Further Cortex-M3 core related macros.

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

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index dbb20a1ec67aa6692d504f2fb83b3d9e57024887..9fd55b0b4b006eb94f3cc503c10017fe7a7ff991 100644 (file)
--- 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     fixme
+       #define CPU_STACK_GROWS_UPWARD 0
+       #define CPU_SP_ON_EMPTY_SLOT   0
+
 #elif CPU_PPC
 
        #define CPU_SAVED_REGS_CNT     1
@@ -214,15 +215,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 */
 
 /**