X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fframe.h;h=1a80fa1da21fa2faf415391212835573a99608ea;hb=019ad4b6e3fca2cbe5e739c94385aadd8dd16bfa;hp=0ecfaa49297882abb228c93645512a5f233cf1cd;hpb=c5b08a9d703fc91f41d323011f77cf36eb27eeb2;p=bertos.git

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index 0ecfaa49..1a80fa1d 100644
--- a/bertos/cpu/frame.h
+++ b/bertos/cpu/frame.h
@@ -58,7 +58,7 @@
 
 #elif CPU_ARM
 
-	#define CPU_SAVED_REGS_CNT     9
+	#define CPU_SAVED_REGS_CNT     10
 	#define CPU_STACK_GROWS_UPWARD 0
 	#define CPU_SP_ON_EMPTY_SLOT   0
 
@@ -74,13 +74,20 @@
 	 * - ARM state.
 	 * - CPU in Supervisor Mode (SVC).
 	 */
-	#define CPU_REG_INIT_VALUE(reg) (reg == (CPU_SAVED_REGS_CNT - 1) ? 0x13 : 0)
+	#define CPU_REG_INIT_VALUE(reg) \
+	({  int a = 0; \
+		if(reg == 0) \
+			a = (int)proc_exit; \
+		else if(reg == (CPU_SAVED_REGS_CNT - 1)) \
+			a = 0x13; \
+		a; \
+	})
 
 #elif CPU_PPC
 
 	#define CPU_SAVED_REGS_CNT     1
 	#define CPU_STACK_GROWS_UPWARD 0
-	#define CPU_SP_ON_EMPTY_SLOT   0
+	#define CPU_SP_ON_EMPTY_SLOT   1
 
 #elif CPU_DSP56K
 
@@ -145,7 +152,7 @@
 	#if !CPU_SP_ON_EMPTY_SLOT
 		/* DSP56K and other weirdos */
 		#define CPU_PUSH_WORD(sp, data) \
-			do { *++(sp) = (cpustack_t)(data); } while (0)
+			do { *++(sp) = (cpu_stack_t)(data); } while (0)
 		#define CPU_POP_WORD(sp) \
 			(*(sp)--)
 	#else
@@ -207,13 +214,13 @@
 
 	#define CPU_PUSH_CALL_FRAME(sp, func) \
 		do { \
-			CPU_PUSH_WORD((sp), (cpustack_t)(func)); /* LR -> 8(SP) */ \
+			CPU_PUSH_WORD((sp), (cpu_stack_t)(func)); /* LR -> 8(SP) */ \
 			CPU_PUSH_WORD((sp), 0);                  /* CR -> 4(SP) */ \
 		} while (0)
 
 #else
 	#define CPU_PUSH_CALL_FRAME(sp, func) \
-		CPU_PUSH_WORD((sp), (cpustack_t)(func))
+		CPU_PUSH_WORD((sp), (cpu_stack_t)(func))
 #endif
 
 /**
@@ -226,7 +233,7 @@
  * in hosted environments such as emulators.
  */
 #ifndef CPU_IDLE
-	#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
+	#if defined(ARCH_QT) && (ARCH & ARCH_QT)
 		/* This emulator hook should yield the CPU to the host.  */
 		EXTERN_C_BEGIN
 		void emul_idle(void);