[ARM] 3471/1: FTOSI functions should return 0 for NaN

Patch from Catalin Marinas

The NaN case was dealed with by the "exponent >= ... + 32" condition but it
was not setting the value "d" to 0.

Signed-off-by: Ken'ichi Kuromusha <musha@aplix.co.jp>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 13 insertions, 3 deletions

diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c
index 9b367a65cb4d..2418d12e7fb5 100644
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
@@ -588,6 +588,7 @@ static u32 vfp_double_ftosi(int sd, int unused, int dm, u32 fpscr)
         struct vfp_double vdm;
         u32 d, exceptions = 0;
         int rmode = fpscr & FPSCR_RMODE_MASK;
+        int tm;
 
         vfp_double_unpack(&vdm, vfp_get_double(dm));
         vfp_double_dump("VDM", &vdm);
@@ -595,10 +596,14 @@ static u32 vfp_double_ftosi(int sd, int unused, int dm, u32 fpscr)
         /*
          * Do we have denormalised number?
          */
-        if (vfp_double_type(&vdm) & VFP_DENORMAL)
+        tm = vfp_double_type(&vdm);
+        if (tm & VFP_DENORMAL)
                 exceptions |= FPSCR_IDC;
 
-        if (vdm.exponent >= 1023 + 32) {
+        if (tm & VFP_NAN) {
+                d = 0;
+                exceptions |= FPSCR_IOC;
+        } else if (vdm.exponent >= 1023 + 32) {
                 d = 0x7fffffff;
                 if (vdm.sign)
                         d = ~d;
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index 14dd696ddeb1..df6e5e23bccb 100644
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
@@ -632,6 +632,7 @@ 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;
+        int tm;
 
         vfp_single_unpack(&vsm, m);
         vfp_single_dump("VSM", &vsm);
@@ -639,10 +640,14 @@ static u32 vfp_single_ftosi(int sd, int unused, s32 m, u32 fpscr)
         /*
          * Do we have a denormalised number?
          */
+        tm = vfp_single_type(&vsm);
         if (vfp_single_type(&vsm) & VFP_DENORMAL)
                 exceptions |= FPSCR_IDC;
 
-        if (vsm.exponent >= 127 + 32) {
+        if (tm & VFP_NAN) {
+                d = 0;
+                exceptions |= FPSCR_IOC;
+        } else if (vsm.exponent >= 127 + 32) {
                 /*
                  * m >= 2^31-2^7: invalid
                  */