From 7e51b3888e67d47377287b449fd49cd81e8f1c68 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Tue, 30 Dec 2014 00:02:55 +0000 Subject: [PATCH] oops, forgot these need to be in data section --- libctru/source/system/init_exit_Wrappers.s | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libctru/source/system/init_exit_Wrappers.s b/libctru/source/system/init_exit_Wrappers.s index 6155b64..8668ff7 100644 --- a/libctru/source/system/init_exit_Wrappers.s +++ b/libctru/source/system/init_exit_Wrappers.s @@ -7,24 +7,26 @@ @--------------------------------------------------------------------------------- initSystem: @--------------------------------------------------------------------------------- - adr r0, saved_lr + ldr r0, =saved_lr str lr, [r0] str sp, [r0,#4] bl __ctru_initSystem ldr r0,=fake_heap_start ldr sp, [r0] - ldr pc, saved_lr - -saved_lr: - .word 0 -saved_stack: - .word 0 - + ldr r0, =saved_lr + ldr pc, [r0] .global __ctru_exit .type __ctru_exit STT_FUNC @--------------------------------------------------------------------------------- __ctru_exit: @--------------------------------------------------------------------------------- - ldr sp, saved_stack + ldr r1, =saved_stack + ldr sp, [r1] b __libctru_exit + + .data +saved_lr: + .word 0 +saved_stack: + .word 0