hos: change initialization API

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.

libraries/libstratosphere/include/stratosphere/hos.hpp

@@ -16,5 +16,6 @@
 
 #pragma once
 
-#include "hos/hos_types.hpp"
+#include <stratosphere/hos/hos_types.hpp>
-#include "hos/hos_version_api.hpp"
+#include <stratosphere/hos/hos_version_api.hpp>
+#include <stratosphere/hos/hos_stratosphere_api.hpp>

libraries/libstratosphere/include/stratosphere/hos/hos_stratosphere_api.hpp

@@ -0,0 +1,24 @@
+/*
+ * 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/>.
+ */
+
+#pragma once
+#include <stratosphere/hos/hos_types.hpp>
+
+namespace ams::hos {
+
+    void InitializeForStratosphere();
+
+}

libraries/libstratosphere/include/stratosphere/hos/hos_version_api.hpp

@@ -15,11 +15,10 @@
  */
 
 #pragma once
-#include "hos_types.hpp"
+#include <stratosphere/hos/hos_types.hpp>
 
 namespace ams::hos {
 
     ::ams::hos::Version GetVersion();
-    void SetVersionForLibnx();
 
 }

libraries/libstratosphere/source/hos/hos_stratosphere_api.cpp

@@ -0,0 +1,35 @@
+/*
+ * 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 "hos_version_api_private.hpp"
+
+namespace ams::os {
+
+    void InitializeForStratosphereInternal();
+
+}
+
+namespace ams::hos {
+
+    void InitializeForStratosphere() {
+        /* Initialize the global os resource managers. This *must* be done before anything else in stratosphere. */
+        os::InitializeForStratosphereInternal();
+
+        /* Initialize hos::Version API. */
+        hos::SetVersionForLibnxInternal();
+    }
+
+}

libraries/libstratosphere/source/hos/hos_version_api.cpp

@@ -13,8 +13,8 @@
  * 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 "hos_version_api_private.hpp"
 
 namespace ams::hos {
 
@@ -86,7 +86,7 @@ namespace ams::hos {
         return g_hos_version;
     }
 
-    void SetVersionForLibnx() {
+    void SetVersionForLibnxInternal() {
         u32 major = 0, minor = 0, micro = 0;
         switch (hos::GetVersion()) {
             case hos::Version_1_0_0:

libraries/libstratosphere/source/hos/hos_version_api_private.hpp

@@ -0,0 +1,23 @@
+/*
+ * 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/>.
+ */
+#pragma once
+#include <stratosphere.hpp>
+
+namespace ams::hos {
+
+    void SetVersionForLibnxInternal();
+
+}

libraries/libstratosphere/source/os/impl/os_resource_manager.cpp

@@ -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 = {};
 
 }

libraries/libstratosphere/source/os/impl/os_resource_manager.hpp

@@ -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);
             }
     };
 

libraries/libstratosphere/source/os/os_stratosphere_api.cpp

@@ -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();
+    }
+
+}

stratosphere/ams_mitm/source/amsmitm_main.cpp

@@ -74,7 +74,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(fsInitialize());

stratosphere/boot/source/boot_main.cpp

@@ -86,7 +86,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     /* Initialize services we need (TODO: NCM) */
     sm::DoWithSession([&]() {

stratosphere/boot2/source/boot2_main.cpp

@@ -66,7 +66,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     /* Initialize services we need. */
     sm::DoWithSession([&]() {

stratosphere/creport/source/creport_main.cpp

@@ -68,7 +68,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(fsInitialize());

stratosphere/dmnt/source/dmnt_main.cpp

@@ -60,7 +60,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(pmdmntInitialize());

stratosphere/erpt/source/erpt_main.cpp

@@ -66,7 +66,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(setInitialize());

stratosphere/fatal/source/fatal_main.cpp

@@ -72,7 +72,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(setInitialize());

stratosphere/loader/source/ldr_main.cpp

@@ -68,7 +68,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     /* Initialize services we need. */
     sm::DoWithSession([&]() {

stratosphere/ncm/source/ncm_main.cpp

@@ -91,7 +91,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     fs::SetAllocator(Allocate, Deallocate);
 

stratosphere/pgl/source/pgl_main.cpp

@@ -117,7 +117,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     fs::SetAllocator(pgl::Allocate, pgl::Deallocate);
 

stratosphere/pm/source/pm_main.cpp

@@ -128,7 +128,7 @@ namespace {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(fsprInitialize());

stratosphere/ro/source/ro_main.cpp

@@ -58,7 +58,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(setsysInitialize());

stratosphere/sm/source/sm_main.cpp

@@ -70,7 +70,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     /* We must do no service setup here, because we are sm. */
 }

stratosphere/spl/source/spl_main.cpp

@@ -75,7 +75,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    hos::SetVersionForLibnx();
+    hos::InitializeForStratosphere();
 
     /* SPL doesn't really access any services... */