OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exosphere: Fix relocation bug (warmboot relocs currently broken in edge case)

Browse Source
This commit is contained in:
Michael Scire
2018-05-18 03:10:06 -06:00
parent e0a5acd0ba
commit 1a9f095463
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
exosphere/src/start.s
View File

@@ -89,11 +89,13 @@ __start_cold:
cmp x0, x1
beq _post_cold_crt0_reloc
1:
ldp x3, x4, [x0], #0x10
stp x3, x4, [x1], #0x10
ldp x3, x4, [x1], #0x10
stp x3, x4, [x0], #0x10
cmp x0, x2
blo 1b
adr x20, __start_cold
adr x19, g_coldboot_crt0_relocation_list
ldr x16, =_post_cold_crt0_reloc
br x16
@@ -104,9 +106,9 @@ _post_cold_crt0_reloc:
mov sp, x0
mov fp, #0
adr x0, g_coldboot_crt0_relocation_list
mov x19, x0
adr x1, __start_cold
/* X1 is already set to __start_cold (original load location) from above. */
mov x0, x19
mov x1, x20
bl coldboot_init
ldr x16, =__jump_to_main_cold