git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
vfp
/
vfpsingle.c
diff --git
a/arch/arm/vfp/vfpsingle.c
b/arch/arm/vfp/vfpsingle.c
index
dae2c2f
..
14dd696
100644
(file)
--- a/
arch/arm/vfp/vfpsingle.c
+++ b/
arch/arm/vfp/vfpsingle.c
@@
-203,7
+203,7
@@
u32 vfp_single_normaliseround(int sd, struct vfp_single *vs, u32 fpscr, u32 exce
vfp_put_float(sd, d);
}
vfp_put_float(sd, d);
}
- return exceptions;
+ return exceptions
& ~VFP_NAN_FLAG
;
}
/*
}
/*
@@
-632,7
+632,6
@@
static u32 vfp_single_ftosi(int sd, int unused, s32 m, u32 fpscr)
struct vfp_single vsm;
u32 d, exceptions = 0;
int rmode = fpscr & FPSCR_RMODE_MASK;
struct vfp_single vsm;
u32 d, exceptions = 0;
int rmode = fpscr & FPSCR_RMODE_MASK;
- int tm;
vfp_single_unpack(&vsm, m);
vfp_single_dump("VSM", &vsm);
vfp_single_unpack(&vsm, m);
vfp_single_dump("VSM", &vsm);
@@
-640,14
+639,10
@@
static u32 vfp_single_ftosi(int sd, int unused, s32 m, u32 fpscr)
/*
* Do we have a denormalised number?
*/
/*
* Do we have a denormalised number?
*/
- tm = vfp_single_type(&vsm);
if (vfp_single_type(&vsm) & VFP_DENORMAL)
exceptions |= FPSCR_IDC;
if (vfp_single_type(&vsm) & VFP_DENORMAL)
exceptions |= FPSCR_IDC;
- if (tm & VFP_NAN) {
- d = 0;
- exceptions |= FPSCR_IOC;
- } else if (vsm.exponent >= 127 + 32) {
+ if (vsm.exponent >= 127 + 32) {
/*
* m >= 2^31-2^7: invalid
*/
/*
* m >= 2^31-2^7: invalid
*/
@@
-1193,7
+1188,7
@@
u32 vfp_single_cpdo(u32 inst, u32 fpscr)
pr_debug("VFP: vecstride=%u veclen=%u\n", vecstride,
(veclen >> FPSCR_LENGTH_BIT) + 1);
pr_debug("VFP: vecstride=%u veclen=%u\n", vecstride,
(veclen >> FPSCR_LENGTH_BIT) + 1);
- fop = (op == FOP_EXT) ? fop_extfns[
FEXT_TO_IDX(inst)
] : fop_fns[FOP_TO_IDX(op)];
+ fop = (op == FOP_EXT) ? fop_extfns[
sn
] : fop_fns[FOP_TO_IDX(op)];
if (!fop)
goto invalid;
if (!fop)
goto invalid;