PERFORCE change 93425 for review

[Kip Macy]

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

Change 93425 by kmacy at kmacy_storage:sun4v_work on 2006/03/17 02:19:09

	make MAGIC_TRAP definition dependent on SIMULATOR define
	fix invltlb to call DEMAP_ALL

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#3 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#10 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#11 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#3 (text+ko) ====

@@ -287,4 +287,17 @@
 #define	HVIO_FIRE_PERFREG_PCIE_LNK_CNT1	14
 #define	HVIO_FIRE_PERFREG_PCIE_LNK_CNT2	15
 
+
+
+#ifdef SIMULATOR
+#define MAGIC_TRAP_ON	ta	0x77
+#define MAGIC_TRAP_OFF	ta	0x78
+#define MAGIC_EXIT	ta	0x71
+#else
+#define MAGIC_TRAP_ON	nop
+#define MAGIC_TRAP_OFF	nop
+#define MAGIC_EXIT	nop
+#endif
+
+
 #endif	/*_MACHINE_HYPERVISORVAR_H_ */

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

@@ -742,6 +742,12 @@
  * 
  */		
 ENTRY(invlctx)
+	cmp	%o0, %g0
+	bne	%xcc, 2f
+	  nop
+	MAGIC_TRAP_ON
+	MAGIC_EXIT
+2:		
 	mov	%o0, %o2
 	mov	%g0, %o0
 	mov	%g0, %o1
@@ -761,7 +767,7 @@
 	mov	%g0, %o0
 	mov	%g0, %o1
 	mov	MAP_ITLB | MAP_DTLB, %o2
-	mov	MMU_DEMAP_CTX, %o5
+	mov	MMU_DEMAP_ALL, %o5
 	ta	FAST_TRAP
 	brz,pt	%o0, 1f
 	  nop

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

@@ -39,10 +39,6 @@
 	.register	%g3, #ignore
 
 #define	PCB_REG	%g6
-	
-#define MAGIC_EXIT	ta 0x71
-#define MAGIC_TRAP_ON	ta 0x77
-#define MAGIC_TRAP_OFF	ta 0x78
 /*
  * void cpu_throw(struct thread *old, struct thread *new)
  */