diff options
| author | Greg Menke <gregory.menke@gsfc.nasa.gov> | 2004-12-06 20:29:51 +0000 |
|---|---|---|
| committer | Greg Menke <gregory.menke@gsfc.nasa.gov> | 2004-12-06 20:29:51 +0000 |
| commit | 5194a28430a6f69264c10b3dcc91e53f7d54f919 (patch) | |
| tree | 4850b03ecd680755d71020361eb744aecbaa2378 /cpukit/score/cpu/mips/cpu.c | |
| parent | Changelog, PR728 & PR729 (diff) | |
| download | rtems-5194a28430a6f69264c10b3dcc91e53f7d54f919.tar.bz2 | |
PR 730
* cpu_asm.S: Collected PR 601 changes for commit to cvshead
for rtems-4.7
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/cpu/mips/cpu.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cpukit/score/cpu/mips/cpu.c b/cpukit/score/cpu/mips/cpu.c index c84b738cf2..5cf43917f0 100644 --- a/cpukit/score/cpu/mips/cpu.c +++ b/cpukit/score/cpu/mips/cpu.c @@ -99,9 +99,11 @@ uint32_t _CPU_ISR_Get_level( void ) mips_get_sr(sr); -#if __mips == 3 -/* EXL bit and shift down hardware ints into bits 1 thru 6 */ - sr = ((sr & SR_EXL) >> 1) | ((sr & 0xfc00) >> 9); + /* printf("current sr=%08X, ",sr); */ + +#if (__mips == 3) || (__mips == 32) +/* IE bit and shift down hardware ints into bits 1 thru 6 */ + sr = (sr & SR_IE) | ((sr & 0xfc00) >> 9); #elif __mips == 1 /* IEC bit and shift down hardware ints into bits 1 thru 6 */ @@ -131,14 +133,14 @@ void _CPU_ISR_Set_level( uint32_t new_level ) mips_get_sr(sr); -#if __mips == 3 +#if (__mips == 3) || (__mips == 32) mips_set_sr( (sr & ~SR_IE) ); /* first disable ie bit (recommended) */ - srbits = sr & ~(0xfc00 | SR_EXL | SR_IE); + srbits = sr & ~(0xfc00 | SR_IE); - sr = srbits | ((new_level==0)? (0xfc00 | SR_EXL | SR_IE): \ + sr = srbits | ((new_level==0)? (0xfc00 | SR_IE): \ (((new_level<<9) & 0xfc00) | \ - (new_level & 1)?(SR_EXL | SR_IE):0)); + ((new_level & 1)?SR_IE:0))); /* if ( (new_level & SR_EXL) == (sr & SR_EXL) ) return; @@ -263,7 +265,7 @@ void _CPU_Install_interrupt_stack( void ) void _CPU_Thread_Idle_body( void ) { -#if __mips == 3 +#if (__mips == 3) || (__mips == 32) for( ; ; ) asm volatile("wait"); /* use wait to enter low power mode */ #elif __mips == 1 |