From patchwork Sat Jun 18 05:19:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9185431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 067126075E for ; Sat, 18 Jun 2016 05:20:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA10F27BFF for ; Sat, 18 Jun 2016 05:19:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBC1427E33; Sat, 18 Jun 2016 05:19:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D3BD27BFF for ; Sat, 18 Jun 2016 05:19:58 +0000 (UTC) Received: from localhost ([::1]:33185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bE8fl-0006uG-E6 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 18 Jun 2016 01:19:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bE8fO-0006uB-Jb for qemu-devel@nongnu.org; Sat, 18 Jun 2016 01:19:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bE8fI-0001ya-Io for qemu-devel@nongnu.org; Sat, 18 Jun 2016 01:19:33 -0400 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:35414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bE8fI-0001yN-8K; Sat, 18 Jun 2016 01:19:28 -0400 Received: by mail-pa0-x243.google.com with SMTP id hf6so6969712pac.2; Fri, 17 Jun 2016 22:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=+xb7cUXMrRvQ3Q7D8xO+ftFPJAUg7UQv0OwBj0GwJKQ=; b=EjEY9y5XykmraNAgmkYnmilHLh11CgnP9tLmuOjBEmiil3L8+j6w5/4+rBYY7FcMVr 98/3IScK86GzkO0adCoS+CP5I2AGjbPvKz2q+fMQ4QFJDm8DNEp+LjwH5Uuh1OvX1BeS S5FgiRLOJj7RlLcHNryeVKjkWvY/KVmHkLV3oFQHoKVjqUqwELtPHx0ZdnQMl60067RI rFyVj/NgQfshQTQp2982YT+zUPkFk2RuI1BKrrM5hpfJ4t7Oj7dzhkWgZavbokQIyf7O l5qetVpyy4AuVJqYd6yFef/nX7EJLevWgehB4KxyHE9mMWPiZXGBMDRvS+eRfDxowmJd Xi/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=+xb7cUXMrRvQ3Q7D8xO+ftFPJAUg7UQv0OwBj0GwJKQ=; b=S3rT1q9H0Ie/W4gFQ1efQoAWUaX/2nd3HxcmUEcd/1MlXxxfoRwmJVM8RnAMWijzPd o3M+GjkBsBmC1rEZoCaRwFlgDAuCsNgTcrMWEeOB5CMtu1lKi44r+HHiPSGoJtJ3K17M oRP3nbl7Gk0P5ImoaeUFgvyA2V0gqQHlJp1muUuSNfroBC/8UHJk1r21sECEyQkOxBP3 gvs495stJtXNPw1TvoAlRaD58+AyZ3U/IFnRDV6AhL275drUW3IfghDxgpsSLQh49m+K bk4w+ZTZeDao+4nIUdp3K9J6LNkJnyLdf21ktTKo9uD59matjj2WaCHR/hzbsgauwWTS jvUQ== X-Gm-Message-State: ALyK8tI3keINwyWvV9JEoRL8KRVrV6UMGOTj6Bqk69Rc1WOhOmfYELsp6gnYBgklpOd3yA== X-Received: by 10.66.183.168 with SMTP id en8mr6792640pac.64.1466227167470; Fri, 17 Jun 2016 22:19:27 -0700 (PDT) Received: from bigtime.twiddle.net (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id g86sm72094283pfd.67.2016.06.17.22.19.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jun 2016 22:19:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 17 Jun 2016 22:19:26 -0700 Message-Id: <1466227166-28168-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::243 Subject: [Qemu-devel] [PATCH v2] target-ppc: Fix rlwimi, rlwinm, rlwnm X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, anton@samba.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In 63ae0915f8ec, I arranged to use a 32-bit rotate, without considering the effect of a mask value that wraps around to the high bits of the word. Signed-off-by: Richard Henderson Tested-by: Anton Blanchard --- target-ppc/translate.c | 73 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index b689475..23bc054 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -1636,7 +1636,6 @@ static void gen_rlwimi(DisasContext *ctx) tcg_gen_deposit_tl(t_ra, t_ra, t_rs, sh, me - mb + 1); } else { target_ulong mask; - TCGv_i32 t0; TCGv t1; #if defined(TARGET_PPC64) @@ -1645,12 +1644,21 @@ static void gen_rlwimi(DisasContext *ctx) #endif mask = MASK(mb, me); - t0 = tcg_temp_new_i32(); t1 = tcg_temp_new(); - tcg_gen_trunc_tl_i32(t0, t_rs); - tcg_gen_rotli_i32(t0, t0, sh); - tcg_gen_extu_i32_tl(t1, t0); - tcg_temp_free_i32(t0); + if (mask <= 0xffffffffu) { + TCGv_i32 t0 = tcg_temp_new_i32(); + tcg_gen_trunc_tl_i32(t0, t_rs); + tcg_gen_rotli_i32(t0, t0, sh); + tcg_gen_extu_i32_tl(t1, t0); + tcg_temp_free_i32(t0); + } else { +#if defined(TARGET_PPC64) + tcg_gen_deposit_i64(t1, t_rs, t_rs, 32, 32); + tcg_gen_rotli_i64(t1, t1, sh); +#else + g_assert_not_reached(); +#endif + } tcg_gen_andi_tl(t1, t1, mask); tcg_gen_andi_tl(t_ra, t_ra, ~mask); @@ -1678,20 +1686,28 @@ static void gen_rlwinm(DisasContext *ctx) tcg_gen_ext32u_tl(t_ra, t_rs); tcg_gen_shri_tl(t_ra, t_ra, mb); } else { + target_ulong mask; #if defined(TARGET_PPC64) mb += 32; me += 32; #endif - if (sh == 0) { - tcg_gen_andi_tl(t_ra, t_rs, MASK(mb, me)); - } else { - TCGv_i32 t0 = tcg_temp_new_i32(); + mask = MASK(mb, me); + if (mask <= 0xffffffffu) { + TCGv_i32 t0 = tcg_temp_new_i32(); tcg_gen_trunc_tl_i32(t0, t_rs); tcg_gen_rotli_i32(t0, t0, sh); - tcg_gen_andi_i32(t0, t0, MASK(mb, me)); + tcg_gen_andi_i32(t0, t0, mask); tcg_gen_extu_i32_tl(t_ra, t0); tcg_temp_free_i32(t0); + } else { +#if defined(TARGET_PPC64) + tcg_gen_deposit_i64(t_ra, t_rs, t_rs, 32, 32); + tcg_gen_rotli_i64(t_ra, t_ra, sh); + tcg_gen_andi_i64(t_ra, t_ra, mask); +#else + g_assert_not_reached(); +#endif } } if (unlikely(Rc(ctx->opcode) != 0)) { @@ -1707,24 +1723,37 @@ static void gen_rlwnm(DisasContext *ctx) TCGv t_rb = cpu_gpr[rB(ctx->opcode)]; uint32_t mb = MB(ctx->opcode); uint32_t me = ME(ctx->opcode); - TCGv_i32 t0, t1; + target_ulong mask; #if defined(TARGET_PPC64) mb += 32; me += 32; #endif + mask = MASK(mb, me); - t0 = tcg_temp_new_i32(); - t1 = tcg_temp_new_i32(); - tcg_gen_trunc_tl_i32(t0, t_rb); - tcg_gen_trunc_tl_i32(t1, t_rs); - tcg_gen_andi_i32(t0, t0, 0x1f); - tcg_gen_rotl_i32(t1, t1, t0); - tcg_temp_free_i32(t0); + if (mask <= 0xffffffffu) { + TCGv_i32 t0 = tcg_temp_new_i32(); + TCGv_i32 t1 = tcg_temp_new_i32(); + tcg_gen_trunc_tl_i32(t0, t_rb); + tcg_gen_trunc_tl_i32(t1, t_rs); + tcg_gen_andi_i32(t0, t0, 0x1f); + tcg_gen_rotl_i32(t1, t1, t0); + tcg_gen_extu_i32_tl(t_ra, t1); + tcg_temp_free_i32(t0); + tcg_temp_free_i32(t1); + } else { +#if defined(TARGET_PPC64) + TCGv_i64 t0 = tcg_temp_new_i64(); + tcg_gen_andi_i64(t0, t_rb, 0x1f); + tcg_gen_deposit_i64(t_ra, t_rs, t_rs, 32, 32); + tcg_gen_rotl_i64(t_ra, t_ra, t0); + tcg_temp_free_i64(t0); +#else + g_assert_not_reached(); +#endif + } - tcg_gen_andi_i32(t1, t1, MASK(mb, me)); - tcg_gen_extu_i32_tl(t_ra, t1); - tcg_temp_free_i32(t1); + tcg_gen_andi_tl(t_ra, t_ra, mask); if (unlikely(Rc(ctx->opcode) != 0)) { gen_set_Rc0(ctx, t_ra);