Changeset 4a3db517 in rtems

Timestamp:

12/05/14 10:07:02 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

b657ea4d

Parents:

12072880

Message:

bsps/sparc: Fix trap table initialization

Fixes bug introduced with dff1803cfbec3775fff1b9c34cc707c05494dc3b.

Location:

c/src/lib/libbsp/sparc

Files:

• erc32/startup/spurious.c (modified) (1 diff)
• leon2/startup/spurious.c (modified) (1 diff)
• leon3/startup/spurious.c (modified) (1 diff)

c/src/lib/libbsp/sparc/erc32/startup/spurious.c

@@ -156 +156 @@
     /*
      *  Skip window overflow, underflow, and flush as well as software
-     *  trap 0 which we will use as a shutdown. Also avoid trap 0x70 - 0x7f
-     *  which cannot happen and where some of the space is used to pass
-     *  paramaters to the program.
+     *  trap 0,9,10 which we will use as a shutdown, IRQ disable, IRQ enable.
+     *  Also avoid trap 0x70 - 0x7f which cannot happen and where some of the
+     *  space is used to pass parameters to the program.
      */
 
     if (( trap == 5 || trap == 6 ) ||
         (( trap >= 0x11 ) && ( trap <= 0x1f )) ||
-        (( trap >= 0x70 ) && ( trap <= 0x83 )))
+        (( trap >= 0x70 ) && ( trap <= 0x83 )) ||
+        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS ) ||
+        ( trap == 0x80 + SPARC_SWTRAP_IRQEN ))
       continue;
 

c/src/lib/libbsp/sparc/leon2/startup/spurious.c

@@ -143 +143 @@
     /*
      *  Skip window overflow, underflow, and flush as well as software
-     *  trap 0 which we will use as a shutdown. Also avoid trap 0x70 - 0x7f
-     *  which cannot happen and where some of the space is used to pass
-     *  paramaters to the program.
+     *  trap 0,9,10 which we will use as a shutdown, IRQ disable, IRQ enable.
+     *  Also avoid trap 0x70 - 0x7f which cannot happen and where some of the
+     *  space is used to pass parameters to the program.
      */
 
     if (( trap == 5 || trap == 6 ) ||
         (( trap >= 0x11 ) && ( trap <= 0x1f )) ||
-        (( trap >= 0x70 ) && ( trap <= 0x83 )))
+        (( trap >= 0x70 ) && ( trap <= 0x83 )) ||
+        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS ) ||
+        ( trap == 0x80 + SPARC_SWTRAP_IRQEN ))
       continue;
 

c/src/lib/libbsp/sparc/leon3/startup/spurious.c

@@ -150 +150 @@
      *  trap 0,9,10 which we will use as a shutdown, IRQ disable, IRQ enable.
      *  Also avoid trap 0x70 - 0x7f which cannot happen and where some of the
-     *  space is used to pass paramaters to the program.
+     *  space is used to pass parameters to the program.
      */