X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fframe.h;h=c96351566f156c71d93de7fe50c803403ebc2966;hb=202e173ecdce67ba47b646308ae713b5801c56da;hp=a17c8efa72ce17c0b7c84cc3bb778847b13b3e71;hpb=2ce39c1d757d9214774af12185522c72727bcdf4;p=bertos.git

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index a17c8efa..c9635156 100644
--- a/bertos/cpu/frame.h
+++ b/bertos/cpu/frame.h
@@ -80,7 +80,7 @@
 
 	#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 +145,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
@@ -160,7 +160,7 @@
 	 * RTS discards SR while returning (it does not restore it). So we push
 	 * 0 to fake the same context.
 	 */
-	#define CPU_PUSH_CALL_FRMAE(sp, func) \
+	#define CPU_PUSH_CALL_FRAME(sp, func) \
 		do { \
 			CPU_PUSH_WORD((sp), (func)); \
 			CPU_PUSH_WORD((sp), 0x100); \
@@ -207,13 +207,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 +226,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);