From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564595999; cv=none; d=zoho.com; s=zohoarc; b=YgZ5xfqQTpVkS1LiPJhrrjjB7z5ITO0G3BmUD7lCUZOW5Nzb8NVMidGJRdpkAOFb8/lXyWUgAIBDD3JjEHl8ZrC0o6UEXezXIT1D40bv6sZShhcmkZ4vaILVAFXpsIiT/gdBDnh9P65moRLRMcIB8sJwucUOO+ah9VZpyLfG/6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564595999; 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:ARC-Authentication-Results; bh=XvCHdm9nHE9smMApxfPJipkd9WnhL73swaE5KE6lGAQ=; b=fNwZVFwW1frdYgX7tMiXlw8gaRFRJba6X4ryEykLip0N394sWVoMBEhxUZ+o//NhVY5gSYDFJboK7pFcU0I4VHmXhn62ap+W4cIMvcdj7qva8+28qMcZOpKqIKWfMPrs17WM2i95zTVrjLiR5HhRP5ERwO5me2FQFKuVWnII7Ig= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156459599927898.00418654069972; Wed, 31 Jul 2019 10:59:59 -0700 (PDT) Received: from localhost ([::1]:43366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsstK-0006tO-85 for importer@patchew.org; Wed, 31 Jul 2019 13:59:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42629) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssr9-00022L-8V for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssr7-0002ca-BQ for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:43 -0400 Received: from mail-yw1-xc42.google.com ([2607:f8b0:4864:20::c42]:39728) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssr7-0002bW-63 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:41 -0400 Received: by mail-yw1-xc42.google.com with SMTP id x74so7287207ywx.6 for ; Wed, 31 Jul 2019 10:57:41 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XvCHdm9nHE9smMApxfPJipkd9WnhL73swaE5KE6lGAQ=; b=dnuBeBCEpiywgd6LIj8NfS5VB0b++TU+SJCYHxR5J2w71bauHOBjmkuFDwGn69VDs+ K9E3RE5pkjDfOlxYpIB4lTTeE7KWebbgidPdgkrofdJV+OXB/oIJHf1oVDaF742WH3Ca OS6qr2GbN1cj1tUa7KpcAZbGLKlAAzFJmlPbWEjicGTChqu8DlIhUuPIErDzY/eLLSkX MdUXM9HkR2a7C41gDSMpA6mF8XBejQkukayo7hYqqGKXPBphTSpkCQvHe4U1Ck3TUylu X+Tvi6MYzgDlujqwVP0ActiPHoIWoM44uewQ01j19kyNwKqBeKcZFU0+p7G52OitaP/Z pvkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XvCHdm9nHE9smMApxfPJipkd9WnhL73swaE5KE6lGAQ=; b=scux+xzvM6la8zUP5Fs2sNBabD+RsqDMrzdnacojb7jL0en+trzcO1FLUHGpZ1k6XU kaWj5E/+ez+BsqrlqeBPwCJ/rgdQ7dB0l/aa2f9+g7+lOuZFGvkwVXPcSrOhdXojJZgB eU0yzpqXgmRdyD/dHYrMbrgyYQ/zIp+GfY4vjSpGGeYWrWLYdXDSsPfmca2TyzVByU+G moQxB9NlZCv0Sp3udDEidnHovzGgJY8SR6+LxlxBTTzO0OFJqNbbdPtTMjNURkGGZVRB DZgTo4eZoVjDQrMr/25xtLqrbUuZDpSSB7GWnmSt0P3KmOhVw8VNsNUhozF/JmzyaElI cBCw== X-Gm-Message-State: APjAAAXoAD2YBnnVwrA1/nbRJKCegrf/LgLiWP2/6dFqQPP4GAx3NPyZ kVzMEN82RMKgsZl4gIzV5shRgQAb X-Google-Smtp-Source: APXvYqzlUdQNwr/wLXB2mId+ypa1aYfWx52gffUjKDhuAxUTff2qGnVv5klWDYb5QoM2i3tuhx41fA== X-Received: by 2002:a81:a1cb:: with SMTP id y194mr79264705ywg.104.1564595860253; Wed, 31 Jul 2019 10:57:40 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:41 -0400 Message-Id: <20190731175702.4916-2-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c42 Subject: [Qemu-devel] [RFC PATCH v1 01/22] target/i386: Push rex_r into DisasContext 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Richard Henderson 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: Richard Henderson Treat this value the same as we do for rex_b and rex_x. Signed-off-by: Richard Henderson --- target/i386/translate.c | 85 +++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/target/i386/translate.c b/target/i386/translate.c index 03150a86e2..d74dbfd585 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -43,10 +43,12 @@ #define CODE64(s) ((s)->code64) #define REX_X(s) ((s)->rex_x) #define REX_B(s) ((s)->rex_b) +#define REX_R(s) ((s)->rex_r) #else #define CODE64(s) 0 #define REX_X(s) 0 #define REX_B(s) 0 +#define REX_R(s) 0 #endif =20 #ifdef TARGET_X86_64 @@ -98,7 +100,7 @@ typedef struct DisasContext { #ifdef TARGET_X86_64 int lma; /* long mode active */ int code64; /* 64 bit code segment */ - int rex_x, rex_b; + int rex_x, rex_b, rex_r; #endif int vex_l; /* vex vector length */ int vex_v; /* vex vvvv register, without 1's complement. */ @@ -3037,7 +3039,7 @@ static const struct SSEOpHelper_eppi sse_op_table7[25= 6] =3D { }; =20 static void gen_sse(CPUX86State *env, DisasContext *s, int b, - target_ulong pc_start, int rex_r) + target_ulong pc_start) { int b1, op1_offset, op2_offset, is_xmm, val; int modrm, mod, rm, reg; @@ -3107,8 +3109,9 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, =20 modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7); - if (is_xmm) - reg |=3D rex_r; + if (is_xmm) { + reg |=3D REX_R(s); + } mod =3D (modrm >> 6) & 3; if (sse_fn_epp =3D=3D SSE_SPECIAL) { b |=3D (b1 << 8); @@ -3642,7 +3645,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, tcg_gen_ld16u_tl(s->T0, cpu_env, offsetof(CPUX86State,fpregs[rm].mmx.MMX_W(= val))); } - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); gen_op_mov_reg_v(s, ot, reg, s->T0); break; case 0x1d6: /* movq ea, xmm */ @@ -3686,7 +3689,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, offsetof(CPUX86State, fpregs[rm].mmx)); gen_helper_pmovmskb_mmx(s->tmp2_i32, cpu_env, s->ptr0); } - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); tcg_gen_extu_i32_tl(cpu_regs[reg], s->tmp2_i32); break; =20 @@ -3698,7 +3701,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, } modrm =3D x86_ldub_code(env, s); rm =3D modrm & 7; - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; if (b1 >=3D 2) { goto unknown_op; @@ -3774,7 +3777,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, /* Various integer extensions at 0f 38 f[0-f]. */ b =3D modrm | (b1 << 8); modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 switch (b) { case 0x3f0: /* crc32 Gd,Eb */ @@ -4128,7 +4131,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, b =3D modrm; modrm =3D x86_ldub_code(env, s); rm =3D modrm & 7; - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; if (b1 >=3D 2) { goto unknown_op; @@ -4148,7 +4151,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, rm =3D (modrm & 7) | REX_B(s); if (mod !=3D 3) gen_lea_modrm(env, s, modrm); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); val =3D x86_ldub_code(env, s); switch (b) { case 0x14: /* pextrb */ @@ -4317,7 +4320,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, /* Various integer extensions at 0f 3a f[0-f]. */ b =3D modrm | (b1 << 8); modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 switch (b) { case 0x3f0: /* rorx Gy,Ey, Ib */ @@ -4491,14 +4494,15 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) TCGMemOp ot, aflag, dflag; int modrm, reg, rm, mod, op, opreg, val; target_ulong next_eip, tval; - int rex_w, rex_r; target_ulong pc_start =3D s->base.pc_next; + int rex_w; =20 s->pc_start =3D s->pc =3D pc_start; s->override =3D -1; #ifdef TARGET_X86_64 s->rex_x =3D 0; s->rex_b =3D 0; + s->rex_r =3D 0; s->x86_64_hregs =3D false; #endif s->rip_offset =3D 0; /* for relative ip address */ @@ -4511,7 +4515,6 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 prefixes =3D 0; rex_w =3D -1; - rex_r =3D 0; =20 next_byte: b =3D x86_ldub_code(env, s); @@ -4555,9 +4558,9 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (CODE64(s)) { /* REX prefix */ rex_w =3D (b >> 3) & 1; - rex_r =3D (b & 0x4) << 1; + s->rex_r =3D (b & 0x4) << 1; s->rex_x =3D (b & 0x2) << 2; - REX_B(s) =3D (b & 0x1) << 3; + s->rex_b =3D (b & 0x1) << 3; /* select uniform byte register addressing */ s->x86_64_hregs =3D true; goto next_byte; @@ -4590,8 +4593,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (s->x86_64_hregs) { goto illegal_op; } + s->rex_r =3D (~vex2 >> 4) & 8; #endif - rex_r =3D (~vex2 >> 4) & 8; if (b =3D=3D 0xc5) { /* 2-byte VEX prefix: RVVVVlpp, implied 0f leading opcode = byte */ vex3 =3D vex2; @@ -4681,7 +4684,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) switch(f) { case 0: /* OP Ev, Gv */ modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; rm =3D (modrm & 7) | REX_B(s); if (mod !=3D 3) { @@ -4703,7 +4706,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 1: /* OP Gv, Ev */ modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); rm =3D (modrm & 7) | REX_B(s); if (mod !=3D 3) { gen_lea_modrm(env, s, modrm); @@ -5123,7 +5126,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) ot =3D mo_b_d(b, dflag); =20 modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); gen_op_mov_v_reg(s, ot, s->T1, reg); @@ -5195,7 +5198,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x6b: ot =3D dflag; modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); if (b =3D=3D 0x69) s->rip_offset =3D insn_const_size(ot); else if (b =3D=3D 0x6b) @@ -5247,7 +5250,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1c1: /* xadd Ev, Gv */ ot =3D mo_b_d(b, dflag); modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; gen_op_mov_v_reg(s, ot, s->T0, reg); if (mod =3D=3D 3) { @@ -5279,7 +5282,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 ot =3D mo_b_d(b, dflag); modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; oldv =3D tcg_temp_new(); newv =3D tcg_temp_new(); @@ -5502,7 +5505,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x89: /* mov Gv, Ev */ ot =3D mo_b_d(b, dflag); modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 /* generate a generic store */ gen_ldst_modrm(env, s, modrm, ot, reg, 1); @@ -5528,7 +5531,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x8b: /* mov Ev, Gv */ ot =3D mo_b_d(b, dflag); modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); gen_op_mov_reg_v(s, ot, reg, s->T0); @@ -5578,7 +5581,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) s_ot =3D b & 8 ? MO_SIGN | ot : ot; =20 modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; rm =3D (modrm & 7) | REX_B(s); =20 @@ -5617,7 +5620,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) mod =3D (modrm >> 6) & 3; if (mod =3D=3D 3) goto illegal_op; - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); { AddressParts a =3D gen_lea_modrm_0(env, s, modrm); TCGv ea =3D gen_lea_modrm_1(s, a); @@ -5699,7 +5702,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x87: /* xchg Ev, Gv */ ot =3D mo_b_d(b, dflag); modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; if (mod =3D=3D 3) { rm =3D (modrm & 7) | REX_B(s); @@ -5736,7 +5739,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) do_lxx: ot =3D dflag !=3D MO_16 ? MO_32 : MO_16; modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; if (mod =3D=3D 3) goto illegal_op; @@ -5819,7 +5822,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; rm =3D (modrm & 7) | REX_B(s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); if (mod !=3D 3) { gen_lea_modrm(env, s, modrm); opreg =3D OR_TMP0; @@ -6674,7 +6677,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } ot =3D dflag; modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); gen_cmovcc1(env, s, ot, b, modrm, reg); break; =20 @@ -6824,7 +6827,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) do_btx: ot =3D dflag; modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; rm =3D (modrm & 7) | REX_B(s); gen_op_mov_v_reg(s, MO_32, s->T1, reg); @@ -6929,7 +6932,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1bd: /* bsr / lzcnt */ ot =3D dflag; modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); gen_extu(ot, s->T0); =20 @@ -7693,7 +7696,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) d_ot =3D dflag; =20 modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; rm =3D (modrm & 7) | REX_B(s); =20 @@ -7767,7 +7770,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; ot =3D dflag !=3D MO_16 ? MO_32 : MO_16; modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0); t0 =3D tcg_temp_local_new(); gen_update_cc_op(s); @@ -7808,7 +7811,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) modrm =3D x86_ldub_code(env, s); if (s->flags & HF_MPX_EN_MASK) { mod =3D (modrm >> 6) & 3; - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); if (prefixes & PREFIX_REPZ) { /* bndcl */ if (reg >=3D 4 @@ -7898,7 +7901,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) modrm =3D x86_ldub_code(env, s); if (s->flags & HF_MPX_EN_MASK) { mod =3D (modrm >> 6) & 3; - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); if (mod !=3D 3 && (prefixes & PREFIX_REPZ)) { /* bndmk */ if (reg >=3D 4 @@ -8012,7 +8015,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) * are assumed to be 1's, regardless of actual values. */ rm =3D (modrm & 7) | REX_B(s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); if (CODE64(s)) ot =3D MO_64; else @@ -8069,7 +8072,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) * are assumed to be 1's, regardless of actual values. */ rm =3D (modrm & 7) | REX_B(s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); if (CODE64(s)) ot =3D MO_64; else @@ -8112,7 +8115,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) mod =3D (modrm >> 6) & 3; if (mod =3D=3D 3) goto illegal_op; - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); /* generate a generic store */ gen_ldst_modrm(env, s, modrm, ot, reg, 1); break; @@ -8338,7 +8341,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; =20 modrm =3D x86_ldub_code(env, s); - reg =3D ((modrm >> 3) & 7) | rex_r; + reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 if (s->prefix & PREFIX_DATA) { ot =3D MO_16; @@ -8366,7 +8369,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1c2: case 0x1c4 ... 0x1c6: case 0x1d0 ... 0x1fe: - gen_sse(env, s, b, pc_start, rex_r); + gen_sse(env, s, b, pc_start); break; default: goto unknown_op; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564595919; cv=none; d=zoho.com; s=zohoarc; b=ZUQomLdLt4q4SFMKW1oZh5bJupLCV3x8ilCb+ukr3kSNiuuefinqOIC+K1yPZk1gPFDegxnR/D9vjLepqNLX4TvVmS6uISWE5hoT/bA4msygKsvqYUn6kb2JcO1A5RojA7saJo+V0523V5hqAycl25Qe1Ok8dfM9TcvByaNGMp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564595919; 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:ARC-Authentication-Results; bh=6nDSi2OJfOTaQ/1QMGaIy9TKp9JFtHSdU8wWAA7Z90w=; b=opNAy6zc1AYOkxl2r/vPfcV4dVorHE2lPkoZqE4HUhJ75C/+bQV0kOUfA7iRCTtuPOWuKD4BcYivxlPJjbfv9TmAKel5Bq9cwMx0F3B0imTjLO1E7ToT4inaP6GsLmX/fgZRti81FrskqxFuWYM0fcly5wdZGSihrTKArkEn744= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564595919557868.5485363642283; Wed, 31 Jul 2019 10:58:39 -0700 (PDT) Received: from localhost ([::1]:43342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsss2-0003dk-E5 for importer@patchew.org; Wed, 31 Jul 2019 13:58:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42624) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssr9-00022K-1g for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssr7-0002dL-Rw for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:42 -0400 Received: from mail-yb1-xb42.google.com ([2607:f8b0:4864:20::b42]:41126) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssr7-0002d2-Nx for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:41 -0400 Received: by mail-yb1-xb42.google.com with SMTP id x188so2574367yba.8 for ; Wed, 31 Jul 2019 10:57:41 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6nDSi2OJfOTaQ/1QMGaIy9TKp9JFtHSdU8wWAA7Z90w=; b=mdUOrrl1HL+Kd6MeulItl68Ug4AOPPWVcXTgja1E8WavCsOofTOyZK0rnCCgI95Ru5 1JLQTAJ5vmwkp0FYoczMttRRRR69TPSM0y+fyT6mv2WFrYV2gZ7EKb4zA9PJBoKT7c5h tP0mMsoS/43SvwwR7byHvPrepRhq+sdkQXxVwpQrbjPM4kA4oeUvUF34cyXgn6A6R1BW upwPNBjr7hvcG8s0mtOLGRyYPz4FkqGNSW/JicjHm6VK1dGY+xg9a9rQNHw/9s3LM4ai UPsADyw/aWFFaaXMWJF4hW79J6CE83IXAi0Y2Z0PyXwpsNYP68fzJeJYWg+yUzCZlGME imkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6nDSi2OJfOTaQ/1QMGaIy9TKp9JFtHSdU8wWAA7Z90w=; b=UfYtaaBdGAFJkzdDGF+GZ40Crj1H/UYlCjBrr8UHkpXcEukiDAxx0K7FZcwL48kWs4 96WbPu4zoSk6sMcxnzkQ4joGBjv47h/CaGxIc/RwiAuaqTKBWbNcGt5wox1l4dAcE0m1 ksfj9+D9PcK2Gjfph++d03nM34mQhmRqmxKmlQp3jS8/BbANkl5On0OnN37Pbwe2aE+J 0RnL9jHLs7FFUkIU03GL+dp2JQ1a7Ts/Q9irRu8qw+JGNeAk+NLHiTrlgCtzcilIU7SM 0I7+hj/cih7je514pLxxRsFKF/Jn2I6WgvPYP5UH5MLLrYMKjyOHGcgaTxABhxi+YSxy /gfw== X-Gm-Message-State: APjAAAViUyROkJLgyDQGLJeDZTSoxVqrgyPuAuAGWn+4pd/W65meowIM 6DUfpd+o2rkMlXguIUTMbeF+S3xj X-Google-Smtp-Source: APXvYqxc5et63cLzMtE7pl/UdjOci25zqw8KCshWmy4PjGaG+NxDcKe5FExpj3Z8ZIQCfk9iEIJb2w== X-Received: by 2002:a25:908d:: with SMTP id t13mr75323398ybl.411.1564595860845; Wed, 31 Jul 2019 10:57:40 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:42 -0400 Message-Id: <20190731175702.4916-3-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b42 Subject: [Qemu-devel] [RFC PATCH v1 02/22] target/i386: Push rex_w into DisasContext 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Richard Henderson 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: Richard Henderson Treat this the same as we already do for other rex bits. Signed-off-by: Richard Henderson --- target/i386/translate.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/target/i386/translate.c b/target/i386/translate.c index d74dbfd585..c0866c2797 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -44,11 +44,13 @@ #define REX_X(s) ((s)->rex_x) #define REX_B(s) ((s)->rex_b) #define REX_R(s) ((s)->rex_r) +#define REX_W(s) ((s)->rex_w) #else #define CODE64(s) 0 #define REX_X(s) 0 #define REX_B(s) 0 #define REX_R(s) 0 +#define REX_W(s) -1 #endif =20 #ifdef TARGET_X86_64 @@ -100,7 +102,7 @@ typedef struct DisasContext { #ifdef TARGET_X86_64 int lma; /* long mode active */ int code64; /* 64 bit code segment */ - int rex_x, rex_b, rex_r; + int rex_x, rex_b, rex_r, rex_w; #endif int vex_l; /* vex vector length */ int vex_v; /* vex vvvv register, without 1's complement. */ @@ -4495,7 +4497,6 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) int modrm, reg, rm, mod, op, opreg, val; target_ulong next_eip, tval; target_ulong pc_start =3D s->base.pc_next; - int rex_w; =20 s->pc_start =3D s->pc =3D pc_start; s->override =3D -1; @@ -4503,6 +4504,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) s->rex_x =3D 0; s->rex_b =3D 0; s->rex_r =3D 0; + s->rex_w =3D -1; s->x86_64_hregs =3D false; #endif s->rip_offset =3D 0; /* for relative ip address */ @@ -4514,7 +4516,6 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } =20 prefixes =3D 0; - rex_w =3D -1; =20 next_byte: b =3D x86_ldub_code(env, s); @@ -4557,7 +4558,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x40 ... 0x4f: if (CODE64(s)) { /* REX prefix */ - rex_w =3D (b >> 3) & 1; + s->rex_w =3D (b >> 3) & 1; s->rex_r =3D (b & 0x4) << 1; s->rex_x =3D (b & 0x2) << 2; s->rex_b =3D (b & 0x1) << 3; @@ -4606,7 +4607,9 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) s->rex_b =3D (~vex2 >> 2) & 8; #endif vex3 =3D x86_ldub_code(env, s); - rex_w =3D (vex3 >> 7) & 1; +#ifdef TARGET_X86_64 + s->rex_w =3D (vex3 >> 7) & 1; +#endif switch (vex2 & 0x1f) { case 0x01: /* Implied 0f leading opcode bytes. */ b =3D x86_ldub_code(env, s) | 0x100; @@ -4631,9 +4634,9 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) /* Post-process prefixes. */ if (CODE64(s)) { /* In 64-bit mode, the default data size is 32-bit. Select 64-bit - data with rex_w, and 16-bit data with 0x66; rex_w takes precede= nce + data with REX_W, and 16-bit data with 0x66; REX_W takes precede= nce over 0x66 if both are present. */ - dflag =3D (rex_w > 0 ? MO_64 : prefixes & PREFIX_DATA ? MO_16 : MO= _32); + dflag =3D (REX_W(s) > 0 ? MO_64 : prefixes & PREFIX_DATA ? MO_16 := MO_32); /* In 64-bit mode, 0x67 selects 32-bit addressing. */ aflag =3D (prefixes & PREFIX_ADR ? MO_32 : MO_64); } else { @@ -5029,7 +5032,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) /* operand size for jumps is 64 bit */ ot =3D MO_64; } else if (op =3D=3D 3 || op =3D=3D 5) { - ot =3D dflag !=3D MO_16 ? MO_32 + (rex_w =3D=3D 1) : MO_16; + ot =3D dflag !=3D MO_16 ? MO_32 + (REX_W(s) =3D=3D 1) : MO= _16; } else if (op =3D=3D 6) { /* default push size is 64 bit */ ot =3D mo_pushpop(s, dflag); --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596010; cv=none; d=zoho.com; s=zohoarc; b=A02XhAtaVl94G8pIbHL40dolAsO6yzGlV/I9NLDacVBwpXhSw/CCCAOUx0FoYoTlOdLYAe58S+aJbZcB6r4qfPcIGvMTbfAWK0FdhCZhi7o6i3AA3ZE7ZDQbZkR14mOIpQZ4D5Vf64PJavG5xPZX8RnenonmpHL8uOgc+kGai48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596010; 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:ARC-Authentication-Results; bh=YLAV4S2K9nuAQ0oLu4D3+8uBxnJ+zXBmJQ4Cts7htIw=; b=gq8ft2iR/0pLcNmLO9knbAuEmCbsqqalgZ+v95EM1yCdwhSnsggeYBkPL8uKIZ4L87NJO0marj7JxBQcGtzHhBCbbxDmIPkCg5bIMALFLPf/8L1bId8uR7EzRx0LRQ4jezwU1kfLq6JM5HsimdSAy+e6Fo8OJFxFiI5ZzeuwF6g= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596010848325.73910119153106; Wed, 31 Jul 2019 11:00:10 -0700 (PDT) Received: from localhost ([::1]:43371 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsstV-0007Po-Ne for importer@patchew.org; Wed, 31 Jul 2019 14:00:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42742) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrE-0002Bs-1t for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssr9-0002gn-Te for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:47 -0400 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]:43094) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssr9-0002fq-Lo for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:43 -0400 Received: by mail-yw1-xc41.google.com with SMTP id n205so25261464ywb.10 for ; Wed, 31 Jul 2019 10:57:43 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YLAV4S2K9nuAQ0oLu4D3+8uBxnJ+zXBmJQ4Cts7htIw=; b=FKzztEheieaRTuVnzJBllq8gZ7wF686XdxA4Jn7kwFjEjsm6OfwW8YRezyUYxqKz2n hudlbrnvJ0xUwNSOZJPLJwWDi7qv7rlIVvqBHpC1hj2LoXqYD7xfyM3AWfa0Q9U/TLa7 HKUV+8RfECoEVqr7xVL6x5MSKjPSs1IoXFvm0/v3G6N5ht20VNnFGn0rxD4AnCL1zX+D NKB7iHd8WKE+gybkf0EOe+SW6DZ2tSiOH82CfTqLP/AlMc2QZZwudL5+f04M3uAVn4MW 2C8e7wlMxtUa9yLWtw9w03YY3T9NBuiV+PqEZ3hHYko9ycQz9FY0+a0m6SG5GMAIIvBY X4Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YLAV4S2K9nuAQ0oLu4D3+8uBxnJ+zXBmJQ4Cts7htIw=; b=XtlFZwKGml3kG7wmzfbJNa6nJkPmh9qihL1ZH5KZgWFfABr6kOuBAUm4sYe6EO2iac MLxuLmgdkSbxYgp/IGMDucs1H7nF+lJlVd6tTrbfhfvpQAgiiX1mQMJuq3IQp6JxO/yJ Ft5JbpR81Gx1KbiIlZcGcfv8r0pJrkuhR4zZ6a0AQgzaR93LXjlYqfbcFbSxEB+D/lPe 8o3HxFOPvheKaTKrYbiPBurhzStI+5Kxt9okjZPGiwRROHqJLqjAl1E8opcv/9yE7cll WVQqyMaI/ssx1XkKhe+d5IBNnWjHyQWrxH60ksWSdQ09rm2aRjDS+ePwCoauWWCFwH8N piYQ== X-Gm-Message-State: APjAAAWJks+9GSIqTY14fr1o1YIdyEpyIAA500SIbcM967KFkvPY3Bp7 0PXVf5W4FGcqa2Ara15QEfwo6uvV X-Google-Smtp-Source: APXvYqw1WftiSgTIWwwBGsG7UZL2p+ocVCyeWbReepz1RX6kmWW5aXQHuxJPCZZHM7TU56Z9t9m6pg== X-Received: by 2002:a81:1488:: with SMTP id 130mr77883503ywu.176.1564595861982; Wed, 31 Jul 2019 10:57:41 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:43 -0400 Message-Id: <20190731175702.4916-4-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c41 Subject: [Qemu-devel] [RFC PATCH v1 03/22] target/i386: Use prefix, aflag and dflag from DisasContext 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Richard Henderson 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: Richard Henderson The variables are already there, we just have to hide the ones in disas_insn so that we are forced to use them. Signed-off-by: Richard Henderson --- target/i386/translate.c | 299 ++++++++++++++++++++-------------------- 1 file changed, 152 insertions(+), 147 deletions(-) diff --git a/target/i386/translate.c b/target/i386/translate.c index c0866c2797..692261f73f 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -4491,13 +4491,17 @@ static void gen_sse(CPUX86State *env, DisasContext = *s, int b, static target_ulong disas_insn(DisasContext *s, CPUState *cpu) { CPUX86State *env =3D cpu->env_ptr; - int b, prefixes; + int b; int shift; - TCGMemOp ot, aflag, dflag; + TCGMemOp ot; int modrm, reg, rm, mod, op, opreg, val; target_ulong next_eip, tval; target_ulong pc_start =3D s->base.pc_next; =20 + { + int prefixes; + TCGMemOp aflag, dflag; + s->pc_start =3D s->pc =3D pc_start; s->override =3D -1; #ifdef TARGET_X86_64 @@ -4657,6 +4661,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) s->prefix =3D prefixes; s->aflag =3D aflag; s->dflag =3D dflag; + } =20 /* now check op code */ reswitch: @@ -4682,7 +4687,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) op =3D (b >> 3) & 7; f =3D (b >> 1) & 3; =20 - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); =20 switch(f) { case 0: /* OP Ev, Gv */ @@ -4740,7 +4745,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) { int val; =20 - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); =20 modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; @@ -4777,16 +4782,16 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) /**************************/ /* inc, dec, and other misc arith */ case 0x40 ... 0x47: /* inc Gv */ - ot =3D dflag; + ot =3D s->dflag; gen_inc(s, ot, OR_EAX + (b & 7), 1); break; case 0x48 ... 0x4f: /* dec Gv */ - ot =3D dflag; + ot =3D s->dflag; gen_inc(s, ot, OR_EAX + (b & 7), -1); break; case 0xf6: /* GRP3 */ case 0xf7: - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); =20 modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; @@ -5018,7 +5023,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 case 0xfe: /* GRP4 */ case 0xff: /* GRP5 */ - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); =20 modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; @@ -5032,10 +5037,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) /* operand size for jumps is 64 bit */ ot =3D MO_64; } else if (op =3D=3D 3 || op =3D=3D 5) { - ot =3D dflag !=3D MO_16 ? MO_32 + (REX_W(s) =3D=3D 1) : MO= _16; + ot =3D s->dflag !=3D MO_16 ? MO_32 + (REX_W(s) =3D=3D 1) := MO_16; } else if (op =3D=3D 6) { /* default push size is 64 bit */ - ot =3D mo_pushpop(s, dflag); + ot =3D mo_pushpop(s, s->dflag); } } if (mod !=3D 3) { @@ -5063,7 +5068,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 2: /* call Ev */ /* XXX: optimize if memory (no 'and' is necessary) */ - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tcg_gen_ext16u_tl(s->T0, s->T0); } next_eip =3D s->pc - s->cs_base; @@ -5081,19 +5086,19 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) if (s->pe && !s->vm86) { tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); gen_helper_lcall_protected(cpu_env, s->tmp2_i32, s->T1, - tcg_const_i32(dflag - 1), + tcg_const_i32(s->dflag - 1), tcg_const_tl(s->pc - s->cs_base= )); } else { tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); gen_helper_lcall_real(cpu_env, s->tmp2_i32, s->T1, - tcg_const_i32(dflag - 1), + tcg_const_i32(s->dflag - 1), tcg_const_i32(s->pc - s->cs_base)); } tcg_gen_ld_tl(s->tmp4, cpu_env, offsetof(CPUX86State, eip)); gen_jr(s, s->tmp4); break; case 4: /* jmp Ev */ - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tcg_gen_ext16u_tl(s->T0, s->T0); } gen_op_jmp_v(s->T0); @@ -5126,7 +5131,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 case 0x84: /* test Ev, Gv */ case 0x85: - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); =20 modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); @@ -5139,7 +5144,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 case 0xa8: /* test eAX, Iv */ case 0xa9: - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); val =3D insn_get(env, s, ot); =20 gen_op_mov_v_reg(s, ot, s->T0, OR_EAX); @@ -5149,7 +5154,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; =20 case 0x98: /* CWDE/CBW */ - switch (dflag) { + switch (s->dflag) { #ifdef TARGET_X86_64 case MO_64: gen_op_mov_v_reg(s, MO_32, s->T0, R_EAX); @@ -5172,7 +5177,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } break; case 0x99: /* CDQ/CWD */ - switch (dflag) { + switch (s->dflag) { #ifdef TARGET_X86_64 case MO_64: gen_op_mov_v_reg(s, MO_64, s->T0, R_EAX); @@ -5199,7 +5204,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1af: /* imul Gv, Ev */ case 0x69: /* imul Gv, Ev, I */ case 0x6b: - ot =3D dflag; + ot =3D s->dflag; modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); if (b =3D=3D 0x69) @@ -5251,7 +5256,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0x1c0: case 0x1c1: /* xadd Ev, Gv */ - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; @@ -5283,7 +5288,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) { TCGv oldv, newv, cmpv; =20 - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; @@ -5344,7 +5349,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } #ifdef TARGET_X86_64 - if (dflag =3D=3D MO_64) { + if (s->dflag =3D=3D MO_64) { if (!(s->cpuid_ext_features & CPUID_EXT_CX16)) { goto illegal_op; } @@ -5384,7 +5389,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } gen_helper_rdrand(s->T0, cpu_env); rm =3D (modrm & 7) | REX_B(s); - gen_op_mov_reg_v(s, dflag, rm, s->T0); + gen_op_mov_reg_v(s, s->dflag, rm, s->T0); set_cc_op(s, CC_OP_EFLAGS); if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_end(); @@ -5421,7 +5426,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0x68: /* push Iv */ case 0x6a: - ot =3D mo_pushpop(s, dflag); + ot =3D mo_pushpop(s, s->dflag); if (b =3D=3D 0x68) val =3D insn_get(env, s, ot); else @@ -5506,7 +5511,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) /* mov */ case 0x88: case 0x89: /* mov Gv, Ev */ - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 @@ -5515,7 +5520,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0xc6: case 0xc7: /* mov Ev, Iv */ - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; if (mod !=3D 3) { @@ -5532,7 +5537,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0x8a: case 0x8b: /* mov Ev, Gv */ - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); =20 @@ -5564,7 +5569,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (reg >=3D 6) goto illegal_op; gen_op_movl_T0_seg(s, reg); - ot =3D mod =3D=3D 3 ? dflag : MO_16; + ot =3D mod =3D=3D 3 ? s->dflag : MO_16; gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1); break; =20 @@ -5577,7 +5582,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) TCGMemOp s_ot; =20 /* d_ot is the size of destination */ - d_ot =3D dflag; + d_ot =3D s->dflag; /* ot is the size of source */ ot =3D (b & 1) + MO_8; /* s_ot is the sign+size of source */ @@ -5628,7 +5633,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) AddressParts a =3D gen_lea_modrm_0(env, s, modrm); TCGv ea =3D gen_lea_modrm_1(s, a); gen_lea_v_seg(s, s->aflag, ea, -1, -1); - gen_op_mov_reg_v(s, dflag, reg, s->A0); + gen_op_mov_reg_v(s, s->dflag, reg, s->A0); } break; =20 @@ -5639,7 +5644,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) { target_ulong offset_addr; =20 - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); switch (s->aflag) { #ifdef TARGET_X86_64 case MO_64: @@ -5677,7 +5682,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0xb8 ... 0xbf: /* mov R, Iv */ #ifdef TARGET_X86_64 - if (dflag =3D=3D MO_64) { + if (s->dflag =3D=3D MO_64) { uint64_t tmp; /* 64 bit case */ tmp =3D x86_ldq_code(env, s); @@ -5687,7 +5692,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } else #endif { - ot =3D dflag; + ot =3D s->dflag; val =3D insn_get(env, s, ot); reg =3D (b & 7) | REX_B(s); tcg_gen_movi_tl(s->T0, val); @@ -5697,13 +5702,13 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) =20 case 0x91 ... 0x97: /* xchg R, EAX */ do_xchg_reg_eax: - ot =3D dflag; + ot =3D s->dflag; reg =3D (b & 7) | REX_B(s); rm =3D R_EAX; goto do_xchg_reg; case 0x86: case 0x87: /* xchg Ev, Gv */ - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; @@ -5740,7 +5745,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1b5: /* lgs Gv */ op =3D R_GS; do_lxx: - ot =3D dflag !=3D MO_16 ? MO_32 : MO_16; + ot =3D s->dflag !=3D MO_16 ? MO_32 : MO_16; modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; @@ -5768,7 +5773,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) shift =3D 2; grp2: { - ot =3D mo_b_d(b, dflag); + ot =3D mo_b_d(b, s->dflag); modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; op =3D (modrm >> 3) & 7; @@ -5821,7 +5826,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) op =3D 1; shift =3D 0; do_shiftd: - ot =3D dflag; + ot =3D s->dflag; modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; rm =3D (modrm & 7) | REX_B(s); @@ -5983,7 +5988,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } break; case 0x0c: /* fldenv mem */ - gen_helper_fldenv(cpu_env, s->A0, tcg_const_i32(dflag - 1)= ); + gen_helper_fldenv(cpu_env, s->A0, tcg_const_i32(s->dflag -= 1)); break; case 0x0d: /* fldcw mem */ tcg_gen_qemu_ld_i32(s->tmp2_i32, s->A0, @@ -5991,7 +5996,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_helper_fldcw(cpu_env, s->tmp2_i32); break; case 0x0e: /* fnstenv mem */ - gen_helper_fstenv(cpu_env, s->A0, tcg_const_i32(dflag - 1)= ); + gen_helper_fstenv(cpu_env, s->A0, tcg_const_i32(s->dflag -= 1)); break; case 0x0f: /* fnstcw mem */ gen_helper_fnstcw(s->tmp2_i32, cpu_env); @@ -6006,10 +6011,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) gen_helper_fpop(cpu_env); break; case 0x2c: /* frstor mem */ - gen_helper_frstor(cpu_env, s->A0, tcg_const_i32(dflag - 1)= ); + gen_helper_frstor(cpu_env, s->A0, tcg_const_i32(s->dflag -= 1)); break; case 0x2e: /* fnsave mem */ - gen_helper_fsave(cpu_env, s->A0, tcg_const_i32(dflag - 1)); + gen_helper_fsave(cpu_env, s->A0, tcg_const_i32(s->dflag - = 1)); break; case 0x2f: /* fnstsw mem */ gen_helper_fnstsw(s->tmp2_i32, cpu_env); @@ -6351,8 +6356,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 case 0xa4: /* movsS */ case 0xa5: - ot =3D mo_b_d(b, dflag); - if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) { + ot =3D mo_b_d(b, s->dflag); + if (s->prefix & (PREFIX_REPZ | PREFIX_REPNZ)) { gen_repz_movs(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= ); } else { gen_movs(s, ot); @@ -6361,8 +6366,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 case 0xaa: /* stosS */ case 0xab: - ot =3D mo_b_d(b, dflag); - if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) { + ot =3D mo_b_d(b, s->dflag); + if (s->prefix & (PREFIX_REPZ | PREFIX_REPNZ)) { gen_repz_stos(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= ); } else { gen_stos(s, ot); @@ -6370,8 +6375,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0xac: /* lodsS */ case 0xad: - ot =3D mo_b_d(b, dflag); - if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) { + ot =3D mo_b_d(b, s->dflag); + if (s->prefix & (PREFIX_REPZ | PREFIX_REPNZ)) { gen_repz_lods(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= ); } else { gen_lods(s, ot); @@ -6379,10 +6384,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0xae: /* scasS */ case 0xaf: - ot =3D mo_b_d(b, dflag); - if (prefixes & PREFIX_REPNZ) { + ot =3D mo_b_d(b, s->dflag); + if (s->prefix & PREFIX_REPNZ) { gen_repz_scas(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= , 1); - } else if (prefixes & PREFIX_REPZ) { + } else if (s->prefix & PREFIX_REPZ) { gen_repz_scas(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= , 0); } else { gen_scas(s, ot); @@ -6391,10 +6396,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) =20 case 0xa6: /* cmpsS */ case 0xa7: - ot =3D mo_b_d(b, dflag); - if (prefixes & PREFIX_REPNZ) { + ot =3D mo_b_d(b, s->dflag); + if (s->prefix & PREFIX_REPNZ) { gen_repz_cmps(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= , 1); - } else if (prefixes & PREFIX_REPZ) { + } else if (s->prefix & PREFIX_REPZ) { gen_repz_cmps(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= , 0); } else { gen_cmps(s, ot); @@ -6402,11 +6407,11 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0x6c: /* insS */ case 0x6d: - ot =3D mo_b_d32(b, dflag); + ot =3D mo_b_d32(b, s->dflag); tcg_gen_ext16u_tl(s->T0, cpu_regs[R_EDX]); gen_check_io(s, ot, pc_start - s->cs_base,=20 - SVM_IOIO_TYPE_MASK | svm_is_rep(prefixes) | 4); - if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) { + SVM_IOIO_TYPE_MASK | svm_is_rep(s->prefix) | 4); + if (s->prefix & (PREFIX_REPZ | PREFIX_REPNZ)) { gen_repz_ins(s, ot, pc_start - s->cs_base, s->pc - s->cs_base); } else { gen_ins(s, ot); @@ -6417,11 +6422,11 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0x6e: /* outsS */ case 0x6f: - ot =3D mo_b_d32(b, dflag); + ot =3D mo_b_d32(b, s->dflag); tcg_gen_ext16u_tl(s->T0, cpu_regs[R_EDX]); gen_check_io(s, ot, pc_start - s->cs_base, - svm_is_rep(prefixes) | 4); - if (prefixes & (PREFIX_REPZ | PREFIX_REPNZ)) { + svm_is_rep(s->prefix) | 4); + if (s->prefix & (PREFIX_REPZ | PREFIX_REPNZ)) { gen_repz_outs(s, ot, pc_start - s->cs_base, s->pc - s->cs_base= ); } else { gen_outs(s, ot); @@ -6436,11 +6441,11 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) =20 case 0xe4: case 0xe5: - ot =3D mo_b_d32(b, dflag); + ot =3D mo_b_d32(b, s->dflag); val =3D x86_ldub_code(env, s); tcg_gen_movi_tl(s->T0, val); gen_check_io(s, ot, pc_start - s->cs_base, - SVM_IOIO_TYPE_MASK | svm_is_rep(prefixes)); + SVM_IOIO_TYPE_MASK | svm_is_rep(s->prefix)); if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_start(); } @@ -6455,11 +6460,11 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0xe6: case 0xe7: - ot =3D mo_b_d32(b, dflag); + ot =3D mo_b_d32(b, s->dflag); val =3D x86_ldub_code(env, s); tcg_gen_movi_tl(s->T0, val); gen_check_io(s, ot, pc_start - s->cs_base, - svm_is_rep(prefixes)); + svm_is_rep(s->prefix)); gen_op_mov_v_reg(s, ot, s->T1, R_EAX); =20 if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { @@ -6476,10 +6481,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0xec: case 0xed: - ot =3D mo_b_d32(b, dflag); + ot =3D mo_b_d32(b, s->dflag); tcg_gen_ext16u_tl(s->T0, cpu_regs[R_EDX]); gen_check_io(s, ot, pc_start - s->cs_base, - SVM_IOIO_TYPE_MASK | svm_is_rep(prefixes)); + SVM_IOIO_TYPE_MASK | svm_is_rep(s->prefix)); if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_start(); } @@ -6494,10 +6499,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0xee: case 0xef: - ot =3D mo_b_d32(b, dflag); + ot =3D mo_b_d32(b, s->dflag); tcg_gen_ext16u_tl(s->T0, cpu_regs[R_EDX]); gen_check_io(s, ot, pc_start - s->cs_base, - svm_is_rep(prefixes)); + svm_is_rep(s->prefix)); gen_op_mov_v_reg(s, ot, s->T1, R_EAX); =20 if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { @@ -6538,21 +6543,21 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) if (s->pe && !s->vm86) { gen_update_cc_op(s); gen_jmp_im(s, pc_start - s->cs_base); - gen_helper_lret_protected(cpu_env, tcg_const_i32(dflag - 1), + gen_helper_lret_protected(cpu_env, tcg_const_i32(s->dflag - 1), tcg_const_i32(val)); } else { gen_stack_A0(s); /* pop offset */ - gen_op_ld_v(s, dflag, s->T0, s->A0); + gen_op_ld_v(s, s->dflag, s->T0, s->A0); /* NOTE: keeping EIP updated is not a problem in case of exception */ gen_op_jmp_v(s->T0); /* pop selector */ - gen_add_A0_im(s, 1 << dflag); - gen_op_ld_v(s, dflag, s->T0, s->A0); + gen_add_A0_im(s, 1 << s->dflag); + gen_op_ld_v(s, s->dflag, s->T0, s->A0); gen_op_movl_seg_T0_vm(s, R_CS); /* add stack offset */ - gen_stack_update(s, val + (2 << dflag)); + gen_stack_update(s, val + (2 << s->dflag)); } gen_eob(s); break; @@ -6563,17 +6568,17 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) gen_svm_check_intercept(s, pc_start, SVM_EXIT_IRET); if (!s->pe) { /* real mode */ - gen_helper_iret_real(cpu_env, tcg_const_i32(dflag - 1)); + gen_helper_iret_real(cpu_env, tcg_const_i32(s->dflag - 1)); set_cc_op(s, CC_OP_EFLAGS); } else if (s->vm86) { if (s->iopl !=3D 3) { gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); } else { - gen_helper_iret_real(cpu_env, tcg_const_i32(dflag - 1)); + gen_helper_iret_real(cpu_env, tcg_const_i32(s->dflag - 1)); set_cc_op(s, CC_OP_EFLAGS); } } else { - gen_helper_iret_protected(cpu_env, tcg_const_i32(dflag - 1), + gen_helper_iret_protected(cpu_env, tcg_const_i32(s->dflag - 1), tcg_const_i32(s->pc - s->cs_base)); set_cc_op(s, CC_OP_EFLAGS); } @@ -6581,14 +6586,14 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0xe8: /* call im */ { - if (dflag !=3D MO_16) { + if (s->dflag !=3D MO_16) { tval =3D (int32_t)insn_get(env, s, MO_32); } else { tval =3D (int16_t)insn_get(env, s, MO_16); } next_eip =3D s->pc - s->cs_base; tval +=3D next_eip; - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tval &=3D 0xffff; } else if (!CODE64(s)) { tval &=3D 0xffffffff; @@ -6605,7 +6610,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 if (CODE64(s)) goto illegal_op; - ot =3D dflag; + ot =3D s->dflag; offset =3D insn_get(env, s, ot); selector =3D insn_get(env, s, MO_16); =20 @@ -6614,13 +6619,13 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) } goto do_lcall; case 0xe9: /* jmp im */ - if (dflag !=3D MO_16) { + if (s->dflag !=3D MO_16) { tval =3D (int32_t)insn_get(env, s, MO_32); } else { tval =3D (int16_t)insn_get(env, s, MO_16); } tval +=3D s->pc - s->cs_base; - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tval &=3D 0xffff; } else if (!CODE64(s)) { tval &=3D 0xffffffff; @@ -6634,7 +6639,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 if (CODE64(s)) goto illegal_op; - ot =3D dflag; + ot =3D s->dflag; offset =3D insn_get(env, s, ot); selector =3D insn_get(env, s, MO_16); =20 @@ -6645,7 +6650,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0xeb: /* jmp Jb */ tval =3D (int8_t)insn_get(env, s, MO_8); tval +=3D s->pc - s->cs_base; - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tval &=3D 0xffff; } gen_jmp(s, tval); @@ -6654,7 +6659,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) tval =3D (int8_t)insn_get(env, s, MO_8); goto do_jcc; case 0x180 ... 0x18f: /* jcc Jv */ - if (dflag !=3D MO_16) { + if (s->dflag !=3D MO_16) { tval =3D (int32_t)insn_get(env, s, MO_32); } else { tval =3D (int16_t)insn_get(env, s, MO_16); @@ -6662,7 +6667,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) do_jcc: next_eip =3D s->pc - s->cs_base; tval +=3D next_eip; - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tval &=3D 0xffff; } gen_bnd_jmp(s); @@ -6678,7 +6683,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (!(s->cpuid_features & CPUID_CMOV)) { goto illegal_op; } - ot =3D dflag; + ot =3D s->dflag; modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); gen_cmovcc1(env, s, ot, b, modrm, reg); @@ -6703,7 +6708,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } else { ot =3D gen_pop_T0(s); if (s->cpl =3D=3D 0) { - if (dflag !=3D MO_16) { + if (s->dflag !=3D MO_16) { gen_helper_write_eflags(cpu_env, s->T0, tcg_const_i32((TF_MASK | AC_MA= SK | ID_MASK | NT_MA= SK | @@ -6718,7 +6723,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) } } else { if (s->cpl <=3D s->iopl) { - if (dflag !=3D MO_16) { + if (s->dflag !=3D MO_16) { gen_helper_write_eflags(cpu_env, s->T0, tcg_const_i32((TF_MASK | AC_MASK | @@ -6735,7 +6740,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) & 0xffff)); } } else { - if (dflag !=3D MO_16) { + if (s->dflag !=3D MO_16) { gen_helper_write_eflags(cpu_env, s->T0, tcg_const_i32((TF_MASK | AC_MAS= K | ID_MASK | NT_MAS= K))); @@ -6795,7 +6800,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) /************************/ /* bit operations */ case 0x1ba: /* bt/bts/btr/btc Gv, im */ - ot =3D dflag; + ot =3D s->dflag; modrm =3D x86_ldub_code(env, s); op =3D (modrm >> 3) & 7; mod =3D (modrm >> 6) & 3; @@ -6828,7 +6833,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1bb: /* btc */ op =3D 3; do_btx: - ot =3D dflag; + ot =3D s->dflag; modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); mod =3D (modrm >> 6) & 3; @@ -6933,14 +6938,14 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; case 0x1bc: /* bsf / tzcnt */ case 0x1bd: /* bsr / lzcnt */ - ot =3D dflag; + ot =3D s->dflag; modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); gen_extu(ot, s->T0); =20 /* Note that lzcnt and tzcnt are in different extensions. */ - if ((prefixes & PREFIX_REPZ) + if ((s->prefix & PREFIX_REPZ) && (b & 1 ? s->cpuid_ext3_features & CPUID_EXT3_ABM : s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_BMI1)) { @@ -7033,14 +7038,14 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) /* misc */ case 0x90: /* nop */ /* XXX: correct lock test for all insn */ - if (prefixes & PREFIX_LOCK) { + if (s->prefix & PREFIX_LOCK) { goto illegal_op; } /* If REX_B is set, then this is xchg eax, r8d, not a nop. */ if (REX_B(s)) { goto do_xchg_reg_eax; } - if (prefixes & PREFIX_REPZ) { + if (s->prefix & PREFIX_REPZ) { gen_update_cc_op(s); gen_jmp_im(s, pc_start - s->cs_base); gen_helper_pause(cpu_env, tcg_const_i32(s->pc - pc_start)); @@ -7107,7 +7112,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x62: /* bound */ if (CODE64(s)) goto illegal_op; - ot =3D dflag; + ot =3D s->dflag; modrm =3D x86_ldub_code(env, s); reg =3D (modrm >> 3) & 7; mod =3D (modrm >> 6) & 3; @@ -7125,7 +7130,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1c8 ... 0x1cf: /* bswap reg */ reg =3D (b & 7) | REX_B(s); #ifdef TARGET_X86_64 - if (dflag =3D=3D MO_64) { + if (s->dflag =3D=3D MO_64) { gen_op_mov_v_reg(s, MO_64, s->T0, reg); tcg_gen_bswap64_i64(s->T0, s->T0); gen_op_mov_reg_v(s, MO_64, reg, s->T0); @@ -7155,7 +7160,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) tval =3D (int8_t)insn_get(env, s, MO_8); next_eip =3D s->pc - s->cs_base; tval +=3D next_eip; - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tval &=3D 0xffff; } =20 @@ -7239,7 +7244,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (!s->pe) { gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); } else { - gen_helper_sysexit(cpu_env, tcg_const_i32(dflag - 1)); + gen_helper_sysexit(cpu_env, tcg_const_i32(s->dflag - 1)); gen_eob(s); } break; @@ -7258,7 +7263,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (!s->pe) { gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); } else { - gen_helper_sysret(cpu_env, tcg_const_i32(dflag - 1)); + gen_helper_sysret(cpu_env, tcg_const_i32(s->dflag - 1)); /* condition codes are modified only in long mode */ if (s->lma) { set_cc_op(s, CC_OP_EFLAGS); @@ -7297,7 +7302,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_svm_check_intercept(s, pc_start, SVM_EXIT_LDTR_READ); tcg_gen_ld32u_tl(s->T0, cpu_env, offsetof(CPUX86State, ldt.selector)); - ot =3D mod =3D=3D 3 ? dflag : MO_16; + ot =3D mod =3D=3D 3 ? s->dflag : MO_16; gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1); break; case 2: /* lldt */ @@ -7318,7 +7323,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_svm_check_intercept(s, pc_start, SVM_EXIT_TR_READ); tcg_gen_ld32u_tl(s->T0, cpu_env, offsetof(CPUX86State, tr.selector)); - ot =3D mod =3D=3D 3 ? dflag : MO_16; + ot =3D mod =3D=3D 3 ? s->dflag : MO_16; gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1); break; case 3: /* ltr */ @@ -7362,7 +7367,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_op_st_v(s, MO_16, s->T0, s->A0); gen_add_A0_im(s, 2); tcg_gen_ld_tl(s->T0, cpu_env, offsetof(CPUX86State, gdt.base)); - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tcg_gen_andi_tl(s->T0, s->T0, 0xffffff); } gen_op_st_v(s, CODE64(s) + MO_32, s->T0, s->A0); @@ -7417,7 +7422,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_op_st_v(s, MO_16, s->T0, s->A0); gen_add_A0_im(s, 2); tcg_gen_ld_tl(s->T0, cpu_env, offsetof(CPUX86State, idt.base)); - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tcg_gen_andi_tl(s->T0, s->T0, 0xffffff); } gen_op_st_v(s, CODE64(s) + MO_32, s->T0, s->A0); @@ -7567,7 +7572,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_op_ld_v(s, MO_16, s->T1, s->A0); gen_add_A0_im(s, 2); gen_op_ld_v(s, CODE64(s) + MO_32, s->T0, s->A0); - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tcg_gen_andi_tl(s->T0, s->T0, 0xffffff); } tcg_gen_st_tl(s->T0, cpu_env, offsetof(CPUX86State, gdt.base)); @@ -7584,7 +7589,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_op_ld_v(s, MO_16, s->T1, s->A0); gen_add_A0_im(s, 2); gen_op_ld_v(s, CODE64(s) + MO_32, s->T0, s->A0); - if (dflag =3D=3D MO_16) { + if (s->dflag =3D=3D MO_16) { tcg_gen_andi_tl(s->T0, s->T0, 0xffffff); } tcg_gen_st_tl(s->T0, cpu_env, offsetof(CPUX86State, idt.base)); @@ -7603,7 +7608,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1); break; case 0xee: /* rdpkru */ - if (prefixes & PREFIX_LOCK) { + if (s->prefix & PREFIX_LOCK) { goto illegal_op; } tcg_gen_trunc_tl_i32(s->tmp2_i32, cpu_regs[R_ECX]); @@ -7611,7 +7616,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) tcg_gen_extr_i64_tl(cpu_regs[R_EAX], cpu_regs[R_EDX], s->tmp1_= i64); break; case 0xef: /* wrpkru */ - if (prefixes & PREFIX_LOCK) { + if (s->prefix & PREFIX_LOCK) { goto illegal_op; } tcg_gen_concat_tl_i64(s->tmp1_i64, cpu_regs[R_EAX], @@ -7696,7 +7701,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (CODE64(s)) { int d_ot; /* d_ot is the size of destination */ - d_ot =3D dflag; + d_ot =3D s->dflag; =20 modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); @@ -7771,7 +7776,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) TCGv t0; if (!s->pe || s->vm86) goto illegal_op; - ot =3D dflag !=3D MO_16 ? MO_32 : MO_16; + ot =3D s->dflag !=3D MO_16 ? MO_32 : MO_16; modrm =3D x86_ldub_code(env, s); reg =3D ((modrm >> 3) & 7) | REX_R(s); gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0); @@ -7815,18 +7820,18 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) if (s->flags & HF_MPX_EN_MASK) { mod =3D (modrm >> 6) & 3; reg =3D ((modrm >> 3) & 7) | REX_R(s); - if (prefixes & PREFIX_REPZ) { + if (s->prefix & PREFIX_REPZ) { /* bndcl */ if (reg >=3D 4 - || (prefixes & PREFIX_LOCK) + || (s->prefix & PREFIX_LOCK) || s->aflag =3D=3D MO_16) { goto illegal_op; } gen_bndck(env, s, modrm, TCG_COND_LTU, cpu_bndl[reg]); - } else if (prefixes & PREFIX_REPNZ) { + } else if (s->prefix & PREFIX_REPNZ) { /* bndcu */ if (reg >=3D 4 - || (prefixes & PREFIX_LOCK) + || (s->prefix & PREFIX_LOCK) || s->aflag =3D=3D MO_16) { goto illegal_op; } @@ -7834,14 +7839,14 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) tcg_gen_not_i64(notu, cpu_bndu[reg]); gen_bndck(env, s, modrm, TCG_COND_GTU, notu); tcg_temp_free_i64(notu); - } else if (prefixes & PREFIX_DATA) { + } else if (s->prefix & PREFIX_DATA) { /* bndmov -- from reg/mem */ if (reg >=3D 4 || s->aflag =3D=3D MO_16) { goto illegal_op; } if (mod =3D=3D 3) { int reg2 =3D (modrm & 7) | REX_B(s); - if (reg2 >=3D 4 || (prefixes & PREFIX_LOCK)) { + if (reg2 >=3D 4 || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } if (s->flags & HF_MPX_IU_MASK) { @@ -7870,7 +7875,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) /* bndldx */ AddressParts a =3D gen_lea_modrm_0(env, s, modrm); if (reg >=3D 4 - || (prefixes & PREFIX_LOCK) + || (s->prefix & PREFIX_LOCK) || s->aflag =3D=3D MO_16 || a.base < -1) { goto illegal_op; @@ -7905,10 +7910,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) if (s->flags & HF_MPX_EN_MASK) { mod =3D (modrm >> 6) & 3; reg =3D ((modrm >> 3) & 7) | REX_R(s); - if (mod !=3D 3 && (prefixes & PREFIX_REPZ)) { + if (mod !=3D 3 && (s->prefix & PREFIX_REPZ)) { /* bndmk */ if (reg >=3D 4 - || (prefixes & PREFIX_LOCK) + || (s->prefix & PREFIX_LOCK) || s->aflag =3D=3D MO_16) { goto illegal_op; } @@ -7933,22 +7938,22 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) /* bnd registers are now in-use */ gen_set_hflag(s, HF_MPX_IU_MASK); break; - } else if (prefixes & PREFIX_REPNZ) { + } else if (s->prefix & PREFIX_REPNZ) { /* bndcn */ if (reg >=3D 4 - || (prefixes & PREFIX_LOCK) + || (s->prefix & PREFIX_LOCK) || s->aflag =3D=3D MO_16) { goto illegal_op; } gen_bndck(env, s, modrm, TCG_COND_GTU, cpu_bndu[reg]); - } else if (prefixes & PREFIX_DATA) { + } else if (s->prefix & PREFIX_DATA) { /* bndmov -- to reg/mem */ if (reg >=3D 4 || s->aflag =3D=3D MO_16) { goto illegal_op; } if (mod =3D=3D 3) { int reg2 =3D (modrm & 7) | REX_B(s); - if (reg2 >=3D 4 || (prefixes & PREFIX_LOCK)) { + if (reg2 >=3D 4 || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } if (s->flags & HF_MPX_IU_MASK) { @@ -7975,7 +7980,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) /* bndstx */ AddressParts a =3D gen_lea_modrm_0(env, s, modrm); if (reg >=3D 4 - || (prefixes & PREFIX_LOCK) + || (s->prefix & PREFIX_LOCK) || s->aflag =3D=3D MO_16 || a.base < -1) { goto illegal_op; @@ -8023,7 +8028,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) ot =3D MO_64; else ot =3D MO_32; - if ((prefixes & PREFIX_LOCK) && (reg =3D=3D 0) && + if ((s->prefix & PREFIX_LOCK) && (reg =3D=3D 0) && (s->cpuid_ext3_features & CPUID_EXT3_CR8LEG)) { reg =3D 8; } @@ -8113,7 +8118,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1c3: /* MOVNTI reg, mem */ if (!(s->cpuid_features & CPUID_SSE2)) goto illegal_op; - ot =3D mo_64_32(dflag); + ot =3D mo_64_32(s->dflag); modrm =3D x86_ldub_code(env, s); mod =3D (modrm >> 6) & 3; if (mod =3D=3D 3) @@ -8127,7 +8132,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) switch (modrm) { CASE_MODRM_MEM_OP(0): /* fxsave */ if (!(s->cpuid_features & CPUID_FXSR) - || (prefixes & PREFIX_LOCK)) { + || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } if ((s->flags & HF_EM_MASK) || (s->flags & HF_TS_MASK)) { @@ -8140,7 +8145,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 CASE_MODRM_MEM_OP(1): /* fxrstor */ if (!(s->cpuid_features & CPUID_FXSR) - || (prefixes & PREFIX_LOCK)) { + || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } if ((s->flags & HF_EM_MASK) || (s->flags & HF_TS_MASK)) { @@ -8179,8 +8184,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 CASE_MODRM_MEM_OP(4): /* xsave */ if ((s->cpuid_ext_features & CPUID_EXT_XSAVE) =3D=3D 0 - || (prefixes & (PREFIX_LOCK | PREFIX_DATA - | PREFIX_REPZ | PREFIX_REPNZ))) { + || (s->prefix & (PREFIX_LOCK | PREFIX_DATA + | PREFIX_REPZ | PREFIX_REPNZ))) { goto illegal_op; } gen_lea_modrm(env, s, modrm); @@ -8191,8 +8196,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 CASE_MODRM_MEM_OP(5): /* xrstor */ if ((s->cpuid_ext_features & CPUID_EXT_XSAVE) =3D=3D 0 - || (prefixes & (PREFIX_LOCK | PREFIX_DATA - | PREFIX_REPZ | PREFIX_REPNZ))) { + || (s->prefix & (PREFIX_LOCK | PREFIX_DATA + | PREFIX_REPZ | PREFIX_REPNZ))) { goto illegal_op; } gen_lea_modrm(env, s, modrm); @@ -8207,10 +8212,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; =20 CASE_MODRM_MEM_OP(6): /* xsaveopt / clwb */ - if (prefixes & PREFIX_LOCK) { + if (s->prefix & PREFIX_LOCK) { goto illegal_op; } - if (prefixes & PREFIX_DATA) { + if (s->prefix & PREFIX_DATA) { /* clwb */ if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_CLWB)) { goto illegal_op; @@ -8220,7 +8225,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) /* xsaveopt */ if ((s->cpuid_ext_features & CPUID_EXT_XSAVE) =3D=3D 0 || (s->cpuid_xsave_features & CPUID_XSAVE_XSAVEOPT) = =3D=3D 0 - || (prefixes & (PREFIX_REPZ | PREFIX_REPNZ))) { + || (s->prefix & (PREFIX_REPZ | PREFIX_REPNZ))) { goto illegal_op; } gen_lea_modrm(env, s, modrm); @@ -8231,10 +8236,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) break; =20 CASE_MODRM_MEM_OP(7): /* clflush / clflushopt */ - if (prefixes & PREFIX_LOCK) { + if (s->prefix & PREFIX_LOCK) { goto illegal_op; } - if (prefixes & PREFIX_DATA) { + if (s->prefix & PREFIX_DATA) { /* clflushopt */ if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_CLFLUSHOPT= )) { goto illegal_op; @@ -8254,8 +8259,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0xd0 ... 0xd7: /* wrfsbase (f3 0f ae /2) */ case 0xd8 ... 0xdf: /* wrgsbase (f3 0f ae /3) */ if (CODE64(s) - && (prefixes & PREFIX_REPZ) - && !(prefixes & PREFIX_LOCK) + && (s->prefix & PREFIX_REPZ) + && !(s->prefix & PREFIX_LOCK) && (s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_FSGSBASE)) { TCGv base, treg, src, dst; =20 @@ -8284,10 +8289,10 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) goto unknown_op; =20 case 0xf8: /* sfence / pcommit */ - if (prefixes & PREFIX_DATA) { + if (s->prefix & PREFIX_DATA) { /* pcommit */ if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_PCOMMIT) - || (prefixes & PREFIX_LOCK)) { + || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } break; @@ -8295,21 +8300,21 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) /* fallthru */ case 0xf9 ... 0xff: /* sfence */ if (!(s->cpuid_features & CPUID_SSE) - || (prefixes & PREFIX_LOCK)) { + || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } tcg_gen_mb(TCG_MO_ST_ST | TCG_BAR_SC); break; case 0xe8 ... 0xef: /* lfence */ if (!(s->cpuid_features & CPUID_SSE) - || (prefixes & PREFIX_LOCK)) { + || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } tcg_gen_mb(TCG_MO_LD_LD | TCG_BAR_SC); break; case 0xf0 ... 0xf7: /* mfence */ if (!(s->cpuid_features & CPUID_SSE2) - || (prefixes & PREFIX_LOCK)) { + || (s->prefix & PREFIX_LOCK)) { goto illegal_op; } tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); @@ -8337,8 +8342,8 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_eob(s); break; case 0x1b8: /* SSE4.2 popcnt */ - if ((prefixes & (PREFIX_REPZ | PREFIX_LOCK | PREFIX_REPNZ)) !=3D - PREFIX_REPZ) + if ((s->prefix & (PREFIX_REPZ | PREFIX_LOCK | PREFIX_REPNZ)) !=3D + PREFIX_REPZ) goto illegal_op; if (!(s->cpuid_ext_features & CPUID_EXT_POPCNT)) goto illegal_op; @@ -8349,7 +8354,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (s->prefix & PREFIX_DATA) { ot =3D MO_16; } else { - ot =3D mo_64_32(dflag); + ot =3D mo_64_32(s->dflag); } =20 gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564595934; cv=none; d=zoho.com; s=zohoarc; b=hbtPAcm9+cUk0POElfvbIaS12G1pZvD2LtSzcDRrI1nVgLnS75cZKo+z2IzwNUgHXQQVQc4IAR9ukFmUT42VorqIgVyjCO+fie56GP3ucvab7mftJOG7mn1AqHzCHfUP074bUMA58/ZgmSkkQYKX7PrGjQV/Jxe5u70WTcQQwVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564595934; 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:ARC-Authentication-Results; bh=RGIzOBL1D3s8zMwGXrr1pEISVemFTBYPjTJ2WYWPeAY=; b=YGNUSp013MVKR/mgzGcvUxoWe3yYFdNUVIlBiaLKKnb3udpzHnKoQQ0V+K3J8en0bv/dAdjA+pJlgnFEl9psElROSgH9XVK1uawna77Dzz5Qp2eDAx0u7HPyd9NJ6ByfY1xtOWaSQRYSIRienfVPwTFfaGAwXTB43OjxFcYzul8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564595934413315.37565255070683; Wed, 31 Jul 2019 10:58:54 -0700 (PDT) Received: from localhost ([::1]:43344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsssH-0003yy-E8 for importer@patchew.org; Wed, 31 Jul 2019 13:58:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42683) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrB-000255-MI for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssr9-0002g1-Ld for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:45 -0400 Received: from mail-yw1-xc42.google.com ([2607:f8b0:4864:20::c42]:41046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssr9-0002fl-G1 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:43 -0400 Received: by mail-yw1-xc42.google.com with SMTP id i138so25274115ywg.8 for ; Wed, 31 Jul 2019 10:57:43 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RGIzOBL1D3s8zMwGXrr1pEISVemFTBYPjTJ2WYWPeAY=; b=XvXmVXE+CJj9y1myA5Tx/oKIgXV+jZ5lxwAvfpfQPx9O/Zz9HoSLGv7C252U65jkAd 6etVQamjEIkNLCLyhYWl957cG8E55gV5dV8pqcSWu9aM9aL4jB1ZAbj+H/7uTYl2cYGP nOYHn4PKF/gBQ7QYFGqY9FDYAKFsL3FIxli4ehw5DKtSKidhLucNNK2KEz9/CPDc+bj1 LhwWetDCJkhLnZ6KJVQrgL1ZDjV12uaJvkTcaZotQYAt4aea2ZtLgPaaPHqbp4xXPg03 ZHDUUVr2i5nAsV5zSbugBsU7flt6TEQfAcoXoM/PW3AQYzSEkHq9OewB1mNa9z7ah46T aXnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RGIzOBL1D3s8zMwGXrr1pEISVemFTBYPjTJ2WYWPeAY=; b=G/iRtFutLc0ZXL9pjE6raOykdarGgejQlaEpt9EPkL1YS3n6U8tGy0qvvwwTxq8BE+ CkRWMUMxfR7bzoJultkq0bTStoNvRzqnF0vQl/yg1e441PoH8PyMoq5eHNHoLLF8a176 sRm5L+czQYf7Em/NZC53Zv5p0sTw1yIKsz0WWDobSgoPLA5juXD1kT/vTaICnHHEkvxw UUo0xZl7h5U5E+ea2rXSDTn3B/KSxnxEK+zkWevEJXz8FzN94T2SmI4iQaX8e4JXLSDA S3IuclRKlPewAjZWJaRonvLu9hS8gd6z4LnL4bZ3ARxn5PkxfQoSWy+4IjydCCtRv+G0 gN3Q== X-Gm-Message-State: APjAAAV6bEDJHEi7UfAGwOEwvn47XVsKrgEmOiGKpxqg1rFr/xi+wP6j FVa6TZ1I9924/GORSUiEPUCEGbBZ X-Google-Smtp-Source: APXvYqxGoRefzJZItrUKgLA9adj4wtnTCjFjCfWZuTTgnL3E313JHxI2FlGDNeU2db5yAO31+GQAgQ== X-Received: by 2002:a0d:e942:: with SMTP id s63mr75219500ywe.511.1564595862505; Wed, 31 Jul 2019 10:57:42 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:44 -0400 Message-Id: <20190731175702.4916-5-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c42 Subject: [Qemu-devel] [RFC PATCH v1 04/22] target/i386: Simplify gen_exception arguments 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Richard Henderson 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: Richard Henderson We can compute cur_eip from values present within DisasContext. Signed-off-by: Richard Henderson --- target/i386/translate.c | 89 ++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/target/i386/translate.c b/target/i386/translate.c index 692261f73f..9e22eca2dc 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -1272,10 +1272,10 @@ static void gen_helper_fp_arith_STN_ST0(int op, int= opreg) } } =20 -static void gen_exception(DisasContext *s, int trapno, target_ulong cur_ei= p) +static void gen_exception(DisasContext *s, int trapno) { gen_update_cc_op(s); - gen_jmp_im(s, cur_eip); + gen_jmp_im(s, s->pc_start - s->cs_base); gen_helper_raise_exception(cpu_env, tcg_const_i32(trapno)); s->base.is_jmp =3D DISAS_NORETURN; } @@ -1284,7 +1284,7 @@ static void gen_exception(DisasContext *s, int trapno= , target_ulong cur_eip) the instruction is known, but it isn't allowed in the current cpu mode.= */ static void gen_illegal_opcode(DisasContext *s) { - gen_exception(s, EXCP06_ILLOP, s->pc_start - s->cs_base); + gen_exception(s, EXCP06_ILLOP); } =20 /* if d =3D=3D OR_TMP0, it means memory operand (address in A0) */ @@ -3040,8 +3040,7 @@ static const struct SSEOpHelper_eppi sse_op_table7[25= 6] =3D { [0xdf] =3D AESNI_OP(aeskeygenassist), }; =20 -static void gen_sse(CPUX86State *env, DisasContext *s, int b, - target_ulong pc_start) +static void gen_sse(CPUX86State *env, DisasContext *s, int b) { int b1, op1_offset, op2_offset, is_xmm, val; int modrm, mod, rm, reg; @@ -3076,7 +3075,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s= , int b, } /* simple MMX/SSE operation */ if (s->flags & HF_TS_MASK) { - gen_exception(s, EXCP07_PREX, pc_start - s->cs_base); + gen_exception(s, EXCP07_PREX); return; } if (s->flags & HF_EM_MASK) { @@ -4515,7 +4514,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) s->vex_l =3D 0; s->vex_v =3D 0; if (sigsetjmp(s->jmpbuf, 0) !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); return s->pc; } =20 @@ -5854,7 +5853,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (s->flags & (HF_EM_MASK | HF_TS_MASK)) { /* if CR0.EM or CR0.TS are set, generate an FPU exception */ /* XXX: what to do if illegal op ? */ - gen_exception(s, EXCP07_PREX, pc_start - s->cs_base); + gen_exception(s, EXCP07_PREX); break; } modrm =3D x86_ldub_code(env, s); @@ -6572,7 +6571,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) set_cc_op(s, CC_OP_EFLAGS); } else if (s->vm86) { if (s->iopl !=3D 3) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_helper_iret_real(cpu_env, tcg_const_i32(s->dflag - 1)); set_cc_op(s, CC_OP_EFLAGS); @@ -6694,7 +6693,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x9c: /* pushf */ gen_svm_check_intercept(s, pc_start, SVM_EXIT_PUSHF); if (s->vm86 && s->iopl !=3D 3) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_update_cc_op(s); gen_helper_read_eflags(s->T0, cpu_env); @@ -6704,7 +6703,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x9d: /* popf */ gen_svm_check_intercept(s, pc_start, SVM_EXIT_POPF); if (s->vm86 && s->iopl !=3D 3) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { ot =3D gen_pop_T0(s); if (s->cpl =3D=3D 0) { @@ -7021,7 +7020,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; val =3D x86_ldub_code(env, s); if (val =3D=3D 0) { - gen_exception(s, EXCP00_DIVZ, pc_start - s->cs_base); + gen_exception(s, EXCP00_DIVZ); } else { gen_helper_aam(cpu_env, tcg_const_i32(val)); set_cc_op(s, CC_OP_LOGICB); @@ -7055,7 +7054,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x9b: /* fwait */ if ((s->flags & (HF_MP_MASK | HF_TS_MASK)) =3D=3D (HF_MP_MASK | HF_TS_MASK)) { - gen_exception(s, EXCP07_PREX, pc_start - s->cs_base); + gen_exception(s, EXCP07_PREX); } else { gen_helper_fwait(cpu_env); } @@ -7066,7 +7065,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0xcd: /* int N */ val =3D x86_ldub_code(env, s); if (s->vm86 && s->iopl !=3D 3) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_interrupt(s, val, pc_start - s->cs_base, s->pc - s->cs_bas= e); } @@ -7089,13 +7088,13 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) if (s->cpl <=3D s->iopl) { gen_helper_cli(cpu_env); } else { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } } else { if (s->iopl =3D=3D 3) { gen_helper_cli(cpu_env); } else { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } } break; @@ -7106,7 +7105,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) gen_jmp_im(s, s->pc - s->cs_base); gen_eob_inhibit_irq(s, true); } else { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } break; case 0x62: /* bound */ @@ -7198,7 +7197,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x130: /* wrmsr */ case 0x132: /* rdmsr */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_update_cc_op(s); gen_jmp_im(s, pc_start - s->cs_base); @@ -7231,7 +7230,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (CODE64(s) && env->cpuid_vendor1 !=3D CPUID_VENDOR_INTEL_1) goto illegal_op; if (!s->pe) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_helper_sysenter(cpu_env); gen_eob(s); @@ -7242,7 +7241,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (CODE64(s) && env->cpuid_vendor1 !=3D CPUID_VENDOR_INTEL_1) goto illegal_op; if (!s->pe) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_helper_sysexit(cpu_env, tcg_const_i32(s->dflag - 1)); gen_eob(s); @@ -7261,7 +7260,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0x107: /* sysret */ if (!s->pe) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_helper_sysret(cpu_env, tcg_const_i32(s->dflag - 1)); /* condition codes are modified only in long mode */ @@ -7283,7 +7282,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0xf4: /* hlt */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_update_cc_op(s); gen_jmp_im(s, pc_start - s->cs_base); @@ -7309,7 +7308,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (!s->pe || s->vm86) goto illegal_op; if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_svm_check_intercept(s, pc_start, SVM_EXIT_LDTR_WRITE); gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0); @@ -7330,7 +7329,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) if (!s->pe || s->vm86) goto illegal_op; if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_svm_check_intercept(s, pc_start, SVM_EXIT_TR_WRITE); gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0); @@ -7446,7 +7445,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } tcg_gen_concat_tl_i64(s->tmp1_i64, cpu_regs[R_EAX], @@ -7463,7 +7462,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_update_cc_op(s); @@ -7488,7 +7487,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_update_cc_op(s); @@ -7501,7 +7500,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_update_cc_op(s); @@ -7516,7 +7515,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_update_cc_op(s); @@ -7530,7 +7529,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_update_cc_op(s); @@ -7554,7 +7553,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_update_cc_op(s); @@ -7564,7 +7563,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 CASE_MODRM_MEM_OP(2): /* lgdt */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_svm_check_intercept(s, pc_start, SVM_EXIT_GDTR_WRITE); @@ -7581,7 +7580,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 CASE_MODRM_MEM_OP(3): /* lidt */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_svm_check_intercept(s, pc_start, SVM_EXIT_IDTR_WRITE); @@ -7626,7 +7625,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; CASE_MODRM_OP(6): /* lmsw */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_svm_check_intercept(s, pc_start, SVM_EXIT_WRITE_CR0); @@ -7638,7 +7637,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) =20 CASE_MODRM_MEM_OP(7): /* invlpg */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); break; } gen_update_cc_op(s); @@ -7653,7 +7652,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) #ifdef TARGET_X86_64 if (CODE64(s)) { if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { tcg_gen_mov_tl(s->T0, cpu_seg_base[R_GS]); tcg_gen_ld_tl(cpu_seg_base[R_GS], cpu_env, @@ -7690,7 +7689,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x108: /* invd */ case 0x109: /* wbinvd */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_svm_check_intercept(s, pc_start, (b & 2) ? SVM_EXIT_INVD := SVM_EXIT_WBINVD); /* nothing to do */ @@ -8014,7 +8013,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x120: /* mov reg, crN */ case 0x122: /* mov crN, reg */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { modrm =3D x86_ldub_code(env, s); /* Ignore the mod bits (assume (modrm&0xc0)=3D=3D0xc0). @@ -8071,7 +8070,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x121: /* mov reg, drN */ case 0x123: /* mov drN, reg */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { modrm =3D x86_ldub_code(env, s); /* Ignore the mod bits (assume (modrm&0xc0)=3D=3D0xc0). @@ -8105,7 +8104,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) break; case 0x106: /* clts */ if (s->cpl !=3D 0) { - gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); + gen_exception(s, EXCP0D_GPF); } else { gen_svm_check_intercept(s, pc_start, SVM_EXIT_WRITE_CR0); gen_helper_clts(cpu_env); @@ -8136,7 +8135,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if ((s->flags & HF_EM_MASK) || (s->flags & HF_TS_MASK)) { - gen_exception(s, EXCP07_PREX, pc_start - s->cs_base); + gen_exception(s, EXCP07_PREX); break; } gen_lea_modrm(env, s, modrm); @@ -8149,7 +8148,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if ((s->flags & HF_EM_MASK) || (s->flags & HF_TS_MASK)) { - gen_exception(s, EXCP07_PREX, pc_start - s->cs_base); + gen_exception(s, EXCP07_PREX); break; } gen_lea_modrm(env, s, modrm); @@ -8161,7 +8160,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->flags & HF_TS_MASK) { - gen_exception(s, EXCP07_PREX, pc_start - s->cs_base); + gen_exception(s, EXCP07_PREX); break; } gen_lea_modrm(env, s, modrm); @@ -8174,7 +8173,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) goto illegal_op; } if (s->flags & HF_TS_MASK) { - gen_exception(s, EXCP07_PREX, pc_start - s->cs_base); + gen_exception(s, EXCP07_PREX); break; } gen_lea_modrm(env, s, modrm); @@ -8377,7 +8376,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) case 0x1c2: case 0x1c4 ... 0x1c6: case 0x1d0 ... 0x1fe: - gen_sse(env, s, b, pc_start); + gen_sse(env, s, b); break; default: goto unknown_op; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596027; cv=none; d=zoho.com; s=zohoarc; b=WsvtaJgBUXQDWZRN2iUJd659hN43D8nk9cjQBxSygTKRqEMeeKjH3pHqQ+ltmdkzSbE+2Ko9f2oFUl2rQ23M8uqaQqIokMDlv/K/JIgzEq+35agmPsqfhGgYTpFKjIkUeWcQSeU6w6FfA2ED4HQVKCGerSe66RX5i7tHt2ZOwfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596027; 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:ARC-Authentication-Results; bh=1ekAymW7+Pf7uZP93T+0YUhPCN4vlbqsaROZQAkd+Pc=; b=dQc/7ZV6HYYApOrvxkq0vyKBV21c3JTOwbMYQDgpQSSrdgr7CF3Zgp+DtfPMXeMDDwFdfJ3OA7kQLyFvwLHp26yLYCqx1FuzVqTjxek2GBHYL8kVrN2zBwLUw5Ayy4If1GEv4daDmsbiqhhUKDYDcnNTifA1g7lYZ8LPtEEJ8tA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596027328981.2710509459458; Wed, 31 Jul 2019 11:00:27 -0700 (PDT) Received: from localhost ([::1]:43379 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsstm-0008CY-Cz for importer@patchew.org; Wed, 31 Jul 2019 14:00:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42661) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrA-00023C-Vr for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssr9-0002h5-VQ for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:44 -0400 Received: from mail-yb1-xb43.google.com ([2607:f8b0:4864:20::b43]:38822) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssr9-0002fw-RU for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:43 -0400 Received: by mail-yb1-xb43.google.com with SMTP id j199so24745007ybg.5 for ; Wed, 31 Jul 2019 10:57:43 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1ekAymW7+Pf7uZP93T+0YUhPCN4vlbqsaROZQAkd+Pc=; b=vLAJzI/Gy5CDj9uzV67TJXjYqi91u5IaoAwEmdLazhBP53Kshly3KTKVVr+3Wt2CV0 S7ia4psPrHlb0J5wGTTQLUEn8Cw961L3E/wNy+6NYru7t34EZAecOy3gAzKygc+1Q5LU wvFFee4rhf2SDejdCJ7DuJ/I/8f5HRIhM7E3ph7MH9SjtL7OgYdsE2MTLAXAtUUY4EeN epiwzukbPji/fm5DsG4h6viCJGRpBNIIWv6o49v20qCf/vj99eYkzbE0jhzB4j1cJxoj B7Yyq3vOPs+9gCT4Obtmp8SbLv3pxFn7DES9ye/R07zSv3udi3C+rNVsyzilzYMkvTiY vBbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ekAymW7+Pf7uZP93T+0YUhPCN4vlbqsaROZQAkd+Pc=; b=gG4GjW7DgUtxH3cmj7xJRiUT5EsyIXUp6ObEa6A80iyats70UTu46mRBKcjy1vjMz2 wB6DEOEvUWU1h3k62R0ilwo9gSCZM5UCFbMjb7dCR+3/hJl6jtHVddQl+ZeIdoFDiiQO DF0JApo9PgQoM+Ag70+TqhdXp3IuGUAiHrX4NoNHEJdMYGTUFTMIFjUtnQzrXxUejwUD l4ERR2zV8Svf6QILphkVee20SrkNjceeLoeZjx+mF0XqyeUhUdQvY74Pl50iuKiPEL8f SmYdvMu5BOaDdrtG8aqKcbh6kQXvJ6LkMwxKx5KOfcL4/qRZtmwLNze8CkOoXPeYrJ5S ij0w== X-Gm-Message-State: APjAAAVJXMEgGqgGi/4leUbLx2svZ6h3GILaX6tezOsk5HfLWP0herlT F0h9iM8Dfp6cWDcU4V23QFJhOcJf X-Google-Smtp-Source: APXvYqxcgi5vg/dBb/ht+KVNhlnMTd4CbsgxEP+QeCYTIx9xJHI6hs8C6tg9ZOyxBEOupWBmjvSnNA== X-Received: by 2002:a25:d05:: with SMTP id 5mr43380216ybn.200.1564595863127; Wed, 31 Jul 2019 10:57:43 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:45 -0400 Message-Id: <20190731175702.4916-6-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b43 Subject: [Qemu-devel] [RFC PATCH v1 05/22] target/i386: introduce gen_ld_modrm_* helpers 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" These help with decoding/loading ModR/M vector operands; the operand's register offset is returned, which is suitable for use with gvec infrastructure. Signed-off-by: Jan Bobek Reviewed-by: Richard Henderson --- target/i386/translate.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/target/i386/translate.c b/target/i386/translate.c index 9e22eca2dc..7548677e1f 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -3040,6 +3040,53 @@ static const struct SSEOpHelper_eppi sse_op_table7[2= 56] =3D { [0xdf] =3D AESNI_OP(aeskeygenassist), }; =20 +static inline void gen_ld_modrm_PqQq(CPUX86State *env, DisasContext *s, in= t modrm, + uint32_t* dofs, uint32_t* aofs) +{ + const int mod =3D (modrm >> 6) & 3; + const int reg =3D (modrm >> 3) & 7; /* no REX_R */ + *dofs =3D offsetof(CPUX86State, fpregs[reg].mmx); + + if(mod =3D=3D 3) { + const int rm =3D modrm & 7; /* no REX_B */ + + *aofs =3D offsetof(CPUX86State, fpregs[rm].mmx); + } else { + *aofs =3D offsetof(CPUX86State, mmx_t0); + + gen_lea_modrm(env, s, modrm); + gen_ldq_env_A0(s, *aofs); + } +} + +static inline void gen_ld_modrm_VxWx(CPUX86State *env, DisasContext *s, in= t modrm, + uint32_t* dofs, uint32_t* aofs) +{ + const int mod =3D (modrm >> 6) & 3; + const int reg =3D ((modrm >> 3) & 7) | REX_R(s); + *dofs =3D offsetof(CPUX86State, xmm_regs[reg]); + + if(mod =3D=3D 3) { + const int rm =3D (modrm & 7) | REX_B(s); + + *aofs =3D offsetof(CPUX86State, xmm_regs[rm]); + } else { + *aofs =3D offsetof(CPUX86State, xmm_t0); + + gen_lea_modrm(env, s, modrm); + gen_ldo_env_A0(s, *aofs); /* FIXME this needs to load 32 bytes for= YMM */ + } +} + +static inline void gen_ld_modrm_VxHxWx(CPUX86State *env, DisasContext *s, = int modrm, + uint32_t* dofs, uint32_t* aofs, uin= t32_t* bofs) +{ + assert(s->prefix & PREFIX_VEX); + + gen_ld_modrm_VxWx(env, s, modrm, dofs, bofs); + *aofs =3D offsetof(CPUX86State, xmm_regs[s->vex_v]); +} + static void gen_sse(CPUX86State *env, DisasContext *s, int b) { int b1, op1_offset, op2_offset, is_xmm, val; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596008; cv=none; d=zoho.com; s=zohoarc; b=Gt43FpVu5glofTOrO6oPdN6khxSVX3sxSxX+688wTOUUAY6vme0rE8mH2OVmRVlNvv3XMQ44rql2ZDMEa7Y+Hal3FLn57xBR79o1XDFzyctinkgjpjJ3uI6srpvAJIqLEm0Zdgrsm+4fWXQXBLC52AbMaXeoZW1Czoxm/XxR8r4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596008; 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:ARC-Authentication-Results; bh=XyOyXownzlqyzcHoDb3cC3+WYnqPG0lqyZKEQlHebr4=; b=U4+BZLMVHnJnZ/5qp2QtiwbDtKkMwrNSomqH2qZ5gJqcqmKDi5+nbBEnDnCPIgStrbAIAAe6TXbIquEJuP9tabnNq19HS6UKnl6vv/EsIfwHWNe7gY7K/R28XLFAXml1xGw7e6MRFcdo2AlgfIj+Oj/joCg76yCZdWOh70i+A+M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596008290193.62370257207635; Wed, 31 Jul 2019 11:00:08 -0700 (PDT) Received: from localhost ([::1]:43368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsstR-0007Ix-T2 for importer@patchew.org; Wed, 31 Jul 2019 14:00:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42694) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrC-000268-41 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrA-0002ik-Ry for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:46 -0400 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]:36011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrA-0002iI-Mv for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:44 -0400 Received: by mail-yw1-xc44.google.com with SMTP id x67so23938893ywd.3 for ; Wed, 31 Jul 2019 10:57:44 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XyOyXownzlqyzcHoDb3cC3+WYnqPG0lqyZKEQlHebr4=; b=Uf9u6OrJFgkrzD8njZj0IXUqvINLEIToyiMP+sh+UZHEEGaecqMmuMm5KaKRr9vX7U ZYJGyxF0BTOtQVdfViigzdqHwgmf4o4235b133qTG7qKfQw0HsSLHcph4ZhaFY2Hq8qT 8VwjHbaBIoa3XrR4vgXbUMXFx3OuIV6tUVCDbYjHbZMhSRgzKqxne3SwDeRlV7RWgsVd IlhNcHrzBEvUwjM6nfYsaGd2oPsIFU1gTs6GN6x74WX2Dj7JIIOz7yRfHBF+JbW7LL+X O+V0hUBdqkDPAlBjK6vlsf+I9svIGgeZqQKJtP2aV/jH7nyWR76+e0cg/T5AZ7Qx98XQ o4Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XyOyXownzlqyzcHoDb3cC3+WYnqPG0lqyZKEQlHebr4=; b=IqEOyGPdlx6ywgUySb1cCl9SHrmxh8OGp2iDAhf28PQkCKKZQVAuLYwtW4OQvxtjlj wOcwqSpmb3w0ZPPHNdGCnMjp2cg3rjGcPuBtx2ACUcVFwnE+FEt59njf3akkJwhe/CTh QRUsiSs1cH5W+0t4r8agp1SNpfxhUYh/H8DZQ5FSjtzFzO/I+39nKf2ydm3lKc9nwNI3 eNuGs2RpidWotdtyaxrgAsDH8/eRN+iLz6P336oWHWyuXHOENKKSU3ZAlWW27jlEclr7 hWuZE7vHpO2/plQV7hILCKqnJPM9FBrh+fB+B1Akv4GGDWcCFJ9c5AAEz66WQo49abb3 EcVg== X-Gm-Message-State: APjAAAWbEK05JDwqiIQ41L2ZVOxrjcbnl38TnxS5joHS237mq1zE5sE3 5DPKAe3uDvUcebhBUu3imvxKjbaE X-Google-Smtp-Source: APXvYqxt/KSjgdt6us31YrZXUOeE1kSS0qCVevXQR9MbFO2nReSWv/OqsYCBtNUFKHs2GbeI/57v/A== X-Received: by 2002:a0d:eb8a:: with SMTP id u132mr74310850ywe.303.1564595863897; Wed, 31 Jul 2019 10:57:43 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:46 -0400 Message-Id: <20190731175702.4916-7-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c44 Subject: [Qemu-devel] [RFC PATCH v1 06/22] target/i386: introduce gen_gvec_ld_modrm_* helpers 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" gen_gvec_ld_modrm_* helpers tie together a gen_ld_modrm_* helper and a particular gvec operation, effectively handling a single instruction. Signed-off-by: Jan Bobek --- target/i386/translate.c | 77 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/target/i386/translate.c b/target/i386/translate.c index 7548677e1f..d576b3345c 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -3087,6 +3087,83 @@ static inline void gen_ld_modrm_VxHxWx(CPUX86State *= env, DisasContext *s, int mo *aofs =3D offsetof(CPUX86State, xmm_regs[s->vex_v]); } =20 +typedef void (*gen_ld_modrm_2_fp_t)(CPUX86State *env, DisasContext *s, int= modrm, + uint32_t *dofs, uint32_t *aofs); +typedef void (*gen_ld_modrm_3_fp_t)(CPUX86State *env, DisasContext *s, int= modrm, + uint32_t *dofs, uint32_t *aofs, uint32= _t *bofs); +typedef void (*gen_gvec_2_fp_t)(unsigned vece, uint32_t dofs, uint32_t aof= s, + uint32_t bofs, uint32_t oprsz, uint32_t ma= xsz); + +static inline void gen_gvec_ld_modrm_2(CPUX86State *env, DisasContext *s, + int modrm, unsigned vece, + uint32_t oprsz, uint32_t maxsz, + gen_ld_modrm_2_fp_t gen_ld_modrm_2_= fp, + gen_gvec_2_fp_t gen_gvec_2_fp, + int opctl) +{ + uint32_t ofss[2]; + + const int opd =3D ((opctl >> 6) & 7) - 1; + const int opa =3D ((opctl >> 3) & 7) - 1; + const int opb =3D ((opctl >> 0) & 7) - 1; + + assert(0 <=3D opd && opd < 2); + assert(0 <=3D opa && opa < 2); + assert(0 <=3D opb && opb < 2); + + (*gen_ld_modrm_2_fp)(env, s, modrm, &ofss[0], &ofss[1]); + (*gen_gvec_2_fp)(vece, ofss[opd], ofss[opa], ofss[opb], oprsz, maxsz); +} + +static inline void gen_gvec_ld_modrm_3(CPUX86State *env, DisasContext *s, + int modrm, unsigned vece, + uint32_t oprsz, uint32_t maxsz, + gen_ld_modrm_3_fp_t gen_ld_modrm_3_= fp, + gen_gvec_2_fp_t gen_gvec_2_fp, + int opctl) +{ + uint32_t ofss[3]; + + const int opd =3D ((opctl >> 6) & 7) - 1; + const int opa =3D ((opctl >> 3) & 7) - 1; + const int opb =3D ((opctl >> 0) & 7) - 1; + + assert(0 <=3D opd && opd < 3); + assert(0 <=3D opa && opa < 3); + assert(0 <=3D opb && opb < 3); + + (*gen_ld_modrm_3_fp)(env, s, modrm, &ofss[0], &ofss[1], &ofss[2]); + (*gen_gvec_2_fp)(vece, ofss[opd], ofss[opa], ofss[opb], oprsz, maxsz); +} + +#define gen_gvec_ld_modrm_mm(env, s, modrm, vece, \ + gen_gvec_2_fp, opctl) \ + gen_gvec_ld_modrm_2((env), (s), (modrm), (vece), \ + sizeof(MMXReg), sizeof(MMXReg), \ + gen_ld_modrm_PqQq, \ + gen_gvec_2_fp, (opctl)) + +#define gen_gvec_ld_modrm_xmm(env, s, modrm, vece, \ + gen_gvec_2_fp, opctl) \ + gen_gvec_ld_modrm_2((env), (s), (modrm), (vece), \ + sizeof(XMMReg), sizeof(XMMReg), \ + gen_ld_modrm_VxWx, \ + gen_gvec_2_fp, (opctl)) + +#define gen_gvec_ld_modrm_vxmm(env, s, modrm, vece, \ + gen_gvec_2_fp, opctl) \ + gen_gvec_ld_modrm_3((env), (s), (modrm), (vece), \ + sizeof(XMMReg), sizeof(ZMMReg), \ + gen_ld_modrm_VxHxWx, \ + gen_gvec_2_fp, (opctl)) + +#define gen_gvec_ld_modrm_vymm(env, s, modrm, vece, \ + gen_gvec_2_fp, opctl) \ + gen_gvec_ld_modrm_3((env), (s), (modrm), (vece), \ + sizeof(YMMReg), sizeof(ZMMReg), \ + gen_ld_modrm_VxHxWx, \ + gen_gvec_2_fp, (opctl)) + static void gen_sse(CPUX86State *env, DisasContext *s, int b) { int b1, op1_offset, op2_offset, is_xmm, val; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564595934; cv=none; d=zoho.com; s=zohoarc; b=B0RvoL1rDcRHb8jw53IrOixH5HbtCDW3Ap1BA2nKzraD2DDI630VqV/dhufoYLRD30SKUDtPp+2JrXUzQiFZS25LnIYsbp229eHFs8RA/n/JOVts3/pzLC200hwqG7Z8jYZMZ81qwDmqiGChii2qL0ZCFdAvCVt059pKsIGNfsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564595934; 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:ARC-Authentication-Results; bh=3o9+fX6bvmdlKvFXmYUA/ZwiB71cbVH3l+l/0w4LH1I=; b=OVxGY/3H7FIY0g3HWGtYvpqjmX+99l7y6tRTkebEVB+HUa+F5IuohEbkISybS0WLfrteqs0V7OvoDOArCk9NHcdCS6bLAPTxw4pcLoRXu5lyVnPwFn8FM3+cqQrEpvdeXSp8Btd+8PbwYwePsD5/a103ZPYELEa5DvcyQd4DabE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564595934665446.25109373335215; Wed, 31 Jul 2019 10:58:54 -0700 (PDT) Received: from localhost ([::1]:43346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsssH-00042Y-MA for importer@patchew.org; Wed, 31 Jul 2019 13:58:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42701) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrC-00027Q-Hr for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrB-0002ju-G7 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:46 -0400 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]:36009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrB-0002jg-CJ for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:45 -0400 Received: by mail-yw1-xc41.google.com with SMTP id x67so23938905ywd.3 for ; Wed, 31 Jul 2019 10:57:45 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3o9+fX6bvmdlKvFXmYUA/ZwiB71cbVH3l+l/0w4LH1I=; b=Hwn7uUBs86nuFt0WVbvYSjlxyaZ6qJw/NyRfavwoBdNM5xRKUPMwck1guY2p2yhl+s Iocu+fffFy3TnlDnarJOYUmwbwZAMyWziqrGI3+p0eOnLnp5x3zgqSoBYzA7vIydJkAU rpakzkD2vexeZMWbBb0UD0NOw2Io7ccWgCoye9y4F8EyfdytkvSwNfiXpw+kOb48VncD KNaYnmxmJ2Z0bIXyqVo3TeV9lv5oNY6FN/zLiWjMy76cBAnYw1mt1iGF/DSdWriDuoY+ lMGgTd6po51tH9Fh64Wr0oWle0A4dTfQ4E9wb6lHY0XxEjrULBOGeFAFwZbZw7IIWhSz MS9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3o9+fX6bvmdlKvFXmYUA/ZwiB71cbVH3l+l/0w4LH1I=; b=mqTMfBP3W8bubQ00YHPP9Q7Z4dLzdvGNOUFJVRK0fq0RGo9j7/lJxwss7c0wMQPR+P +g3AcHuDxDtOV94rTsA4oG9dKl5p6UYRFazSDJz2SkPlbaCaWpfuKDY+yK7pHX7lgZSp bO6ojshywdO8Aukn9lMjrAzPhONwwZZFwViTEJ7Kd4dvUWT8qR6JYubfyoby6Of/gHcm HR0GFI2f5M0M9L8YMt7l2RjwY70Cd+Cp4+pGM5l17bnlZOiK8kkVfT9rkr2Nk/5KKW6Q kynDttxitq9AEEUIY/w1t0dJ6vPZQ51Pn/cgTQmNsbVMUjGVsmOdqktzZqsC1xPKGv77 R0VA== X-Gm-Message-State: APjAAAXozU79w5gnfiDqgv3xU7w5hoQCySNQWKanwYjwbd6okWPawhFi kHVkufcQePSpYG+DRBllW0dRvrnk X-Google-Smtp-Source: APXvYqyPA5+yYg28FuH3h+1x3OlAq0sMCeUFymkRkd6Rnz+CRV7hlQ2QTvo6dv6tNwxMESyuNxln9A== X-Received: by 2002:a81:7805:: with SMTP id t5mr79579965ywc.312.1564595864806; Wed, 31 Jul 2019 10:57:44 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:47 -0400 Message-Id: <20190731175702.4916-8-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c41 Subject: [Qemu-devel] [RFC PATCH v1 07/22] target/i386: add vector register file alignment constraints 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" gvec operations require that all vectors be aligned on 16-byte boundary; make sure the MM/XMM/YMM/ZMM register file is aligned as neccessary. Signed-off-by: Jan Bobek Reviewed-by: Richard Henderson --- target/i386/cpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 8b3dc5533e..cb407b86ba 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1199,9 +1199,9 @@ typedef struct CPUX86State { float_status mmx_status; /* for 3DNow! float ops */ float_status sse_status; uint32_t mxcsr; - ZMMReg xmm_regs[CPU_NB_REGS =3D=3D 8 ? 8 : 32]; - ZMMReg xmm_t0; - MMXReg mmx_t0; + ZMMReg xmm_regs[CPU_NB_REGS =3D=3D 8 ? 8 : 32] QEMU_ALIGNED(16); + ZMMReg xmm_t0 QEMU_ALIGNED(16); + MMXReg mmx_t0 QEMU_ALIGNED(8); =20 XMMReg ymmh_regs[CPU_NB_REGS]; =20 --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596105; cv=none; d=zoho.com; s=zohoarc; b=CBKclzfcENZb2o7VabW6qvfqUSj5L4uLnasfYnTuclMXSS+oPJGKpfF1JPSD4GPfvmdQvBa9bk+c/93K0DsruLS2p84QBITWrKor4ruc3zMXmIrLjY/uHr3CaAEgnYejOgtKdgIHV/la1N5aa7nni0pQvTbqN8KERoBRkSou0vU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596105; 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:ARC-Authentication-Results; bh=4d3RfxvWrL3pS5CIKpyaSSwwN3flwpgu4uNrI6R0JKY=; b=h/x2Vh0ggrNjDw2jjvMMT53GfT7CUBuvpK+CYzr1zPh9D8qvambPAXqoDN/2jgKvUFjZmoEcXnHhvW+cxJtCrn3DmQ4Y3/ABvEwFTrbXQJLFWnA5yvY6A8pGRGv5SHdToznE7gTadSLC/MhxPGJQjixFSQjCIbToz9DwLDkNQZU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596105535652.0757728830366; Wed, 31 Jul 2019 11:01:45 -0700 (PDT) Received: from localhost ([::1]:43396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssv2-0001xI-Fi for importer@patchew.org; Wed, 31 Jul 2019 14:01:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42737) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrD-0002Am-Mq for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrC-0002kj-Bu for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:47 -0400 Received: from mail-yw1-xc42.google.com ([2607:f8b0:4864:20::c42]:43095) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrC-0002kK-6t for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:46 -0400 Received: by mail-yw1-xc42.google.com with SMTP id n205so25261520ywb.10 for ; Wed, 31 Jul 2019 10:57:46 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4d3RfxvWrL3pS5CIKpyaSSwwN3flwpgu4uNrI6R0JKY=; b=uI/rhecQG8ykYxRJMYkNLXgoe4c5jUJuFVqjw2w1nWzzA8XpjDX9XVbqG68C0iMIj4 A/hkGID8rc1fcDjfT6i2dW604FrcJAA8+2solVJiABsbhW0+TQwD1FhQPwHYt6ifApNE 5rIvEA4jRT/uSA5NJhXSrf8MPvoCmZDG5KVT9KXgmlW1q8f2wv0bPUk/uaPP1KNNI8QQ 28nGqJMlmN9PwmCecDA4tFSqIdhGLKjZ1n9RwNjzMefugc+PPsVtp5ma6sv0uSanB2Hp XdWfc0UjZgaCMTvcqvaTkEEsLCbMaHBNp2YLOc18HvASFfbKYU6DLw2t3UkGBQg6nGDZ 4hkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4d3RfxvWrL3pS5CIKpyaSSwwN3flwpgu4uNrI6R0JKY=; b=TFVY5GKy7yiUCy0al2wL2B3WmJZDo+vS3IbEYkLvhpfBlZXCpj/+WYDPBD59dySmJa 1V0auWxXGFlAh13YFokGodZ1DDy0r4xd97BA0zaNBA9MXN/gYM4TKp/3nHK8/nC2+DFd fku7LLTmvNGsZr0ywgMYR7X9/kPN2Ri77uOU/AE5vWEBC+cLjnC2B5TmPujHGPrQmprs R8fWrl91NjDhg7iScFztahZvBxQ6lgKaoyJ5ZJ7LTuKZN/Q83cEirrdLdi5JrgN0ZhAf Bz4NNC/J1ZRUPMLuEoYlxLD0EELZdynqlZFSlsC2J2aDZqfWum20q4PGIdLnE8BCa5ND 8Snw== X-Gm-Message-State: APjAAAURdoo82m6wKfu+l9djy0+MlRkvRvGCLCfNB3PH+qBoyG4BYnRe XZI0/RsD8BnE9u+SsY7sEuAqxZsW X-Google-Smtp-Source: APXvYqz/esu6UpTPlXvA00D6ddh4n6eqyyCCl7R8/vY14vk/XXIdcnuEgisIOYsCwFq/AF22dEmhhQ== X-Received: by 2002:a81:70d0:: with SMTP id l199mr78458053ywc.397.1564595865571; Wed, 31 Jul 2019 10:57:45 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:48 -0400 Message-Id: <20190731175702.4916-9-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c42 Subject: [Qemu-devel] [RFC PATCH v1 08/22] target/i386: reimplement (V)PAND, (V)ANDPS, (V)ANDPD 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Note: This commit adds several bits which will not be part of the final patch series and which are only present to allow for incremenal write-and-test development cycle. Notably, the SSE_TOMBSTONE define will go away entirely with all of the tables, and nothing will follow the new dispatch switch in gen_sse. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 2 -- target/i386/ops_sse_header.h | 1 - target/i386/translate.c | 49 ++++++++++++++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index ed05989768..b3ba23287d 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -353,7 +353,6 @@ static inline int satsw(int x) #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) #define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) =20 -#define FAND(a, b) ((a) & (b)) #define FANDN(a, b) ((~(a)) & (b)) #define FOR(a, b) ((a) | (b)) #define FXOR(a, b) ((a) ^ (b)) @@ -397,7 +396,6 @@ SSE_HELPER_B(helper_pmaxub, FMAXUB) SSE_HELPER_W(helper_pminsw, FMINSW) SSE_HELPER_W(helper_pmaxsw, FMAXSW) =20 -SSE_HELPER_Q(helper_pand, FAND) SSE_HELPER_Q(helper_pandn, FANDN) SSE_HELPER_Q(helper_por, FOR) SSE_HELPER_Q(helper_pxor, FXOR) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 094aafc573..63b4376389 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -86,7 +86,6 @@ SSE_HELPER_B(pmaxub, FMAXUB) SSE_HELPER_W(pminsw, FMINSW) SSE_HELPER_W(pmaxsw, FMAXSW) =20 -SSE_HELPER_Q(pand, FAND) SSE_HELPER_Q(pandn, FANDN) SSE_HELPER_Q(por, FOR) SSE_HELPER_Q(pxor, FXOR) diff --git a/target/i386/translate.c b/target/i386/translate.c index d576b3345c..3821733a4e 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -23,6 +23,7 @@ #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg-op.h" +#include "tcg-op-gvec.h" #include "exec/cpu_ldst.h" #include "exec/translator.h" =20 @@ -2723,6 +2724,7 @@ typedef void (*SSEFunc_0_eppt)(TCGv_ptr env, TCGv_ptr= reg_a, TCGv_ptr reg_b, =20 #define SSE_SPECIAL ((void *)1) #define SSE_DUMMY ((void *)2) +#define SSE_TOMBSTONE ((void *)3) =20 #define MMX_OP2(x) { gen_helper_ ## x ## _mmx, gen_helper_ ## x ## _xmm } #define SSE_FOP(x) { gen_helper_ ## x ## ps, gen_helper_ ## x ## pd, \ @@ -2754,7 +2756,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0x51] =3D SSE_FOP(sqrt), [0x52] =3D { gen_helper_rsqrtps, NULL, gen_helper_rsqrtss, NULL }, [0x53] =3D { gen_helper_rcpps, NULL, gen_helper_rcpss, NULL }, - [0x54] =3D { gen_helper_pand_xmm, gen_helper_pand_xmm }, /* andps, and= pd */ + [0x54] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* andps, andpd */ [0x55] =3D { gen_helper_pandn_xmm, gen_helper_pandn_xmm }, /* andnps, = andnpd */ [0x56] =3D { gen_helper_por_xmm, gen_helper_por_xmm }, /* orps, orpd */ [0x57] =3D { gen_helper_pxor_xmm, gen_helper_pxor_xmm }, /* xorps, xor= pd */ @@ -2823,7 +2825,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xd8] =3D MMX_OP2(psubusb), [0xd9] =3D MMX_OP2(psubusw), [0xda] =3D MMX_OP2(pminub), - [0xdb] =3D MMX_OP2(pand), + [0xdb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdc] =3D MMX_OP2(paddusb), [0xdd] =3D MMX_OP2(paddusw), [0xde] =3D MMX_OP2(pmaxub), @@ -3164,6 +3166,17 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, gen_ld_modrm_VxHxWx, \ gen_gvec_2_fp, (opctl)) =20 +#define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) +#define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) +#define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) +#define gen_vpand_ymm(env, s, modrm) gen_gvec_ld_modrm_vymm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) +#define gen_andps_xmm gen_pand_xmm +#define gen_vandps_xmm gen_vpand_xmm +#define gen_vandps_ymm gen_vpand_ymm +#define gen_andpd_xmm gen_pand_xmm +#define gen_vandpd_xmm gen_vpand_xmm +#define gen_vandpd_ymm gen_vpand_ymm + static void gen_sse(CPUX86State *env, DisasContext *s, int b) { int b1, op1_offset, op2_offset, is_xmm, val; @@ -3238,6 +3251,38 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) reg |=3D REX_R(s); } mod =3D (modrm >> 6) & 3; + + enum { + M_0F =3D 0x01 << 8, + M_0F38 =3D 0x02 << 8, + M_0F3A =3D 0x04 << 8, + P_66 =3D 0x08 << 8, + P_F3 =3D 0x10 << 8, + P_F2 =3D 0x20 << 8, + VEX_128 =3D 0x40 << 8, + VEX_256 =3D 0x80 << 8, + }; + + switch(b | M_0F + | (s->prefix & PREFIX_DATA ? P_66 : 0) + | (s->prefix & PREFIX_REPZ ? P_F3 : 0) + | (s->prefix & PREFIX_REPNZ ? P_F2 : 0) + | (s->prefix & PREFIX_VEX ? (s->vex_l ? VEX_256 : VEX_128) : 0)= ) { + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; + case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; + case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); retur= n; + case 0xdb | M_0F | P_66 | VEX_256: gen_vpand_ymm(env, s, modrm); retur= n; + case 0x54 | M_0F: gen_andps_xmm(env, s, modrm); retur= n; + case 0x54 | M_0F | VEX_128: gen_vandps_xmm(env, s, modrm); retu= rn; + case 0x54 | M_0F | VEX_256: gen_vandps_ymm(env, s, modrm); retu= rn; + case 0x54 | M_0F | P_66: gen_andpd_xmm(env, s, modrm); retur= n; + case 0x54 | M_0F | P_66 | VEX_128: gen_vandpd_xmm(env, s, modrm); retu= rn; + case 0x54 | M_0F | P_66 | VEX_256: gen_vandpd_ymm(env, s, modrm); retu= rn; + default: break; + } + + assert(sse_fn_epp !=3D SSE_TOMBSTONE); + if (sse_fn_epp =3D=3D SSE_SPECIAL) { b |=3D (b1 << 8); switch(b) { --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596217; cv=none; d=zoho.com; s=zohoarc; b=cz75ZfSqzyZxHAWpCdnfLb6fZt2lrKt4xTwnEJggUrLmRtMBeUuckaAD32ehxYv+6BQDBFvmIMn06fCNgGZrLCBBAgNy5stBGnEe/avWaPy2rrLqaXnoTgGyuq6L8Seqk6fOMfkMYyL8nb8cvuvA/vNVpFA1hLpIy8OfwN20imI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596217; 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:ARC-Authentication-Results; bh=BTjCiZ+/q0ebvBZ9ZPiURBBWKzSYrYsZVU8BkSr9mlc=; b=TIOXsz0eMow1KJrPVOw9xe0q7BNcFjZDgVWBbkzDbh8KbDHpQyZ3MzMDClmOxiBdTyU+rMV3jSjBTWYixW89X6X+EqzRVtkPBmbjRY44bpeCHx75zlYO8TeUIRvLHsQhMz04IvIIcPiYMUNws4SuAnG5mAvSJPSoRqBZNilCYA4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596217538716.6660568916413; Wed, 31 Jul 2019 11:03:37 -0700 (PDT) Received: from localhost ([::1]:43424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsswq-0005Q8-Jl for importer@patchew.org; Wed, 31 Jul 2019 14:03:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42754) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrE-0002DQ-IH for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrD-0002n1-8p for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:48 -0400 Received: from mail-yb1-xb41.google.com ([2607:f8b0:4864:20::b41]:37570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrD-0002ln-48 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:47 -0400 Received: by mail-yb1-xb41.google.com with SMTP id i1so17409931ybo.4 for ; Wed, 31 Jul 2019 10:57:47 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.45 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BTjCiZ+/q0ebvBZ9ZPiURBBWKzSYrYsZVU8BkSr9mlc=; b=E4Mn1Z9ZnifLm7HexQR82elARjWBp2hAqvyAxVNhWSMbM6O4x9/uVuQFWHB9/cGqSg n0i7Z37lLXyOUsqUZV22+iPZ+nDXUfWDkmEKu7VYTSeO2gysdUjcND90osQxt/EK/vIK WojaPIoEqvLIlsppLF8WpH6ELycBnTYEAzXyIlPei6vXrPmNDIWxcS+XLiAyZmQhrhUk n+2fuCbYdwivwih7xb36hsQ9ennmfe05F2jM27BcbEE8bRGEzMkcqsnjZ5JrOGiqPaxc sJR3LUfcBqm4JaZpBcMyEmcJKqHYK0lE6q8fAUZiee/0JOAu2FrbCxUZQmB2xxxl3saZ JenQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BTjCiZ+/q0ebvBZ9ZPiURBBWKzSYrYsZVU8BkSr9mlc=; b=DQCKcMqkm++xO27iMEKl9ctO44skXepuPn5Tj0+7fORw1IMyUcZLkWuLEww6283FaC XrPfX0lM+Tcs6JAzOoh69aSmTRM9+g8C0z5aHpAr9xYGNzYL5Blgv/fuzsKcWRyUZ6Sp VhC0pzcxIdK530ycb/kPXA+KGuyiKY1y1f54IN9/1OPsWHbidPI/gaQDDcNuuAREntYT 6GH2XKZoPxT17iDAJ3kWjcFWl0hFj4uV8GSwGgWoDDVGTm2P9ifKV1yBfnzTIASp64jt MTUV7Dw+ybavpovHG9gb2qpKmzLdSXrtX4xxi4bkT8tTvwgVzx2VuRX5aRBapH7jPYaa qXvw== X-Gm-Message-State: APjAAAVn+LXXr+LLsK6GU+dtgbJlvlTW1buXiHaO1rJ+5XQYFw/jfiXK boAfvLi84WOM8/+yvlVJXFRIwaku X-Google-Smtp-Source: APXvYqyrp6O+WFpQDg30ET7y7mlacjPA1PRBIIFlYavR8dbBK4Y4RW9qP/Z+31iGwGdIVzC+4PUGOw== X-Received: by 2002:a25:3b56:: with SMTP id i83mr9131321yba.39.1564595866403; Wed, 31 Jul 2019 10:57:46 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:49 -0400 Message-Id: <20190731175702.4916-10-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b41 Subject: [Qemu-devel] [RFC PATCH v1 09/22] target/i386: reimplement (V)POR, (V)ORPS, (V)ORPD 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 2 -- target/i386/ops_sse_header.h | 1 - target/i386/translate.c | 27 +++++++++++++++++++++++++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index b3ba23287d..8b4ac9115e 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -354,7 +354,6 @@ static inline int satsw(int x) #define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) =20 #define FANDN(a, b) ((~(a)) & (b)) -#define FOR(a, b) ((a) | (b)) #define FXOR(a, b) ((a) ^ (b)) =20 #define FCMPGTB(a, b) ((int8_t)(a) > (int8_t)(b) ? -1 : 0) @@ -397,7 +396,6 @@ SSE_HELPER_W(helper_pminsw, FMINSW) SSE_HELPER_W(helper_pmaxsw, FMAXSW) =20 SSE_HELPER_Q(helper_pandn, FANDN) -SSE_HELPER_Q(helper_por, FOR) SSE_HELPER_Q(helper_pxor, FXOR) =20 SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 63b4376389..6a732ee489 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -87,7 +87,6 @@ SSE_HELPER_W(pminsw, FMINSW) SSE_HELPER_W(pmaxsw, FMAXSW) =20 SSE_HELPER_Q(pandn, FANDN) -SSE_HELPER_Q(por, FOR) SSE_HELPER_Q(pxor, FXOR) =20 SSE_HELPER_B(pcmpgtb, FCMPGTB) diff --git a/target/i386/translate.c b/target/i386/translate.c index 3821733a4e..28cd84432d 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2758,7 +2758,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0x53] =3D { gen_helper_rcpps, NULL, gen_helper_rcpss, NULL }, [0x54] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* andps, andpd */ [0x55] =3D { gen_helper_pandn_xmm, gen_helper_pandn_xmm }, /* andnps, = andnpd */ - [0x56] =3D { gen_helper_por_xmm, gen_helper_por_xmm }, /* orps, orpd */ + [0x56] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* orps, orpd */ [0x57] =3D { gen_helper_pxor_xmm, gen_helper_pxor_xmm }, /* xorps, xor= pd */ [0x58] =3D SSE_FOP(add), [0x59] =3D SSE_FOP(mul), @@ -2841,7 +2841,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xe8] =3D MMX_OP2(psubsb), [0xe9] =3D MMX_OP2(psubsw), [0xea] =3D MMX_OP2(pminsw), - [0xeb] =3D MMX_OP2(por), + [0xeb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xec] =3D MMX_OP2(paddsb), [0xed] =3D MMX_OP2(paddsw), [0xee] =3D MMX_OP2(pmaxsw), @@ -3177,6 +3177,17 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vandpd_xmm gen_vpand_xmm #define gen_vandpd_ymm gen_vpand_ymm =20 +#define gen_por_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (mo= drm), MO_64, tcg_gen_gvec_or, 0112) +#define gen_por_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (mo= drm), MO_64, tcg_gen_gvec_or, 0112) +#define gen_vpor_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (mo= drm), MO_64, tcg_gen_gvec_or, 0123) +#define gen_vpor_ymm(env, s, modrm) gen_gvec_ld_modrm_vymm((env), (s), (mo= drm), MO_64, tcg_gen_gvec_or, 0123) +#define gen_orps_xmm gen_por_xmm +#define gen_vorps_xmm gen_vpor_xmm +#define gen_vorps_ymm gen_vpor_ymm +#define gen_orpd_xmm gen_por_xmm +#define gen_vorpd_xmm gen_vpor_xmm +#define gen_vorpd_ymm gen_vpor_ymm + static void gen_sse(CPUX86State *env, DisasContext *s, int b) { int b1, op1_offset, op2_offset, is_xmm, val; @@ -3278,6 +3289,18 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0x54 | M_0F | P_66: gen_andpd_xmm(env, s, modrm); retur= n; case 0x54 | M_0F | P_66 | VEX_128: gen_vandpd_xmm(env, s, modrm); retu= rn; case 0x54 | M_0F | P_66 | VEX_256: gen_vandpd_ymm(env, s, modrm); retu= rn; + + case 0xeb | M_0F: gen_por_mm(env, s, modrm); return; + case 0xeb | M_0F | P_66: gen_por_xmm(env, s, modrm); return; + case 0xeb | M_0F | P_66 | VEX_128: gen_vpor_xmm(env, s, modrm); return; + case 0xeb | M_0F | P_66 | VEX_256: gen_vpor_ymm(env, s, modrm); return; + case 0x56 | M_0F: gen_orps_xmm(env, s, modrm); return; + case 0x56 | M_0F | VEX_128: gen_vorps_xmm(env, s, modrm); retur= n; + case 0x56 | M_0F | VEX_256: gen_vorps_ymm(env, s, modrm); retur= n; + case 0x56 | M_0F | P_66: gen_orpd_xmm(env, s, modrm); return; + case 0x56 | M_0F | P_66 | VEX_128: gen_vorpd_xmm(env, s, modrm); retur= n; + case 0x56 | M_0F | P_66 | VEX_256: gen_vorpd_ymm(env, s, modrm); retur= n; + default: break; } =20 --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596153; cv=none; d=zoho.com; s=zohoarc; b=oIa6YvaHcVbSEernERG+UDCsgkIcWpyXyFl8SMrwzOG1pYF3yjbueQMjyOcvdw68PXS7RWcljEdwaL3yjZtqDMknHCNsbNKdpTDA9Dh4v5Nr0FmdJ0RnP3aeJuUVaC31OoTlRGhwDTrb/RwSCnDmMaFZCcjlpFgiCAG5RPrlxsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596153; 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:ARC-Authentication-Results; bh=ecO/M3gLvEyQeFxd5TUkSAfubfu0V6F9TjGpO7Vv5Qk=; b=GRT1yKBopANmbbqs4OFlqGj1yZIY9IvXSminMntaKiYgxhx4vszYvXquZ4FO5JdCkHgvlcv6b95ejtnuiOdRJOX0oA46/JsPfpFddCn7v2jrtqy/poMnhnNqnAJiZenIZnl5ooVvfq4+xlpdMPjoXpNi14S5xaLn3rZp3BMve98= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596153382283.5773315971725; Wed, 31 Jul 2019 11:02:33 -0700 (PDT) Received: from localhost ([::1]:43406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssvo-0003FS-D4 for importer@patchew.org; Wed, 31 Jul 2019 14:02:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42773) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrF-0002FF-6w for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrE-0002nx-0z for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:49 -0400 Received: from mail-yb1-xb41.google.com ([2607:f8b0:4864:20::b41]:45781) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrD-0002nc-Sj for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:47 -0400 Received: by mail-yb1-xb41.google.com with SMTP id s41so2569800ybe.12 for ; Wed, 31 Jul 2019 10:57:47 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ecO/M3gLvEyQeFxd5TUkSAfubfu0V6F9TjGpO7Vv5Qk=; b=XhSCtG76twJN6GejJTLQcqo9JSNGGSrUAVj+RS5LYvVEjneSG/ZPuBlgFK/jKsxtM2 vL14vxGi6Y/+dln6ffPbxosbNJ/l40RQ4f4WppOm4TwyjDYzWma07Wa8+4+oM+HV/vw+ N8Ttz/nzB2SkzG/gJHRGdMpAvYxqohevHmh4klR9ELOjMY97YL3AbdYIOr4D1/NaFncE CUivNIu4MOtb5e3/zktEKEGADH8kmop6lPxv19vrJq/Vp37CygIEqgEtaCqF5jK29/4s xLdw4GW19jV1XJi6LEBuIXWGv1x/l/svTj1IxTlglh2kmaIl40Hj+0TXXPL+PwL6CRe6 dnkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ecO/M3gLvEyQeFxd5TUkSAfubfu0V6F9TjGpO7Vv5Qk=; b=N6+b+hyTYs+0SN0Q96gx6pyGVEXNM2UekgLmQ4WUXhVoxPGRA2fQTrAWnuIHr6iJe8 5/PRCL9nVdpKJeICKe7JFaLN7CjcIEOxAgGGuavgqmPjBlCfFwHSuHOC2exyZB/Ibg1z xB9JTXGOWJgodqVZg4bvo4Bw3v+bv/DpRZuzDY5yliS4nJX4izCXat5DpQAtp2TcUMR/ 7CLsR6lfxVIkld0JW6O50uCFgBXE/LwdPuL/ak6bWYcilk+4zcKoVmRpXRlq6TRZohne WUvx78rZTDxzhAU2HvHVFygclWiwcVEdsbEiaYXGBka7H4/Evnm3MBeatjVMbluJybbZ Kb+Q== X-Gm-Message-State: APjAAAWRJqmJQE6to+6OWXNRKAlgO1IaSogXQHlgfQdP26iMe7ZiyqHL JHnwOcjUXzx1/6IYdVuPzFb1lj3e X-Google-Smtp-Source: APXvYqz6eOq+UTlRakWlYarhoPZzub+PaQuLOE9vSLFAEDr0bZ9FdMt1gQQt/JZ0MNU/4+Iuzi7yAQ== X-Received: by 2002:a25:bd0f:: with SMTP id f15mr79210758ybk.151.1564595867174; Wed, 31 Jul 2019 10:57:47 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:50 -0400 Message-Id: <20190731175702.4916-11-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b41 Subject: [Qemu-devel] [RFC PATCH v1 10/22] target/i386: reimplement (V)PXOR, (V)XORPS, (V)XORPD 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 2 -- target/i386/ops_sse_header.h | 1 - target/i386/translate.c | 26 ++++++++++++++++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 8b4ac9115e..68dbeda047 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -354,7 +354,6 @@ static inline int satsw(int x) #define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) =20 #define FANDN(a, b) ((~(a)) & (b)) -#define FXOR(a, b) ((a) ^ (b)) =20 #define FCMPGTB(a, b) ((int8_t)(a) > (int8_t)(b) ? -1 : 0) #define FCMPGTW(a, b) ((int16_t)(a) > (int16_t)(b) ? -1 : 0) @@ -396,7 +395,6 @@ SSE_HELPER_W(helper_pminsw, FMINSW) SSE_HELPER_W(helper_pmaxsw, FMAXSW) =20 SSE_HELPER_Q(helper_pandn, FANDN) -SSE_HELPER_Q(helper_pxor, FXOR) =20 SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) SSE_HELPER_W(helper_pcmpgtw, FCMPGTW) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 6a732ee489..a98b9f8f3f 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -87,7 +87,6 @@ SSE_HELPER_W(pminsw, FMINSW) SSE_HELPER_W(pmaxsw, FMAXSW) =20 SSE_HELPER_Q(pandn, FANDN) -SSE_HELPER_Q(pxor, FXOR) =20 SSE_HELPER_B(pcmpgtb, FCMPGTB) SSE_HELPER_W(pcmpgtw, FCMPGTW) diff --git a/target/i386/translate.c b/target/i386/translate.c index 28cd84432d..cfe285e3e5 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2759,7 +2759,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0x54] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* andps, andpd */ [0x55] =3D { gen_helper_pandn_xmm, gen_helper_pandn_xmm }, /* andnps, = andnpd */ [0x56] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* orps, orpd */ - [0x57] =3D { gen_helper_pxor_xmm, gen_helper_pxor_xmm }, /* xorps, xor= pd */ + [0x57] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* xorps, xorpd */ [0x58] =3D SSE_FOP(add), [0x59] =3D SSE_FOP(mul), [0x5a] =3D { gen_helper_cvtps2pd, gen_helper_cvtpd2ps, @@ -2845,7 +2845,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xec] =3D MMX_OP2(paddsb), [0xed] =3D MMX_OP2(paddsw), [0xee] =3D MMX_OP2(pmaxsw), - [0xef] =3D MMX_OP2(pxor), + [0xef] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xf0] =3D { NULL, NULL, NULL, SSE_SPECIAL }, /* lddqu */ [0xf1] =3D MMX_OP2(psllw), [0xf2] =3D MMX_OP2(pslld), @@ -3188,6 +3188,17 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vorpd_xmm gen_vpor_xmm #define gen_vorpd_ymm gen_vpor_ymm =20 +#define gen_pxor_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_xor, 0112) +#define gen_pxor_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_xor, 0112) +#define gen_vpxor_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_xor, 0123) +#define gen_vpxor_ymm(env, s, modrm) gen_gvec_ld_modrm_vymm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_xor, 0123) +#define gen_xorps_xmm gen_pxor_xmm +#define gen_vxorps_xmm gen_vpxor_xmm +#define gen_vxorps_ymm gen_vpxor_ymm +#define gen_xorpd_xmm gen_pxor_xmm +#define gen_vxorpd_xmm gen_vpxor_xmm +#define gen_vxorpd_ymm gen_vpxor_ymm + static void gen_sse(CPUX86State *env, DisasContext *s, int b) { int b1, op1_offset, op2_offset, is_xmm, val; @@ -3301,6 +3312,17 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0x56 | M_0F | P_66 | VEX_128: gen_vorpd_xmm(env, s, modrm); retur= n; case 0x56 | M_0F | P_66 | VEX_256: gen_vorpd_ymm(env, s, modrm); retur= n; =20 + case 0xef | M_0F: gen_pxor_mm(env, s, modrm); return; + case 0xef | M_0F | P_66: gen_pxor_xmm(env, s, modrm); return; + case 0xef | M_0F | P_66 | VEX_128: gen_vpxor_xmm(env, s, modrm); retur= n; + case 0xef | M_0F | P_66 | VEX_256: gen_vpxor_ymm(env, s, modrm); retur= n; + case 0x57 | M_0F: gen_xorps_xmm(env, s, modrm); retur= n; + case 0x57 | M_0F | VEX_128: gen_vxorps_xmm(env, s, modrm); retu= rn; + case 0x57 | M_0F | VEX_256: gen_vxorps_ymm(env, s, modrm); retu= rn; + case 0x57 | M_0F | P_66: gen_xorpd_xmm(env, s, modrm); retur= n; + case 0x57 | M_0F | P_66 | VEX_128: gen_vxorpd_xmm(env, s, modrm); retu= rn; + case 0x57 | M_0F | P_66 | VEX_256: gen_vxorpd_ymm(env, s, modrm); retu= rn; + default: break; } =20 --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596131; cv=none; d=zoho.com; s=zohoarc; b=X9zUucUZnDSpaCekj5IvfnRvTimjXBz6IdiFrLoIqskS/N1VDMTotqaFTpX+nO612O9NScbG6mjPxjEIVrXtHLQuK5uYYXBMpsqWvZtnEcyuZxYHoqFKHIPXp5pLfYZ4b/RbqJBus0yt48f4rJa4dyS2rpMhh5m7hEHo97RWhmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596131; 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:ARC-Authentication-Results; bh=1ZMG70QtK9GLeaErFuDoQBPgLSJCesIXqA/tYDobWRA=; b=eRzDh/GKGj4k6M9ioXyYzztl/Y+3fDmAMk7d5/XxxkWtmshXBaspSVeJbUHCABSX4yd9uvM3D6GgEc2x1gQ9FfXRpX/HM1a1ZQ6fu2dnmYhOs7vQN87fuhslrv0Z3WkYFdEt3C6w0L+1TssbaXFI6Dmt3ADt6oI/FeR4f/JOqfE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596131933138.32148087961616; Wed, 31 Jul 2019 11:02:11 -0700 (PDT) Received: from localhost ([::1]:43398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssvK-0002LK-HT for importer@patchew.org; Wed, 31 Jul 2019 14:02:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42787) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrF-0002Gu-OW for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrE-0002oy-EP for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:49 -0400 Received: from mail-yb1-xb42.google.com ([2607:f8b0:4864:20::b42]:43843) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrE-0002o5-9W for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:48 -0400 Received: by mail-yb1-xb42.google.com with SMTP id y123so21711716yby.10 for ; Wed, 31 Jul 2019 10:57:48 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1ZMG70QtK9GLeaErFuDoQBPgLSJCesIXqA/tYDobWRA=; b=Do4vEYQniXhgsHXc4ZMrA4zVV/kJf5CsQSVIEbvjhqXDcPO2mc73F4/33XGTZ99fAM coTmYWHcZb3Jj+uvE20Vw3/BMBuJG/IqoVwDvfVVRUWUelXEc8E2KfrlfwpEXmEqkbcL kDQ/+YRncDIZwiO7XZfp5zBb0vM6C4pTXQFd5UJNHOBF90/FDFVIiIw5Mfls2EpDCXwj L1mLabX611Ue/Fs7OPS9n664p0tT0aHfXzK59egju5ZfZomRw+MfrnnneZvVLvbCxEyk jxNjdbvWRxJQDmbY3Hv7xOlbNwtL3cMNK9ZPh44WUYnm9ltaNgA4bBYG1Li4fLo0hxUi FNDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ZMG70QtK9GLeaErFuDoQBPgLSJCesIXqA/tYDobWRA=; b=MoThi1S0yz+2+7Ak5BsGcdXOfiouzPOWxz/6UJW8s87LqGNWnevHn9VUTtDcVDoQrf 9yp8QhH0kc0DoGPCV7KmP/WQphzPidmEF3/PaiEu/6aelBQoYDm0i29FlP70QebncvOM rAP5X5h8+gWOvFDbyZquHNU9hwXo4pUS6EBuxRiIeraIg/5GhkkLPJsx50diBcnSogPv 1qCPITPKIPpZY8XtSCwZpRIdkMe81Iok6a38J+qswC2ze65Uula1etK7xpdVlBxEo6rw ApHbWgVmgf0PnJ2I6s5MDvUzFTnwEuQq5FRxfQsF7O95wAKMdKQYJL/fngiyblue8h3J zWjw== X-Gm-Message-State: APjAAAWRFi+k16wQm/wPtT5xCawcu+hCYUyjlz/fgd2e/ByrobdxvpL5 CkzlrLqP7RD84GrdZntrhjiLJh3r X-Google-Smtp-Source: APXvYqwUtToOSEgj3bOyUPF1cR/TiZs2oIrrgSARYQyB7UkyhlALL67ZWmf8mwgniAj5jesRLg6X2A== X-Received: by 2002:a25:d391:: with SMTP id e139mr70865666ybf.331.1564595867647; Wed, 31 Jul 2019 10:57:47 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:51 -0400 Message-Id: <20190731175702.4916-12-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b42 Subject: [Qemu-devel] [RFC PATCH v1 11/22] target/i386: reimplement (V)PANDN, (V)ANDNPS, (V)ANDNPD 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 4 ---- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 26 ++++++++++++++++++++++++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 68dbeda047..84562a4536 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -353,8 +353,6 @@ static inline int satsw(int x) #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) #define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) =20 -#define FANDN(a, b) ((~(a)) & (b)) - #define FCMPGTB(a, b) ((int8_t)(a) > (int8_t)(b) ? -1 : 0) #define FCMPGTW(a, b) ((int16_t)(a) > (int16_t)(b) ? -1 : 0) #define FCMPGTL(a, b) ((int32_t)(a) > (int32_t)(b) ? -1 : 0) @@ -394,8 +392,6 @@ SSE_HELPER_B(helper_pmaxub, FMAXUB) SSE_HELPER_W(helper_pminsw, FMINSW) SSE_HELPER_W(helper_pmaxsw, FMAXSW) =20 -SSE_HELPER_Q(helper_pandn, FANDN) - SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) SSE_HELPER_W(helper_pcmpgtw, FCMPGTW) SSE_HELPER_L(helper_pcmpgtl, FCMPGTL) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index a98b9f8f3f..abd00ca69d 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -86,8 +86,6 @@ SSE_HELPER_B(pmaxub, FMAXUB) SSE_HELPER_W(pminsw, FMINSW) SSE_HELPER_W(pmaxsw, FMAXSW) =20 -SSE_HELPER_Q(pandn, FANDN) - SSE_HELPER_B(pcmpgtb, FCMPGTB) SSE_HELPER_W(pcmpgtw, FCMPGTW) SSE_HELPER_L(pcmpgtl, FCMPGTL) diff --git a/target/i386/translate.c b/target/i386/translate.c index cfe285e3e5..69e9514679 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2757,7 +2757,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0x52] =3D { gen_helper_rsqrtps, NULL, gen_helper_rsqrtss, NULL }, [0x53] =3D { gen_helper_rcpps, NULL, gen_helper_rcpss, NULL }, [0x54] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* andps, andpd */ - [0x55] =3D { gen_helper_pandn_xmm, gen_helper_pandn_xmm }, /* andnps, = andnpd */ + [0x55] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* andnps, andnpd */ [0x56] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* orps, orpd */ [0x57] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, /* xorps, xorpd */ [0x58] =3D SSE_FOP(add), @@ -2829,7 +2829,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xdc] =3D MMX_OP2(paddusb), [0xdd] =3D MMX_OP2(paddusw), [0xde] =3D MMX_OP2(pmaxub), - [0xdf] =3D MMX_OP2(pandn), + [0xdf] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xe0] =3D MMX_OP2(pavgb), [0xe1] =3D MMX_OP2(psraw), [0xe2] =3D MMX_OP2(psrad), @@ -3177,6 +3177,17 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vandpd_xmm gen_vpand_xmm #define gen_vandpd_ymm gen_vpand_ymm =20 +#define gen_pandn_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (= modrm), MO_64, tcg_gen_gvec_andc, 0121) +#define gen_pandn_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (= modrm), MO_64, tcg_gen_gvec_andc, 0121) +#define gen_vpandn_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (= modrm), MO_64, tcg_gen_gvec_andc, 0132) +#define gen_vpandn_ymm(env, s, modrm) gen_gvec_ld_modrm_vymm((env), (s), (= modrm), MO_64, tcg_gen_gvec_andc, 0132) +#define gen_andnps_xmm gen_pandn_xmm +#define gen_vandnps_xmm gen_vpandn_xmm +#define gen_vandnps_ymm gen_vpandn_ymm +#define gen_andnpd_xmm gen_pandn_xmm +#define gen_vandnpd_xmm gen_vpandn_xmm +#define gen_vandnpd_ymm gen_vpandn_ymm + #define gen_por_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (mo= drm), MO_64, tcg_gen_gvec_or, 0112) #define gen_por_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (mo= drm), MO_64, tcg_gen_gvec_or, 0112) #define gen_vpor_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (mo= drm), MO_64, tcg_gen_gvec_or, 0123) @@ -3301,6 +3312,17 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0x54 | M_0F | P_66 | VEX_128: gen_vandpd_xmm(env, s, modrm); retu= rn; case 0x54 | M_0F | P_66 | VEX_256: gen_vandpd_ymm(env, s, modrm); retu= rn; =20 + case 0xdf | M_0F: gen_pandn_mm(env, s, modrm); return; + case 0xdf | M_0F | P_66: gen_pandn_xmm(env, s, modrm); retur= n; + case 0xdf | M_0F | P_66 | VEX_128: gen_vpandn_xmm(env, s, modrm); retu= rn; + case 0xdf | M_0F | P_66 | VEX_256: gen_vpandn_ymm(env, s, modrm); retu= rn; + case 0x55 | M_0F: gen_andnps_xmm(env, s, modrm); retu= rn; + case 0x55 | M_0F | VEX_128: gen_vandnps_xmm(env, s, modrm); ret= urn; + case 0x55 | M_0F | VEX_256: gen_vandnps_ymm(env, s, modrm); ret= urn; + case 0x55 | M_0F | P_66: gen_andnpd_xmm(env, s, modrm); retu= rn; + case 0x55 | M_0F | P_66 | VEX_128: gen_vandnpd_xmm(env, s, modrm); ret= urn; + case 0x55 | M_0F | P_66 | VEX_256: gen_vandnpd_ymm(env, s, modrm); ret= urn; + case 0xeb | M_0F: gen_por_mm(env, s, modrm); return; case 0xeb | M_0F | P_66: gen_por_xmm(env, s, modrm); return; case 0xeb | M_0F | P_66 | VEX_128: gen_vpor_xmm(env, s, modrm); return; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596251; cv=none; d=zoho.com; s=zohoarc; b=Deeuik/TwT0Xfp2WUBAguOUMpiI86wodj+9PnVTdLoNyXCaEOKi7B/YvGBSQzt3IEJMRy4qRQ0KTl2vT5Ei9rQbWPTMtlLEg0iWO3FYOtKsZljSdwQr9sy75ORuAME57slPFeHs4fCjhMY1CJE/tuzeslJClRD8fDxyZxnWeY1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596251; 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:ARC-Authentication-Results; bh=bcxzzQU+Os6mByThQeAgYZj1muTdUxSMU3AVuLL5+B0=; b=jMqKMI5FXmLHOS3FINGXfzW8fZZOfdjF7vjmePk7cJoDaqG7/nr7DXXKVS/eVil/iFCxsQewzNWa1IyK4vBfjSdFoFns0hUVtIompI1OinHw1OvX09ymEwmZVm8ZHOt0zJh4Ho1i1uqItNRU1rEt80KI3WgUMdbpQvv2YxP4ad4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596251285240.49239823547066; Wed, 31 Jul 2019 11:04:11 -0700 (PDT) Received: from localhost ([::1]:43430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssxO-0006ec-CZ for importer@patchew.org; Wed, 31 Jul 2019 14:04:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42814) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrG-0002Jo-MM for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrF-0002pm-Cl for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:50 -0400 Received: from mail-yb1-xb43.google.com ([2607:f8b0:4864:20::b43]:33616) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrF-0002pZ-8w for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:49 -0400 Received: by mail-yb1-xb43.google.com with SMTP id c202so23398428ybf.0 for ; Wed, 31 Jul 2019 10:57:49 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bcxzzQU+Os6mByThQeAgYZj1muTdUxSMU3AVuLL5+B0=; b=StW6f8DQdul/jG6usq7Ywo9EX1RAH0H9e26kALvJqh/XQGn+YKkyjHcWgtPsmLGuC/ SMADZo/9fq7Oql4C+1wrr2DbYLYs4lC5RCoDI6j4obItFutk3zXR+j18V/HBXuQWgaSr YQ8jHOTQGFZ2LaSeeniCz73Syr3TFfgSYakK4cP4Mm1F2xCBT6LkCrq5o2OOY1zbDKk+ cw6G2k+P62P75Vi1SiM4Svz437J1fOMzoCoXVgoR9AIBQaBiUnpXFeZvX9IUqP6Ka1kD PoToM9dX52q1pJNnkFQJclO4URIlhIklPEGYFkiopnf17e0m1f8kytzphGX81KJg6GAP p5Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bcxzzQU+Os6mByThQeAgYZj1muTdUxSMU3AVuLL5+B0=; b=fzESyhswolFqTJbDraSyPVRzV/FLIq9qUSbT4Ltw8FTiQB0aOklG9b1IOy8Yfzms4P nKY+irXS9O3JiWT5AySYqnBw86KbO8CIaSU/T44LUfcrg4Psfp9VmAPvSKzj5DI2cNiW I/HPOVUhu9m6eHSeCybQuLwbK7/+qvxz7RcxUMYaqwBj/FtsQ40lh/A7Yd+sL5tw1Bys XStVSEeN+vcsUVa+bh5mfG2KCmw0Lxchuw5oExIYEQn6obJuLaSGym2gMCuWQsy/QGts Q3KUC9LfYt5OKvRWZx4rrPgOdJjybSJ2h+Qj1gaUm7Ef5IYJwx3awavX1+rBTuBqODND nBKQ== X-Gm-Message-State: APjAAAVfhE2KIpjNV8D/1bfO+1+3S/UtJnSOv/PKzowHOsQdeYiYJMEj KDyznTm5nLwvh6QOxHTocGuQOYvI X-Google-Smtp-Source: APXvYqxAKVxjmu/8R4EwDeYdQpj/GUPt7NZ/iBhvLMiue/IyQDiln3brbt+ruFdO6XgNMF5v3gmgDw== X-Received: by 2002:a25:9a82:: with SMTP id s2mr63225962ybo.369.1564595868472; Wed, 31 Jul 2019 10:57:48 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:52 -0400 Message-Id: <20190731175702.4916-13-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b43 Subject: [Qemu-devel] [RFC PATCH v1 12/22] target/i386: reimplement (V)PADD(B, W, D, Q) 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 6 ------ target/i386/ops_sse_header.h | 5 ----- target/i386/translate.c | 33 +++++++++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 84562a4536..31a761a89a 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,7 +337,6 @@ static inline int satsw(int x) } } =20 -#define FADD(a, b) ((a) + (b)) #define FADDUB(a, b) satub((a) + (b)) #define FADDUW(a, b) satuw((a) + (b)) #define FADDSB(a, b) satsb((int8_t)(a) + (int8_t)(b)) @@ -366,11 +365,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif =20 -SSE_HELPER_B(helper_paddb, FADD) -SSE_HELPER_W(helper_paddw, FADD) -SSE_HELPER_L(helper_paddl, FADD) -SSE_HELPER_Q(helper_paddq, FADD) - SSE_HELPER_B(helper_psubb, FSUB) SSE_HELPER_W(helper_psubw, FSUB) SSE_HELPER_L(helper_psubl, FSUB) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index abd00ca69d..5c69ab91d4 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,11 +60,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) #define SSE_HELPER_Q(name, F)\ DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 -SSE_HELPER_B(paddb, FADD) -SSE_HELPER_W(paddw, FADD) -SSE_HELPER_L(paddl, FADD) -SSE_HELPER_Q(paddq, FADD) - SSE_HELPER_B(psubb, FSUB) SSE_HELPER_W(psubw, FSUB) SSE_HELPER_L(psubl, FSUB) diff --git a/target/i386/translate.c b/target/i386/translate.c index 69e9514679..1dbeb49066 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2818,7 +2818,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xd1] =3D MMX_OP2(psrlw), [0xd2] =3D MMX_OP2(psrld), [0xd3] =3D MMX_OP2(psrlq), - [0xd4] =3D MMX_OP2(paddq), + [0xd4] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xd5] =3D MMX_OP2(pmullw), [0xd6] =3D { NULL, SSE_SPECIAL, SSE_SPECIAL, SSE_SPECIAL }, [0xd7] =3D { SSE_SPECIAL, SSE_SPECIAL }, /* pmovmskb */ @@ -2859,9 +2859,9 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xf9] =3D MMX_OP2(psubw), [0xfa] =3D MMX_OP2(psubl), [0xfb] =3D MMX_OP2(psubq), - [0xfc] =3D MMX_OP2(paddb), - [0xfd] =3D MMX_OP2(paddw), - [0xfe] =3D MMX_OP2(paddl), + [0xfc] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xfd] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xfe] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, }; =20 static const SSEFunc_0_epp sse_op_table2[3 * 8][2] =3D { @@ -3166,6 +3166,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, gen_ld_modrm_VxHxWx, \ gen_gvec_2_fp, (opctl)) =20 +#define gen_padd_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0112) +#define gen_padd_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0112) +#define gen_vpadd_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0123) +#define gen_vpadd_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3301,6 +3306,26 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) | (s->prefix & PREFIX_REPZ ? P_F3 : 0) | (s->prefix & PREFIX_REPNZ ? P_F2 : 0) | (s->prefix & PREFIX_VEX ? (s->vex_l ? VEX_256 : VEX_128) : 0)= ) { + case 0xfc | M_0F: gen_padd_mm(env, s, modrm, MO_8); r= eturn; + case 0xfc | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_8); = return; + case 0xfc | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_8);= return; + case 0xfc | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_8);= return; + + case 0xfd | M_0F: gen_padd_mm(env, s, modrm, MO_16); = return; + case 0xfd | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_16);= return; + case 0xfd | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_16)= ; return; + case 0xfd | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_16)= ; return; + + case 0xfe | M_0F: gen_padd_mm(env, s, modrm, MO_32); = return; + case 0xfe | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_32);= return; + case 0xfe | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_32)= ; return; + case 0xfe | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_32)= ; return; + + case 0xd4 | M_0F: gen_padd_mm(env, s, modrm, MO_64); = return; + case 0xd4 | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_64);= return; + case 0xd4 | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_64)= ; return; + case 0xd4 | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_64)= ; return; + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); retur= n; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596348; cv=none; d=zoho.com; s=zohoarc; b=L4SmX99KjlUjQ0m7KE2Lbm7YNqcASab0baAo+iiMWhf/jPiu6hVeIbq/pv4CUzWs98OqTYh5qOVBGWppV9FqRcS1YugRq3UiNXYAqsk6S2ZpD5GpmcJLcFFWcJImGr+wVwSSbRwHNOEp6JCcHHG4J5PIrAa/ZzoCuIlIQoEIHps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596348; 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:ARC-Authentication-Results; bh=qOqDTxFtH/3YrZnFMnrtU1fae7f/i4Xpw9RfJj8CEIA=; b=ZZrEb1ua3RPUZey21AcjpNK20X6Swya3D+aqFQOjDKBSbZKc92lG3ynAkXR/tN7HhV9tDb01SNAVgKHdTCORu9Alh4OjOlpXI5wPXqXtOYheyCxQwOs7qVIPRHDXy7wxA50PQRDC3/PF3FxliZJ9B1ZdnLW4gsaVTMBrMhpV8IY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596348481162.5073872981485; Wed, 31 Jul 2019 11:05:48 -0700 (PDT) Received: from localhost ([::1]:43450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssyx-0000TV-95 for importer@patchew.org; Wed, 31 Jul 2019 14:05:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42832) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrH-0002Lr-A0 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrG-0002qd-0K for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:51 -0400 Received: from mail-yb1-xb44.google.com ([2607:f8b0:4864:20::b44]:46504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrF-0002pw-SG for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:49 -0400 Received: by mail-yb1-xb44.google.com with SMTP id a5so24731488ybo.13 for ; Wed, 31 Jul 2019 10:57:49 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qOqDTxFtH/3YrZnFMnrtU1fae7f/i4Xpw9RfJj8CEIA=; b=WjGwy4kbutEvop+EAKk57CutipLQ838mde8k+PywgdSwCT57rX8Kbf5oT9Ju4tbhfq RFfQhKMWVnJmb2vQ4Xs+FAX/0RS7G/2ey0rvU72ryEqUvJPOl1tkSp0fJ55RN1xZ/c/a uKKKtmzp+xFDx6XgtzUSLH5nqUbeekPCutN3I8h3oN77NQ0hn+2HnCIFbVBp/LiXUiZ/ EG0u69Z3ca6TYfBHEQaB00tPJmRtrFildamzVkjCZ14okvj6xil4wrQLY9Zrv+xEpBS3 ASmJPiqNhS41rPfuWqkge078TaYapBhpm9cDR8y+u8Yi5BEpfdagOxs6oc3nEjodqNmT S+kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qOqDTxFtH/3YrZnFMnrtU1fae7f/i4Xpw9RfJj8CEIA=; b=O9p4h1pc0hXz41JJ2OG5kWzS/8yQ4wrhVhaJC+eNU58N+g/BT4QOSj2N0j5nfnPow2 MF5rzRKHNtWk8CadjYovrHyKRVnf6LK+Y49vZ2yZQQGf3Ceo5y+BlZWvIvru0xp7GZZg bCtct0Nj1DTYMrd2StxKf8cWaF3mXlVtzKf1VxVhIpsEp5OqsX5c9IhdzTG24oYdI1Cf taZKWb4Y81CV5ciFBh2m6PY9CATa2CkPEsn9y76Y099BXVbDNf1tI2NEah9FC4XwMqCR xrKCO1UXA0F+FnLyUK+pYKpzKOSet6nzg3IIzABTBonEshWfzJ+q3PIz0Qm8kJyXoXwb qQgw== X-Gm-Message-State: APjAAAUR+YCNqokOY3PCcyXMDcOQPv3id/j9/3/5a9BW9xc2XWFzwnUc cn0m697Av8Nf2rh12glF91DKX0il X-Google-Smtp-Source: APXvYqzxokb+SycQz1t1yMYEg3fsCqPydDjNuNyxYCSDA5ElksCFT0MHJq50oqap7i6+FKWhuSHfag== X-Received: by 2002:a25:ba07:: with SMTP id t7mr16920323ybg.261.1564595869012; Wed, 31 Jul 2019 10:57:49 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:53 -0400 Message-Id: <20190731175702.4916-14-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b44 Subject: [Qemu-devel] [RFC PATCH v1 13/22] target/i386: reimplement (V)PSUB(B, W, D, Q) 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 6 ------ target/i386/ops_sse_header.h | 5 ----- target/i386/translate.c | 33 +++++++++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 31a761a89a..59935a65be 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -342,7 +342,6 @@ static inline int satsw(int x) #define FADDSB(a, b) satsb((int8_t)(a) + (int8_t)(b)) #define FADDSW(a, b) satsw((int16_t)(a) + (int16_t)(b)) =20 -#define FSUB(a, b) ((a) - (b)) #define FSUBUB(a, b) satub((a) - (b)) #define FSUBUW(a, b) satuw((a) - (b)) #define FSUBSB(a, b) satsb((int8_t)(a) - (int8_t)(b)) @@ -365,11 +364,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif =20 -SSE_HELPER_B(helper_psubb, FSUB) -SSE_HELPER_W(helper_psubw, FSUB) -SSE_HELPER_L(helper_psubl, FSUB) -SSE_HELPER_Q(helper_psubq, FSUB) - SSE_HELPER_B(helper_paddusb, FADDUB) SSE_HELPER_B(helper_paddsb, FADDSB) SSE_HELPER_B(helper_psubusb, FSUBUB) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 5c69ab91d4..bcdbac99a0 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,11 +60,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) #define SSE_HELPER_Q(name, F)\ DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 -SSE_HELPER_B(psubb, FSUB) -SSE_HELPER_W(psubw, FSUB) -SSE_HELPER_L(psubl, FSUB) -SSE_HELPER_Q(psubq, FSUB) - SSE_HELPER_B(paddusb, FADDUB) SSE_HELPER_B(paddsb, FADDSB) SSE_HELPER_B(psubusb, FSUBUB) diff --git a/target/i386/translate.c b/target/i386/translate.c index 1dbeb49066..6f4dfd06a1 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2855,10 +2855,10 @@ static const SSEFunc_0_epp sse_op_table1[256][4] = =3D { [0xf6] =3D MMX_OP2(psadbw), [0xf7] =3D { (SSEFunc_0_epp)gen_helper_maskmov_mmx, (SSEFunc_0_epp)gen_helper_maskmov_xmm }, /* XXX: casts */ - [0xf8] =3D MMX_OP2(psubb), - [0xf9] =3D MMX_OP2(psubw), - [0xfa] =3D MMX_OP2(psubl), - [0xfb] =3D MMX_OP2(psubq), + [0xf8] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xf9] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xfa] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xfb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xfc] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xfd] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xfe] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, @@ -3171,6 +3171,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpadd_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0123) #define gen_vpadd_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0123) =20 +#define gen_psub_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0112) +#define gen_psub_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0112) +#define gen_vpsub_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0123) +#define gen_vpsub_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3326,6 +3331,26 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xd4 | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_64)= ; return; case 0xd4 | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_64)= ; return; =20 + case 0xf8 | M_0F: gen_psub_mm(env, s, modrm, MO_8); r= eturn; + case 0xf8 | M_0F | P_66: gen_psub_xmm(env, s, modrm, MO_8); = return; + case 0xf8 | M_0F | P_66 | VEX_128: gen_vpsub_xmm(env, s, modrm, MO_8);= return; + case 0xf8 | M_0F | P_66 | VEX_256: gen_vpsub_ymm(env, s, modrm, MO_8);= return; + + case 0xf9 | M_0F: gen_psub_mm(env, s, modrm, MO_16); = return; + case 0xf9 | M_0F | P_66: gen_psub_xmm(env, s, modrm, MO_16);= return; + case 0xf9 | M_0F | P_66 | VEX_128: gen_vpsub_xmm(env, s, modrm, MO_16)= ; return; + case 0xf9 | M_0F | P_66 | VEX_256: gen_vpsub_ymm(env, s, modrm, MO_16)= ; return; + + case 0xfa | M_0F: gen_psub_mm(env, s, modrm, MO_32); = return; + case 0xfa | M_0F | P_66: gen_psub_xmm(env, s, modrm, MO_32);= return; + case 0xfa | M_0F | P_66 | VEX_128: gen_vpsub_xmm(env, s, modrm, MO_32)= ; return; + case 0xfa | M_0F | P_66 | VEX_256: gen_vpsub_ymm(env, s, modrm, MO_32)= ; return; + + case 0xfb | M_0F: gen_psub_mm(env, s, modrm, MO_64); = return; + case 0xfb | M_0F | P_66: gen_psub_xmm(env, s, modrm, MO_64);= return; + case 0xfb | M_0F | P_66 | VEX_128: gen_vpsub_xmm(env, s, modrm, MO_64)= ; return; + case 0xfb | M_0F | P_66 | VEX_256: gen_vpsub_ymm(env, s, modrm, MO_64)= ; return; + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); retur= n; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596135; cv=none; d=zoho.com; s=zohoarc; b=fZs4NvaqmUjijomKoEqqYSRPObzpqG/hFzQ2zdlSdotI/D4eBOqmt0CUpZZrsoyMhX8glnuF+mWxSc+E96zYBpn0GdBkSX8b83J45kzSa8/bWUGVqi0VctDzI7Y4lBux2MG1WKWqLOo02+5uHtryOMrebQWj1+hZkz/2G5Ia3fg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596135; 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:ARC-Authentication-Results; bh=LvfVVm1R1i5TWS3AOjieQ7QlUKuT8clHbsVMx2FutBg=; b=Z7RtZkfczQFK6LzblAWOnXlXqcioPS0fI9sudcYDiMgu+ucAAkZ/YxyeCiR3XocCsqcIw/YQG4wBrR1VsZcDJ0zD3XrtSYvsfnzqNmvNH04Fiw51K2s8IHOI9kAYVvUgCDhrSK4gVDNUozk/l5EM0k++ivbuRQozasLn8jiB1tE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596135046350.92135604268765; Wed, 31 Jul 2019 11:02:15 -0700 (PDT) Received: from localhost ([::1]:43400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssvW-0002Yt-0r for importer@patchew.org; Wed, 31 Jul 2019 14:02:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42844) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrH-0002N0-KB for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrG-0002rz-CZ for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:51 -0400 Received: from mail-yb1-xb41.google.com ([2607:f8b0:4864:20::b41]:39086) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrG-0002r1-8C for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:50 -0400 Received: by mail-yb1-xb41.google.com with SMTP id z128so2573679yba.6 for ; Wed, 31 Jul 2019 10:57:50 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LvfVVm1R1i5TWS3AOjieQ7QlUKuT8clHbsVMx2FutBg=; b=mPI1b4BdBuyMd+z8QdDfpNkvZyaM5PZcyO+9qRFqSUx+XV9ErrHsdqw83B0on9wty9 5PdREDB7e14gQY4ob/1qKU5Up7i0n53rqaycWOMS0O3a5JxpRkCg5K8N2uDrtsrGC5qr vMe3Q928cIsgYBzcWqBIOYrvYpVf6AQ80QwvTcVQdO32H1TzhhdRhQEw7ZIXyDstoDow 5nwOqf4W8Smrrxzx0eNGkAnLvrTdSaD02vUY7HBnaJqavWZHnYS8qgqLeYmURT1zSoDW a+VUeLXSsMFpM6yeOfYy8t/ix2Rtr09GfqHebTkyh5DxtsTPpceg+zhIDG4eB6nLeB1S ORUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LvfVVm1R1i5TWS3AOjieQ7QlUKuT8clHbsVMx2FutBg=; b=NNrmdTQzYy9hc/LiRTIo4SEviLI2R5n44HOVVrqghhN2fx+haxy7yamRAJLii/atpw uD+GAlGVtE3mUNpqIGVZbVQHnPLkwLZoWwspJtlCer81QVwqLWJsanseS/ybWPYOKJQh OgnuQpWj7yy1h06u8/PbNK8nrOBQjt/UFgVgNYhjMn7Bp7kIrhrpPKSw/xrr99d8C9Gz sHyhaHnsKtkpOWf4nQJqR+Q4Iaokzy1HHrbizPb/zT5b539JuqZI/+OhS2EjsFVrNKXN M9GmKbY/nxHcExxz1ZVjO/KYD9WRH8WqqBrhsTNeSWUt0zXioPYyWkKfzTFBFsBpKqIA 2mlw== X-Gm-Message-State: APjAAAX9pJsriXGB+DhyouTXLEGBkKMZzXmtHj/g7ZE9PyktRZ/TxuNS 1xDgfPoTbFUa/fiPwsPgpcVhh9C/ X-Google-Smtp-Source: APXvYqzpKtDX0hnj1kIajPI0khLumwvWsYATgroxsmSK864aT66+ShjbHij5XNcpbHfApdj6yH2+cA== X-Received: by 2002:a5b:792:: with SMTP id b18mr62858185ybq.498.1564595869520; Wed, 31 Jul 2019 10:57:49 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:54 -0400 Message-Id: <20190731175702.4916-15-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b41 Subject: [Qemu-devel] [RFC PATCH v1 14/22] target/i386: reimplement (V)PADDS(B, W) 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 4 ---- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 19 +++++++++++++++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 59935a65be..8829dcb781 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -339,8 +339,6 @@ static inline int satsw(int x) =20 #define FADDUB(a, b) satub((a) + (b)) #define FADDUW(a, b) satuw((a) + (b)) -#define FADDSB(a, b) satsb((int8_t)(a) + (int8_t)(b)) -#define FADDSW(a, b) satsw((int16_t)(a) + (int16_t)(b)) =20 #define FSUBUB(a, b) satub((a) - (b)) #define FSUBUW(a, b) satuw((a) - (b)) @@ -365,12 +363,10 @@ static inline int satsw(int x) #endif =20 SSE_HELPER_B(helper_paddusb, FADDUB) -SSE_HELPER_B(helper_paddsb, FADDSB) SSE_HELPER_B(helper_psubusb, FSUBUB) SSE_HELPER_B(helper_psubsb, FSUBSB) =20 SSE_HELPER_W(helper_paddusw, FADDUW) -SSE_HELPER_W(helper_paddsw, FADDSW) SSE_HELPER_W(helper_psubusw, FSUBUW) SSE_HELPER_W(helper_psubsw, FSUBSW) =20 diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index bcdbac99a0..78203e80a5 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -61,12 +61,10 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 SSE_HELPER_B(paddusb, FADDUB) -SSE_HELPER_B(paddsb, FADDSB) SSE_HELPER_B(psubusb, FSUBUB) SSE_HELPER_B(psubsb, FSUBSB) =20 SSE_HELPER_W(paddusw, FADDUW) -SSE_HELPER_W(paddsw, FADDSW) SSE_HELPER_W(psubusw, FSUBUW) SSE_HELPER_W(psubsw, FSUBSW) =20 diff --git a/target/i386/translate.c b/target/i386/translate.c index 6f4dfd06a1..5ea5014d99 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2842,8 +2842,8 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xe9] =3D MMX_OP2(psubsw), [0xea] =3D MMX_OP2(pminsw), [0xeb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xec] =3D MMX_OP2(paddsb), - [0xed] =3D MMX_OP2(paddsw), + [0xec] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xed] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xee] =3D MMX_OP2(pmaxsw), [0xef] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xf0] =3D { NULL, NULL, NULL, SSE_SPECIAL }, /* lddqu */ @@ -3171,6 +3171,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpadd_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0123) #define gen_vpadd_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (= s), (modrm), (vece), tcg_gen_gvec_add, 0123) =20 +#define gen_padds_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), = (s), (modrm), (vece), tcg_gen_gvec_ssadd, 0112) +#define gen_padds_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), = (s), (modrm), (vece), tcg_gen_gvec_ssadd, 0112) +#define gen_vpadds_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_ssadd, 0123) +#define gen_vpadds_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_ssadd, 0123) + #define gen_psub_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0112) #define gen_psub_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0112) #define gen_vpsub_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0123) @@ -3331,6 +3336,16 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xd4 | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_64)= ; return; case 0xd4 | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_64)= ; return; =20 + case 0xec | M_0F: gen_padds_mm(env, s, modrm, MO_8); = return; + case 0xec | M_0F | P_66: gen_padds_xmm(env, s, modrm, MO_8);= return; + case 0xec | M_0F | P_66 | VEX_128: gen_vpadds_xmm(env, s, modrm, MO_8)= ; return; + case 0xec | M_0F | P_66 | VEX_256: gen_vpadds_ymm(env, s, modrm, MO_8)= ; return; + + case 0xed | M_0F: gen_padds_mm(env, s, modrm, MO_16);= return; + case 0xed | M_0F | P_66: gen_padds_xmm(env, s, modrm, MO_16)= ; return; + case 0xed | M_0F | P_66 | VEX_128: gen_vpadds_xmm(env, s, modrm, MO_16= ); return; + case 0xed | M_0F | P_66 | VEX_256: gen_vpadds_ymm(env, s, modrm, MO_16= ); return; + case 0xf8 | M_0F: gen_psub_mm(env, s, modrm, MO_8); r= eturn; case 0xf8 | M_0F | P_66: gen_psub_xmm(env, s, modrm, MO_8); = return; case 0xf8 | M_0F | P_66 | VEX_128: gen_vpsub_xmm(env, s, modrm, MO_8);= return; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596406; cv=none; d=zoho.com; s=zohoarc; b=Y5N4yynCuWJ0aTqZjhfe89nVkWD+BcoGbHE4JJ7MzK8OcleBGLckseZv6bzV5psemNNaZlEFf2BiPL9i1u82lB76pskLGDHc8ZtBQiXE4chNMoBiUjAElbjQLE1or94ee+MTOJ3BzJzXhSckNBxy4gKjl3p5jMlrTkvrmAtKmiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596406; 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:ARC-Authentication-Results; bh=hp/kv1iRAg1esL0wOHljF2nNjTxCw5xL8M8rejzPABE=; b=Oi27aUMTdq9Ax2o6w38l4051gq56DQDMMtQeSPh0KZE2oYNoLT4oLiCBtcABCskqye5JGZkmtJ5zkVZ3b7hXITM6gcSVJPtOQyFj3pv2ZDFRSYV1PTlUFCGDNZKpH+fqzFaM37mAxh7An/kWnus4yEaJco62z4IvwKyPQsOfK4s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596406052748.699001247814; Wed, 31 Jul 2019 11:06:46 -0700 (PDT) Received: from localhost ([::1]:43457 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsszt-00024G-2m for importer@patchew.org; Wed, 31 Jul 2019 14:06:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42855) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrI-0002OZ-0D for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrG-0002tU-PL for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:51 -0400 Received: from mail-yb1-xb43.google.com ([2607:f8b0:4864:20::b43]:40704) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrG-0002sD-LI for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:50 -0400 Received: by mail-yb1-xb43.google.com with SMTP id j6so2571469ybm.7 for ; Wed, 31 Jul 2019 10:57:50 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hp/kv1iRAg1esL0wOHljF2nNjTxCw5xL8M8rejzPABE=; b=pK55u8k0yMLZmVtwXOCIwpLGmVcOywFIeMmHLKqzz4jLhY9KWqf7NhsWA8glSFS22H 2VNiSFGQjOJv9VGagJpNsQLuoGiI+7gQHJK9Vxu9FHCfV6v5oqxTMbMFIWormk2nrsuf gO+ZYSLo0rehAVk44g1xuHh1Qvizf/oyabguO6sHFJxnJ0Un1DJBmkGh7nljuTZkWFl/ NnwxTBgwLYE+CsB6+zYcjvh2bWdSyfMQ365NHTRR1SVasR1HkFhh1HdDFii+JE1fjw9Q DZ1WqsSfmEvJRJ1Koaa8C6wdObAcnY2sgEFdf57DxGQURbU7HF+VDYmR6+o4koRbsD12 uyPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hp/kv1iRAg1esL0wOHljF2nNjTxCw5xL8M8rejzPABE=; b=fW0ftayFElwllDiLPH7s89seY74O//cQ/FUPkRXbS2wa26+dcmcL3LNVO/i9bCdgvE AhCCFZ8Dpy77Pen4EK7hVRoRpw9emwhNcSLDw/RTNpshy2CHlZ9TlAlMBwNNlQ0SSgd/ jGruCGjukI6C/qT7+E+Do8O41iy1/o04waamJRHyDbFQx2mZXT9ic1z6ujYdsy/B91F2 PdMh+57QpFgLzp2Yg1HvCwVaRmM5o8SCOzqafR+eWq7EKf1ic0Lf+xpacjvD67apKQTq bZ36/LApJRpPzD8v+sKzfMMmAq4nuc9X7heTRt0eBdExdm2A8SaW5QmeNtjRqlmw/y+O feHg== X-Gm-Message-State: APjAAAXFly0Pthh2Vmy0QViiDzY8mxHmtvHq0b6O78U6AjHqoKg6f/8m 6y6RmUQixJNzsPae5TgYV96GPI8b X-Google-Smtp-Source: APXvYqxx0Hr/5QxoWkmkQ7nOj81Wh3L3E0ZRcy1C5J6C9e5gpjN6oi6ev1mW7q1wCZm2oREoUBaDXw== X-Received: by 2002:a25:81c6:: with SMTP id n6mr79461473ybm.403.1564595870026; Wed, 31 Jul 2019 10:57:50 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:55 -0400 Message-Id: <20190731175702.4916-16-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b43 Subject: [Qemu-devel] [RFC PATCH v1 15/22] target/i386: reimplement (V)PADDUS(B, W) 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 5 ----- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 19 +++++++++++++++++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 8829dcb781..8c9b47fca4 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,9 +337,6 @@ static inline int satsw(int x) } } =20 -#define FADDUB(a, b) satub((a) + (b)) -#define FADDUW(a, b) satuw((a) + (b)) - #define FSUBUB(a, b) satub((a) - (b)) #define FSUBUW(a, b) satuw((a) - (b)) #define FSUBSB(a, b) satsb((int8_t)(a) - (int8_t)(b)) @@ -362,11 +359,9 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif =20 -SSE_HELPER_B(helper_paddusb, FADDUB) SSE_HELPER_B(helper_psubusb, FSUBUB) SSE_HELPER_B(helper_psubsb, FSUBSB) =20 -SSE_HELPER_W(helper_paddusw, FADDUW) SSE_HELPER_W(helper_psubusw, FSUBUW) SSE_HELPER_W(helper_psubsw, FSUBSW) =20 diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 78203e80a5..8a31ade70c 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,11 +60,9 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) #define SSE_HELPER_Q(name, F)\ DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 -SSE_HELPER_B(paddusb, FADDUB) SSE_HELPER_B(psubusb, FSUBUB) SSE_HELPER_B(psubsb, FSUBSB) =20 -SSE_HELPER_W(paddusw, FADDUW) SSE_HELPER_W(psubusw, FSUBUW) SSE_HELPER_W(psubsw, FSUBSW) =20 diff --git a/target/i386/translate.c b/target/i386/translate.c index 5ea5014d99..e2ed8c20b3 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2826,8 +2826,8 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xd9] =3D MMX_OP2(psubusw), [0xda] =3D MMX_OP2(pminub), [0xdb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xdc] =3D MMX_OP2(paddusb), - [0xdd] =3D MMX_OP2(paddusw), + [0xdc] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xdd] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xde] =3D MMX_OP2(pmaxub), [0xdf] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xe0] =3D MMX_OP2(pavgb), @@ -3176,6 +3176,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpadds_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_ssadd, 0123) #define gen_vpadds_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_ssadd, 0123) =20 +#define gen_paddus_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env),= (s), (modrm), (vece), tcg_gen_gvec_usadd, 0112) +#define gen_paddus_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env),= (s), (modrm), (vece), tcg_gen_gvec_usadd, 0112) +#define gen_vpaddus_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env),= (s), (modrm), (vece), tcg_gen_gvec_usadd, 0123) +#define gen_vpaddus_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env),= (s), (modrm), (vece), tcg_gen_gvec_usadd, 0123) + #define gen_psub_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0112) #define gen_psub_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0112) #define gen_vpsub_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0123) @@ -3336,6 +3341,16 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xd4 | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_64)= ; return; case 0xd4 | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_64)= ; return; =20 + case 0xdc | M_0F: gen_paddus_mm(env, s, modrm, MO_8);= return; + case 0xdc | M_0F | P_66: gen_paddus_xmm(env, s, modrm, MO_8)= ; return; + case 0xdc | M_0F | P_66 | VEX_128: gen_vpaddus_xmm(env, s, modrm, MO_8= ); return; + case 0xdc | M_0F | P_66 | VEX_256: gen_vpaddus_ymm(env, s, modrm, MO_8= ); return; + + case 0xdd | M_0F: gen_paddus_mm(env, s, modrm, MO_16)= ; return; + case 0xdd | M_0F | P_66: gen_paddus_xmm(env, s, modrm, MO_16= ); return; + case 0xdd | M_0F | P_66 | VEX_128: gen_vpaddus_xmm(env, s, modrm, MO_1= 6); return; + case 0xdd | M_0F | P_66 | VEX_256: gen_vpaddus_ymm(env, s, modrm, MO_1= 6); return; + case 0xec | M_0F: gen_padds_mm(env, s, modrm, MO_8); = return; case 0xec | M_0F | P_66: gen_padds_xmm(env, s, modrm, MO_8);= return; case 0xec | M_0F | P_66 | VEX_128: gen_vpadds_xmm(env, s, modrm, MO_8)= ; return; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596360; cv=none; d=zoho.com; s=zohoarc; b=n5q5n0BB1riL/FX3NhQpWiVaSvFURuMoiUtV3kIdBRyFJ+lEnXa5hwYXDnk+uDLq+nDK1lQK/cBstjJOzRNEz6gQ4+gmSdjgVpoCwuGVMiK2FZY2Vs0wQdvNd7cxKjwfFjihCRjGN0K1yrrMc0hJ4wVLQnCDkRCYiGl5+LKpYoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596360; 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:ARC-Authentication-Results; bh=lrmhZVG/ZO5RmiqtTQnFr3XryHW4Ewk2KiAQQytBZw0=; b=aFYenZgMLxwoBiqu21dG4n5PiF2Mooij8EpJcjJbMknTYqUoqqui03DjxwSz8lEZt0+BmuUnrUk+jmzeB9e0As0Lgthz5tWwLJs4g5t5Asp+c2s5BU/lhRNmXhJ2/HgBUQL6AuUIUsDp4jPN/8R6MqK30GimqBv79xI24014uWk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596360973150.71417312875155; Wed, 31 Jul 2019 11:06:00 -0700 (PDT) Received: from localhost ([::1]:43454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsszA-0001Nr-1v for importer@patchew.org; Wed, 31 Jul 2019 14:06:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42883) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrI-0002Rb-VG for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrH-0002tv-KH for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:52 -0400 Received: from mail-yb1-xb42.google.com ([2607:f8b0:4864:20::b42]:36222) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrH-0002td-Fa for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:51 -0400 Received: by mail-yb1-xb42.google.com with SMTP id d9so18323478ybf.3 for ; Wed, 31 Jul 2019 10:57:51 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lrmhZVG/ZO5RmiqtTQnFr3XryHW4Ewk2KiAQQytBZw0=; b=KmgRbyuCeElBJDKGlH8Np+hCNE9MP/r4H2Iw/d8T3IjRc4eL9MxGUpUUUA9HUufxX5 RHCXj+qB7a/Ox+A56lYyZyqE39dthcx+wAt9xub8KxrniDKg67q/HhqIGNhV2sGaAvV8 HBySGNaoA+5HQjSBXq/BqV6BcyocnPYb6aKvIezk7OaH7GTwzBes+IJgpVZ2t24/OILR kSGms4mmgZ5kQZc/3d+PiwTdM3qM5v0MD0G5HaGBe5eVMKlep3+ZyC+0GNAua40hcmMH oSvh772t0dd03uXKKvIVN1HD9SJ7bS7Qp7muSQjMGCDGXhDbmkIHrmYmbwchbzV+J2rq xAFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lrmhZVG/ZO5RmiqtTQnFr3XryHW4Ewk2KiAQQytBZw0=; b=ZE66s0ZS68QylD+48/oMQDVYNYGCooCWXMjFvN6tKt00Dvg01mj12M8ThrQBQM1dhF +LS6Xsb+QQRn/fAqtkuHna4BGWeGrMft3xkOzPYiZr52p+cIdmSTAU5L3b+1K4OC4qEM I5bZdarblocfkWie6KVtlxOe34bFPbkt5w30UK95Q03N91ThD7SPYiCjKb0p1SV0oACD hfuB1WmQULTJ4TZBwYNHEJX9h2YIc2nbFlSuSCuCtUvwLuDP3kPM77dozweWC0hdB0oJ 7ShjvS57UbU27tmHkckZ41kHjcbzH5cW8uk/3lMiLJ3s9rnmeGD1QX4RM8fOfA5Facxk z1Zg== X-Gm-Message-State: APjAAAXbG9ejc3qO8DrDrrT15ULjHLBPoeQXI8WDHU46vPapcSBP5Kyw nacD/phmEnsKqRaLgnOhfKuDpIPI X-Google-Smtp-Source: APXvYqy8j/pu+kh41Bu940KOf1gaCqbHQGZPIs4kEjYwbqat3dXEkEMwHmi9zZzASNb1b0AOT0CZCw== X-Received: by 2002:a25:bb11:: with SMTP id z17mr69460876ybg.260.1564595870870; Wed, 31 Jul 2019 10:57:50 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:56 -0400 Message-Id: <20190731175702.4916-17-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b42 Subject: [Qemu-devel] [RFC PATCH v1 16/22] target/i386: reimplement (V)PSUBS(B, W) 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 4 ---- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 19 +++++++++++++++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 8c9b47fca4..f948adbc68 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -339,8 +339,6 @@ static inline int satsw(int x) =20 #define FSUBUB(a, b) satub((a) - (b)) #define FSUBUW(a, b) satuw((a) - (b)) -#define FSUBSB(a, b) satsb((int8_t)(a) - (int8_t)(b)) -#define FSUBSW(a, b) satsw((int16_t)(a) - (int16_t)(b)) #define FMINUB(a, b) ((a) < (b)) ? (a) : (b) #define FMINSW(a, b) ((int16_t)(a) < (int16_t)(b)) ? (a) : (b) #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) @@ -360,10 +358,8 @@ static inline int satsw(int x) #endif =20 SSE_HELPER_B(helper_psubusb, FSUBUB) -SSE_HELPER_B(helper_psubsb, FSUBSB) =20 SSE_HELPER_W(helper_psubusw, FSUBUW) -SSE_HELPER_W(helper_psubsw, FSUBSW) =20 SSE_HELPER_B(helper_pminub, FMINUB) SSE_HELPER_B(helper_pmaxub, FMAXUB) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 8a31ade70c..20fb8aeccc 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -61,10 +61,8 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 SSE_HELPER_B(psubusb, FSUBUB) -SSE_HELPER_B(psubsb, FSUBSB) =20 SSE_HELPER_W(psubusw, FSUBUW) -SSE_HELPER_W(psubsw, FSUBSW) =20 SSE_HELPER_B(pminub, FMINUB) SSE_HELPER_B(pmaxub, FMAXUB) diff --git a/target/i386/translate.c b/target/i386/translate.c index e2ed8c20b3..894471861d 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2838,8 +2838,8 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xe5] =3D MMX_OP2(pmulhw), [0xe6] =3D { NULL, gen_helper_cvttpd2dq, gen_helper_cvtdq2pd, gen_help= er_cvtpd2dq }, [0xe7] =3D { SSE_SPECIAL , SSE_SPECIAL }, /* movntq, movntq */ - [0xe8] =3D MMX_OP2(psubsb), - [0xe9] =3D MMX_OP2(psubsw), + [0xe8] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xe9] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xea] =3D MMX_OP2(pminsw), [0xeb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xec] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, @@ -3186,6 +3186,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpsub_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0123) #define gen_vpsub_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (= s), (modrm), (vece), tcg_gen_gvec_sub, 0123) =20 +#define gen_psubs_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), = (s), (modrm), (vece), tcg_gen_gvec_sssub, 0112) +#define gen_psubs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), = (s), (modrm), (vece), tcg_gen_gvec_sssub, 0112) +#define gen_vpsubs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_sssub, 0123) +#define gen_vpsubs_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_sssub, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3381,6 +3386,16 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xfb | M_0F | P_66 | VEX_128: gen_vpsub_xmm(env, s, modrm, MO_64)= ; return; case 0xfb | M_0F | P_66 | VEX_256: gen_vpsub_ymm(env, s, modrm, MO_64)= ; return; =20 + case 0xe8 | M_0F: gen_psubs_mm(env, s, modrm, MO_8); = return; + case 0xe8 | M_0F | P_66: gen_psubs_xmm(env, s, modrm, MO_8);= return; + case 0xe8 | M_0F | P_66 | VEX_128: gen_vpsubs_xmm(env, s, modrm, MO_8)= ; return; + case 0xe8 | M_0F | P_66 | VEX_256: gen_vpsubs_ymm(env, s, modrm, MO_8)= ; return; + + case 0xe9 | M_0F: gen_psubs_mm(env, s, modrm, MO_16);= return; + case 0xe9 | M_0F | P_66: gen_psubs_xmm(env, s, modrm, MO_16)= ; return; + case 0xe9 | M_0F | P_66 | VEX_128: gen_vpsubs_xmm(env, s, modrm, MO_16= ); return; + case 0xe9 | M_0F | P_66 | VEX_256: gen_vpsubs_ymm(env, s, modrm, MO_16= ); return; + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); retur= n; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596232; cv=none; d=zoho.com; s=zohoarc; b=gfb4OX/EdLBVvuXP60AUORX0WcEdqfpv8LrTxMAxs38Wdrj7nTAF4q144exrLhL3PtGz/3IgDWVr05D4ctXU3i1yCTFRr1/mFOsR7ckhM/9DwQFQ4BoZSfuaJpWRZ5gYp8GL9FxRg5Z6wszoTU/Qd0KyLHMS1qB60PWGbRr1gO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596232; 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:ARC-Authentication-Results; bh=M4/3ExEjJuGXnyFh1NZkWxyCI3Eunoxw4SVaU+Tn7IU=; b=TnnsEAK6EBg2aD/SkSDnprjR2dMtf89MxhRA0j30AXCHzZqbz/UW8jITVXB0nIHbnTr5hSXvPq5LGweKO/SG18Xo7C4z1bP9+ZQjvH2j2Q/ACOWlHRoLa6VNheTvTG0L/NxOGDSpJVC2J21+6GTqeMYQW31xWPzdJTZ/M2FOSDU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596232285558.7752014462891; Wed, 31 Jul 2019 11:03:52 -0700 (PDT) Received: from localhost ([::1]:43428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssx5-00063p-9F for importer@patchew.org; Wed, 31 Jul 2019 14:03:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42899) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrJ-0002Uv-Iw for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrI-0002vH-Bs for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:53 -0400 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]:43097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrI-0002uZ-7U for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:52 -0400 Received: by mail-yw1-xc44.google.com with SMTP id n205so25261603ywb.10 for ; Wed, 31 Jul 2019 10:57:52 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M4/3ExEjJuGXnyFh1NZkWxyCI3Eunoxw4SVaU+Tn7IU=; b=DRiwfkX7hrvoUzu//FKcV7gVS7rFEmpJClFrrrqabTZUQG4coRzu6cbLxfSL9yDp4Q FZ2BynZflTdelMA2HfsbSHjoNrS0c8Et1/+bvWxVUdHtTuhX3StvLBav4saDrRODNU2t 1QNyoVR19MN+GT8UQG5jPofIRwVNFEGGFKCOA0FepTHXQx723kfu8Yvra9IsxDZ17bP/ pAcIkpHOIGDlgjFbxnKqsnULHAklx4oeGJa2vxITOVIZRDiT1rAKQG9kL/dT4zDFp6Cl ErfXVedj0Njh8YFn9SM2oUlYRyWVqpcOti6GKwYBvQDMNA16FO7CccW93bAPJgLPn245 S66Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M4/3ExEjJuGXnyFh1NZkWxyCI3Eunoxw4SVaU+Tn7IU=; b=qOCb0EAjyxT2ROjxPJQBn/51CdE7KeNu4RawHQJpx3KNkyF2qG7iK+WgBRLhxFwyfD TLmRi9EmUljsELOUO4x1BonS84Wu0NRFI9uGRMBmqY/0YXFLIi7OQPiimKGqu+8rhWTV eSn5Z42BH8LP2WY79JzQy46gSRTDn64qMfXnzBaPJ2BUkjjbUrkTkC3kAhTkmfnnTa0h E+qEw0medU5sXaEhzn2EQw9ZnwUpMWBEQq1kezsEHLcD3nD3c0cpvGT/E9Iu9hG5uNmt 0pII2L5pX3XSKKQH9fNWlvdDf7unyw9ZfDCFvw4htzGlahn+TMtDcwnXjxBSMX9UXCjv fR3A== X-Gm-Message-State: APjAAAXrjM9+zs07ElAXoTqKDFWKaLgFMTyzBBV6pV4WqwQ5CLrvzAbO fTEbG34O92qkPg4kRUleFVhmyZis X-Google-Smtp-Source: APXvYqxd2CkGcmZ5eIkUZ+ApaKPQDXN2UkfqOSRObQpB25/nBqdQym/kSfq0RVoWgLVfp2zT4HSxNg== X-Received: by 2002:a81:a186:: with SMTP id y128mr77236315ywg.128.1564595871611; Wed, 31 Jul 2019 10:57:51 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:57 -0400 Message-Id: <20190731175702.4916-18-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c44 Subject: [Qemu-devel] [RFC PATCH v1 17/22] target/i386: reimplement (V)PSUBUS(B, W) 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 6 ------ target/i386/ops_sse_header.h | 4 ---- target/i386/translate.c | 19 +++++++++++++++++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index f948adbc68..4f00f3273d 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,8 +337,6 @@ static inline int satsw(int x) } } =20 -#define FSUBUB(a, b) satub((a) - (b)) -#define FSUBUW(a, b) satuw((a) - (b)) #define FMINUB(a, b) ((a) < (b)) ? (a) : (b) #define FMINSW(a, b) ((int16_t)(a) < (int16_t)(b)) ? (a) : (b) #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) @@ -357,10 +355,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif =20 -SSE_HELPER_B(helper_psubusb, FSUBUB) - -SSE_HELPER_W(helper_psubusw, FSUBUW) - SSE_HELPER_B(helper_pminub, FMINUB) SSE_HELPER_B(helper_pmaxub, FMAXUB) =20 diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 20fb8aeccc..829c132ae4 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,10 +60,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) #define SSE_HELPER_Q(name, F)\ DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 -SSE_HELPER_B(psubusb, FSUBUB) - -SSE_HELPER_W(psubusw, FSUBUW) - SSE_HELPER_B(pminub, FMINUB) SSE_HELPER_B(pmaxub, FMAXUB) =20 diff --git a/target/i386/translate.c b/target/i386/translate.c index 894471861d..5b19e9ac4b 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2822,8 +2822,8 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xd5] =3D MMX_OP2(pmullw), [0xd6] =3D { NULL, SSE_SPECIAL, SSE_SPECIAL, SSE_SPECIAL }, [0xd7] =3D { SSE_SPECIAL, SSE_SPECIAL }, /* pmovmskb */ - [0xd8] =3D MMX_OP2(psubusb), - [0xd9] =3D MMX_OP2(psubusw), + [0xd8] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xd9] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xda] =3D MMX_OP2(pminub), [0xdb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdc] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, @@ -3191,6 +3191,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpsubs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_sssub, 0123) #define gen_vpsubs_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_sssub, 0123) =20 +#define gen_psubus_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env),= (s), (modrm), (vece), tcg_gen_gvec_ussub, 0112) +#define gen_psubus_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env),= (s), (modrm), (vece), tcg_gen_gvec_ussub, 0112) +#define gen_vpsubus_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env),= (s), (modrm), (vece), tcg_gen_gvec_ussub, 0123) +#define gen_vpsubus_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env),= (s), (modrm), (vece), tcg_gen_gvec_ussub, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3386,6 +3391,16 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xfb | M_0F | P_66 | VEX_128: gen_vpsub_xmm(env, s, modrm, MO_64)= ; return; case 0xfb | M_0F | P_66 | VEX_256: gen_vpsub_ymm(env, s, modrm, MO_64)= ; return; =20 + case 0xd8 | M_0F: gen_psubus_mm(env, s, modrm, MO_8);= return; + case 0xd8 | M_0F | P_66: gen_psubus_xmm(env, s, modrm, MO_8)= ; return; + case 0xd8 | M_0F | P_66 | VEX_128: gen_vpsubus_xmm(env, s, modrm, MO_8= ); return; + case 0xd8 | M_0F | P_66 | VEX_256: gen_vpsubus_ymm(env, s, modrm, MO_8= ); return; + + case 0xd9 | M_0F: gen_psubus_mm(env, s, modrm, MO_16)= ; return; + case 0xd9 | M_0F | P_66: gen_psubus_xmm(env, s, modrm, MO_16= ); return; + case 0xd9 | M_0F | P_66 | VEX_128: gen_vpsubus_xmm(env, s, modrm, MO_1= 6); return; + case 0xd9 | M_0F | P_66 | VEX_256: gen_vpsubus_ymm(env, s, modrm, MO_1= 6); return; + case 0xe8 | M_0F: gen_psubs_mm(env, s, modrm, MO_8); = return; case 0xe8 | M_0F | P_66: gen_psubs_xmm(env, s, modrm, MO_8);= return; case 0xe8 | M_0F | P_66 | VEX_128: gen_vpsubs_xmm(env, s, modrm, MO_8)= ; return; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596228; cv=none; d=zoho.com; s=zohoarc; b=RsFYtVCBcrCnL8O074AegVKzkllEQn/kjUyqTmhgg/qWsriee0gPeLAGtdre9bVB9Hfnk9tTLFhsG1fkF4pYv2Ebp+bXy2QZqV2htyHb9wPe00PyGuRXfon3kC4zSHQbzexUc6/0U4DVPDQF0uejnwFPHMI03GvjxkSk6CE96+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596228; 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:ARC-Authentication-Results; bh=rpSf9DsyPi6aCjOpAfKCodbW7O9D1x8yH1l051ssV8E=; b=iCNBvrSW0fOTHgHeixC8x8az0k6Sz8Qb2uavC2f0ITyAeXGVETIg2SADTcqCKqju3csTAxHALrOEqyR62t+qjcyEeeBva2iTiOnA2Ou+r/XvXBNt1VGVHtIElya+7kMnFMUiFWy6KeZoo2xb6x7f9M5SzuogHnn9D8UnCTaPYWI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156459622802435.653848152789806; Wed, 31 Jul 2019 11:03:48 -0700 (PDT) Received: from localhost ([::1]:43426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssx1-0005oK-10 for importer@patchew.org; Wed, 31 Jul 2019 14:03:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42924) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrK-0002Y3-FR for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrJ-0002yW-91 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:54 -0400 Received: from mail-yb1-xb44.google.com ([2607:f8b0:4864:20::b44]:38824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrJ-0002xI-4h for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:53 -0400 Received: by mail-yb1-xb44.google.com with SMTP id j199so24745195ybg.5 for ; Wed, 31 Jul 2019 10:57:53 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rpSf9DsyPi6aCjOpAfKCodbW7O9D1x8yH1l051ssV8E=; b=lqKujsqKKAfdVnxMh3Cszv4ht4yYPv7xy4Z3hX1doCl7DZEATqEm/iO6Ml0qpnNk74 O4Sfpv1CnrAywXmE5BCdozxGP0AleA4sd1s6Ap+csaiHOtC5dj1ig/8EjTsIpU7J8atl 3VWFA3N9SZzHslaGOn4dr6I8ePqawpUAFhTeRtm/qS6hBKl0x7rmZuMaaX7yFHoUr7l3 LzdFkmToZSCNESTCivBbkIAGps6N5V/T/0freuuqbjPU8z8MFKM6qZI/fzFF499h9EMC ttQwAhyHfxndQ4DhsPBIhKo6vqqwRvnmXUGL2FEHHR1osxeqi+I+aInuA4n00zYXjnXg TsnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rpSf9DsyPi6aCjOpAfKCodbW7O9D1x8yH1l051ssV8E=; b=lyEzrcF43HAtq/nlcHaQQ1LQkbgZZaWrrf1orIU9n9NKFyamIohTJG8yc51Q7AgGEb TH8URmKKKpLcgskeJlMnDUkOb4xOVCt3m6Z+vc9CLcJSMjakSCns/uSyOGyjFKfvQaAf 4j6XRLqMFkqbKjObavxS0XwwjaAgXZ65DNQYorsmhjHodJlmSLAcOhNYnm7I2+XKWGos TG5U3pv5jMpWQ09QHA55qtueM54HCOXU68zVQQsBADHen95VDs/A/xiB/AF+HLaKSpvO fmPoFx01HVMAc8unqKdxoyqZlKsNOPE7fUMRU7W/toMDNEXJxzLnzTEuHmMYTUP5038n uPsA== X-Gm-Message-State: APjAAAUxRy3qa1xHQpGit2RyHz2UH3Z0QGlmxbS3J7quz5kMpSoBNQJv C6el+6vDHSLvIrfCPpOJIuhxtTiX X-Google-Smtp-Source: APXvYqy+W9SnLEzYq8jsfiArWOtwfm55DViw6VqQxLk0yMSLDTzqnl0GXpdRhSf6SOfoTudVorheRw== X-Received: by 2002:a25:bccd:: with SMTP id l13mr71614245ybm.48.1564595872442; Wed, 31 Jul 2019 10:57:52 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:58 -0400 Message-Id: <20190731175702.4916-19-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b44 Subject: [Qemu-devel] [RFC PATCH v1 18/22] target/i386: reimplement (V)PMINSW 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 2 -- target/i386/ops_sse_header.h | 1 - target/i386/translate.c | 12 +++++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 4f00f3273d..f57eaa2c77 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -338,7 +338,6 @@ static inline int satsw(int x) } =20 #define FMINUB(a, b) ((a) < (b)) ? (a) : (b) -#define FMINSW(a, b) ((int16_t)(a) < (int16_t)(b)) ? (a) : (b) #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) #define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) =20 @@ -358,7 +357,6 @@ static inline int satsw(int x) SSE_HELPER_B(helper_pminub, FMINUB) SSE_HELPER_B(helper_pmaxub, FMAXUB) =20 -SSE_HELPER_W(helper_pminsw, FMINSW) SSE_HELPER_W(helper_pmaxsw, FMAXSW) =20 SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 829c132ae4..a7f99e5427 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -63,7 +63,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) SSE_HELPER_B(pminub, FMINUB) SSE_HELPER_B(pmaxub, FMAXUB) =20 -SSE_HELPER_W(pminsw, FMINSW) SSE_HELPER_W(pmaxsw, FMAXSW) =20 SSE_HELPER_B(pcmpgtb, FCMPGTB) diff --git a/target/i386/translate.c b/target/i386/translate.c index 5b19e9ac4b..d601c6d4c2 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2840,7 +2840,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xe7] =3D { SSE_SPECIAL , SSE_SPECIAL }, /* movntq, movntq */ [0xe8] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xe9] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xea] =3D MMX_OP2(pminsw), + [0xea] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xeb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xec] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xed] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, @@ -3196,6 +3196,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpsubus_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env),= (s), (modrm), (vece), tcg_gen_gvec_ussub, 0123) #define gen_vpsubus_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env),= (s), (modrm), (vece), tcg_gen_gvec_ussub, 0123) =20 +#define gen_pmins_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), = (s), (modrm), (vece), tcg_gen_gvec_smin, 0112) +#define gen_pmins_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), = (s), (modrm), (vece), tcg_gen_gvec_smin, 0112) +#define gen_vpmins_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_smin, 0123) +#define gen_vpmins_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_smin, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3411,6 +3416,11 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xe9 | M_0F | P_66 | VEX_128: gen_vpsubs_xmm(env, s, modrm, MO_16= ); return; case 0xe9 | M_0F | P_66 | VEX_256: gen_vpsubs_ymm(env, s, modrm, MO_16= ); return; =20 + case 0xea | M_0F: gen_pmins_mm(env, s, modrm, MO_16);= return; + case 0xea | M_0F | P_66: gen_pmins_xmm(env, s, modrm, MO_16)= ; return; + case 0xea | M_0F | P_66 | VEX_128: gen_vpmins_xmm(env, s, modrm, MO_16= ); return; + case 0xea | M_0F | P_66 | VEX_256: gen_vpmins_ymm(env, s, modrm, MO_16= ); return; + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); retur= n; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596355; cv=none; d=zoho.com; s=zohoarc; b=gsaJMT50mpeaBfFGzj3fVhGgKTwzBUAE2u7sQdSi6WyaKxvzjCMHQDh7I7zLqFfXkQUJQDbB5yO7oZC33XJxZHV04I+PBntcjobuZSSgRPYLmcRFMFk0rIjCdlrXYVv/bof0b+pX4qyy82Smf+C+2HkPpZCu8gaCZOD1hQy0qE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596355; 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:ARC-Authentication-Results; bh=mPS1RZO8DgeaiIxpzPUBfBtNhgDZ08sPwLWj65FslAM=; b=WrahWLQKrsDmbhGn7nlJ+kucnZkOQAlBxTs0MhPGkAFOjb+1U3GSNtQnw/AHbl3C5lWRweMsynCvl8VkMMktFm0+znneB4LRtGAII+F6f/ifY7y/IhEPtlJayNCBv9j1EL5FpeQrNwbd6z5AqP5H5+f6arM/Dmco7R+qZTBrLKs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596355865554.6786936034513; Wed, 31 Jul 2019 11:05:55 -0700 (PDT) Received: from localhost ([::1]:43452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssz4-00011d-UC for importer@patchew.org; Wed, 31 Jul 2019 14:05:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42949) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrL-0002bG-AQ for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrK-00031f-3v for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:55 -0400 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]:34191) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrJ-00030J-W2 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:54 -0400 Received: by mail-yw1-xc44.google.com with SMTP id q128so25297391ywc.1 for ; Wed, 31 Jul 2019 10:57:53 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mPS1RZO8DgeaiIxpzPUBfBtNhgDZ08sPwLWj65FslAM=; b=cp52Nzr+Q1OKZwQM/yhWDk2CN/eticPlhjmDaMR9pFr2xT24Golh+68lJrcPhKNjcQ LGsB9mLcEgel3sGnqqvPmOHY+0BLu8Tlm0lSITtvsVAAKMbeQhbjYJEVL5qWYfzSh3Mc tQySzUE48s/tv0u5rb4wuYRMzQXvxRPRmVhlImLStkL1RkCVKEBhdO7jlN4qqTIr69zq NW+viXr8frkgwY9sNIGd5742qLjCRas1FqjtiwSBe0ZcbDIVg5zFAHOn5woTXbqYQhzv fH73q49T7EcS0hH7iQSjshyI9pVA9lQqV7oWbw7HryUkjgveM2v1rcrs1ObRmQNpd/nL GYNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mPS1RZO8DgeaiIxpzPUBfBtNhgDZ08sPwLWj65FslAM=; b=N1pTOves9SNsBaEaSswnDbPAXA/6lYa/PsUHMPW+Ulkc0hoCEDMuDevR8eBZzkmdDN M73badYf5RiuYInZrw/+vwhk0SxL+00r3S75bGe5NKdji6f2ynyO4ccpaXt/0bwti/0c 4UJHHFASLe+cOgIYphi5ysdWXtlddCcpOE7izn/NNd2yOtNhFckTDPUbXb3+S+DoCVfw ARS3EIqhmsfWDKvBTPtu9TOJvNzDFDJ3X7lM9JGnyUtStEgwRRrOXj49rqXQBb5E1Z5K 0S2GREhv1f4Y/eZx5bvgb5wXzsArTqLrpbHRIKtYbojjmn42N1ZfoLDmsvVuAKQawM/T RVog== X-Gm-Message-State: APjAAAVPCrV6VLzqqAn+Y5I5oSlBWAOIBIaEaLygO3zLl7BvkNpTFmPu PBWgaDO2MW8+D+ZZrWZ3eOp+6vgN X-Google-Smtp-Source: APXvYqz6yyR58CdmLTm/YkVMTZzaPSJQy2pv+ZFm1+yDwjiw3U8XmyWVyPft4J4mIGaBnvmIBctPYA== X-Received: by 2002:a81:1f44:: with SMTP id f65mr76358974ywf.217.1564595873396; Wed, 31 Jul 2019 10:57:53 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:56:59 -0400 Message-Id: <20190731175702.4916-20-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c44 Subject: [Qemu-devel] [RFC PATCH v1 19/22] target/i386: reimplement (V)PMINUB 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 2 -- target/i386/ops_sse_header.h | 1 - target/i386/translate.c | 12 +++++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index f57eaa2c77..058ed5cdfc 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,7 +337,6 @@ static inline int satsw(int x) } } =20 -#define FMINUB(a, b) ((a) < (b)) ? (a) : (b) #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) #define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) =20 @@ -354,7 +353,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif =20 -SSE_HELPER_B(helper_pminub, FMINUB) SSE_HELPER_B(helper_pmaxub, FMAXUB) =20 SSE_HELPER_W(helper_pmaxsw, FMAXSW) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index a7f99e5427..3d0e321230 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,7 +60,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) #define SSE_HELPER_Q(name, F)\ DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 -SSE_HELPER_B(pminub, FMINUB) SSE_HELPER_B(pmaxub, FMAXUB) =20 SSE_HELPER_W(pmaxsw, FMAXSW) diff --git a/target/i386/translate.c b/target/i386/translate.c index d601c6d4c2..893fe1253f 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2824,7 +2824,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xd7] =3D { SSE_SPECIAL, SSE_SPECIAL }, /* pmovmskb */ [0xd8] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xd9] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xda] =3D MMX_OP2(pminub), + [0xda] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdc] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdd] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, @@ -3201,6 +3201,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpmins_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_smin, 0123) #define gen_vpmins_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_smin, 0123) =20 +#define gen_pminu_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), = (s), (modrm), (vece), tcg_gen_gvec_umin, 0112) +#define gen_pminu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), = (s), (modrm), (vece), tcg_gen_gvec_umin, 0112) +#define gen_vpminu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_umin, 0123) +#define gen_vpminu_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_umin, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3416,6 +3421,11 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xe9 | M_0F | P_66 | VEX_128: gen_vpsubs_xmm(env, s, modrm, MO_16= ); return; case 0xe9 | M_0F | P_66 | VEX_256: gen_vpsubs_ymm(env, s, modrm, MO_16= ); return; =20 + case 0xda | M_0F: gen_pminu_mm(env, s, modrm, MO_8); = return; + case 0xda | M_0F | P_66: gen_pminu_xmm(env, s, modrm, MO_8);= return; + case 0xda | M_0F | P_66 | VEX_128: gen_vpminu_xmm(env, s, modrm, MO_8)= ; return; + case 0xda | M_0F | P_66 | VEX_256: gen_vpminu_ymm(env, s, modrm, MO_8)= ; return; + case 0xea | M_0F: gen_pmins_mm(env, s, modrm, MO_16);= return; case 0xea | M_0F | P_66: gen_pmins_xmm(env, s, modrm, MO_16)= ; return; case 0xea | M_0F | P_66 | VEX_128: gen_vpmins_xmm(env, s, modrm, MO_16= ); return; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596471; cv=none; d=zoho.com; s=zohoarc; b=KklnLdd0I7pAnQpuBqDawnFZuSXsLxhswLDRwEpI14Ktf0xU+GyuZYiBiU6Svv3Hevyat9xeLYWosl+TH+x0awoOrbKs0lp6C+bcm4MQd1yeJVDuiJhLSmq1MGHn5kw+oTORb6EIGldvMfASjGt2VfEhdFAEHFz+GE58iX9qw7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596471; 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:ARC-Authentication-Results; bh=46sUYgeGntAE/jMTF6+vkugERws++s4JtY9D7A29bq0=; b=dJnKaJQU1ZKDyLQouYZ1rAXmgh2UsNzVgLbr1dDU0Xec9ZoetHqFLmBYNYmAGueUdC7Y+RmX78qmZzV27hHtVQltxQEv5esy1p0cZe0idH/kOCe6xfd6TmA8onF/Zra5xE2ceJLOo9EYwMuwHlia6lVts3HGx/D91E+jHL87Dd4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596471526399.21523157858917; Wed, 31 Jul 2019 11:07:51 -0700 (PDT) Received: from localhost ([::1]:43484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hst0w-0005Pw-Fo for importer@patchew.org; Wed, 31 Jul 2019 14:07:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42967) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrM-0002e9-2c for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrK-000339-Tl for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:56 -0400 Received: from mail-yb1-xb41.google.com ([2607:f8b0:4864:20::b41]:43843) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrK-000322-PQ for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:54 -0400 Received: by mail-yb1-xb41.google.com with SMTP id y123so21711842yby.10 for ; Wed, 31 Jul 2019 10:57:54 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=46sUYgeGntAE/jMTF6+vkugERws++s4JtY9D7A29bq0=; b=D37uY7oxeeDybj3NRVcMwIIi0BXJK/THpWyo8nzud5a8ljUcHginSLc9mG7f8r87Gh glAfmEh8BnuFiowoKyXQ5S06fUL1nJDYYLugPm0XVlrW6Nvf8u1cUi1HXs9DCd0z7Ekf zR3T1cOCX00cNMUoe21POASK+8Grlzd/tZkV7XWFgybOce3SB97g4+2SbZsGvfSi9KD7 mIr3U3qpWM9NOQn90FqFkM6WYgTf37qdnVjg7JjHl3WGmJ/2SLcFOnD/QrNR7GOIi12Z LfB1qXu00BO2jKOeJ9Ry7TZqRb75WBHkj0f1IGjz/J4bGnaHsHj58UH+bH1cBOkRN75d pcWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=46sUYgeGntAE/jMTF6+vkugERws++s4JtY9D7A29bq0=; b=f65dXpGEQ5YuArol1Ih226RpKr8L8/fgw3MAzUXD+CcqnUNsh8XVVklhDr4D+4Q2Kw Ly9xWzMp1uxvmXb4SxSOq9pPJOeuP5EfudbuwDi3369Jzw7rnJq4q2gTzLGq2Xo0x30I yeYzxrI+JSd/kRkZTLEZzND+4lrrUmVvT40Xpy/BtgNyQ1xTN+uOnHJlCrVk/Sxtb956 ySJ1CHcyJgKQJP9wcA8GimsS/3XoFRyox5cGY1AH9T3XCzmO4BgGc19YRb9IsPTGbFUm K0rnw+C6CsPJQSiSq+Y2w65sdsXJHisgMbP1EXAXDPY+8YOV7GJ8hzGQkRTj5EowbHgj jFkA== X-Gm-Message-State: APjAAAX+pCGXLVSHqs7TAE3/PJSfHzxfpiGmDUIRcLlLHhBV/jik1f+Y PtY5LGcwXduQYfmp+obj7bK16fZA X-Google-Smtp-Source: APXvYqzg0JjrnQLuBWtxwrTgh+kDDBNGzcm6a3HbBkLJBUpedePZ0Cq5kVbTw+oQ3Zzlc2A60hjUKQ== X-Received: by 2002:a5b:b41:: with SMTP id b1mr72272206ybr.277.1564595874164; Wed, 31 Jul 2019 10:57:54 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:57:00 -0400 Message-Id: <20190731175702.4916-21-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::b41 Subject: [Qemu-devel] [RFC PATCH v1 20/22] target/i386: reimplement (V)PMAXSW 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 3 --- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 12 +++++++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 058ed5cdfc..92d0544474 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -338,7 +338,6 @@ static inline int satsw(int x) } =20 #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) -#define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) =20 #define FCMPGTB(a, b) ((int8_t)(a) > (int8_t)(b) ? -1 : 0) #define FCMPGTW(a, b) ((int16_t)(a) > (int16_t)(b) ? -1 : 0) @@ -355,8 +354,6 @@ static inline int satsw(int x) =20 SSE_HELPER_B(helper_pmaxub, FMAXUB) =20 -SSE_HELPER_W(helper_pmaxsw, FMAXSW) - SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) SSE_HELPER_W(helper_pcmpgtw, FCMPGTW) SSE_HELPER_L(helper_pcmpgtl, FCMPGTL) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 3d0e321230..bf38738783 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -62,8 +62,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) =20 SSE_HELPER_B(pmaxub, FMAXUB) =20 -SSE_HELPER_W(pmaxsw, FMAXSW) - SSE_HELPER_B(pcmpgtb, FCMPGTB) SSE_HELPER_W(pcmpgtw, FCMPGTW) SSE_HELPER_L(pcmpgtl, FCMPGTL) diff --git a/target/i386/translate.c b/target/i386/translate.c index 893fe1253f..48bfb4e47b 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2844,7 +2844,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xeb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xec] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xed] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xee] =3D MMX_OP2(pmaxsw), + [0xee] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xef] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xf0] =3D { NULL, NULL, NULL, SSE_SPECIAL }, /* lddqu */ [0xf1] =3D MMX_OP2(psllw), @@ -3206,6 +3206,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpminu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_umin, 0123) #define gen_vpminu_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_umin, 0123) =20 +#define gen_pmaxs_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), = (s), (modrm), (vece), tcg_gen_gvec_smax, 0112) +#define gen_pmaxs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), = (s), (modrm), (vece), tcg_gen_gvec_smax, 0112) +#define gen_vpmaxs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_smax, 0123) +#define gen_vpmaxs_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_smax, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3431,6 +3436,11 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xea | M_0F | P_66 | VEX_128: gen_vpmins_xmm(env, s, modrm, MO_16= ); return; case 0xea | M_0F | P_66 | VEX_256: gen_vpmins_ymm(env, s, modrm, MO_16= ); return; =20 + case 0xee | M_0F: gen_pmaxs_mm(env, s, modrm, MO_16);= return; + case 0xee | M_0F | P_66: gen_pmaxs_xmm(env, s, modrm, MO_16)= ; return; + case 0xee | M_0F | P_66 | VEX_128: gen_vpmaxs_xmm(env, s, modrm, MO_16= ); return; + case 0xee | M_0F | P_66 | VEX_256: gen_vpmaxs_ymm(env, s, modrm, MO_16= ); return; + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); retur= n; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596471; cv=none; d=zoho.com; s=zohoarc; b=lO6AX0qA5RFvm8RPPQ0QGz2fErcSN4/BBpAPqbjvar64i+wG/lYmQNnXARbGfNJsJlcCelhjaBtG1DztIFvY8yxDRu1eG2gA7zoXKucbrkuuNepSUTdMI/sS1WHLBBom6Bij94uM9a5eLFKZwPZprg/GVDbI6Z5E6XBaFppHQIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596471; 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:ARC-Authentication-Results; bh=qwNJraZExAiEk69izkYfz3uLADtLZ4vzJetI20/CgG4=; b=M7qJ7w/uC4TL08DSqqiTpz+yryfIi7HbbpcG1yMUYuGAeRLE2UQgjSQXiwmFGBFPs/mq82hqVkcYo1fx0xE25l/C/byJBNrW6VSgOotTpWG2n6v4XYBA7VuuNdcq/2ogu3aE0+4rpBjjQCIbM/vhFAqDYwjeuxbCojtk4x2dKCY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596471702727.197821866597; Wed, 31 Jul 2019 11:07:51 -0700 (PDT) Received: from localhost ([::1]:43486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hst0w-0005SB-Pf for importer@patchew.org; Wed, 31 Jul 2019 14:07:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42987) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrM-0002gk-P2 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrL-00034s-LI for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:56 -0400 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]:40125) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrL-00034Q-GX for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:55 -0400 Received: by mail-yw1-xc44.google.com with SMTP id b143so25253974ywb.7 for ; Wed, 31 Jul 2019 10:57:55 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qwNJraZExAiEk69izkYfz3uLADtLZ4vzJetI20/CgG4=; b=NCTInTmr+D3ZkZ/d2QQAYUN1e1Mk4EcAVMp2lFc9ptRPvzLsSoEWwNeAcp6w6fsgF4 dsjj9Pj9Vwxdix3R7ykscerWlOnPuAHrYgavc7uMdG4aJnU7TIfp/GZe0BeLEtFT+ibH jOt3OmerpQrkJ60x9aPldR7ULviC+52mSFYP97l8O5PRGuF57HO/Ds02euwfpBfyZYof 5fdTNYzr7Dqm8urWTllYc+IKwjv8RBQjaPnXKHm7Al1kDilQT8tHpLayXXRh7ORNJp0l xp9teXOUTYlluiSPIwxkIeygFKXGz+G6yHV3ZptSeBGFM7IfHlQwCjzANMT7um/0XeFK uLjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qwNJraZExAiEk69izkYfz3uLADtLZ4vzJetI20/CgG4=; b=Gde51l7eet2bVrryYjNXT4ZCmLwRyz0HwPv5cFihEXBhHdFEZsMZ1vwBAlIb/IYA6A 6nloO3ITbnwRE7o0EYY9d/e2XKiD/V9vi4Rviy882QwbbbaElzLJGTljlxc/Jlhs93/X 0QggjtcnNST5mLdCZSJGwrndkSKD8gcJpSp5eIU1Y13ze9nFDZ5LVFwCMbIkbOdE0mNK +FeaA/YpWNTXP4HMeGSzK34U4xswIce23bhT35obmQVCiT/HhCl7Nfw0igjJPB6Mnvvl qLdnoa4FlWcsyH2QSons1BhoufpIwpjQx2Oj21NsYA9VRtrDUtOPhLoCYpeSVNeOi1Rt udug== X-Gm-Message-State: APjAAAWishxlhow6BxkrJt0iyu6/np+D9kf+tdIZuVpcyh4w0IC/vuEd jfvPEUxVxalhi9KDLSEVjI6qceSg X-Google-Smtp-Source: APXvYqyH/lanD9JlxPxXsLddvMGzPSiPuQgg4z0aP7XpW1EeOhABSU2lAYR9YQBOKdMPtoFVpmOOQQ== X-Received: by 2002:a81:a50c:: with SMTP id u12mr71761104ywg.287.1564595874902; Wed, 31 Jul 2019 10:57:54 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:57:01 -0400 Message-Id: <20190731175702.4916-22-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c44 Subject: [Qemu-devel] [RFC PATCH v1 21/22] target/i386: reimplement (V)PMAXUB 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 4 ---- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 12 +++++++++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 92d0544474..75ff686bb6 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,8 +337,6 @@ static inline int satsw(int x) } } =20 -#define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) - #define FCMPGTB(a, b) ((int8_t)(a) > (int8_t)(b) ? -1 : 0) #define FCMPGTW(a, b) ((int16_t)(a) > (int16_t)(b) ? -1 : 0) #define FCMPGTL(a, b) ((int32_t)(a) > (int32_t)(b) ? -1 : 0) @@ -352,8 +350,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif =20 -SSE_HELPER_B(helper_pmaxub, FMAXUB) - SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) SSE_HELPER_W(helper_pcmpgtw, FCMPGTW) SSE_HELPER_L(helper_pcmpgtl, FCMPGTL) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index bf38738783..9c7451d28e 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,8 +60,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) #define SSE_HELPER_Q(name, F)\ DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 -SSE_HELPER_B(pmaxub, FMAXUB) - SSE_HELPER_B(pcmpgtb, FCMPGTB) SSE_HELPER_W(pcmpgtw, FCMPGTW) SSE_HELPER_L(pcmpgtl, FCMPGTL) diff --git a/target/i386/translate.c b/target/i386/translate.c index 48bfb4e47b..d08d2cedce 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2828,7 +2828,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0xdb] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdc] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdd] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xde] =3D MMX_OP2(pmaxub), + [0xde] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdf] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xe0] =3D MMX_OP2(pavgb), [0xe1] =3D MMX_OP2(psraw), @@ -3211,6 +3211,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpmaxs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_smax, 0123) #define gen_vpmaxs_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_smax, 0123) =20 +#define gen_pmaxu_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), = (s), (modrm), (vece), tcg_gen_gvec_umax, 0112) +#define gen_pmaxu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), = (s), (modrm), (vece), tcg_gen_gvec_umax, 0112) +#define gen_vpmaxu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_umax, 0123) +#define gen_vpmaxu_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_umax, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3436,6 +3441,11 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xea | M_0F | P_66 | VEX_128: gen_vpmins_xmm(env, s, modrm, MO_16= ); return; case 0xea | M_0F | P_66 | VEX_256: gen_vpmins_ymm(env, s, modrm, MO_16= ); return; =20 + case 0xde | M_0F: gen_pmaxu_mm(env, s, modrm, MO_8); = return; + case 0xde | M_0F | P_66: gen_pmaxu_xmm(env, s, modrm, MO_8);= return; + case 0xde | M_0F | P_66 | VEX_128: gen_vpmaxu_xmm(env, s, modrm, MO_8)= ; return; + case 0xde | M_0F | P_66 | VEX_256: gen_vpmaxu_ymm(env, s, modrm, MO_8)= ; return; + case 0xee | M_0F: gen_pmaxs_mm(env, s, modrm, MO_16);= return; case 0xee | M_0F | P_66: gen_pmaxs_xmm(env, s, modrm, MO_16)= ; return; case 0xee | M_0F | P_66 | VEX_128: gen_vpmaxs_xmm(env, s, modrm, MO_16= ); return; --=20 2.20.1 From nobody Wed May 1 23:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564596459; cv=none; d=zoho.com; s=zohoarc; b=F0vLgJQSqHd/JWDYzrjnxSdjHu1z65bwsvJKDm3lR+FsewjbJXbQrYzojTUNyToBOw5GGgO4YbSJKQVRtPKIizw1hm/UtAe/0vJPU4A6Dx5j8bUk17aeh2C0wczA/ti6mNQMH4qcdqp72rBX0YguMHQrLgGLXgqUszOJ+yVJ7P4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564596458; 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:ARC-Authentication-Results; bh=oqUdiwvpgwp0hHDM9ysTSzyqe47m4ce56JCVOIeEHmY=; b=KDCfA8TORPagG/S79/+LFISI5yo52oCPrW2iatAvuA2EL/tOuwt5e1447Qgr47Aa5ENVFfFZj/lE6xr8nNUy6OXDxlDohYipCCrIkGDJixE25NIHQXnmBP2dOP/jfPBaGb68qS5lN/XLyZZeecwf3aTMIACdpnID3hKh3GtX/rQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564596458993178.68446209189744; Wed, 31 Jul 2019 11:07:38 -0700 (PDT) Received: from localhost ([::1]:43482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hst0j-0004jf-S8 for importer@patchew.org; Wed, 31 Jul 2019 14:07:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43019) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hssrO-0002lP-6k for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hssrM-00038X-Hg for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:58 -0400 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]:34189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hssrM-00036y-CM for qemu-devel@nongnu.org; Wed, 31 Jul 2019 13:57:56 -0400 Received: by mail-yw1-xc41.google.com with SMTP id q128so25297435ywc.1 for ; Wed, 31 Jul 2019 10:57:56 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id 206sm16077696ywk.44.2019.07.31.10.57.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 10:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oqUdiwvpgwp0hHDM9ysTSzyqe47m4ce56JCVOIeEHmY=; b=BWumgjyq0o/VcCVjotfjXxDGjA1iy36NneGBTFDswWdiwvmKS+Xt3LbPbNkJ1Emyou QJ0spsRD+HiUXk5b4bHdqdYUq3TbYwVzN23tO81/q2td2JsaaKFJQWd7mbaRj9ABC7fY EXxc47e4aUIIe+SzGSKVLpc+4JHX8QmDqZYPT1hHBgqaSB2SJfdf0hV/jFjsGCRFJW23 C5OxdHurh1NgJQVHs8w8FUtpXL1EQ5nCHCKdWIh1eYZsc6S8WWCpoNZHC/01/mhsreHu 5a1oPi7vABHGTtrrDbNqy5tuN6c2EvX/l2uiiBHbDcSgWuu/fvS/YazLuCEW/2LMGoMt HPUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oqUdiwvpgwp0hHDM9ysTSzyqe47m4ce56JCVOIeEHmY=; b=bp8OuiSviW2J7MVWIS4I435/muE5a6Q9Yx93bbVKa9VNAqYtzcCEyatO0xHOAfmFHX F4F89n8c/kwTNXZMotZjWmfMmNGSWK0JxZ3/xJyUyFSKtfrIw51gDr4QDoh0XB8tGhAT saUhMoNRCBKopAjlHmzu43RteSrrZAvaJODjyrbe48BXypBcl4aYnpbrZyfVy0poICO8 3N4mLvZ63r2hqz7JB46a4DopqElYPAowIWHzsP7GpJ70VEuJYz3t09Ms46Fz7dgLxS7S 3s74Kq3tdhGNXhHtnO9vuNEGacIA/j8+2WLgZIOOdPYyG1WsnrQ5OW3qVO7WebDQmSxK WqRA== X-Gm-Message-State: APjAAAX2ef/20+r9QGbistSl3rwWxbdRPsbgTvZ23g70N6nzsj0A7SuX dK8hqlo4zoGgsRtAUPr+jB/MK3po X-Google-Smtp-Source: APXvYqwkfB9+RwHa+pFjdy4Eoz4FDaOxLyXqH43ffjEgJqfmIWTblMuSw0c7z9ARReKPBA3Jhw9CYA== X-Received: by 2002:a81:a497:: with SMTP id b145mr70471253ywh.271.1564595875738; Wed, 31 Jul 2019 10:57:55 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:57:02 -0400 Message-Id: <20190731175702.4916-23-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731175702.4916-1-jan.bobek@gmail.com> References: <20190731175702.4916-1-jan.bobek@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c41 Subject: [Qemu-devel] [RFC PATCH v1 22/22] target/i386: reimplement (V)P(EQ, CMP)(B, W, D) 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Jan Bobek 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" Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek --- target/i386/ops_sse.h | 13 ------- target/i386/ops_sse_header.h | 8 ----- target/i386/translate.c | 66 ++++++++++++++++++++++++++++++++---- 3 files changed, 60 insertions(+), 27 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 75ff686bb6..b6ace9410f 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,11 +337,6 @@ static inline int satsw(int x) } } =20 -#define FCMPGTB(a, b) ((int8_t)(a) > (int8_t)(b) ? -1 : 0) -#define FCMPGTW(a, b) ((int16_t)(a) > (int16_t)(b) ? -1 : 0) -#define FCMPGTL(a, b) ((int32_t)(a) > (int32_t)(b) ? -1 : 0) -#define FCMPEQ(a, b) ((a) =3D=3D (b) ? -1 : 0) - #define FMULLW(a, b) ((a) * (b)) #define FMULHRW(a, b) (((int16_t)(a) * (int16_t)(b) + 0x8000) >> 16) #define FMULHUW(a, b) ((a) * (b) >> 16) @@ -350,14 +345,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif =20 -SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) -SSE_HELPER_W(helper_pcmpgtw, FCMPGTW) -SSE_HELPER_L(helper_pcmpgtl, FCMPGTL) - -SSE_HELPER_B(helper_pcmpeqb, FCMPEQ) -SSE_HELPER_W(helper_pcmpeqw, FCMPEQ) -SSE_HELPER_L(helper_pcmpeql, FCMPEQ) - SSE_HELPER_W(helper_pmullw, FMULLW) #if SHIFT =3D=3D 0 SSE_HELPER_W(helper_pmulhrw, FMULHRW) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 9c7451d28e..d8e33dff6b 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,14 +60,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) #define SSE_HELPER_Q(name, F)\ DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg) =20 -SSE_HELPER_B(pcmpgtb, FCMPGTB) -SSE_HELPER_W(pcmpgtw, FCMPGTW) -SSE_HELPER_L(pcmpgtl, FCMPGTL) - -SSE_HELPER_B(pcmpeqb, FCMPEQ) -SSE_HELPER_W(pcmpeqw, FCMPEQ) -SSE_HELPER_L(pcmpeql, FCMPEQ) - SSE_HELPER_W(pmullw, FMULLW) #if SHIFT =3D=3D 0 SSE_HELPER_W(pmulhrw, FMULHRW) diff --git a/target/i386/translate.c b/target/i386/translate.c index d08d2cedce..729509e1ff 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2783,9 +2783,9 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0x61] =3D MMX_OP2(punpcklwd), [0x62] =3D MMX_OP2(punpckldq), [0x63] =3D MMX_OP2(packsswb), - [0x64] =3D MMX_OP2(pcmpgtb), - [0x65] =3D MMX_OP2(pcmpgtw), - [0x66] =3D MMX_OP2(pcmpgtl), + [0x64] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0x65] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0x66] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0x67] =3D MMX_OP2(packuswb), [0x68] =3D MMX_OP2(punpckhbw), [0x69] =3D MMX_OP2(punpckhwd), @@ -2802,9 +2802,9 @@ static const SSEFunc_0_epp sse_op_table1[256][4] =3D { [0x71] =3D { SSE_SPECIAL, SSE_SPECIAL }, /* shiftw */ [0x72] =3D { SSE_SPECIAL, SSE_SPECIAL }, /* shiftd */ [0x73] =3D { SSE_SPECIAL, SSE_SPECIAL }, /* shiftq */ - [0x74] =3D MMX_OP2(pcmpeqb), - [0x75] =3D MMX_OP2(pcmpeqw), - [0x76] =3D MMX_OP2(pcmpeql), + [0x74] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0x75] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0x76] =3D { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0x77] =3D { SSE_DUMMY }, /* emms */ [0x78] =3D { NULL, SSE_SPECIAL, NULL, SSE_SPECIAL }, /* extrq_i, inser= tq_i */ [0x79] =3D { NULL, gen_helper_extrq_r, NULL, gen_helper_insertq_r }, @@ -3216,6 +3216,30 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *= env, DisasContext *s, #define gen_vpmaxu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), = (s), (modrm), (vece), tcg_gen_gvec_umax, 0123) #define gen_vpmaxu_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), = (s), (modrm), (vece), tcg_gen_gvec_umax, 0123) =20 +static inline void gen_gvec_cmpeq(unsigned vece, uint32_t dofs, + uint32_t aofs, uint32_t bofs, + uint32_t oprsz, uint32_t maxsz) +{ + tcg_gen_gvec_cmp(TCG_COND_EQ, vece, dofs, aofs, bofs, oprsz, maxsz); +} + +#define gen_pcmpeq_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env),= (s), (modrm), (vece), gen_gvec_cmpeq, 0112) +#define gen_pcmpeq_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env),= (s), (modrm), (vece), gen_gvec_cmpeq, 0112) +#define gen_vpcmpeq_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env),= (s), (modrm), (vece), gen_gvec_cmpeq, 0123) +#define gen_vpcmpeq_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env),= (s), (modrm), (vece), gen_gvec_cmpeq, 0123) + +static inline void gen_gvec_cmpgt(unsigned vece, uint32_t dofs, + uint32_t aofs, uint32_t bofs, + uint32_t oprsz, uint32_t maxsz) +{ + tcg_gen_gvec_cmp(TCG_COND_GT, vece, dofs, aofs, bofs, oprsz, maxsz); +} + +#define gen_pcmpgt_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env),= (s), (modrm), (vece), gen_gvec_cmpgt, 0112) +#define gen_pcmpgt_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env),= (s), (modrm), (vece), gen_gvec_cmpgt, 0112) +#define gen_vpcmpgt_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env),= (s), (modrm), (vece), gen_gvec_cmpgt, 0123) +#define gen_vpcmpgt_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env),= (s), (modrm), (vece), gen_gvec_cmpgt, 0123) + #define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0112) #define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s), (m= odrm), MO_64, tcg_gen_gvec_and, 0123) @@ -3451,6 +3475,36 @@ static void gen_sse(CPUX86State *env, DisasContext *= s, int b) case 0xee | M_0F | P_66 | VEX_128: gen_vpmaxs_xmm(env, s, modrm, MO_16= ); return; case 0xee | M_0F | P_66 | VEX_256: gen_vpmaxs_ymm(env, s, modrm, MO_16= ); return; =20 + case 0x64 | M_0F: gen_pcmpgt_mm(env, s, modrm, MO_8);= return; + case 0x64 | M_0F | P_66: gen_pcmpgt_xmm(env, s, modrm, MO_8)= ; return; + case 0x64 | M_0F | P_66 | VEX_128: gen_vpcmpgt_xmm(env, s, modrm, MO_8= ); return; + case 0x64 | M_0F | P_66 | VEX_256: gen_vpcmpgt_ymm(env, s, modrm, MO_8= ); return; + + case 0x65 | M_0F: gen_pcmpgt_mm(env, s, modrm, MO_16)= ; return; + case 0x65 | M_0F | P_66: gen_pcmpgt_xmm(env, s, modrm, MO_16= ); return; + case 0x65 | M_0F | P_66 | VEX_128: gen_vpcmpgt_xmm(env, s, modrm, MO_1= 6); return; + case 0x65 | M_0F | P_66 | VEX_256: gen_vpcmpgt_ymm(env, s, modrm, MO_1= 6); return; + + case 0x66 | M_0F: gen_pcmpgt_mm(env, s, modrm, MO_32)= ; return; + case 0x66 | M_0F | P_66: gen_pcmpgt_xmm(env, s, modrm, MO_32= ); return; + case 0x66 | M_0F | P_66 | VEX_128: gen_vpcmpgt_xmm(env, s, modrm, MO_3= 2); return; + case 0x66 | M_0F | P_66 | VEX_256: gen_vpcmpgt_ymm(env, s, modrm, MO_3= 2); return; + + case 0x74 | M_0F: gen_pcmpeq_mm(env, s, modrm, MO_8);= return; + case 0x74 | M_0F | P_66: gen_pcmpeq_xmm(env, s, modrm, MO_8)= ; return; + case 0x74 | M_0F | P_66 | VEX_128: gen_vpcmpeq_xmm(env, s, modrm, MO_8= ); return; + case 0x74 | M_0F | P_66 | VEX_256: gen_vpcmpeq_ymm(env, s, modrm, MO_8= ); return; + + case 0x75 | M_0F: gen_pcmpeq_mm(env, s, modrm, MO_16)= ; return; + case 0x75 | M_0F | P_66: gen_pcmpeq_xmm(env, s, modrm, MO_16= ); return; + case 0x75 | M_0F | P_66 | VEX_128: gen_vpcmpeq_xmm(env, s, modrm, MO_1= 6); return; + case 0x75 | M_0F | P_66 | VEX_256: gen_vpcmpeq_ymm(env, s, modrm, MO_1= 6); return; + + case 0x76 | M_0F: gen_pcmpeq_mm(env, s, modrm, MO_32)= ; return; + case 0x76 | M_0F | P_66: gen_pcmpeq_xmm(env, s, modrm, MO_32= ); return; + case 0x76 | M_0F | P_66 | VEX_128: gen_vpcmpeq_xmm(env, s, modrm, MO_3= 2); return; + case 0x76 | M_0F | P_66 | VEX_256: gen_vpcmpeq_ymm(env, s, modrm, MO_3= 2); return; + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); retur= n; --=20 2.20.1