Changeset 17408b90 in rtems

Timestamp:

09/30/98 13:02:30 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9dd23877

Parents:

982ed3f8

Message:

Patch from Eric Norum <eric@…>:

I found that my 68040/68360 test programs would not run even after
I fixed the `wrong BSP' problem.

It seems that there's a bug in the interrupt handling code for
processors with hardware interrupt stacks (e.g. 68040). The wrong
status register was getting pushed on the stack for the `return
from exception' to call _ISRDispatch. This ended up making
the context switch code run on the interrupt stack, so interrupt-driven
context switches would always fail.

I guess that no one has tried running any of the RTEMS-4.0 snapshots
on a 68040 machine!

Anyhow, here are the patches for

1) gen68360.cfg --- to fix the `wrong-BSP' problem.
2) m68k/cpu_asm.s --- to fix the hardware interrupt stack problem.

With these patches in place, the network demo programs run on my
68040/68360 system. The paranoia program runs with no failures,
defects nor flaws.

Files:

• c/src/exec/score/cpu/m68k/cpu_asm.s (modified) (1 diff)
• c/src/exec/score/cpu/m68k/m68k.h (modified) (1 diff)
• make/custom/gen68360.cfg (modified) (1 diff)

c/src/exec/score/cpu/m68k/cpu_asm.s

@@ -239 +239 @@
         movew   #0,a0@-                  | push format word
         movel   #SYM(_ISR_Dispatch),a0@- | push return addr
-        movew   sr,a0@-                  | push existing sr
+        movew   a0@(6),a0@-              | push saved sr
         movec   a0,msp                   | set master stack pointer
 #else

c/src/exec/score/cpu/m68k/m68k.h

@@ -120 +120 @@
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 1
-#define M68K_HAS_BFFFO           1
-#define M68K_HAS_PREINDEXING     1
-#define M68K_HAS_EXTB_L          1
-#define M68K_HAS_MISALIGNED      1
-# if defined (__HAVE_68881__)
-# define M68K_HAS_FPU            1
-# define M68K_HAS_FPSP_PACKAGE   1
-# else
-# define M68K_HAS_FPU            0
-# define M68K_HAS_FPSP_PACKAGE   0
-# endif
- 
-#elif defined(__mc68060__)
-
-#define CPU_MODEL_NAME          "m68060"
-#define M68K_HAS_VBR             1
-#define M68K_HAS_SEPARATE_STACKS 0
 #define M68K_HAS_BFFFO           1
 #define M68K_HAS_PREINDEXING     1

make/custom/gen68360.cfg

@@ -19 +19 @@
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=gen68360
-
-## Target compiler config file, if any
-CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
-
-# We may install in a CPU model based directory but this is still
-# a gen68360 based bsp.
-RTEMS_BSP=gen68360
 
 #