X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Firq.h;h=c234d99efca74a20151844fa4196a9595b81936c;hb=b64d74abecd41a9ea563eb6197ace94b78eee675;hp=bda8b49729a60cf2c2807dc74edadc1187705fbb;hpb=24e36c81e1486c98337bc178fba5d252c7f490a4;p=bertos.git

diff --git a/bertos/cpu/irq.h b/bertos/cpu/irq.h
index bda8b497..c234d99e 100644
--- a/bertos/cpu/irq.h
+++ b/bertos/cpu/irq.h
@@ -72,7 +72,7 @@
 	 * NOTE: 0 means that an interrupt is not affected by the global IRQ
 	 * priority settings.
 	 */
-	#define IRQ_PRIO		0x80
+	#define IRQ_PRIO		    0x80
 	#define IRQ_PRIO_MIN		0xf0
 	#define IRQ_PRIO_MAX		0
 	/*
@@ -89,66 +89,97 @@
 	#define IRQ_PRIO_DISABLED	0x40
 	#define IRQ_PRIO_ENABLED	0
 
-	#define IRQ_DISABLE						\
-	({								\
-		register cpu_flags_t reg = IRQ_PRIO_DISABLED;		\
-		asm volatile (						\
-			"msr basepri, %0"				\
-			: : "r"(reg) : "memory", "cc");			\
-	})
+	#ifdef __IAR_SYSTEMS_ICC__
+		INLINE cpu_flags_t CPU_READ_FLAGS(void)
+		{
+			return __get_BASEPRI();
+		}
 
-	#define IRQ_ENABLE						\
-	({								\
-		register cpu_flags_t reg = IRQ_PRIO_ENABLED;		\
-		asm volatile (						\
-			"msr basepri, %0"				\
-			: : "r"(reg) : "memory", "cc");			\
-	})
+		INLINE void CPU_WRITE_FLAGS(cpu_flags_t flags)
+		{
+			__set_BASEPRI(flags);
+		}
 
-	#define CPU_READ_FLAGS()					\
-	({								\
-		register cpu_flags_t reg;				\
-		asm volatile (						\
-			"mrs %0, basepri"				\
-			 : "=r"(reg) : : "memory", "cc");		\
-		reg;							\
-	})
+		extern uint32_t CPU_READ_IPSR(void);
+		extern bool irq_running(void);
 
-	#define IRQ_SAVE_DISABLE(x)					\
-	({								\
-		x = CPU_READ_FLAGS();					\
-		IRQ_DISABLE;						\
-	})
+		#define IRQ_DISABLE	CPU_WRITE_FLAGS(IRQ_PRIO_DISABLED)
 
-	#define IRQ_RESTORE(x)						\
-	({								\
-		asm volatile (						\
-			"msr basepri, %0"				\
-			: : "r"(x) : "memory", "cc");			\
-	})
+		#define IRQ_ENABLE	CPU_WRITE_FLAGS(IRQ_PRIO_ENABLED)
 
-	#define IRQ_ENABLED() (CPU_READ_FLAGS() == IRQ_PRIO_ENABLED)
+		#define IRQ_SAVE_DISABLE(x)					\
+		do {								\
+			x = CPU_READ_FLAGS();					\
+			IRQ_DISABLE;						\
+		} while (0)
 
-	INLINE bool irq_running(void)
-	{
-		register uint32_t ret;
+		#define IRQ_RESTORE(x)						\
+		do {								\
+			CPU_WRITE_FLAGS(x);					\
+		} while (0)
+	#else /* !__IAR_SYSTEMS_ICC__ */
+		#define IRQ_DISABLE						\
+		({								\
+			register cpu_flags_t reg = IRQ_PRIO_DISABLED;		\
+			asm volatile (						\
+				"msr basepri, %0"				\
+				: : "r"(reg) : "memory", "cc");			\
+		})
+
+		#define IRQ_ENABLE						\
+		({								\
+			register cpu_flags_t reg = IRQ_PRIO_ENABLED;		\
+			asm volatile (						\
+				"msr basepri, %0"				\
+				: : "r"(reg) : "memory", "cc");			\
+		})
+
+		#define CPU_READ_FLAGS()					\
+		({								\
+			register cpu_flags_t reg;				\
+			asm volatile (						\
+				"mrs %0, basepri"				\
+				 : "=r"(reg) : : "memory", "cc");		\
+			reg;							\
+		})
+
+		#define IRQ_SAVE_DISABLE(x)					\
+		({								\
+			x = CPU_READ_FLAGS();					\
+			IRQ_DISABLE;						\
+		})
+
+		#define IRQ_RESTORE(x)						\
+		({								\
+			asm volatile (						\
+				"msr basepri, %0"				\
+				: : "r"(x) : "memory", "cc");			\
+		})
+
+		INLINE bool irq_running(void)
+		{
+			register uint32_t ret;
+
+			/*
+			 * Check if the current stack pointer is the main stack or
+			 * process stack: we use the main stack only in Handler mode,
+			 * so this means we're running inside an ISR.
+			 */
+			asm volatile (
+				"mrs %0, msp\n\t"
+				"cmp sp, %0\n\t"
+				"ite ne\n\t"
+				"movne %0, #0\n\t"
+				"moveq %0, #1\n\t" : "=r"(ret) : : "cc");
+			return ret;
+		}
+	#endif /* __IAR_SYSTEMS_ICC__ */
+
+	#define IRQ_ENABLED() (CPU_READ_FLAGS() == IRQ_PRIO_ENABLED)
 
-		/*
-		 * Check if the current stack pointer is the main stack or
-		 * process stack: we use the main stack only in Handler mode,
-		 * so this means we're running inside an ISR.
-		 */
-		asm volatile (
-			"mrs %0, msp\n\t"
-			"cmp sp, %0\n\t"
-			"ite ne\n\t"
-			"movne %0, #0\n\t"
-			"moveq %0, #1\n\t" : "=r"(ret) : : "cc");
-		return ret;
-	}
 	#define IRQ_RUNNING() irq_running()
 
-	#if CONFIG_KERN_PREEMPT
+	#if (CONFIG_KERN && CONFIG_KERN_PREEMPT)
 
 		#define DECLARE_ISR_CONTEXT_SWITCH(func)		\
 		void func(void);					\
@@ -288,7 +319,9 @@
 
 		#define IRQ_ENABLED() ((CPU_READ_FLAGS() & 0xc0) != 0xc0)
 
-		#if CONFIG_KERN_PREEMPT
+		#define IRQ_RUNNING() ((CPU_READ_FLAGS() & 0x0F) == 0x02)
+
+		#if (CONFIG_KERN && CONFIG_KERN_PREEMPT)
 			EXTERN_C void asm_irq_switch_context(void);
 
 			/**
@@ -350,7 +383,7 @@
 					__isr_##func();				\
 					IRQ_EXIT();				\
 				}						\
-				static void __isr_##func(void)
+				static NOINLINE void __isr_##func(void)
 			/**
 			 * Interrupt service routine prototype: can be used for
 			 * forward declarations.
@@ -377,7 +410,7 @@
 		#endif /* CONFIG_KERN_PREEMPT */
 
 		#ifndef ISR_FUNC
-			#define ISR_FUNC  __attribute__((interrupt))
+			#define ISR_FUNC __attribute__((naked))
 		#endif
 		#ifndef DECLARE_ISR
 			#define DECLARE_ISR(func) \
@@ -394,9 +427,14 @@
 				static NOINLINE void __isr_##func(void);		\
 				void ISR_FUNC func(void)				\
 				{							\
+					asm volatile (					\
+						"sub	lr, lr, #4\n\t"			\
+						"stmfd	sp!, {r0-r3, ip, lr}\n\t");	\
 					__isr_##func();					\
+					asm volatile (					\
+						"ldmfd sp!, {r0-r3, ip, pc}^\n\t");	\
 				}							\
-				static void __isr_##func(void)
+				static NOINLINE void __isr_##func(void)
 		#endif
 		#ifndef DECLARE_ISR_CONTEXT_SWITCH
 			#define DECLARE_ISR_CONTEXT_SWITCH(func) DECLARE_ISR(func)
@@ -477,7 +515,7 @@
 		); \
 		(bool)(sreg & 0x80); \
 	})
-	#if CONFIG_KERN_PREEMPT
+	#if (CONFIG_KERN && CONFIG_KERN_PREEMPT)
 		#define DECLARE_ISR_CONTEXT_SWITCH(vect)		\
 			INLINE void __isr_##vect(void);			\
 			ISR(vect)					\
@@ -522,6 +560,13 @@
 		#define ISR_PROTO_CONTEXT_SWITCH(vect) ISR(vect)
 	#endif
 
+#elif CPU_MSP430
+
+	/* Get the compiler defined macros */
+	#include <signal.h>
+	#define IRQ_DISABLE         dint()
+	#define IRQ_ENABLE          eint()
+
 #else
 	#error No CPU_... defined.
 #endif
@@ -551,7 +596,7 @@
 
 
 #ifndef IRQ_PREEMPT_HANDLER
-	#if CONFIG_KERN_PREEMPT
+	#if (CONFIG_KERN && CONFIG_KERN_PREEMPT)
 		/**
 		 * Handle preemptive context switch inside timer IRQ.
 		 */