Changeset 8e0738e1 in rtems

Timestamp:

08/14/02 23:08:04 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a50b011f

Parents:

5e39823

Message:

2002-08-14 Brett Swimley <brett.swimley@…>

• cpu_asm.S: Per PR267, the _ISR_Handler() function never was modifying _ISR_Nest_level, and _Watchdog_Insert() requires this variable to be modified to determine if an interrupt may have modified the watchdog chain. Prior to modifying _ISR_Handler(), I had a test that would fail if _ISR_Flash was not commented out in _Watchdog_Insert(). After this modification was made, my test ran flawlessly.

Location:

cpukit/score/cpu/m68k

Files:

• ChangeLog (modified) (1 diff)
• cpu_asm.S (modified) (4 diffs)
• rtems/score/cpu.h (modified) (2 diffs)

cpukit/score/cpu/m68k/ChangeLog

@@ +1 @@
+2002-08-14      Brett Swimley <brett.swimley@aedinc.net>
+
+        * cpu_asm.S: Per PR267, the _ISR_Handler() function never was modifying
+        _ISR_Nest_level, and _Watchdog_Insert() requires this variable
+        to be modified to determine if an interrupt may have modified
+        the watchdog chain.  Prior to modifying _ISR_Handler(), I had
+        a test that would fail if _ISR_Flash was not commented out in
+        _Watchdog_Insert().  After this modification was made, my test
+        ran flawlessly.
+
 2002-08-05      Joel Sherrill <joel@OARcorp.com>
 

cpukit/score/cpu/m68k/cpu_asm.S

@@ -140 +140 @@
 
 #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 )
+        tstl    SYM (_ISR_Nest_level)   | Interrupting an interrupt handler?
+        bne     2f                      | Yes, just skip over stack switch code
         movel   _CPU_Interrupt_stack_high,a0    | a0 now point just above interrupt stack
         cmpl    _CPU_Interrupt_stack_low,a7     | stack below interrupt stack?
@@ -152 +154 @@
 #endif /* CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 */
 
+        addql   #1,SYM(_ISR_Nest_level) | one nest level deeper
+        
         movel   SYM (_ISR_Vector_table),a0 | a0= base of RTEMS table
 #if ( M68K_HAS_PREINDEXING == 1 )
@@ -166 +170 @@
 
 #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 )
+        subql   #1,SYM(_ISR_Nest_level) | Reduce interrupt-nesting count
+        bne     1f                      | Skip if return to interrupt
         movel   _CPU_Interrupt_stack_high,a0
         subql   #4,a0
@@ -172 +178 @@
         movel   (a7),a7                 | Restore task stack pointer
 1:
+#else
+        subql   #1,SYM (_ISR_Nest_level) | one less nest level
 #endif /* CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 */
-
         subql   #1,SYM (_Thread_Dispatch_disable_level)
                                          | unnest multitasking

cpukit/score/cpu/m68k/rtems/score/cpu.h

@@ -85 +85 @@
 #define CPU_USE_DEFERRED_FP_SWITCH       TRUE
 
-#define CPU_PROVIDES_IDLE_THREAD_BODY    FALSE
+#define CPU_PROVIDES_IDLE_THREAD_BODY    TRUE
 #define CPU_STACK_GROWS_UP               FALSE
 #define CPU_STRUCTURE_ALIGNMENT
@@ -416 +416 @@
 
 /* end of Context handler macros */
+
+/*
+ *  _CPU_Thread_Idle_body
+ *
+ *  This routine is the CPU dependent IDLE thread body.
+ *
+ *  NOTE:  It need only be provided if CPU_PROVIDES_IDLE_THREAD_BODY
+ *         is TRUE.
+ */
+
+void _CPU_Thread_Idle_body( void );
 
 /*