2003-02-11 Joel Sherrill <joel@OARcorp.com>

	* 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.

2 files changed, 20 insertions, 4 deletions

diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog
index 508c40b0a6..8663872d8d 100644
--- a/cpukit/score/cpu/a29k/ChangeLog
+++ b/cpukit/score/cpu/a29k/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-11	Joel Sherrill <joel@OARcorp.com>
+
+	* 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.
+
 2002-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Require autoconf-2.57 + automake-1.7.2.
diff --git a/cpukit/score/cpu/a29k/cpu.c b/cpukit/score/cpu/a29k/cpu.c
index 158f680d4e..d522c07538 100644
--- a/cpukit/score/cpu/a29k/cpu.c
+++ b/cpukit/score/cpu/a29k/cpu.c
@@ -270,8 +270,17 @@ void a29k_ISR_Handler(unsigned32 vector)
       (*_ISR_Vector_table[ vector ])( vector );
    --_Thread_Dispatch_disable_level;
    --_ISR_Nest_level;
-   if ( !_Thread_Dispatch_disable_level && !_ISR_Nest_level &&
-    (_Context_Switch_necessary || _ISR_Signals_to_thread_executing ))
-      _Thread_Dispatch();
-   return;
+
+   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();
+   }
 }