X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cpu.h;h=ef3e15166930b1e9e6ac66a10625ddfa29fb14ed;hb=4560fc1a4dc7c27243d7f8afa9a1291e646c2f8b;hp=c8a242f22645931af2252572d9ed3d8027a21d46;hpb=d8c41d44af59c3b699736024da1ccc11efa52384;p=bertos.git

diff --git a/cpu.h b/cpu.h
index c8a242f2..ef3e1516 100755
--- a/cpu.h
+++ b/cpu.h
@@ -17,6 +17,19 @@
 
 /*
  * $Log$
+ * Revision 1.12  2004/08/14 19:37:57  rasky
+ * Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *
+ * Revision 1.11  2004/08/05 17:39:56  bernie
+ * Fix a Doxygen tag.
+ *
+ * Revision 1.10  2004/08/02 20:20:29  aleph
+ * Merge from project_ks
+ *
+ * Revision 1.9  2004/07/30 14:24:16  rasky
+ * Task switching con salvataggio perfetto stato di interrupt (SR)
+ * Kernel monitor per dump informazioni su stack dei processi
+ *
  * Revision 1.8  2004/07/30 14:15:53  rasky
  * Nuovo supporto unificato per detect della CPU
  *
@@ -48,15 +61,12 @@
 #include "compiler.h"
 
 
-//! Initialization value for registers in stack frame
-#define CPU_REG_INIT_VALUE(reg)     0
-
-// Macros for determining CPU endianess
+// Macros for determining CPU endianness
 #define CPU_BIG_ENDIAN    0x1234
 #define CPU_LITTLE_ENDIAN 0x3412
 
 // Macros to include cpu-specific version of the headers
-#define CPU_HEADER(module)          PP_STRINGIZE(PP_CAT4(module, _, CPU_ID, .h))
+#define CPU_HEADER(module)          PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).h)
 
 
 #if CPU_I196
@@ -94,34 +104,20 @@
 	#define ENABLE_INTS             do { asm(bfclr #0x0200,SR); asm(nop); } while (0)
 
 	#define DISABLE_IRQSAVE(x)  \
-		do { asm(move SR,x); asm(bfset #0x0200,SR); } while (0)
+		do { (void)x; asm(move SR,x); asm(bfset #0x0200,SR); } while (0)
 	#define ENABLE_IRQRESTORE(x)  \
-		do { asm(move x,SR); } while (0)
+		do { (void)x; asm(move x,SR); } while (0)
 
 	typedef uint16_t cpuflags_t;
 	typedef unsigned int cpustack_t;
 
 	#define CPU_REGS_CNT            FIXME
-	#define CPU_SAVED_REGS_CNT      28
+	#define CPU_SAVED_REGS_CNT      8
 	#define CPU_STACK_GROWS_UPWARD  1
 	#define CPU_SP_ON_EMPTY_SLOT	0
 	#define CPU_BYTE_ORDER          CPU_BIG_ENDIAN
 
-	#undef CPU_REG_INIT_VALUE
-	INLINE uint16_t CPU_REG_INIT_VALUE(int reg)
-	{
-		if (reg == 14)
-		{
-			uint16_t omr_img;
-			asm(move OMR, omr_img);
-			return omr_img & (BV(3)/*EX*/ | BV(1)/*MB*/ | BV(0)/*MA*/);
-		}
-		else if (reg == 16)/*M01*/
-			return 0xFFFF;
-		return 0;
-	}
-
-#elif defined (__AVR__)
+#elif CPU_AVR
 
 	#define NOP                     asm volatile ("nop" ::)
 	#define DISABLE_INTS            asm volatile ("cli" ::)
@@ -146,11 +142,27 @@
 	typedef uint8_t cpuflags_t;
 	typedef uint8_t cpustack_t;
 
-	#define CPU_REGS_CNT            32
-	#define CPU_SAVED_REGS_CNT      18
+	/* Register counts include SREG too */
+	#define CPU_REGS_CNT            33
+	#define CPU_SAVED_REGS_CNT      19
 	#define CPU_STACK_GROWS_UPWARD  0
 	#define CPU_SP_ON_EMPTY_SLOT	1
 	#define CPU_BYTE_ORDER          CPU_LITTLE_ENDIAN
+
+	/*!
+	 * Initialization value for registers in stack frame.
+	 * The register index is not directly corrispondent to CPU
+	 * register numbers. Index 0 is the SREG register: the initial
+	 * value is all 0 but the interrupt bit (bit 7).
+	 */
+	#define CPU_REG_INIT_VALUE(reg) (reg == 0 ? 0x80 : 0)
+
+#endif
+
+
+//! Default for macro not defined in the right arch section
+#ifndef CPU_REG_INIT_VALUE
+	#define CPU_REG_INIT_VALUE(reg)     0
 #endif
 
 
@@ -205,10 +217,10 @@
 	#define CPU_PUSH_CALL_CONTEXT(sp, func) \
 		do { \
 			CPU_PUSH_WORD((sp), (func)); \
-			CPU_PUSH_WORD((sp), 0); \
+			CPU_PUSH_WORD((sp), 0x100); \
 		} while (0);
 
-#elif defined (__AVR__)
+#elif CPU_AVR
 	/* In AVR, the addresses are pushed into the stack as little-endian, while
 	 * memory accesses are big-endian (actually, it's a 8-bit CPU, so there is
 	 * no natural endianess).
@@ -227,7 +239,7 @@
 
 
 /*!
- * \name SCHEDULER_IDLE
+ * \def SCHEDULER_IDLE
  *
  * \brief Invoked by the scheduler to stop the CPU when idle.
  *
@@ -237,7 +249,7 @@
  */
 #ifndef SCHEDULER_IDLE
 	#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
-		/* This emulator hook should yeld the CPU to the host.  */
+		/* This emulator hook should yield the CPU to the host.  */
 		EXTERN_C_BEGIN
 		void SchedulerIdle(void);
 		EXTERN_C_END