From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41101 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PpLDH-0005q9-RD for qemu-devel@nongnu.org; Tue, 15 Feb 2011 08:45:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PpLDF-0005Ny-4B for qemu-devel@nongnu.org; Tue, 15 Feb 2011 08:45:07 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:56889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PpLDE-0005J7-Rw for qemu-devel@nongnu.org; Tue, 15 Feb 2011 08:45:05 -0500 From: Peter Maydell Date: Tue, 15 Feb 2011 13:44:42 +0000 Message-Id: <1297777490-5323-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1297777490-5323-1-git-send-email-peter.maydell@linaro.org> References: <1297777490-5323-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 02/10] target-arm: Fix signed VRSHL by large shift counts List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Christophe Lyon , patches@linaro.org 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 --- 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 cc63636..f692640 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) { -- 1.7.1