Changeset 42540ecd in rtems


Ignore:
Timestamp:
Mar 30, 2004, 11:46:13 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
9a26317
Parents:
16ce0e70
Message:

2004-03-30 Ralf Corsepius <ralf_corsepius@…>

  • cpu.c, cpu_asm.c, rtems/score/cpu.h: Convert to using c99 fixed size types.
Location:
cpukit/score/cpu/or32
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/cpu/or32/ChangeLog

    r16ce0e70 r42540ecd  
     12004-03-30      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * cpu.c, cpu_asm.c, rtems/score/cpu.h: Convert to using c99 fixed
     4        size types.
     5
    162004-03-29      Ralf Corsepius <ralf_corsepius@rtems.org>
    27
  • cpukit/score/cpu/or32/cpu.c

    r16ce0e70 r42540ecd  
    7373 */
    7474
    75 inline unsigned32 _CPU_ISR_Get_level( void )
     75inline uint32_t  _CPU_ISR_Get_level( void )
    7676{
    77   register unsigned32 sr;
     77  register uint32_t  sr;
    7878  asm("l.mfspr %0,r0,0x17" : "=r" (sr));
    7979  return !((sr & SR_EXR) && (sr & SR_EIR));
     
    9494 
    9595void _CPU_ISR_install_raw_handler(
    96   unsigned32  vector,
     96  uint32_t    vector,
    9797  proc_ptr    new_handler,
    9898  proc_ptr   *old_handler
    9999)
    100100{
    101   register unsigned32 sr;
    102   register unsigned32 tmp;
    103   extern unsigned32 Or1k_Interrupt_Vectors[];
     101  register uint32_t  sr;
     102  register uint32_t  tmp;
     103  extern uint32_t  Or1k_Interrupt_Vectors[];
    104104
    105105  asm volatile ("l.mfspr %0,r0,0x11\n\t"
     
    132132
    133133void _CPU_ISR_install_vector(
    134   unsigned32  vector,
     134  uint32_t    vector,
    135135  proc_ptr    new_handler,
    136136  proc_ptr   *old_handler
  • cpukit/score/cpu/or32/cpu_asm.c

    r16ce0e70 r42540ecd  
    7777)
    7878{
    79   register unsigned32 temp;
    80   register unsigned32 address = (unsigned32)(*fp_context_ptr);
    81   register unsigned32 xfer;
    82   register unsigned32 loop;
     79  register uint32_t  temp;
     80  register uint32_t   address = (uint32_t  )(*fp_context_ptr);
     81  register uint32_t  xfer;
     82  register uint32_t  loop;
    8383
    8484  /* %0 is a temporary register which is used for several
     
    135135)
    136136{
    137   register unsigned32 temp;
    138   register unsigned32 address = (unsigned32)(*fp_context_ptr);
    139   register unsigned32 xfer;
    140   register unsigned32 loop;
     137  register uint32_t  temp;
     138  register uint32_t   address = (uint32_t  )(*fp_context_ptr);
     139  register uint32_t  xfer;
     140  register uint32_t  loop;
    141141
    142142  /* The reverse of Context_save_fp */
     
    194194)
    195195{
    196   register unsigned32 temp1 = 0;
    197   register unsigned32 temp2 = 0;
     196  register uint32_t  temp1 = 0;
     197  register uint32_t  temp2 = 0;
    198198
    199199  /* This function is really tricky. When this function is called,
     
    499499 */
    500500
    501 void _ISR_Handler(unsigned32 vector,unsigned32 ProgramCounter,
    502                   unsigned32 EffectiveAddress,unsigned32 StatusRegister)
     501void _ISR_Handler(uint32_t   vector,uint32_t  ProgramCounter,
     502                  uint32_t   EffectiveAddress,uint32_t  StatusRegister)
    503503{
    504504   /*
  • cpukit/score/cpu/or32/rtems/score/cpu.h

    r16ce0e70 r42540ecd  
    377377
    378378#ifdef OR1K_64BIT_ARCH
    379 #define or1kreg unsigned64
     379#define or1kreg uint64_t 
    380380#else
    381 #define or1kreg unsigned32
     381#define or1kreg uint32_t 
    382382#endif
    383383
     
    434434
    435435typedef struct {
    436   unsigned32  sr;     /* Current status register non persistent values */
    437   unsigned32  esr;    /* Saved exception status register */
    438   unsigned32  ear;    /* Saved exception effective address register */
    439   unsigned32  epc;    /* Saved exception PC register    */
     436  uint32_t    sr;     /* Current status register non persistent values */
     437  uint32_t    esr;    /* Saved exception status register */
     438  uint32_t    ear;    /* Saved exception effective address register */
     439  uint32_t    epc;    /* Saved exception PC register    */
    440440  or1kreg     r[31];  /* Registers */
    441441  or1kreg     pc;     /* Context PC 4 or 8 bytes for 64 bit alignment */
     
    460460  void       (*idle_task)( void );
    461461  boolean      do_zero_of_workspace;
    462   unsigned32   idle_task_stack_size;
    463   unsigned32   interrupt_stack_size;
    464   unsigned32   extra_mpci_receive_server_stack;
    465   void *     (*stack_allocate_hook)( unsigned32 );
     462  uint32_t     idle_task_stack_size;
     463  uint32_t     interrupt_stack_size;
     464  uint32_t     extra_mpci_receive_server_stack;
     465  void *     (*stack_allocate_hook)( uint32_t  );
    466466  void       (*stack_free_hook)( void* );
    467467  /* end of fields required on all CPUs */
     
    692692  }
    693693
    694 unsigned32 _CPU_ISR_Get_level( void );
     694uint32_t  _CPU_ISR_Get_level( void );
    695695
    696696/* end of ISR handler macros */
     
    724724  { \
    725725  memset(_the_context,'\0',sizeof(Context_Control)); \
    726   (_the_context)->r[1] = (unsigned32*) ((unsigned32) (_stack_base) + (_size) ); \
    727   (_the_context)->r[2] = (unsigned32*) ((unsigned32) (_stack_base)); \
     726  (_the_context)->r[1] = (uint32_t  *) ((uint32_t  ) (_stack_base) + (_size) ); \
     727  (_the_context)->r[2] = (uint32_t  *) ((uint32_t  ) (_stack_base)); \
    728728  (_the_context)->sr  = (_isr) ? 0x0000001B : 0x0000001F; \
    729   (_the_context)->pc  = (unsigned32*) _entry_point ; \
     729  (_the_context)->pc  = (uint32_t  *) _entry_point ; \
    730730  }
    731731
     
    929929 
    930930void _CPU_ISR_install_raw_handler(
    931   unsigned32  vector,
     931  uint32_t    vector,
    932932  proc_ptr    new_handler,
    933933  proc_ptr   *old_handler
     
    945945
    946946void _CPU_ISR_install_vector(
    947   unsigned32  vector,
     947  uint32_t    vector,
    948948  proc_ptr    new_handler,
    949949  proc_ptr   *old_handler
     
    10511051)
    10521052{
    1053   unsigned32 byte1, byte2, byte3, byte4, swapped;
     1053  uint32_t  byte1, byte2, byte3, byte4, swapped;
    10541054 
    10551055  byte4 = (value >> 24) & 0xff;
Note: See TracChangeset for help on using the changeset viewer.