diff options
| author | Bernard Xiong <[email protected]> | 2015-05-13 13:35:23 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-05-13 13:35:23 +0800 |
| commit | deaeaf709f10159bccac06a3ac512abdc3c5ae2d (patch) | |
| tree | 4f153daef5f905130dd3b6ef12c5dc2dfcc319b0 | |
| parent | ec55dd2f9fe8223af281328c5eedb3507fc32669 (diff) | |
| parent | 73df162d3f9de24158eec9cc66f2662ecd9ec269 (diff) | |
Merge pull request #476 from aozima/pulls
fixed assembly warnings.
| -rw-r--r-- | libcpu/arm/cortex-m0/context_rvds.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m3/context_rvds.S | 6 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m4/context_rvds.S | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/libcpu/arm/cortex-m0/context_rvds.S b/libcpu/arm/cortex-m0/context_rvds.S index 89ac029282..bf68592e63 100644 --- a/libcpu/arm/cortex-m0/context_rvds.S +++ b/libcpu/arm/cortex-m0/context_rvds.S @@ -183,13 +183,11 @@ rt_hw_context_switch_to PROC LDR r0, =NVIC_INT_CTRL LDR r1, =NVIC_PENDSVSET STR r1, [r0] - NOP ; restore MSP LDR r0, =SCB_VTOR LDR r0, [r0] LDR r0, [r0] - NOP MSR msp, r0 ; enable interrupts at processor level @@ -216,4 +214,6 @@ HardFault_Handler PROC POP {pc} ENDP + ALIGN 4 + END diff --git a/libcpu/arm/cortex-m3/context_rvds.S b/libcpu/arm/cortex-m3/context_rvds.S index 33fcd124d9..ebfd5c8da8 100644 --- a/libcpu/arm/cortex-m3/context_rvds.S +++ b/libcpu/arm/cortex-m3/context_rvds.S @@ -177,7 +177,6 @@ rt_hw_context_switch_to PROC rt_hw_interrupt_thread_switch PROC EXPORT rt_hw_interrupt_thread_switch BX lr - NOP ENDP IMPORT rt_hw_hard_fault_exception @@ -203,5 +202,6 @@ HardFault_Handler PROC BX lr ENDP - NOP - END
\ No newline at end of file + ALIGN 4 + + END diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S index af7461fd49..d7cb34d5c3 100644 --- a/libcpu/arm/cortex-m4/context_rvds.S +++ b/libcpu/arm/cortex-m4/context_rvds.S @@ -218,7 +218,6 @@ rt_hw_context_switch_to PROC rt_hw_interrupt_thread_switch PROC EXPORT rt_hw_interrupt_thread_switch BX lr - NOP ENDP IMPORT rt_hw_hard_fault_exception @@ -235,4 +234,6 @@ HardFault_Handler PROC BX lr ENDP + ALIGN 4 + END |