From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52571 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPzhs-0001Bs-E8 for qemu-devel@nongnu.org; Tue, 07 Dec 2010 10:44:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPzhq-0006cm-6b for qemu-devel@nongnu.org; Tue, 07 Dec 2010 10:43:56 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:13458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPzhp-0006bm-SE for qemu-devel@nongnu.org; Tue, 07 Dec 2010 10:43:54 -0500 From: Peter Maydell Date: Tue, 7 Dec 2010 15:43:31 +0000 Message-Id: <1291736623-3695-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1291736623-3695-1-git-send-email-peter.maydell@linaro.org> References: <1291736623-3695-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 02/14] target-arm: Fix mixup in decoding of saturating add and sub List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org From: Johan Bengtsson The thumb2 decoder contained a mixup between the bit controlling doubling and the bit controlling if the operation was an add or a sub. Signed-off-by: Johan Bengtsson Signed-off-by: Peter Maydell Reviewed-by: Nathan Froyd --- target-arm/translate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 183928b..947de6d 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7713,9 +7713,9 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1) /* Saturating add/subtract. */ tmp = load_reg(s, rn); tmp2 = load_reg(s, rm); - if (op & 2) - gen_helper_double_saturate(tmp, tmp); if (op & 1) + gen_helper_double_saturate(tmp, tmp); + if (op & 2) gen_helper_sub_saturate(tmp, tmp2, tmp); else gen_helper_add_saturate(tmp, tmp, tmp2); -- 1.6.3.3