diff options
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7750/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c | 22 |
2 files changed, 20 insertions, 9 deletions
diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog index f4dddd3853..1d1d17317e 100644 --- a/c/src/lib/libcpu/sh/sh7750/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog @@ -1,3 +1,10 @@ +2003-02-11 Joel Sherrill <joel@OARcorp.com> + + * score/cpu_asm.c: Rework logic that decides when to call + _Thread_Dispatch. Analysis by Sergei Organov <osv@javad.ru> + determined that _ISR_Signals_to_thread_executing was not being + honored and/or cleared properly. + 2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c index f6d5d16326..240805d4ea 100644 --- a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c @@ -287,6 +287,8 @@ void __ISR_Handler( unsigned32 vector) _CPU_ISR_Disable( level ); + _Thread_Dispatch_disable_level--; + _ISR_Nest_level--; #if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) @@ -296,16 +298,18 @@ void __ISR_Handler( unsigned32 vector) stack_ptr = _old_stack_ptr; #endif - _Thread_Dispatch_disable_level--; - _CPU_ISR_Enable( level ); - if ( _Thread_Dispatch_disable_level == 0 ) - { - if(( _Context_Switch_necessary) || (! _ISR_Signals_to_thread_executing)) - { - _ISR_Signals_to_thread_executing = FALSE; - _Thread_Dispatch(); - } + if ( _ISR_Nest_level ) + return; + + if ( _Thread_Dispatch_disable_level ) { + _ISR_Signals_to_thread_executing = FALSE; + return; + } + + if ( _Context_Switch_necessary || _ISR_Signals_to_thread_executing ) { + _ISR_Signals_to_thread_executing = FALSE; + _Thread_Dispatch(); } } |