From b73e57bffe6cf60b1817bb2fc244a2f0c602bd5c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 9 Jul 1999 17:08:48 +0000 Subject: Patch from Jiri Gaisler : + interrupt masking correction + FPU rev.B workaround + minor erc32 related fixes --- cpukit/score/cpu/sparc/rtems/score/cpu.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cpukit/score/cpu/sparc/rtems/score/cpu.h') diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h index cf50f035d6..7a55ae5d0d 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpu.h +++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h @@ -725,6 +725,9 @@ SCORE_EXTERN unsigned8 _CPU_Trap_Table_area[ 8192 ] #ifndef ASM +extern unsigned int sparc_disable_interrupts(); +extern void sparc_enable_interrupts(); + /* ISR handler macros */ /* @@ -733,7 +736,7 @@ SCORE_EXTERN unsigned8 _CPU_Trap_Table_area[ 8192 ] */ #define _CPU_ISR_Disable( _level ) \ - sparc_disable_interrupts( _level ) + (_level) = sparc_disable_interrupts() /* * Enable interrupts to the previous level (returned by _CPU_ISR_Disable). @@ -743,7 +746,6 @@ SCORE_EXTERN unsigned8 _CPU_Trap_Table_area[ 8192 ] #define _CPU_ISR_Enable( _level ) \ sparc_enable_interrupts( _level ) - /* * This temporarily restores the interrupt to _level before immediately * disabling them again. This is used to divide long critical @@ -761,7 +763,7 @@ SCORE_EXTERN unsigned8 _CPU_Trap_Table_area[ 8192 ] */ #define _CPU_ISR_Set_level( _newlevel ) \ - sparc_set_interrupt_level( _newlevel ) + sparc_enable_interrupts( _newlevel << 8) unsigned32 _CPU_ISR_Get_level( void ); @@ -840,7 +842,7 @@ void _CPU_Context_Initialize( do { \ unsigned32 level; \ \ - sparc_disable_interrupts( level ); \ + level = sparc_disable_interrupts(); \ asm volatile ( "mov %0, %%g1 " : "=r" (level) : "0" (level) ); \ while (1); /* loop forever */ \ } while (0) -- cgit v1.2.3