X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fppc_asm.tmpl;h=0019d460902c107a361cf059e634234999bfc976;hb=5fa62000db6d0b46ecdeadbeb50faf5197db49ef;hp=f15628aa2e530021507a8ef9d50499e0f139c5f4;hpb=6b44466cdeabd54f9dabcd2f00d3a232a4b854a9;p=oweals%2Fu-boot.git

diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index f15628aa2e..0019d46090 100644
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -113,11 +113,11 @@
 
 #if  defined(CONFIG_5xx)
 /* Some special purpose registers */
-#define DER	149		/* Debug Enable Register	    	*/
-#define COUNTA	150		/* Breakpoint Counter	    	 	*/
-#define COUNTB	151		/* Breakpoint Counter	    	 	*/
-#define LCTRL1	156		/* Load/Store Support	    	 	*/
-#define LCTRL2	157		/* Load/Store Support	    	 	*/
+#define DER	149		/* Debug Enable Register		*/
+#define COUNTA	150		/* Breakpoint Counter			*/
+#define COUNTB	151		/* Breakpoint Counter			*/
+#define LCTRL1	156		/* Load/Store Support			*/
+#define LCTRL2	157		/* Load/Store Support			*/
 #define ICTRL	158		/* I-Bus Support Control Register	*/
 #define EID	81
 #endif	/* CONFIG_5xx */
@@ -235,7 +235,7 @@
 	stw	r22,_CTR(r21);	\
 	mfspr	r20,XER;	\
 	stw	r20,_XER(r21);	\
-	mfspr	r20,DEAR;	\
+	mfspr	r20, DAR_DEAR;	\
 	stw	r20,_DAR(r21);	\
 	mfspr	r22,reg1;	\
 	mfspr	r23,reg2;	\
@@ -266,39 +266,37 @@ label:							\
 	addi	r3,r1,STACK_FRAME_OVERHEAD;		\
 	li	r20,MSR_KERNEL;				\
 	rlwimi	r20,r23,0,25,25;			\
-	blrl;	 					\
+	blrl;						\
 .L_ ## label :						\
 	.long	hdlr - _start + _START_OFFSET;		\
 	.long	int_return - _start + _START_OFFSET
 
 #define CRIT_EXCEPTION(n, label, hdlr)				\
-        . = n;							\
+	. = n;							\
 label:								\
-        EXCEPTION_PROLOG(csrr0, csrr1);				\
-        lwz     r3,GOT(transfer_to_handler);			\
-        mtlr    r3;						\
-        addi    r3,r1,STACK_FRAME_OVERHEAD;			\
-        li      r20,(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE));	\
-        rlwimi  r20,r23,0,25,25;				\
-        blrl;							\
+	EXCEPTION_PROLOG(CSRR0, CSRR1);				\
+	lwz	r3,GOT(transfer_to_handler);			\
+	mtlr	r3;						\
+	addi	r3,r1,STACK_FRAME_OVERHEAD;			\
+	li	r20,(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE));	\
+	rlwimi	r20,r23,0,25,25;				\
+	blrl;							\
 .L_ ## label :							\
-        .long   hdlr - _start + _START_OFFSET;			\
-        .long   crit_return - _start + _START_OFFSET
+	.long	hdlr - _start + _START_OFFSET;			\
+	.long	crit_return - _start + _START_OFFSET
 
-#ifdef CONFIG_440
 #define MCK_EXCEPTION(n, label, hdlr)				\
-        . = n;							\
+	. = n;							\
 label:								\
-        EXCEPTION_PROLOG(MCSRR0, MCSRR1);			\
-        lwz     r3,GOT(transfer_to_handler);			\
-        mtlr    r3;						\
-        addi    r3,r1,STACK_FRAME_OVERHEAD;			\
-        li      r20,(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE));	\
-        rlwimi  r20,r23,0,25,25;				\
-        blrl;							\
+	EXCEPTION_PROLOG(MCSRR0, MCSRR1);			\
+	lwz	r3,GOT(transfer_to_handler);			\
+	mtlr	r3;						\
+	addi	r3,r1,STACK_FRAME_OVERHEAD;			\
+	li	r20,(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE));	\
+	rlwimi	r20,r23,0,25,25;				\
+	blrl;							\
 .L_ ## label :							\
-        .long   hdlr - _start + _START_OFFSET;			\
-        .long   mck_return - _start + _START_OFFSET
-#endif /* CONFIG_440  */
+	.long	hdlr - _start + _START_OFFSET;			\
+	.long	mck_return - _start + _START_OFFSET
 
 #endif	/* __PPC_ASM_TMPL__ */