Adapt changes from b9s/next

loader/Makefile

@@ -13,8 +13,8 @@ dir_build := build
 dir_out := ../$(dir_build)
 
 ASFLAGS := -mcpu=arm946e-s
-CFLAGS  := -Wall -Wextra -mthumb $(ASFLAGS) -fno-builtin -std=c11 -Wno-main -O2 -flto -ffast-math
-LDFLAGS := -nostdlib
+CFLAGS  := -Wall -Wextra -marm $(ASFLAGS) -fno-builtin -std=c11 -Wno-main -O2 -flto -ffast-math
+LDFLAGS := -nostartfiles -Wl,--nmagic
 
 objects = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
           $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \

loader/source/firm.c

@@ -24,20 +24,15 @@
 #include "memory.h"
 #include "cache.h"
 
+void disableMpuAndJumpToEntrypoints(int argc, char **argv, void *arm11Entry, void *arm9Entry);
+
 void launchFirm(Firm *firm, int argc, char **argv)
 {
     //Copy FIRM sections to respective memory locations
     for(u32 sectionNum = 0; sectionNum < 4 && firm->section[sectionNum].size != 0; sectionNum++)
         memcpy(firm->section[sectionNum].address, (u8 *)firm + firm->section[sectionNum].offset, firm->section[sectionNum].size);
 
-    //Ensure that all memory transfers have completed and that the caches have been flushed
-    flushCaches();
-
-    //Set ARM11 entrypoint
-    *(vu32 *)0x1FFFFFFC = (u32)firm->arm11Entry;
-
-    //Jump to ARM9 entrypoint. Also give it additional arguments it can dismiss
-    ((void (*)(int, char**, u32))firm->arm9Entry)(argc, argv, 0x0000BEEF);
+    disableMpuAndJumpToEntrypoints(argc, argv, firm->arm9Entry, firm->arm11Entry);
 
     __builtin_unreachable();
 }

loader/source/main.c

@@ -24,17 +24,25 @@
 #include "cache.h"
 #include "firm.h"
 
-void main(int argc __attribute__((unused)), char **argv)
+void main(int argc, char **argv)
 {
-    Firm *firm = (Firm *)0x24000000;
+    Firm *firm = (Firm *)0x20001000;
+    struct fb fbs[2];
     char absPath[24 + 255];
 
+    if(argc == 2)
+    {
+        struct fb *fbsrc = (struct fb *)argv[1];
+        fbs[0] = fbsrc[0];
+        fbs[1] = fbsrc[1];
+    }
+
     u32 i;
     for(i = 0; i < sizeof(absPath) - 1 && argv[0][i] != 0; i++)
         absPath[i] = argv[0][i];
     absPath[i] = 0;
 
-    char *argvPassed[1] = {absPath};
+    char *argvPassed[2] = {absPath, (char *)&fbs};
 
-    launchFirm(firm, 1, argvPassed);
+    launchFirm(firm, argc, argvPassed);
 }

loader/source/start.s

@@ -18,9 +18,40 @@
 @   reasonable legal notices or author attributions in that material or in the Appropriate Legal
 @   Notices displayed by works containing it.
 
+.arm
+
 .section .text.start
 .align 4
 .global _start
 _start:
     ldr sp, =0x27ffe000
     b main
+
+.text
+.balign 4
+.global disableMpuAndJumpToEntrypoints
+.type   disableMpuAndJumpToEntrypoints, %function
+disableMpuAndJumpToEntrypoints:
+    mov r4, r0
+    mov r5, r1
+    mov r6, r2
+    mov r7, r3
+
+    bl flushCaches
+
+    @ Disable caches / MPU
+    mrc p15, 0, r0, c1, c0, 0  @ read control register
+    bic r0, #(1<<12)           @ - instruction cache disable
+    bic r0, #(1<<2)            @ - data cache disable
+    bic r0, #(1<<0)            @ - mpu disable
+    mcr p15, 0, r0, c1, c0, 0  @ write control register
+
+    @ Set the ARM11 entrypoint
+    mov r0, #0x20000000
+    str r7, [r0, #-4]
+
+    @ Jump to the ARM9 entrypoint
+    mov r0, r4
+    mov r1, r5
+    ldr r2, =0xBEEF
+    bx r6

loader/source/types.h

@@ -32,4 +32,10 @@ typedef uint64_t u64;
 typedef volatile u8 vu8;
 typedef volatile u16 vu16;
 typedef volatile u32 vu32;
-typedef volatile u64 vu64;
+typedef volatile u64 vu64;
+
+struct fb {
+     u8 *top_left;
+     u8 *top_right;
+     u8 *bottom;
+}  __attribute__((packed));