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

Merge pull request #476 from aozima/pulls 

fixed assembly warnings.
This commit is contained in:
Bernard Xiong 2015-05-13 13:35:23 +08:00
parent ec55dd2f9f 73df162d3f
commit deaeaf709f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcpu/arm/cortex-m0/context_rvds.S
View File

@ -183,13 +183,11 @@ rt_hw_context_switch_to PROC
LDR r0, =NVIC_INT_CTRL LDR r0, =NVIC_INT_CTRL
LDR r1, =NVIC_PENDSVSET LDR r1, =NVIC_PENDSVSET
STR r1, [r0] STR r1, [r0]
NOP
; restore MSP ; restore MSP
LDR r0, =SCB_VTOR LDR r0, =SCB_VTOR
LDR r0, [r0] LDR r0, [r0]
LDR r0, [r0] LDR r0, [r0]
NOP
MSR msp, r0 MSR msp, r0
; enable interrupts at processor level ; enable interrupts at processor level
@ -216,4 +214,6 @@ HardFault_Handler PROC
POP {pc} POP {pc}
ENDP ENDP
ALIGN 4
END END

6
libcpu/arm/cortex-m3/context_rvds.S
View File

@ -177,7 +177,6 @@ rt_hw_context_switch_to PROC
rt_hw_interrupt_thread_switch PROC rt_hw_interrupt_thread_switch PROC
EXPORT rt_hw_interrupt_thread_switch EXPORT rt_hw_interrupt_thread_switch
BX lr BX lr
NOP
ENDP ENDP
IMPORT rt_hw_hard_fault_exception IMPORT rt_hw_hard_fault_exception
@ -203,5 +202,6 @@ HardFault_Handler PROC
BX lr BX lr
ENDP ENDP
NOP ALIGN 4
END
END

3
libcpu/arm/cortex-m4/context_rvds.S
View File

@ -218,7 +218,6 @@ rt_hw_context_switch_to PROC
rt_hw_interrupt_thread_switch PROC rt_hw_interrupt_thread_switch PROC
EXPORT rt_hw_interrupt_thread_switch EXPORT rt_hw_interrupt_thread_switch
BX lr BX lr
NOP
ENDP ENDP
IMPORT rt_hw_hard_fault_exception IMPORT rt_hw_hard_fault_exception
@ -235,4 +234,6 @@ HardFault_Handler PROC
BX lr BX lr
ENDP ENDP
ALIGN 4
END END