diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-02-15 13:44:42 +0000 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-02-20 17:43:01 +0100 |
| commit | 0670a7b65b0ce122c9f415ac7ae78e015a52a30a (patch) | |
| tree | 639c1daa58d1dc701da781971bace89a37a4c724 | |
| parent | 4bd4ee072cfbd3555b34279c8529f7f5f8d6c14a (diff) | |
| download | qemu-0670a7b65b0ce122c9f415ac7ae78e015a52a30a.tar.gz qemu-0670a7b65b0ce122c9f415ac7ae78e015a52a30a.tar.bz2 qemu-0670a7b65b0ce122c9f415ac7ae78e015a52a30a.zip | |
target-arm: Fix signed VRSHL by large shift counts
Correctly handle VRSHL of signed values by a shift count of the
width of the data type or larger, which must be special-cased in the
rshl_s* helper functions.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | target-arm/neon_helper.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/target-arm/neon_helper.c b/target-arm/neon_helper.c index a32a2c80f4..0ddfe6d0a2 100644 --- a/target-arm/neon_helper.c +++ b/target-arm/neon_helper.c @@ -543,14 +543,9 @@ uint64_t HELPER(neon_shl_s64)(uint64_t valop, uint64_t shiftop) #define NEON_FN(dest, src1, src2) do { \ int8_t tmp; \ tmp = (int8_t)src2; \ - if (tmp >= (ssize_t)sizeof(src1) * 8) { \ + if ((tmp >= (ssize_t)sizeof(src1) * 8) \ + || (tmp <= -(ssize_t)sizeof(src1) * 8)) { \ dest = 0; \ - } else if (tmp < -(ssize_t)sizeof(src1) * 8) { \ - dest = src1 >> (sizeof(src1) * 8 - 1); \ - } else if (tmp == -(ssize_t)sizeof(src1) * 8) { \ - dest = src1 >> (tmp - 1); \ - dest++; \ - dest >>= 1; \ } else if (tmp < 0) { \ dest = (src1 + (1 << (-1 - tmp))) >> -tmp; \ } else { \ @@ -584,14 +579,8 @@ uint64_t HELPER(neon_rshl_s64)(uint64_t valop, uint64_t shiftop) { int8_t shift = (int8_t)shiftop; int64_t val = valop; - if (shift >= 64) { + if ((shift >= 64) || (shift <= -64)) { val = 0; - } else if (shift < -64) { - val >>= 63; - } else if (shift == -63) { - val >>= 63; - val++; - val >>= 1; } else if (shift < 0) { val >>= (-shift - 1); if (val == INT64_MAX) { |