libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug fix (USR mode stack removed). 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@252 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
mbbill 2009-12-28 14:37:56 +00:00
parent 6a7ad0f578
commit f64d2241d0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcpu/arm/AT91SAM7X/start_rvds.S
View File

@ -26,6 +26,8 @@
; Standard definitions of Mode bits and Interrupt (I & F) flags in PSRs ; Standard definitions of Mode bits and Interrupt (I & F) flags in PSRs
; 2009-12-28 MingBai Bug fix (USR mode stack removed).
Mode_USR EQU 0x10 Mode_USR EQU 0x10
Mode_FIQ EQU 0x11 Mode_FIQ EQU 0x11
Mode_IRQ EQU 0x12 Mode_IRQ EQU 0x12
@ -57,7 +59,7 @@ SVC_Stack_Size EQU 0x00000100
ABT_Stack_Size EQU 0x00000000 ABT_Stack_Size EQU 0x00000000
FIQ_Stack_Size EQU 0x00000000 FIQ_Stack_Size EQU 0x00000000
IRQ_Stack_Size EQU 0x00000100 IRQ_Stack_Size EQU 0x00000100
USR_Stack_Size EQU 0x00000100 USR_Stack_Size EQU 0x00000000
ISR_Stack_Size EQU (UND_Stack_Size + SVC_Stack_Size + ABT_Stack_Size + \ ISR_Stack_Size EQU (UND_Stack_Size + SVC_Stack_Size + ABT_Stack_Size + \
FIQ_Stack_Size + IRQ_Stack_Size) FIQ_Stack_Size + IRQ_Stack_Size)
@ -383,7 +385,7 @@ MC_RCR EQU 0x00 ; MC_RCR Offset
; Enter Supervisor Mode and set its Stack Pointer ; Enter Supervisor Mode and set its Stack Pointer
MSR CPSR_c, #Mode_SVC:OR:I_Bit:OR:F_Bit MSR CPSR_c, #Mode_SVC:OR:I_Bit:OR:F_Bit
MOV SP, R0 MOV SP, R0
SUB R0, R0, #SVC_Stack_Size ; SUB R0, R0, #SVC_Stack_Size
; Enter User Mode and set its Stack Pointer ; Enter User Mode and set its Stack Pointer
; MSR CPSR_c, #Mode_USR ; MSR CPSR_c, #Mode_USR
@ -393,8 +395,9 @@ MC_RCR EQU 0x00 ; MC_RCR Offset
ELSE ELSE
MOV SP, R0 ; No usr mode stack here.
SUB SL, SP, #USR_Stack_Size ;MOV SP, R0
;SUB SL, SP, #USR_Stack_Size
ENDIF ENDIF
@ -489,7 +492,7 @@ rt_hw_context_switch_interrupt_do PROC
__user_initial_stackheap __user_initial_stackheap
LDR R0, = Heap_Mem LDR R0, = Heap_Mem
LDR R1, =(Stack_Mem + USR_Stack_Size) LDR R1, =(Stack_Mem + SVC_Stack_Size)
LDR R2, = (Heap_Mem + Heap_Size) LDR R2, = (Heap_Mem + Heap_Size)
LDR R3, = Stack_Mem LDR R3, = Stack_Mem
BX LR BX LR