diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-25 14:58:27 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-25 14:58:27 +0000 |
| commit | 524055a90924a150246a4cc5e01837e0530de6ce (patch) | |
| tree | 734b9e7349c9464ab51d33602354655cc63d9b5a /cpukit/score/cpu | |
| parent | 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-524055a90924a150246a4cc5e01837e0530de6ce.tar.bz2 | |
2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* rtems/score/cpu.h: Remove warning in _CPU_Context_Initialize.
Diffstat (limited to 'cpukit/score/cpu')
| -rw-r--r-- | cpukit/score/cpu/lm32/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/lm32/rtems/score/cpu.h | 8 | ||||
| -rw-r--r-- | cpukit/score/cpu/mips/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/mips/rtems/score/cpu.h | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/cpukit/score/cpu/lm32/ChangeLog b/cpukit/score/cpu/lm32/ChangeLog index 81311b892c..80612ff04f 100644 --- a/cpukit/score/cpu/lm32/ChangeLog +++ b/cpukit/score/cpu/lm32/ChangeLog @@ -1,3 +1,7 @@ +2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * rtems/score/cpu.h: Remove warning in _CPU_Context_Initialize. + 2010-04-15 Ralf Corsépius <ralf.corsepius@rtems.org> * rtems/score/cpu.h: Make _gp global. diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/cpukit/score/cpu/lm32/rtems/score/cpu.h index 9cf0ec389f..973fad29b8 100644 --- a/cpukit/score/cpu/lm32/rtems/score/cpu.h +++ b/cpukit/score/cpu/lm32/rtems/score/cpu.h @@ -846,10 +846,10 @@ extern char _gp[]; _isr, _entry_point, _is_fp ) \ do { \ uint32_t _stack = (uint32_t)(_stack_base) + (_size) - 4; \ - (_the_context)->gp = (void *)_gp; \ - (_the_context)->fp = (void *)_stack; \ - (_the_context)->sp = (void *)_stack; \ - (_the_context)->ra = (void *)(_entry_point); \ + (_the_context)->gp = (uint32_t)_gp; \ + (_the_context)->fp = (uint32_t)_stack; \ + (_the_context)->sp = (uint32_t)_stack; \ + (_the_context)->ra = (uint32_t)(_entry_point); \ } while ( 0 ) /** diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index e2a89d2653..bcb3c7cdba 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,3 +1,7 @@ +2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * rtems/score/cpu.h: Remove warning in _CPU_Context_Initialize. + 2010-03-27 Joel Sherrill <joel.sherrill@oarcorp.com> * cpu.c, cpu_asm.S: Add include of config.h diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/rtems/score/cpu.h index 4ff4a1fe24..b4bdf7424d 100644 --- a/cpukit/score/cpu/mips/rtems/score/cpu.h +++ b/cpukit/score/cpu/mips/rtems/score/cpu.h @@ -857,8 +857,8 @@ void _CPU_ISR_Set_level( uint32_t ); /* in cpu.c */ (uintptr_t)(_stack_base) + (_size) - CPU_STACK_ALIGNMENT; \ uintptr_t _intlvl = _isr & 0xff; \ _stack_tmp &= ~(CPU_STACK_ALIGNMENT - 1); \ - (_the_context)->sp = _stack_tmp; \ - (_the_context)->fp = _stack_tmp; \ + (_the_context)->sp = (__MIPS_REGISTER_TYPE) _stack_tmp; \ + (_the_context)->fp = (__MIPS_REGISTER_TYPE) _stack_tmp; \ (_the_context)->ra = (__MIPS_REGISTER_TYPE)_entry_point; \ (_the_context)->c0_sr = ((_intlvl==0)?(mips_interrupt_mask() | 0x300 | _INTON): \ ( ((_intlvl<<9) & mips_interrupt_mask()) | 0x300 | ((_intlvl & 1)?_INTON:0)) ) | \ |