Module Name: src
Committed By: rin
Date: Sun Aug 28 22:22:41 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_explode.c fpu_extern.h fpu_implode.c
Log Message:
u_int64_t --> uint64_t. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/fpu/fpu_explode.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/fpu/fpu_extern.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/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/powerpc/fpu/fpu_explode.c
diff -u src/sys/arch/powerpc/fpu/fpu_explode.c:1.9 src/sys/arch/powerpc/fpu/fpu_explode.c:1.10
--- src/sys/arch/powerpc/fpu/fpu_explode.c:1.9 Sat Jun 27 04:24:08 2020
+++ src/sys/arch/powerpc/fpu/fpu_explode.c Sun Aug 28 22:22:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_explode.c,v 1.9 2020/06/27 04:24:08 rin Exp $ */
+/* $NetBSD: fpu_explode.c,v 1.10 2022/08/28 22:22:41 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.9 2020/06/27 04:24:08 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.10 2022/08/28 22:22:41 rin Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ fpu_itof(struct fpn *fp, u_int i)
* 64-bit int -> fpn.
*/
int
-fpu_xtof(struct fpn *fp, u_int64_t i)
+fpu_xtof(struct fpn *fp, uint64_t i)
{
if (i == 0)
@@ -209,9 +209,9 @@ void
fpu_explode(struct fpemu *fe, struct fpn *fp, int type, int reg)
{
u_int s, *space;
- u_int64_t l, *xspace;
+ uint64_t l, *xspace;
- xspace = (u_int64_t *)&fe->fe_fpstate->fpreg[reg];
+ xspace = (uint64_t *)&fe->fe_fpstate->fpreg[reg];
l = xspace[0];
space = (u_int *)&fe->fe_fpstate->fpreg[reg];
s = space[0];
Index: src/sys/arch/powerpc/fpu/fpu_extern.h
diff -u src/sys/arch/powerpc/fpu/fpu_extern.h:1.5 src/sys/arch/powerpc/fpu/fpu_extern.h:1.6
--- src/sys/arch/powerpc/fpu/fpu_extern.h:1.5 Mon Jul 23 04:13:06 2012
+++ src/sys/arch/powerpc/fpu/fpu_extern.h Sun Aug 28 22:22:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_extern.h,v 1.5 2012/07/23 04:13:06 matt Exp $ */
+/* $NetBSD: fpu_extern.h,v 1.6 2022/08/28 22:22:41 rin Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ struct fpn *fpu_div(struct fpemu *);
/* fpu_explode.c */
int fpu_itof(struct fpn *, u_int);
-int fpu_xtof(struct fpn *, u_int64_t);
+int fpu_xtof(struct fpn *, uint64_t);
int fpu_stof(struct fpn *, u_int);
int fpu_dtof(struct fpn *, u_int, u_int);
void fpu_explode(struct fpemu *, struct fpn *, int, int);
Index: src/sys/arch/powerpc/fpu/fpu_implode.c
diff -u src/sys/arch/powerpc/fpu/fpu_implode.c:1.7 src/sys/arch/powerpc/fpu/fpu_implode.c:1.8
--- src/sys/arch/powerpc/fpu/fpu_implode.c:1.7 Sat Jun 27 03:07:57 2020
+++ src/sys/arch/powerpc/fpu/fpu_implode.c Sun Aug 28 22:22:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_implode.c,v 1.7 2020/06/27 03:07:57 rin Exp $ */
+/* $NetBSD: fpu_implode.c,v 1.8 2022/08/28 22:22:41 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.7 2020/06/27 03:07:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.8 2022/08/28 22:22:41 rin Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -245,7 +245,7 @@ fpu_ftoi(struct fpemu *fe, struct fpn *f
u_int
fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *res)
{
- u_int64_t i;
+ uint64_t i;
int sign, exp;
sign = fp->fp_sign;
@@ -271,8 +271,8 @@ fpu_ftox(struct fpemu *fe, struct fpn *f
/* NB: the following includes exp < 0 cases */
if (fpu_shr(fp, FP_NMANT - 1 - exp) != 0)
fe->fe_cx |= FPSCR_UX;
- i = ((u_int64_t)fp->fp_mant[2]<<32)|fp->fp_mant[3];
- if (i >= ((u_int64_t)0x8000000000000000LL + sign))
+ i = ((uint64_t)fp->fp_mant[2]<<32)|fp->fp_mant[3];
+ if (i >= ((uint64_t)0x8000000000000000LL + sign))
break;
return (sign ? -i : i);
