 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.702 2011/04/26 15:51:23 joerg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.703 2011/06/07 14:53:03 bouyer Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility NASA Ames Research Center, by Julio M. Merino Vidal,
  * and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.702 2011/04/26 15:51:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.703 2011/06/07 14:53:03 bouyer Exp $");
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_svr4.h"
 #include "opt_cpureset_delay.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_kgdb.h"
 #include "opt_mtrr.h"
 #include "opt_modular.h"
 #include "opt_multiboot.h"
 #include "opt_multiprocessor.h"
 @@ -517,52 +517,52 @@ i386_proc0_tss_ldt_init(void)
 	struct pcb *pcb = lwp_getpcb(l);
 	pmap_kernel()->pm_ldt_sel = GSEL(GLDT_SEL, SEL_KPL);
 	pcb->pcb_cr0 = rcr0() & ~CR0_TS;
 	pcb->pcb_esp0 = uvm_lwp_getuarea(l) + KSTACK_SIZE - 16;
 	pcb->pcb_iopl = SEL_KPL;
 	l->l_md.md_regs = (struct trapframe *)pcb->pcb_esp0 - 1;
 	memcpy(&pcb->pcb_fsd, &gdt[GUDATA_SEL], sizeof(pcb->pcb_fsd));
 	memcpy(&pcb->pcb_gsd, &gdt[GUDATA_SEL], sizeof(pcb->pcb_gsd));
 #ifndef XEN
 	lldt(pmap_kernel()->pm_ldt_sel);
 #else
-	HYPERVISOR_fpu_taskswitch();
+	HYPERVISOR_fpu_taskswitch(1);
 	XENPRINTF(("lwp tss sp %p ss %04x/%04x\n",
 	    (void *)pcb->pcb_esp0,
 	    GSEL(GDATA_SEL, SEL_KPL),
 	    IDXSEL(GSEL(GDATA_SEL, SEL_KPL))));
 	HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), pcb->pcb_esp0);
 #endif
+}
 #ifdef XEN
 /*
  * Switch context:
  * - honor CR0_TS in saved CR0 and request DNA exception on FPU use
  * - switch stack pointer for user->kernel transition
  */
 void
 i386_switch_context(lwp_t *l)
+{
 	struct cpu_info *ci;
 	struct pcb *pcb;
 	struct physdev_op physop;
 	pcb = lwp_getpcb(l);
 	ci = curcpu();
 	if (ci->ci_fpused) {
-		HYPERVISOR_fpu_taskswitch();
+		HYPERVISOR_fpu_taskswitch(1);
 		ci->ci_fpused = 0;
+	}
 	HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), pcb->pcb_esp0);
 	physop.cmd = PHYSDEVOP_SET_IOPL;
 	physop.u.set_iopl.iopl = pcb->pcb_iopl;
 	HYPERVISOR_physdev_op(&physop);
+}
 #endif /* XEN */
 #ifndef XEN
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: npx.c,v 1.139 2010/12/20 00:25:35 matt Exp $	*/
+/*	$NetBSD: npx.c,v 1.140 2011/06/07 14:53:03 bouyer Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -86,27 +86,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)npx.c	7.2 (Berkeley) 5/12/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.139 2010/12/20 00:25:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.140 2011/06/07 14:53:03 bouyer Exp $");
 #if 0
 #define IPRINTF(x)	printf x
 #else
 #define	IPRINTF(x)
 #endif
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 @@ -149,28 +149,28 @@ __KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.13
  * 3b) Otherwise, reload the process's previous NPX state.
+ *
  * When a process is created or exec()s, its saved cr0 image has the TS bit
  * set and the MDL_USEDFPU bit clear.  The MDL_USEDFPU bit is set when the
  * process first gets a DNA and the NPX is initialized.  The TS bit is turned
  * off when the NPX is used, and turned on again later when the process's NPX
  * state is saved.
  */
 static int	x86fpflags_to_ksiginfo(uint32_t flags);
 static int	npxdna(struct cpu_info *);
 #ifdef XEN
-#define	clts()
+#define	clts() HYPERVISOR_fpu_taskswitch(0)
-#define	stts()
+#define	stts() HYPERVISOR_fpu_taskswitch(1)
 #endif
 static	enum npx_type		npx_type;
 volatile u_int			npx_intrs_while_probing;
 volatile u_int			npx_traps_while_probing;
 extern int i386_fpu_present;
 extern int i386_fpu_exception;
 extern int i386_fpu_fdivbug;
 struct npx_softc		*npx_softc;
 static inline void
 @@ -180,29 +180,27 @@ fpu_save(union savefpu *addr)
+	{
                 fxsave(&addr->sv_xmm);
 		/* FXSAVE doesn't FNINIT like FNSAVE does -- so do it here. */
 		fninit();
 	} else
 		fnsave(&addr->sv_87);
+}
 static int
 npxdna_empty(struct cpu_info *ci)
+{
 #ifndef XEN
 	panic("npxdna vector not initialized");
 #endif
 	return 0;
+}
 int    (*npxdna_func)(struct cpu_info *) = npxdna_empty;
 #ifndef XEN
 /*
  * This calls i8259_* directly, but currently we can count on systems
  * having a i8259 compatible setup all the time. Maybe have to change
  * that in the future.
  */
 enum npx_type
 @@ -497,27 +495,29 @@ npxintr(void *arg, struct intrframe *fra
+		}
 		trapsignal(l, &ksi);
 	} else {
 		/*
 		 * This is a nested interrupt.  This should only happen when
 		 * an IRQ13 occurs at the same time as a higher-priority
 		 * interrupt.
+		 *
 		 * XXX
 		 * Currently, we treat this like an asynchronous interrupt, but
 		 * this has disadvantages.
 		 */
 		mutex_enter(proc_lock);
 		psignal(l->l_proc, SIGFPE);
 		mutex_exit(proc_lock);
+	}
 	kpreempt_enable();
 	return (1);
+}
 /* map x86 fp flags to ksiginfo fp codes 		*/
 /* see table 8-4 of the IA-32 Intel Architecture	*/
 /* Software Developer's Manual, Volume 1		*/
 /* XXX punting on the stack fault with FLTINV		*/
 static int
 x86fpflags_to_ksiginfo(uint32_t flags)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hypercalls.h,v 1.11 2011/03/30 22:57:24 jym Exp $	*/
+/*	$NetBSD: hypercalls.h,v 1.12 2011/06/07 14:53:03 bouyer Exp $	*/
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -216,51 +216,37 @@ static __inline int
 HYPERVISOR_mmuext_op(struct mmuext_op *op, int count, int *success_count,
     domid_t domid)
+{
     int ret;
     unsigned long ign1, ign2, ign3, ign4;
     _hypercall(__HYPERVISOR_mmuext_op,
 	_harg("1" (op), "2" (count), "3" (success_count), "4" (domid)),
 	_harg("=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4)));
     return ret;
+}
 #if 0
 static __inline int
 HYPERVISOR_fpu_taskswitch(int set)
+{
     long ret;
     long ign1;
     _hypercall(__HYPERVISOR_fpu_taskswitch, _harg("1" (set)),
 	_harg("=a" (ret), "=b" (ign1)));
     return ret;
+}
 #else /* 0 */
 /* Xen2 compat: always i38HYPERVISOR_fpu_taskswitch(1) */
 static __inline int
 HYPERVISOR_fpu_taskswitch(void)
     long ret;
     long ign1;
     _hypercall(__HYPERVISOR_fpu_taskswitch, _harg("1" (1)),
 	_harg("=a" (ret), "=b" (ign1)));
     return ret;
 #endif /* 0 */
 static __inline int
 HYPERVISOR_update_descriptor(uint64_t ma, uint32_t word1, uint32_t word2)
+{
     int ret;
     unsigned long ign1, ign2, ign3, ign4;
     int ma1 = ma & 0xffffffff;
     int ma2 = (ma >> 32) & 0xffffffff;
     _hypercall(__HYPERVISOR_update_descriptor,
 	_harg("1" (ma1), "2" (ma2), "3" (word1), "4" (word2)),
 	_harg("=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4)));