2007-12-05 Till Straumann <strauman@slac.stanford.edu>

	* shared/irq/irq_asm.S, shared/vectors/vectors.S,
	shared/vectors/vectors.h, shared/vectors/vectors_init.c:
	Converted exception vector names to new ones
	(qualified by <cpu_type> if non-std ppc exceptions).

5 files changed, 23 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index 60d48e6cfa..4170bbc26f 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-05	Till Straumann <strauman@slac.stanford.edu>
+
+	* shared/irq/irq_asm.S, shared/vectors/vectors.S,
+	shared/vectors/vectors.h, shared/vectors/vectors_init.c:
+	Converted exception vector names to new ones
+	(qualified by <cpu_type> if non-std ppc exceptions).
+
+
 2007-12-04	Till Straumann <strauman@slac.stanford.edu>
 
 	* shared/startup/bspstart.c: export BSP_commandline_string
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
index e8a9c779e7..65ce87d56e 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
@@ -47,7 +47,7 @@ SYM (decrementer_exception_vector_prolog_code):
 	decrementer_exception_vector_prolog_code_size = . - decrementer_exception_vector_prolog_code
 #endif
 
-#if defined(ASM_SYSMGMT_VECTOR)
+#if defined(ASM_60X_SYSMGMT_VECTOR)
 	PUBLIC_VAR(sysmgmt_exception_vector_prolog_code)
 
 SYM (sysmgmt_exception_vector_prolog_code):
@@ -56,7 +56,7 @@ SYM (sysmgmt_exception_vector_prolog_code):
 	 */
 	stwu    r1, - (EXCEPTION_FRAME_END)(r1)
 	stw	r4, GPR4_OFFSET(r1)
-	li	r4, ASM_SYSMGMT_VECTOR
+	li	r4, ASM_60X_SYSMGMT_VECTOR
 	ba	shared_raw_irq_code_entry
 
 	PUBLIC_VAR (sysmgmt_exception_vector_prolog_code_size)
@@ -65,7 +65,7 @@ SYM (sysmgmt_exception_vector_prolog_code):
 #endif
 
 
-#if defined(ASM_PIT_VECTOR)
+#if defined(ASM_BOOKE_PIT_VECTOR)
 	PUBLIC_VAR(pit_exception_vector_prolog_code)
 
 SYM (pit_exception_vector_prolog_code):
@@ -74,7 +74,7 @@ SYM (pit_exception_vector_prolog_code):
 	 */
 	stwu    r1, - (EXCEPTION_FRAME_END)(r1)
 	stw	r4, GPR4_OFFSET(r1)
-	li	r4, ASM_PIT_VECTOR
+	li	r4, ASM_BOOKE_PIT_VECTOR
 	ba	shared_raw_irq_code_entry
 
 	PUBLIC_VAR (pit_exception_vector_prolog_code_size)
@@ -82,7 +82,7 @@ SYM (pit_exception_vector_prolog_code):
 	pit_exception_vector_prolog_code_size = . - pit_exception_vector_prolog_code
 #endif
 
-#if defined(ASM_FIT_VECTOR)
+#if defined(ASM_BOOKE_FIT_VECTOR)
 	PUBLIC_VAR(fit_exception_vector_prolog_code)
 
 SYM (fit_exception_vector_prolog_code):
@@ -91,7 +91,7 @@ SYM (fit_exception_vector_prolog_code):
 	 */
 	stwu    r1, - (EXCEPTION_FRAME_END)(r1)
 	stw	r4, GPR4_OFFSET(r1)
-	li	r4, ASM_FIT_VECTOR
+	li	r4, ASM_BOOKE_FIT_VECTOR
 	ba	shared_raw_irq_code_entry
 
 	PUBLIC_VAR (fit_exception_vector_prolog_code_size)
diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S
index 9901cb1595..60847cd026 100644
--- a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S
+++ b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S
@@ -70,13 +70,13 @@ SYM (push_normalized_frame):
 	mflr	r3
 	/* mask upper bits in case vectors are in the high area (psim) */
 	rlwinm  r3, r3, 32-5, 20, 31
-#if defined(ASM_VEC_VECTOR)
+#if defined(ASM_60X_VEC_VECTOR)
 	/*
 	 * Remap altivec unavaliable (0xf20) to its vector number...
 	 */
-	cmplwi  r3,(ASM_VEC_VECTOR_OFFSET>>5)
+	cmplwi  r3,(ASM_60X_VEC_VECTOR_OFFSET>>5)
 	bne     1f
-	li		r3,ASM_VEC_VECTOR<<3
+	li		r3,ASM_60X_VEC_VECTOR<<3
 1:
 #endif
 	/*
diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.h b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.h
index 3e34b71fbc..213976984b 100644
--- a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.h
+++ b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.h
@@ -91,15 +91,15 @@ extern  unsigned int  external_exception_vector_prolog_code_size[];
 extern  void decrementer_exception_vector_prolog_code();
 extern  unsigned int  decrementer_exception_vector_prolog_code_size[];
 #endif
-#if defined(ASM_SYSMGMT_VECTOR)
+#if defined(ASM_60X_SYSMGMT_VECTOR)
 extern  void sysmgmt_exception_vector_prolog_code();
 extern  unsigned int  sysmgmt_exception_vector_prolog_code_size[];
 #endif
-#if defined(ASM_PIT_VECTOR)
+#if defined(ASM_BOOKE_PIT_VECTOR)
 extern  void pit_exception_vector_prolog_code();
 extern  unsigned int  pit_exception_vector_prolog_code_size[];
 #endif
-#if defined(ASM_FIT_VECTOR)
+#if defined(ASM_BOOKE_FIT_VECTOR)
 extern  void fit_exception_vector_prolog_code();
 extern  unsigned int  fit_exception_vector_prolog_code_size[];
 #endif
diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/vectors_init.c b/c/src/lib/libbsp/powerpc/shared/vectors/vectors_init.c
index 87b4cdfb80..b87c3d00be 100644
--- a/c/src/lib/libbsp/powerpc/shared/vectors/vectors_init.c
+++ b/c/src/lib/libbsp/powerpc/shared/vectors/vectors_init.c
@@ -189,9 +189,9 @@ void initialize_exceptions()
     exception_table[i].exceptIndex	= i;
 #if defined(PPC_HAS_60X_VECTORS)
     if ( has_shadowed_gprs
-         && (   ASM_IMISS_VECTOR  == i
-             || ASM_DLMISS_VECTOR == i
-             || ASM_DSMISS_VECTOR == i ) ) {
+         && (   ASM_60X_IMISS_VECTOR  == i
+             || ASM_60X_DLMISS_VECTOR == i
+             || ASM_60X_DSMISS_VECTOR == i ) ) {
       exception_table[i].hdl.raw_hdl	  = tgpr_clr_exception_vector_code_prolog;
       exception_table[i].hdl.raw_hdl_size = (unsigned)tgpr_clr_exception_vector_code_prolog_size;
     } else {