diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 07:07:11 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 07:07:20 +0100 |
| commit | 6b914c998787d65022e80d6262dfd0edef58cadb (patch) | |
| tree | ec9d9605ae08e6e40664c4302a181979ab4fe1d3 /arch/parisc/math-emu/cnv_float.h | |
| parent | Merge tag 'cleanup_for_v3.9' of git://git.infradead.org/users/jcooper/linux i... (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | linux-6b914c998787d65022e80d6262dfd0edef58cadb.tar.xz linux-6b914c998787d65022e80d6262dfd0edef58cadb.zip | |
Merge tag 'v3.8-rc5' into next/cleanup
Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/parisc/math-emu/cnv_float.h')
| -rw-r--r-- | arch/parisc/math-emu/cnv_float.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/parisc/math-emu/cnv_float.h b/arch/parisc/math-emu/cnv_float.h index 9071e093164a..933423fa5144 100644 --- a/arch/parisc/math-emu/cnv_float.h +++ b/arch/parisc/math-emu/cnv_float.h @@ -347,16 +347,15 @@ Sgl_isinexact_to_fix(sgl_value,exponent) #define Duint_from_sgl_mantissa(sgl_value,exponent,dresultA,dresultB) \ - {Sall(sgl_value) <<= SGL_EXP_LENGTH; /* left-justify */ \ + {unsigned int val = Sall(sgl_value) << SGL_EXP_LENGTH; \ if (exponent <= 31) { \ - Dintp1(dresultA) = 0; \ - Dintp2(dresultB) = (unsigned)Sall(sgl_value) >> (31 - exponent); \ + Dintp1(dresultA) = 0; \ + Dintp2(dresultB) = val >> (31 - exponent); \ } \ else { \ - Dintp1(dresultA) = Sall(sgl_value) >> (63 - exponent); \ - Dintp2(dresultB) = Sall(sgl_value) << (exponent - 31); \ + Dintp1(dresultA) = val >> (63 - exponent); \ + Dintp2(dresultB) = exponent <= 62 ? val << (exponent - 31) : 0; \ } \ - Sall(sgl_value) >>= SGL_EXP_LENGTH; /* return to original */ \ } #define Duint_setzero(dresultA,dresultB) \ |