PERFORCE change 93743 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=93743

Change 93743 by kmacy at kmacy_storage:sun4vtmp on 2006/03/21 20:55:52

	be more careful about setting %g4 pil

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#37 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#37 (text+ko) ====

@@ -212,7 +212,7 @@
 
 	.macro	tl0_setup	type
 	clr	%g3
-	mov	0, %g4
+	sub	%g0, 1, %g4
 	set	trap, %g1
 	ba	%xcc, tl0_trap
 	  mov	\type, %g2
@@ -539,7 +539,6 @@
 	.endm
 
 	.macro	tl1_pil_entry level, mask
-	tl0_split
 	set	\mask, %g2
 	ba	%xcc, tl0_intr
 	  mov	\level, %g1
@@ -577,7 +576,7 @@
 
 	.macro	tl0_syscall
 	clr	%g3
-	mov	0, %g4
+	sub	%g0, 1, %g4
         set	syscall, %g1
 	ba	%xcc, tl0_trap
 	  mov	T_SYSCALL, %g2
@@ -1350,12 +1349,6 @@
 	! %g4 == fault type %g5 == fault addr %g6 == tag
 	! XXX only handle normal miss for now (look at fault type in the future)
 #ifdef PMAP_DEBUG
-	cmp	%g5, %g0			! NULL ptr deref 
-	bne,pt	%xcc, 12f
-	  nop
-tsb_miss_null_deref:	
-	MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT				! give up
-12:
 	cmp	%g3, T_INSTRUCTION_MISS
 	bne,pn	%xcc, 17f
 	  nop
@@ -1552,7 +1545,7 @@
         sethi	%hi(trap), %g1
 	mov	T_DATA_PROTECTION, %g2			
 	mov	%g6, %g3
-	mov	-1, %g4
+	sub	%g0, 1, %g4
 	ba	%xcc, tl0_trap
 	  or	%g1, %lo(trap), %g1
 END(prot_fault_trap)