Changes in kernel/arch/arm32/src/exc_handler.S [dfd735a1:a5f63cd] in mainline

File:

• kernel/arch/arm32/src/exc_handler.S (modified) (9 diffs)

kernel/arch/arm32/src/exc_handler.S

@@ -96 +96 @@
         ldmfd r3!, {r4-r7}
         stmfd r13!, {r4-r7}
-        mov r4, r13
-        stmfd r4, {r13, lr}^
-        nop                     /* Cannot access r13 immediately after stm(2) */
-        sub r13, r13, #8
+        stmfd r13!, {r13, lr}^
         stmfd r13!, {r2}
-
-        # Stop stack traces here
-        mov fp, #0
-        
         b 2f
 
@@ -130 +123 @@
         stmfd r13!, {r2}
 2:
+        # Stop stack traces here
+        mov fp, #0
 .endm
 
@@ -140 +135 @@
 
         # return to user mode
-        mov r0, r13
-        ldmfd r0, {r13, lr}^
-        nop                     /* Cannot access r13 immediately after ldm(2) */
-        add r13, r13, #8
+        ldmfd r13!, {r13, lr}^
         b 2f
 
@@ -158 +150 @@
         mov r0, #0
         mov r1, r13
-        bl ras_check
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -166 +158 @@
         mov r0, #5
         mov r1, r13
-        bl ras_check
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -174 +166 @@
         mov r0, #6
         mov r1, r13
-        bl ras_check
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -181 +173 @@
         mov r0, #1
         mov r1, r13
-        bl ras_check
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -189 +181 @@
         mov r0, #3
         mov r1, r13
-        bl ras_check
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -197 +189 @@
         mov r0, #4
         mov r1, r13
-        bl ras_check
+        bl ras_check 
         LOAD_REGS_FROM_STACK