/*
* $Log$
- * Revision 1.8 2004/07/30 14:15:53 rasky
- * Nuovo supporto unificato per detect della CPU
+ * Revision 1.14 2004/08/24 13:29:28 bernie
+ * Trim CVS log; Rename header guards.
*
- * Revision 1.7 2004/07/20 23:26:48 bernie
- * Fix two errors introduced by previous commit.
+ * 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.6 2004/07/20 23:12:16 bernie
- * Rationalize and document SCHEDULER_IDLE.
+ * Revision 1.11 2004/08/05 17:39:56 bernie
+ * Fix a Doxygen tag.
*
- * Revision 1.5 2004/07/20 16:20:35 bernie
- * Move byte-order macros to mware/byteorder.h; Add missing author names.
- *
- * Revision 1.4 2004/07/20 16:06:04 bernie
- * Add macros to handle endianess issues.
- *
- * Revision 1.3 2004/07/18 21:49:51 bernie
- * Fixes for GCC 3.5.
- *
- * Revision 1.2 2004/06/03 11:27:09 bernie
- * Add dual-license information.
- *
- * Revision 1.1 2004/05/23 17:48:35 bernie
- * Add top-level files.
+ * 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
*/
-#ifndef CPU_H
-#define CPU_H
-
-#include "compiler.h"
+#ifndef DEVLIB_CPU_H
+#define DEVLIB_CPU_H
+#include "compiler.h" /* for uintXX_t, PP_CAT3(), PP_STRINGIZE() */
-//! 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
typedef uint16_t cpuflags_t; // FIXME
typedef unsigned int cpustack_t;
+ #define CPU_REG_BITS 16
#define CPU_REGS_CNT 16
#define CPU_STACK_GROWS_UPWARD 0
#define CPU_SP_ON_EMPTY_SLOT 0
typedef uint32_t cpuflags_t; // FIXME
typedef uint32_t cpustack_t;
+ #define CPU_REG_BITS 32
#define CPU_REGS_CNT 7
#define CPU_STACK_GROWS_UPWARD 0
#define CPU_SP_ON_EMPTY_SLOT 0
#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_REG_BITS 16
#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__)
+ /* Memory is word-addessed in the DSP56K */
+ #define BITSP_PER_CHAR 16
+ #define SIZEOF_SHORT 1
+ #define SIZEOF_INT 1
+ #define SIZEOF_LONG 2
+ #define SIZEOF_PTR 1
+
+#elif CPU_AVR
#define NOP asm volatile ("nop" ::)
#define DISABLE_INTS asm volatile ("cli" ::)
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_REG_BITS 8
+ #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_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
#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).
/*!
- * \name SCHEDULER_IDLE
+ * \def SIZEOF_CHAR SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_PTR
+ * \def BITS_PER_CHAR BITS_PER_SHORT BITS_PER_INT BITS_PER_LONG BITS_PER_PTR
+ *
+ * \brief Default type sizes
+ *
+ * These defaults are reasonable for most 16/32bit machines.
+ * Some of these macros may be overridden by CPU-specific code above.
+ *
+ * ANSI C specifies that the following equations must be true:
+ * \code
+ * sizeof(char) <= sizeof(short) <= sizeof(int) <= sizeof(long)
+ * sizeof(float) <= sizeof(double)
+ * BITS_PER_CHAR >= 8
+ * BITS_PER_SHORT >= 8
+ * BITS_PER_INT >= 16
+ * BITS_PER_LONG >= 32
+ * \end code
+ * \{
+ */
+#ifndef SIZEOF_CHAR
+#define SIZEOF_CHAR 1
+#endif
+
+#ifndef SIZEOF_SHORT
+#define SIZEOF_SHORT 2
+#endif
+
+#ifndef SIZEOF_INT
+#if CPU_REG_BITS < 32
+ #define SIZEOF_INT 2
+#else
+ #define SIZEOF_INT 4
+#endif
+#endif /* !SIZEOF_INT */
+
+#ifndef SIZEOF_LONG
+#define SIZEOF_LONG 4
+#endif
+
+#ifndef SIZEOF_PTR
+#define SIZEOF_PTR SIZEOF_INT
+#endif
+
+#ifndef BITS_PER_CHAR
+#define BITS_PER_CHAR (SIZEOF_CHAR * 8)
+#endif
+
+#ifndef BITS_PER_SHORT
+#define BITS_PER_SHORT (SIZEOF_SHORT * BITS_PER_CHAR)
+#endif
+
+#ifndef BITS_PER_INT
+#define BITS_PER_INT (SIZEOF_INT * BITS_PER_CHAR)
+#endif
+
+#ifndef BITS_PER_LONG
+#define BITS_PER_LONG (SIZEOF_LONG * BITS_PER_CHAR)
+#endif
+
+#ifndef BITS_PER_PTR
+#define BITS_PER_PTR (SIZEOF_PTR * BITS_PER_CHAR)
+#endif
+/*\}*/
+
+
+/*!
+ * \def SCHEDULER_IDLE
*
* \brief Invoked by the scheduler to stop the CPU when idle.
*
*/
#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
+ #define SCHEDULER_IDLE SchedulerIdle()
#else /* !ARCH_EMUL */
- #define SCHEDULER_IDLE /* nothing */
+ #define SCHEDULER_IDLE do { /* nothing */ } while (0)
#endif /* !ARCH_EMUL */
#endif /* !SCHEDULER_IDLE */
-#endif /* CPU_H */
+#endif /* DEVLIB_CPU_H */
projects / bertos.git / blobdiff