Skip to content

Commit

Permalink
MIPS: Fix abs.[sd] and neg.[sd] emulation for NaN operands
Browse files Browse the repository at this point in the history
This patch ensures that the sign bit is always updated for NaN operands.

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Nigel Stephens authored and Ralf Baechle committed Nov 2, 2009
1 parent a074f0e commit cea2be4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
13 changes: 4 additions & 9 deletions arch/mips/math-emu/dp_simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ ieee754dp ieee754dp_neg(ieee754dp x)
return ieee754dp_nanxcpt(y, "neg");
}

if (ieee754dp_isnan(x)) /* but not infinity */
return ieee754dp_nanxcpt(x, "neg", x);
return x;
}

Expand All @@ -76,15 +74,12 @@ ieee754dp ieee754dp_abs(ieee754dp x)
CLEARCX;
FLUSHXDP;

/* Clear sign ALWAYS, irrespective of NaN */
DPSIGN(x) = 0;

if (xc == IEEE754_CLASS_SNAN) {
SETCX(IEEE754_INVALID_OPERATION);
return ieee754dp_nanxcpt(ieee754dp_indef(), "neg");
return ieee754dp_nanxcpt(ieee754dp_indef(), "abs");
}

if (ieee754dp_isnan(x)) /* but not infinity */
return ieee754dp_nanxcpt(x, "abs", x);

/* quick fix up */
DPSIGN(x) = 0;
return x;
}
11 changes: 3 additions & 8 deletions arch/mips/math-emu/sp_simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ ieee754sp ieee754sp_neg(ieee754sp x)
return ieee754sp_nanxcpt(y, "neg");
}

if (ieee754sp_isnan(x)) /* but not infinity */
return ieee754sp_nanxcpt(x, "neg", x);
return x;
}

Expand All @@ -76,15 +74,12 @@ ieee754sp ieee754sp_abs(ieee754sp x)
CLEARCX;
FLUSHXSP;

/* Clear sign ALWAYS, irrespective of NaN */
SPSIGN(x) = 0;

if (xc == IEEE754_CLASS_SNAN) {
SETCX(IEEE754_INVALID_OPERATION);
return ieee754sp_nanxcpt(ieee754sp_indef(), "abs");
}

if (ieee754sp_isnan(x)) /* but not infinity */
return ieee754sp_nanxcpt(x, "abs", x);

/* quick fix up */
SPSIGN(x) = 0;
return x;
}

0 comments on commit cea2be4

Please sign in to comment.