sparc: More reliable bad trap handling

Statically initialize the trap table in start.S to jump to _SPARC_Bad_trap()
for all unexpected traps.  This enables a proper RTEMS fatal error handling
right from the start.  Do not rely on the stack and register settings which
caused an unexpected trap.  Use the ISR stack of the processor to do the fatal
error handling.  Save the full context which caused the trap.  Fatal error
handler may use it for error logging.

Unify the _CPU_Exception_frame_print() implementations and move it to cpukit.

Update #4459.

10 files changed, 2 insertions, 578 deletions

diff --git a/bsps/sparc/erc32/include/bsp.h b/bsps/sparc/erc32/include/bsp.h
index 6347c58da3..300202bff5 100644
--- a/bsps/sparc/erc32/include/bsp.h
+++ b/bsps/sparc/erc32/include/bsp.h
@@ -90,8 +90,6 @@ rtems_isr_entry set_vector(                     /* returns old vector */
 
 void BSP_fatal_exit(uint32_t error);
 
-void bsp_spurious_initialize( void );
-
 /* Interrupt Service Routine (ISR) pointer */
 typedef void (*bsp_shared_isr)(void *arg);
 
diff --git a/bsps/sparc/erc32/start/bspstart.c b/bsps/sparc/erc32/start/bspstart.c
index 80447b9457..d56d3b2ff2 100644
--- a/bsps/sparc/erc32/start/bspstart.c
+++ b/bsps/sparc/erc32/start/bspstart.c
@@ -20,8 +20,6 @@
  */
 static void erc32_pre_driver_hook( void )
 {
-  bsp_spurious_initialize();
-
   /* Initialize shared interrupt handling, must be done after IRQ
    * controller has been found and initialized.
    */
diff --git a/bsps/sparc/erc32/start/spurious.c b/bsps/sparc/erc32/start/spurious.c
deleted file mode 100644
index b022f96f5c..0000000000
--- a/bsps/sparc/erc32/start/spurious.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *  ERC32 Spurious Trap Handler
- *
- *  This is just enough of a trap handler to let us know what
- *  the likely source of the trap was.
- *
- *  Developed as part of the port of RTEMS to the ERC32 implementation
- *  of the SPARC by On-Line Applications Research Corporation (OAR)
- *  under contract to the European Space Agency (ESA).
- *
- *  COPYRIGHT (c) 1995. European Space Agency.
- *
- *  This terms of the RTEMS license apply to this file.
- */
-
-#include <bsp.h>
-#include <rtems/bspIo.h>
-#include <inttypes.h>
-
-void _CPU_Exception_frame_print( const CPU_Exception_frame *frame )
-{
-  uint32_t                   trap;
-  uint32_t                   real_trap;
-  const CPU_Interrupt_frame *isf;
-
-  trap = frame->trap;
-  real_trap = SPARC_REAL_TRAP_NUMBER(trap);
-  isf = frame->isf;
-
-  printk(
-    "Unexpected trap (%2" PRId32 ") at address 0x%08" PRIx32 "\n",
-    real_trap,
-    isf->tpc
-  );
-
-  switch (real_trap) {
-
-    /*
-     *  First the ones defined by the basic architecture
-     */
-
-    case 0x00:
-      printk( "reset\n" );
-      break;
-    case 0x01:
-      printk( "instruction access exception\n" );
-      break;
-    case 0x02:
-      printk( "illegal instruction\n" );
-      break;
-    case 0x03:
-      printk( "privileged instruction\n" );
-      break;
-    case 0x04:
-      printk( "fp disabled\n" );
-      break;
-    case 0x07:
-      printk( "memory address not aligned\n" );
-      break;
-    case 0x08:
-      printk( "fp exception\n" );
-      break;
-    case 0x09:
-      printk("data access exception at 0x%08" PRIx32 "\n",
-        ERC32_MEC.First_Failing_Address );
-      break;
-    case 0x0A:
-      printk( "tag overflow\n" );
-      break;
-
-    /*
-     *  Then the ones defined by the ERC32 in particular
-     */
-
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_MASKED_ERRORS ):
-      printk( "ERC32_INTERRUPT_MASKED_ERRORS\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_EXTERNAL_1 ):
-      printk( "ERC32_INTERRUPT_EXTERNAL_1\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_EXTERNAL_2 ):
-      printk( "ERC32_INTERRUPT_EXTERNAL_2\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_UART_A_RX_TX ):
-      printk( "ERC32_INTERRUPT_UART_A_RX_TX\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_UART_B_RX_TX ):
-      printk( "ERC32_INTERRUPT_UART_A_RX_TX\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_CORRECTABLE_MEMORY_ERROR ):
-      printk( "ERC32_INTERRUPT_CORRECTABLE_MEMORY_ERROR\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_UART_ERROR ):
-      printk( "ERC32_INTERRUPT_UART_ERROR\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_DMA_ACCESS_ERROR ):
-      printk( "ERC32_INTERRUPT_DMA_ACCESS_ERROR\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_DMA_TIMEOUT ):
-      printk( "ERC32_INTERRUPT_DMA_TIMEOUT\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_EXTERNAL_3 ):
-      printk( "ERC32_INTERRUPT_EXTERNAL_3\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_EXTERNAL_4 ):
-      printk( "ERC32_INTERRUPT_EXTERNAL_4\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_GENERAL_PURPOSE_TIMER ):
-      printk( "ERC32_INTERRUPT_GENERAL_PURPOSE_TIMER\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_REAL_TIME_CLOCK ):
-      printk( "ERC32_INTERRUPT_REAL_TIME_CLOCK\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_EXTERNAL_5 ):
-      printk( "ERC32_INTERRUPT_EXTERNAL_5\n" );
-      break;
-    case ERC32_TRAP_TYPE( ERC32_INTERRUPT_WATCHDOG_TIMEOUT ):
-      printk( "ERC32_INTERRUPT_WATCHDOG_TIMEOUT\n" );
-      break;
-
-    default:
-      break;
-  }
-}
-
-static rtems_isr bsp_spurious_handler(
-   rtems_vector_number trap,
-   CPU_Interrupt_frame *isf
-)
-{
-  CPU_Exception_frame frame = {
-    .trap = trap,
-    .isf = isf
-  };
-
-#if !defined(SPARC_USE_LAZY_FP_SWITCH)
-  if ( SPARC_REAL_TRAP_NUMBER( trap ) == 4 ) {
-    _Internal_error( INTERNAL_ERROR_ILLEGAL_USE_OF_FLOATING_POINT_UNIT );
-  }
-#endif
-
-  rtems_fatal(
-    RTEMS_FATAL_SOURCE_EXCEPTION,
-    (rtems_fatal_code) &frame
-  );
-}
-
-/*
- *  bsp_spurious_initialize
- *
- *  Install the spurious handler for most traps. Note that set_vector()
- *  will unmask the corresponding asynchronous interrupt, so the initial
- *  interrupt mask is restored after the handlers are installed.
- */
-
-void bsp_spurious_initialize()
-{
-  uint32_t   trap;
-  uint32_t   level = 15;
-  uint32_t   mask;
-
-  level = sparc_disable_interrupts();
-  mask = ERC32_MEC.Interrupt_Mask;
-
-  for ( trap=0 ; trap<256 ; trap++ ) {
-
-    /*
-     *  Skip window overflow, underflow, and flush as well as software
-     *  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 ) ||
-#if defined(SPARC_USE_LAZY_FP_SWITCH)
-        ( trap == 4 ) ||
-#endif
-        (( trap >= 0x11 ) && ( trap <= 0x1f )) ||
-        (( trap >= 0x70 ) && ( trap <= 0x83 )) ||
-        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS ) ||
-#if defined(SPARC_USE_SYNCHRONOUS_FP_SWITCH)
-        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS_FP ) ||
-#endif
-        ( trap == 0x80 + SPARC_SWTRAP_IRQEN ))
-      continue;
-
-    set_vector( (rtems_isr_entry) bsp_spurious_handler,
-         SPARC_SYNCHRONOUS_TRAP( trap ), 1 );
-  }
-
-  ERC32_MEC.Interrupt_Mask = mask;
-  sparc_enable_interrupts(level);
-
-}
diff --git a/bsps/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h
index 5fe39d09d2..f97d78ba80 100644
--- a/bsps/sparc/leon2/include/bsp.h
+++ b/bsps/sparc/leon2/include/bsp.h
@@ -114,8 +114,6 @@ rtems_isr_entry set_vector(                     /* returns old vector */
 
 void BSP_fatal_exit(uint32_t error);
 
-void bsp_spurious_initialize( void );
-
 /* Interrupt Service Routine (ISR) pointer */
 typedef void (*bsp_shared_isr)(void *arg);
 
diff --git a/bsps/sparc/leon2/start/bspstart.c b/bsps/sparc/leon2/start/bspstart.c
index e3b9141bf5..8ffd0aa2e7 100644
--- a/bsps/sparc/leon2/start/bspstart.c
+++ b/bsps/sparc/leon2/start/bspstart.c
@@ -108,8 +108,6 @@ struct drvmgr_bus_res leon2_amba_res __attribute__((weak)) =
  */
 static void leon2_pre_driver_hook( void )
 {
-  bsp_spurious_initialize();
-
   /* Initialize shared interrupt handling, must be done after IRQ
    * controller has been found and initialized.
    */
diff --git a/bsps/sparc/leon2/start/spurious.c b/bsps/sparc/leon2/start/spurious.c
deleted file mode 100644
index 0d5fb1631c..0000000000
--- a/bsps/sparc/leon2/start/spurious.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * @file
- * @ingroup RTEMSBSPsSPARCLEON2
- * @brief LEON Spurious Trap Handler
- */
-
-/*
- *  LEON Spurious Trap Handler
- *
- *  This is just enough of a trap handler to let us know what
- *  the likely source of the trap was.
- *
- *  Developed as part of the port of RTEMS to the LEON implementation
- *  of the SPARC by On-Line Applications Research Corporation (OAR)
- *  under contract to the European Space Agency (ESA).
- *
- *  COPYRIGHT (c) 1995. European Space Agency.
- *
- *  This terms of the RTEMS license apply to this file.
- */
-
-#include <bsp.h>
-#include <rtems/bspIo.h>
-#include <inttypes.h>
-
-void _CPU_Exception_frame_print( const CPU_Exception_frame *frame )
-{
-  uint32_t                   trap;
-  uint32_t                   real_trap;
-  const CPU_Interrupt_frame *isf;
-
-  trap = frame->trap;
-  real_trap = SPARC_REAL_TRAP_NUMBER(trap);
-  isf = frame->isf;
-
-  printk(
-    "Unexpected trap (%2" PRId32 ") at address 0x%08" PRIx32 "\n",
-    real_trap,
-    isf->tpc
-  );
-
-  switch (real_trap) {
-
-    /*
-     *  First the ones defined by the basic architecture
-     */
-
-    case 0x00:
-      printk( "reset\n" );
-      break;
-    case 0x01:
-      printk( "instruction access exception\n" );
-      break;
-    case 0x02:
-      printk( "illegal instruction\n" );
-      break;
-    case 0x03:
-      printk( "privileged instruction\n" );
-      break;
-    case 0x04:
-      printk( "fp disabled\n" );
-      break;
-    case 0x07:
-      printk( "memory address not aligned\n" );
-      break;
-    case 0x08:
-      printk( "fp exception\n" );
-      break;
-    case 0x09:
-      printk("data access exception at 0x%08x\n", LEON_REG.Failed_Address );
-      break;
-    case 0x0A:
-      printk( "tag overflow\n" );
-      break;
-
-    /*
-     *  Then the ones defined by the LEON in particular
-     */
-
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_CORRECTABLE_MEMORY_ERROR ):
-      printk( "LEON_INTERRUPT_CORRECTABLE_MEMORY_ERROR\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_UART_2_RX_TX ):
-      printk( "LEON_INTERRUPT_UART_2_RX_TX\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_UART_1_RX_TX ):
-      printk( "LEON_INTERRUPT_UART_1_RX_TX\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_0 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_0\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_1 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_1\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_2 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_2\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_3 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_3\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_TIMER1 ):
-      printk( "LEON_INTERRUPT_TIMER1\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_TIMER2 ):
-      printk( "LEON_INTERRUPT_TIMER2\n" );
-      break;
-
-    default:
-      break;
-  }
-}
-
-static rtems_isr bsp_spurious_handler(
-   rtems_vector_number trap,
-   CPU_Interrupt_frame *isf
-)
-{
-  CPU_Exception_frame frame = {
-    .trap = trap,
-    .isf = isf
-  };
-
-#if !defined(SPARC_USE_LAZY_FP_SWITCH)
-  if ( SPARC_REAL_TRAP_NUMBER( trap ) == 4 ) {
-    _Internal_error( INTERNAL_ERROR_ILLEGAL_USE_OF_FLOATING_POINT_UNIT );
-  }
-#endif
-
-  rtems_fatal(
-    RTEMS_FATAL_SOURCE_EXCEPTION,
-    (rtems_fatal_code) &frame
-  );
-}
-
-/*
- *  bsp_spurious_initialize
- *
- *  Install the spurious handler for most traps. Note that set_vector()
- *  will unmask the corresponding asynchronous interrupt, so the initial
- *  interrupt mask is restored after the handlers are installed.
- */
-
-void bsp_spurious_initialize()
-{
-  uint32_t trap;
-  uint32_t level;
-  uint32_t mask;
-
-  level = sparc_disable_interrupts();
-  mask = LEON_REG.Interrupt_Mask;
-
-  for ( trap=0 ; trap<256 ; trap++ ) {
-
-    /*
-     *  Skip window overflow, underflow, and flush as well as software
-     *  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 ) ||
-#if defined(SPARC_USE_LAZY_FP_SWITCH)
-        ( trap == 4 ) ||
-#endif
-        (( trap >= 0x11 ) && ( trap <= 0x1f )) ||
-        (( trap >= 0x70 ) && ( trap <= 0x83 )) ||
-        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS ) ||
-#if defined(SPARC_USE_SYNCHRONOUS_FP_SWITCH)
-        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS_FP ) ||
-#endif
-        ( trap == 0x80 + SPARC_SWTRAP_IRQEN ))
-      continue;
-
-    set_vector(
-        (rtems_isr_entry) bsp_spurious_handler,
-        SPARC_SYNCHRONOUS_TRAP( trap ),
-        1
-    );
-  }
-
-  LEON_REG.Interrupt_Mask = mask;
-  sparc_enable_interrupts(level);
-
-}
diff --git a/bsps/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h
index 85730b5e20..6a96b91bf6 100644
--- a/bsps/sparc/leon3/include/bsp.h
+++ b/bsps/sparc/leon3/include/bsp.h
@@ -129,8 +129,6 @@ rtems_isr_entry set_vector(                     /* returns old vector */
 
 void BSP_fatal_exit(uint32_t error);
 
-void bsp_spurious_initialize( void );
-
 /*
  *  Delay for the specified number of microseconds.
  */
diff --git a/bsps/sparc/leon3/start/bspstart.c b/bsps/sparc/leon3/start/bspstart.c
index e4c3f1045e..69ff519189 100644
--- a/bsps/sparc/leon3/start/bspstart.c
+++ b/bsps/sparc/leon3/start/bspstart.c
@@ -98,8 +98,6 @@ static void leon3_interrupt_common_init( void )
  */
 static void leon3_pre_driver_hook( void )
 {
-  bsp_spurious_initialize();
-
 #ifndef RTEMS_DRVMGR_STARTUP
   leon3_interrupt_common_init();
 #endif
diff --git a/bsps/sparc/leon3/start/spurious.c b/bsps/sparc/leon3/start/spurious.c
deleted file mode 100644
index 23ac4bf4cf..0000000000
--- a/bsps/sparc/leon3/start/spurious.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *  LEON Spurious Trap Handler
- *
- *  This is just enough of a trap handler to let us know what
- *  the likely source of the trap was.
- *
- *  Developed as part of the port of RTEMS to the LEON implementation
- *  of the SPARC by On-Line Applications Research Corporation (OAR)
- *  under contract to the European Space Agency (ESA).
- *
- *  COPYRIGHT (c) 1995. European Space Agency.
- *
- *  Modified for LEON3 BSP.
- *  COPYRIGHT (c) 2004.
- *  Gaisler Research.
- *
- *  This terms of the RTEMS license apply to this file.
- */
-
-#include <bsp.h>
-#include <rtems/score/cpu.h>
-#include <rtems/bspIo.h>
-#include <inttypes.h>
-
-void _CPU_Exception_frame_print( const CPU_Exception_frame *frame )
-{
-  uint32_t                   trap;
-  uint32_t                   real_trap;
-  const CPU_Interrupt_frame *isf;
-
-  trap = frame->trap;
-  real_trap = SPARC_REAL_TRAP_NUMBER(trap);
-  isf = frame->isf;
-
-  printk(
-    "Unexpected trap (%2" PRId32 ") at address 0x%08" PRIx32 "\n",
-    real_trap,
-    isf->tpc
-  );
-
-  switch (real_trap) {
-
-    /*
-     *  First the ones defined by the basic architecture
-     */
-
-    case 0x00:
-      printk( "reset\n" );
-      break;
-    case 0x01:
-      printk( "instruction access exception\n" );
-      break;
-    case 0x02:
-      printk( "illegal instruction\n" );
-      break;
-    case 0x03:
-      printk( "privileged instruction\n" );
-      break;
-    case 0x04:
-      printk( "fp disabled\n" );
-      break;
-    case 0x07:
-      printk( "memory address not aligned\n" );
-      break;
-    case 0x08:
-      printk( "fp exception\n" );
-      break;
-    case 0x0A:
-      printk( "tag overflow\n" );
-      break;
-
-    /*
-     *  Then the ones defined by the LEON in particular
-     */
-      /* FIXME */
-
-      /*
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_CORRECTABLE_MEMORY_ERROR ):
-      printk( "LEON_INTERRUPT_CORRECTABLE_MEMORY_ERROR\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_UART_2_RX_TX ):
-      printk( "LEON_INTERRUPT_UART_2_RX_TX\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_UART_1_RX_TX ):
-      printk( "LEON_INTERRUPT_UART_1_RX_TX\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_0 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_0\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_1 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_1\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_2 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_2\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_EXTERNAL_3 ):
-      printk( "LEON_INTERRUPT_EXTERNAL_3\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_TIMER1 ):
-      printk( "LEON_INTERRUPT_TIMER1\n" );
-      break;
-    case LEON_TRAP_TYPE( LEON_INTERRUPT_TIMER2 ):
-      printk( "LEON_INTERRUPT_TIMER2\n" );
-      break;
-      */
-
-    default:
-      break;
-  }
-}
-
-static rtems_isr bsp_spurious_handler(
-   rtems_vector_number trap,
-   CPU_Interrupt_frame *isf
-)
-{
-  CPU_Exception_frame frame = {
-    .trap = trap,
-    .isf = isf
-  };
-
-#if !defined(SPARC_USE_LAZY_FP_SWITCH)
-  if ( SPARC_REAL_TRAP_NUMBER( trap ) == 4 ) {
-    _Internal_error( INTERNAL_ERROR_ILLEGAL_USE_OF_FLOATING_POINT_UNIT );
-  }
-#endif
-
-  rtems_fatal(
-    RTEMS_FATAL_SOURCE_EXCEPTION,
-    (rtems_fatal_code) &frame
-  );
-}
-
-/*
- *  bsp_spurious_initialize
- *
- *  Install the spurious handler for most traps. Note that set_vector()
- *  will unmask the corresponding asynchronous interrupt, so the initial
- *  interrupt mask is restored after the handlers are installed.
- */
-
-void bsp_spurious_initialize()
-{
-  uint32_t trap;
-  uint32_t level;
-  /* uint32_t mask; */
-
-  level = sparc_disable_interrupts();
-  /* mask = LEON3_IrqCtrl_Regs->mask_p0; */
-
-  for ( trap=0 ; trap<256 ; trap++ ) {
-
-    /*
-     *  Skip window overflow, underflow, and flush as well as software
-     *  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 ) ||
-#if defined(SPARC_USE_LAZY_FP_SWITCH)
-        ( trap == 4 ) ||
-#endif
-        (( trap >= 0x11 ) && ( trap <= 0x1f )) ||
-        (( trap >= 0x70 ) && ( trap <= 0x83 )) ||
-        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS ) ||
-#if defined(SPARC_USE_SYNCHRONOUS_FP_SWITCH)
-        ( trap == 0x80 + SPARC_SWTRAP_IRQDIS_FP ) ||
-#endif
-        ( trap == 0x80 + SPARC_SWTRAP_IRQEN ))
-      continue;
-
-    set_vector(
-        (rtems_isr_entry) bsp_spurious_handler,
-        SPARC_SYNCHRONOUS_TRAP( trap ),
-        1
-    );
-  }
-
-  /* LEON3_IrqCtrl_Regs->mask_p0 = mask; */
-  sparc_enable_interrupts(level);
-
-}
diff --git a/bsps/sparc/shared/start/start.S b/bsps/sparc/shared/start/start.S
index 9bdc752fa2..cd43f08f01 100644
--- a/bsps/sparc/shared/start/start.S
+++ b/bsps/sparc/shared/start/start.S
@@ -26,14 +26,11 @@
 #define TRAP_SYM(_vector) SYM(trap_##_vector)
 
 /*
- *  Unexpected trap will halt the processor by forcing it to error state
+ *  Unexpected trap will lead to an RTEMS fatal error.
  */
 #define BAD_TRAP(_vector) \
   TRAP_SYM(_vector):; \
-  ta 0; \
-  nop; \
-  nop; \
-  nop;
+  TRAP(_vector, _SPARC_Bad_trap)
 
 /*
  * System call optimized trap table entry