mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-26 22:02:15 +00:00
Code Issues Releases Activity

fusee_cpp: improved relocation logic

Browse source
This commit is contained in:
Michael Scire 2021-09-04 23:00:06 -07:00 committed by SciresM
parent 596f5c3f52
commit 0ef9f7ccc8
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
fusee_cpp/loader_stub/source/fusee_loader_start.s
View file

@ -25,21 +25,49 @@ _ZN3ams6nxboot6loader5StartEv:
/* Switch to system mode, mask all interrupts, clear all flags */ /* Switch to system mode, mask all interrupts, clear all flags */
msr cpsr_cxsf, #0xDF msr cpsr_cxsf, #0xDF
/* Relocate loader stub. */ /* Relocate main program. */
ldr r0, =_ZN3ams6nxboot6loader5StartEv ldr r0, =_ZN3ams6nxboot6loader5StartEv
adr r1, _ZN3ams6nxboot6loader5StartEv adr r1, _ZN3ams6nxboot6loader5StartEv
cmp r0, r1
beq 3f
/* Relocate first 0x100. */
mov r4, #0x100
0:
ldmia r1!, {r5-r12}
stmia r0!, {r5-r12}
subs r4, #0x20
bne 0b
/* Jump, continue relocating. */
ldr r3, =1f
bx r3
1:
ldr r4, =__loader_stub_lma__
ldr r3, =__loader_stub_end__
add r4, r4, r3
ldr r3, =__loader_stub_start__
sub r4, r4, r3
sub r4, r4, r0
2:
ldmia r1!, {r5-r12}
stmia r0!, {r5-r12}
subs r4, #0x20
bne 2b
/* Relocate loader stub. */
3:
ldr r2, =__loader_stub_lma__ ldr r2, =__loader_stub_lma__
sub r2, r2, r0
add r2, r2, r1
ldr r3, =__loader_stub_start__ ldr r3, =__loader_stub_start__
ldr r4, =__loader_stub_end__ ldr r4, =__loader_stub_end__
sub r4, r4, r3 sub r4, r4, r3
0: 4:
ldmia r2!, {r5-r12} ldmia r2!, {r5-r12}
stmia r3!, {r5-r12} stmia r3!, {r5-r12}
subs r4, #0x20 subs r4, #0x20
bne 0b bne 4b
/* Set the stack pointer */ /* Set the stack pointer */
ldr sp, =0x40001000 ldr sp, =0x40001000
@ -49,8 +77,6 @@ _ZN3ams6nxboot6loader5StartEv:
ldr r3, =program_lz4 ldr r3, =program_lz4
ldr r4, =program_lz4_end ldr r4, =program_lz4_end
sub r4, r4, r3 sub r4, r4, r3
sub r3, r3, r0
add r3, r3, r1
mov r0, r3 mov r0, r3
mov r1, r4 mov r1, r4