/*#*
*#* $Log$
+ *#* Revision 1.13 2006/03/27 04:49:23 bernie
+ *#* CPU_IDLE(): Fix for new emulator.
+ *#*
+ *#* Revision 1.12 2006/03/21 10:52:39 bernie
+ *#* Update ARM support.
+ *#*
+ *#* Revision 1.11 2006/03/20 17:49:00 bernie
+ *#* Spacing fix.
+ *#*
+ *#* Revision 1.10 2006/02/24 01:17:30 bernie
+ *#* CPU_SAVED_REGS_CNT: Declare for x86/x86_64.
+ *#*
*#* Revision 1.9 2006/02/23 09:08:43 bernie
*#* Add note for a frequently reported non-bug.
*#*
#define DEVLIB_CPU_H
#include <cfg/compiler.h> /* for uintXX_t */
+#include <cfg/arch_config.h> /* ARCH_EMUL */
/*!
#define CPU_REGS_CNT 7
+ #define CPU_SAVED_REGS_CNT 7
#define CPU_STACK_GROWS_UPWARD 0
#define CPU_SP_ON_EMPTY_SLOT 0
#define CPU_BYTE_ORDER CPU_LITTLE_ENDIAN
#elif CPU_ARM
+ typedef uint32_t cpuflags_t;
+ typedef uint32_t cpustack_t;
+
+ /* Register counts include SREG too */
+ #define CPU_REG_BITS 32
+ #define CPU_REGS_CNT 16
+ #define CPU_SAVED_REGS_CNT FIXME
+ #define CPU_STACK_GROWS_UPWARD 0 //FIXME
+ #define CPU_SP_ON_EMPTY_SLOT 0 //FIXME
+ #define CPU_BYTE_ORDER (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
+ #define CPU_HARVARD 0
+
#ifdef __IAR_SYSTEMS_ICC__
#include <inarm.h>
+ #if __CPU_MODE__ == 1 /* Thumb */
+ /* Use stubs */
+ extern cpuflags_t get_CPSR(void);
+ extern void set_CPSR(cpuflags_t flags);
+ #else
+ #define get_CPSR __get_CPSR
+ #define set_CPSR __set_CPSR
+ #endif
+
#define NOP __no_operation()
#define IRQ_DISABLE __disable_interrupt()
#define IRQ_ENABLE __enable_interrupt()
#define IRQ_SAVE_DISABLE(x) \
do { \
- (x) = __get_CPSR(); \
+ (x) = get_CPSR(); \
__disable_interrupt(); \
} while (0)
#define IRQ_RESTORE(x) \
do { \
- __set_CPSR(x); \
+ set_CPSR(x); \
} while (0)
#define IRQ_GETSTATE() \
- ((bool)(__get_CPSR() & 0xb0))
+ ((bool)(get_CPSR() & 0xb0))
- #else /* __IAR_SYSTEMS_ICC__ */
+ #define BREAKPOINT /* asm("bkpt 0") DOES NOT WORK */
+
+ #else /* !__IAR_SYSTEMS_ICC__ */
#warning "IRQ_ macros need testing!"
#endif /* __IAR_SYSTEMS_ICC_ */
- typedef uint32_t cpuflags_t;
- typedef uint32_t cpustack_t;
-
- /* Register counts include SREG too */
- #define CPU_REG_BITS 32
- #define CPU_REGS_CNT 16
- #define CPU_SAVED_REGS_CNT FIXME
- #define CPU_STACK_GROWS_UPWARD 0 //FIXME
- #define CPU_SP_ON_EMPTY_SLOT 0 //FIXME
- #define CPU_BYTE_ORDER (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
- #define CPU_HARVARD 0
-
#elif CPU_PPC
#define NOP asm volatile ("nop" ::)
#else
#define CPU_PUSH_CALL_CONTEXT(sp, func) \
- CPU_PUSH_WORD((sp), (func))
+ CPU_PUSH_WORD((sp), (cpustack_t)(func))
#endif
#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
/* This emulator hook should yield the CPU to the host. */
EXTERN_C_BEGIN
- void SchedulerIdle(void);
+ void emul_idle(void);
EXTERN_C_END
- #define CPU_IDLE SchedulerIdle()
+ #define CPU_IDLE emul_idle()
#else /* !ARCH_EMUL */
#define CPU_IDLE do { /* nothing */ } while (0)
#endif /* !ARCH_EMUL */
#endif /* !CPU_IDLE */
-/* OBSOLETE */
-#define SCHEDULER_IDLE CPU_IDLE
-
#endif /* DEVLIB_CPU_H */