X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcpu.h;h=9b9d31430fea3bc9dbe30d805a4c3493334f65b8;hb=4d6d308ca900a435e80acf51b71e3ea7eccd8d5c;hp=ab7617d285016790b7844e1c9d6bd87b188e7d61;hpb=4e7233c06bec20fb90fd3b42dddbee78b5947ba3;p=bertos.git diff --git a/cfg/cpu.h b/cfg/cpu.h index ab7617d2..9b9d3143 100755 --- a/cfg/cpu.h +++ b/cfg/cpu.h @@ -17,6 +17,36 @@ /*#* *#* $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. + *#* + *#* Revision 1.8 2006/02/10 12:37:45 bernie + *#* Add support for ARM on IAR. + *#* + *#* 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. *#* @@ -48,6 +78,7 @@ #define DEVLIB_CPU_H #include /* for uintXX_t */ +#include /* ARCH_EMUL */ /*! @@ -55,12 +86,15 @@ * \{ */ #define CPU_BIG_ENDIAN 0x1234 -#define CPU_LITTLE_ENDIAN 0x3412 +#define CPU_LITTLE_ENDIAN 0x3412 /* Look twice, pal. This is not a bug. */ /*\}*/ /*! 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 +115,153 @@ #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 + #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_SAVED_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_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 + + #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(); \ + __disable_interrupt(); \ + } while (0) + + #define IRQ_RESTORE(x) \ + do { \ + set_CPSR(x); \ + } while (0) + + #define IRQ_GETSTATE() \ + ((bool)(get_CPSR() & 0xb0)) + + #define BREAKPOINT /* asm("bkpt 0") DOES NOT WORK */ + + #else /* !__IAR_SYSTEMS_ICC__ */ + + #warning "IRQ_ macros need testing!" + + #define NOP asm volatile ("mov r0,r0" ::) + + #define IRQ_DISABLE \ + do { \ + asm volatile ( \ + "mrs r0, cpsr\n\t" \ + "orr r0, r0, #0xb0\n\t" \ + "msr cpsr, r0" \ + :: \ + ); \ + } while (0) + + #define IRQ_ENABLE \ + do { \ + asm volatile ( \ + "mrs r0, cpsr\n\t" \ + "bic r0, r0, #0xb0\n\t" \ + "msr cpsr, r0" \ + :: \ + ); \ + } while (0) + + #define IRQ_SAVE_DISABLE(x) \ + do { \ + asm volatile ( \ + "mrs r0, cpsr\n\t" \ + "mov %0, r0\n\t" \ + "orr r0, r0, #0xb0\n\t" \ + "msr cpsr, r0" \ + : "=r" (x) \ + : /* no inputs */ \ + : "r0" \ + ); \ + } while (0) + + #define IRQ_RESTORE(x) \ + do { \ + asm volatile ( \ + "mov r0, %0\n\t" \ + "msr cpsr, r0" \ + : /* no outputs */ \ + : "r" (x) \ + : "r0" \ + ); \ + } while (0) + + #define IRQ_GETSTATE() \ + ({ \ + uint32_t sreg; \ + asm volatile ( \ + "mrs r0, cpsr\n\t" \ + "mov %0, r0" \ + : "=r" (sreg) + : /* no inputs */ + : "r0" \ + ); \ + (bool)(sreg & 0xb0); \ + }) + + #endif /* __IAR_SYSTEMS_ICC_ */ + #elif CPU_PPC #define NOP asm volatile ("nop" ::) + #define IRQ_DISABLE FIXME #define IRQ_ENABLE FIXME #define IRQ_SAVE_DISABLE(x) FIXME @@ -143,8 +307,6 @@ } #define IRQ_GETSTATE() irq_getstate() - - typedef uint16_t cpuflags_t; typedef unsigned int cpustack_t; @@ -309,7 +471,7 @@ #else #define CPU_PUSH_CALL_CONTEXT(sp, func) \ - CPU_PUSH_WORD((sp), (func)) + CPU_PUSH_WORD((sp), (cpustack_t)(func)) #endif @@ -355,7 +517,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 +557,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 @@ -404,15 +582,12 @@ STATIC_ASSERT(sizeof(int) == SIZEOF_INT); #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 */