Module Name: src
Committed By: matt
Date: Wed Dec 26 19:05:04 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke: spe.c
src/sys/arch/powerpc/oea: altivec.c
src/sys/arch/powerpc/powerpc: fpu.c
Log Message:
Update to new pcu_state_{load,state,release} definitions
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/spe.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/powerpc/fpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/spe.c
diff -u src/sys/arch/powerpc/booke/spe.c:1.5 src/sys/arch/powerpc/booke/spe.c:1.6
--- src/sys/arch/powerpc/booke/spe.c:1.5 Tue Jun 7 01:01:42 2011
+++ src/sys/arch/powerpc/booke/spe.c Wed Dec 26 19:05:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spe.c,v 1.5 2011/06/07 01:01:42 matt Exp $ */
+/* $NetBSD: spe.c,v 1.6 2012/12/26 19:05:04 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spe.c,v 1.5 2011/06/07 01:01:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spe.c,v 1.6 2012/12/26 19:05:04 matt Exp $");
#include "opt_altivec.h"
@@ -49,9 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD: spe.c,v 1.5
#include <powerpc/psl.h>
#include <powerpc/pcb.h>
-static void vec_state_load(lwp_t *, bool);
-static void vec_state_save(lwp_t *);
-static void vec_state_release(lwp_t *);
+static void vec_state_load(lwp_t *, u_int);
+static void vec_state_save(lwp_t *, u_int);
+static void vec_state_release(lwp_t *, u_int);
const pcu_ops_t vec_ops = {
.pcu_id = PCU_VEC,
@@ -73,7 +73,7 @@ vec_mark_used(lwp_t *l)
}
void
-vec_state_load(lwp_t *l, bool used)
+vec_state_load(lwp_t *l, u_int flags)
{
struct pcb * const pcb = lwp_getpcb(l);
@@ -110,7 +110,7 @@ vec_state_load(lwp_t *l, bool used)
}
void
-vec_state_save(lwp_t *l)
+vec_state_save(lwp_t *l, u_int flags)
{
struct pcb * const pcb = lwp_getpcb(l);
@@ -135,7 +135,7 @@ vec_state_save(lwp_t *l)
}
void
-vec_state_release(lwp_t *l)
+vec_state_release(lwp_t *l, u_int flags)
{
/*
* Turn off SPV so the next SPE instruction will cause a
Index: src/sys/arch/powerpc/oea/altivec.c
diff -u src/sys/arch/powerpc/oea/altivec.c:1.25 src/sys/arch/powerpc/oea/altivec.c:1.26
--- src/sys/arch/powerpc/oea/altivec.c:1.25 Tue Jun 7 01:01:43 2011
+++ src/sys/arch/powerpc/oea/altivec.c Wed Dec 26 19:05:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: altivec.c,v 1.25 2011/06/07 01:01:43 matt Exp $ */
+/* $NetBSD: altivec.c,v 1.26 2012/12/26 19:05:03 matt Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.25 2011/06/07 01:01:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.26 2012/12/26 19:05:03 matt Exp $");
#include "opt_multiprocessor.h"
@@ -49,9 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD: altivec.c,v
#include <powerpc/oea/spr.h>
#include <powerpc/psl.h>
-static void vec_state_load(lwp_t *, bool);
-static void vec_state_save(lwp_t *);
-static void vec_state_release(lwp_t *);
+static void vec_state_load(lwp_t *, u_int);
+static void vec_state_save(lwp_t *, u_int);
+static void vec_state_release(lwp_t *, u_int);
const pcu_ops_t vec_ops = {
.pcu_id = PCU_VEC,
@@ -73,7 +73,7 @@ vec_mark_used(lwp_t *l)
}
void
-vec_state_load(lwp_t *l, bool used)
+vec_state_load(lwp_t *l, u_int flags)
{
struct pcb * const pcb = lwp_getpcb(l);
@@ -114,7 +114,7 @@ vec_state_load(lwp_t *l, bool used)
}
void
-vec_state_save(lwp_t *l)
+vec_state_save(lwp_t *l, u_int flags)
{
struct pcb * const pcb = lwp_getpcb(l);
@@ -149,7 +149,7 @@ vec_state_save(lwp_t *l)
}
void
-vec_state_release(lwp_t *l)
+vec_state_release(lwp_t *l, u_int flags)
{
__asm volatile("dssall;sync");
l->l_md.md_utf->tf_srr1 &= ~PSL_VEC;
Index: src/sys/arch/powerpc/powerpc/fpu.c
diff -u src/sys/arch/powerpc/powerpc/fpu.c:1.31 src/sys/arch/powerpc/powerpc/fpu.c:1.32
--- src/sys/arch/powerpc/powerpc/fpu.c:1.31 Tue Jun 7 01:01:43 2011
+++ src/sys/arch/powerpc/powerpc/fpu.c Wed Dec 26 19:05:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.31 2011/06/07 01:01:43 matt Exp $ */
+/* $NetBSD: fpu.c,v 1.32 2012/12/26 19:05:03 matt Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.31 2011/06/07 01:01:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.32 2012/12/26 19:05:03 matt Exp $");
#include "opt_multiprocessor.h"
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.31
#include <machine/psl.h>
#ifdef PPC_HAVE_FPU
-static void fpu_state_load(lwp_t *, bool);
-static void fpu_state_save(lwp_t *);
-static void fpu_state_release(lwp_t *);
+static void fpu_state_load(lwp_t *, u_int);
+static void fpu_state_save(lwp_t *, u_int);
+static void fpu_state_release(lwp_t *, u_int);
#endif
const pcu_ops_t fpu_ops = {
@@ -76,7 +76,7 @@ fpu_mark_used(lwp_t *l)
#ifdef PPC_HAVE_FPU
void
-fpu_state_load(lwp_t *l, bool used)
+fpu_state_load(lwp_t *l, u_int flags)
{
struct pcb * const pcb = lwp_getpcb(l);
@@ -104,7 +104,7 @@ fpu_state_load(lwp_t *l, bool used)
* Save the contents of the current CPU's FPU to its PCB.
*/
void
-fpu_state_save(lwp_t *l)
+fpu_state_save(lwp_t *l, u_int flags)
{
struct pcb * const pcb = lwp_getpcb(l);
@@ -120,7 +120,7 @@ fpu_state_save(lwp_t *l)
}
void
-fpu_state_release(lwp_t *l)
+fpu_state_release(lwp_t *l, u_int flags)
{
l->l_md.md_utf->tf_srr1 &= ~PSL_FP;
}
