wutcrt: Make sure main is called with a 8 byte aligned stack pointer

devkitPro · Jul 27, 2022 · b1142d5 · b1142d5
1 parent 9d7289c
commit b1142d5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/libraries/wutcrt/crt0_rpl.s b/libraries/wutcrt/crt0_rpl.s
@@ -6,11 +6,11 @@
 .section .crt0, "ax", @progbits
 .global __rpl_start
 __rpl_start:
-   stwu 1, -0x14(1)
+   stwu 1, -0x10(1)
    mflr 0
-   stw 0, 0x18(1)
-   stw 3, 0xC(1)
-   stw 4, 0x10(1)
+   stw 0, 0x4(1)
+   stw 3, 0x8(1)
+   stw 4, 0xC(1)
    cmpwi 3, 2
    beq unload
 
@@ -20,17 +20,17 @@ load:
    # rpl files use wutmalloc instead of the custom heap
    bl __init_wut_malloc
    bl __eabi
-   lwz 3, 0xC(1)
-   lwz 4, 0x10(1)
+   lwz 3, 0x8(1)
+   lwz 4, 0xC(1)
    bl rpl_entry
-   addi 1, 1, 0x14
+   addi 1, 1, 0x10
    blr
 
 unload:
    # Handle unload
-   lwz 3, 0xC(1)
-   lwz 4, 0x10(1)
+   lwz 3, 0x8(1)
+   lwz 4, 0xC(1)
    bl rpl_entry
-   addi 1, 1, 0x14
+   addi 1, 1, 0x10
    b exit
 
diff --git a/libraries/wutcrt/crt0_rpx.s b/libraries/wutcrt/crt0_rpx.s
@@ -7,16 +7,16 @@
 .section .crt0, "ax", @progbits
 .global __rpx_start
 __rpx_start:
-   stwu 1, -0x14(1)
+   stwu 1, -0x10(1)
    mflr 0
-   stw 0, 0x18(1)
-   stw 3, 0xC(1)
-   stw 4, 0x10(1)
+   stw 0, 0x4(1)
+   stw 3, 0x8(1)
+   stw 4, 0xC(1)
    bl __init_wut
-   lwz 3, 0xC(1)
-   lwz 4, 0x10(1)
+   lwz 3, 0x8(1)
+   lwz 4, 0xC(1)
    bl main
-   addi 1, 1, 0x14
+   addi 1, 1, 0x10
    b exit
 
 # -----------------------------------