2001-04-11 Eric Valette <valette@crf.canon.fr>

	* Makefile.am, configure.in, console/console.c,
	include/Makefile.am, include/bsp.h, network/network.c,
	startup/Makefile.am, startup/bspstart.c, startup/linkcmds,
	wrapup/Makefile.am: Switch the eth_comm BSP to use the
	"new exception processing model."

3 files changed, 56 insertions, 5 deletions

diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am
index 6c3a60d726..55640aaf09 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am
@@ -9,7 +9,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
 PGM = $(ARCH)/startup.rel
 
 C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c cpuinit.c \
-    main.c mmutlbtab.c sbrk.c setvec.c gnatinstallhandler.c
+    main.c mmutlbtab.c sbrk.c gnatinstallhandler.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
@@ -35,6 +35,6 @@ all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = bspstart.c linkcmds setvec.c
+EXTRA_DIST = bspstart.c linkcmds
 
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
index 6013336b7e..11236cafd6 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
@@ -31,7 +31,7 @@ boardinfo_t M860_binfo;
  *  some changes.
  */
 extern rtems_configuration_table Configuration;
-
+extern unsigned long intrStackPtr;
 rtems_configuration_table  BSP_Configuration;
 
 rtems_cpu_table Cpu_table;
@@ -44,6 +44,18 @@ char *rtems_progname;
 void bsp_postdriver_hook(void);
 void bsp_libc_init( void *, unsigned32, int );
 
+void BSP_panic(char *s)
+{
+  printk("%s PANIC %s\n",_RTEMS_version, s);
+  __asm__ __volatile ("sc"); 
+}
+
+void _BSP_Fatal_error(unsigned int v)
+{
+  printk("%s PANIC ERROR %x\n",_RTEMS_version, v);
+  __asm__ __volatile ("sc"); 
+}
+
 /*
  *  Function:   bsp_pretasking_hook
  *  Created:    95/03/10
@@ -99,10 +111,33 @@ void bsp_start(void)
   extern int _end;
   rtems_unsigned32  heap_start;
   rtems_unsigned32  ws_start;
+  ppc_cpu_id_t myCpu;
+  ppc_cpu_revision_t myCpuRevision;
+  register unsigned char* intrStack;
+  register unsigned int intrNestingLevel = 0;
+   
+  /*
+   * Get CPU identification dynamically. Note that the get_ppc_cpu_type() function
+   * store the result in global variables so that it can be used latter...
+   */
+  myCpu 	= get_ppc_cpu_type();
+  myCpuRevision = get_ppc_cpu_revision();
 
   cpu_init();
   mmu_init();
-  
+  /*
+   * Initialize some SPRG registers related to irq handling
+   */
+   
+  intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE);
+  asm volatile ("mtspr	273, %0" : "=r" (intrStack) : "0" (intrStack));
+  asm volatile ("mtspr	272, %0" : "=r" (intrNestingLevel) : "0" (intrNestingLevel));
+ 
+   /*
+    * Install our own set of exception vectors
+    */
+   initialize_exceptions();
+ 
   /*
    *  Allocate the memory for the RTEMS Work Space.  This can come from
    *  a variety of places: hard coded address, malloc'ed from outside
@@ -162,6 +197,14 @@ 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  
+
 }
 
 
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/linkcmds b/c/src/lib/libbsp/powerpc/eth_comm/startup/linkcmds
index fc0dd33287..192fceb700 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/linkcmds
@@ -125,7 +125,15 @@ SECTIONS
 	bss.size = bss.end - bss.start;
 	text.size = text.end - text.start;
 	PROVIDE(_end = bss.end);
-	
+	/*
+	 * Interrupt stack setup
+	 */
+
+	IntrStack_start = ALIGN(0x10);
+	. += 0x4000;
+	intrStack = .;
+	PROVIDE(intrStackPtr = intrStack);
+ 	
         dpram : 
 	{
           m8xx = .;