From: kstailey Date: Sat, 5 Apr 1997 20:22:01 +0000 (+0000) Subject: fpu_type -> fputype X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1113ed2f16c3318ca8422832a4f280fda35c0459;p=openbsd fpu_type -> fputype --- diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h index f53af4afbdb..40798fad64a 100644 --- a/sys/arch/sun3/include/machdep.h +++ b/sys/arch/sun3/include/machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.h,v 1.6 1997/02/14 23:50:17 kstailey Exp $ */ +/* $OpenBSD: machdep.h,v 1.7 1997/04/05 20:22:02 kstailey Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross * Copyright (c) 1993 Adam Glass @@ -65,7 +65,7 @@ struct pmap; extern int cache_size; extern int cold; -extern int fpu_type; +extern int fputype; extern label_t *nofault; diff --git a/sys/arch/sun3/sun3/fpu.c b/sys/arch/sun3/sun3/fpu.c index ecc408b1d36..652ec087d3d 100644 --- a/sys/arch/sun3/sun3/fpu.c +++ b/sys/arch/sun3/sun3/fpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.c,v 1.6 1997/01/16 04:04:20 kstailey Exp $ */ +/* $OpenBSD: fpu.c,v 1.7 1997/04/05 20:24:24 kstailey Exp $ */ /* $NetBSD: fpu.c,v 1.9 1996/11/20 18:57:29 gwr Exp $ */ /*- @@ -80,15 +80,15 @@ initfpu() enab_reg |= SYSTEM_ENAB_FPP; set_control_byte((char *) SYSTEM_ENAB, enab_reg); - fpu_type = fpu_probe(); - if ((0 <= fpu_type) && (fpu_type <= 2)) - descr = fpu_descr[fpu_type]; + fputype = fpu_probe(); + if ((0 <= fputype) && (fputype <= 2)) + descr = fpu_descr[fputype]; else descr = "unknown type"; printf("fpu: %s\n", descr); - if (fpu_type == 0) { + if (fputype == 0) { /* Might as well turn the enable bit back off. */ enab_reg = get_control_byte((char *) SYSTEM_ENAB); enab_reg &= ~SYSTEM_ENAB_FPP; diff --git a/sys/arch/sun3/sun3/locore.s b/sys/arch/sun3/sun3/locore.s index 44652d4fd22..cc72f3f04fe 100644 --- a/sys/arch/sun3/sun3/locore.s +++ b/sys/arch/sun3/sun3/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.17 1997/02/20 06:30:03 kstailey Exp $ */ +/* $OpenBSD: locore.s,v 1.18 1997/04/05 20:22:01 kstailey Exp $ */ /* $NetBSD: locore.s,v 1.40 1996/11/06 20:19:54 cgd Exp $ */ /* @@ -1046,7 +1046,7 @@ Lsw2: movl usp,a2 | grab USP (a2 has been saved) movl a2,a1@(PCB_USP) | and save it - tstl _fpu_type | Do we have an fpu? + tstl _fputype | Do we have an fpu? jeq Lswnofpsave | No? Then don't try save. lea a1@(PCB_FPCTX),a2 | pointer to FP save area fsave a2@ | save FP state @@ -1098,7 +1098,7 @@ Lswnofpsave: movl a1@(PCB_USP),a0 movl a0,usp | and USP - tstl _fpu_type | If we don't have an fpu, + tstl _fputype | If we don't have an fpu, jeq Lres_skip | don't try to restore it. lea a1@(PCB_FPCTX),a0 | pointer to FP save area tstb a0@ | null state frame? @@ -1128,7 +1128,7 @@ ENTRY(savectx) movl a0,a1@(PCB_USP) | and save it moveml #0xFCFC,a1@(PCB_REGS) | save non-scratch registers - tstl _fpu_type | Do we have FPU? + tstl _fputype | Do we have FPU? jeq Lsavedone | No? Then don't save state. lea a1@(PCB_FPCTX),a0 | pointer to FP save area fsave a0@ | save FP state