Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/fpu_type/fputype/g

Browse Source
This commit is contained in:
gwr 1997-03-17 19:03:11 +00:00
parent 3c9709606d
commit d531b1ed42
13 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/m68k/m68k/sig_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sig_machdep.c,v 1.1 1997/03/13 19:14:35 gwr Exp $ */ /* $NetBSD: sig_machdep.c,v 1.2 1997/03/17 19:03:11 gwr Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -59,7 +59,7 @@
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/reg.h> #include <machine/reg.h>
extern int fpu_type; extern int fputype;
extern short exframesize[]; extern short exframesize[];
void m68881_save __P((struct fpframe *)); void m68881_save __P((struct fpframe *));
void m68881_restore __P((struct fpframe *)); void m68881_restore __P((struct fpframe *));
@ -203,7 +203,7 @@ sendsig(catcher, sig, mask, code)
#endif #endif
} }
if (fpu_type) { if (fputype) {
kfp->sf_state.ss_flags |= SS_FPSTATE; kfp->sf_state.ss_flags |= SS_FPSTATE;
m68881_save(&kfp->sf_state.ss_fpstate); m68881_save(&kfp->sf_state.ss_fpstate);
} }
@ -362,7 +362,7 @@ sys_sigreturn(p, v, retval)
/* /*
* Finally we restore the original FP context * Finally we restore the original FP context
*/ */
if (fpu_type && (flags & SS_FPSTATE)) if (fputype && (flags & SS_FPSTATE))
m68881_restore(&tstate.ss_fpstate); m68881_restore(&tstate.ss_fpstate);
#ifdef DEBUG #ifdef DEBUG
if ((sigdebug & SDB_FPSTATE) && *(char *)&tstate.ss_fpstate) if ((sigdebug & SDB_FPSTATE) && *(char *)&tstate.ss_fpstate)

4
sys/arch/sun3/include/machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.h,v 1.5 1997/02/11 00:18:25 gwr Exp $ */ /* $NetBSD: machdep.h,v 1.6 1997/03/17 19:03:15 gwr Exp $ */
/* /*
* Copyright (c) 1994 Gordon W. Ross * Copyright (c) 1994 Gordon W. Ross
@ -81,7 +81,7 @@ struct trapframe;
extern int cache_size; extern int cache_size;
extern int cold; extern int cold;
extern int fpu_type; extern int fputype;
extern label_t *nofault; extern label_t *nofault;

10
sys/arch/sun3/sun3/fpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fpu.c,v 1.12 1997/01/27 20:43:55 gwr Exp $ */ /* $NetBSD: fpu.c,v 1.13 1997/03/17 19:03:17 gwr Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -79,15 +79,15 @@ initfpu()
enab_reg |= SYSTEM_ENAB_FPP; enab_reg |= SYSTEM_ENAB_FPP;
set_control_byte((char *) SYSTEM_ENAB, enab_reg); set_control_byte((char *) SYSTEM_ENAB, enab_reg);
fpu_type = fpu_probe(); fputype = fpu_probe();
if ((0 <= fpu_type) && (fpu_type <= 2)) if ((0 <= fputype) && (fputype <= 2))
descr = fpu_descr[fpu_type]; descr = fpu_descr[fputype];
else else
descr = "unknown type"; descr = "unknown type";
printf("fpu: %s\n", descr); printf("fpu: %s\n", descr);
if (fpu_type == 0) { if (fputype == 0) {
/* Might as well turn the enable bit back off. */ /* Might as well turn the enable bit back off. */
enab_reg = get_control_byte((char *) SYSTEM_ENAB); enab_reg = get_control_byte((char *) SYSTEM_ENAB);
enab_reg &= ~SYSTEM_ENAB_FPP; enab_reg &= ~SYSTEM_ENAB_FPP;

8
sys/arch/sun3/sun3/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.47 1997/03/16 11:05:12 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.48 1997/03/17 19:03:19 gwr Exp $ */
/* /*
* Copyright (c) 1994, 1995 Gordon W. Ross * Copyright (c) 1994, 1995 Gordon W. Ross
@ -965,7 +965,7 @@ Lsw2:
movl usp,a2 | grab USP (a2 has been saved) movl usp,a2 | grab USP (a2 has been saved)
movl a2,a1@(PCB_USP) | and save it 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. jeq Lswnofpsave | No? Then don't try save.
lea a1@(PCB_FPCTX),a2 | pointer to FP save area lea a1@(PCB_FPCTX),a2 | pointer to FP save area
fsave a2@ | save FP state fsave a2@ | save FP state
@ -1026,7 +1026,7 @@ Lswnofpsave:
movl a1@(PCB_USP),a0 movl a1@(PCB_USP),a0
movl a0,usp | and USP 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. jeq Lres_skip | don't try to restore it.
lea a1@(PCB_FPCTX),a0 | pointer to FP save area lea a1@(PCB_FPCTX),a0 | pointer to FP save area
tstb a0@ | null state frame? tstb a0@ | null state frame?
@ -1056,7 +1056,7 @@ ENTRY(savectx)
movl a0,a1@(PCB_USP) | and save it movl a0,a1@(PCB_USP) | and save it
moveml #0xFCFC,a1@(PCB_REGS) | save non-scratch registers 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. jeq Lsavedone | No? Then don't save state.
lea a1@(PCB_FPCTX),a0 | pointer to FP save area lea a1@(PCB_FPCTX),a0 | pointer to FP save area
fsave a0@ | save FP state fsave a0@ | save FP state

6
sys/arch/sun3/sun3/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.86 1997/02/18 15:53:15 gwr Exp $ */ /* $NetBSD: machdep.c,v 1.87 1997/03/17 19:03:21 gwr Exp $ */
/* /*
* Copyright (c) 1994, 1995 Gordon W. Ross * Copyright (c) 1994, 1995 Gordon W. Ross
@ -105,7 +105,7 @@ extern char kernel_text[];
extern char etext[]; extern char etext[];
int physmem; int physmem;
int fpu_type; int fputype;
int msgbufmapped; int msgbufmapped;
vm_offset_t vmmap; vm_offset_t vmmap;
@ -401,7 +401,7 @@ setregs(p, pack, stack, retval)
/* restore a null state frame */ /* restore a null state frame */
p->p_addr->u_pcb.pcb_fpregs.fpf_null = 0; p->p_addr->u_pcb.pcb_fpregs.fpf_null = 0;
if (fpu_type) { if (fputype) {
m68881_restore(&p->p_addr->u_pcb.pcb_fpregs); m68881_restore(&p->p_addr->u_pcb.pcb_fpregs);
} }
p->p_md.md_flags = 0; p->p_md.md_flags = 0;

4
sys/arch/sun3/sun3/machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.h,v 1.5 1997/02/11 00:18:25 gwr Exp $ */ /* $NetBSD: machdep.h,v 1.6 1997/03/17 19:03:15 gwr Exp $ */
/* /*
* Copyright (c) 1994 Gordon W. Ross * Copyright (c) 1994 Gordon W. Ross
@ -81,7 +81,7 @@ struct trapframe;
extern int cache_size; extern int cache_size;
extern int cold; extern int cold;
extern int fpu_type; extern int fputype;
extern label_t *nofault; extern label_t *nofault;

4
sys/arch/sun3/sun3/vm_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_machdep.c,v 1.37 1997/01/24 00:09:35 gwr Exp $ */ /* $NetBSD: vm_machdep.c,v 1.38 1997/03/17 19:03:24 gwr Exp $ */
/* /*
* Copyright (c) 1994, 1995 Gordon W. Ross * Copyright (c) 1994, 1995 Gordon W. Ross
@ -63,8 +63,6 @@
#include <machine/pmap.h> #include <machine/pmap.h>
#include <machine/machdep.h> #include <machine/machdep.h>
extern int fpu_type;
extern void proc_do_uret __P((void)); extern void proc_do_uret __P((void));
extern void proc_trampoline __P((void)); extern void proc_trampoline __P((void));

8
sys/arch/sun3/sun3x/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.12 1997/03/16 11:05:16 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.13 1997/03/17 19:03:32 gwr Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -985,7 +985,7 @@ Lsw2:
movl usp,a2 | grab USP (a2 has been saved) movl usp,a2 | grab USP (a2 has been saved)
movl a2,a1@(PCB_USP) | and save it 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. jeq Lswnofpsave | No? Then don't try save.
lea a1@(PCB_FPCTX),a2 | pointer to FP save area lea a1@(PCB_FPCTX),a2 | pointer to FP save area
fsave a2@ | save FP state fsave a2@ | save FP state
@ -1055,7 +1055,7 @@ Lsame_mmuctx:
movl a1@(PCB_USP),a0 movl a1@(PCB_USP),a0
movl a0,usp | and USP 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. jeq Lres_skip | don't try to restore it.
lea a1@(PCB_FPCTX),a0 | pointer to FP save area lea a1@(PCB_FPCTX),a0 | pointer to FP save area
tstb a0@ | null state frame? tstb a0@ | null state frame?
@ -1085,7 +1085,7 @@ ENTRY(savectx)
movl a0,a1@(PCB_USP) | and save it movl a0,a1@(PCB_USP) | and save it
moveml #0xFCFC,a1@(PCB_REGS) | save non-scratch registers 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. jeq Lsavedone | No? Then don't save state.
lea a1@(PCB_FPCTX),a0 | pointer to FP save area lea a1@(PCB_FPCTX),a0 | pointer to FP save area
fsave a0@ | save FP state fsave a0@ | save FP state

6
sys/arch/sun3/sun3x/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.8 1997/02/18 15:54:53 gwr Exp $ */ /* $NetBSD: machdep.c,v 1.9 1997/03/17 19:03:35 gwr Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -103,7 +103,7 @@ extern char kernel_text[];
extern char etext[]; extern char etext[];
int physmem; int physmem;
int fpu_type; int fputype;
int msgbufmapped; int msgbufmapped;
vm_offset_t vmmap; vm_offset_t vmmap;
@ -399,7 +399,7 @@ setregs(p, pack, stack, retval)
/* restore a null state frame */ /* restore a null state frame */
p->p_addr->u_pcb.pcb_fpregs.fpf_null = 0; p->p_addr->u_pcb.pcb_fpregs.fpf_null = 0;
if (fpu_type) { if (fputype) {
m68881_restore(&p->p_addr->u_pcb.pcb_fpregs); m68881_restore(&p->p_addr->u_pcb.pcb_fpregs);
} }
p->p_md.md_flags = 0; p->p_md.md_flags = 0;

4
sys/arch/sun3x/include/machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.h,v 1.7 1997/02/11 00:56:08 gwr Exp $ */ /* $NetBSD: machdep.h,v 1.8 1997/03/17 19:03:27 gwr Exp $ */
/* /*
* Copyright (c) 1994 Gordon W. Ross * Copyright (c) 1994 Gordon W. Ross
@ -95,7 +95,7 @@ struct reg;
struct trapframe; struct trapframe;
extern int cold; extern int cold;
extern int fpu_type; extern int fputype;
extern int has_iocache; extern int has_iocache;
/* This is set by locore.s with the monitor's root ptr. */ /* This is set by locore.s with the monitor's root ptr. */

10
sys/arch/sun3x/sun3x/fpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fpu.c,v 1.2 1997/01/23 22:44:46 gwr Exp $ */ /* $NetBSD: fpu.c,v 1.3 1997/03/17 19:03:30 gwr Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -76,15 +76,15 @@ initfpu()
/* Set the FPU bit in the "system enable register" */ /* Set the FPU bit in the "system enable register" */
*enable_reg |= ENA_FPP; *enable_reg |= ENA_FPP;
fpu_type = fpu_probe(); fputype = fpu_probe();
if ((0 <= fpu_type) && (fpu_type <= 2)) if ((0 <= fputype) && (fputype <= 2))
descr = fpu_descr[fpu_type]; descr = fpu_descr[fputype];
else else
descr = "unknown type"; descr = "unknown type";
printf("fpu: %s\n", descr); printf("fpu: %s\n", descr);
if (fpu_type == 0) { if (fputype == 0) {
/* Might as well turn the enable bit back off. */ /* Might as well turn the enable bit back off. */
*enable_reg &= ~ENA_FPP; *enable_reg &= ~ENA_FPP;
} }

8
sys/arch/sun3x/sun3x/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.12 1997/03/16 11:05:16 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.13 1997/03/17 19:03:32 gwr Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -985,7 +985,7 @@ Lsw2:
movl usp,a2 | grab USP (a2 has been saved) movl usp,a2 | grab USP (a2 has been saved)
movl a2,a1@(PCB_USP) | and save it 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. jeq Lswnofpsave | No? Then don't try save.
lea a1@(PCB_FPCTX),a2 | pointer to FP save area lea a1@(PCB_FPCTX),a2 | pointer to FP save area
fsave a2@ | save FP state fsave a2@ | save FP state
@ -1055,7 +1055,7 @@ Lsame_mmuctx:
movl a1@(PCB_USP),a0 movl a1@(PCB_USP),a0
movl a0,usp | and USP 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. jeq Lres_skip | don't try to restore it.
lea a1@(PCB_FPCTX),a0 | pointer to FP save area lea a1@(PCB_FPCTX),a0 | pointer to FP save area
tstb a0@ | null state frame? tstb a0@ | null state frame?
@ -1085,7 +1085,7 @@ ENTRY(savectx)
movl a0,a1@(PCB_USP) | and save it movl a0,a1@(PCB_USP) | and save it
moveml #0xFCFC,a1@(PCB_REGS) | save non-scratch registers 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. jeq Lsavedone | No? Then don't save state.
lea a1@(PCB_FPCTX),a0 | pointer to FP save area lea a1@(PCB_FPCTX),a0 | pointer to FP save area
fsave a0@ | save FP state fsave a0@ | save FP state

6
sys/arch/sun3x/sun3x/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.8 1997/02/18 15:54:53 gwr Exp $ */ /* $NetBSD: machdep.c,v 1.9 1997/03/17 19:03:35 gwr Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -103,7 +103,7 @@ extern char kernel_text[];
extern char etext[]; extern char etext[];
int physmem; int physmem;
int fpu_type; int fputype;
int msgbufmapped; int msgbufmapped;
vm_offset_t vmmap; vm_offset_t vmmap;
@ -399,7 +399,7 @@ setregs(p, pack, stack, retval)
/* restore a null state frame */ /* restore a null state frame */
p->p_addr->u_pcb.pcb_fpregs.fpf_null = 0; p->p_addr->u_pcb.pcb_fpregs.fpf_null = 0;
if (fpu_type) { if (fputype) {
m68881_restore(&p->p_addr->u_pcb.pcb_fpregs); m68881_restore(&p->p_addr->u_pcb.pcb_fpregs);
} }
p->p_md.md_flags = 0; p->p_md.md_flags = 0;