Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* rtems/new-exceptions/cpu.h, rtems/old-exceptions/cpu.h,
	rtems/powerpc/registers.h: Convert to using c99 fixed size types.
This commit is contained in:
Ralf Corsepius
2004-03-30 11:49:33 +00:00
parent c346f33d6d
commit 30b1016bf8
4 changed files with 167 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/score/cpu/powerpc/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>
* rtems/new-exceptions/cpu.h, rtems/old-exceptions/cpu.h,
rtems/powerpc/registers.h: Convert to using c99 fixed size types.
2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org> 2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: RTEMS_TOP([../../../..]). * configure.ac: RTEMS_TOP([../../../..]).

138
cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h
View File

@@ -310,30 +310,30 @@ extern "C" {
#ifndef ASM #ifndef ASM
typedef struct { typedef struct {
unsigned32 gpr1; /* Stack pointer for all */ uint32_t gpr1; /* Stack pointer for all */
unsigned32 gpr2; /* TOC in PowerOpen, reserved SVR4, section ptr EABI + */ uint32_t gpr2; /* TOC in PowerOpen, reserved SVR4, section ptr EABI + */
unsigned32 gpr13; /* First non volatile PowerOpen, section ptr SVR4/EABI */ uint32_t gpr13; /* First non volatile PowerOpen, section ptr SVR4/EABI */
unsigned32 gpr14; /* Non volatile for all */ uint32_t gpr14; /* Non volatile for all */
unsigned32 gpr15; /* Non volatile for all */ uint32_t gpr15; /* Non volatile for all */
unsigned32 gpr16; /* Non volatile for all */ uint32_t gpr16; /* Non volatile for all */
unsigned32 gpr17; /* Non volatile for all */ uint32_t gpr17; /* Non volatile for all */
unsigned32 gpr18; /* Non volatile for all */ uint32_t gpr18; /* Non volatile for all */
unsigned32 gpr19; /* Non volatile for all */ uint32_t gpr19; /* Non volatile for all */
unsigned32 gpr20; /* Non volatile for all */ uint32_t gpr20; /* Non volatile for all */
unsigned32 gpr21; /* Non volatile for all */ uint32_t gpr21; /* Non volatile for all */
unsigned32 gpr22; /* Non volatile for all */ uint32_t gpr22; /* Non volatile for all */
unsigned32 gpr23; /* Non volatile for all */ uint32_t gpr23; /* Non volatile for all */
unsigned32 gpr24; /* Non volatile for all */ uint32_t gpr24; /* Non volatile for all */
unsigned32 gpr25; /* Non volatile for all */ uint32_t gpr25; /* Non volatile for all */
unsigned32 gpr26; /* Non volatile for all */ uint32_t gpr26; /* Non volatile for all */
unsigned32 gpr27; /* Non volatile for all */ uint32_t gpr27; /* Non volatile for all */
unsigned32 gpr28; /* Non volatile for all */ uint32_t gpr28; /* Non volatile for all */
unsigned32 gpr29; /* Non volatile for all */ uint32_t gpr29; /* Non volatile for all */
unsigned32 gpr30; /* Non volatile for all */ uint32_t gpr30; /* Non volatile for all */
unsigned32 gpr31; /* Non volatile for all */ uint32_t gpr31; /* Non volatile for all */
unsigned32 cr; /* PART of the CR is non volatile for all */ uint32_t cr; /* PART of the CR is non volatile for all */
unsigned32 pc; /* Program counter/Link register */ uint32_t pc; /* Program counter/Link register */
unsigned32 msr; /* Initial interrupt level */ uint32_t msr; /* Initial interrupt level */
} Context_Control; } Context_Control;
typedef struct { typedef struct {
@@ -353,33 +353,33 @@ typedef struct {
} Context_Control_fp; } Context_Control_fp;
typedef struct CPU_Interrupt_frame { typedef struct CPU_Interrupt_frame {
unsigned32 stacklink; /* Ensure this is a real frame (also reg1 save) */ uint32_t stacklink; /* Ensure this is a real frame (also reg1 save) */
unsigned32 calleeLr; /* link register used by callees: SVR4/EABI */ uint32_t calleeLr; /* link register used by callees: SVR4/EABI */
/* This is what is left out of the primary contexts */ /* This is what is left out of the primary contexts */
unsigned32 gpr0; uint32_t gpr0;
unsigned32 gpr2; /* play safe */ uint32_t gpr2; /* play safe */
unsigned32 gpr3; uint32_t gpr3;
unsigned32 gpr4; uint32_t gpr4;
unsigned32 gpr5; uint32_t gpr5;
unsigned32 gpr6; uint32_t gpr6;
unsigned32 gpr7; uint32_t gpr7;
unsigned32 gpr8; uint32_t gpr8;
unsigned32 gpr9; uint32_t gpr9;
unsigned32 gpr10; uint32_t gpr10;
unsigned32 gpr11; uint32_t gpr11;
unsigned32 gpr12; uint32_t gpr12;
unsigned32 gpr13; /* Play safe */ uint32_t gpr13; /* Play safe */
unsigned32 gpr28; /* For internal use by the IRQ handler */ uint32_t gpr28; /* For internal use by the IRQ handler */
unsigned32 gpr29; /* For internal use by the IRQ handler */ uint32_t gpr29; /* For internal use by the IRQ handler */
unsigned32 gpr30; /* For internal use by the IRQ handler */ uint32_t gpr30; /* For internal use by the IRQ handler */
unsigned32 gpr31; /* For internal use by the IRQ handler */ uint32_t gpr31; /* For internal use by the IRQ handler */
unsigned32 cr; /* Bits of this are volatile, so no-one may save */ uint32_t cr; /* Bits of this are volatile, so no-one may save */
unsigned32 ctr; uint32_t ctr;
unsigned32 xer; uint32_t xer;
unsigned32 lr; uint32_t lr;
unsigned32 pc; uint32_t pc;
unsigned32 msr; uint32_t msr;
unsigned32 pad[3]; uint32_t pad[3];
} CPU_Interrupt_frame; } CPU_Interrupt_frame;
/* /*
@@ -393,29 +393,29 @@ typedef struct {
void (*postdriver_hook)( void ); void (*postdriver_hook)( void );
void (*idle_task)( void ); void (*idle_task)( void );
boolean do_zero_of_workspace; boolean do_zero_of_workspace;
unsigned32 idle_task_stack_size; uint32_t idle_task_stack_size;
unsigned32 interrupt_stack_size; uint32_t interrupt_stack_size;
unsigned32 extra_mpci_receive_server_stack; uint32_t extra_mpci_receive_server_stack;
void * (*stack_allocate_hook)( unsigned32 ); void * (*stack_allocate_hook)( uint32_t );
void (*stack_free_hook)( void* ); void (*stack_free_hook)( void* );
/* end of fields required on all CPUs */ /* end of fields required on all CPUs */
unsigned32 clicks_per_usec; /* Timer clicks per microsecond */ uint32_t clicks_per_usec; /* Timer clicks per microsecond */
boolean exceptions_in_RAM; /* TRUE if in RAM */ boolean exceptions_in_RAM; /* TRUE if in RAM */
#if (defined(ppc403) || defined(mpc860) || defined(mpc821) || defined(mpc8260)) #if (defined(ppc403) || defined(mpc860) || defined(mpc821) || defined(mpc8260))
unsigned32 serial_per_sec; /* Serial clocks per second */ uint32_t serial_per_sec; /* Serial clocks per second */
boolean serial_external_clock; boolean serial_external_clock;
boolean serial_xon_xoff; boolean serial_xon_xoff;
boolean serial_cts_rts; boolean serial_cts_rts;
unsigned32 serial_rate; uint32_t serial_rate;
unsigned32 timer_average_overhead; /* Average overhead of timer in ticks */ uint32_t timer_average_overhead; /* Average overhead of timer in ticks */
unsigned32 timer_least_valid; /* Least valid number from timer */ uint32_t timer_least_valid; /* Least valid number from timer */
boolean timer_internal_clock; /* TRUE, when timer runs with CPU clk */ boolean timer_internal_clock; /* TRUE, when timer runs with CPU clk */
#endif #endif
#if (defined(mpc860) || defined(mpc821) || defined(mpc8260)) #if (defined(mpc860) || defined(mpc821) || defined(mpc8260))
unsigned32 clock_speed; /* Speed of CPU in Hz */ uint32_t clock_speed; /* Speed of CPU in Hz */
#endif #endif
} rtems_cpu_table; } rtems_cpu_table;
@@ -488,7 +488,7 @@ SCORE_EXTERN void *_CPU_Interrupt_stack_high;
#ifndef ASM #ifndef ASM
SCORE_EXTERN struct { SCORE_EXTERN struct {
unsigned32 *Disable_level; uint32_t *Disable_level;
void *Stack; void *Stack;
volatile boolean *Switch_necessary; volatile boolean *Switch_necessary;
boolean *Signal; boolean *Signal;
@@ -611,7 +611,7 @@ SCORE_EXTERN struct {
#ifndef ASM #ifndef ASM
static inline unsigned32 _CPU_ISR_Get_level( void ) static inline uint32_t _CPU_ISR_Get_level( void )
{ {
register unsigned int msr; register unsigned int msr;
_CPU_MSR_GET(msr); _CPU_MSR_GET(msr);
@@ -619,7 +619,7 @@ static inline unsigned32 _CPU_ISR_Get_level( void )
else return 1; else return 1;
} }
static inline void _CPU_ISR_Set_level( unsigned32 level ) static inline void _CPU_ISR_Set_level( uint32_t level )
{ {
register unsigned int msr; register unsigned int msr;
_CPU_MSR_GET(msr); _CPU_MSR_GET(msr);
@@ -658,9 +658,9 @@ void BSP_panic(char *);
void _CPU_Context_Initialize( void _CPU_Context_Initialize(
Context_Control *the_context, Context_Control *the_context,
unsigned32 *stack_base, uint32_t *stack_base,
unsigned32 size, uint32_t size,
unsigned32 new_level, uint32_t new_level,
void *entry_point, void *entry_point,
boolean is_fp boolean is_fp
); );
@@ -817,7 +817,7 @@ void _BSP_Fatal_error(unsigned int);
/* variables */ /* variables */
extern const unsigned32 _CPU_msrs[4]; extern const uint32_t _CPU_msrs[4];
/* functions */ /* functions */
@@ -898,7 +898,7 @@ void _CPU_Context_restore_fp(
); );
void _CPU_Fatal_error( void _CPU_Fatal_error(
unsigned32 _error uint32_t _error
); );
/* The following routine swaps the endian format of an unsigned int. /* The following routine swaps the endian format of an unsigned int.
@@ -925,7 +925,7 @@ static inline unsigned int CPU_swap_u32(
unsigned int value unsigned int value
) )
{ {
unsigned32 swapped; uint32_t swapped;
asm volatile("rlwimi %0,%1,8,24,31;" asm volatile("rlwimi %0,%1,8,24,31;"
"rlwimi %0,%1,24,16,23;" "rlwimi %0,%1,24,16,23;"

182
cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h
View File

@@ -330,30 +330,30 @@ typedef void ( *ppc_isr_entry )( int, struct CPU_Interrupt_frame * );
*/ */
typedef struct { typedef struct {
unsigned32 gpr1; /* Stack pointer for all */ uint32_t gpr1; /* Stack pointer for all */
unsigned32 gpr2; /* TOC in PowerOpen, reserved SVR4, section ptr EABI + */ uint32_t gpr2; /* TOC in PowerOpen, reserved SVR4, section ptr EABI + */
unsigned32 gpr13; /* First non volatile PowerOpen, section ptr SVR4/EABI */ uint32_t gpr13; /* First non volatile PowerOpen, section ptr SVR4/EABI */
unsigned32 gpr14; /* Non volatile for all */ uint32_t gpr14; /* Non volatile for all */
unsigned32 gpr15; /* Non volatile for all */ uint32_t gpr15; /* Non volatile for all */
unsigned32 gpr16; /* Non volatile for all */ uint32_t gpr16; /* Non volatile for all */
unsigned32 gpr17; /* Non volatile for all */ uint32_t gpr17; /* Non volatile for all */
unsigned32 gpr18; /* Non volatile for all */ uint32_t gpr18; /* Non volatile for all */
unsigned32 gpr19; /* Non volatile for all */ uint32_t gpr19; /* Non volatile for all */
unsigned32 gpr20; /* Non volatile for all */ uint32_t gpr20; /* Non volatile for all */
unsigned32 gpr21; /* Non volatile for all */ uint32_t gpr21; /* Non volatile for all */
unsigned32 gpr22; /* Non volatile for all */ uint32_t gpr22; /* Non volatile for all */
unsigned32 gpr23; /* Non volatile for all */ uint32_t gpr23; /* Non volatile for all */
unsigned32 gpr24; /* Non volatile for all */ uint32_t gpr24; /* Non volatile for all */
unsigned32 gpr25; /* Non volatile for all */ uint32_t gpr25; /* Non volatile for all */
unsigned32 gpr26; /* Non volatile for all */ uint32_t gpr26; /* Non volatile for all */
unsigned32 gpr27; /* Non volatile for all */ uint32_t gpr27; /* Non volatile for all */
unsigned32 gpr28; /* Non volatile for all */ uint32_t gpr28; /* Non volatile for all */
unsigned32 gpr29; /* Non volatile for all */ uint32_t gpr29; /* Non volatile for all */
unsigned32 gpr30; /* Non volatile for all */ uint32_t gpr30; /* Non volatile for all */
unsigned32 gpr31; /* Non volatile for all */ uint32_t gpr31; /* Non volatile for all */
unsigned32 cr; /* PART of the CR is non volatile for all */ uint32_t cr; /* PART of the CR is non volatile for all */
unsigned32 pc; /* Program counter/Link register */ uint32_t pc; /* Program counter/Link register */
unsigned32 msr; /* Initial interrupt level */ uint32_t msr; /* Initial interrupt level */
} Context_Control; } Context_Control;
typedef struct { typedef struct {
@@ -373,37 +373,37 @@ typedef struct {
} Context_Control_fp; } Context_Control_fp;
typedef struct CPU_Interrupt_frame { typedef struct CPU_Interrupt_frame {
unsigned32 stacklink; /* Ensure this is a real frame (also reg1 save) */ uint32_t stacklink; /* Ensure this is a real frame (also reg1 save) */
#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) #if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27)
unsigned32 dummy[13]; /* Used by callees: PowerOpen ABI */ uint32_t dummy[13]; /* Used by callees: PowerOpen ABI */
#else #else
unsigned32 dummy[1]; /* Used by callees: SVR4/EABI */ uint32_t dummy[1]; /* Used by callees: SVR4/EABI */
#endif #endif
/* This is what is left out of the primary contexts */ /* This is what is left out of the primary contexts */
unsigned32 gpr0; uint32_t gpr0;
unsigned32 gpr2; /* play safe */ uint32_t gpr2; /* play safe */
unsigned32 gpr3; uint32_t gpr3;
unsigned32 gpr4; uint32_t gpr4;
unsigned32 gpr5; uint32_t gpr5;
unsigned32 gpr6; uint32_t gpr6;
unsigned32 gpr7; uint32_t gpr7;
unsigned32 gpr8; uint32_t gpr8;
unsigned32 gpr9; uint32_t gpr9;
unsigned32 gpr10; uint32_t gpr10;
unsigned32 gpr11; uint32_t gpr11;
unsigned32 gpr12; uint32_t gpr12;
unsigned32 gpr13; /* Play safe */ uint32_t gpr13; /* Play safe */
unsigned32 gpr28; /* For internal use by the IRQ handler */ uint32_t gpr28; /* For internal use by the IRQ handler */
unsigned32 gpr29; /* For internal use by the IRQ handler */ uint32_t gpr29; /* For internal use by the IRQ handler */
unsigned32 gpr30; /* For internal use by the IRQ handler */ uint32_t gpr30; /* For internal use by the IRQ handler */
unsigned32 gpr31; /* For internal use by the IRQ handler */ uint32_t gpr31; /* For internal use by the IRQ handler */
unsigned32 cr; /* Bits of this are volatile, so no-one may save */ uint32_t cr; /* Bits of this are volatile, so no-one may save */
unsigned32 ctr; uint32_t ctr;
unsigned32 xer; uint32_t xer;
unsigned32 lr; uint32_t lr;
unsigned32 pc; uint32_t pc;
unsigned32 msr; uint32_t msr;
unsigned32 pad[3]; uint32_t pad[3];
} CPU_Interrupt_frame; } CPU_Interrupt_frame;
@@ -418,30 +418,30 @@ typedef struct {
void (*postdriver_hook)( void ); void (*postdriver_hook)( void );
void (*idle_task)( void ); void (*idle_task)( void );
boolean do_zero_of_workspace; boolean do_zero_of_workspace;
unsigned32 idle_task_stack_size; uint32_t idle_task_stack_size;
unsigned32 interrupt_stack_size; uint32_t interrupt_stack_size;
unsigned32 extra_mpci_receive_server_stack; uint32_t extra_mpci_receive_server_stack;
void * (*stack_allocate_hook)( unsigned32 ); void * (*stack_allocate_hook)( uint32_t );
void (*stack_free_hook)( void* ); void (*stack_free_hook)( void* );
/* end of fields required on all CPUs */ /* end of fields required on all CPUs */
unsigned32 clicks_per_usec; /* Timer clicks per microsecond */ uint32_t clicks_per_usec; /* Timer clicks per microsecond */
void (*spurious_handler)(unsigned32 vector, CPU_Interrupt_frame *); void (*spurious_handler)(uint32_t vector, CPU_Interrupt_frame *);
boolean exceptions_in_RAM; /* TRUE if in RAM */ boolean exceptions_in_RAM; /* TRUE if in RAM */
#if (defined(ppc403) || defined(ppc405) || defined(mpc860) || defined(mpc821)) #if (defined(ppc403) || defined(ppc405) || defined(mpc860) || defined(mpc821))
unsigned32 serial_per_sec; /* Serial clocks per second */ uint32_t serial_per_sec; /* Serial clocks per second */
boolean serial_external_clock; boolean serial_external_clock;
boolean serial_xon_xoff; boolean serial_xon_xoff;
boolean serial_cts_rts; boolean serial_cts_rts;
unsigned32 serial_rate; uint32_t serial_rate;
unsigned32 timer_average_overhead; /* Average overhead of timer in ticks */ uint32_t timer_average_overhead; /* Average overhead of timer in ticks */
unsigned32 timer_least_valid; /* Least valid number from timer */ uint32_t timer_least_valid; /* Least valid number from timer */
boolean timer_internal_clock; /* TRUE, when timer runs with CPU clk */ boolean timer_internal_clock; /* TRUE, when timer runs with CPU clk */
#endif #endif
#if (defined(mpc860) || defined(mpc821)) #if (defined(mpc860) || defined(mpc821))
unsigned32 clock_speed; /* Speed of CPU in Hz */ uint32_t clock_speed; /* Speed of CPU in Hz */
#endif #endif
} rtems_cpu_table; } rtems_cpu_table;
@@ -507,10 +507,10 @@ typedef struct {
*/ */
typedef struct { typedef struct {
unsigned32 stwu_r1; /* stwu %r1, -(??+IP_END)(%1)*/ uint32_t stwu_r1; /* stwu %r1, -(??+IP_END)(%1)*/
unsigned32 stw_r0; /* stw %r0, IP_0(%r1) */ uint32_t stw_r0; /* stw %r0, IP_0(%r1) */
unsigned32 li_r0_IRQ; /* li %r0, _IRQ */ uint32_t li_r0_IRQ; /* li %r0, _IRQ */
unsigned32 b_Handler; /* b PROC (_ISR_Handler) */ uint32_t b_Handler; /* b PROC (_ISR_Handler) */
} CPU_Trap_table_entry; } CPU_Trap_table_entry;
/* /*
@@ -556,22 +556,22 @@ SCORE_EXTERN void *_CPU_Interrupt_stack_high;
SCORE_EXTERN struct { SCORE_EXTERN struct {
unsigned32 volatile* Nest_level; uint32_t volatile* Nest_level;
unsigned32 volatile* Disable_level; uint32_t volatile* Disable_level;
void *Vector_table; void *Vector_table;
void *Stack; void *Stack;
#if (PPC_ABI == PPC_ABI_POWEROPEN) #if (PPC_ABI == PPC_ABI_POWEROPEN)
unsigned32 Dispatch_r2; uint32_t Dispatch_r2;
#else #else
unsigned32 Default_r2; uint32_t Default_r2;
#if (PPC_ABI != PPC_ABI_GCC27) #if (PPC_ABI != PPC_ABI_GCC27)
unsigned32 Default_r13; uint32_t Default_r13;
#endif #endif
#endif #endif
volatile boolean *Switch_necessary; volatile boolean *Switch_necessary;
boolean *Signal; boolean *Signal;
unsigned32 msr_initial; uint32_t msr_initial;
} _CPU_IRQ_info CPU_STRUCTURE_ALIGNMENT; } _CPU_IRQ_info CPU_STRUCTURE_ALIGNMENT;
/* /*
@@ -763,18 +763,18 @@ void _CPU_Initialize_vectors(void);
* via the rtems_task_mode directive. * via the rtems_task_mode directive.
*/ */
unsigned32 _CPU_ISR_Calculate_level( uint32_t _CPU_ISR_Calculate_level(
unsigned32 new_level uint32_t new_level
); );
void _CPU_ISR_Set_level( void _CPU_ISR_Set_level(
unsigned32 new_level uint32_t new_level
); );
unsigned32 _CPU_ISR_Get_level( void ); uint32_t _CPU_ISR_Get_level( void );
void _CPU_ISR_install_raw_handler( void _CPU_ISR_install_raw_handler(
unsigned32 vector, uint32_t vector,
proc_ptr new_handler, proc_ptr new_handler,
proc_ptr *old_handler proc_ptr *old_handler
); );
@@ -791,7 +791,7 @@ void _CPU_ISR_install_raw_handler(
#define rtems_bsp_delay( _microseconds ) \ #define rtems_bsp_delay( _microseconds ) \
do { \ do { \
unsigned32 start, ticks, now; \ uint32_t start, ticks, now; \
CPU_Get_timebase_low( start ) ; \ CPU_Get_timebase_low( start ) ; \
ticks = (_microseconds) * _CPU_Table.clicks_per_usec; \ ticks = (_microseconds) * _CPU_Table.clicks_per_usec; \
do \ do \
@@ -801,7 +801,7 @@ void _CPU_ISR_install_raw_handler(
#define rtems_bsp_delay_in_bus_cycles( _cycles ) \ #define rtems_bsp_delay_in_bus_cycles( _cycles ) \
do { \ do { \
unsigned32 start, now; \ uint32_t start, now; \
CPU_Get_timebase_low( start ); \ CPU_Get_timebase_low( start ); \
do \ do \
CPU_Get_timebase_low( now ); \ CPU_Get_timebase_low( now ); \
@@ -832,9 +832,9 @@ void _CPU_ISR_install_raw_handler(
void _CPU_Context_Initialize( void _CPU_Context_Initialize(
Context_Control *the_context, Context_Control *the_context,
unsigned32 *stack_base, uint32_t *stack_base,
unsigned32 size, uint32_t size,
unsigned32 new_level, uint32_t new_level,
void *entry_point, void *entry_point,
boolean is_fp boolean is_fp
); );
@@ -989,7 +989,7 @@ void _CPU_Context_Initialize(
/* variables */ /* variables */
extern const unsigned32 _CPU_msrs[4]; extern const uint32_t _CPU_msrs[4];
/* functions */ /* functions */
@@ -1011,7 +1011,7 @@ void _CPU_Initialize(
*/ */
void _CPU_ISR_install_vector( void _CPU_ISR_install_vector(
unsigned32 vector, uint32_t vector,
proc_ptr new_handler, proc_ptr new_handler,
proc_ptr *old_handler proc_ptr *old_handler
); );
@@ -1072,7 +1072,7 @@ void _CPU_Context_restore_fp(
); );
void _CPU_Fatal_error( void _CPU_Fatal_error(
unsigned32 _error uint32_t _error
); );
/* The following routine swaps the endian format of an unsigned int. /* The following routine swaps the endian format of an unsigned int.
@@ -1099,7 +1099,7 @@ static inline unsigned int CPU_swap_u32(
unsigned int value unsigned int value
) )
{ {
unsigned32 swapped; uint32_t swapped;
asm volatile("rlwimi %0,%1,8,24,31;" asm volatile("rlwimi %0,%1,8,24,31;"
"rlwimi %0,%1,24,16,23;" "rlwimi %0,%1,24,16,23;"
@@ -1126,12 +1126,12 @@ static inline unsigned int CPU_swap_u32(
* Routines to access the time base register * Routines to access the time base register
*/ */
static inline unsigned64 PPC_Get_timebase_register( void ) static inline uint64_t PPC_Get_timebase_register( void )
{ {
unsigned32 tbr_low; uint32_t tbr_low;
unsigned32 tbr_high; uint32_t tbr_high;
unsigned32 tbr_high_old; uint32_t tbr_high_old;
unsigned64 tbr; uint64_t tbr;
do { do {
asm volatile( "mftbu %0" : "=r" (tbr_high_old)); asm volatile( "mftbu %0" : "=r" (tbr_high_old));

4
cpukit/score/cpu/powerpc/rtems/powerpc/registers.h
View File

@@ -278,7 +278,7 @@ static inline void PPC_Set_timebase_register (unsigned long long tbr)
#define rtems_bsp_delay( _microseconds ) \ #define rtems_bsp_delay( _microseconds ) \
do { \ do { \
unsigned32 start, ticks, now; \ uint32_t start, ticks, now; \
CPU_Get_timebase_low( start ) ; \ CPU_Get_timebase_low( start ) ; \
ticks = (_microseconds) * rtems_cpu_configuration_get_clicks_per_usec(); \ ticks = (_microseconds) * rtems_cpu_configuration_get_clicks_per_usec(); \
do \ do \
@@ -288,7 +288,7 @@ static inline void PPC_Set_timebase_register (unsigned long long tbr)
#define rtems_bsp_delay_in_bus_cycles( _cycles ) \ #define rtems_bsp_delay_in_bus_cycles( _cycles ) \
do { \ do { \
unsigned32 start, now; \ uint32_t start, now; \
CPU_Get_timebase_low( start ); \ CPU_Get_timebase_low( start ); \
do \ do \
CPU_Get_timebase_low( now ); \ CPU_Get_timebase_low( now ); \