X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fframe.h;h=63d341cf1db379d159d3f4b0d99e162ece2a9e5f;hb=39e200e1f43474a96888f97e2271728c9605ccbe;hp=dbb20a1ec67aa6692d504f2fb83b3d9e57024887;hpb=32d1445272120a254d77ce8d1af1f527da7a2c17;p=bertos.git

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index dbb20a1e..63d341cf 100644
--- a/bertos/cpu/frame.h
+++ b/bertos/cpu/frame.h
@@ -52,19 +52,14 @@
 
 #if CPU_X86
 	#if CPU_X86_32
-
-		#define CPU_SAVED_REGS_CNT      4
-		#define CPU_STACK_GROWS_UPWARD  0
-		#define CPU_SP_ON_EMPTY_SLOT	0
-
+		#define CPU_SAVED_REGS_CNT      2
 	#elif CPU_X86_64
-
 		#define CPU_SAVED_REGS_CNT      8
-		#define CPU_STACK_GROWS_UPWARD  0
-		#define CPU_SP_ON_EMPTY_SLOT	0
 	#else
 		#error "unknown CPU"
 	#endif
+	#define CPU_STACK_GROWS_UPWARD  0
+	#define CPU_SP_ON_EMPTY_SLOT	0
 
 #elif CPU_ARM
 
@@ -72,6 +67,12 @@
 	#define CPU_STACK_GROWS_UPWARD 0
 	#define CPU_SP_ON_EMPTY_SLOT   0
 
+#elif CPU_CM3
+
+	#define CPU_SAVED_REGS_CNT     8
+	#define CPU_STACK_GROWS_UPWARD 0
+	#define CPU_SP_ON_EMPTY_SLOT   0
+
 #elif CPU_PPC
 
 	#define CPU_SAVED_REGS_CNT     1
@@ -90,6 +91,12 @@
 	#define CPU_STACK_GROWS_UPWARD  0
 	#define CPU_SP_ON_EMPTY_SLOT    1
 
+#elif CPU_MSP430
+
+	#define CPU_SAVED_REGS_CNT     16
+	#define CPU_STACK_GROWS_UPWARD  1
+	#define CPU_SP_ON_EMPTY_SLOT    0
+
 #else
 	#error No CPU_... defined.
 #endif
@@ -154,6 +161,40 @@
 			CPU_PUSH_WORD((sp), 0x100); \
 		} while (0);
 
+#elif CPU_CM3
+
+	#if CONFIG_KERN_PREEMPT
+		INLINE void cm3_preempt_switch_context(cpu_stack_t **new_sp, cpu_stack_t **old_sp)
+		{
+			register cpu_stack_t **__new_sp asm ("r0") = new_sp;
+			register cpu_stack_t **__old_sp asm ("r1") = old_sp;
+
+			asm volatile ("svc #0"
+				: : "r"(__new_sp), "r"(__old_sp) : "memory", "cc");
+		}
+		#define asm_switch_context cm3_preempt_switch_context
+
+		#define CPU_CREATE_NEW_STACK(stack) \
+			do { \
+				size_t i; \
+				/* Initialize process stack frame */ \
+				CPU_PUSH_WORD((stack), 0x01000000);		/* xPSR    */	\
+				CPU_PUSH_WORD((stack), (cpu_stack_t)proc_entry);	/* pc      */	\
+				CPU_PUSH_WORD((stack), 0);				/* lr      */	\
+				CPU_PUSH_WORD((stack), 0);				/* ip	   */	\
+				CPU_PUSH_WORD((stack), 0);				/* r3      */	\
+				CPU_PUSH_WORD((stack), 0);				/* r2      */	\
+				CPU_PUSH_WORD((stack), 0);				/* r1      */	\
+				CPU_PUSH_WORD((stack), 0);				/* r0      */	\
+				CPU_PUSH_WORD((stack), 0xfffffffd);		/* lr_exc  */	\
+				/* Push a clean set of CPU registers for asm_switch_context() */ \
+				for (i = 0; i < CPU_SAVED_REGS_CNT; i++) \
+					CPU_PUSH_WORD(stack, CPU_REG_INIT_VALUE(i)); \
+				CPU_PUSH_WORD(stack, IRQ_PRIO_DISABLED); \
+			} while (0)
+
+	#endif /* CONFIG_KERN_PREEMPT */
+
 #elif CPU_AVR
 	/*
 	 * On AVR, addresses are pushed into the stack as little-endian, while
@@ -199,7 +240,9 @@
 			CPU_PUSH_WORD((sp), 0);                  /* CR -> 4(SP) */ \
 		} while (0)
 
-#else
+#endif
+
+#ifndef CPU_PUSH_CALL_FRAME
 	#define CPU_PUSH_CALL_FRAME(sp, func) \
 		CPU_PUSH_WORD((sp), (cpu_stack_t)(func))
 #endif
@@ -214,15 +257,7 @@
  * in hosted environments such as emulators.
  */
 #ifndef CPU_IDLE
-	#if defined(ARCH_QT) && (ARCH & ARCH_QT)
-		/* This emulator hook should yield the CPU to the host.  */
-		EXTERN_C_BEGIN
-		void emul_idle(void);
-		EXTERN_C_END
-		#define CPU_IDLE emul_idle()
-	#else /* !ARCH_EMUL */
-		#define CPU_IDLE do { /* nothing */ } while (0)
-	#endif /* !ARCH_EMUL */
+	#define CPU_IDLE PAUSE
 #endif /* !CPU_IDLE */
 
 /**