Use my DOL relocation stub

PlatypusWithCheese · Jul 17, 2022 · 6170f76 · 6170f76
1 parent 4e6bf6d
commit 6170f76
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 488 deletions.
diff --git a/source/main.c b/source/main.c
@@ -1,14 +1,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sdcard/gcsd.h>
+#include <string.h>
 #include <malloc.h>
 #include <unistd.h>
 #include <ogc/lwp_watchdog.h>
 #include <fcntl.h>
-#include "sidestep.h"
 #include "ffshim.h"
 #include "fatfs/ff.h"
 
+#include "stub.h"
+#define STUB_ADDR  0x80001000
+#define STUB_STACK 0x80003000
+
 u8 *dol = NULL;
 
 void dol_alloc(int size)
@@ -24,12 +28,6 @@ void dol_alloc(int size)
         return;
     }
 
-    if (size >= (AR_GetSize() - (64 * 1024)))
-    {
-        kprintf("DOL too big\n");
-        return;
-    }
-
     dol = (u8 *) memalign(32, size);
 
     if (!dol)
@@ -223,7 +221,13 @@ int main()
 load:
     if (dol)
     {
-        DOLtoARAM(dol, 0, NULL);
+        memcpy((void *) STUB_ADDR, stub, stub_size);
+        DCStoreRange((void *) STUB_ADDR, stub_size);
+
+        SYS_ResetSystem(SYS_SHUTDOWN, 0, FALSE);
+        SYS_SwitchFiber((intptr_t) dol, 0,
+                        (intptr_t) NULL, 0,
+                        STUB_ADDR, STUB_STACK);
     }
 
     // If we reach here, all attempts to load a DOL failed

diff --git a/source/sidestep.c b/source/sidestep.c