From patchwork Wed Mar 2 17:34:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 286 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:41:28 -0000 Delivered-To: patches@linaro.org Received: by 10.224.19.208 with SMTP id c16cs195752qab; Wed, 2 Mar 2011 09:34:11 -0800 (PST) Received: by 10.227.195.210 with SMTP id ed18mr6212415wbb.63.1299087251247; Wed, 02 Mar 2011 09:34:11 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id n6si394877wee.77.2011.03.02.09.34.10 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Mar 2011 09:34:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Pupw8-0000AU-ST; Wed, 02 Mar 2011 17:34:08 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH] target-arm: Set carry flag correctly for Thumb2 ORNS Date: Wed, 2 Mar 2011 17:34:08 +0000 Message-Id: <1299087248-622-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.3 The code for Thumb2 ORNS (or negated and set flags) was trashing a TCG input register which was needed later for use in calculating flags, with the effect that the carry flag was always set with the wrong sense. Fix this by using a TCG temporary instead. Signed-off-by: Peter Maydell --- target-arm/translate.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index dbd958b..8f4e16b 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7326,10 +7326,17 @@ gen_thumb2_data_op(DisasContext *s, int op, int conds, uint32_t shifter_out, TCG logic_cc = conds; break; case 3: /* orn */ - tcg_gen_not_i32(t1, t1); - tcg_gen_or_i32(t0, t0, t1); + { + /* We can't just invert t1 in place because we might need it + * to calculate the carry flag later. + */ + TCGv tmp = tcg_temp_new_i32(); + tcg_gen_not_i32(tmp, t1); + tcg_gen_or_i32(t0, t0, tmp); + tcg_temp_free_i32(tmp); logic_cc = conds; break; + } case 4: /* eor */ tcg_gen_xor_i32(t0, t0, t1); logic_cc = conds;