Exclude buildrev.h from the codelite project file.

[bertos.git] / bertos / cpu / frame.h

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index fe22f8e3cba394ea81acd377432cfd30ad3078dd..1a80fa1da21fa2faf415391212835573a99608ea 100644 (file)
--- 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
 
@@ -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);