strat: use ams::Main() instead of main(argc, argv)

stratosphere/pgl/source/pgl_main.cpp

@@ -15,127 +15,46 @@
  */
 #include <stratosphere.hpp>
 
-extern "C" {
-    extern u32 __start__;
-
-    u32 __nx_applet_type = AppletType_None;
-    u32 __nx_fs_num_sessions = 1;
-
-    #define INNER_HEAP_SIZE 0x0
-    size_t nx_inner_heap_size = INNER_HEAP_SIZE;
-    char   nx_inner_heap[INNER_HEAP_SIZE];
-
-    void __libnx_initheap(void);
-    void __appInit(void);
-    void __appExit(void);
-
-    /* Exception handling. */
-    alignas(16) u8 __nx_exception_stack[ams::os::MemoryPageSize];
-    u64 __nx_exception_stack_size = sizeof(__nx_exception_stack);
-    void __libnx_exception_handler(ThreadExceptionDump *ctx);
-
-    void *__libnx_alloc(size_t size);
-    void *__libnx_aligned_alloc(size_t alignment, size_t size);
-    void __libnx_free(void *mem);
-}
-
-using namespace ams;
-
-void __libnx_exception_handler(ThreadExceptionDump *ctx) {
-    ams::CrashHandler(ctx);
-}
-
-void __libnx_initheap(void) {
-	void*  addr = nx_inner_heap;
-	size_t size = nx_inner_heap_size;
-
-	/* Newlib */
-	extern char* fake_heap_start;
-	extern char* fake_heap_end;
-
-	fake_heap_start = (char*)addr;
-	fake_heap_end   = (char*)addr + size;
-}
-
-void __appInit(void) {
-    hos::InitializeForStratosphere();
-
-    ams::pgl::srv::InitializeHeap();
-
-    fs::SetAllocator(pgl::srv::Allocate, pgl::srv::Deallocate);
-
-    R_ABORT_UNLESS(sm::Initialize());
-
-    R_ABORT_UNLESS(setInitialize());
-    R_ABORT_UNLESS(setsysInitialize());
-    R_ABORT_UNLESS(pmshellInitialize());
-    R_ABORT_UNLESS(ldrShellInitialize());
-    R_ABORT_UNLESS(lrInitialize());
-    R_ABORT_UNLESS(fsInitialize());
-
-    ams::CheckApiVersion();
-}
-
-void __appExit(void) {
-    fsExit();
-    lrExit();
-    ldrShellExit();
-    pmshellExit();
-    setsysExit();
-    setExit();
-}
-
 namespace ams {
 
-    void *Malloc(size_t) {
-        AMS_ABORT("ams::Malloc was called");
+    namespace init {
+
+        void InitializeSystemModule() {
+            /* Initialize heap. */
+            pgl::srv::InitializeHeap();
+
+            /* Initialize our connection to sm. */
+            R_ABORT_UNLESS(sm::Initialize());
+
+            /* Initialize fs. */
+            fs::InitializeForSystem();
+            fs::SetAllocator(pgl::srv::Allocate, pgl::srv::Deallocate);
+            fs::SetEnabledAutoAbort(false);
+
+            /* Initialize other services we need. */
+            R_ABORT_UNLESS(setInitialize());
+            R_ABORT_UNLESS(setsysInitialize());
+            R_ABORT_UNLESS(pmshellInitialize());
+            R_ABORT_UNLESS(ldrShellInitialize());
+            R_ABORT_UNLESS(lrInitialize());
+
+            /* Verify that we can sanely execute. */
+            ams::CheckApiVersion();
+        }
+
+        void FinalizeSystemModule() { /* ... */ }
+
+        void Startup() { /* ... */ }
+
     }
 
-    void Free(void *) {
-        AMS_ABORT("ams::Free was called");
+    void Main() {
+        /* Set thread name. */
+        os::SetThreadNamePointer(os::GetCurrentThread(), AMS_GET_SYSTEM_THREAD_NAME(pgl, Main));
+        AMS_ASSERT(os::GetThreadPriority(os::GetCurrentThread()) == AMS_GET_SYSTEM_THREAD_PRIORITY(pgl, Main));
+
+        /* Initialize and start the server. */
+        pgl::srv::StartServer();
     }
 
 }
-
-void *operator new(size_t size) {
-    return pgl::srv::Allocate(size);
-}
-
-void operator delete(void *p) {
-    return pgl::srv::Deallocate(p, 0);
-}
-
-void operator delete(void *p, size_t size) {
-    return pgl::srv::Deallocate(p, size);
-}
-
-void *__libnx_alloc(size_t) {
-    AMS_ABORT("__libnx_alloc was called");
-}
-
-void *__libnx_aligned_alloc(size_t, size_t) {
-    AMS_ABORT("__libnx_aligned_alloc was called");
-}
-
-void __libnx_free(void *) {
-    AMS_ABORT("__libnx_free was called");
-}
-
-int main(int argc, char **argv)
-{
-    AMS_UNUSED(argc, argv);
-
-    /* Disable auto-abort in fs operations. */
-    fs::SetEnabledAutoAbort(false);
-
-    /* Set thread name. */
-    os::SetThreadNamePointer(os::GetCurrentThread(), AMS_GET_SYSTEM_THREAD_NAME(pgl, Main));
-    AMS_ASSERT(os::GetThreadPriority(os::GetCurrentThread()) == AMS_GET_SYSTEM_THREAD_PRIORITY(pgl, Main));
-
-    /* Initialize and start the server. */
-    pgl::srv::StartServer();
-
-    /* Cleanup */
-    return 0;
-}
-