 @@ -1,14 +1,14 @@
-/*	$NetBSD: spe.c,v 1.4 2011/05/02 06:43:16 matt Exp $	*/
+/*	$NetBSD: spe.c,v 1.5 2011/06/07 01:01:42 matt Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spe.c,v 1.4 2011/05/02 06:43:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spe.c,v 1.5 2011/06/07 01:01:42 matt Exp $");
 #include "opt_altivec.h"
 #ifdef PPC_HAVE_SPE
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/siginfo.h>
 #include <sys/pcu.h>
 #include <powerpc/altivec.h>
 @@ -67,26 +67,31 @@ vec_used_p(lwp_t *l)
+}
 void
 vec_mark_used(lwp_t *l)
+{
 	l->l_md.md_flags |= MDLWP_USEDVEC;
+}
 void
 vec_state_load(lwp_t *l, bool used)
+{
 	struct pcb * const pcb = lwp_getpcb(l);
 	if (__predict_false(!vec_used_p(l))) {
 		memset(&pcb->pcb_vr, 0, sizeof(pcb->pcb_vr));
 		vec_mark_used(l);
+	}
 	/*
 	 * Enable SPE temporarily (and disable interrupts).
 	 */
 	const register_t msr = mfmsr();
 	mtmsr((msr & ~PSL_EE) | PSL_SPV);
 	__asm volatile ("isync");
 	/*
 	 * Call an assembly routine to do load everything.
 	 */
 	vec_load_from_vreg(&pcb->pcb_vr);
 	__asm volatile ("sync");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: altivec.c,v 1.24 2011/05/25 05:42:37 matt Exp $	*/
+/*	$NetBSD: altivec.c,v 1.25 2011/06/07 01:01:43 matt Exp $	*/
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
  * Copyright (C) 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * 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
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.24 2011/05/25 05:42:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.25 2011/06/07 01:01:43 matt Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <uvm/uvm_extern.h>		/*  for vcopypage/vzeropage */
 #include <powerpc/pcb.h>
 #include <powerpc/altivec.h>
 #include <powerpc/spr.h>
 @@ -67,26 +67,31 @@ vec_used_p(lwp_t *l)
+}
 void
 vec_mark_used(lwp_t *l)
+{
 	l->l_md.md_flags |= MDLWP_USEDVEC;
+}
 void
 vec_state_load(lwp_t *l, bool used)
+{
 	struct pcb * const pcb = lwp_getpcb(l);
 	if (__predict_false(!vec_used_p(l))) {
 		memset(&pcb->pcb_vr, 0, sizeof(pcb->pcb_vr));
 		vec_mark_used(l);
+	}
 	/*
 	 * Enable AltiVec temporarily (and disable interrupts).
 	 */
 	const register_t msr = mfmsr();
 	mtmsr((msr & ~PSL_EE) | PSL_VEC);
 	__asm volatile ("isync");
 	/*
 	 * Load the vector unit from vreg which is best done in
 	 * assembly.
 	 */
 	vec_load_from_vreg(&pcb->pcb_vr);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fpu.c,v 1.30 2011/06/07 00:48:32 matt Exp $	*/
+/*	$NetBSD: fpu.c,v 1.31 2011/06/07 01:01:43 matt Exp $	*/
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
  * Copyright (C) 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * 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
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.30 2011/06/07 00:48:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.31 2011/06/07 01:01:43 matt Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/siginfo.h>
 #include <sys/pcu.h>
 #include <machine/pcb.h>
 #include <machine/fpu.h>
 #include <machine/psl.h>
 @@ -70,28 +70,29 @@ fpu_used_p(lwp_t *l)
 void
 fpu_mark_used(lwp_t *l)
+{
 	l->l_md.md_flags |= MDLWP_USEDFPU;
+}
 #ifdef PPC_HAVE_FPU
 void
 fpu_state_load(lwp_t *l, bool used)
+{
 	struct pcb * const pcb = lwp_getpcb(l);
-	if (__predict_false(!used)) {
+	if (__predict_false(!fpu_used_p(l))) {
 		memset(&pcb->pcb_fpu, 0, sizeof(pcb->pcb_fpu));
 		fpu_mark_used(l);
+	}
 	const register_t msr = mfmsr();
         mtmsr((msr & ~PSL_EE) | PSL_FP);
 	__asm volatile ("isync");
 	fpu_load_from_fpreg(&pcb->pcb_fpu);
 	__asm volatile ("sync");
 	mtmsr(msr);
 	__asm volatile ("isync");
 	curcpu()->ci_ev_fpusw.ev_count++;