RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

arm: Provide CPU_Exception_frame for ARMv7-M

Browse Source
This commit is contained in:
Sebastian Huber
2013-01-07 08:39:45 +01:00
parent 0f7abd9943
commit 0d8cde94eb
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cpukit/score/cpu/arm/rtems/score/cpu.h
View File

@@ -482,14 +482,14 @@ static inline uint16_t CPU_swap_u16( uint16_t value )
/** @} */ /** @} */
#if defined(ARM_MULTILIB_ARCH_V4)
/** /**
* @addtogroup ScoreCPUARM * @addtogroup ScoreCPUARM
* *
* @{ * @{
*/ */
#if defined(ARM_MULTILIB_ARCH_V4)
typedef enum { typedef enum {
ARM_EXCEPTION_RESET = 0, ARM_EXCEPTION_RESET = 0,
ARM_EXCEPTION_UNDEF = 1, ARM_EXCEPTION_UNDEF = 1,
@@ -503,7 +503,7 @@ typedef enum {
ARM_EXCEPTION_MAKE_ENUM_32_BIT = 0xffffffff ARM_EXCEPTION_MAKE_ENUM_32_BIT = 0xffffffff
} Arm_symbolic_exception_name; } Arm_symbolic_exception_name;
/** @} */ #endif /* defined(ARM_MULTILIB_ARCH_V4) */
typedef struct { typedef struct {
uint32_t register_r0; uint32_t register_r0;
@@ -520,27 +520,25 @@ typedef struct {
uint32_t register_r11; uint32_t register_r11;
uint32_t register_r12; uint32_t register_r12;
uint32_t register_sp; uint32_t register_sp;
uint32_t register_lr; void *register_lr;
uint32_t register_pc; void *register_pc;
#if defined(ARM_MULTILIB_ARCH_V4)
uint32_t register_cpsr; uint32_t register_cpsr;
Arm_symbolic_exception_name vector; Arm_symbolic_exception_name vector;
#elif defined(ARM_MULTILIB_ARCH_V7M)
uint32_t register_xpsr;
uint32_t vector;
#endif
} CPU_Exception_frame; } CPU_Exception_frame;
typedef CPU_Exception_frame CPU_Interrupt_frame; typedef CPU_Exception_frame CPU_Interrupt_frame;
#else /* !defined(ARM_MULTILIB_ARCH_V4) */
typedef void CPU_Interrupt_frame;
/* FIXME */
typedef CPU_Interrupt_frame CPU_Exception_frame;
#endif /* !defined(ARM_MULTILIB_ARCH_V4) */
void _CPU_Exception_frame_print( const CPU_Exception_frame *frame ); void _CPU_Exception_frame_print( const CPU_Exception_frame *frame );
void _ARM_Exception_default( CPU_Exception_frame *frame ); void _ARM_Exception_default( CPU_Exception_frame *frame );
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif