DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.

[bertos.git] / cpu.h

diff --git a/cpu.h b/cpu.h
index df177e34876a12ef03a3f290f2284281c85441f4..a8a0766ae959e9edb319c3a86d33577d910ed27b 100755 (executable)
--- a/cpu.h
+++ b/cpu.h
@@ -17,6 +17,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.25  2004/12/08 08:31:02  bernie
+ *#* CPU_HARVARD: Define to 1 for AVR and DSP56K.
+ *#*
+ *#* Revision 1.24  2004/12/08 08:04:13  bernie
+ *#* Doxygen fixes.
+ *#*
+ *#* Revision 1.23  2004/11/16 22:41:58  bernie
+ *#* Support 64bit CPUs.
+ *#*
+ *#* Revision 1.22  2004/11/16 21:57:59  bernie
+ *#* CPU_IDLE: Rename from SCHEDULER_IDLE.
+ *#*
  *#* Revision 1.21  2004/11/16 21:34:25  bernie
  *#* Commonize obsolete names for IRQ macros; Doxygen fixes.
  *#*
@@ -125,6 +137,7 @@
        #define CPU_STACK_GROWS_UPWARD  1
        #define CPU_SP_ON_EMPTY_SLOT    0
        #define CPU_BYTE_ORDER          CPU_BIG_ENDIAN
+       #define CPU_HARVARD             1
 
        /* Memory is word-addessed in the DSP56K */
        #define CPU_BITS_PER_CHAR  16
@@ -175,6 +188,7 @@
        #define CPU_STACK_GROWS_UPWARD  0
        #define CPU_SP_ON_EMPTY_SLOT    1
        #define CPU_BYTE_ORDER          CPU_LITTLE_ENDIAN
+       #define CPU_HARVARD             1
 
        /*!
         * Initialization value for registers in stack frame.
@@ -287,11 +301,7 @@
 
 
 /*!
- * \name Default type sizes
- *
- * \def SIZEOF_CHAR SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_PTR
- * \def CPU_BITS_PER_CHAR CPU_BITS_PER_SHORT CPU_BITS_PER_INT
- * \def CPU_BITS_PER_LONG CPU_BITS_PER_PTR
+ * \name Default type sizes.
  *
  * These defaults are reasonable for most 16/32bit machines.
  * Some of these macros may be overridden by CPU-specific code above.
@@ -324,7 +334,11 @@
 #endif /* !SIZEOF_INT */
 
 #ifndef SIZEOF_LONG
-#define SIZEOF_LONG  4
+#if CPU_REG_BITS > 32
+       #define SIZEOF_LONG  8
+#else
+       #define SIZEOF_LONG  4
+#endif
 #endif
 
 #ifndef SIZEOF_PTR
@@ -368,16 +382,19 @@ STATIC_ASSERT(sizeof(int) == SIZEOF_INT);
  * profile system load with an external strobe, or to save CPU cycles
  * in hosted environments such as emulators.
  */
-#ifndef SCHEDULER_IDLE
+#ifndef CPU_IDLE
        #if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
                /* This emulator hook should yield the CPU to the host.  */
                EXTERN_C_BEGIN
                void SchedulerIdle(void);
                EXTERN_C_END
-               #define SCHEDULER_IDLE SchedulerIdle()
+               #define CPU_IDLE SchedulerIdle()
        #else /* !ARCH_EMUL */
-               #define SCHEDULER_IDLE do { /* nothing */ } while (0)
+               #define CPU_IDLE do { /* nothing */ } while (0)
        #endif /* !ARCH_EMUL */
-#endif /* !SCHEDULER_IDLE */
+#endif /* !CPU_IDLE */
+
+/* OBSOLETE */
+#define SCHEDULER_IDLE CPU_IDLE
 
 #endif /* DEVLIB_CPU_H */