From bf056d5372b6375b088836dd57339d7a499fe0d6 Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Tue, 11 Oct 2011 16:06:03 +0000 Subject: Switch to SYS mode on arm FS#12322 by me git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30741 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/at91sam/lyre_proto1/crt0.S | 36 +++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'firmware/target/arm/at91sam/lyre_proto1') diff --git a/firmware/target/arm/at91sam/lyre_proto1/crt0.S b/firmware/target/arm/at91sam/lyre_proto1/crt0.S index 0146a8409c..029c1b7aec 100644 --- a/firmware/target/arm/at91sam/lyre_proto1/crt0.S +++ b/firmware/target/arm/at91sam/lyre_proto1/crt0.S @@ -33,6 +33,8 @@ #define ARM_MODE_FIQ 0x11 #define ARM_MODE_IRQ 0x12 #define ARM_MODE_SVC 0x13 +#define ARM_MODE_UND 0x1b +#define ARM_MODE_SYS 0x1f #define I_BIT 0x80 #define F_BIT 0x40 @@ -163,6 +165,15 @@ _stack_init: * r2 = IRQ_STACK_SIZE */ + /*- Set up Interrupt Mode and set IRQ Mode Stack */ + msr CPSR_c, #ARM_MODE_IRQ | I_BIT | F_BIT /* Enter in Mode Interrupt + * and disable IRQ (Interrupt) and FIQ (Fast Interrupt) + */ + + mov sp, r0 /* sp (Interrupt Mode Stack Pointer) = + * TOP_OF_MEMORY (end of IRAM 1) + */ + /*- Set up Abort Mode and set ABT Mode Stack */ msr CPSR_c, #ARM_MODE_ABT | I_BIT | F_BIT /* Enter in Mode Abort * and disable IRQ (Interrupt) and FIQ (Fast Interrupt) @@ -172,26 +183,27 @@ _stack_init: * (end of IRAM 1) */ - /* put r0 with value of the new address for next Stack */ - sub r0, r0, r1 /* r0 = r0 - r1 --> r0 = (end of IRAM 1) - - * (ABT_STACK_SIZE) - */ - - /*- Set up Interrupt Mode and set IRQ Mode Stack */ - msr CPSR_c, #ARM_MODE_IRQ | I_BIT | F_BIT /* Enter in Mode Interrupt + /*- Set up Abort Mode and set ABT Mode Stack */ + msr CPSR_c, #ARM_MODE_UND | I_BIT | F_BIT /* Enter in Mode Undefined * and disable IRQ (Interrupt) and FIQ (Fast Interrupt) */ - mov sp, r0 /* sp (Interrupt Mode Stack Pointer) = - * TOP_OF_MEMORY (end of IRAM 1) - (ABT_STACK_SIZE) + mov sp, r0 /* sp (ABT Mode Stack Pointer) = TOP_OF_MEMORY + * (end of IRAM 1) */ + /*- Set up Supervisor Mode and set Supervisor Mode Stack */ + msr CPSR_c, #ARM_MODE_SVC | I_BIT | F_BIT + mov sp, r0 + sub r0, r0, r2 /* Put on r0 the new address for next - * Stack (Supervisor Mode) + * Stack (Sys Mode) */ -/*- Enable interrupt & Set up Supervisor Mode and set Supervisor Mode Stack */ - msr CPSR_c, #ARM_MODE_SVC | F_BIT + /*- Set up Sys Mode and set Sys Mode Stack */ + msr CPSR_c, #ARM_MODE_SYS | F_BIT /* Enter in Sys Mode + * and enable IRQ (Interrupt) and disable FIQ (Fast Interrupt) + */ mov sp, r0 /*----------------------------------------------------------------------------- -- cgit v1.2.3