Module Name: src
Committed By: isaki
Date: Tue Mar 26 11:30:21 UTC 2013
Modified Files:
src/sys/arch/m68k/fpe: fpu_add.c fpu_arith.h fpu_div.c fpu_emulate.c
fpu_emulate.h fpu_explode.c fpu_fmovecr.c fpu_fscale.c fpu_fstore.c
fpu_implode.c fpu_log.c fpu_mul.c fpu_rem.c fpu_sqrt.c fpu_subr.c
fpu_trig.c
Log Message:
u_int -> uint32_t
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/fpe/fpu_add.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/fpe/fpu_arith.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/fpe/fpu_div.c \
src/sys/arch/m68k/fpe/fpu_mul.c src/sys/arch/m68k/fpe/fpu_sqrt.c \
src/sys/arch/m68k/fpe/fpu_trig.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/m68k/fpe/fpu_emulate.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/m68k/fpe/fpu_emulate.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/m68k/fpe/fpu_explode.c \
src/sys/arch/m68k/fpe/fpu_fstore.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/fpe/fpu_fmovecr.c \
src/sys/arch/m68k/fpe/fpu_fscale.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/fpe/fpu_implode.c \
src/sys/arch/m68k/fpe/fpu_log.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/m68k/fpe/fpu_rem.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/fpe/fpu_subr.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/m68k/fpe/fpu_add.c
diff -u src/sys/arch/m68k/fpe/fpu_add.c:1.8 src/sys/arch/m68k/fpe/fpu_add.c:1.9
--- src/sys/arch/m68k/fpe/fpu_add.c:1.8 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_add.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_add.c,v 1.8 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_add.c,v 1.9 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.8 2013/03/19 09:17:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.9 2013/03/26 11:30:20 isaki Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ struct fpn *
fpu_add(struct fpemu *fe)
{
struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2, *r;
- u_int r0, r1, r2;
+ uint32_t r0, r1, r2;
int rd;
/*
Index: src/sys/arch/m68k/fpe/fpu_arith.h
diff -u src/sys/arch/m68k/fpe/fpu_arith.h:1.6 src/sys/arch/m68k/fpe/fpu_arith.h:1.7
--- src/sys/arch/m68k/fpe/fpu_arith.h:1.6 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_arith.h Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_arith.h,v 1.6 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_arith.h,v 1.7 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -80,13 +80,13 @@
#define FPU_ADDS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) + (quad_t)(y); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xffffffff00000000LL) != 0); \
}
#define FPU_ADDCS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) + (quad_t)(y) + (!!fpu_carry); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xffffffff00000000LL) != 0); \
}
#define FPU_SUBC(r, x, y) \
@@ -94,13 +94,13 @@
#define FPU_SUBS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) - (quad_t)(y); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xffffffff00000000LL) != 0); \
}
#define FPU_SUBCS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) - (quad_t)(y) - (!!fpu_carry); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xffffffff00000000LL) != 0); \
}
Index: src/sys/arch/m68k/fpe/fpu_div.c
diff -u src/sys/arch/m68k/fpe/fpu_div.c:1.7 src/sys/arch/m68k/fpe/fpu_div.c:1.8
--- src/sys/arch/m68k/fpe/fpu_div.c:1.7 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_div.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_div.c,v 1.7 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_div.c,v 1.8 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.7 2013/03/19 09:17:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.8 2013/03/26 11:30:20 isaki Exp $");
#include <sys/types.h>
@@ -153,8 +153,8 @@ struct fpn *
fpu_div(struct fpemu *fe)
{
struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
- u_int q, bit;
- u_int r0, r1, r2, d0, d1, d2, y0, y1, y2;
+ uint32_t q, bit;
+ uint32_t r0, r1, r2, d0, d1, d2, y0, y1, y2;
FPU_DECL_CARRY
fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
Index: src/sys/arch/m68k/fpe/fpu_mul.c
diff -u src/sys/arch/m68k/fpe/fpu_mul.c:1.7 src/sys/arch/m68k/fpe/fpu_mul.c:1.8
--- src/sys/arch/m68k/fpe/fpu_mul.c:1.7 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_mul.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_mul.c,v 1.7 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_mul.c,v 1.8 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.7 2013/03/19 09:17:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.8 2013/03/26 11:30:21 isaki Exp $");
#include <sys/types.h>
@@ -100,7 +100,7 @@ struct fpn *
fpu_mul(struct fpemu *fe)
{
struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
- u_int a2, a1, a0, x2, x1, x0, bit, m;
+ uint32_t a2, a1, a0, x2, x1, x0, bit, m;
int sticky;
FPU_DECL_CARRY
Index: src/sys/arch/m68k/fpe/fpu_sqrt.c
diff -u src/sys/arch/m68k/fpe/fpu_sqrt.c:1.7 src/sys/arch/m68k/fpe/fpu_sqrt.c:1.8
--- src/sys/arch/m68k/fpe/fpu_sqrt.c:1.7 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_sqrt.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_sqrt.c,v 1.7 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_sqrt.c,v 1.8 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.7 2013/03/19 09:17:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.8 2013/03/26 11:30:21 isaki Exp $");
#include <sys/types.h>
@@ -189,10 +189,10 @@ struct fpn *
fpu_sqrt(struct fpemu *fe)
{
struct fpn *x = &fe->fe_f2;
- u_int bit, q, tt;
- u_int x0, x1, x2;
- u_int y0, y1, y2;
- u_int d0, d1, d2;
+ uint32_t bit, q, tt;
+ uint32_t x0, x1, x2;
+ uint32_t y0, y1, y2;
+ uint32_t d0, d1, d2;
int e;
FPU_DECL_CARRY
Index: src/sys/arch/m68k/fpe/fpu_trig.c
diff -u src/sys/arch/m68k/fpe/fpu_trig.c:1.7 src/sys/arch/m68k/fpe/fpu_trig.c:1.8
--- src/sys/arch/m68k/fpe/fpu_trig.c:1.7 Sat Mar 23 12:06:24 2013
+++ src/sys/arch/m68k/fpe/fpu_trig.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_trig.c,v 1.7 2013/03/23 12:06:24 isaki Exp $ */
+/* $NetBSD: fpu_trig.c,v 1.8 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_trig.c,v 1.7 2013/03/23 12:06:24 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_trig.c,v 1.8 2013/03/26 11:30:21 isaki Exp $");
#include "fpu_emulate.h"
@@ -90,14 +90,14 @@ fpu_atan(struct fpemu *fe)
* hyperb is for sinh(), cosh().
*/
struct fpn *
-fpu_sincos_taylor(struct fpemu *fe, struct fpn *s0, u_int f, int hyperb)
+fpu_sincos_taylor(struct fpemu *fe, struct fpn *s0, uint32_t f, int hyperb)
{
struct fpn res;
struct fpn x2;
struct fpn *s1;
struct fpn *r;
int sign;
- u_int k;
+ uint32_t k;
/* x2 := x * x */
CPYFPN(&fe->fe_f1, &fe->fe_f2);
Index: src/sys/arch/m68k/fpe/fpu_emulate.c
diff -u src/sys/arch/m68k/fpe/fpu_emulate.c:1.36 src/sys/arch/m68k/fpe/fpu_emulate.c:1.37
--- src/sys/arch/m68k/fpe/fpu_emulate.c:1.36 Sat Oct 15 15:14:29 2011
+++ src/sys/arch/m68k/fpe/fpu_emulate.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emulate.c,v 1.36 2011/10/15 15:14:29 tsutsui Exp $ */
+/* $NetBSD: fpu_emulate.c,v 1.37 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_emulate.c,v 1.36 2011/10/15 15:14:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emulate.c,v 1.37 2013/03/26 11:30:20 isaki Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -245,8 +245,8 @@ fpu_emulate(struct frame *frame, struct
int
fpu_upd_excp(struct fpemu *fe)
{
- u_int fpsr;
- u_int fpcr;
+ uint32_t fpsr;
+ uint32_t fpcr;
fpsr = fe->fe_fpsr;
fpcr = fe->fe_fpcr;
@@ -276,10 +276,10 @@ fpu_upd_excp(struct fpemu *fe)
}
/* update fpsr according to fp (= result of an fp op) */
-u_int
+uint32_t
fpu_upd_fpsr(struct fpemu *fe, struct fpn *fp)
{
- u_int fpsr;
+ uint32_t fpsr;
DPRINTF(("%s: previous fpsr=%08x\n", __func__, fe->fe_fpsr));
/* clear all condition code */
@@ -556,12 +556,12 @@ static int
fpu_emul_arith(struct fpemu *fe, struct instruction *insn)
{
struct frame *frame = fe->fe_frame;
- u_int *fpregs = &(fe->fe_fpframe->fpf_regs[0]);
+ uint32_t *fpregs = &(fe->fe_fpframe->fpf_regs[0]);
struct fpn *res;
int word1, sig = 0;
int regnum, format;
int discard_result = 0;
- u_int buf[3];
+ uint32_t buf[3];
#ifdef DEBUG_FPE
int flags;
char regname;
Index: src/sys/arch/m68k/fpe/fpu_emulate.h
diff -u src/sys/arch/m68k/fpe/fpu_emulate.h:1.21 src/sys/arch/m68k/fpe/fpu_emulate.h:1.22
--- src/sys/arch/m68k/fpe/fpu_emulate.h:1.21 Tue Mar 19 09:28:39 2013
+++ src/sys/arch/m68k/fpe/fpu_emulate.h Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emulate.h,v 1.21 2013/03/19 09:28:39 isaki Exp $ */
+/* $NetBSD: fpu_emulate.h,v 1.22 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1995 Gordon Ross
@@ -81,7 +81,7 @@ struct fpn {
int fp_sign; /* 0 => positive, 1 => negative */
int fp_exp; /* exponent (unbiased) */
int fp_sticky; /* nonzero bits lost at right end */
- u_int fp_mant[3]; /* 83-bit mantissa */
+ uint32_t fp_mant[3]; /* 83-bit mantissa */
};
#define FP_NMANT 83 /* total bits in mantissa (incl g,r) */
@@ -132,7 +132,7 @@ CPYFPN(struct fpn *dst, const struct fpn
* then op1 is the one we want; otherwise op2 is the one we want.
*/
#define ORDER(x, y) { \
- if ((u_int)(x)->fp_class > (u_int)(y)->fp_class) \
+ if ((uint32_t)(x)->fp_class > (uint32_t)(y)->fp_class) \
SWAP(x, y); \
}
#define SWAP(x, y) { \
@@ -146,8 +146,8 @@ CPYFPN(struct fpn *dst, const struct fpn
struct fpemu {
struct frame *fe_frame; /* integer regs, etc */
struct fpframe *fe_fpframe; /* FP registers, etc */
- u_int fe_fpsr; /* fpsr copy (modified during op) */
- u_int fe_fpcr; /* fpcr copy */
+ uint32_t fe_fpsr; /* fpsr copy (modified during op) */
+ uint32_t fe_fpcr; /* fpcr copy */
struct fpn fe_f1; /* operand 1 */
struct fpn fe_f2; /* operand 2, if required */
struct fpn fe_f3; /* available storage for result */
@@ -188,8 +188,8 @@ struct insn_ea {
#define ea_fea ea_ext[0] /* MC68LC040 only: frame EA */
struct instruction {
- u_int is_pc; /* insn's address */
- u_int is_nextpc; /* next PC */
+ uint32_t is_pc; /* insn's address */
+ uint32_t is_nextpc; /* next PC */
int is_advance; /* length of instruction */
int is_datasize; /* size of memory operand */
int is_opcode; /* opcode word */
@@ -227,8 +227,8 @@ int fpu_shr(struct fpn *, int);
int fpu_round(struct fpemu *, struct fpn *);
/* type conversion */
-void fpu_explode(struct fpemu *, struct fpn *, int t, const u_int *);
-void fpu_implode(struct fpemu *, struct fpn *, int t, u_int *);
+void fpu_explode(struct fpemu *, struct fpn *, int t, const uint32_t *);
+void fpu_implode(struct fpemu *, struct fpn *, int t, uint32_t *);
/*
* non-static emulation functions
@@ -246,16 +246,16 @@ int fpu_emul_fscale(struct fpemu *, stru
int fpu_emulate(struct frame *, struct fpframe *, ksiginfo_t *);
struct fpn *fpu_cmp(struct fpemu *);
-struct fpn *fpu_sincos_taylor(struct fpemu *, struct fpn *, u_int, int);
+struct fpn *fpu_sincos_taylor(struct fpemu *, struct fpn *, uint32_t, int);
/*
* "helper" functions
*/
/* return values from constant rom */
-struct fpn *fpu_const(struct fpn *, u_int);
+struct fpn *fpu_const(struct fpn *, uint32_t);
/* update exceptions and FPSR */
int fpu_upd_excp(struct fpemu *);
-u_int fpu_upd_fpsr(struct fpemu *, struct fpn *);
+uint32_t fpu_upd_fpsr(struct fpemu *, struct fpn *);
/* address mode decoder, and load/store */
int fpu_decode_ea(struct frame *, struct instruction *,
Index: src/sys/arch/m68k/fpe/fpu_explode.c
diff -u src/sys/arch/m68k/fpe/fpu_explode.c:1.13 src/sys/arch/m68k/fpe/fpu_explode.c:1.14
--- src/sys/arch/m68k/fpe/fpu_explode.c:1.13 Tue Mar 19 09:28:39 2013
+++ src/sys/arch/m68k/fpe/fpu_explode.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_explode.c,v 1.13 2013/03/19 09:28:39 isaki Exp $ */
+/* $NetBSD: fpu_explode.c,v 1.14 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.13 2013/03/19 09:28:39 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.14 2013/03/26 11:30:20 isaki Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -59,10 +59,10 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_explode.
/* Conversion to internal format -- note asymmetry. */
-static int fpu_itof(struct fpn *fp, u_int i);
-static int fpu_stof(struct fpn *fp, u_int i);
-static int fpu_dtof(struct fpn *fp, u_int i, u_int j);
-static int fpu_xtof(struct fpn *fp, u_int i, u_int j, u_int k);
+static int fpu_itof(struct fpn *fp, uint32_t i);
+static int fpu_stof(struct fpn *fp, uint32_t i);
+static int fpu_dtof(struct fpn *fp, uint32_t i, uint32_t j);
+static int fpu_xtof(struct fpn *fp, uint32_t i, uint32_t j, uint32_t k);
/*
* N.B.: in all of the following, we assume the FP format is
@@ -87,7 +87,7 @@ static int fpu_xtof(struct fpn *fp, u_in
* int -> fpn.
*/
static int
-fpu_itof(struct fpn *fp, u_int i)
+fpu_itof(struct fpn *fp, uint32_t i)
{
if (i == 0)
@@ -143,10 +143,10 @@ fpu_itof(struct fpn *fp, u_int i)
* format: i.e., needs at most fp_mant[0] and fp_mant[1].
*/
static int
-fpu_stof(struct fpn *fp, u_int i)
+fpu_stof(struct fpn *fp, uint32_t i)
{
int exp;
- u_int frac, f0, f1;
+ uint32_t frac, f0, f1;
#define SNG_SHIFT (SNG_FRACBITS - FP_LG)
exp = (i >> (32 - 1 - SNG_EXPBITS)) & mask(SNG_EXPBITS);
@@ -161,10 +161,10 @@ fpu_stof(struct fpn *fp, u_int i)
* We assume this uses at most (96-FP_LG) bits.
*/
static int
-fpu_dtof(struct fpn *fp, u_int i, u_int j)
+fpu_dtof(struct fpn *fp, uint32_t i, uint32_t j)
{
int exp;
- u_int frac, f0, f1, f2;
+ uint32_t frac, f0, f1, f2;
#define DBL_SHIFT (DBL_FRACBITS - 32 - FP_LG)
exp = (i >> (32 - 1 - DBL_EXPBITS)) & mask(DBL_EXPBITS);
@@ -180,10 +180,10 @@ fpu_dtof(struct fpn *fp, u_int i, u_int
* 96-bit extended -> fpn.
*/
static int
-fpu_xtof(struct fpn *fp, u_int i, u_int j, u_int k)
+fpu_xtof(struct fpn *fp, uint32_t i, uint32_t j, uint32_t k)
{
int exp;
- u_int frac, f0, f1, f2;
+ uint32_t frac, f0, f1, f2;
#define EXT_SHIFT (EXT_FRACBITS - 1 - 32 - FP_LG)
exp = (i >> (32 - 1 - EXT_EXPBITS)) & mask(EXT_EXPBITS);
@@ -222,9 +222,9 @@ fpu_xtof(struct fpn *fp, u_int i, u_int
* Explode the contents of a memory operand.
*/
void
-fpu_explode(struct fpemu *fe, struct fpn *fp, int type, const u_int *space)
+fpu_explode(struct fpemu *fe, struct fpn *fp, int type, const uint32_t *space)
{
- u_int s;
+ uint32_t s;
s = space[0];
fp->fp_sign = s >> 31;
Index: src/sys/arch/m68k/fpe/fpu_fstore.c
diff -u src/sys/arch/m68k/fpe/fpu_fstore.c:1.13 src/sys/arch/m68k/fpe/fpu_fstore.c:1.14
--- src/sys/arch/m68k/fpe/fpu_fstore.c:1.13 Mon Jul 18 14:11:27 2011
+++ src/sys/arch/m68k/fpe/fpu_fstore.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_fstore.c,v 1.13 2011/07/18 14:11:27 isaki Exp $ */
+/* $NetBSD: fpu_fstore.c,v 1.14 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_fstore.c,v 1.13 2011/07/18 14:11:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_fstore.c,v 1.14 2013/03/26 11:30:21 isaki Exp $");
#include <sys/types.h>
#include <sys/signal.h>
@@ -45,11 +45,11 @@ int
fpu_emul_fstore(struct fpemu *fe, struct instruction *insn)
{
struct frame *frame = fe->fe_frame;
- u_int *fpregs = fe->fe_fpframe->fpf_regs;
+ uint32_t *fpregs = fe->fe_fpframe->fpf_regs;
int word1, sig;
int regnum;
int format;
- u_int buf[3];
+ uint32_t buf[3];
#if DEBUG_FPE
printf(" fpu_emul_fstore: frame at %p fpframe at %p\n",
Index: src/sys/arch/m68k/fpe/fpu_fmovecr.c
diff -u src/sys/arch/m68k/fpe/fpu_fmovecr.c:1.15 src/sys/arch/m68k/fpe/fpu_fmovecr.c:1.16
--- src/sys/arch/m68k/fpe/fpu_fmovecr.c:1.15 Sat Mar 23 12:08:47 2013
+++ src/sys/arch/m68k/fpe/fpu_fmovecr.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_fmovecr.c,v 1.15 2013/03/23 12:08:47 isaki Exp $ */
+/* $NetBSD: fpu_fmovecr.c,v 1.16 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_fmovecr.c,v 1.15 2013/03/23 12:08:47 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_fmovecr.c,v 1.16 2013/03/26 11:30:20 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ static struct fpn constrom[] = {
};
struct fpn *
-fpu_const(struct fpn *fp, u_int offset)
+fpu_const(struct fpn *fp, uint32_t offset)
{
struct fpn *r;
@@ -101,7 +101,7 @@ int
fpu_emul_fmovecr(struct fpemu *fe, struct instruction *insn)
{
int dstreg, offset;
- u_int *fpreg;
+ uint32_t *fpreg;
dstreg = (insn->is_word1 >> 7) & 0x7;
offset = insn->is_word1 & 0x7F;
Index: src/sys/arch/m68k/fpe/fpu_fscale.c
diff -u src/sys/arch/m68k/fpe/fpu_fscale.c:1.15 src/sys/arch/m68k/fpe/fpu_fscale.c:1.16
--- src/sys/arch/m68k/fpe/fpu_fscale.c:1.15 Mon Jul 18 14:11:27 2011
+++ src/sys/arch/m68k/fpe/fpu_fscale.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_fscale.c,v 1.15 2011/07/18 14:11:27 isaki Exp $ */
+/* $NetBSD: fpu_fscale.c,v 1.16 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_fscale.c,v 1.15 2011/07/18 14:11:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_fscale.c,v 1.16 2013/03/26 11:30:20 isaki Exp $");
#include <sys/types.h>
#include <sys/signal.h>
@@ -51,12 +51,12 @@ int
fpu_emul_fscale(struct fpemu *fe, struct instruction *insn)
{
struct frame *frame;
- u_int *fpregs;
+ uint32_t *fpregs;
int word1, sig;
int regnum, format;
int scale, sign, exp;
- u_int m0, m1;
- u_int buf[3], fpsr;
+ uint32_t m0, m1;
+ uint32_t buf[3], fpsr;
#if DEBUG_FPE
int flags;
char regname;
@@ -208,7 +208,7 @@ fpu_emul_fscale(struct fpemu *fe, struct
exp += scale;
if (exp < 0) {
/* underflow */
- u_int grs; /* guard, round and sticky */
+ uint32_t grs; /* guard, round and sticky */
exp = 0;
grs = m1 << (32 + exp);
Index: src/sys/arch/m68k/fpe/fpu_implode.c
diff -u src/sys/arch/m68k/fpe/fpu_implode.c:1.14 src/sys/arch/m68k/fpe/fpu_implode.c:1.15
--- src/sys/arch/m68k/fpe/fpu_implode.c:1.14 Fri Mar 22 13:46:38 2013
+++ src/sys/arch/m68k/fpe/fpu_implode.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_implode.c,v 1.14 2013/03/22 13:46:38 isaki Exp $ */
+/* $NetBSD: fpu_implode.c,v 1.15 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.14 2013/03/22 13:46:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.15 2013/03/26 11:30:21 isaki Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -58,10 +58,10 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_implode.
#include "fpu_arith.h"
/* Conversion from internal format -- note asymmetry. */
-static u_int fpu_ftoi(struct fpemu *fe, struct fpn *fp);
-static u_int fpu_ftos(struct fpemu *fe, struct fpn *fp);
-static u_int fpu_ftod(struct fpemu *fe, struct fpn *fp, u_int *);
-static u_int fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *);
+static uint32_t fpu_ftoi(struct fpemu *fe, struct fpn *fp);
+static uint32_t fpu_ftos(struct fpemu *fe, struct fpn *fp);
+static uint32_t fpu_ftod(struct fpemu *fe, struct fpn *fp, uint32_t *);
+static uint32_t fpu_ftox(struct fpemu *fe, struct fpn *fp, uint32_t *);
/*
* Round a number (algorithm from Motorola MC68882 manual, modified for
@@ -78,7 +78,7 @@ static u_int fpu_ftox(struct fpemu *fe,
int
fpu_round(struct fpemu *fe, struct fpn *fp)
{
- u_int m0, m1, m2;
+ uint32_t m0, m1, m2;
int gr, s;
m0 = fp->fp_mant[0];
@@ -186,10 +186,10 @@ toinf(struct fpemu *fe, int sign)
* N.B.: this conversion always rounds towards zero (this is a peculiarity
* of the SPARC instruction set).
*/
-static u_int
+static uint32_t
fpu_ftoi(struct fpemu *fe, struct fpn *fp)
{
- u_int i;
+ uint32_t i;
int sign, exp;
sign = fp->fp_sign;
@@ -220,7 +220,7 @@ fpu_ftoi(struct fpemu *fe, struct fpn *f
}
fpu_round(fe, fp);
i = fp->fp_mant[2];
- if (i >= ((u_int)0x80000000 + sign))
+ if (i >= ((uint32_t)0x80000000 + sign))
break;
return (sign ? -i : i);
@@ -236,10 +236,10 @@ fpu_ftoi(struct fpemu *fe, struct fpn *f
* fpn -> single (32 bit single returned as return value).
* We assume <= 29 bits in a single-precision fraction (1.f part).
*/
-static u_int
+static uint32_t
fpu_ftos(struct fpemu *fe, struct fpn *fp)
{
- u_int sign = fp->fp_sign << 31;
+ uint32_t sign = fp->fp_sign << 31;
int exp;
#define SNG_EXP(e) ((e) << SNG_FRACBITS) /* makes e an exponent */
@@ -320,10 +320,10 @@ done:
*
* This code mimics fpu_ftos; see it for comments.
*/
-static u_int
-fpu_ftod(struct fpemu *fe, struct fpn *fp, u_int *res)
+static uint32_t
+fpu_ftod(struct fpemu *fe, struct fpn *fp, uint32_t *res)
{
- u_int sign = fp->fp_sign << 31;
+ uint32_t sign = fp->fp_sign << 31;
int exp;
#define DBL_EXP(e) ((e) << (DBL_FRACBITS & 31))
@@ -382,10 +382,10 @@ done:
*
* This code mimics fpu_ftos; see it for comments.
*/
-static u_int
-fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *res)
+static uint32_t
+fpu_ftox(struct fpemu *fe, struct fpn *fp, uint32_t *res)
{
- u_int sign = fp->fp_sign << 31;
+ uint32_t sign = fp->fp_sign << 31;
int exp;
#define EXT_EXP(e) ((e) << 16)
@@ -456,7 +456,7 @@ done:
* Implode an fpn, writing the result into the given space.
*/
void
-fpu_implode(struct fpemu *fe, struct fpn *fp, int type, u_int *space)
+fpu_implode(struct fpemu *fe, struct fpn *fp, int type, uint32_t *space)
{
/* XXX Dont delete exceptions set here: fe->fe_fpsr &= ~FPSR_EXCP; */
Index: src/sys/arch/m68k/fpe/fpu_log.c
diff -u src/sys/arch/m68k/fpe/fpu_log.c:1.14 src/sys/arch/m68k/fpe/fpu_log.c:1.15
--- src/sys/arch/m68k/fpe/fpu_log.c:1.14 Mon Jul 18 14:11:27 2011
+++ src/sys/arch/m68k/fpe/fpu_log.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_log.c,v 1.14 2011/07/18 14:11:27 isaki Exp $ */
+/* $NetBSD: fpu_log.c,v 1.15 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -32,30 +32,30 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_log.c,v 1.14 2011/07/18 14:11:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_log.c,v 1.15 2013/03/26 11:30:21 isaki Exp $");
#include <sys/types.h>
#include <sys/systm.h>
#include "fpu_emulate.h"
-static u_int logA6[] = { 0x3FC2499A, 0xB5E4040B };
-static u_int logA5[] = { 0xBFC555B5, 0x848CB7DB };
-static u_int logA4[] = { 0x3FC99999, 0x987D8730 };
-static u_int logA3[] = { 0xBFCFFFFF, 0xFF6F7E97 };
-static u_int logA2[] = { 0x3FD55555, 0x555555A4 };
-static u_int logA1[] = { 0xBFE00000, 0x00000008 };
-
-static u_int logB5[] = { 0x3F175496, 0xADD7DAD6 };
-static u_int logB4[] = { 0x3F3C71C2, 0xFE80C7E0 };
-static u_int logB3[] = { 0x3F624924, 0x928BCCFF };
-static u_int logB2[] = { 0x3F899999, 0x999995EC };
-static u_int logB1[] = { 0x3FB55555, 0x55555555 };
+static uint32_t logA6[] = { 0x3FC2499A, 0xB5E4040B };
+static uint32_t logA5[] = { 0xBFC555B5, 0x848CB7DB };
+static uint32_t logA4[] = { 0x3FC99999, 0x987D8730 };
+static uint32_t logA3[] = { 0xBFCFFFFF, 0xFF6F7E97 };
+static uint32_t logA2[] = { 0x3FD55555, 0x555555A4 };
+static uint32_t logA1[] = { 0xBFE00000, 0x00000008 };
+
+static uint32_t logB5[] = { 0x3F175496, 0xADD7DAD6 };
+static uint32_t logB4[] = { 0x3F3C71C2, 0xFE80C7E0 };
+static uint32_t logB3[] = { 0x3F624924, 0x928BCCFF };
+static uint32_t logB2[] = { 0x3F899999, 0x999995EC };
+static uint32_t logB1[] = { 0x3FB55555, 0x55555555 };
/* sfpn = shortened fp number; can represent only positive numbers */
static struct sfpn {
int sp_exp;
- u_int sp_m0, sp_m1;
+ uint32_t sp_m0, sp_m1;
} logtbl[] = {
{ 0x3FFE - 0x3fff, 0xFE03F80FU, 0xE03F80FEU },
{ 0x3FF7 - 0x3fff, 0xFF015358U, 0x833C47E2U },
@@ -337,7 +337,8 @@ __fpu_logn(struct fpemu *fe)
fe->fe_f2.fp_mant[0] = (logtbl[i].sp_m0 >> (31 - FP_LG));
fe->fe_f2.fp_mant[1] = (logtbl[i].sp_m0 << (FP_LG + 1)) |
(logtbl[i].sp_m1 >> (31 - FP_LG));
- fe->fe_f2.fp_mant[2] = (u_int)(logtbl[i].sp_m1 << (FP_LG + 1));
+ fe->fe_f2.fp_mant[2] =
+ (uint32_t)(logtbl[i].sp_m1 << (FP_LG + 1));
#if FPE_DEBUG
printf("__fpu_logn: 1/F=(%d,%08x,%08x...)\n", fe->fe_f2.fp_exp,
@@ -477,7 +478,7 @@ struct fpn *
fpu_log10(struct fpemu *fe)
{
struct fpn *fp = &fe->fe_f2;
- u_int fpsr;
+ uint32_t fpsr;
fpsr = fe->fe_fpsr & ~FPSR_EXCP; /* clear all exceptions */
@@ -514,7 +515,7 @@ struct fpn *
fpu_log2(struct fpemu *fe)
{
struct fpn *fp = &fe->fe_f2;
- u_int fpsr;
+ uint32_t fpsr;
fpsr = fe->fe_fpsr & ~FPSR_EXCP; /* clear all exceptions */
@@ -558,7 +559,7 @@ struct fpn *
fpu_logn(struct fpemu *fe)
{
struct fpn *fp = &fe->fe_f2;
- u_int fpsr;
+ uint32_t fpsr;
fpsr = fe->fe_fpsr & ~FPSR_EXCP; /* clear all exceptions */
Index: src/sys/arch/m68k/fpe/fpu_rem.c
diff -u src/sys/arch/m68k/fpe/fpu_rem.c:1.12 src/sys/arch/m68k/fpe/fpu_rem.c:1.13
--- src/sys/arch/m68k/fpe/fpu_rem.c:1.12 Tue Mar 26 10:57:13 2013
+++ src/sys/arch/m68k/fpe/fpu_rem.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_rem.c,v 1.12 2013/03/26 10:57:13 isaki Exp $ */
+/* $NetBSD: fpu_rem.c,v 1.13 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_rem.c,v 1.12 2013/03/26 10:57:13 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_rem.c,v 1.13 2013/03/26 11:30:21 isaki Exp $");
#include <sys/types.h>
#include <sys/signal.h>
@@ -93,7 +93,7 @@ __fpu_modrem(struct fpemu *fe, int modre
static struct fpn X, Y;
struct fpn *x, *y, *r;
struct fpn r_bkup;
- u_int signX, signY, signQ;
+ uint32_t signX, signY, signQ;
int j, k, l, q;
int Last_Subtract;
Index: src/sys/arch/m68k/fpe/fpu_subr.c
diff -u src/sys/arch/m68k/fpe/fpu_subr.c:1.9 src/sys/arch/m68k/fpe/fpu_subr.c:1.10
--- src/sys/arch/m68k/fpe/fpu_subr.c:1.9 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_subr.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_subr.c,v 1.9 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_subr.c,v 1.10 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.9 2013/03/19 09:17:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.10 2013/03/26 11:30:21 isaki Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v
int
fpu_shr(struct fpn *fp, int rsh)
{
- u_int m0, m1, m2, s;
+ uint32_t m0, m1, m2, s;
int lsh;
#ifdef DIAGNOSTIC
@@ -131,7 +131,7 @@ fpu_shr(struct fpn *fp, int rsh)
void
fpu_norm(struct fpn *fp)
{
- u_int m0, m1, m2, sup, nrm;
+ uint32_t m0, m1, m2, sup, nrm;
int lsh, rsh, exp;
exp = fp->fp_exp;
