i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm/arch_exceptions.S: Replace spsr_all with spsr

Browse Source 
After a quick look at binutils, they seem to be equal, however, Clang
does not accept the _all one.
This commit is contained in:
Jonathan Schleifer
2015-11-08 00:59:18 +01:00
parent 15d594cccd
commit 93bcaf3650
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/arm/arch_exceptions.S
+3 -3
View File
@@ -32,20 +32,20 @@
str r0, [sp, #-4]! /* Push return address */ str r0, [sp, #-4]! /* Push return address */
str lr, [sp, #-4]! /* Push SVC lr */ str lr, [sp, #-4]! /* Push SVC lr */
str r2, [sp, #-4]! /* Push SVC sp */ str r2, [sp, #-4]! /* Push SVC sp */
msr spsr_all, r3 /* Restore correct spsr */ msr spsr, r3 /* Restore correct spsr */
ldmdb r1, {r0-r3} /* Restore 4 regs from xxx mode */ ldmdb r1, {r0-r3} /* Restore 4 regs from xxx mode */
sub sp, sp, #(4*15) /* Adjust the stack pointer */ sub sp, sp, #(4*15) /* Adjust the stack pointer */
stmia sp, {r0-r12} /* Push the user mode registers */ stmia sp, {r0-r12} /* Push the user mode registers */
add r0, sp, #(4*13) /* Adjust the stack pointer */ add r0, sp, #(4*13) /* Adjust the stack pointer */
stmia r0, {r13-r14}^ /* Push the user mode registers */ stmia r0, {r13-r14}^ /* Push the user mode registers */
mov r0, r0 /* NOP for previous instruction */ mov r0, r0 /* NOP for previous instruction */
mrs r0, spsr_all mrs r0, spsr
str r0, [sp, #-4]! /* Save spsr */ str r0, [sp, #-4]! /* Save spsr */
.endm .endm
.macro PULLFRAMEFROMSVCANDEXIT .macro PULLFRAMEFROMSVCANDEXIT
ldr r0, [sp], #0x0004 /* Get the SPSR from stack */ ldr r0, [sp], #0x0004 /* Get the SPSR from stack */
msr spsr_all, r0 /* restore SPSR */ msr spsr, r0 /* restore SPSR */
ldmia sp, {r0-r14}^ /* Restore registers (usr mode) */ ldmia sp, {r0-r14}^ /* Restore registers (usr mode) */
mov r0, r0 /* NOP for previous instruction */ mov r0, r0 /* NOP for previous instruction */
add sp, sp, #(4*15) /* Adjust the stack pointer */ add sp, sp, #(4*15) /* Adjust the stack pointer */