Update for exception support changes.

2026-11-08 00:40:21 +08:00 · 2009-10-23 07:32:46 +00:00
1 parent cc1e864dfe
commit 2d2de4eba1
@@ -1,3 +1,9 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* shared/clock/clock.c, shared/irq/irq_init.c,
+	shared/irq/openpic_i8259_irq.c: Changed exception header file
+	includes.
+
 2009-10-20	Till Straumann <strauman@slac.stanford.edu>

 	* shared/startup/pgtbl_setup.c: Fixed compiler warnings
@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq_init.c, irq/openpic_xxx_irq.c: Changed exception header file
+	includes.
+	* startup/bspstart.c: Update for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/ep1a.cfg: Remove RTEMS_BSP_FAMILY.
@@ -65,8 +65,6 @@ libbsp_a_SOURCES += pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \
    ../../powerpc/shared/pci/pcifinddevice.c

 include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h
 # irq
 libbsp_a_SOURCES += irq/irq_init.c irq/openpic_xxx_irq.c ../../powerpc/shared/irq/i8259.c 
@@ -87,11 +85,11 @@ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c \
    ../../shared/vmeUniverse/vme_am_defs.h

 libbsp_a_LIBADD = \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
@@ -27,7 +27,7 @@
 #include <bsp/openpic.h>
 #include <bsp/irq.h>
 #include <bsp.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>
 #include <bsp/motorola.h>
 #include <rtems/bspIo.h>

@@ -18,7 +18,6 @@
 #include <bsp/irq_supp.h>
 #include <bsp/VMEConfig.h>
 #include <bsp/openpic.h>
-#include <libcpu/raw_exception.h>
 #include <libcpu/io.h>
 #include <bsp/vectors.h>
 #include <stdlib.h>
@@ -105,14 +105,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: ../../powerpc/shared/irq/irq.h $(PROJECT_INCLUDE)/
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h

-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
 $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
@@ -277,8 +277,9 @@ void Read_ep1a_config_registers( ppc_cpu_id_t myCpu ) {

 void bsp_start( void )
 {
-  uint32_t intrStackStart;
-  uint32_t intrStackSize;
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
+  uintptr_t intrStackStart;
+  uintptr_t intrStackSize;
  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;
  Triv121PgTbl	pt=0;   /*  R = e; */
@@ -315,17 +316,20 @@ ShowBATS();
  /*
   * Initialize the interrupt related settings.
   */
-  intrStackStart = (uint32_t) __rtems_end;
+  intrStackStart = (uintptr_t) __rtems_end;
  intrStackSize = rtems_configuration_get_interrupt_stack_size();

  /*
   * Initialize default raw exception hanlders.
   */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
    intrStackStart,
    intrStackSize
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /*
   * Init MMU block address translation to enable hardware
@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq.c: Changed exception header file includes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-22	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* clock/clock.c: Add missing prototypes.
@@ -68,9 +68,7 @@ libbsp_a_SOURCES += i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h
 # ide
 libbsp_a_SOURCES += ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h

-include_bsp_HEADERS = ../../../libcpu/@RTEMS_CPU@/new-exceptions/bspsupport/vectors.h \
-	../../../libcpu/@RTEMS_CPU@/new-exceptions/bspsupport/ppc_exc_bspsupp.h \
-	../../shared/include/irq-generic.h \
+include_bsp_HEADERS = ../../shared/include/irq-generic.h \
 	include/irq-config.h \
 	include/irq.h \
 	include/i2cdrv.h \
@@ -134,7 +132,6 @@ libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
 	../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
 	../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
@@ -76,12 +76,10 @@
 #include <rtems.h>

 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>

 #include <bsp.h>
 #include <bsp/irq.h>
-#include <bsp/vectors.h>
-#include <bsp/ppc_exc_bspsupp.h>
 #include <bsp/irq-generic.h>
 #include <bsp/mpc5200.h>

@@ -101,14 +101,6 @@ $(PROJECT_LIB)/linkcmds.pm520: startup/linkcmds.pm520 $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.pm520
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.pm520

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/new-exceptions/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/new-exceptions/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
 $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
@@ -94,17 +94,15 @@
 /*                                                                     */
 /***********************************************************************/

-#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c).
-
 #include <rtems.h>
+
 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>

 #include <bsp.h>
+#include <bsp/vectors.h>
 #include <bsp/bootcard.h>
-#include <bsp/ppc_exc_bspsupp.h>
-
 #include <bsp/irq.h>
+#include <bsp/irq-generic.h>

 #if defined(HAS_UBOOT)
 /* will be overwritten from startup code */
@@ -132,6 +130,7 @@ void _BSP_Fatal_error(unsigned int v)

 void bsp_start(void)
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;

@@ -170,15 +169,19 @@ void bsp_start(void)

  /* Initialize exception handler */
  ppc_exc_cache_wb_check = 0;
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-    (uint32_t) bsp_interrupt_stack_start,
-    (uint32_t) bsp_interrupt_stack_size
+    (uintptr_t) bsp_interrupt_stack_start,
+    (uintptr_t) bsp_interrupt_stack_size
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /* Initalize interrupt support */
-  if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
-    BSP_panic( "Cannot intitialize interrupt support\n");
+  sc = bsp_interrupt_initialize();
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot intitialize interrupts");
  }

  /*
@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq.c, irq/irq_init.c: Changed exception header file includes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/gen83xx.inc: Remove RTEMS_BSP_FAMILY.
@@ -66,16 +66,18 @@ libbsp_a_SOURCES += ../shared/clock/clock.c
 include_bsp_HEADERS = include/irq.h \
 	include/irq-config.h \
 	../../shared/include/irq-generic.h \
+	../../shared/include/irq-info.h \
 	include/hwreg_vals.h \
 	../shared/include/u-boot.h \
 	../shared/include/tictac.h

 # irq
-libbsp_a_SOURCES += include/irq.h \
-	include/irq-config.h \
-	irq/irq.c \
+libbsp_a_SOURCES += irq/irq.c \
 	../../shared/src/irq-generic.c \
-	../../shared/src/irq-legacy.c
+	../../shared/src/irq-legacy.c \
+	../../shared/src/irq-info.c \
+	../../shared/src/irq-shell.c \
+	../../shared/src/irq-server.c

 # console
 libbsp_a_SOURCES += console/console.c console/ns16550cfg.c 
@@ -95,7 +97,6 @@ endif
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
 	../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel   \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
@@ -24,9 +24,7 @@
 #define TMTESTS_TM27_H

 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
-
-#include <bsp/ppc_exc_bspsupp.h>
+#include <bsp/vectors.h>

 #define MUST_WAIT_FOR_INTERRUPT 1

@@ -22,12 +22,10 @@
 #include <rtems.h>

 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>

 #include <bsp.h>
 #include <bsp/irq.h>
-#include <bsp/vectors.h>
-#include <bsp/ppc_exc_bspsupp.h>
 #include <bsp/irq-generic.h>

 #define MPC83XX_IPIC_VECTOR_NUMBER 92
@@ -101,6 +101,10 @@ $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h

+$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
+
 $(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
@@ -21,12 +21,11 @@
 */

 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>

 #include <bsp.h>
+#include <bsp/vectors.h>
 #include <bsp/bootcard.h>
 #include <bsp/irq-generic.h>
-#include <bsp/ppc_exc_bspsupp.h>

 #ifdef HAS_UBOOT

@@ -84,13 +83,12 @@ void _BSP_Fatal_error(unsigned n)
 void bsp_start( void)
 {
  rtems_status_code sc = RTEMS_SUCCESSFUL;
-  int rv = 0;

  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;

-  uint32_t interrupt_stack_start = (uint32_t) bsp_interrupt_stack_start;
-  uint32_t interrupt_stack_size = (uint32_t) bsp_interrupt_stack_size;
+  uintptr_t interrupt_stack_start = (uintptr_t) bsp_interrupt_stack_start;
+  uintptr_t interrupt_stack_size = (uintptr_t) bsp_interrupt_stack_size;

  /*
   * Get CPU identification dynamically. Note that the get_ppc_cpu_type() function
@@ -130,22 +128,25 @@ void bsp_start( void)
 #endif /* HAS_UBOOT */

  /* Initialize exception handler */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
    interrupt_stack_start,
    interrupt_stack_size
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /* Install default handler for the decrementer exception */
-  rv = ppc_exc_set_handler( ASM_DEC_VECTOR, mpc83xx_decrementer_exception_handler);
-  if (rv < 0) {
-    BSP_panic( "Cannot install decrementer exception handler!\n");
+  sc = ppc_exc_set_handler( ASM_DEC_VECTOR, mpc83xx_decrementer_exception_handler);
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot install decrementer exception handler");
  }

  /* Initalize interrupt support */
  sc = bsp_interrupt_initialize();
  if (sc != RTEMS_SUCCESSFUL) {
-    BSP_panic( "Cannot intitialize interrupt support\n");
+    BSP_panic("cannot intitialize interrupts\n");
  }

 #ifdef SHOW_MORE_INIT_SETTINGS
@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq.c, include/tm27.h: Changed exception header file includes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/haleakala.cfg: Remove RTEMS_BSP_FAMILY.
@@ -46,17 +46,15 @@ libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
    ../../powerpc/shared/console/console.c

 include_bsp_HEADERS += irq/irq.h \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h

 # irq
 libbsp_a_SOURCES += irq/irq_init.c irq/irq.c

 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
    ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel 
@@ -14,7 +14,7 @@
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <bsp/irq_supp.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>
 #include <libcpu/powerpc-utility.h>


@@ -166,7 +166,7 @@ BSP_setup_the_pic(rtems_irq_global_settings* config)
 */
 
 int 
-C_dispatch_irq_handler( struct _BSP_Exception_frame* frame, unsigned int excNum )
+C_dispatch_irq_handler( BSP_Exception_frame* frame, unsigned int excNum )
 {
 	if (excNum == ASM_EXT_VECTOR) {
 		uint32_t active[kUICWords];
@@ -139,7 +139,7 @@ extern "C" {
 	#define BSP_UART_COM1_IRQ		BSP_UIC_UART0 /* Required by shared/console/uart.c */
 	#define BSP_UART_COM2_IRQ		BSP_UIC_UART1

-	/* Define processor IRQ numbers; IRQs that are handled by the raw_exception vectors */
+	/* Define processor IRQ numbers; IRQs that are handled by the exception vectors */

 	#define BSP_PIT				BSP_PROCESSOR_IRQ_LOWEST_OFFSET	/* Required by ppc403/clock.c */
 	#define	BSP_FIT				BSP_PROCESSOR_IRQ_LOWEST_OFFSET + 1
@@ -13,7 +13,7 @@
 #include <libcpu/spr.h>
 #include <bsp/irq.h>
 #include <bsp.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>
 #include <rtems/bspIo.h>
 #include <rtems/powerpc/powerpc.h>

@@ -77,15 +77,7 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
 $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h

-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
@@ -64,10 +64,8 @@
 #include <bsp.h>
 #include <bsp/uart.h>
 #include <bsp/irq.h>
-#include <rtems/bspIo.h>
-#include <libcpu/cpuIdent.h>
-#include <rtems/powerpc/powerpc.h>
-#include <bsp/ppc_exc_bspsupp.h>
+#include <libcpu/powerpc-utility.h>
+#include <bsp/vectors.h>
 #include <ppc4xx/ppc405gp.h>
 #include <ppc4xx/ppc405ex.h>

@@ -171,6 +169,7 @@ BSP_output_char_function_type BSP_output_char = DirectUARTWrite;
 */
 void bsp_start( void )
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
  LINKER_SYMBOL(intrStack_start);
  LINKER_SYMBOL(intrStack_size);
  ppc_cpu_id_t myCpu;
@@ -205,10 +204,14 @@ void bsp_start( void )
  /*
   * Initialize default raw exception handlers. 
   */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-    (uint32_t) intrStack_start,
-    (uint32_t) intrStack_size);
+    (uintptr_t) intrStack_start,
+    (uintptr_t) intrStack_size
+  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /*
   * Install our own set of exception vectors
@@ -1,3 +1,12 @@
+2009-10-23	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* include/irq-config.h: New file.
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	Use generic interrupt support.
+	* make/custom/mbx8xx.inc, startup/linkcmds: Enable EABI.
+	* irq/irq.c, startup/bspstart.c: Converted to generic interrupt
+	support.  Update for exception support changes.
+
 2009-10-23	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* irq/irq.h: Add BSP_irq_enabled_at_cpm.
@@ -21,7 +21,10 @@ noinst_PROGRAMS =

 include_HEADERS += include/coverhd.h
 include_bsp_HEADERS = include/mbx.h include/commproc.h include/8xx_immap.h \
-    irq/irq.h vectors/vectors.h
+	irq/irq.h \
+	include/irq-config.h \
+	../../shared/include/irq-generic.h \
+	../../shared/include/irq-info.h

 EXTRA_DIST = times-mbx821 times-mbx860

@@ -35,12 +38,14 @@ libbsp_a_SOURCES += clock/p_clock.c
 # console
 libbsp_a_SOURCES += console/console.c
 # irq
-libbsp_a_SOURCES += irq/irq.c irq/irq_asm.S irq/irq_init.c
+libbsp_a_SOURCES += irq/irq.c \
+	../../shared/src/irq-generic.c \
+	../../shared/src/irq-legacy.c \
+	../../shared/src/irq-info.c \
+	../../shared/src/irq-shell.c \
+	../../shared/src/irq-server.c
 # ide
 libbsp_a_SOURCES += ide/idecfg.c ide/pcmcia_ide.c
-# vectors
-libbsp_a_SOURCES += vectors/vectors.h vectors/vectors_init.c \
-    vectors/vectors.S
 # startup
 libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
    ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
@@ -61,7 +66,7 @@ libbsp_a_LIBADD = \
    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8xx/clock.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8xx/console-generic.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8xx/cpm.rel \
@@ -40,7 +40,8 @@ RTEMS_CPU_MODEL=mpc$(8XX_CPU_TYPE)
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -Dmpc$(8XX_CPU_TYPE) -D$(RTEMS_MBX_MODEL)
+CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -Dmpc$(8XX_CPU_TYPE) -D$(RTEMS_MBX_MODEL) \
+	-meabi -msdata -fno-common

 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
@@ -68,9 +68,17 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
+$(PROJECT_INCLUDE)/bsp/irq-config.h: include/irq-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h
+
+$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
+
+$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h

 $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
@@ -18,8 +18,6 @@
 *  $Id$
 */

-#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c).
-
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <rtems/bspIo.h>
@@ -29,8 +27,6 @@

 SPR_RW(SPRG1)

-extern unsigned long intrStackPtr;
-
 /*
 *  Driver configuration parameters
 */
@@ -45,6 +41,9 @@ uint32_t   bsp_timer_average_overhead; /* Average overhead of timer in ticks */
 uint32_t   bsp_timer_least_valid;      /* Least valid number from timer      */
 bool       bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */

+extern char IntrStack_start [];
+extern char intrStack [];
+
 void BSP_panic(char *s)
 {
  printk("%s PANIC %s\n",_RTEMS_version, s);
@@ -83,9 +82,9 @@ void _BSP_Fatal_error(unsigned int v)
 */
 void bsp_start(void)
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;
-  register unsigned char* intrStack;

  /*
   * Get CPU identification dynamically. Note that the get_ppc_cpu_type() function
@@ -112,17 +111,22 @@ void bsp_start(void)
  rtems_cache_enable_data();
 #endif
 #endif
-  /*
-   * Initialize some SPRG registers related to irq handling
-   */

-  intrStack = (((unsigned char*)&intrStackPtr) - PPC_MINIMUM_STACK_FRAME_SIZE);
-  _write_SPRG1((unsigned int)intrStack);
+  /* Initialize exception handler */
+  sc = ppc_exc_initialize(
+    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
+    (uintptr_t) IntrStack_start,
+    (uintptr_t) intrStack - (uintptr_t) IntrStack_start
+  );
+  if ( sc != RTEMS_SUCCESSFUL ) {
+    BSP_panic( "cannot initialize exceptions" );
+  }

-  /*
-   * Install our own set of exception vectors
-   */
-  initialize_exceptions();
+  /* Initalize interrupt support */
+  sc = bsp_interrupt_initialize();
+  if ( sc != RTEMS_SUCCESSFUL ) {
+    BSP_panic( "cannot initialize interrupts" );
+  }

  /*
   *  initialize the device driver parameters
@@ -165,10 +169,7 @@ void bsp_start(void)
  m8xx.scc2p.rbase=0;
  m8xx.scc2p.tbase=0;
  m8xx_cp_execute_cmd( M8xx_CR_OP_STOP_TX | M8xx_CR_CHAN_SCC2 );
-  /*
-   * Initalize RTEMS IRQ system
-   */
-  BSP_rtems_irq_mng_init(0);
+
 #ifdef SHOW_MORE_INIT_SETTINGS
  printk("Exit from bspstart\n");
 #endif
@@ -21,13 +21,13 @@ RamSize = DEFINED(RamSize) ? RamSize : 4M;
 HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 MEMORY
-	{
-	ram : org = 0x0, l = 4M
-	nvram : org = 0xfa000000, l = 32K
-	dpram : org = 0xfa200000, l = 16K
-	flash : org = 0xfc000000, l = 2M
-	immr  : org = 0xfa200000, l = 16K
-	}
+  {
+    ram : org = 0x0, l = 4M
+    nvram : org = 0xfa000000, l = 32K
+    dpram : org = 0xfa200000, l = 16K
+    flash : org = 0xfc000000, l = 2M
+    immr  : org = 0xfa200000, l = 16K
+  }


 SECTIONS
@@ -45,7 +45,7 @@ SECTIONS
   *  The stack will live in this area - between the vectors and
   *  the text section.
   */
-	
+  
  .text 0x10000:
  {
    /* Read-only sections, merged into text segment: */
@@ -58,10 +58,10 @@ SECTIONS

    /* Actual code */
    *(.text*)
-	     
+       
    /* C++ constructors/destructors */
    *(.gnu.linkonce.t*)
-	     
+       
    /*  Initialization and finalization code.
     *
     *  Various files can provide initialization and finalization functions.
@@ -91,14 +91,14 @@ SECTIONS
     *  end terminate with a NULL entry.
     */
     
-    PROVIDE (__CTOR_LIST__ = .);	     
+    PROVIDE (__CTOR_LIST__ = .);       
    /* LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) */
    *crtbegin.o(.ctors)
    *(.ctors)
    *crtend.o(.ctors)
    LONG(0)
    PROVIDE (__CTOR_END__ = .);
-	
+  
    PROVIDE (__DTOR_LIST__ = .);
    /* LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) */
    *crtbegin.o(.dtors)
@@ -106,7 +106,7 @@ SECTIONS
    *crtend.o(.dtors)
    LONG(0)
    PROVIDE (__DTOR_END__ = .);
-	
+  
    /*
     * Special FreeBSD sysctl sections.
     */
@@ -192,12 +192,6 @@ SECTIONS
    *(.data.*)
    *(.data1)
    
-    PROVIDE (__SDATA_START__ = .);
-    *(.sdata*)
-    *(.gnu.linkonce.d*)
-    *(.gnu.linkonce.s.*)
-    PROVIDE (__SDATA_END__ = .);
-    
    PROVIDE (__EXCEPT_START__ = .);
    *(.gcc_except_table*)
    PROVIDE (__EXCEPT_END__ = .);
@@ -206,7 +200,7 @@ SECTIONS
    *(.got.plt) 
    *(.got)
    PROVIDE(__GOT_END__ = .);
-	
+  
    *(.got1)
    
    PROVIDE (__GOT2_START__ = .);
@@ -214,40 +208,46 @@ SECTIONS
    *(.got2)
    PROVIDE (__GOT2_END__ = .);
    PROVIDE (_GOT2_END_ = .);
-	
+  
    PROVIDE (__FIXUP_START__ = .);
    PROVIDE (_FIXUP_START_ = .);
    *(.fixup)
    PROVIDE (_FIXUP_END_ = .);
    PROVIDE (__FIXUP_END__ = .);
-
-  /*  We want the small data sections together, so single-instruction offsets
-   *   can access them all.
-   */
-    PROVIDE (__SDATA2_START__ = .);
-    *(.sdata2)
-    *(.gnu.linkonce.s2.*)
-    *(.sbss2)
-    PROVIDE (__SDATA2_END__ = .);
  } > ram
-	
-	 
+  
+  .sdata : {
+    PROVIDE (_SDA_BASE_ = 32768);
+    *(.sdata .sdata.* .gnu.linkonce.s.*)
+  } > ram
+
+  .sbss : {
+    __bss_start = .;
+
+    PROVIDE (__sbss_start = .); PROVIDE (___sbss_start = .);
+    *(.scommon)
+    *(.dynsbss)
+    *(.sbss .sbss.* .gnu.linkonce.sb.*)
+    PROVIDE (__sbss_end = .); PROVIDE (___sbss_end = .);
+  } > ram
+
+  .sdata2 : {
+    PROVIDE (_SDA2_BASE_ = 32768);
+
+    *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+  } > ram =0
+
+  .sbss2 : {
+    *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
+  } > ram =0
+   
  .bss :
  {
-    PROVIDE (__SBSS_START__ = .);
-	
-    PROVIDE (__SBSS2_START__ = .);
-    *(.sbss2)
-    PROVIDE (__SBSS2_END__ = .);
-	
    bss.start = .;
    *(.bss .bss* .gnu.linkonce.b*)
-    *(.sbss*)
    *(COMMON)
    . = ALIGN(4);
    bss.end = .;
-    
-   PROVIDE (__SBSS_END__ = .);

  } > ram
  
@@ -1,3 +1,7 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/mcp750.cfg: Remove RTEMS_BSP_FAMILY.
@@ -80,9 +80,7 @@ libbsp_a_SOURCES += \
    ../../powerpc/shared/console/uart.h

 include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
+	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h

 # irq
 libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c \
@@ -133,11 +131,11 @@ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c \

 libbsp_a_LIBADD = \
    polledIO.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
@@ -97,14 +97,6 @@ $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bsps
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
 $(PROJECT_INCLUDE)/bsp/motorola.h: ../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
@@ -1,3 +1,9 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am: Update for exception support changes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21	Sebastian Huber <sebastian.huber@embedded-brains.de>

 	* network/smsc9218i.c, tests/tests.c: Update for interrupt handler
@@ -83,7 +83,6 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dspi.rel \
    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/esci.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel

 if HAS_NETWORKING
@@ -25,12 +25,12 @@
 #include <rtems.h>

 #include <libcpu/powerpc-utility.h>
+#include <bsp/vectors.h>

 #include <bsp.h>
 #include <bsp/bootcard.h>
 #include <bsp/irq.h>
 #include <bsp/irq-generic.h>
-#include <bsp/ppc_exc_bspsupp.h>

 #define RTEMS_STATUS_CHECKS_USE_PRINTK

@@ -188,6 +188,7 @@ static void mpc55xx_ebi_init()
 */
 void bsp_start(void)
 {
+	rtems_status_code sc = RTEMS_SUCCESSFUL;
 	ppc_cpu_id_t myCpu;
 	ppc_cpu_revision_t myCpuRevision;

@@ -224,16 +225,21 @@ void bsp_start(void)
 	
 	/* Initialize exceptions */
 	RTEMS_DEBUG_PRINT( "Initialize exceptions ...\n");
-	ppc_exc_initialize(
-          PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-          interrupt_stack_start,
-          interrupt_stack_size
-        );
-	DEBUG_DONE();
+	sc = ppc_exc_initialize(
+		PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
+		interrupt_stack_start,
+		interrupt_stack_size
+	);
+	if (sc != RTEMS_SUCCESSFUL) {
+		BSP_panic( "Cannot initialize exceptions");
+	} else {
+		DEBUG_DONE();
+	}

 	/* Initialize interrupts */
 	RTEMS_DEBUG_PRINT( "Initialize interrupts ...\n");
-	if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
+	sc = bsp_interrupt_initialize();
+	if (sc != RTEMS_SUCCESSFUL) {
 		BSP_panic( "Cannot initialize interrupts");
 	} else {
 		DEBUG_DONE();
@@ -1,3 +1,12 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* include/irq-config.h: New file.
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	Use generic interrupt support.
+	* make/custom/mpc8260ads.cfg, startup/linkcmds: Enable EABI.
+	* irq/irq.c, startup/bspstart.c: Converted to generic interrupt
+	support.  Update for exception support changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/mpc8260ads.cfg: Remove RTEMS_BSP_FAMILY.
@@ -35,11 +35,19 @@ libbsp_a_SOURCES += clock/p_clock.c
 # console
 libbsp_a_SOURCES += console/console.c

-include_bsp_HEADERS = irq/irq.h
-# irq
-libbsp_a_SOURCES += irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S
+include_bsp_HEADERS = irq/irq.h \
+	include/irq-config.h \
+	../../shared/include/irq-generic.h \
+	../../shared/include/irq-info.h
+
+# irq
+libbsp_a_SOURCES += irq/irq.c \
+	../../shared/src/irq-generic.c \
+	../../shared/src/irq-legacy.c \
+	../../shared/src/irq-info.c \
+	../../shared/src/irq-shell.c \
+	../../shared/src/irq-server.c

-include_bsp_HEADERS += vectors/vectors.h
 # startup
 libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
    ../../shared/bsppredriverhook.c ../../shared/bsppost.c \
@@ -47,10 +55,6 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c \
    ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c

-# vectors
-libbsp_a_SOURCES += vectors/vectors_init.c vectors/vectors.h \
-    vectors/vectors.S
-
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 network_CPPFLAGS += -D__BSD_VISIBLE
@@ -63,12 +67,12 @@ endif
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8260/clock.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8260/console-generic.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \
-    ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel
+    ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
@@ -14,7 +14,8 @@ RTEMS_CPU_MODEL=mpc8260
 #  and (hopefully) optimize for it. 
 #
 # CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -mstrict-align
-CPU_CFLAGS = -mcpu=603e -mstrict-align -Dmpc8260
+CPU_CFLAGS = -mcpu=603e -mstrict-align -Dmpc8260 \
+	-meabi -msdata -fno-common

 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
@@ -69,7 +69,15 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
+$(PROJECT_INCLUDE)/bsp/irq-config.h: include/irq-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h
+
+$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
+
+$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h

@@ -35,8 +35,6 @@
 *  $Id$
 */

-#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c).
-
 #include <bsp.h>

 /*
@@ -55,8 +53,6 @@

 SPR_RW(SPRG1)

-extern unsigned long intrStackPtr;
-
 /*
 *  Driver configuration parameters
 */
@@ -74,7 +70,9 @@ bool       bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */
 void  _BSP_GPLED1_on(void);
 void  _BSP_GPLED0_on(void);
 void  cpu_init(void);
-void  initialize_exceptions(void);
+
+extern char IntrStack_start [];
+extern char intrStack [];

 void BSP_panic(char *s)
 {
@@ -150,10 +148,10 @@ void _BSP_Uart2_disable()

 void bsp_start(void)
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
  extern void *_WorkspaceBase;
  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;
-  register unsigned char* intrStack;

  /* Set MPC8260ADS board LEDS and Uart enable lines */
  _BSP_GPLED0_off();
@@ -173,21 +171,24 @@ void bsp_start(void)
 /*
  mmu_init();
 */
-  /*
-   * Initialize some SPRG registers related to irq handling
-   */

-  intrStack = (((unsigned char*)&intrStackPtr) - PPC_MINIMUM_STACK_FRAME_SIZE);
-  _write_SPRG1((unsigned int)intrStack);
+  /* Initialize exception handler */
+  /* FIXME: Interrupt stack begin and size */
+  sc = ppc_exc_initialize(
+    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
+    (uintptr_t) IntrStack_start,
+    (uintptr_t) intrStack - (uintptr_t) IntrStack_start
+  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot intitialize exceptions");
+  }

-/*
-  printk( "About to call initialize_exceptions\n" );
-*/
-   /*
-    * Install our own set of exception vectors
-    */
+  /* Initalize interrupt support */
+  sc = bsp_interrupt_initialize();
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot intitialize interrupts");
+  }

-   initialize_exceptions();

 /*
  mmu_init();
@@ -227,11 +228,6 @@ void bsp_start(void)
  m8260.brgc1 = M8260_BRG_EN + (uint32_t)(((uint16_t)((40016384)/(32768)) - 1) << 1) + 0;
 */

-  /*
-   * Initalize RTEMS IRQ system
-   */
-  BSP_rtems_irq_mng_init(0);
-
 #ifdef SHOW_MORE_INIT_SETTINGS
  printk("Exit from bspstart\n");
 #endif
@@ -208,29 +208,39 @@ SECTIONS
    .fixup	  : { *(.fixup) 	} >ram
    PROVIDE (_FIXUP_END_ = .);
    PROVIDE (__FIXUP_END__ = .);
+  
+    .sdata : {
+      PROVIDE (_SDA_BASE_ = 32768);
+      *(.sdata .sdata.* .gnu.linkonce.s.*)
+    } > ram
+ 
+    .sbss : {
+      __bss_start = .;
+ 
+      PROVIDE (__sbss_start = .); PROVIDE (___sbss_start = .);
+      *(.scommon)
+      *(.dynsbss)
+      *(.sbss .sbss.* .gnu.linkonce.sb.*)
+      PROVIDE (__sbss_end = .); PROVIDE (___sbss_end = .);
+    } > ram
+ 
+    .sdata2 : {
+      PROVIDE (_SDA2_BASE_ = 32768);
+ 
+      *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+    } > ram =0
+ 
+    .sbss2 : {
+      *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
+    } > ram =0

-    PROVIDE (__SDATA2_START__ = .);
-    .sdata2   	  : { *(.sdata2) *(.gnu.linkonce.s2.*)	} >ram
-    .sbss2   	  : { *(.sbss2) *(.gnu.linkonce.sb2.*)	} >ram
-    PROVIDE (__SBSS2_END__ = .);
-
-    .sbss2   	  : { *(.sbss2) 	} >ram
-    PROVIDE (__SBSS2_END__ = .);
-
-    __SBSS_START__ = .;
    .bss :
    {
      bss.start = .;
      *(.bss .bss* .gnu.linkonce.b*)
-      *(.sbss*) *(COMMON)
      . = ALIGN(4);
      bss.end = .;
    } > ram
-    __SBSS_END__ = .;
-
-
-
-

    /* R/W Data */
    .data ( . ) :
@@ -1,3 +1,9 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq_init.c: Changed exception header file includes.
+	* startup/bspstart.c: Update for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/mvme3100.cfg: Remove RTEMS_BSP_FAMILY.
@@ -97,8 +97,6 @@ libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
    ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h

 include_bsp_HEADERS += \
-  ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
-  ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \
  ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h

 include_bsp_HEADERS += vme/VMEConfig.h \
@@ -142,12 +140,12 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif

 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
    ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \
    ../../../libcpu/@RTEMS_CPU@/e500/timer.rel \
    ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel

@@ -25,7 +25,7 @@
 #include <bsp/openpic.h>
 #include <bsp/irq.h>
 #include <bsp.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>
 #include <rtems/bspIo.h>

 static void nop_func(void *unused)
@@ -89,14 +89,6 @@ $(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
 $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
@@ -225,9 +225,10 @@ SPR_RW(HID1)

 void bsp_start( void )
 {
+rtems_status_code   sc;
 unsigned char       *stack;
-uint32_t            intrStackStart;
-uint32_t            intrStackSize;
+uintptr_t           intrStackStart;
+uintptr_t           intrStackSize;
 char                *chpt;
 ppc_cpu_id_t        myCpu;
 ppc_cpu_revision_t  myCpuRevision;
@@ -271,17 +272,20 @@ VpdBufRec          vpdData [] = {
 	/*
 	 * Initialize the interrupt related settings.
 	 */
-	intrStackStart = (uint32_t) __rtems_end;
+	intrStackStart = (uintptr_t) __rtems_end;
 	intrStackSize = rtems_configuration_get_interrupt_stack_size();

 	/*
 	 * Initialize default raw exception handlers.
 	 */
-	ppc_exc_initialize(
+	sc = ppc_exc_initialize(
 		PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
 		intrStackStart,
 		intrStackSize
 	);
+	if (sc != RTEMS_SUCCESSFUL) {
+		BSP_panic("cannot initialize exceptions");
+	}

 	printk("CPU 0x%x - rev 0x%x\n", myCpu, myCpuRevision);

@@ -1,3 +1,10 @@
+2009-10-23	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/BSP_irq.c, irq/irq_init.c, vectors/exceptionhandler.c: Changed
+	exception header file includes.
+	* startup/bspstart.c: Update for ppc_exc_initialize() changes.
+
 2009-10-23	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* irq/BSP_irq.c, network/if_100MHz/GT64260eth.c,
@@ -65,9 +65,7 @@ libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c

 include_bsp_HEADERS += vectors/bspException.h
 include_bsp_HEADERS += \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
+	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h

 # vectors
 libbsp_a_SOURCES += vectors/exceptionhandler.c \
@@ -120,7 +118,6 @@ libbsp_a_LIBADD = \
    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
@@ -32,7 +32,6 @@
 #include <bsp/irq.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/apiext.h>
-#include <libcpu/raw_exception.h>
 #include <rtems/rtems/intr.h>
 #include <libcpu/io.h>
 #include <libcpu/byteorder.h>
@@ -18,7 +18,7 @@
 #include <libcpu/spr.h>
 #include <bsp/irq.h>
 #include <bsp.h>
-#include <libcpu/raw_exception.h>  /* ASM_EXT_VECTOR, ASM_DEC_VECTOR ... */
+#include <bsp/vectors.h>  /* ASM_EXT_VECTOR, ASM_DEC_VECTOR ... */
 /*#define  TRACE_IRQ_INIT*/

 /*
@@ -89,18 +89,10 @@ $(PROJECT_INCLUDE)/bsp/bspException.h: vectors/bspException.h $(PROJECT_INCLUDE)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspException.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspException.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
 $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h

-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
 $(PROJECT_INCLUDE)/bsp/bspMvme5500.h: GT64260/bspMvme5500.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspMvme5500.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspMvme5500.h
@@ -216,6 +216,7 @@ save_boot_params(

 void bsp_start( void )
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
 #ifdef CONF_VPD
  int i;
 #endif
@@ -228,8 +229,8 @@ void bsp_start( void )
 #ifdef SHOW_LCR3_REGISTER
  unsigned l3cr;
 #endif
-  uint32_t intrStackStart;
-  uint32_t intrStackSize;
+  uintptr_t intrStackStart;
+  uintptr_t intrStackSize;
  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;
  Triv121PgTbl  pt=0;
@@ -267,17 +268,20 @@ void bsp_start( void )
  /*
   * Initialize the interrupt related settings.
   */
-  intrStackStart = (uint32_t) __rtems_end;
+  intrStackStart = (uintptr_t) __rtems_end;
  intrStackSize = rtems_configuration_get_interrupt_stack_size();

  /*
   * Initialize default raw exception handlers.
   */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
    intrStackStart,
    intrStackSize
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /*
   * Init MMU block address translation to enable hardware
@@ -50,7 +50,6 @@

 #include <bsp.h>
 #include <bsp/vectors.h>
-#include <libcpu/raw_exception.h>
 #include <libcpu/spr.h>
 #include <bsp/pci.h>
 #include <rtems/bspIo.h>
@@ -60,9 +59,6 @@
 #define SRR1_TEA_EXC	(1<<(31-13))
 #define SRR1_MCP_EXC	(1<<(31-12))

-extern void
-BSP_printStackTrace(BSP_Exception_frame* excPtr);
-
 static volatile BSP_ExceptionExtension	BSP_exceptionExtension = 0;

 BSP_ExceptionExtension
@@ -1,3 +1,9 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq_init.c: Changed exception header file includes.
+	* startup/bspstart.c: Update for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/psim.cfg: Remove RTEMS_BSP_FAMILY.
@@ -57,10 +57,7 @@ EXTRA_DIST = vectors/README
 # vectors
 libbsp_a_SOURCES += vectors/align_h.S

-include_bsp_HEADERS += \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h	\
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h	\
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
+include_bsp_HEADERS += ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h

 EXTRA_DIST += shmsupp/README
 if HAS_MP
@@ -74,10 +71,10 @@ libbsp_a_SOURCES += network/if_sim.c
 endif

 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
@@ -20,7 +20,7 @@
 #include <bsp/irq.h>
 #include <bsp.h>
 #include <psim.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>
 #include <rtems/bspIo.h>
 #include <bsp/openpic.h>

@@ -81,15 +81,7 @@ $(PROJECT_INCLUDE)/bsp/openpic.h: ../shared/openpic/openpic.h $(PROJECT_INCLUDE)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
 $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h

-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
@@ -79,8 +79,9 @@ void _BSP_Fatal_error(unsigned int v)
 */
 void bsp_start( void )
 {
-  uint32_t intrStackStart;
-  uint32_t intrStackSize;
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
+  uintptr_t intrStackStart;
+  uintptr_t intrStackSize;

  /*
   * Note we can not get CPU identification dynamically, so
@@ -103,17 +104,20 @@ void bsp_start( void )
  /*
   * Initialize the interrupt related settings.
   */
-  intrStackStart = (uint32_t) __rtems_end;
+  intrStackStart = (uintptr_t) __rtems_end;
  intrStackSize = rtems_configuration_get_interrupt_stack_size();

  /*
   * Initialize default raw exception handlers.
   */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
    intrStackStart,
    intrStackSize
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /*
   * Initalize RTEMS IRQ system
@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq_init.c: Changed exception header file includes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/qemuppc.cfg: Remove RTEMS_BSP_FAMILY.
@@ -56,18 +56,10 @@ noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
    $(irq_SOURCES)

-#    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel
-include_bsp_HEADERS +=  ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h	\
-                       ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h	\
-                       ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
-
-
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel

@@ -20,12 +20,10 @@
 #include <rtems.h>

 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>

 #include <bsp.h>
 #include <bsp/irq.h>
 #include <bsp/vectors.h>
-#include <bsp/ppc_exc_bspsupp.h>

 int qemuppc_exception_handler( BSP_Exception_frame *frame, unsigned exception_number)
 {
@@ -55,6 +53,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void)
 		return RTEMS_IO_ERROR;
 	}

+	return RTEMS_SUCCESSFUL;
 }

 void bsp_interrupt_handler_default( rtems_vector_number vector)
@@ -81,15 +81,3 @@ $(PROJECT_INCLUDE)/bsp/irq-config.h: irq/irq-config.h $(PROJECT_INCLUDE)/bsp/$(d
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
-
-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
@@ -16,19 +16,16 @@

 #include <string.h>
 #include <fcntl.h>
-#include <bsp.h>
-#include <bsp/irq.h>
-#include <bsp/bootcard.h>
-#include <rtems/bspIo.h>
-#include <rtems/powerpc/powerpc.h>
-#include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
-#include <bsp/irq-generic.h>
-#include <bsp/ppc_exc_bspsupp.h>

-#include <libcpu/cpuIdent.h>
 #include <libcpu/bat.h>
 #include <libcpu/spr.h>
+#include <libcpu/powerpc-utility.h>
+
+#include <bsp.h>
+#include <bsp/irq.h>
+#include <bsp/vectors.h>
+#include <bsp/bootcard.h>
+#include <bsp/irq-generic.h>

 /*
 * CPU Bus Frequency
@@ -65,10 +62,10 @@ static int default_decrementer_exception_handler( BSP_Exception_frame *frame, un

 void bsp_start( void )
 {
-  uint32_t intrStackStart;
-  uint32_t intrStackSize;
-  int rv = 0;
-  rtems_status_code sc;
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
+  uintptr_t intrStackStart;
+  uintptr_t intrStackSize;
+
  /*
   * Note we can not get CPU identification dynamically, so
   * force current_ppc_cpu.
@@ -86,30 +83,33 @@ void bsp_start( void )
  /*
   * Initialize the interrupt related settings.
   */
-  intrStackStart = (uint32_t) bsp_interrupt_stack_start;
-  intrStackSize =  (uint32_t) bsp_interrupt_stack_size;
+  intrStackStart = (uintptr_t) bsp_interrupt_stack_start;
+  intrStackSize =  (uintptr_t) bsp_interrupt_stack_size;

  BSP_mem_size = (uint32_t )RamSize;

  /*
   * Initialize default raw exception handlers.
   */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
    intrStackStart,
    intrStackSize
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /* Install default handler for the decrementer exception */
-  rv = ppc_exc_set_handler( ASM_DEC_VECTOR, default_decrementer_exception_handler);
-  if (rv < 0) {
-    BSP_panic( "Cannot install decrementer exception handler!\n");
+  sc = ppc_exc_set_handler( ASM_DEC_VECTOR, default_decrementer_exception_handler);
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot install decrementer exception handler");
  }

  /* Initalize interrupt support */
  sc = bsp_interrupt_initialize();
  if (sc != RTEMS_SUCCESSFUL) {
-    BSP_panic( "Cannot intitialize interrupt support\n");
+    BSP_panic("cannot intitialize interrupts");
  }

 #if 0
@@ -1,3 +1,11 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq.c, irq/irq_init.c, irq/no_pic.c: Changed exception header
+	file includes.  Fixes for type changes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/score603e.cfg: Remove RTEMS_BSP_FAMILY.
@@ -46,8 +46,6 @@ pci_SOURCES = PCI_bus/flash.c ../../powerpc/shared/pci/pci.c \
    ../../powerpc/shared/pci/pcifinddevice.c  PCI_bus/PCI.c  PCI_bus/universe.c

 include_bsp_HEADERS += irq/irq.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h

 irq_SOURCES =  irq/no_pic.c irq/irq_init.c \
@@ -70,13 +68,13 @@ libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \
    $(pci_SOURCES) $(vectors_SOURCES) $(startup_SOURCES) 

 libbsp_a_LIBADD = \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel

@@ -16,7 +16,6 @@
 #include <bsp/irq.h>
 #include <bsp/VME.h>
 #include <rtems/score/apiext.h>  /* for post ISR signal processing */
-#include <libcpu/raw_exception.h>
 #include <libcpu/io.h>
 #include <bsp/vectors.h>
 #include <stdlib.h>
@@ -24,7 +24,7 @@
 #include <bsp/residual.h>
 #include <bsp/irq.h>
 #include <bsp.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>
 #include <rtems/bspIo.h>

 #define SHOW_ISA_PCI_BRIDGE_SETTINGS 1
@@ -16,7 +16,7 @@
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <bsp/irq_supp.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>

 static rtems_irq_connect_data *rtems_hdl_tbl;
 static rtems_irq_connect_data  dflt_entry;
@@ -25,7 +25,7 @@ static rtems_irq_connect_data  dflt_entry;
 * High level IRQ handler called from shared_raw_irq_code_entry
 */
 int C_dispatch_irq_handler(
-  struct _BSP_Exception_frame *frame,
+  BSP_Exception_frame *frame,
  unsigned int excNum
 )
 {
@@ -93,14 +93,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h

-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
 $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
@@ -157,10 +157,11 @@ void initialize_PMC(void) {

 void bsp_start( void )
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
  unsigned char        *work_space_start;
  unsigned int         msr_value = 0x0000;
-  uint32_t             intrStackStart;
-  uint32_t             intrStackSize;
+  uintptr_t            intrStackStart;
+  uintptr_t            intrStackSize;
  volatile uint32_t    *ptr;
  ppc_cpu_id_t         myCpu;
  ppc_cpu_revision_t   myCpuRevision;
@@ -190,7 +191,7 @@ void bsp_start( void )
  /*
   * Initialize the interrupt related settings.
   */
-  intrStackStart = (uint32_t) __rtems_end;
+  intrStackStart = (uintptr_t) __rtems_end;
  intrStackSize = rtems_configuration_get_interrupt_stack_size();
  printk("Interrupt Stack Start: 0x%x Size: 0x%x  Heap Start: 0x%x\n",
    intrStackStart, intrStackSize, BSP_heap_start
@@ -203,11 +204,14 @@ void bsp_start( void )
  /*
   * Initialize default raw exception handlers.
   */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
    intrStackStart,
    intrStackSize
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  msr_value = 0x2030;
  _CPU_MSR_SET( msr_value );
@@ -23,9 +23,7 @@
 #include <rtems/clockdrv.h>

 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
-
-#include <bsp/ppc_exc_bspsupp.h>
+#include <bsp/vectors.h>

 #define RTEMS_STATUS_CHECKS_USE_PRINTK

@@ -26,7 +26,6 @@
 #include <bsp/irq.h>
 #include <bsp/irq_supp.h>
 #include <bsp.h>
-#include <libcpu/raw_exception.h>
 #include <bsp/motorola.h>
 #include <rtems/bspIo.h>

@@ -21,7 +21,6 @@
 #include <bsp/VMEConfig.h>
 #endif
 #include <bsp/openpic.h>
-#include <libcpu/raw_exception.h>
 #include <libcpu/io.h>
 #include <bsp/vectors.h>
 #include <stdlib.h>
@@ -140,11 +140,12 @@ unsigned int get_eumbbar(void) {

 void bsp_start( void )
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
 #if !defined(mvme2100)
  unsigned l2cr;
 #endif
-  uint32_t intrStackStart;
-  uint32_t intrStackSize;
+  uintptr_t intrStackStart;
+  uintptr_t intrStackSize;
  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;
  prep_t boardManufacturer;
@@ -210,17 +211,20 @@ void bsp_start( void )
  /*
   * Initialize the interrupt related settings.
   */
-  intrStackStart = (uint32_t) __rtems_end;
+  intrStackStart = (uintptr_t) __rtems_end;
  intrStackSize = rtems_configuration_get_interrupt_stack_size();

  /*
   * Initialize default raw exception handlers.
   */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
    intrStackStart,
    intrStackSize
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  select_console(CONSOLE_LOG);

@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq.c: Changed exception header file includes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21  Thomas Doerfler  <Thomas.Doerfler@imd-systems.de>

 	* ChangeLog, Makefile.am, console/console.c, include/bsp.h, irq/irq.c, preinstall.am, startup/bspstart.c, startup/start.S:
@@ -22,10 +22,8 @@ noinst_PROGRAMS =
 include_HEADERS += include/coverhd.h
 include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \
    include/irq.h include/irq-config.h \
-    ../../shared/include/irq-generic.h\
-    spi/spi.h\
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
+    ../../shared/include/irq-generic.h \
+    spi/spi.h

 EXTRA_DIST = times-tqm866

@@ -78,7 +76,6 @@ libbsp_a_LIBADD = \
    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8xx/console-generic.rel \
    ../../../libcpu/@RTEMS_CPU@/mpc8xx/cpm.rel \
@@ -26,12 +26,10 @@
 #include <mpc8xx.h>

 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>

 #include <bsp.h>
 #include <bsp/irq.h>
-#include <bsp/vectors.h>
-#include <bsp/ppc_exc_bspsupp.h>
 #include <bsp/irq-generic.h>
 /*
 * functions to enable/disable a source at the SIU/CPM irq controller
@@ -81,14 +81,6 @@ $(PROJECT_INCLUDE)/bsp/spi.h: spi/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
 $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
@@ -20,14 +20,16 @@
 * $Id$
 */

-#include <rtems.h>
 #include <stdlib.h>
+
+#include <rtems.h>
+
 #include <libcpu/powerpc-utility.h>

 #include <bsp.h>
+#include <bsp/vectors.h>
 #include <bsp/bootcard.h>
 #include <bsp/irq-generic.h>
-#include <bsp/ppc_exc_bspsupp.h>

 #ifdef BSP_HAS_TQMMON
 /*
@@ -124,11 +126,12 @@ rtems_status_code  bsp_tqm_get_cib_uint32( const char *cib_id,

 void bsp_start( void)
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
  ppc_cpu_id_t myCpu;
  ppc_cpu_revision_t myCpuRevision;

-  uint32_t interrupt_stack_start = (uint32_t) bsp_interrupt_stack_start;
-  uint32_t interrupt_stack_size = (uint32_t) bsp_interrupt_stack_size;
+  uintptr_t interrupt_stack_start = (uintptr_t) bsp_interrupt_stack_start;
+  uintptr_t interrupt_stack_size = (uintptr_t) bsp_interrupt_stack_size;

  /*
   * Get CPU identification dynamically. Note that the get_ppc_cpu_type() function
@@ -177,14 +180,19 @@ void bsp_start( void)
  bsp_timer_average_overhead = 3;

  /* Initialize exception handler */
-  ppc_exc_initialize(PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-		     interrupt_stack_start,
-		     interrupt_stack_size
-		     );
+  sc = ppc_exc_initialize(
+    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
+    interrupt_stack_start,
+    interrupt_stack_size
+  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /* Initalize interrupt support */
-  if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
-    BSP_panic("Cannot intitialize interrupt support\n");
+  sc = bsp_interrupt_initialize();
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot intitialize interrupts");
  }

 #ifdef SHOW_MORE_INIT_SETTINGS
@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq.c: Changed exception header file includes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* make/custom/virtex.cfg: Remove RTEMS_BSP_FAMILY.
@@ -53,10 +53,6 @@ include_bsp_HEADERS += irq/irq.h
 # irq
 libbsp_a_SOURCES += irq/irq_init.c

-include_bsp_HEADERS +=  \
-  ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
-  ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
-
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 network_CPPFLAGS += -D__BSD_VISIBLE
@@ -68,8 +64,8 @@ endif

 libbsp_a_LIBADD = \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
    ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \
@@ -22,7 +22,6 @@
 #include <libcpu/spr.h>
 #include <bsp/irq.h>
 #include <bsp.h>
-#include <libcpu/raw_exception.h>
 #include <rtems/bspIo.h>
 #include <rtems/powerpc/powerpc.h>
 #include <bsp/vectors.h>
@@ -82,11 +82,3 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h

-$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
-
@@ -104,6 +104,7 @@ void bsp_XAssertHandler(const char* file, int line) {
 */
 void bsp_start( void )
 {
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
  extern unsigned char IntrStack_start[];
  extern unsigned char IntrStack_end[];
  ppc_cpu_id_t myCpu;
@@ -135,11 +136,14 @@ void bsp_start( void )
  /*
   * Initialize default raw exception handlers. 
   */
-  ppc_exc_initialize(
-	PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-	(uint32_t)IntrStack_start,
-	IntrStack_end - IntrStack_start
+  sc = ppc_exc_initialize(
+    PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
+    (uint32_t)IntrStack_start,
+    IntrStack_end - IntrStack_start
  );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }

  /*
   * Install our own set of exception vectors
@@ -1,3 +1,29 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* new-exceptions/bspsupport/ppc-code-copy.c,
+	new-exceptions/bspsupport/ppc_exc_address.c,
+	new-exceptions/bspsupport/ppc_exc_categories.c,
+	new-exceptions/bspsupport/ppc_exc_global_handler.c,
+	new-exceptions/bspsupport/ppc_exc_initialize.c,
+	new-exceptions/bspsupport/ppc_exc_naked.S,
+	new-exceptions/bspsupport/ppc_exc_prologue.c: New files.
+	* new-exceptions/bspsupport/irq.c,
+	new-exceptions/bspsupport/irq_supp.h,
+	new-exceptions/bspsupport/ppc_exc_asm_macros.h: Changed exception
+	header file includes.  Fixes for type changes.
+	* new-exceptions/bspsupport/vectors.h: Reformatted.  Documentation.
+	Removed parts that belong to the raw exception API.  Added
+	declarations from files "new-exceptions/raw_exception.h" and
+	"bspsupport/ppc_exc_bspsupp.h".
+	* new-exceptions/bspsupport/ppc_exc_hdl.c: Reformatted.  Removed parts
+	that belong to the raw exception API.
+	* new-exceptions/bspsupport/ppc_exc_bspsupp.h: Added prologue template.
+	* new-exceptions/bspsupport/ppc_exc.S: Fixed
+	ppc_exc_tgpr_clr_prolog_size.
+	* shared/include/powerpc-utility.h: Reformatted.  Include more files
+	for ASM.
+	* shared/include/cpuIdent.h: Added ppc_cpu_current() and ppc_cpu_is().
+
 2009-10-22	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* new-exceptions/bspsupport/vectors_init.c: Remove duplicate
@@ -15,6 +15,10 @@ include_libcpudir = $(includedir)/libcpu

 include_libcpu_HEADERS = shared/include/powerpc-utility.h

+include_bspdir = $(includedir)/bsp
+
+include_bsp_HEADERS =
+
 EXTRA_DIST =

 noinst_PROGRAMS = new-exceptions/rtems-cpu.rel
@@ -25,19 +29,20 @@ new_exceptions_rtems_cpu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)


 if !mpc5xx
-include_libcpu_HEADERS += new-exceptions/raw_exception.h
-noinst_PROGRAMS += new-exceptions/raw_exception.rel
-new_exceptions_raw_exception_rel_SOURCES = new-exceptions/raw_exception.c \
-    new-exceptions/asm_utils.S \
-	new-exceptions/e500_raw_exc_init.c
-new_exceptions_raw_exception_rel_CPPFLAGS = $(AM_CPPFLAGS)
-new_exceptions_raw_exception_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h

 noinst_PROGRAMS += new-exceptions/exc_bspsupport.rel
 new_exceptions_exc_bspsupport_rel_SOURCES = \
+    new-exceptions/bspsupport/ppc-code-copy.c \
    new-exceptions/bspsupport/ppc_exc.S \
+    new-exceptions/bspsupport/ppc_exc_naked.S \
    new-exceptions/bspsupport/ppc_exc_hdl.c \
-    new-exceptions/bspsupport/vectors_init.c
+    new-exceptions/bspsupport/ppc_exc_initialize.c \
+    new-exceptions/bspsupport/ppc_exc_global_handler.c \
+    new-exceptions/bspsupport/ppc_exc_categories.c \
+    new-exceptions/bspsupport/ppc_exc_address.c \
+    new-exceptions/bspsupport/ppc_exc_prologue.c
+
 new_exceptions_exc_bspsupport_rel_CPPFLAGS = $(AM_CPPFLAGS)
 new_exceptions_exc_bspsupport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)

@@ -50,7 +55,6 @@ endif

 EXTRA_DIST += new-exceptions/bspsupport/vectors.h
 EXTRA_DIST += new-exceptions/bspsupport/irq_supp.h
-EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_bspsupp.h
 EXTRA_DIST += new-exceptions/bspsupport/README
 EXTRA_DIST += new-exceptions/bspsupport/nest_irq_test.c
 EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c
@@ -357,11 +361,6 @@ endif
 if mpc83xx

 # Includes
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS = new-exceptions/bspsupport/vectors.h \
-	new-exceptions/bspsupport/ppc_exc_bspsupp.h
-
 include_mpc83xxdir = $(includedir)/mpc83xx

 include_mpc83xx_HEADERS = mpc83xx/include/mpc83xx.h
@@ -407,12 +406,6 @@ endif
 if mpc55xx

 # Includes
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS = new-exceptions/bspsupport/vectors.h \
-	new-exceptions/bspsupport/ppc_exc_bspsupp.h \
-	mpc55xx/include/irq.h
-
 include_mpc55xxdir = $(includedir)/mpc55xx

 include_mpc55xx_HEADERS = mpc55xx/include/regs.h \
@@ -424,6 +417,8 @@ include_mpc55xx_HEADERS = mpc55xx/include/regs.h \
 	mpc55xx/include/esci.h \
 	mpc55xx/include/watchdog.h

+include_bsp_HEADERS += mpc55xx/include/irq.h
+
 # IRQ
 noinst_PROGRAMS += mpc55xx/irq.rel
 mpc55xx_irq_rel_SOURCES = mpc55xx/irq/irq.c
@@ -20,12 +20,11 @@

 #include <mpc55xx/regs.h>

-#include <libcpu/raw_exception.h>
 #include <libcpu/powerpc-utility.h>

 #include <bsp/irq.h>
+#include <bsp/vectors.h>
 #include <bsp/irq-generic.h>
-#include <bsp/ppc_exc_bspsupp.h>

 #define RTEMS_STATUS_CHECKS_USE_PRINTK

@@ -69,7 +69,6 @@
 #ifdef	DEBUG_EXC
 #include <bsp.h>
 #include <bsp/vectors.h>
-#include <libcpu/raw_exception.h>
 #endif
 #endif

@@ -16,10 +16,7 @@
 #include <rtems.h>
 #include "irq_supp.h"
 #include <rtems/score/apiext.h>  /* for post ISR signal processing */
-#include <libcpu/raw_exception.h>
-#include <libcpu/cpuIdent.h>
-#include "vectors.h"
-#include "ppc_exc_bspsupp.h"
+#include <bsp/vectors.h>
 #include <stdlib.h>
 #include <rtems/bspIo.h> /* for printk */
 #include <libcpu/spr.h>
@@ -24,9 +24,10 @@
 #endif

 #include <rtems.h>
-#include <stdint.h>
 #include <rtems/irq.h>

+#include <bsp/vectors.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -51,8 +52,6 @@ extern int  BSP_disable_irq_at_pic(const rtems_irq_number irqLine);
 */
 extern int  BSP_setup_the_pic(rtems_irq_global_settings* config);

-struct _BSP_Exception_frame;
-
 /* IRQ dispatcher to be defined by the PIC driver; note that it MUST
 * implement shared interrupts.
 * Note also that the exception frame passed to this handler is not very
@@ -64,7 +63,7 @@ struct _BSP_Exception_frame;
 * uncaught exception.
 *******************************************************************
 */
-int C_dispatch_irq_handler (struct _BSP_Exception_frame *frame, unsigned int excNum);
+int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum);

 /*
 * Snippet to be used by PIC drivers and by bsp_irq_dispatch_list
@@ -64,6 +64,9 @@ ppc_exc_min_prolog_auto:
 	mflr	VECTOR_REGISTER
 	bla	wrap_auto

+	.global ppc_exc_tgpr_clr_prolog_size
+ppc_exc_tgpr_clr_prolog_size = . - ppc_exc_tgpr_clr_prolog
+
 /**
 * @brief Use vector offsets with 16 byte boundaries.
 *
@@ -76,9 +79,6 @@ ppc_exc_min_prolog_auto_packed:
 	mflr	VECTOR_REGISTER
 	bla	wrap_auto_packed

-	.global ppc_exc_tgpr_clr_prolog_size
-ppc_exc_tgpr_clr_prolog_size = . - ppc_exc_tgpr_clr_prolog
-
 /*
 * Automatic vector, asynchronous exception; however,
 * automatic vector calculation is less efficient than
@@ -12,10 +12,7 @@
 * reintroduce such statements.
 */

-#include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
-
-#include "vectors.h"
+#include <bsp/vectors.h>

 #define LT(cr) ((cr)*4+0)
 #define GT(cr) ((cr)*4+1)
@@ -117,6 +117,7 @@ extern void ppc_exc_min_prolog_async_tmpl_bookE_crit(void);
 extern void ppc_exc_min_prolog_sync_tmpl_bookE_crit(void);
 extern void ppc_exc_min_prolog_sync_tmpl_e500_mchk(void);
 extern void ppc_exc_min_prolog_async_tmpl_e500_mchk(void);
+extern void ppc_exc_min_prolog_tmpl_naked(void);

 /* Special prologue for handling register shadowing on 603-style CPUs */
 extern void ppc_exc_tgpr_clr_prolog(void);
@@ -10,20 +10,10 @@
 *  $Id$
 */

-#include	<stdint.h>
-#include	<string.h>
+#include <rtems.h>
+#include <rtems/score/apiext.h>

-#include	<rtems.h>
-#include	<rtems/score/cpu.h>
-#include	<libcpu/raw_exception.h>
-#include	<libcpu/spr.h>
-#include	<rtems/score/apiext.h>
-
-#include	"vectors.h"
-#include	"ppc_exc_bspsupp.h"
-
-/* offset into min-prolog where vector # is hardcoded */
-#define		PPC_EXC_PROLOG_VEC_OFFSET	2
+#include <bsp/vectors.h>

 /* Provide temp. storage space for a few registers.
 * This is used by the assembly code prior to setting up
@@ -39,9 +29,9 @@ uint32_t ppc_exc_lock_std  = 0;
 uint32_t ppc_exc_lock_crit = 0;
 uint32_t ppc_exc_lock_mchk = 0;

-uint32_t ppc_exc_vector_register_std     = 0;
-uint32_t ppc_exc_vector_register_crit    = 0;
-uint32_t ppc_exc_vector_register_mchk    = 0;
+uint32_t ppc_exc_vector_register_std  = 0;
+uint32_t ppc_exc_vector_register_crit = 0;
+uint32_t ppc_exc_vector_register_mchk = 0;

 /* MSR bits to enable once critical status info is saved and the stack
 * is switched; must be set depending on CPU type
@@ -49,105 +39,65 @@ uint32_t ppc_exc_vector_register_mchk    = 0;
 * Default is set here for classic PPC CPUs with a MMU
 * but is overridden from vectors_init.c
 */
-uint32_t ppc_exc_msr_bits     = MSR_IR | MSR_DR | MSR_RI;
+uint32_t ppc_exc_msr_bits = MSR_IR | MSR_DR | MSR_RI;

-int ppc_exc_handler_default( BSP_Exception_frame *f, unsigned int vector)
+static int ppc_exc_handler_default(BSP_Exception_frame *f, unsigned int vector)
 {
-	return 1;
+  return -1;
 }

 /* Table of C-handlers */
 ppc_exc_handler_t ppc_exc_handler_table [LAST_VALID_EXC + 1] = {
-	[0 ... LAST_VALID_EXC] = ppc_exc_handler_default
+  [0 ... LAST_VALID_EXC] = ppc_exc_handler_default
 };

-ppc_exc_handler_t ppc_exc_get_handler( unsigned vector)
+ppc_exc_handler_t ppc_exc_get_handler(unsigned vector)
 {
-	ppc_exc_handler_t handler = NULL;
-	if (vector > LAST_VALID_EXC) {
-		return 0;
-	}
-	if (ppc_exc_handler_table [vector] != ppc_exc_handler_default) {
-		handler = ppc_exc_handler_table [vector];
-	}
-	return handler;
+  if (
+    vector <= LAST_VALID_EXC
+      && ppc_exc_handler_table [vector] != ppc_exc_handler_default
+  ) {
+    return ppc_exc_handler_table [vector];
+  } else {
+    return NULL;
+  }
 }

-int ppc_exc_set_handler( unsigned vector, ppc_exc_handler_t handler)
+rtems_status_code ppc_exc_set_handler(unsigned vector, ppc_exc_handler_t handler)
 {
-	if (vector > LAST_VALID_EXC) {
-		return -1;
-	}
-	if (handler == NULL) {
-		ppc_exc_handler_table [vector] = ppc_exc_handler_default;
-	} else {
-		ppc_exc_handler_table [vector] = handler;
-	}
-	return 0;
+  if (vector <= LAST_VALID_EXC) {
+    if (handler == NULL) {
+      ppc_exc_handler_table [vector] = ppc_exc_handler_default;
+    } else {
+      ppc_exc_handler_table [vector] = handler;
+    }
+
+    return RTEMS_SUCCESSFUL;
+  } else {
+    return RTEMS_INVALID_ID;
+  }
 }

-void
-ppc_exc_wrapup( BSP_Exception_frame *f)
+void ppc_exc_wrapup(BSP_Exception_frame *frame)
 {
-	/* dispatch_disable level is decremented from assembly code.  */
-	if ( _Context_Switch_necessary ) {
-		/* FIXME: I believe it should be OK to re-enable
-		 *        interrupts around the execution of _Thread_Dispatch();
-		 */
-		_Thread_Dispatch();
-	} else if ( _ISR_Signals_to_thread_executing ) {
-		_ISR_Signals_to_thread_executing = 0;
-		/*
-		 * Process pending signals that have not already been
-		 * processed by _Thread_Dispatch. This happens quite
-		 * unfrequently : the ISR must have posted an action
-		 * to the current running thread.
-		 */
-		if ( _Thread_Do_post_task_switch_extension ||
-				_Thread_Executing->do_post_task_switch_extension ) {
-			_Thread_Executing->do_post_task_switch_extension = false;
-			_API_extensions_Run_postswitch();
-		}
-	}
+  /* dispatch_disable level is decremented from assembly code.  */
+  if ( _Context_Switch_necessary ) {
+    /* FIXME: I believe it should be OK to re-enable
+     *        interrupts around the execution of _Thread_Dispatch();
+     */
+    _Thread_Dispatch();
+  } else if ( _ISR_Signals_to_thread_executing ) {
+    _ISR_Signals_to_thread_executing = 0;
+    /*
+     * Process pending signals that have not already been
+     * processed by _Thread_Dispatch. This happens quite
+     * unfrequently : the ISR must have posted an action
+     * to the current running thread.
+     */
+    if ( _Thread_Do_post_task_switch_extension ||
+        _Thread_Executing->do_post_task_switch_extension ) {
+      _Thread_Executing->do_post_task_switch_extension = false;
+      _API_extensions_Run_postswitch();
+    }
+  }
 }
-
-void
-ppc_exc_min_prolog_expand(ppc_exc_min_prolog_t buf, ppc_exc_min_prolog_template_t templ, uint16_t vec)
-{
-	memcpy(&buf[0], templ, sizeof(ppc_exc_min_prolog_t));
-	/* fixup the vector */
-	buf[PPC_EXC_PROLOG_VEC_OFFSET] = (buf[PPC_EXC_PROLOG_VEC_OFFSET] & 0xffff8000) | (vec & 0x7fff);
-}
-
-#undef TESTING
-#ifdef TESTING
-
-static void noop(const struct __rtems_raw_except_connect_data__*x) {}
-
-rtems_raw_except_connect_data exc_conn = {
-	exceptIndex: ASM_SYS_VECTOR,
-	hdl        : {
-					vector: ASM_SYS_VECTOR,
-					raw_hdl: 0,
-					raw_hdl_size: 0
-	             },
-	on         : noop,
-	off        : noop,
-	isOn       : 0	/* never used AFAIK */
-};
-
-void
-ppc_exc_raise()
-{
-	asm volatile("li 3, 0xffffdead; sc");
-}
-
-
-int
-exc_conn_do()
-{
-	exc_conn.hdl.raw_hdl      = ppc_exc_min_prolog_auto;
-	exc_conn.hdl.raw_hdl_size = 16;
-	return ppc_set_exception(&exc_conn);
-}
-#endif
@@ -51,9 +51,7 @@
 #include <bsp.h>

 #ifdef BSP_PPC403_CLOCK_HOOK_EXCEPTION
-#include <libcpu/raw_exception.h>
 #include <bsp/vectors.h>
-#include <bsp/ppc_exc_bspsupp.h>
 #define PPC_HAS_CLASSIC_EXCEPTIONS FALSE
 #else
 #if !defined(ppc405)