From nobody Sun May 19 10:57:26 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1628637992; cv=none; d=zohomail.com; s=zohoarc; b=K/D2T1yq6pRrb3ahsXvEih4sa/DXJqCntN0z+q0vhM6PqqhEKGtvoQw3nFVuIHt7S75q2qgtfIrT6B9N76kRZbtrD3F9oF9r8szocuElVuoS7z40q9iYzEn01FrtLCQAjWh1LaGr8K1Od2SEVgnCrb2Q7Qls2B0N3Du5raOWIUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628637992; h=Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=15BEYQtN4UapNvyhLKq3oMt2WjEqo8HuDY5tg+xCuXM=; b=ESPC8uOyqtmEQza+Tn3HpdEX96lxQcSdG74o2sjKC3AvbxJHJ7oWasUbrRXVzB8vmnVXd20y6Y62+A7kOU/CQP3h2mSgad5tVUBbWLGCul625kifcLGR8c1TqYcpO0glQWiPRlYPquIazkSwNuLY5LJkVo1D/4TyOAL0BArRjKc= 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+importer=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 162863799257782.16057781138113; Tue, 10 Aug 2021 16:26:32 -0700 (PDT) Received: from localhost ([::1]:51730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDb8g-00034Z-52 for importer@patchew.org; Tue, 10 Aug 2021 19:26:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDb7s-0002MZ-Vy for qemu-devel@nongnu.org; Tue, 10 Aug 2021 19:25:41 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]:51981) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDb7r-0003FT-2j for qemu-devel@nongnu.org; Tue, 10 Aug 2021 19:25:40 -0400 Received: by mail-pj1-x1034.google.com with SMTP id oa17so539403pjb.1 for ; Tue, 10 Aug 2021 16:25:38 -0700 (PDT) Received: from localhost.localdomain (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id d134sm25558205pfd.60.2021.08.10.16.25.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 16:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=15BEYQtN4UapNvyhLKq3oMt2WjEqo8HuDY5tg+xCuXM=; b=YkAk3d00crX1KFv1IkXtUXY3wMRX1bPage9IEk9zTrIkWZvICOjC3xP/Za/AxvlGxf 80IOsHgdmgzTWZasSitMmd5GfU3+jMH4wV/81FB8/Qej24AOilUvDQStk7mTHNC1SfX0 42KIWd7w3q36uHoyhGOfIyszzLmZ/OXTAN4EPlN9+ulLT8EGG1cdJrAL4gnplyDuvN7T Z+MHKDS6k2RTxBzjdHC4VIV7CMJtc2zPcLgxRAet5fkS2ScUXC+2IyQ/zgihQbq+Mwqo 0xoHV7CBNI60RBf+DyeJS9C7N82IvsdGwyIdBHGbfmKqI/VLc4ZopMLvbsIfeFBlRT15 4mUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=15BEYQtN4UapNvyhLKq3oMt2WjEqo8HuDY5tg+xCuXM=; b=FbT8Wq9FdhhC0xbGwpTzE+Pt+YoWS3gbQ+0iRJIwc0Asv6sVSN16QZ69bkynDxzCVK mzioRSoKsnlZ9PaQSeHWszisd4NxE7DShwNWQIYcU78YWcF2wUh/b+7FQkikkck9h8qo fyWbxx/4t8ldNCN2mjpoAe0YVyWev6a8Ruf3Jtd51vUltEtUGEnPhWjmY0MMjjFUTWfL /UF9i4i2kRY4nMxwGWzD5y5QXwcoHqJJhoe4NzSDiIJPZLK1dMQededxmVaZYdO1jmB6 nwDs52yUP6IOlG/mTVGMunMf47uFqaGnmg/p8Fu9z72z8zjADTA4y6IUqAHPkflvkAGq O11g== X-Gm-Message-State: AOAM530yCZi5Nm3vNj/EOG7Pzn3MlLKbeeVbJiunVefUctfAysJcRkWU D5jGG+c37n7XjmpavDAghIoljH8IAsKA2w== X-Google-Smtp-Source: ABdhPJzpWgA3xv3PfrHAoQntrvJUFu24jJ0tAvWRqwBSYckD30fb9mfOiiAFwB9Cf2neqLceiRGLlw== X-Received: by 2002:a17:90b:38ca:: with SMTP id nn10mr34017269pjb.3.1628637937305; Tue, 10 Aug 2021 16:25:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH for-6.1] tcg/i386: Split P_VEXW from P_REXW Date: Tue, 10 Aug 2021 13:25:30 -1000 Message-Id: <20210810232530.1033519-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1034.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1628637994786100001 Content-Type: text/plain; charset="utf-8" We need to be able to represent VEX.W on a 32-bit host, where REX.W will always be zero. Fixes the encoding for VPSLLVQ and VPSRLVQ. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/385 Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 98d924b91a..997510109d 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -241,8 +241,9 @@ static bool tcg_target_const_match(int64_t val, TCGType= type, int ct) #define P_EXT 0x100 /* 0x0f opcode prefix */ #define P_EXT38 0x200 /* 0x0f 0x38 opcode prefix */ #define P_DATA16 0x400 /* 0x66 opcode prefix */ +#define P_VEXW 0x1000 /* Set VEX.W =3D 1 */ #if TCG_TARGET_REG_BITS =3D=3D 64 -# define P_REXW 0x1000 /* Set REX.W =3D 1 */ +# define P_REXW P_VEXW /* Set REX.W =3D 1; match VEXW */ # define P_REXB_R 0x2000 /* REG field as byte register */ # define P_REXB_RM 0x4000 /* R/M field as byte register */ # define P_GS 0x8000 /* gs segment override */ @@ -410,13 +411,13 @@ static bool tcg_target_const_match(int64_t val, TCGTy= pe type, int ct) #define OPC_VPBROADCASTW (0x79 | P_EXT38 | P_DATA16) #define OPC_VPBROADCASTD (0x58 | P_EXT38 | P_DATA16) #define OPC_VPBROADCASTQ (0x59 | P_EXT38 | P_DATA16) -#define OPC_VPERMQ (0x00 | P_EXT3A | P_DATA16 | P_REXW) +#define OPC_VPERMQ (0x00 | P_EXT3A | P_DATA16 | P_VEXW) #define OPC_VPERM2I128 (0x46 | P_EXT3A | P_DATA16 | P_VEXL) #define OPC_VPSLLVD (0x47 | P_EXT38 | P_DATA16) -#define OPC_VPSLLVQ (0x47 | P_EXT38 | P_DATA16 | P_REXW) +#define OPC_VPSLLVQ (0x47 | P_EXT38 | P_DATA16 | P_VEXW) #define OPC_VPSRAVD (0x46 | P_EXT38 | P_DATA16) #define OPC_VPSRLVD (0x45 | P_EXT38 | P_DATA16) -#define OPC_VPSRLVQ (0x45 | P_EXT38 | P_DATA16 | P_REXW) +#define OPC_VPSRLVQ (0x45 | P_EXT38 | P_DATA16 | P_VEXW) #define OPC_VZEROUPPER (0x77 | P_EXT) #define OPC_XCHG_ax_r32 (0x90) =20 @@ -576,7 +577,7 @@ static void tcg_out_vex_opc(TCGContext *s, int opc, int= r, int v, =20 /* Use the two byte form if possible, which cannot encode VEX.W, VEX.B, VEX.X, or an m-mmmm field other than P_EXT. */ - if ((opc & (P_EXT | P_EXT38 | P_EXT3A | P_REXW)) =3D=3D P_EXT + if ((opc & (P_EXT | P_EXT38 | P_EXT3A | P_VEXW)) =3D=3D P_EXT && ((rm | index) & 8) =3D=3D 0) { /* Two byte VEX prefix. */ tcg_out8(s, 0xc5); @@ -601,7 +602,7 @@ static void tcg_out_vex_opc(TCGContext *s, int opc, int= r, int v, tmp |=3D (rm & 8 ? 0 : 0x20); /* VEX.B */ tcg_out8(s, tmp); =20 - tmp =3D (opc & P_REXW ? 0x80 : 0); /* VEX.W */ + tmp =3D (opc & P_VEXW ? 0x80 : 0); /* VEX.W */ } =20 tmp |=3D (opc & P_VEXL ? 0x04 : 0); /* VEX.L */ --=20 2.25.1