X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fframe.h;h=1a80fa1da21fa2faf415391212835573a99608ea;hb=5e75e84ec8e806f7ded1207b395be2fb09a60a35;hp=2a9680a2a7e64231ca89ae4c35645ddc652ec52a;hpb=e62ca0b357f09804d7d894949df44224c9d74bb7;p=bertos.git

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index 2a9680a2..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,7 +74,14 @@
 	 * - 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
 
@@ -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);