2008-07-21 Till Straumann <strauman@slac.stanford.edu>

	* new-exceptions/raw_exception,h,
	new-exceptions/raw_exception.c: Added more vectors for PPC405:
	watchdog, fpu-unavail, apu-unavail, itlbmiss, dtlbmiss, debug.

3 files changed, 75 insertions, 46 deletions

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index f9dc8605d2..cb561afbd4 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-21	Till Straumann <strauman@slac.stanford.edu>
+
+	* new-exceptions/raw_exception,h,
+	new-exceptions/raw_exception.c: Added more vectors for PPC405:
+	watchdog, fpu-unavail, apu-unavail, itlbmiss, dtlbmiss, debug.
+	
 2008-07-18	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* shared/include/powerpc-utility.h: Changed special purpose register
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
index 795661fa7c..866bf30f97 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
@@ -60,51 +60,65 @@ uint32_t ppc_exc_vector_base = 0;
 
 void* ppc_get_vector_addr(rtems_vector vector)
 {
-  unsigned vaddr;
-
-  vaddr = ((unsigned)vector) << 8;
-
-  switch(vector) {
-    /*
-     * some vectors are located at odd addresses and only available
-     * on some CPU derivates. this construct will handle them
-     * if available
-     */
-  /* Special case; altivec unavailable doesn't fit :-( */
-  case ASM_60X_VEC_VECTOR:
+	unsigned vaddr;
+
+	vaddr = ((unsigned)vector) << 8;
+
+	switch(vector) {
+		/*
+		 * some vectors are located at odd addresses and only available
+		 * on some CPU derivates. this construct will handle them
+		 * if available
+		 */
+		/* Special case; altivec unavailable doesn't fit :-( */
+		case ASM_60X_VEC_VECTOR:
 #ifndef ASM_60X_VEC_VECTOR_OFFSET
 #define ASM_60X_VEC_VECTOR_OFFSET 0xf20
 #endif
-  	if ( ppc_cpu_has_altivec() )
-   		vaddr = ASM_60X_VEC_VECTOR_OFFSET;
-    break;
+			if ( ppc_cpu_has_altivec() )
+				vaddr = ASM_60X_VEC_VECTOR_OFFSET;
+			break;
+
+		default:
+			break;
+	}
 
-  case ASM_BOOKE_FIT_VECTOR:
-#ifndef ASM_BOOKE_FIT_VECTOR_OFFSET
-#define ASM_BOOKE_FIT_VECTOR_OFFSET 0x1010
+	if ( PPC_405 == current_ppc_cpu ) {
+		switch ( vector ) {
+			case ASM_BOOKE_FIT_VECTOR:
+#ifndef ASM_PPC405_FIT_VECTOR_OFFSET
+#define ASM_PPC405_FIT_VECTOR_OFFSET 0x1010
 #endif
-  	if ( PPC_405 == current_ppc_cpu )
-    	vaddr = ASM_BOOKE_FIT_VECTOR_OFFSET;
-    break;
-  case ASM_BOOKE_WDOG_VECTOR:
-#ifndef ASM_BOOKE_WDOG_VECTOR_OFFSET
-#define ASM_BOOKE_WDOG_VECTOR_OFFSET 0x1020
+				vaddr = ASM_PPC405_FIT_VECTOR_OFFSET;
+				break;
+			case ASM_BOOKE_WDOG_VECTOR:
+#ifndef ASM_PPC405_WDOG_VECTOR_OFFSET
+#define ASM_PPC405_WDOG_VECTOR_OFFSET 0x1020
 #endif
-  	if ( PPC_405 == current_ppc_cpu )
-    	vaddr = ASM_BOOKE_WDOG_VECTOR_OFFSET;
-    break;
-  default:
-    break;
-  }
-  if (bsp_exceptions_in_RAM) {
-    if (ppc_cpu_has_ivpr_and_ivor()) {
-      return ((void*) ((vaddr >> 4) + ppc_exc_vector_base));
-    } else {
-      return ((void*) (vaddr + ppc_exc_vector_base));
-    }
-  }
+				vaddr = ASM_PPC405_WDOG_VECTOR_OFFSET;
+				break;
+			case ASM_TRACE_VECTOR:
+#ifndef ASM_PPC405_TRACE_VECTOR_OFFSET
+#define ASM_PPC405_TRACE_VECTOR_OFFSET	0x2000
+#endif
+				vaddr = ASM_PPC405_TRACE_VECTOR_OFFSET;
+				break;
+			case ASM_PPC405_APU_UNAVAIL_VECTOR:
+				vaddr = ASM_60X_VEC_VECTOR_OFFSET;
+			default:
+				break;
+		}
+	}
+
+	if (bsp_exceptions_in_RAM) {
+		if (ppc_cpu_has_ivpr_and_ivor()) {
+			return ((void*) ((vaddr >> 4) + ppc_exc_vector_base));
+		} else {
+			return ((void*) (vaddr + ppc_exc_vector_base));
+		}
+	}
 
-  return ((void*)  (vaddr + 0xfff00000));
+	return ((void*)  (vaddr + 0xfff00000));
 }
 
 static const cat_ini_t mpc_860_vector_categories[LAST_VALID_EXC + 1] = {
@@ -161,20 +175,27 @@ static const cat_ini_t mpc_5xx_vector_categories[LAST_VALID_EXC + 1] = {
 };
 
 static const cat_ini_t ppc_405_vector_categories[LAST_VALID_EXC + 1] = {
-  [ ASM_EXT_VECTOR             ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
-  [ ASM_BOOKE_DEC_VECTOR       ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,		/* PIT */
-  [ ASM_BOOKE_FIT_VECTOR       ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,		/* FIT */
-
+  [ ASM_BOOKE_CRIT_VECTOR      ] = PPC_EXC_405_CRITICAL | PPC_EXC_ASYNC,
+  [ ASM_MACH_VECTOR            ] = PPC_EXC_405_CRITICAL,
   [ ASM_PROT_VECTOR            ] = PPC_EXC_CLASSIC,
   [ ASM_ISI_VECTOR             ] = PPC_EXC_CLASSIC,
+  [ ASM_EXT_VECTOR             ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
   [ ASM_ALIGN_VECTOR           ] = PPC_EXC_CLASSIC,
   [ ASM_PROG_VECTOR            ] = PPC_EXC_CLASSIC,
+  [ ASM_FLOAT_VECTOR           ] = PPC_EXC_CLASSIC,
+
+  [ ASM_PPC405_APU_UNAVAIL_VECTOR] = PPC_EXC_CLASSIC,
+
   [ ASM_SYS_VECTOR             ] = PPC_EXC_CLASSIC,
-  [ ASM_BOOKE_ITLBMISS_VECTOR  ] = PPC_EXC_CLASSIC,
-  [ ASM_BOOKE_DTLBMISS_VECTOR  ] = PPC_EXC_CLASSIC,
 
-  [ ASM_BOOKE_CRIT_VECTOR      ] = PPC_EXC_405_CRITICAL | PPC_EXC_ASYNC,
-  [ ASM_MACH_VECTOR            ] = PPC_EXC_405_CRITICAL,
+
+
+  [ ASM_BOOKE_DEC_VECTOR       ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,		/* PIT */
+  [ ASM_BOOKE_FIT_VECTOR       ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,		/* FIT */
+  [ ASM_BOOKE_WDOG_VECTOR      ] = PPC_EXC_405_CRITICAL | PPC_EXC_ASYNC,
+  [ ASM_BOOKE_DTLBMISS_VECTOR  ] = PPC_EXC_CLASSIC,
+  [ ASM_BOOKE_ITLBMISS_VECTOR  ] = PPC_EXC_CLASSIC,
+  [ ASM_TRACE_VECTOR           ] = PPC_EXC_405_CRITICAL,
 };
 
 
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h
index 9723a37f92..2359d6b871 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h
@@ -58,6 +58,8 @@
 #define	ASM_BOOKE_FIT_VECTOR                 0x13
 #define	ASM_BOOKE_WDOG_VECTOR                0x14
 
+#define ASM_PPC405_APU_UNAVAIL_VECTOR		ASM_60X_VEC_ASSIST_VECTOR
+
 #define	ASM_8XX_FLOATASSIST_VECTOR	         0x0E
 #define	ASM_8XX_SOFTEMUL_VECTOR	             0x10
 #define	ASM_8XX_ITLBMISS_VECTOR              0x11