Browse Source

fixed context thread issue when using armcc compile

weety 12 years ago
parent
commit
03aa76155e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      libcpu/arm/at91sam926x/context_rvds.S

+ 2 - 2
libcpu/arm/at91sam926x/context_rvds.S

@@ -60,9 +60,9 @@ rt_hw_context_switch	PROC
 	LDMFD	sp!, {r4}			; pop new task spsr
 	LDMFD	sp!, {r4}			; pop new task spsr
 	MSR	spsr_cxsf, r4
 	MSR	spsr_cxsf, r4
 	LDMFD	sp!, {r4}			; pop new task cpsr
 	LDMFD	sp!, {r4}			; pop new task cpsr
-	MSR	cpsr_cxsf, r4
+	MSR	spsr_cxsf, r4
 
 
-	LDMFD	sp!, {r0-r12, lr, pc}	; pop new task r0-r12, lr & pc
+	LDMFD	sp!, {r0-r12, lr, pc}^	; pop new task r0-r12, lr & pc
 	ENDP
 	ENDP
 
 
 ;/*
 ;/*