Changeset 5e67b98 in rtems

Timestamp:

01/03/01 16:45:52 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

80cc928

Parents:

e182c620

Message:

2001-01-03 Joel Sherrill <joel@…>

• new_exception_processing/cpu.h, old_exception_processing/cpu.c: old_exception_processing/cpu.h, Added _CPU_Initialize_vectors(). In particular, spurious vector initialization had to be moved on old exception processing model.

Location:

c/src/lib

Files:

• libbsp/powerpc/support/new_exception_processing/cpu.h (modified) (1 diff)
• libbsp/powerpc/support/old_exception_processing/cpu.c (modified) (3 diffs)
• libbsp/powerpc/support/old_exception_processing/cpu.h (modified) (1 diff)
• libcpu/powerpc/ChangeLog (modified) (1 diff)
• libcpu/powerpc/new_exception_processing/cpu.h (modified) (1 diff)
• libcpu/powerpc/old-exceptions/cpu.c (modified) (3 diffs)
• libcpu/powerpc/old_exception_processing/cpu.c (modified) (3 diffs)
• libcpu/powerpc/old_exception_processing/cpu.h (modified) (1 diff)

c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu.h

@@ -613 +613 @@
 
 
-/* ISR handler macros */
+/*
+ *  ISR handler macros
+ */
+
+#define _CPU_Initialize_vectors()
 
 /*

c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c

@@ -59 +59 @@
 )
 {
-  proc_ptr handler = (proc_ptr)ppc_spurious;
   int i;
 #if (PPC_ABI != PPC_ABI_POWEROPEN)
@@ -76 +75 @@
   _CPU_IRQ_info.Nest_level = &_ISR_Nest_level;
   _CPU_IRQ_info.Disable_level = &_Thread_Dispatch_disable_level;
-  _CPU_IRQ_info.Vector_table = _ISR_Vector_table;
+  /* fill in _CPU_IRQ_info.Vector_table later */
 #if (PPC_ABI == PPC_ABI_POWEROPEN)
   _CPU_IRQ_info.Dispatch_r2 = ((unsigned32 *)_Thread_Dispatch)[1];
@@ -98 +97 @@
 #endif
 
-  if ( cpu_table->spurious_handler )
-    handler = (proc_ptr)cpu_table->spurious_handler;
+  _CPU_Table = *cpu_table;
+}
+
+/*
+ *  _CPU_Initialize_vectors()
+ *
+ *  Support routine to initialize the RTEMS vector table after it is allocated.
+ *
+ *  PowerPC Specific Information:
+ *
+ *  Complete initialization since the table is now allocated.
+ */
+ 
+void _CPU_Initialize_vectors(void)
+{
+  int i;
+  proc_ptr handler = (proc_ptr)ppc_spurious;
+
+  _CPU_IRQ_info.Vector_table = _ISR_Vector_table;
+
+  if ( _CPU_Table.spurious_handler )
+    handler = (proc_ptr)_CPU_Table.spurious_handler;
 
   for (i = 0; i < PPC_INTERRUPT_MAX;  i++)
     _ISR_Vector_table[i] = handler;
 
-  _CPU_Table = *cpu_table;
-}
-
+}
+ 
 /*PAGE
  *

c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.h

@@ -707 +707 @@
 #define CPU_STACK_ALIGNMENT        (PPC_STACK_ALIGNMENT)
 
-/* ISR handler macros */
+/*
+ *  ISR handler macros
+ */
+
+void _CPU_Initialize_vectors(void);
 
 /*

c/src/lib/libcpu/powerpc/ChangeLog

@@ +1 @@
+2001-01-03      Joel Sherrill <joel@OARcorp.com>
+
+        * new_exception_processing/cpu.h, old_exception_processing/cpu.c: 
+        old_exception_processing/cpu.h, Added _CPU_Initialize_vectors().
+        In particular, spurious vector initialization had to be moved
+        on old exception processing model.
+
 2000-11-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/lib/libcpu/powerpc/new_exception_processing/cpu.h

@@ -613 +613 @@
 
 
-/* ISR handler macros */
+/*
+ *  ISR handler macros
+ */
+
+#define _CPU_Initialize_vectors()
 
 /*

c/src/lib/libcpu/powerpc/old-exceptions/cpu.c

@@ -59 +59 @@
 )
 {
-  proc_ptr handler = (proc_ptr)ppc_spurious;
   int i;
 #if (PPC_ABI != PPC_ABI_POWEROPEN)
@@ -76 +75 @@
   _CPU_IRQ_info.Nest_level = &_ISR_Nest_level;
   _CPU_IRQ_info.Disable_level = &_Thread_Dispatch_disable_level;
-  _CPU_IRQ_info.Vector_table = _ISR_Vector_table;
+  /* fill in _CPU_IRQ_info.Vector_table later */
 #if (PPC_ABI == PPC_ABI_POWEROPEN)
   _CPU_IRQ_info.Dispatch_r2 = ((unsigned32 *)_Thread_Dispatch)[1];
@@ -98 +97 @@
 #endif
 
-  if ( cpu_table->spurious_handler )
-    handler = (proc_ptr)cpu_table->spurious_handler;
+  _CPU_Table = *cpu_table;
+}
+
+/*
+ *  _CPU_Initialize_vectors()
+ *
+ *  Support routine to initialize the RTEMS vector table after it is allocated.
+ *
+ *  PowerPC Specific Information:
+ *
+ *  Complete initialization since the table is now allocated.
+ */
+ 
+void _CPU_Initialize_vectors(void)
+{
+  int i;
+  proc_ptr handler = (proc_ptr)ppc_spurious;
+
+  _CPU_IRQ_info.Vector_table = _ISR_Vector_table;
+
+  if ( _CPU_Table.spurious_handler )
+    handler = (proc_ptr)_CPU_Table.spurious_handler;
 
   for (i = 0; i < PPC_INTERRUPT_MAX;  i++)
     _ISR_Vector_table[i] = handler;
 
-  _CPU_Table = *cpu_table;
-}
-
+}
+ 
 /*PAGE
  *

c/src/lib/libcpu/powerpc/old_exception_processing/cpu.c

@@ -59 +59 @@
 )
 {
-  proc_ptr handler = (proc_ptr)ppc_spurious;
   int i;
 #if (PPC_ABI != PPC_ABI_POWEROPEN)
@@ -76 +75 @@
   _CPU_IRQ_info.Nest_level = &_ISR_Nest_level;
   _CPU_IRQ_info.Disable_level = &_Thread_Dispatch_disable_level;
-  _CPU_IRQ_info.Vector_table = _ISR_Vector_table;
+  /* fill in _CPU_IRQ_info.Vector_table later */
 #if (PPC_ABI == PPC_ABI_POWEROPEN)
   _CPU_IRQ_info.Dispatch_r2 = ((unsigned32 *)_Thread_Dispatch)[1];
@@ -98 +97 @@
 #endif
 
-  if ( cpu_table->spurious_handler )
-    handler = (proc_ptr)cpu_table->spurious_handler;
+  _CPU_Table = *cpu_table;
+}
+
+/*
+ *  _CPU_Initialize_vectors()
+ *
+ *  Support routine to initialize the RTEMS vector table after it is allocated.
+ *
+ *  PowerPC Specific Information:
+ *
+ *  Complete initialization since the table is now allocated.
+ */
+ 
+void _CPU_Initialize_vectors(void)
+{
+  int i;
+  proc_ptr handler = (proc_ptr)ppc_spurious;
+
+  _CPU_IRQ_info.Vector_table = _ISR_Vector_table;
+
+  if ( _CPU_Table.spurious_handler )
+    handler = (proc_ptr)_CPU_Table.spurious_handler;
 
   for (i = 0; i < PPC_INTERRUPT_MAX;  i++)
     _ISR_Vector_table[i] = handler;
 
-  _CPU_Table = *cpu_table;
-}
-
+}
+ 
 /*PAGE
  *

c/src/lib/libcpu/powerpc/old_exception_processing/cpu.h

@@ -707 +707 @@
 #define CPU_STACK_ALIGNMENT        (PPC_STACK_ALIGNMENT)
 
-/* ISR handler macros */
+/*
+ *  ISR handler macros
+ */
+
+void _CPU_Initialize_vectors(void);
 
 /*