Skip to content

Commit

Permalink
fpu: Correct edgecase in float64_muladd
Browse files Browse the repository at this point in the history
In handling float64_muladd, if we end up doing a subtraction of the
product and c, and the 128 bit result of this subtraction happens to
have its most significant bit in bit 63, we weren't handling this
correctly when attempting to normalize to put the most significant
bit into bit 126.  We would end up doing a right shift by a negative
number (undefined behaviour in C) so at best we would return an
incorrect result to the guest.  MSB in bit 63 has to be handled as a
special case separately from MSB in 0..62 and MSB in 63..126.  (MSB
in 127 is not possible.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
  • Loading branch information
pm215 authored and aurel32 committed Apr 15, 2013
1 parent db08dc2 commit e3d142d
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions fpu/softfloat.c
Expand Up @@ -3898,9 +3898,15 @@ float64 float64_muladd(float64 a, float64 b, float64 c, int flags STATUS_PARAM)
}
zExp -= shiftcount;
} else {
shiftcount = countLeadingZeros64(zSig1) - 1;
zSig0 = zSig1 << shiftcount;
zExp -= (shiftcount + 64);
shiftcount = countLeadingZeros64(zSig1);
if (shiftcount == 0) {
zSig0 = (zSig1 >> 1) | (zSig1 & 1);
zExp -= 63;
} else {
shiftcount--;
zSig0 = zSig1 << shiftcount;
zExp -= (shiftcount + 64);
}
}
return roundAndPackFloat64(zSign, zExp, zSig0 STATUS_VAR);
}
Expand Down

0 comments on commit e3d142d

Please sign in to comment.