X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcpu.h;h=51b142d6157bfd04e0573bb4f1a789e4f76bd9a3;hb=ff16c7e3fd2184d58a87d5fe1576cd246ecb719e;hp=ab7617d285016790b7844e1c9d6bd87b188e7d61;hpb=4e7233c06bec20fb90fd3b42dddbee78b5947ba3;p=bertos.git

diff --git a/cfg/cpu.h b/cfg/cpu.h
index ab7617d2..51b142d6 100755
--- a/cfg/cpu.h
+++ b/cfg/cpu.h
@@ -17,6 +17,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2005/11/27 03:04:38  bernie
+ *#* Add POSIX emulation for IRQ_* macros; Add Qt support.
+ *#*
+ *#* Revision 1.6  2005/07/19 07:26:49  bernie
+ *#* Add missing #endif.
+ *#*
+ *#* Revision 1.5  2005/06/27 21:24:17  bernie
+ *#* CPU_CSOURCE(): New macro.
+ *#*
+ *#* Revision 1.4  2005/06/14 06:15:10  bernie
+ *#* Add X86_64 support.
+ *#*
  *#* Revision 1.3  2005/04/12 04:06:17  bernie
  *#* Catch missing CPU earlier.
  *#*
@@ -61,6 +73,9 @@
 /*! Macro to include cpu-specific versions of the headers. */
 #define CPU_HEADER(module)          PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).h)
 
+/*! Macro to include cpu-specific versions of implementation files. */
+#define CPU_CSOURCE(module)         PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).c)
+
 
 #if CPU_I196
 
@@ -81,23 +96,40 @@
 #elif CPU_X86
 
 	#define NOP                     asm volatile ("nop")
-	#define IRQ_DISABLE             /* nothing */
-	#define IRQ_ENABLE              /* nothing */
-	#define IRQ_SAVE_DISABLE(x)     /* nothing */
-	#define IRQ_RESTORE(x)          /* nothing */
 
-	typedef uint32_t cpuflags_t; // FIXME
-	typedef uint32_t cpustack_t;
+	/* Get IRQ_* definitions from the hosting environment. */
+	#include <cfg/os.h>
+	#if OS_EMBEDDED
+		#define IRQ_DISABLE             FIXME
+		#define IRQ_ENABLE              FIXME
+		#define IRQ_SAVE_DISABLE(x)     FIXME
+		#define IRQ_RESTORE(x)          FIXME
+		typedef uint32_t cpuflags_t; // FIXME
+	#endif /* OS_EMBEDDED */
+
 
-	#define CPU_REG_BITS            32
 	#define CPU_REGS_CNT            7
 	#define CPU_STACK_GROWS_UPWARD  0
 	#define CPU_SP_ON_EMPTY_SLOT	0
 	#define CPU_BYTE_ORDER          CPU_LITTLE_ENDIAN
 	#define CPU_HARVARD		0
 
+	#if CPU_X86_64
+		typedef uint64_t cpustack_t;
+		#define CPU_REG_BITS    64
+
+		#ifdef __WIN64__
+			/* WIN64 is an IL32-P64 weirdo. */
+			#define SIZEOF_LONG  4
+		#endif
+	#else
+		typedef uint32_t cpustack_t;
+		#define CPU_REG_BITS    32
+	#endif
+
 #elif CPU_PPC
 	#define NOP                 asm volatile ("nop" ::)
+
 	#define IRQ_DISABLE         FIXME
 	#define IRQ_ENABLE          FIXME
 	#define IRQ_SAVE_DISABLE(x) FIXME
@@ -143,8 +175,6 @@
 	}
 	#define IRQ_GETSTATE() irq_getstate()
 
-
-
 	typedef uint16_t cpuflags_t;
 	typedef unsigned int cpustack_t;
 
@@ -355,7 +385,13 @@
 #endif
 
 #ifndef SIZEOF_PTR
-#define SIZEOF_PTR   SIZEOF_INT
+#if CPU_REG_BITS < 32
+	#define SIZEOF_PTR   2
+#elif CPU_REG_BITS == 32
+	#define SIZEOF_PTR   4
+#else /* CPU_REG_BITS > 32 */
+	#define SIZEOF_PTR   8
+#endif
 #endif
 
 #ifndef CPU_BITS_PER_CHAR
@@ -389,7 +425,17 @@ STATIC_ASSERT(sizeof(char) == SIZEOF_CHAR);
 STATIC_ASSERT(sizeof(short) == SIZEOF_SHORT);
 STATIC_ASSERT(sizeof(long) == SIZEOF_LONG);
 STATIC_ASSERT(sizeof(int) == SIZEOF_INT);
-
+STATIC_ASSERT(sizeof(void *) == SIZEOF_PTR);
+STATIC_ASSERT(sizeof(int8_t) * CPU_BITS_PER_CHAR == 8);
+STATIC_ASSERT(sizeof(uint8_t) * CPU_BITS_PER_CHAR == 8);
+STATIC_ASSERT(sizeof(int16_t) * CPU_BITS_PER_CHAR == 16);
+STATIC_ASSERT(sizeof(uint16_t) * CPU_BITS_PER_CHAR == 16);
+STATIC_ASSERT(sizeof(int32_t) * CPU_BITS_PER_CHAR == 32);
+STATIC_ASSERT(sizeof(uint32_t) * CPU_BITS_PER_CHAR == 32);
+#ifdef __HAS_INT64_T__
+STATIC_ASSERT(sizeof(int64_t) * CPU_BITS_PER_CHAR == 64);
+STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
+#endif
 
 /*!
  * \def CPU_IDLE