summaryrefslogtreecommitdiff
path: root/libcpu
diff options
context:
space:
mode:
authoraozima <[email protected]>2017-08-09 09:49:05 +0800
committeraozima <[email protected]>2017-08-18 11:12:58 +0800
commit9b7303e511b8196d9ba6b8aa292489ead7c51240 (patch)
tree368b3adbd433363fd276345a4fb0c0fec746b280 /libcpu
parentf975ef5146f4e12dd464b310b1cce3b8b0e9cbfb (diff)
update libcpu: ensure fault enable.
Diffstat (limited to 'libcpu')
-rw-r--r--libcpu/arm/cortex-m0/context_gcc.S4
-rw-r--r--libcpu/arm/cortex-m0/context_iar.S1
-rw-r--r--libcpu/arm/cortex-m0/context_rvds.S1
-rw-r--r--libcpu/arm/cortex-m3/context_gcc.S4
-rw-r--r--libcpu/arm/cortex-m3/context_iar.S4
-rw-r--r--libcpu/arm/cortex-m3/context_rvds.S1
-rw-r--r--libcpu/arm/cortex-m4/context_gcc.S4
-rw-r--r--libcpu/arm/cortex-m4/context_iar.S4
-rw-r--r--libcpu/arm/cortex-m4/context_rvds.S1
-rw-r--r--libcpu/arm/cortex-m7/context_gcc.S4
-rw-r--r--libcpu/arm/cortex-m7/context_iar.S4
-rw-r--r--libcpu/arm/cortex-m7/context_rvds.S1
12 files changed, 26 insertions, 7 deletions
diff --git a/libcpu/arm/cortex-m0/context_gcc.S b/libcpu/arm/cortex-m0/context_gcc.S
index 3186a5ae9f..c95582630a 100644
--- a/libcpu/arm/cortex-m0/context_gcc.S
+++ b/libcpu/arm/cortex-m0/context_gcc.S
@@ -181,7 +181,9 @@ rt_hw_context_switch_to:
NOP
MSR MSP, R0
- CPSIE I /* enable interrupts at processor level */
+ /* enable interrupts at processor level */
+ CPSIE F
+ CPSIE I
/* never reach here! */
diff --git a/libcpu/arm/cortex-m0/context_iar.S b/libcpu/arm/cortex-m0/context_iar.S
index 67ea808d8c..e7d680867a 100644
--- a/libcpu/arm/cortex-m0/context_iar.S
+++ b/libcpu/arm/cortex-m0/context_iar.S
@@ -188,6 +188,7 @@ rt_hw_context_switch_to:
MSR msp, r0
; enable interrupts at processor level
+ CPSIE F
CPSIE I
; never reach here!
diff --git a/libcpu/arm/cortex-m0/context_rvds.S b/libcpu/arm/cortex-m0/context_rvds.S
index bf68592e63..5411162e56 100644
--- a/libcpu/arm/cortex-m0/context_rvds.S
+++ b/libcpu/arm/cortex-m0/context_rvds.S
@@ -191,6 +191,7 @@ rt_hw_context_switch_to PROC
MSR msp, r0
; enable interrupts at processor level
+ CPSIE F
CPSIE I
; never reach here!
diff --git a/libcpu/arm/cortex-m3/context_gcc.S b/libcpu/arm/cortex-m3/context_gcc.S
index ca961bbd87..5181cb2712 100644
--- a/libcpu/arm/cortex-m3/context_gcc.S
+++ b/libcpu/arm/cortex-m3/context_gcc.S
@@ -162,7 +162,9 @@ rt_hw_context_switch_to:
NOP
MSR msp, r0
- CPSIE I /* enable interrupts at processor level */
+ /* enable interrupts at processor level */
+ CPSIE F
+ CPSIE I
/* never reach here! */
diff --git a/libcpu/arm/cortex-m3/context_iar.S b/libcpu/arm/cortex-m3/context_iar.S
index ad9fa0dd0f..95dee8062d 100644
--- a/libcpu/arm/cortex-m3/context_iar.S
+++ b/libcpu/arm/cortex-m3/context_iar.S
@@ -161,7 +161,9 @@ rt_hw_context_switch_to:
NOP
MSR msp, r0
- CPSIE I ; enable interrupts at processor level
+ ; enable interrupts at processor level
+ CPSIE F
+ CPSIE I
; never reach here!
diff --git a/libcpu/arm/cortex-m3/context_rvds.S b/libcpu/arm/cortex-m3/context_rvds.S
index ebfd5c8da8..a4191203be 100644
--- a/libcpu/arm/cortex-m3/context_rvds.S
+++ b/libcpu/arm/cortex-m3/context_rvds.S
@@ -168,6 +168,7 @@ rt_hw_context_switch_to PROC
MSR msp, r0
; enable interrupts at processor level
+ CPSIE F
CPSIE I
; never reach here!
diff --git a/libcpu/arm/cortex-m4/context_gcc.S b/libcpu/arm/cortex-m4/context_gcc.S
index 908a44f847..af6c9934d4 100644
--- a/libcpu/arm/cortex-m4/context_gcc.S
+++ b/libcpu/arm/cortex-m4/context_gcc.S
@@ -203,7 +203,9 @@ rt_hw_context_switch_to:
NOP
MSR msp, r0
- CPSIE I /* enable interrupts at processor level */
+ /* enable interrupts at processor level */
+ CPSIE F
+ CPSIE I
/* never reach here! */
diff --git a/libcpu/arm/cortex-m4/context_iar.S b/libcpu/arm/cortex-m4/context_iar.S
index 8761a97052..4cc9539112 100644
--- a/libcpu/arm/cortex-m4/context_iar.S
+++ b/libcpu/arm/cortex-m4/context_iar.S
@@ -207,7 +207,9 @@ rt_hw_context_switch_to:
NOP
MSR msp, r0
- CPSIE I ; enable interrupts at processor level
+ ; enable interrupts at processor level
+ CPSIE F
+ CPSIE I
; never reach here!
diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S
index fa7a1c90f8..ea894ed000 100644
--- a/libcpu/arm/cortex-m4/context_rvds.S
+++ b/libcpu/arm/cortex-m4/context_rvds.S
@@ -208,6 +208,7 @@ rt_hw_context_switch_to PROC
MSR msp, r0
; enable interrupts at processor level
+ CPSIE F
CPSIE I
; never reach here!
diff --git a/libcpu/arm/cortex-m7/context_gcc.S b/libcpu/arm/cortex-m7/context_gcc.S
index 908a44f847..af6c9934d4 100644
--- a/libcpu/arm/cortex-m7/context_gcc.S
+++ b/libcpu/arm/cortex-m7/context_gcc.S
@@ -203,7 +203,9 @@ rt_hw_context_switch_to:
NOP
MSR msp, r0
- CPSIE I /* enable interrupts at processor level */
+ /* enable interrupts at processor level */
+ CPSIE F
+ CPSIE I
/* never reach here! */
diff --git a/libcpu/arm/cortex-m7/context_iar.S b/libcpu/arm/cortex-m7/context_iar.S
index 8761a97052..4cc9539112 100644
--- a/libcpu/arm/cortex-m7/context_iar.S
+++ b/libcpu/arm/cortex-m7/context_iar.S
@@ -207,7 +207,9 @@ rt_hw_context_switch_to:
NOP
MSR msp, r0
- CPSIE I ; enable interrupts at processor level
+ ; enable interrupts at processor level
+ CPSIE F
+ CPSIE I
; never reach here!
diff --git a/libcpu/arm/cortex-m7/context_rvds.S b/libcpu/arm/cortex-m7/context_rvds.S
index 53a3756783..38410c8a3b 100644
--- a/libcpu/arm/cortex-m7/context_rvds.S
+++ b/libcpu/arm/cortex-m7/context_rvds.S
@@ -208,6 +208,7 @@ rt_hw_context_switch_to PROC
MSR msp, r0
; enable interrupts at processor level
+ CPSIE F
CPSIE I
; never reach here!