svn commit: r196086 - projects/ppc64/sys/powerpc/aim64

[Nathan Whitehorn]

Author: nwhitehorn
Date: Fri Aug  7 15:41:16 2009
New Revision: 196086
URL: http://svn.freebsd.org/changeset/base/196086

Log:
  Use the correct link register mask to know when we are taking a
  segmentation exception instead of a DSI/ISI.

Modified:
  projects/ppc64/sys/powerpc/aim64/machdep.c
  projects/ppc64/sys/powerpc/aim64/trap_subr.S

Modified: projects/ppc64/sys/powerpc/aim64/machdep.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/machdep.c	Fri Aug  7 02:06:35 2009	(r196085)
+++ projects/ppc64/sys/powerpc/aim64/machdep.c	Fri Aug  7 15:41:16 2009	(r196086)
@@ -232,7 +232,7 @@ extern char	kernel_text[], _end[];
 #ifdef SMP
 extern void	*rstcode, *rstsize;
 #endif
-extern void	*trapcode, *trapcode64, *trapsize;
+extern void	*trapcode, *trapsize;
 extern void	*alitrap, *alisize;
 extern void	*dsitrap, *dsisize;
 extern void	*decrint, *decrsize;

Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/trap_subr.S	Fri Aug  7 02:06:35 2009	(r196085)
+++ projects/ppc64/sys/powerpc/aim64/trap_subr.S	Fri Aug  7 15:41:16 2009	(r196086)
@@ -290,7 +290,7 @@ CNAME(trapcode):
 	mtsprg1	%r1			/* save SP */
 	mflr	%r1			/* Save the old LR in r1 */
 	mtsprg2 %r1			/* And then in SPRG2 */
-	li	%r1, 0x20		/* How to get the vector from LR */
+	li	%r1, 0xA0		/* How to get the vector from LR */
 	bla	generictrap		/* LR & SPRG3 is exception # */
 CNAME(trapsize) = .-CNAME(trapcode)