iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: math-emu: Use preferred flavor of unsigned integer declarations

Browse Source 
Fix occurences of unsigned integer variable declarations that are
not preferred by standards of checkpatch scripts. This removes a
significant number of checkpatch warnings for files in math-emu
directory (several files become completely warning-free), and thus
makes easier to spot (now and in the future) other, perhaps more
significant, checkpatch errors and warnings.

Signed-off-by: Aleksandar Markovic <aleksandar.markovic@mips.com>
Reviewed-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Douglas Leung <douglas.leung@mips.com>
Cc: Goran Ferenc <goran.ferenc@mips.com>
Cc: "Maciej W. Rozycki" <macro@imgtec.com>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Miodrag Dinic <miodrag.dinic@mips.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Petar Jovanovic <petar.jovanovic@mips.com>
Cc: Raghu Gandham <raghu.gandham@mips.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17582/
Signed-off-by: James Hogan <jhogan@kernel.org>
This commit is contained in:
Aleksandar Markovic 2017-11-02 12:13:59 +01:00 committed by James Hogan
parent 409fcace99
commit a58f85b5d5
12 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/mips/math-emu/cp1emu.c
View File

@ -810,7 +810,7 @@ do { \
#define SITOREG(si, x) \ #define SITOREG(si, x) \
do { \ do { \
if (cop1_64bit(xcp) && !hybrid_fprs()) { \ if (cop1_64bit(xcp) && !hybrid_fprs()) { \
unsigned i; \ unsigned int i; \
set_fpr32(&ctx->fpr[x], 0, si); \ set_fpr32(&ctx->fpr[x], 0, si); \
for (i = 1; i < ARRAY_SIZE(ctx->fpr[x].val32); i++) \ for (i = 1; i < ARRAY_SIZE(ctx->fpr[x].val32); i++) \
set_fpr32(&ctx->fpr[x], i, 0); \ set_fpr32(&ctx->fpr[x], i, 0); \
@ -823,7 +823,7 @@ do { \
#define SITOHREG(si, x) \ #define SITOHREG(si, x) \
do { \ do { \
unsigned i; \ unsigned int i; \
set_fpr32(&ctx->fpr[x], 1, si); \ set_fpr32(&ctx->fpr[x], 1, si); \
for (i = 2; i < ARRAY_SIZE(ctx->fpr[x].val32); i++) \ for (i = 2; i < ARRAY_SIZE(ctx->fpr[x].val32); i++) \
set_fpr32(&ctx->fpr[x], i, 0); \ set_fpr32(&ctx->fpr[x], i, 0); \
@ -834,7 +834,7 @@ do { \
#define DITOREG(di, x) \ #define DITOREG(di, x) \
do { \ do { \
unsigned fpr, i; \ unsigned int fpr, i; \
fpr = (x) & ~(cop1_64bit(xcp) ^ 1); \ fpr = (x) & ~(cop1_64bit(xcp) ^ 1); \
set_fpr64(&ctx->fpr[fpr], 0, di); \ set_fpr64(&ctx->fpr[fpr], 0, di); \
for (i = 1; i < ARRAY_SIZE(ctx->fpr[x].val64); i++) \ for (i = 1; i < ARRAY_SIZE(ctx->fpr[x].val64); i++) \
@ -1465,7 +1465,7 @@ DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg);
static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
mips_instruction ir, void __user **fault_addr) mips_instruction ir, void __user **fault_addr)
{ {
unsigned rcsr = 0; /* resulting csr */ unsigned int rcsr = 0; /* resulting csr */
MIPS_FPU_EMU_INC_STATS(cp1xops); MIPS_FPU_EMU_INC_STATS(cp1xops);
@ -1661,10 +1661,10 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
mips_instruction ir) mips_instruction ir)
{ {
int rfmt; /* resulting format */ int rfmt; /* resulting format */
unsigned rcsr = 0; /* resulting csr */ unsigned int rcsr = 0; /* resulting csr */
unsigned int oldrm; unsigned int oldrm;
unsigned int cbit; unsigned int cbit;
unsigned cond; unsigned int cond;
union { union {
union ieee754dp d; union ieee754dp d;
union ieee754sp s; union ieee754sp s;
@ -2029,9 +2029,10 @@ copcsr:
default: default:
if (!NO_R6EMU && MIPSInst_FUNC(ir) >= fcmp_op) { if (!NO_R6EMU && MIPSInst_FUNC(ir) >= fcmp_op) {
unsigned cmpop = MIPSInst_FUNC(ir) - fcmp_op; unsigned int cmpop;
union ieee754sp fs, ft; union ieee754sp fs, ft;
cmpop = MIPSInst_FUNC(ir) - fcmp_op;
SPFROMREG(fs, MIPSInst_FS(ir)); SPFROMREG(fs, MIPSInst_FS(ir));
SPFROMREG(ft, MIPSInst_FT(ir)); SPFROMREG(ft, MIPSInst_FT(ir));
rv.w = ieee754sp_cmp(fs, ft, rv.w = ieee754sp_cmp(fs, ft,
@ -2379,9 +2380,10 @@ dcopuop:
default: default:
if (!NO_R6EMU && MIPSInst_FUNC(ir) >= fcmp_op) { if (!NO_R6EMU && MIPSInst_FUNC(ir) >= fcmp_op) {
unsigned cmpop = MIPSInst_FUNC(ir) - fcmp_op; unsigned int cmpop;
union ieee754dp fs, ft; union ieee754dp fs, ft;
cmpop = MIPSInst_FUNC(ir) - fcmp_op;
DPFROMREG(fs, MIPSInst_FS(ir)); DPFROMREG(fs, MIPSInst_FS(ir));
DPFROMREG(ft, MIPSInst_FT(ir)); DPFROMREG(ft, MIPSInst_FT(ir));
rv.w = ieee754dp_cmp(fs, ft, rv.w = ieee754dp_cmp(fs, ft,

8
arch/mips/math-emu/dp_maddf.c
View File

@ -45,10 +45,10 @@ static union ieee754dp _dp_maddf(union ieee754dp z, union ieee754dp x,
{ {
int re; int re;
int rs; int rs;
unsigned lxm; unsigned int lxm;
unsigned hxm; unsigned int hxm;
unsigned lym; unsigned int lym;
unsigned hym; unsigned int hym;
u64 lrm; u64 lrm;
u64 hrm; u64 hrm;
u64 lzm; u64 lzm;

8
arch/mips/math-emu/dp_mul.c
View File

@ -26,10 +26,10 @@ union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y)
int re; int re;
int rs; int rs;
u64 rm; u64 rm;
unsigned lxm; unsigned int lxm;
unsigned hxm; unsigned int hxm;
unsigned lym; unsigned int lym;
unsigned hym; unsigned int hym;
u64 lrm; u64 lrm;
u64 hrm; u64 hrm;
u64 t; u64 t;

4
arch/mips/math-emu/dp_sqrt.c
View File

@ -21,7 +21,7 @@
#include "ieee754dp.h" #include "ieee754dp.h"
static const unsigned table[] = { static const unsigned int table[] = {
0, 1204, 3062, 5746, 9193, 13348, 18162, 23592, 0, 1204, 3062, 5746, 9193, 13348, 18162, 23592,
29598, 36145, 43202, 50740, 58733, 67158, 75992, 29598, 36145, 43202, 50740, 58733, 67158, 75992,
85215, 83599, 71378, 60428, 50647, 41945, 34246, 85215, 83599, 71378, 60428, 50647, 41945, 34246,
@ -33,7 +33,7 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x)
{ {
struct _ieee754_csr oldcsr; struct _ieee754_csr oldcsr;
union ieee754dp y, z, t; union ieee754dp y, z, t;
unsigned scalx, yh; unsigned int scalx, yh;
COMPXDP; COMPXDP;
EXPLODEXDP; EXPLODEXDP;

15
arch/mips/math-emu/ieee754.h
View File

@ -165,11 +165,12 @@ struct _ieee754_csr {
}; };
#define ieee754_csr (*(struct _ieee754_csr *)(&current->thread.fpu.fcr31)) #define ieee754_csr (*(struct _ieee754_csr *)(&current->thread.fpu.fcr31))
static inline unsigned ieee754_getrm(void) static inline unsigned int ieee754_getrm(void)
{ {
return (ieee754_csr.rm); return (ieee754_csr.rm);
} }
static inline unsigned ieee754_setrm(unsigned rm)
static inline unsigned int ieee754_setrm(unsigned int rm)
{ {
return (ieee754_csr.rm = rm); return (ieee754_csr.rm = rm);
} }
@ -177,14 +178,14 @@ static inline unsigned ieee754_setrm(unsigned rm)
/* /*
* get current exceptions * get current exceptions
*/ */
static inline unsigned ieee754_getcx(void) static inline unsigned int ieee754_getcx(void)
{ {
return (ieee754_csr.cx); return (ieee754_csr.cx);
} }
/* test for current exception condition /* test for current exception condition
*/ */
static inline int ieee754_cxtest(unsigned n) static inline int ieee754_cxtest(unsigned int n)
{ {
return (ieee754_csr.cx & n); return (ieee754_csr.cx & n);
} }
@ -192,21 +193,21 @@ static inline int ieee754_cxtest(unsigned n)
/* /*
* get sticky exceptions * get sticky exceptions
*/ */
static inline unsigned ieee754_getsx(void) static inline unsigned int ieee754_getsx(void)
{ {
return (ieee754_csr.sx); return (ieee754_csr.sx);
} }
/* clear sticky conditions /* clear sticky conditions
*/ */
static inline unsigned ieee754_clrsx(void) static inline unsigned int ieee754_clrsx(void)
{ {
return (ieee754_csr.sx = 0); return (ieee754_csr.sx = 0);
} }
/* test for sticky exception condition /* test for sticky exception condition
*/ */
static inline int ieee754_sxtest(unsigned n) static inline int ieee754_sxtest(unsigned int n)
{ {
return (ieee754_csr.sx & n); return (ieee754_csr.sx & n);
} }

6
arch/mips/math-emu/ieee754int.h
View File

@ -54,13 +54,13 @@ static inline int ieee754_class_nan(int xc)
} }
#define COMPXSP \ #define COMPXSP \
unsigned xm; int xe; int xs __maybe_unused; int xc unsigned int xm; int xe; int xs __maybe_unused; int xc
#define COMPYSP \ #define COMPYSP \
unsigned ym; int ye; int ys; int yc unsigned int ym; int ye; int ys; int yc
#define COMPZSP \ #define COMPZSP \
unsigned zm; int ze; int zs; int zc unsigned int zm; int ze; int zs; int zc
#define EXPLODESP(v, vc, vs, ve, vm) \ #define EXPLODESP(v, vc, vs, ve, vm) \
{ \ { \

4
arch/mips/math-emu/ieee754sp.c
View File

@ -65,7 +65,7 @@ union ieee754sp __cold ieee754sp_nanxcpt(union ieee754sp r)
return r; return r;
} }
static unsigned ieee754sp_get_rounding(int sn, unsigned xm) static unsigned int ieee754sp_get_rounding(int sn, unsigned int xm)
{ {
/* inexact must round of 3 bits /* inexact must round of 3 bits
*/ */
@ -96,7 +96,7 @@ static unsigned ieee754sp_get_rounding(int sn, unsigned xm)
* xe is an unbiased exponent * xe is an unbiased exponent
* xm is 3bit extended precision value. * xm is 3bit extended precision value.
*/ */
union ieee754sp ieee754sp_format(int sn, int xe, unsigned xm) union ieee754sp ieee754sp_format(int sn, int xe, unsigned int xm)
{ {
assert(xm); /* we don't gen exact zeros (probably should) */ assert(xm); /* we don't gen exact zeros (probably should) */

2
arch/mips/math-emu/ieee754sp.h
View File

@ -69,7 +69,7 @@ static inline int ieee754sp_finite(union ieee754sp x)
#define SPDNORMY SPDNORMx(ym, ye) #define SPDNORMY SPDNORMx(ym, ye)
#define SPDNORMZ SPDNORMx(zm, ze) #define SPDNORMZ SPDNORMx(zm, ze)
static inline union ieee754sp buildsp(int s, int bx, unsigned m) static inline union ieee754sp buildsp(int s, int bx, unsigned int m)
{ {
union ieee754sp r; union ieee754sp r;

4
arch/mips/math-emu/sp_div.c
View File

@ -23,9 +23,9 @@
union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y) union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y)
{ {
unsigned rm; unsigned int rm;
int re; int re;
unsigned bm; unsigned int bm;
COMPXSP; COMPXSP;
COMPYSP; COMPYSP;

2
arch/mips/math-emu/sp_fint.c
View File

@ -23,7 +23,7 @@
union ieee754sp ieee754sp_fint(int x) union ieee754sp ieee754sp_fint(int x)
{ {
unsigned xm; unsigned int xm;
int xe; int xe;
int xs; int xs;

6
arch/mips/math-emu/sp_maddf.c
View File

@ -20,9 +20,9 @@ static union ieee754sp _sp_maddf(union ieee754sp z, union ieee754sp x,
{ {
int re; int re;
int rs; int rs;
unsigned rm; unsigned int rm;
uint64_t rm64; u64 rm64;
uint64_t zm64; u64 zm64;
int s; int s;
COMPXSP; COMPXSP;

10
arch/mips/math-emu/sp_mul.c
View File

@ -25,15 +25,15 @@ union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y)
{ {
int re; int re;
int rs; int rs;
unsigned rm; unsigned int rm;
unsigned short lxm; unsigned short lxm;
unsigned short hxm; unsigned short hxm;
unsigned short lym; unsigned short lym;
unsigned short hym; unsigned short hym;
unsigned lrm; unsigned int lrm;
unsigned hrm; unsigned int hrm;
unsigned t; unsigned int t;
unsigned at; unsigned int at;
COMPXSP; COMPXSP;
COMPYSP; COMPYSP;