arm: Remove legacy execption support

22 files changed, 182 insertions, 595 deletions

diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index 9783354c98..a567a2c1c6 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -18,9 +18,6 @@ EXTRA_DIST =
 EXTRA_DIST += shared/comm/uart.h
 EXTRA_DIST += shared/comm/uart.c
 
-# abort
-EXTRA_DIST += shared/abort/simple_abort.c
-
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 27d159f3c9..09bc3582cd 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -38,8 +38,6 @@ libbsp_a_SOURCES += ../../shared/cpucounterread.c
 libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 # console
 libbsp_a_SOURCES += console/uart.c
-# abort
-libbsp_a_SOURCES += ../shared/abort/abort.c
 # IRQ
 include_bsp_HEADERS += ../../shared/include/irq-generic.h \
 	../../shared/include/irq-info.h
diff --git a/c/src/lib/libbsp/arm/csb336/start/start.S b/c/src/lib/libbsp/arm/csb336/start/start.S
index 1935ded76a..ce452f52a2 100644
--- a/c/src/lib/libbsp/arm/csb336/start/start.S
+++ b/c/src/lib/libbsp/arm/csb336/start/start.S
@@ -132,28 +132,35 @@ _hang:  b       _hang
  * of 16 words (64 bytes)
  */
 vector_block:
-        ldr     pc, Reset_Handler
-        ldr     pc, Undefined_Handler
-        ldr     pc, SWI_Handler
-        ldr     pc, Prefetch_Handler
-        ldr     pc, Abort_Handler
+        ldr    pc, handler_addr_reset
+        ldr    pc, handler_addr_undef
+        ldr    pc, handler_addr_swi
+        ldr    pc, handler_addr_prefetch
+        ldr    pc, handler_addr_abort
         nop
-        ldr     pc, IRQ_Handler
-        ldr     pc, FIQ_Handler
-
-Reset_Handler:          b       bsp_reset
-Undefined_Handler:      b       Undefined_Handler
-SWI_Handler:            b       SWI_Handler
-Prefetch_Handler:       b       Prefetch_Handler
-Abort_Handler:          b       Abort_Handler
-                        nop
-IRQ_Handler:            b       IRQ_Handler
-FIQ_Handler:            b       FIQ_Handler
-
-.globl Reset_Handler
-.globl Undefined_Handler
-.globl SWI_Handler
-.globl Prefetch_Handler
-.globl Abort_Handler
-.globl IRQ_Handler
-.globl FIQ_Handler
+        ldr    pc, handler_addr_irq
+        ldr    pc, handler_addr_fiq
+
+handler_addr_reset:
+        .word  bsp_reset
+
+handler_addr_undef:
+        .word  _ARMV4_Exception_undef_default
+
+handler_addr_swi:
+        .word  _ARMV4_Exception_swi_default
+
+handler_addr_prefetch:
+        .word  _ARMV4_Exception_pref_abort_default
+
+handler_addr_abort:
+        .word  _ARMV4_Exception_data_abort_default
+
+handler_addr_reserved:
+        .word  _ARMV4_Exception_reserved_default
+
+handler_addr_irq:
+        .word  _ARMV4_Exception_interrupt
+
+handler_addr_fiq:
+        .word  _ARMV4_Exception_fiq_default
diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
index 0a134ba162..8970dfbe4a 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
@@ -55,12 +55,6 @@ static void bsp_start_default( void )
   MC9328MXL_AITC_NIMASK = 0x1f;
 
   /*
-   * Init rtems exceptions management
-   */
-  /* FIXME: Use shared start.S */
-  rtems_exception_init_mngt();
-
-  /*
    * Init rtems interrupt management
    */
   bsp_interrupt_initialize();
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 018bf671e3..f4bcd3540c 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -75,8 +75,6 @@ libbsp_a_SOURCES += ../../shared/src/irq-shell.c
 if ENABLE_LCD
 libbsp_a_SOURCES += console/sed1356.c console/fbcons.c
 endif
-# abort
-libbsp_a_SOURCES += ../shared/abort/abort.c
 # umon
 if ENABLE_UMON
 libbsp_a_SOURCES += ../../shared/umon/umonrtemsglue.c  \
diff --git a/c/src/lib/libbsp/arm/csb337/start/start.S b/c/src/lib/libbsp/arm/csb337/start/start.S
index 1c77d9913d..f88cf41d78 100644
--- a/c/src/lib/libbsp/arm/csb337/start/start.S
+++ b/c/src/lib/libbsp/arm/csb337/start/start.S
@@ -118,28 +118,35 @@ _hang:  b       _hang
  * of 16 words (64 bytes)
  */
 vector_block:
-        ldr     pc, Reset_Handler
-        ldr     pc, Undefined_Handler
-        ldr     pc, SWI_Handler
-        ldr     pc, Prefetch_Handler
-        ldr     pc, Abort_Handler
+        ldr    pc, handler_addr_reset
+        ldr    pc, handler_addr_undef
+        ldr    pc, handler_addr_swi
+        ldr    pc, handler_addr_prefetch
+        ldr    pc, handler_addr_abort
         nop
-        ldr     pc, IRQ_Handler
-        ldr     pc, FIQ_Handler
-
-Reset_Handler:          b       bsp_reset
-Undefined_Handler:      b       Undefined_Handler
-SWI_Handler:            b       SWI_Handler
-Prefetch_Handler:       b       Prefetch_Handler
-Abort_Handler:          b       Abort_Handler
-                        nop
-IRQ_Handler:            b       IRQ_Handler
-FIQ_Handler:            b       FIQ_Handler
-
-.globl Reset_Handler
-.globl Undefined_Handler
-.globl SWI_Handler
-.globl Prefetch_Handler
-.globl Abort_Handler
-.globl IRQ_Handler
-.globl FIQ_Handler
+        ldr    pc, handler_addr_irq
+        ldr    pc, handler_addr_fiq
+
+handler_addr_reset:
+        .word  bsp_reset
+
+handler_addr_undef:
+        .word  _ARMV4_Exception_undef_default
+
+handler_addr_swi:
+        .word  _ARMV4_Exception_swi_default
+
+handler_addr_prefetch:
+        .word  _ARMV4_Exception_pref_abort_default
+
+handler_addr_abort:
+        .word  _ARMV4_Exception_data_abort_default
+
+handler_addr_reserved:
+        .word  _ARMV4_Exception_reserved_default
+
+handler_addr_irq:
+        .word  _ARMV4_Exception_interrupt
+
+handler_addr_fiq:
+        .word  _ARMV4_Exception_fiq_default
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
index 75c8fd7402..a47198598c 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
@@ -54,12 +54,6 @@ static void bsp_start_default( void )
   bsp_usart_init(); 
 
   /*
-   * Init rtems exceptions management
-   */
-  /* FIXME: Use shared start.S */
-  rtems_exception_init_mngt();
-
-  /*
    * Init rtems interrupt management
    */
   bsp_interrupt_initialize();
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index fae2c5fdf9..ff0fa67115 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -47,8 +47,6 @@ libbsp_a_SOURCES += console/uart.c ../../shared/console.c \
     ../../shared/console_read.c ../../shared/console_write.c 
 # timer
 libbsp_a_SOURCES += timer/timer.c
-# abort
-libbsp_a_SOURCES += ../shared/abort/abort.c
 
 # irq
 include_bsp_HEADERS += ../../shared/include/irq-generic.h \
diff --git a/c/src/lib/libbsp/arm/edb7312/start/start.S b/c/src/lib/libbsp/arm/edb7312/start/start.S
index e1af00d39a..e03707bfcf 100644
--- a/c/src/lib/libbsp/arm/edb7312/start/start.S
+++ b/c/src/lib/libbsp/arm/edb7312/start/start.S
@@ -37,44 +37,38 @@
 ********************************************************/
 
 Vector_Init_Block:
-	LDR	PC, Reset_Addr
-	LDR	PC, Undefined_Addr
-	LDR	PC, SWI_Addr
-	LDR	PC, Prefetch_Addr
-	LDR	PC, Abort_Addr
-	NOP
-	LDR	PC, IRQ_Addr
-	LDR	PC, FIQ_Addr
-
-	.globl Reset_Addr
-Reset_Addr:	.long   _start
-Undefined_Addr:	.long	Undefined_Handler
-SWI_Addr:	.long	SWI_Handler
-Prefetch_Addr:	.long	Prefetch_Handler
-Abort_Addr:	.long	Abort_Handler
-		.long	0
-IRQ_Addr:	.long	IRQ_Handler
-FIQ_Addr:	.long	FIQ_Handler
-
-/* The following handlers do not do anything useful */
-	.globl Undefined_Handler
-Undefined_Handler:
-        B       Undefined_Handler
-	.globl SWI_Handler
-SWI_Handler:
-        B       SWI_Handler
-	.globl Prefetch_Handler
-Prefetch_Handler:
-        B       Prefetch_Handler
-	.globl Abort_Handler
-Abort_Handler:
-        B       Abort_Handler
-	.globl IRQ_Handler
-IRQ_Handler:
-        B       IRQ_Handler
-	.globl FIQ_Handler
-FIQ_Handler:
-        B       FIQ_Handler
+        ldr    pc, handler_addr_reset
+        ldr    pc, handler_addr_undef
+        ldr    pc, handler_addr_swi
+        ldr    pc, handler_addr_prefetch
+        ldr    pc, handler_addr_abort
+        nop
+        ldr    pc, handler_addr_irq
+        ldr    pc, handler_addr_fiq
+
+handler_addr_reset:
+        .word  _start
+
+handler_addr_undef:
+        .word  _ARMV4_Exception_undef_default
+
+handler_addr_swi:
+        .word  _ARMV4_Exception_swi_default
+
+handler_addr_prefetch:
+        .word  _ARMV4_Exception_pref_abort_default
+
+handler_addr_abort:
+        .word  _ARMV4_Exception_data_abort_default
+
+handler_addr_reserved:
+        .word  _ARMV4_Exception_reserved_default
+
+handler_addr_irq:
+        .word  _ARMV4_Exception_interrupt
+
+handler_addr_fiq:
+        .word  _ARMV4_Exception_fiq_default
 
 	.globl	_start
 _start:
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
index 31aff8c8e1..0f9c64d2d8 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
@@ -33,12 +33,6 @@ static void bsp_start_default( void )
   *EP7312_INTMR2 = 0;
 
   /*
-   * Init rtems exceptions management
-   */
-  /* FIXME: Use shared start.S */
-  rtems_exception_init_mngt();
-
-  /*
    * Init rtems interrupt management
    */
   bsp_interrupt_initialize();
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 708a75bbbc..68fb9ce7a3 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -49,8 +49,6 @@ libbsp_a_SOURCES += ../../shared/src/irq-info.c
 libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
 libbsp_a_SOURCES += ../../shared/src/irq-server.c
 libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-#abort
-libbsp_a_SOURCES += ../shared/abort/abort.c
 
 # Cache
 libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
diff --git a/c/src/lib/libbsp/arm/gumstix/start/start.S b/c/src/lib/libbsp/arm/gumstix/start/start.S
index 123d2d7f56..dccc99993e 100644
--- a/c/src/lib/libbsp/arm/gumstix/start/start.S
+++ b/c/src/lib/libbsp/arm/gumstix/start/start.S
@@ -122,28 +122,35 @@ _hang:  b       _hang
  * of 16 words (64 bytes)
  */
 vector_block:
-        ldr     pc, Reset_Handler
-        ldr     pc, Undefined_Handler
-        ldr     pc, SWI_Handler
-        ldr     pc, Prefetch_Handler
-        ldr     pc, Abort_Handler
+        ldr    pc, handler_addr_reset
+        ldr    pc, handler_addr_undef
+        ldr    pc, handler_addr_swi
+        ldr    pc, handler_addr_prefetch
+        ldr    pc, handler_addr_abort
         nop
-        ldr     pc, IRQ_Handler
-        ldr     pc, FIQ_Handler
-
-Reset_Handler:          b       bsp_reset
-Undefined_Handler:      b       Undefined_Handler
-SWI_Handler:            b       SWI_Handler
-Prefetch_Handler:       b       Prefetch_Handler
-Abort_Handler:          b       Abort_Handler
-                        nop
-IRQ_Handler:            b       IRQ_Handler
-FIQ_Handler:            b       FIQ_Handler
-
-.globl Reset_Handler
-.globl Undefined_Handler
-.globl SWI_Handler
-.globl Prefetch_Handler
-.globl Abort_Handler
-.globl IRQ_Handler
-.globl FIQ_Handler
+        ldr    pc, handler_addr_irq
+        ldr    pc, handler_addr_fiq
+
+handler_addr_reset:
+        .word  bsp_reset
+
+handler_addr_undef:
+        .word  _ARMV4_Exception_undef_default
+
+handler_addr_swi:
+        .word  _ARMV4_Exception_swi_default
+
+handler_addr_prefetch:
+        .word  _ARMV4_Exception_pref_abort_default
+
+handler_addr_abort:
+        .word  _ARMV4_Exception_data_abort_default
+
+handler_addr_reserved:
+        .word  _ARMV4_Exception_reserved_default
+
+handler_addr_irq:
+        .word  _ARMV4_Exception_interrupt
+
+handler_addr_fiq:
+        .word  _ARMV4_Exception_fiq_default
diff --git a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c b/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c
index cfbb122762..f86bf3d6e3 100644
--- a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c
@@ -30,8 +30,6 @@ static void bsp_start_default( void )
 {
   /* disable interrupts */
   XSCALE_INT_ICMR = 0x0;
-  /* FIXME: Use shared start.S */
-  rtems_exception_init_mngt();
   bsp_interrupt_initialize();
 } /* bsp_start */
 
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index fd5255fd0f..18eaf62247 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -51,8 +51,6 @@ libbsp_a_SOURCES += ../../shared/src/irq-info.c
 libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
 libbsp_a_SOURCES += ../../shared/src/irq-server.c
 libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-# simple_abort
-libbsp_a_SOURCES += ../shared/abort/simple_abort.c
 # debugio
 libbsp_a_SOURCES += console/uart.c
 
diff --git a/c/src/lib/libbsp/arm/rtl22xx/start/start.S b/c/src/lib/libbsp/arm/rtl22xx/start/start.S
index 0afd3ff1da..c038198aff 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/start/start.S
+++ b/c/src/lib/libbsp/arm/rtl22xx/start/start.S
@@ -123,80 +123,35 @@ _hang:  b       _hang
 ********************************************************/
 
 vector_block:
-	LDR	PC, Reset_Addr
-	LDR	PC, Undefined_Addr
-	LDR	PC, SWI_Addr
-	LDR	PC, Prefetch_Addr
-	LDR	PC, Abort_Addr
-	NOP
-	LDR	PC, IRQ_Addr
-	LDR	PC, FIQ_Addr
-
-	.globl Reset_Addr
-Reset_Addr:	.long   _start
-Undefined_Addr:	.long	Undefined_Handler
-SWI_Addr:	.long	SWI_Handler
-Prefetch_Addr:	.long	Prefetch_Handler
-Abort_Addr:	.long	Abort_Handler
-		.long	0
-IRQ_Addr:	.long	IRQ_Handler
-FIQ_Addr:	.long	FIQ_Handler
-
-/* The following handlers do not do anything useful */
-	.globl Undefined_Handler
-Undefined_Handler:
-        B       Undefined_Handler
-	.globl SWI_Handler
-SWI_Handler:
-        B       SWI_Handler
-	.globl Prefetch_Handler
-Prefetch_Handler:
-        B       Prefetch_Handler
-	.globl Abort_Handler
-Abort_Handler:
-        B       Abort_Handler
-	.globl IRQ_Handler
-IRQ_Handler:
-        B       IRQ_Handler
-	.globl FIQ_Handler
-FIQ_Handler:
-        B       FIQ_Handler
+        ldr    pc, handler_addr_reset
+        ldr    pc, handler_addr_undef
+        ldr    pc, handler_addr_swi
+        ldr    pc, handler_addr_prefetch
+        ldr    pc, handler_addr_abort
+        nop
+        ldr    pc, handler_addr_irq
+        ldr    pc, handler_addr_fiq
 
+handler_addr_reset:
+        .word  _start
 
+handler_addr_undef:
+        .word  _ARMV4_Exception_undef_default
 
+handler_addr_swi:
+        .word  _ARMV4_Exception_swi_default
 
-/*
- * This is the exception vector table and the pointers to
- * the functions that handle the exceptions. It's a total
- * of 16 words (64 bytes)
- */
+handler_addr_prefetch:
+        .word  _ARMV4_Exception_pref_abort_default
 
- /*******************************************************
+handler_addr_abort:
+        .word  _ARMV4_Exception_data_abort_default
 
-vector_block:
-        ldr     pc, Reset_Handler
-        ldr     pc, Undefined_Handler
-        ldr     pc, SWI_Handler
-        ldr     pc, Prefetch_Handler
-        ldr     pc, Abort_Handler
-        nop
-        ldr     pc, IRQ_Handler
-        ldr     pc, FIQ_Handler
-
-Reset_Handler:          b       bsp_reset
-Undefined_Handler:      b       Undefined_Handler
-SWI_Handler:            b       SWI_Handler
-Prefetch_Handler:       b       Prefetch_Handler
-Abort_Handler:          b       Abort_Handler
-                        nop
-IRQ_Handler:            b       IRQ_Handler
-FIQ_Handler:            b       FIQ_Handler
-
-.globl Reset_Handler
-.globl Undefined_Handler
-.globl SWI_Handler
-.globl Prefetch_Handler
-.globl Abort_Handler
-.globl IRQ_Handler
-.globl FIQ_Handler
- */
+handler_addr_reserved:
+        .word  _ARMV4_Exception_reserved_default
+
+handler_addr_irq:
+        .word  _ARMV4_Exception_interrupt
+
+handler_addr_fiq:
+        .word  _ARMV4_Exception_fiq_default
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
index c10308ca83..fa128d9054 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
@@ -72,12 +72,6 @@ static void bsp_start_default( void )
   UART0_Ini();
 
   /*
-   * Init rtems exceptions management
-   */
-  /* FIXME: Use shared start.S */
-  rtems_exception_init_mngt();
-
-  /*
    * Init rtems interrupt management
    */
   bsp_interrupt_initialize();
diff --git a/c/src/lib/libbsp/arm/shared/abort/abort.c b/c/src/lib/libbsp/arm/shared/abort/abort.c
deleted file mode 100644
index 657b2f489a..0000000000
--- a/c/src/lib/libbsp/arm/shared/abort/abort.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *  ARM CPU Dependent Source
- *
- *  If you want a small footprint RTEMS, pls use simple_abort.c
- */
-
-/*
- *  COPYRIGHT (c) 2007 Ray Xu.
- *  mailto: Rayx at gmail dot com
- *
- *  COPYRIGHT (c) 2000 Canon Research Centre France SA.
- *  Emmanuel Raguet, mailto:raguet@crf.canon.fr
- *
- *  Copyright (c) 2002 Advent Networks, Inc
- *      Jay Monkman <jmonkman@adventnetworks.com>
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- *
- */
-
-#include <rtems/system.h>
-#include <rtems.h>
-#include <rtems/bspIo.h>
-#include "abort.h"
-
-uint32_t g_data_abort_cnt = 0;
-/*this is a big overhead for MCU only got 16K RAM*/
-uint32_t g_data_abort_insn_list[1024];
-
-
-char *_print_full_context_mode2txt[0x20]={
-  [0x0]="user",  /* User */
-  [0x1]="fiq",   /* FIQ - Fast Interrupt Request */
-  [0x2]="irq",   /* IRQ - Interrupt Request */
-  [0x3]="super", /* Supervisor */
-  [0x7]="abort", /* Abort */
-  [0xb]="undef", /* Undefined */
-  [0xf]="system" /* System */
-};
-
-void _print_full_context(uint32_t spsr)
-{
-    char *mode;
-    uint32_t prev_sp,prev_lr,cpsr,arm_switch_reg;
-    int i;
-
-    printk("active thread thread 0x%08x\n", rtems_task_self());
-
-    mode=_print_full_context_mode2txt[spsr&0x1f];
-    if(!mode) mode="unknown";
-
-    __asm__ volatile (ARM_SWITCH_TO_ARM
-              "	MRS  %[cpsr], cpsr \n"
-              "	ORR  %[arm_switch_reg], %[spsr], #0xc0 \n"
-              "	MSR  cpsr_c, %[arm_switch_reg] \n"
-              "	MOV  %[prev_sp], sp \n"
-              "	MOV  %[prev_lr], lr \n"
-              "	MSR  cpsr_c, %[cpsr] \n"
-	      ARM_SWITCH_BACK
-              : [arm_switch_reg] "=&r" (arm_switch_reg), [prev_sp] "=&r" (prev_sp), [prev_lr] "=&r" (prev_lr),
-		[cpsr] "=&r" (cpsr)
-              : [spsr] "r" (spsr)
-              : "cc");
-
-    printk("Previous sp=0x%08x lr=0x%08x and actual cpsr=%08x\n",
-           prev_sp, prev_lr, cpsr);
-
-    for(i=0;i<48;){
-        printk(" 0x%08x",((uint32_t*)prev_sp)[i++]);
-        if((i%6) == 0)
-            printk("\n");
-    }
-
-}
-
-
-/* This function is supposed to figure out what caused the
- * data abort, do that, then return.
- *
- * All unhandled instructions cause the system to hang.
- */
-
-void do_data_abort(
-  uint32_t insn,
-  uint32_t spsr,
-  Context_Control *ctx
-)
-{
-    /* Clarify, which type is correct, CPU_Exception_frame or Context_Control */
-    uint8_t               decode;
-    uint8_t               insn_type;
-    rtems_interrupt_level level;
-
-    g_data_abort_insn_list[g_data_abort_cnt & 0x3ff] = ctx->register_lr - 8;
-    g_data_abort_cnt++;
-
-    decode = ((insn >> 20) & 0xff);
-
-    insn_type = decode & INSN_MASK;
-    switch(insn_type) {
-    case INSN_STM1:
-        printk("\n\nINSN_STM1\n");
-        break;
-    case INSN_STM2:
-        printk("\n\nINSN_STM2\n");
-        break;
-    case INSN_STR:
-        printk("\n\nINSN_STR\n");
-        break;
-    case INSN_STRB:
-        printk("\n\nINSN_STRB\n");
-        break;
-    case INSN_LDM1:
-        printk("\n\nINSN_LDM1\n");
-        break;
-    case INSN_LDM23:
-        printk("\n\nINSN_LDM23\n");
-        break;
-    case INSN_LDR:
-        printk("\n\nINSN_LDR\n");
-        break;
-    case INSN_LDRB:
-        printk("\n\nINSN_LDRB\n");
-        break;
-    default:
-        printk("\n\nUnrecognized instruction\n");
-        break;
-    }
-
-    printk("data_abort at address 0x%x, instruction: 0x%x,   spsr = 0x%x\n",
-           ctx->register_lr - 8, insn, spsr);
-
-    _print_full_context(spsr);
-
-    /* disable interrupts, wait forever */
-    rtems_interrupt_disable(level);
-    (void) level; /* avoid set but unused warning */
-
-    while(1) {
-        continue;
-    }
-}
-
diff --git a/c/src/lib/libbsp/arm/shared/abort/abort.h b/c/src/lib/libbsp/arm/shared/abort/abort.h
deleted file mode 100644
index 6d8704f1d7..0000000000
--- a/c/src/lib/libbsp/arm/shared/abort/abort.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  COPYRIGHT (c) 2007 Ray Xu.
- *  mailto: Rayx at gmail dot com
- *
- *  COPYRIGHT (c) 2000 Canon Research Centre France SA.
- *  Emmanuel Raguet, mailto:raguet@crf.canon.fr
- *
- *  Copyright (c) 2002 Advent Networks, Inc
- *      Jay Monkman <jmonkman@adventnetworks.com>
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- *
- */
-
-#ifndef _BSPABORT_H
-#define _BSPABORT_H
-
-#include <rtems/system.h>
-#include <rtems.h>
-#include <rtems/bspIo.h>
-
-#define INSN_MASK         0xc5
-
-#define INSN_STM1         0x80
-#define INSN_STM2         0x84
-#define INSN_STR          0x40
-#define INSN_STRB         0x44
-
-#define INSN_LDM1         0x81
-#define INSN_LDM23        0x85
-#define INSN_LDR          0x41
-#define INSN_LDRB         0x45
-
-#define GET_RD(x)         ((x & 0x0000f000) >> 12)
-#define GET_RN(x)         ((x & 0x000f0000) >> 16)
-
-#define GET_U(x)          ((x & 0x00800000) >> 23)
-#define GET_I(x)          ((x & 0x02000000) >> 25)
-
-#define GET_REG(r, ctx)      (((uint32_t   *)ctx)[r])
-#define SET_REG(r, ctx, v)   (((uint32_t   *)ctx)[r] = v)
-#define GET_OFFSET(insn)     (insn & 0xfff)
-
-/*
- * Prototypes
- */
-void _print_full_context(uint32_t);
-void do_data_abort(uint32_t, uint32_t, Context_Control *);
-
-#endif /* _BSPABORT_H */
diff --git a/c/src/lib/libbsp/arm/shared/abort/simple_abort.c b/c/src/lib/libbsp/arm/shared/abort/simple_abort.c
deleted file mode 100644
index e721323b0d..0000000000
--- a/c/src/lib/libbsp/arm/shared/abort/simple_abort.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *  ARM CPU Dependent Source
- *
- *  COPYRIGHT (c) 2007 Ray Xu.
- *  mailto: Rayx.cn at gmail dot com
- *
- *  COPYRIGHT (c) 2000 Canon Research Centre France SA.
- *  Emmanuel Raguet, mailto:raguet@crf.canon.fr
- *
- *  Copyright (c) 2002 Advent Networks, Inc
- *      Jay Monkman <jmonkman@adventnetworks.com>
- *
- *  This is a simple implement of abort
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- *
- */
-
-#include <rtems/system.h>
-#include <rtems.h>
-#include <rtems/bspIo.h>
-#include "abort.h"
-
-char *_print_full_context_mode2txt[0x10]={
-  [0x0]="user",  /* User */
-  [0x1]="fiq",   /* FIQ - Fast Interrupt Request */
-  [0x2]="irq",   /* IRQ - Interrupt Request */
-  [0x3]="super", /* Supervisor */
-  [0x7]="abort", /* Abort */
-  [0xb]="undef", /* Undefined */
-  [0xf]="system" /* System */
-};
-
-void _print_full_context(uint32_t spsr)
-{
-  char *mode;
-  uint32_t prev_sp,prev_lr,cpsr,arm_switch_reg;
-  int i, j;
-
-  printk("active thread thread 0x%08x\n", rtems_task_self());
-
-  mode=_print_full_context_mode2txt[(spsr&0x1f)-0x10];
-  if(!mode) mode="unknown";
-
-  __asm__ volatile (
-    ARM_SWITCH_TO_ARM
-    "mrs %[cpsr], cpsr\n"
-    "orr %[arm_switch_reg], %[spsr], #0xc0\n"
-    "msr cpsr_c, %[arm_switch_reg]\n"
-    "mov %[prev_sp], sp\n"
-    "mov %[prev_lr], lr\n"
-    "msr cpsr_c, %[cpsr]\n"
-    ARM_SWITCH_BACK
-    : [prev_sp] "=&r" (prev_sp), [prev_lr] "=&r" (prev_lr),
-      [cpsr] "=&r" (cpsr), [arm_switch_reg] "=&r" (arm_switch_reg)
-    : [spsr] "r" (spsr)
-    : "cc"
-  );
-
-  printk(
-    "Previous sp=0x%08x lr=0x%08x and actual cpsr=%08x\n",
-     prev_sp,
-     prev_lr,
-     cpsr
-  );
-
-  j=0;
-  for(i=0;i<48;) {
-      printk(" 0x%08x",((uint32_t*)prev_sp)[i++]);
-      j++;
-      /*try not to use % because it introduces hundreds of byte overhead*/
-      if((j-6)==0) {
-          printk("\n");
-        j=0;
-      }
-  }
-}
-
-
-/* This function is supposed to figure out what caused the
- * data abort, do that, then return.
- *
- * All unhandled instructions cause the system to hang.
- */
-
-void do_data_abort(
-  uint32_t         insn,
-  uint32_t         spsr,
-  Context_Control *ctx
-)
-{
-  /* Clarify, which type is correct, CPU_Exception_frame or Context_Control */
-
-  uint8_t               decode;
-  uint8_t               insn_type;
-  rtems_interrupt_level level;
-
-  decode = ((insn >> 20) & 0xff);
-
-  insn_type = decode & INSN_MASK;
-  switch(insn_type) {
-  case INSN_STM1:
-    printk("\n\nINSN_STM1\n");
-    break;
-  case INSN_STM2:
-    printk("\n\nINSN_STM2\n");
-    break;
-  case INSN_STR:
-    printk("\n\nINSN_STR\n");
-    break;
-  case INSN_STRB:
-    printk("\n\nINSN_STRB\n");
-    break;
-  case INSN_LDM1:
-    printk("\n\nINSN_LDM1\n");
-    break;
-  case INSN_LDM23:
-    printk("\n\nINSN_LDM23\n");
-    break;
-  case INSN_LDR:
-    printk("\n\nINSN_LDR\n");
-    break;
-  case INSN_LDRB:
-    printk("\n\nINSN_LDRB\n");
-    break;
-  default:
-    printk("\n\nUnrecognized instruction\n");
-    break;
-  }
-
-  printk("data_abort at address 0x%x, instruction: 0x%x,   spsr = 0x%x\n",
-         ctx->register_lr - 8, insn, spsr);
-
-  _print_full_context(spsr);
-
-  /* disable interrupts, wait forever */
-  rtems_interrupt_disable(level);
-  (void)level;
-  while(1) {
-    continue;
-  }
-  return;
-}
-
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 7ded7214f4..7cf25e165b 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -57,8 +57,6 @@ libbsp_a_SOURCES += ../../shared/src/irq-info.c
 libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
 libbsp_a_SOURCES += ../../shared/src/irq-server.c
 libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-# abort
-libbsp_a_SOURCES += ../shared/abort/abort.c
 # smc
 libbsp_a_SOURCES += smc/smc.c
 libbsp_a_SOURCES += smc/smc.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/start/start.S b/c/src/lib/libbsp/arm/smdk2410/start/start.S
index f5f8891380..95d781cb89 100644
--- a/c/src/lib/libbsp/arm/smdk2410/start/start.S
+++ b/c/src/lib/libbsp/arm/smdk2410/start/start.S
@@ -171,28 +171,35 @@ _hang:  b       _hang
  * of 16 words (64 bytes)
  */
 vector_block:
-        ldr     pc, Reset_Handler
-        ldr     pc, Undefined_Handler
-        ldr     pc, SWI_Handler
-        ldr     pc, Prefetch_Handler
-        ldr     pc, Abort_Handler
+        ldr    pc, handler_addr_reset
+        ldr    pc, handler_addr_undef
+        ldr    pc, handler_addr_swi
+        ldr    pc, handler_addr_prefetch
+        ldr    pc, handler_addr_abort
         nop
-        ldr     pc, IRQ_Handler
-        ldr     pc, FIQ_Handler
-
-Reset_Handler:          b       bsp_reset
-Undefined_Handler:      b       Undefined_Handler
-SWI_Handler:            b       SWI_Handler
-Prefetch_Handler:       b       Prefetch_Handler
-Abort_Handler:          b       Abort_Handler
-                        nop
-IRQ_Handler:            b       IRQ_Handler
-FIQ_Handler:            b       FIQ_Handler
-
-.globl Reset_Handler
-.globl Undefined_Handler
-.globl SWI_Handler
-.globl Prefetch_Handler
-.globl Abort_Handler
-.globl IRQ_Handler
-.globl FIQ_Handler
+        ldr    pc, handler_addr_irq
+        ldr    pc, handler_addr_fiq
+
+handler_addr_reset:
+        .word  bsp_reset
+
+handler_addr_undef:
+        .word  _ARMV4_Exception_undef_default
+
+handler_addr_swi:
+        .word  _ARMV4_Exception_swi_default
+
+handler_addr_prefetch:
+        .word  _ARMV4_Exception_pref_abort_default
+
+handler_addr_abort:
+        .word  _ARMV4_Exception_data_abort_default
+
+handler_addr_reserved:
+        .word  _ARMV4_Exception_reserved_default
+
+handler_addr_irq:
+        .word  _ARMV4_Exception_interrupt
+
+handler_addr_fiq:
+        .word  _ARMV4_Exception_fiq_default
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/bspstart.c b/c/src/lib/libbsp/arm/smdk2410/startup/bspstart.c
index 5002e578c0..c70de1f291 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/smdk2410/startup/bspstart.c
@@ -71,12 +71,6 @@ static void bsp_start_default( void )
   rTCFG0 = (cr | (0<<0));
 
   /*
-   * Init rtems exceptions management
-   */
-  /* FIXME: Use shared start.S */
-  rtems_exception_init_mngt();
-
-  /*
    * Init rtems interrupt management
    */
   bsp_interrupt_initialize();