1 files changed, 105 insertions, 121 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c
index 649ec0b956..12fff2394e 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.c
@@ -1,24 +1,26 @@
 /*
- * raw_exception.c  - This file contains implementation of C function to
- *          	      Instanciate 8xx ppc primary exception entries.
- *	 	      More detailled information can be found on motorola
- *	    	      site and more precisely in the following book :
+ * raw_exception.c  - This file contains implementation of C functions to
+ *          	      Instantiate mpc5xx primary exception entries.
+ *	 	      More detailled information can be found on the Motorola
+ *	    	      site and more precisely in the following book:
  *
- *		      MPC860
- *		      Risc Microporcessor User's Manual
- *		      Motorola REF : MPC860UM/AD 
+ *		     MPC555/MPC556 User's Manual
+ *		     Motorola REF : MPC555UM/D Rev. 3, 2000 October 15
+ *
+ *
+ * MPC5xx port sponsored by Defence Research and Development Canada - Suffield
+ * Copyright (C) 2004, Real-Time Systems Inc. (querbach@realtime.bc.ca)
+ *
+ * Derived from libcpu/powerpc/mpc8xx/exceptions/raw_exception.c:
  *
  * Copyright (C) 1999  Eric Valette (valette@crf.canon.fr)
  *                     Canon Centre Recherche France.
  *
- * Changes for MPC5XX Wilfried Busalski (w.busalski@lancier-monitoring.de)
- * Copyright (C) 2003 Lancier Monitoring GmbH
- *
  *  The license and distribution terms for this file may be
  *  found in found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
+ *  http://www.rtems.com/license/LICENSE.
  *
- * raw_exception.c,v 1.5 2002/11/04 14:29:02 joel Exp
+ * $Id$
  */
 
 #include <rtems/system.h>
@@ -29,88 +31,76 @@
 #include <rtems/bspIo.h>	/* for printk */
 #include <string.h>
 
-void * codemove(void *, const void *, unsigned int, unsigned long);
-
 static rtems_raw_except_connect_data* 		raw_except_table;
 static rtems_raw_except_connect_data  		default_raw_except_entry;
 static rtems_raw_except_global_settings* 	local_settings;
 
-int mpc565_vector_is_valid(rtems_vector vector)
-{
-  switch(vector) {
-  case ASM_RESET_VECTOR: /* fall through */
-  case ASM_MACH_VECTOR:
-  case ASM_PROT_VECTOR:
-  case ASM_ISI_VECTOR:
-  case ASM_EXT_VECTOR:			   
-  case ASM_ALIGN_VECTOR:
-  case ASM_PROG_VECTOR:
-  case ASM_FLOAT_VECTOR:
-  case ASM_DEC_VECTOR:
-    
-  case ASM_SYS_VECTOR:
-  case ASM_TRACE_VECTOR:
-  case ASM_FLOATASSIST_VECTOR:
-
-  case ASM_SOFTEMUL_VECTOR:
-
-  case ASM_ITLBERROR_VECTOR:
-  case ASM_DTLBERROR_VECTOR:
-
-  case ASM_DBREAK_VECTOR:
-  case ASM_IBREAK_VECTOR:
-  case ASM_PERIFBREAK_VECTOR:
-  case ASM_DEVPORT_VECTOR:
-    return 1;
-  default: return 0;
-  }
-}
-
 int mpc5xx_vector_is_valid(rtems_vector vector)
 {
-     switch (current_ppc_cpu) {
-        case MPC_5XX:
-            if (!mpc565_vector_is_valid(vector)) {
-                return 0;
-            }
-            break;
-        default:
-            printk("Please complete libcpu/powerpc/mpc5xx/exceptions/raw_exception.c\n");
-            printk("current_ppc_cpu = %x\n", current_ppc_cpu);
-            return 0;
-     }
-     return 1;
+  switch (current_ppc_cpu) {
+    case PPC_5XX:
+      switch(vector) {
+        case ASM_RESET_VECTOR:
+        case ASM_MACH_VECTOR:
+
+        case ASM_EXT_VECTOR:
+        case ASM_ALIGN_VECTOR:
+        case ASM_PROG_VECTOR:
+        case ASM_FLOAT_VECTOR:
+        case ASM_DEC_VECTOR:
+
+        case ASM_SYS_VECTOR:
+        case ASM_TRACE_VECTOR:
+        case ASM_FLOATASSIST_VECTOR:
+
+        case ASM_SOFTEMUL_VECTOR:
+
+        case ASM_IPROT_VECTOR:
+        case ASM_DPROT_VECTOR:
+
+        case ASM_DBREAK_VECTOR:
+        case ASM_IBREAK_VECTOR:
+        case ASM_MEBREAK_VECTOR:
+        case ASM_NMEBREAK_VECTOR:
+          return 1;
+        default: 
+          return 0;
+      }
+    default:
+      printk("Please complete libcpu/powerpc/mpc5xx/exceptions/raw_exception.c\n");
+      printk("current_ppc_cpu = %x\n", current_ppc_cpu);
+      return 0;
+  }
 }
 
 int mpc5xx_set_exception  (const rtems_raw_except_connect_data* except)
 {
-    unsigned int level;
+  unsigned int level;
 
-    if (!mpc5xx_vector_is_valid(except->exceptIndex)) {
-      return 0;
-    }
-    /*
-     * Check if default handler is actually connected. If not issue an error.
-     * You must first get the current handler via mpc5xx_get_current_exception
-     * and then disconnect it using mpc5xx_delete_exception.
-     * RATIONALE : to always have the same transition by forcing the user
-     * to get the previous handler before accepting to disconnect.
-     */
-    if (memcmp(mpc5xx_get_vector_addr(except->exceptIndex), (void*)default_raw_except_entry.hdl.raw_hdl,default_raw_except_entry.hdl.raw_hdl_size)) {
-      return 0;
-    }
+  if (!mpc5xx_vector_is_valid(except->exceptIndex)) {
+    return 0;
+  }
+  /*
+   * Check if default handler is actually connected. If not issue an error.
+   * You must first get the current handler via mpc5xx_get_current_exception
+   * and then disconnect it using mpc5xx_delete_exception.
+   * RATIONALE : to always have the same transition by forcing the user
+   * to get the previous handler before accepting to disconnect.
+   */
+  if (exception_handler_table[except->exceptIndex] != 
+      default_raw_except_entry.hdl.raw_hdl) {
+    return 0;
+  }
 
-    _CPU_ISR_Disable(level);
-    
-    raw_except_table [except->exceptIndex] = *except;
-    codemove((void*)mpc5xx_get_vector_addr(except->exceptIndex),
-	     except->hdl.raw_hdl,
-	     except->hdl.raw_hdl_size,
-	     PPC_CACHE_ALIGNMENT);
-    except->on(except);
-    
-    _CPU_ISR_Enable(level);
-    return 1;
+  _CPU_ISR_Disable(level);
+  
+  raw_except_table[except->exceptIndex] = *except;
+
+  exception_handler_table[except->exceptIndex] = except->hdl.raw_hdl;
+  except->on(except);
+  
+  _CPU_ISR_Enable(level);
+  return 1;
 }
 
 int mpc5xx_get_current_exception (rtems_raw_except_connect_data* except)
@@ -119,7 +109,7 @@ int mpc5xx_get_current_exception (rtems_raw_except_connect_data* except)
     return 0;
   }
     
-  *except = raw_except_table [except->exceptIndex];
+  *except = raw_except_table[except->exceptIndex];
     
   return 1;
 }
@@ -138,20 +128,16 @@ int mpc5xx_delete_exception (const rtems_raw_except_connect_data* except)
    * RATIONALE : to always have the same transition by forcing the user
    * to get the previous handler before accepting to disconnect.
    */
-  if (memcmp(mpc5xx_get_vector_addr(except->exceptIndex),
-	     (void*)except->hdl.raw_hdl,
-	     except->hdl.raw_hdl_size)) {
-      return 0;
+  if (exception_handler_table[except->exceptIndex] != except->hdl.raw_hdl) {
+    return 0;
   }
+
   _CPU_ISR_Disable(level);
 
   except->off(except);
-  codemove((void*)mpc5xx_get_vector_addr(except->exceptIndex),
-	   default_raw_except_entry.hdl.raw_hdl,
-	   default_raw_except_entry.hdl.raw_hdl_size,
-	   PPC_CACHE_ALIGNMENT);
-
-    
+  exception_handler_table[except->exceptIndex] = 
+    default_raw_except_entry.hdl.raw_hdl;
+  
   raw_except_table[except->exceptIndex] = default_raw_except_entry;
   raw_except_table[except->exceptIndex].exceptIndex = except->exceptIndex;
 
@@ -162,39 +148,37 @@ int mpc5xx_delete_exception (const rtems_raw_except_connect_data* except)
 
 /*
  * Exception global init.
+ *
+ * Install exception handler pointers from the raw exception table into the
+ * exception handler table.
  */
 int mpc5xx_init_exceptions (rtems_raw_except_global_settings* config)
 {
-    unsigned 			i;
-    unsigned int level;
-    
-    /*
-     * store various accelerators
-     */
-    raw_except_table 		= config->rawExceptHdlTbl;
-    local_settings 		= config;
-    default_raw_except_entry 	= config->defaultRawEntry;
-
-    _CPU_ISR_Disable(level);
-
-    for (i=0; i <= LAST_VALID_EXC; i++) {
-      if (!mpc5xx_vector_is_valid(i)){
-	continue;
-      }
-      codemove((void*)mpc5xx_get_vector_addr(i),
-	     raw_except_table[i].hdl.raw_hdl,
-	     raw_except_table[i].hdl.raw_hdl_size,
-	     PPC_CACHE_ALIGNMENT);
-      if (raw_except_table[i].hdl.raw_hdl != default_raw_except_entry.hdl.raw_hdl) {
-	raw_except_table[i].on(&raw_except_table[i]);
-      }
-      else {
-	raw_except_table[i].off(&raw_except_table[i]);
-      }
+  unsigned 			i;
+  unsigned int level;
+  
+  /*
+   * store various accelerators
+   */
+  raw_except_table 		= config->rawExceptHdlTbl;
+  local_settings 		= config;
+  default_raw_except_entry 	= config->defaultRawEntry;
+
+  _CPU_ISR_Disable(level);
+
+  for (i = 0; i < NUM_EXCEPTIONS; i++) {
+    exception_handler_table[i] = raw_except_table[i].hdl.raw_hdl;
+
+    if (raw_except_table[i].hdl.raw_hdl != default_raw_except_entry.hdl.raw_hdl) {
+      raw_except_table[i].on(&raw_except_table[i]);
+    }
+    else {
+      raw_except_table[i].off(&raw_except_table[i]);
     }
-    _CPU_ISR_Enable(level);
+  }
+  _CPU_ISR_Enable(level);
 
-    return 1;
+  return 1;
 }
 
 int mpc5xx_get_exception_config (rtems_raw_except_global_settings** config)