From e18314fc9857b08a51dfcfcdb69b9490ca968fb1 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Tue, 20 Oct 2009 02:16:37 +0000 Subject: [PATCH] main returns to __libnds_exit --- dkarm-eabi/crtls/ds_arm7_crt0.s | 8 +++----- dkarm-eabi/crtls/ds_arm9_crt0.s | 12 ++---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dkarm-eabi/crtls/ds_arm7_crt0.s b/dkarm-eabi/crtls/ds_arm7_crt0.s index fb45061..b626dc0 100644 --- a/dkarm-eabi/crtls/ds_arm7_crt0.s +++ b/dkarm-eabi/crtls/ds_arm7_crt0.s @@ -33,11 +33,9 @@ _start: mov r0, #0 @ int argc mov r1, #0 @ char *argv[] ldr r3, =main - bl _blx_r3_stub - - @ If the user ever returns, return to flash cartridge - mov r0, #0x08000000 - bx r0 + ldr lr,=__libnds_exit + bx r3 + @--------------------------------------------------------------------------------- _blx_r3_stub: diff --git a/dkarm-eabi/crtls/ds_arm9_crt0.s b/dkarm-eabi/crtls/ds_arm9_crt0.s index c1c1bb4..0290e14 100644 --- a/dkarm-eabi/crtls/ds_arm9_crt0.s +++ b/dkarm-eabi/crtls/ds_arm9_crt0.s @@ -275,16 +275,8 @@ setregions: ldr r0, [r0,#12] @ argc ldr r3, =main - blx r3 @ jump to user code - - @ If the user ever returns, go back to passme loop - ldr r0, =ILoop - ldr r0, [r0] - ldr r1, =0x02FFFE78 - str r0, [r1] - bx r1 -ILoop: - b ILoop + ldr lr,=__libnds_exit + bx r3 @ jump to user code @--------------------------------------------------------------------------------- @ check for a commandline