From cebb2edba8168fcca24724e9d1723ed0c7783877 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 24 Feb 2008 03:01:26 +0000 Subject: [PATCH] Resolve warnings exposed by LINT. o Put prototypes in a single header only. o Fix printf format specifiers. --- sys/powerpc/fpu/fpu_add.c | 1 - sys/powerpc/fpu/fpu_emu.c | 6 +++--- sys/powerpc/fpu/fpu_emu.h | 2 ++ sys/powerpc/fpu/fpu_extern.h | 21 --------------------- sys/powerpc/fpu/fpu_subr.c | 1 - 5 files changed, 5 insertions(+), 26 deletions(-) diff --git a/sys/powerpc/fpu/fpu_add.c b/sys/powerpc/fpu/fpu_add.c index 375c529354d9..5610b4a67847 100644 --- a/sys/powerpc/fpu/fpu_add.c +++ b/sys/powerpc/fpu/fpu_add.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include struct fpn * fpu_add(struct fpemu *fe) diff --git a/sys/powerpc/fpu/fpu_emu.c b/sys/powerpc/fpu/fpu_emu.c index ef7c1860ade6..790647c81fe9 100644 --- a/sys/powerpc/fpu/fpu_emu.c +++ b/sys/powerpc/fpu/fpu_emu.c @@ -328,7 +328,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn) /* Store as integer */ ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - DPRINTF(FPE_INSN, ("reg %d has %lx reg %d has %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n", ra, tf->fixreg[ra], rb, tf->fixreg[rb])); addr = tf->fixreg[rb]; @@ -358,7 +358,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn) /* calculate EA of load/store */ ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - DPRINTF(FPE_INSN, ("reg %d has %lx reg %d has %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n", ra, tf->fixreg[ra], rb, tf->fixreg[rb])); addr = tf->fixreg[rb]; if (ra != 0) @@ -375,7 +375,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn) /* calculate EA of load/store */ ra = instr.i_d.i_ra; addr = instr.i_d.i_d; - DPRINTF(FPE_INSN, ("reg %d has %lx displ %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x displ %x\n", ra, tf->fixreg[ra], addr)); if (ra != 0) addr += tf->fixreg[ra]; diff --git a/sys/powerpc/fpu/fpu_emu.h b/sys/powerpc/fpu/fpu_emu.h index 56f1ef8b8390..89ccc3611528 100644 --- a/sys/powerpc/fpu/fpu_emu.h +++ b/sys/powerpc/fpu/fpu_emu.h @@ -167,6 +167,8 @@ void fpu_compare(struct fpemu *, int); /* Build a new Quiet NaN (sign=0, frac=all 1's). */ struct fpn *fpu_newnan(struct fpemu *); +void fpu_norm(struct fpn *); + /* * Shift a number right some number of bits, taking care of round/sticky. * Note that the result is probably not a well-formed number (it will lack diff --git a/sys/powerpc/fpu/fpu_extern.h b/sys/powerpc/fpu/fpu_extern.h index cb569e29dfbf..d8528d790676 100644 --- a/sys/powerpc/fpu/fpu_extern.h +++ b/sys/powerpc/fpu/fpu_extern.h @@ -48,36 +48,15 @@ struct fpn; int fpu_emulate(struct trapframe *, struct fpreg *); int fpu_execute(struct trapframe *, struct fpemu *, union instr *); -/* fpu_add.c */ -struct fpn *fpu_add(struct fpemu *); - -/* fpu_compare.c */ -void fpu_compare(struct fpemu *, int); - -/* fpu_div.c */ -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_stof(struct fpn *, u_int); int fpu_dtof(struct fpn *, u_int, u_int); -void fpu_explode(struct fpemu *, struct fpn *, int, int); /* fpu_implode.c */ u_int fpu_ftoi(struct fpemu *, struct fpn *); u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *); u_int fpu_ftos(struct fpemu *, struct fpn *); u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *); -void fpu_implode(struct fpemu *, struct fpn *, int, u_int *); -/* fpu_mul.c */ -struct fpn *fpu_mul(struct fpemu *); - -/* fpu_sqrt.c */ -struct fpn *fpu_sqrt(struct fpemu *); - -/* fpu_subr.c */ -int fpu_shr(struct fpn *, int); -void fpu_norm(struct fpn *); -struct fpn *fpu_newnan(struct fpemu *); diff --git a/sys/powerpc/fpu/fpu_subr.c b/sys/powerpc/fpu/fpu_subr.c index e403e1816693..58b0b3de5800 100644 --- a/sys/powerpc/fpu/fpu_subr.c +++ b/sys/powerpc/fpu/fpu_subr.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* * Shift the given number right rsh bits. Any bits that `fall off' will get