From nobody Thu Oct 2 03:25:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1584441111; cv=none; d=zohomail.com; s=zohoarc; b=gLKWV3f1PxoNIVFqCMktnuO4VGOBEPDsQlRtf0CqJ3EHzR6Wft/E52HJ5N61XFBx1ahwceJqVfDXWTxpJcfjiNfAxYrb7xG81l1FtrC7QUeqOgrY8SZFvNNJdjgo0m1e8ONQMlegcDvrkiELFhI5tRRonlyGNUir7DQtKvg5njs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584441111; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k6MQ65wfAw+vddQjYCj04yQauFYl4wYvNcMhd8vFLkU=; b=kh8a24vcnWOwjnZ6Jkn33asRLizJb5Ajeyd/jrUO7bo1DbU1ZufQmLjzGpkZ29JR+pjLETH90tUsJygwXCeMgFZAIXimOM6KSmtMs50tfvXCyajLBzp98ybKcU1hFFXi437CtXXaq7deZRpJ67US3WYaDQ5Vw9qYph1BxOAUm/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584441111535152.94733794448814; Tue, 17 Mar 2020 03:31:51 -0700 (PDT) Received: from localhost ([::1]:56127 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE9Vm-0006N9-DC for importer@patchew.org; Tue, 17 Mar 2020 06:31:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46415) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE96P-0002Bz-Ai for qemu-devel@nongnu.org; Tue, 17 Mar 2020 06:05:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jE96O-0007ct-34 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 06:05:37 -0400 Received: from ozlabs.org ([203.11.71.1]:46565) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jE96N-0003xE-Me; Tue, 17 Mar 2020 06:05:36 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 48hTL039dLz9sTS; Tue, 17 Mar 2020 21:04:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1584439480; bh=SAXwkEjbnnAeuIlPrPLqPBmFdg7DXOMyP1ESLVuY0oE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UQ+mM4JUpVvLAwBbWygdDmgo69WCA/RGQIxlzAiPh9k8Mo9aWpOI/fuiNOF2kWvFq dkW7CXbrDrNNOpzgKDu/2VOfwXZMm6XL1v3JZUpRomINbNW/+XiUzLPHZ51YAmL/YW aUFP9FAH8NUao5jZD06RSKIeWa5v5OQHP204hPWo= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 30/45] target/ppc: Fix rlwinm on ppc64 Date: Tue, 17 Mar 2020 21:04:08 +1100 Message-Id: <20200317100423.622643-31-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317100423.622643-1-david@gibson.dropbear.id.au> References: <20200317100423.622643-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, qemu-stable@nongnu.org, Richard Henderson , mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, Vitaly Chikunov , groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vitaly Chikunov rlwinm cannot just AND with Mask if shift value is zero on ppc64 when Mask Begin is greater than Mask End and high bits are set to 1. Note that PowerISA 3.0B says that for `rlwinm' ROTL32 is used, and ROTL32 is defined (in 3.3.14) so that rotated value should have two copies of lower word of the source value. This seems to be another incarnation of the fix from 820724d170 ("target-ppc: Fix rlwimi, rlwinm, rlwnm again"), except I leave optimization when Mask value is less than 32 bits. Fixes: 7b4d326f47 ("target-ppc: Use the new deposit and extract ops") Cc: qemu-stable@nongnu.org Signed-off-by: Vitaly Chikunov Message-Id: <20200309204557.14836-1-vt@altlinux.org> Reviewed-by: Richard Henderson Signed-off-by: David Gibson --- target/ppc/translate.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 36fa27367c..127c82a24e 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -1938,15 +1938,17 @@ static void gen_rlwinm(DisasContext *ctx) me +=3D 32; #endif mask =3D MASK(mb, me); - if (sh =3D=3D 0) { - tcg_gen_andi_tl(t_ra, t_rs, mask); - } else if (mask <=3D 0xffffffffu) { - TCGv_i32 t0 =3D 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); - tcg_gen_extu_i32_tl(t_ra, t0); - tcg_temp_free_i32(t0); + if (mask <=3D 0xffffffffu) { + if (sh =3D=3D 0) { + tcg_gen_andi_tl(t_ra, t_rs, mask); + } else { + TCGv_i32 t0 =3D 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); + 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); --=20 2.24.1