mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-06-05 17:14:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

hos: change initialization API

Browse source 
This was needed to make stratosphere buildable with debugging on.

os:: assertions rely on GetCurrentThread() working, and this requires
the global os resource manager to be constructed. However, __appInit executes
before global constructors. We now require that hos::InitializeForStratosphere()
be called before anything else is done. This initializes the os resource manager,
sets the hos version for libnx, and may do more things in the future.

TODO: Consider replacing __appInit/__appExit with ams:: namespace functions in general,
and wrap them so that we guarantee hos::InitializeForStratosphere is called first, and
generally ensure a consistent stratosphere environment.
This commit is contained in:
Michael Scire 2020-04-16 22:57:01 -07:00
parent 332dbdd497
commit 94ec9ae41b
23 changed files with 136 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/libstratosphere/source/os/impl/os_resource_manager.cpp
View file

@ -19,6 +19,6 @@
namespace ams::os::impl {
/* TODO: C++20 constinit */
OsResourceManager ResourceManagerHolder::s_resource_manager = {};
TYPED_STORAGE(OsResourceManager) ResourceManagerHolder::s_resource_manager_storage = {};
}

9
libraries/libstratosphere/source/os/impl/os_resource_manager.hpp
View file

@ -39,12 +39,17 @@ namespace ams::os::impl {
class ResourceManagerHolder {
private:
static /* TODO: C++20 constinit */ OsResourceManager s_resource_manager;
static TYPED_STORAGE(OsResourceManager) s_resource_manager_storage;
private:
constexpr ResourceManagerHolder() { /* ... */ }
public:
static ALWAYS_INLINE void InitializeResourceManagerInstance() {
/* Construct the resource manager instance. */
new (GetPointer(s_resource_manager_storage)) OsResourceManager;
}
static ALWAYS_INLINE OsResourceManager &GetResourceManagerInstance() {
return s_resource_manager;
return GetReference(s_resource_manager_storage);
}
};

26
libraries/libstratosphere/source/os/os_stratosphere_api.cpp Normal file
View file

@ -0,0 +1,26 @@
/*
* Copyright (c) 2018-2020 Atmosphère-NX
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stratosphere.hpp>
#include "impl/os_resource_manager.hpp"
namespace ams::os {
void InitializeForStratosphereInternal() {
/* Initialize the global os resource manager. */
os::impl::ResourceManagerHolder::InitializeResourceManagerInstance();
}
}