From nobody Sun Apr 28 06:20:09 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1673739154; cv=none; d=zohomail.com; s=zohoarc; b=EhnLXan1ITYTbVQv1nv1WjJmby1MG6ks9ftjJc304AxOpnwmhhPnkmf3x8rQcvObY3hmdgzUAhwKGgVX/k44zjr+hEKwfRcZnOonkMyEB97mkE1kLqbZZZiSz3gLInFxAsYbU1b5lerqbFbFA2S7d7gzxnDyrV+S/AHlGdqWHzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673739154; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=TPJtijyYg7SioJJm8YKTqkjAc4t5Wt3KkB0wi9IGkog=; b=jOy8pXmBh4QHeWsQl3k/J00cIhyQmS4ySmYhcSlsvVKV8fzTHqy8mFBZrfDdlaatLBGc2GRxB1zqNTuXhaUgOCJVI0BzA6tYC2+tjGDtDSIhsjuxitShPt5rka4fd6syUm6afVGyB+MWHg5YMlBfBmPY/DCzxD3wWHyEJN9VS2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673739154677593.2741115477692; Sat, 14 Jan 2023 15:32:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGq0V-0000DJ-B7; Sat, 14 Jan 2023 18:32:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGq0S-0008U5-VB for qemu-devel@nongnu.org; Sat, 14 Jan 2023 18:32:13 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGq0R-0004FK-7a for qemu-devel@nongnu.org; Sat, 14 Jan 2023 18:32:12 -0500 Received: by mail-pf1-x42e.google.com with SMTP id a184so18575227pfa.9 for ; Sat, 14 Jan 2023 15:32:10 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id q4-20020aa79824000000b00581d62be96dsm3434079pfl.197.2023.01.14.15.32.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 15:32:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TPJtijyYg7SioJJm8YKTqkjAc4t5Wt3KkB0wi9IGkog=; b=DvoqW17yKdjbtWOoIu1IuzkAPwXkVd8ppyizrTvgby+yHodfaaXFEr3qCz+ZLDbSd4 k3ZZWZsfO4TARos1MqMFLg52Dbn47QZX5xNRBW1kDIpwm3giZJ2L9D0yKz5ARibTrrTl zoKgDnlNEzNWKFeOxoB7rr1QiSdWl2aiyD6+hQtV9t1YjdESwnnhOV5F8XuIGmkQGk3c cdoarq80/rdqb4+mO/u2JyRpyqJ1KFdfHRr4tLvqnio5SNG2GJ9mmH4lKCvzh9Yl6561 rwLDa5dy3SZQ7P3bxn1ohRX4ZZxSS6ub37KhpFG67i5MwdmBNf2DTHkmk5gEDLnhJkvW 7dcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TPJtijyYg7SioJJm8YKTqkjAc4t5Wt3KkB0wi9IGkog=; b=HWUE1bzaI+vSVoLAEAq4cOJTjwBwvxQKJPVHdeg8YCOPeW2PdGaFWeGArzw6vL1xhR 4ncmUQ4+EnZLLH7PLPtMsifHJ48FJMZ/ZoQJdl4nnYEhE2CqpUlG+/Q0y3yP2J64d0d5 sVVz36A8Hm1OYAxp3GtNTGlGLuzBrP6y0WjoDSNA5uQVuIKH4W1IfZ6eSEI6ywBDh9/a jfBeneFSCbiu+h6sOkt9pY4LlzFKoiHjLDl3rb3t6zE15z0xYQ0Tnmtg0fCdk9P/L0rD xfSJJ3AWlbtHXZXFF1FP2snU77gyJ0EicvGpiiBh8FjMhaILDNmdsuFFurMgHrxyMDoN LxSw== X-Gm-Message-State: AFqh2krpea/uUgbokvSYt7+4QGFy7hoQS036WYnGIrpWbDZpOs4xkvJy PVKWRauIsgU4tMmTZc0WtZSe++1Je6ApqKrl X-Google-Smtp-Source: AMrXdXvKjzL8FU8vhCeTmqFiuJmkbzuRDXNAglAQstTQx7wyJd1/9KYSl/mk11Q16E7/DYSl44JmoA== X-Received: by 2002:a62:1a53:0:b0:58d:8ea0:ce31 with SMTP id a80-20020a621a53000000b0058d8ea0ce31mr1692951pfa.27.1673739129820; Sat, 14 Jan 2023 15:32:09 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Subject: [PATCH] target/i386: Fix BZHI instruction Date: Sat, 14 Jan 2023 13:32:06 -1000 Message-Id: <20230114233206.3118472-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673739156013100003 Content-Type: text/plain; charset="utf-8" We did not correctly handle N >=3D operand size. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1374 Signed-off-by: Richard Henderson --- tests/tcg/i386/test-i386-bmi2.c | 3 +++ target/i386/tcg/emit.c.inc | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/tcg/i386/test-i386-bmi2.c b/tests/tcg/i386/test-i386-bmi= 2.c index 982d4abda4..0244df7987 100644 --- a/tests/tcg/i386/test-i386-bmi2.c +++ b/tests/tcg/i386/test-i386-bmi2.c @@ -123,6 +123,9 @@ int main(int argc, char *argv[]) { result =3D bzhiq(mask, 0x1f); assert(result =3D=3D (mask & ~(-1 << 30))); =20 + result =3D bzhiq(mask, 0x40); + assert(result =3D=3D mask); + result =3D rorxq(0x2132435465768798, 8); assert(result =3D=3D 0x9821324354657687); =20 diff --git a/target/i386/tcg/emit.c.inc b/target/i386/tcg/emit.c.inc index 4d7702c106..1eace1231a 100644 --- a/target/i386/tcg/emit.c.inc +++ b/target/i386/tcg/emit.c.inc @@ -1143,20 +1143,20 @@ static void gen_BLSR(DisasContext *s, CPUX86State *= env, X86DecodedInsn *decode) static void gen_BZHI(DisasContext *s, CPUX86State *env, X86DecodedInsn *de= code) { MemOp ot =3D decode->op[0].ot; - TCGv bound; + TCGv bound =3D tcg_constant_tl(ot =3D=3D MO_64 ? 63 : 31); + TCGv zero =3D tcg_constant_tl(0); + TCGv mone =3D tcg_constant_tl(-1); =20 - tcg_gen_ext8u_tl(s->T1, cpu_regs[s->vex_v]); - bound =3D tcg_constant_tl(ot =3D=3D MO_64 ? 63 : 31); + tcg_gen_ext8u_tl(s->T1, s->T1); =20 /* * Note that since we're using BMILG (in order to get O * cleared) we need to store the inverse into C. */ - tcg_gen_setcond_tl(TCG_COND_LT, cpu_cc_src, s->T1, bound); - tcg_gen_movcond_tl(TCG_COND_GT, s->T1, s->T1, bound, bound, s->T1); + tcg_gen_setcond_tl(TCG_COND_LEU, cpu_cc_src, s->T1, bound); =20 - tcg_gen_movi_tl(s->A0, -1); - tcg_gen_shl_tl(s->A0, s->A0, s->T1); + tcg_gen_shl_tl(s->A0, mone, s->T1); + tcg_gen_movcond_tl(TCG_COND_LEU, s->A0, s->T1, bound, s->A0, zero); tcg_gen_andc_tl(s->T0, s->T0, s->A0); =20 gen_op_update1_cc(s); --=20 2.34.1