summaryrefslogtreecommitdiffstats
path: root/nuttx/arch/arm/include
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2010-11-20 00:39:29 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2010-11-20 00:39:29 +0000
commitd15690d31744ac52d68625472999e3474b540d8f (patch)
treeb827da1499744d503114c5f538007f93234903f9 /nuttx/arch/arm/include
parent15e3ef7a3375b7b3efa8da7f0b9e27c180f08fde (diff)
Fix Cortex-M3 nested interrupt hard fault
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3119 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/include')
-rw-r--r--nuttx/arch/arm/include/cortexm3/irq.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/nuttx/arch/arm/include/cortexm3/irq.h b/nuttx/arch/arm/include/cortexm3/irq.h
index de38585c39..3f731385b4 100644
--- a/nuttx/arch/arm/include/cortexm3/irq.h
+++ b/nuttx/arch/arm/include/cortexm3/irq.h
@@ -244,7 +244,7 @@ static inline void setbasepri(uint32_t basepri)
: "memory");
}
-/* Get IPSR */
+/* Get/set IPSR */
static inline uint32_t getipsr(void)
{
@@ -258,6 +258,16 @@ static inline uint32_t getipsr(void)
return ipsr;
}
+static inline void setipsr(uint32_t ipsr)
+{
+ __asm__ __volatile__
+ (
+ "\tmsr ipsr, %0\n"
+ :
+ : "r" (ipsr)
+ : "memory");
+}
+
/* SVC system call */
static inline void svcall(uint32_t cmd, uint32_t arg)