From patchwork Mon Feb 25 18:30:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 223016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4BADF2C029A for ; Tue, 26 Feb 2013 06:03:36 +1100 (EST) Received: from localhost ([::1]:44942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA2q4-0002AU-8u for incoming@patchwork.ozlabs.org; Mon, 25 Feb 2013 13:31:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA2pZ-0000wU-EM for qemu-devel@nongnu.org; Mon, 25 Feb 2013 13:31:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UA2pN-00032M-88 for qemu-devel@nongnu.org; Mon, 25 Feb 2013 13:31:17 -0500 Received: from mail-qa0-f42.google.com ([209.85.216.42]:54386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA2pN-00032D-0b for qemu-devel@nongnu.org; Mon, 25 Feb 2013 13:31:05 -0500 Received: by mail-qa0-f42.google.com with SMTP id cr7so1764430qab.15 for ; Mon, 25 Feb 2013 10:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=whCI6OoMBxFTF/zURIcSt3MtpNGZaGPk4P7A4CbiTPk=; b=LUerQ9gHyGQKw+AkrYVz08DO1oFtJUq0ovr0vLatnj8rsnvo5/ceBwnzMvLB+vUTDE bvBB4HLlqeNKxxkywEav0NOybx1d8XYLqUyFwv3T3KjT+SMQ9/PBWwM/NL7WXAUwiWNf EtHyda6iJHNvcJA/Wdrq5GmRSIkJEQCJnIbKMQrLC4v+shL3hPJe8Dcwp1apH8Zf81FA 2v7ZvPjIigt6zKmb4IOW+xGKZJnHLYkxjbyQZ17aVaeWBubi9QL/u2PMxUipy0rT+SwS APxFDFPSORo/IHU/SeJyr+kvaoCYOY5CCPyGxFk6qk5bJkaOT7h02MO8KGmiodjt1q6H DRmg== X-Received: by 10.49.73.232 with SMTP id o8mr15072296qev.0.1361817064590; Mon, 25 Feb 2013 10:31:04 -0800 (PST) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id x9sm17329664qen.1.2013.02.25.10.31.02 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Feb 2013 10:31:03 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2013 10:30:23 -0800 Message-Id: <1361817023-4842-4-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361817023-4842-1-git-send-email-rth@twiddle.net> References: <1361817023-4842-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.42 Cc: Anthony Liguori , Alexander Graf Subject: [Qemu-devel] [PATCH 3/3] target-ppc: Fix SUBFE carry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org While ~T0+T1+CF = T1-T0+CF-1 is true for the low 32-bits, it does not produce the correct carry-out to bit 33. Do exactly what the manual says. Cc: Alexander Graf Signed-off-by: Richard Henderson --- target-ppc/translate.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index f886441..b3d509f 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -1120,14 +1120,15 @@ static inline void gen_op_arith_subf(DisasContext *ctx, TCGv ret, TCGv arg1, } if (add_ca) { - /* dest = ~arg1 + arg2 + ca = arg2 - arg1 + ca - 1. */ + /* dest = ~arg1 + arg2 + ca. */ if (compute_ca) { - TCGv zero; - tcg_gen_subi_tl(cpu_ca, cpu_ca, 1); + TCGv zero, inv1 = tcg_temp_new(); + tcg_gen_not_tl(inv1, arg1); zero = tcg_const_tl(0); tcg_gen_add2_tl(t0, cpu_ca, arg2, zero, cpu_ca, zero); - tcg_gen_sub2_tl(t0, cpu_ca, t0, cpu_ca, arg1, zero); + tcg_gen_sub2_tl(t0, cpu_ca, t0, cpu_ca, inv1, zero); tcg_temp_free(zero); + tcg_temp_free(inv1); } else { tcg_gen_sub_tl(t0, arg2, arg1); tcg_gen_add_tl(t0, t0, cpu_ca);