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

diff --git a/cpu.h b/cpu.h
index f373b7b1..ef3e1516 100755
--- a/cpu.h
+++ b/cpu.h
@@ -17,6 +17,15 @@
 
 /*
  * $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
@@ -52,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
@@ -98,9 +104,9 @@
 	#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;
@@ -136,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
 
 
@@ -217,7 +239,7 @@
 
 
 /*!
- * \name SCHEDULER_IDLE
+ * \def SCHEDULER_IDLE
  *
  * \brief Invoked by the scheduler to stop the CPU when idle.
  *
@@ -227,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