From patchwork Tue Nov 23 18:53:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 72735 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AF09DB70AF for ; Wed, 24 Nov 2010 06:08:33 +1100 (EST) Received: from localhost ([127.0.0.1]:51972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKyEB-0002uo-54 for incoming@patchwork.ozlabs.org; Tue, 23 Nov 2010 14:08:31 -0500 Received: from [140.186.70.92] (port=51255 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKy0B-000471-1i for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKy09-00079w-PE for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:02 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:30450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKy09-000780-Bi for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:01 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PKxzz-0003Qu-Bl; Tue, 23 Nov 2010 18:53:51 +0000 From: Peter Maydell To: Anthony Liguori , qemu-devel@nongnu.org Date: Tue, 23 Nov 2010 18:53:41 +0000 Message-Id: <1290538431-13170-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> References: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH 02/12] target-arm: Fix mixup in decoding of saturating add and sub X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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);