Module Name: src
Committed By: rin
Date: Sun Aug 28 22:09:26 UTC 2022
Modified Files:
src/sys/arch/sparc/fpu: fpu_add.c fpu_compare.c fpu_div.c fpu_emu.h
fpu_explode.c fpu_extern.h fpu_implode.c fpu_mul.c fpu_sqrt.c
fpu_subr.c
Log Message:
Drop ``register'' qualifier.
No binary changes for GENERIC compiled by GCC 10.4.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/fpu/fpu_add.c \
src/sys/arch/sparc/fpu/fpu_compare.c src/sys/arch/sparc/fpu/fpu_sqrt.c \
src/sys/arch/sparc/fpu/fpu_subr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/fpu/fpu_div.c \
src/sys/arch/sparc/fpu/fpu_mul.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/fpu/fpu_emu.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/fpu/fpu_explode.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/fpu/fpu_extern.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/fpu/fpu_implode.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/sparc/fpu/fpu_add.c
diff -u src/sys/arch/sparc/fpu/fpu_add.c:1.6 src/sys/arch/sparc/fpu/fpu_add.c:1.7
--- src/sys/arch/sparc/fpu/fpu_add.c:1.6 Wed Nov 16 23:24:44 2005
+++ src/sys/arch/sparc/fpu/fpu_add.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_add.c,v 1.6 2005/11/16 23:24:44 uwe Exp $ */
+/* $NetBSD: fpu_add.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.6 2005/11/16 23:24:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include <sys/types.h>
#ifdef DIAGNOSTIC
@@ -64,9 +64,9 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v
struct fpn *
fpu_add(struct fpemu *fe)
{
- register struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2, *r;
- register u_int r0, r1, r2, r3;
- register int rd;
+ struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2, *r;
+ u_int r0, r1, r2, r3;
+ int rd;
/*
* Put the `heavier' operand on the right (see fpu_emu.h).
Index: src/sys/arch/sparc/fpu/fpu_compare.c
diff -u src/sys/arch/sparc/fpu/fpu_compare.c:1.6 src/sys/arch/sparc/fpu/fpu_compare.c:1.7
--- src/sys/arch/sparc/fpu/fpu_compare.c:1.6 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/fpu/fpu_compare.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_compare.c,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: fpu_compare.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.6 2005/12/11 12:19:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include <sys/types.h>
@@ -75,8 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_compare.
void
fpu_compare(struct fpemu *fe, int cmpe)
{
- register struct fpn *a, *b;
- register int cc;
+ struct fpn *a, *b;
+ int cc;
FPU_DECL_CARRY
a = &fe->fe_f1;
Index: src/sys/arch/sparc/fpu/fpu_sqrt.c
diff -u src/sys/arch/sparc/fpu/fpu_sqrt.c:1.6 src/sys/arch/sparc/fpu/fpu_sqrt.c:1.7
--- src/sys/arch/sparc/fpu/fpu_sqrt.c:1.6 Tue May 24 20:00:49 2022
+++ src/sys/arch/sparc/fpu/fpu_sqrt.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_sqrt.c,v 1.6 2022/05/24 20:00:49 andvar Exp $ */
+/* $NetBSD: fpu_sqrt.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.6 2022/05/24 20:00:49 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include <sys/types.h>
@@ -188,12 +188,12 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v
struct fpn *
fpu_sqrt(struct fpemu *fe)
{
- register struct fpn *x = &fe->fe_f1;
- register u_int bit, q, tt;
- register u_int x0, x1, x2, x3;
- register u_int y0, y1, y2, y3;
- register u_int d0, d1, d2, d3;
- register int e;
+ struct fpn *x = &fe->fe_f1;
+ u_int bit, q, tt;
+ u_int x0, x1, x2, x3;
+ u_int y0, y1, y2, y3;
+ u_int d0, d1, d2, d3;
+ int e;
/*
* Take care of special cases first. In order:
Index: src/sys/arch/sparc/fpu/fpu_subr.c
diff -u src/sys/arch/sparc/fpu/fpu_subr.c:1.6 src/sys/arch/sparc/fpu/fpu_subr.c:1.7
--- src/sys/arch/sparc/fpu/fpu_subr.c:1.6 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/fpu/fpu_subr.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_subr.c,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: fpu_subr.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.6 2005/12/11 12:19:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include <sys/types.h>
#ifdef DIAGNOSTIC
@@ -66,10 +66,10 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v
* sticky field is ignored anyway.
*/
int
-fpu_shr(register struct fpn *fp, register int rsh)
+fpu_shr(struct fpn *fp, register int rsh)
{
- register u_int m0, m1, m2, m3, s;
- register int lsh;
+ u_int m0, m1, m2, m3, s;
+ int lsh;
#ifdef DIAGNOSTIC
if (rsh <= 0 || (fp->fp_class != FPC_NUM && !ISNAN(fp)))
@@ -140,10 +140,10 @@ fpu_shr(register struct fpn *fp, registe
* a supernormal and it will fix it (provided fp->fp_mant[3] == 0).
*/
void
-fpu_norm(register struct fpn *fp)
+fpu_norm(struct fpn *fp)
{
- register u_int m0, m1, m2, m3, top, sup, nrm;
- register int lsh, rsh, exp;
+ u_int m0, m1, m2, m3, top, sup, nrm;
+ int lsh, rsh, exp;
exp = fp->fp_exp;
m0 = fp->fp_mant[0];
@@ -208,9 +208,9 @@ fpu_norm(register struct fpn *fp)
* As a side effect, we set NV (invalid) for the current exceptions.
*/
struct fpn *
-fpu_newnan(register struct fpemu *fe)
+fpu_newnan(struct fpemu *fe)
{
- register struct fpn *fp;
+ struct fpn *fp;
fe->fe_cx = FSR_NV;
fp = &fe->fe_f3;
Index: src/sys/arch/sparc/fpu/fpu_div.c
diff -u src/sys/arch/sparc/fpu/fpu_div.c:1.5 src/sys/arch/sparc/fpu/fpu_div.c:1.6
--- src/sys/arch/sparc/fpu/fpu_div.c:1.5 Wed Nov 16 23:24:44 2005
+++ src/sys/arch/sparc/fpu/fpu_div.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_div.c,v 1.5 2005/11/16 23:24:44 uwe Exp $ */
+/* $NetBSD: fpu_div.c,v 1.6 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.5 2005/11/16 23:24:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.6 2022/08/28 22:09:26 rin Exp $");
#include <sys/types.h>
@@ -152,9 +152,9 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v
struct fpn *
fpu_div(struct fpemu *fe)
{
- register struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
- register u_int q, bit;
- register u_int r0, r1, r2, r3, d0, d1, d2, d3, y0, y1, y2, y3;
+ struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
+ u_int q, bit;
+ u_int r0, r1, r2, r3, d0, d1, d2, d3, y0, y1, y2, y3;
FPU_DECL_CARRY
/*
Index: src/sys/arch/sparc/fpu/fpu_mul.c
diff -u src/sys/arch/sparc/fpu/fpu_mul.c:1.5 src/sys/arch/sparc/fpu/fpu_mul.c:1.6
--- src/sys/arch/sparc/fpu/fpu_mul.c:1.5 Wed Nov 16 23:24:44 2005
+++ src/sys/arch/sparc/fpu/fpu_mul.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_mul.c,v 1.5 2005/11/16 23:24:44 uwe Exp $ */
+/* $NetBSD: fpu_mul.c,v 1.6 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.5 2005/11/16 23:24:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.6 2022/08/28 22:09:26 rin Exp $");
#include <sys/types.h>
@@ -77,8 +77,8 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v
*
* Since we do not have efficient multiword arithmetic, we code the
* accumulator as four separate words, just like any other mantissa.
- * We use local `register' variables in the hope that this is faster
- * than memory. We keep x->fp_mant in locals for the same reason.
+ * We use local variables in the hope that this is faster than memory.
+ * We keep x->fp_mant in locals for the same reason.
*
* In the algorithm above, the bits in y are inspected one at a time.
* We will pick them up 32 at a time and then deal with those 32, one
@@ -101,9 +101,9 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v
struct fpn *
fpu_mul(struct fpemu *fe)
{
- register struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
- register u_int a3, a2, a1, a0, x3, x2, x1, x0, bit, m;
- register int sticky;
+ struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
+ u_int a3, a2, a1, a0, x3, x2, x1, x0, bit, m;
+ int sticky;
FPU_DECL_CARRY
/*
Index: src/sys/arch/sparc/fpu/fpu_emu.h
diff -u src/sys/arch/sparc/fpu/fpu_emu.h:1.7 src/sys/arch/sparc/fpu/fpu_emu.h:1.8
--- src/sys/arch/sparc/fpu/fpu_emu.h:1.7 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/fpu/fpu_emu.h Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emu.h,v 1.7 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: fpu_emu.h,v 1.8 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -131,7 +131,7 @@ struct fpn {
SWAP(x, y); \
}
#define SWAP(x, y) { \
- register struct fpn *swap; \
+ struct fpn *swap; \
swap = (x), (x) = (y), (y) = swap; \
}
Index: src/sys/arch/sparc/fpu/fpu_explode.c
diff -u src/sys/arch/sparc/fpu/fpu_explode.c:1.12 src/sys/arch/sparc/fpu/fpu_explode.c:1.13
--- src/sys/arch/sparc/fpu/fpu_explode.c:1.12 Wed Nov 16 23:24:44 2005
+++ src/sys/arch/sparc/fpu/fpu_explode.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_explode.c,v 1.12 2005/11/16 23:24:44 uwe Exp $ */
+/* $NetBSD: fpu_explode.c,v 1.13 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.12 2005/11/16 23:24:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.13 2022/08/28 22:09:26 rin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sparc_arch.h"
@@ -173,8 +173,8 @@ fpu_xtof(struct fpn *fp, uint64_t i)
int
fpu_stof(struct fpn *fp, u_int i)
{
- register int exp;
- register u_int frac, f0, f1;
+ int exp;
+ u_int frac, f0, f1;
#define SNG_SHIFT (SNG_FRACBITS - FP_LG)
exp = (i >> (32 - 1 - SNG_EXPBITS)) & mask(SNG_EXPBITS);
@@ -191,8 +191,8 @@ fpu_stof(struct fpn *fp, u_int i)
int
fpu_dtof(struct fpn *fp, u_int i, u_int j)
{
- register int exp;
- register u_int frac, f0, f1, f2;
+ int exp;
+ u_int frac, f0, f1, f2;
#define DBL_SHIFT (DBL_FRACBITS - 32 - FP_LG)
exp = (i >> (32 - 1 - DBL_EXPBITS)) & mask(DBL_EXPBITS);
@@ -208,10 +208,10 @@ fpu_dtof(struct fpn *fp, u_int i, u_int
* 128-bit extended -> fpn.
*/
int
-fpu_qtof(register struct fpn *fp, u_int i, u_int j, u_int k, u_int l)
+fpu_qtof(struct fpn *fp, u_int i, u_int j, u_int k, u_int l)
{
- register int exp;
- register u_int frac, f0, f1, f2, f3;
+ int exp;
+ u_int frac, f0, f1, f2, f3;
#define EXT_SHIFT (-(EXT_FRACBITS - 3 * 32 - FP_LG)) /* left shift! */
/*
@@ -236,7 +236,7 @@ fpu_qtof(register struct fpn *fp, u_int
void
fpu_explode(struct fpemu *fe, struct fpn *fp, int type, int reg)
{
- register u_int s, *space;
+ u_int s, *space;
#ifdef SUN4U
uint64_t l, *xspace;
Index: src/sys/arch/sparc/fpu/fpu_extern.h
diff -u src/sys/arch/sparc/fpu/fpu_extern.h:1.9 src/sys/arch/sparc/fpu/fpu_extern.h:1.10
--- src/sys/arch/sparc/fpu/fpu_extern.h:1.9 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/fpu/fpu_extern.h Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_extern.h,v 1.9 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: fpu_extern.h,v 1.10 2022/08/28 22:09:26 rin Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -91,6 +91,6 @@ struct fpn *fpu_mul(struct fpemu *);
struct fpn *fpu_sqrt(struct fpemu *);
/* fpu_subr.c */
-int fpu_shr(register struct fpn *, register int);
-void fpu_norm(register struct fpn *);
-struct fpn *fpu_newnan(register struct fpemu *);
+int fpu_shr(struct fpn *, register int);
+void fpu_norm(struct fpn *);
+struct fpn *fpu_newnan(struct fpemu *);
Index: src/sys/arch/sparc/fpu/fpu_implode.c
diff -u src/sys/arch/sparc/fpu/fpu_implode.c:1.13 src/sys/arch/sparc/fpu/fpu_implode.c:1.14
--- src/sys/arch/sparc/fpu/fpu_implode.c:1.13 Wed Nov 16 23:24:44 2005
+++ src/sys/arch/sparc/fpu/fpu_implode.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_implode.c,v 1.13 2005/11/16 23:24:44 uwe Exp $ */
+/* $NetBSD: fpu_implode.c,v 1.14 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.13 2005/11/16 23:24:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.14 2022/08/28 22:09:26 rin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sparc_arch.h"
@@ -81,8 +81,8 @@ static int toinf(struct fpemu *, int);
static int
round(struct fpemu *fe, struct fpn *fp)
{
- register u_int m0, m1, m2, m3;
- register int gr, s;
+ u_int m0, m1, m2, m3;
+ int gr, s;
m0 = fp->fp_mant[0];
m1 = fp->fp_mant[1];
@@ -196,8 +196,8 @@ toinf(struct fpemu *fe, int sign)
u_int
fpu_ftoi(struct fpemu *fe, struct fpn *fp)
{
- register u_int i;
- register int sign, exp;
+ u_int i;
+ int sign, exp;
sign = fp->fp_sign;
switch (fp->fp_class) {
@@ -244,8 +244,8 @@ fpu_ftoi(struct fpemu *fe, struct fpn *f
u_int
fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *res)
{
- register uint64_t i;
- register int sign, exp;
+ uint64_t i;
+ int sign, exp;
sign = fp->fp_sign;
switch (fp->fp_class) {
@@ -293,8 +293,8 @@ fpu_ftox(struct fpemu *fe, struct fpn *f
u_int
fpu_ftos(struct fpemu *fe, struct fpn *fp)
{
- register u_int sign = fp->fp_sign << 31;
- register int exp;
+ u_int sign = fp->fp_sign << 31;
+ int exp;
#define SNG_EXP(e) ((e) << SNG_FRACBITS) /* makes e an exponent */
#define SNG_MASK (SNG_EXP(1) - 1) /* mask for fraction */
@@ -375,8 +375,8 @@ done:
u_int
fpu_ftod(struct fpemu *fe, struct fpn *fp, u_int *res)
{
- register u_int sign = fp->fp_sign << 31;
- register int exp;
+ u_int sign = fp->fp_sign << 31;
+ int exp;
#define DBL_EXP(e) ((e) << (DBL_FRACBITS & 31))
#define DBL_MASK (DBL_EXP(1) - 1)
@@ -433,8 +433,8 @@ done:
u_int
fpu_ftoq(struct fpemu *fe, struct fpn *fp, u_int *res)
{
- register u_int sign = fp->fp_sign << 31;
- register int exp;
+ u_int sign = fp->fp_sign << 31;
+ int exp;
#define EXT_EXP(e) ((e) << (EXT_FRACBITS & 31))
#define EXT_MASK (EXT_EXP(1) - 1)
