qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 23/39] target/i386: isolate MMX code more
Date: Thu,  1 Sep 2022 20:24:13 +0200	[thread overview]
Message-ID: <20220901182429.93533-24-pbonzini@redhat.com> (raw)
In-Reply-To: <20220901182429.93533-1-pbonzini@redhat.com>

Extracted from a patch by Paul Brook <paul@nowt.org>.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/tcg/translate.c | 52 +++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 849c40b685..097c895ef1 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -3888,6 +3888,12 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
                         gen_ldo_env_A0(s, op2_offset);
                     }
                 }
+                if (!op6->op[b1]) {
+                    goto illegal_op;
+                }
+                tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
+                tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
+                op6->op[b1](cpu_env, s->ptr0, s->ptr1);
             } else {
                 if ((op6->flags & SSE_OPF_MMX) == 0) {
                     goto unknown_op;
@@ -3900,14 +3906,10 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
                     gen_lea_modrm(env, s, modrm);
                     gen_ldq_env_A0(s, op2_offset);
                 }
+                tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
+                tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
+                op6->op[0](cpu_env, s->ptr0, s->ptr1);
             }
-            if (!op6->op[b1]) {
-                goto illegal_op;
-            }
-
-            tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
-            tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
-            op6->op[b1](cpu_env, s->ptr0, s->ptr1);
 
             if (op6->flags & SSE_OPF_CMP) {
                 set_cc_op(s, CC_OP_EFLAGS);
@@ -4427,16 +4429,8 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
                 return;
             }
 
-            if (b1) {
-                op1_offset = ZMM_OFFSET(reg);
-                if (mod == 3) {
-                    op2_offset = ZMM_OFFSET(rm | REX_B(s));
-                } else {
-                    op2_offset = offsetof(CPUX86State,xmm_t0);
-                    gen_lea_modrm(env, s, modrm);
-                    gen_ldo_env_A0(s, op2_offset);
-                }
-            } else {
+            if (b1 == 0) {
+                /* MMX */
                 if ((op7->flags & SSE_OPF_MMX) == 0) {
                     goto illegal_op;
                 }
@@ -4448,9 +4442,29 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
                     gen_lea_modrm(env, s, modrm);
                     gen_ldq_env_A0(s, op2_offset);
                 }
-            }
-            val = x86_ldub_code(env, s);
+                val = x86_ldub_code(env, s);
+                tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
+                tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
 
+                /* We only actually have one MMX instuction (palignr) */
+                assert(b == 0x0f);
+
+                op7->op[0](cpu_env, s->ptr0, s->ptr1,
+                           tcg_const_i32(val));
+                break;
+            }
+
+            /* SSE */
+            op1_offset = ZMM_OFFSET(reg);
+            if (mod == 3) {
+                op2_offset = ZMM_OFFSET(rm | REX_B(s));
+            } else {
+                op2_offset = offsetof(CPUX86State, xmm_t0);
+                gen_lea_modrm(env, s, modrm);
+                gen_ldo_env_A0(s, op2_offset);
+            }
+
+            val = x86_ldub_code(env, s);
             if ((b & 0xfc) == 0x60) { /* pcmpXstrX */
                 set_cc_op(s, CC_OP_EFLAGS);
 
-- 
2.37.2




  parent reply	other threads:[~2022-09-01 18:56 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-01 18:23 [PULL 00/39] i386, SCSI, build system changes for 2022-09-01 Paolo Bonzini
2022-09-01 18:23 ` [PULL 01/39] esp: Handle CMD_BUSRESET by resetting the SCSI bus Paolo Bonzini
2022-09-01 18:23 ` [PULL 02/39] scsi: Add buf_len parameter to scsi_req_new() Paolo Bonzini
2022-12-07 22:06   ` Guenter Roeck
2022-09-01 18:23 ` [PULL 03/39] scsi: Reject commands if the CDB length exceeds buf_len Paolo Bonzini
2022-09-01 18:23 ` [PULL 04/39] i386: reset KVM nested state upon CPU reset Paolo Bonzini
2022-09-01 18:23 ` [PULL 05/39] i386: do kvm_put_msr_feature_control() first thing when vCPU is reset Paolo Bonzini
2022-09-01 18:23 ` [PULL 06/39] configure: improve error for ucontext coroutine backend Paolo Bonzini
2022-09-01 18:23 ` [PULL 07/39] meson: be strict for boolean options Paolo Bonzini
2022-09-01 18:23 ` [PULL 08/39] meson: remove dead code Paolo Bonzini
2022-09-01 18:23 ` [PULL 09/39] meson: remove dead assignments Paolo Bonzini
2022-09-01 18:24 ` [PULL 10/39] KVM: dirty ring: add missing memory barrier Paolo Bonzini
2022-09-01 18:24 ` [PULL 11/39] tests/tcg: x86_64: improve consistency with i386 Paolo Bonzini
2022-09-01 18:24 ` [PULL 12/39] tests/tcg: i386: extend BMI test Paolo Bonzini
2022-09-01 18:24 ` [PULL 13/39] target/i386: fix PHSUB* instructions with dest=src Paolo Bonzini
2022-09-01 18:24 ` [PULL 14/39] target/i386: DPPS rounding fix Paolo Bonzini
2022-09-01 18:24 ` [PULL 15/39] tests/tcg: i386: add SSE tests Paolo Bonzini
2022-09-01 18:24 ` [PULL 16/39] target/i386: do not use MOVL to move data between SSE registers Paolo Bonzini
2022-09-01 18:24 ` [PULL 17/39] target/i386: formatting fixes Paolo Bonzini
2022-09-01 18:24 ` [PULL 18/39] target/i386: Add ZMM_OFFSET macro Paolo Bonzini
2022-09-01 18:24 ` [PULL 19/39] target/i386: Rework sse_op_table1 Paolo Bonzini
2022-09-01 18:24 ` [PULL 20/39] target/i386: Rework sse_op_table6/7 Paolo Bonzini
2022-09-01 18:24 ` [PULL 21/39] target/i386: Move 3DNOW decoder Paolo Bonzini
2022-09-01 18:24 ` [PULL 22/39] target/i386: check SSE table flags instead of hardcoding opcodes Paolo Bonzini
2022-09-01 18:24 ` Paolo Bonzini [this message]
2022-09-01 18:24 ` [PULL 24/39] target/i386: Add size suffix to vector FP helpers Paolo Bonzini
2022-09-01 18:24 ` [PULL 25/39] target/i386: do not cast gen_helper_* function pointers Paolo Bonzini
2022-09-01 18:24 ` [PULL 26/39] target/i386: Add CHECK_NO_VEX Paolo Bonzini
2022-09-01 18:24 ` [PULL 27/39] target/i386: rewrite destructive 3DNow operations Paolo Bonzini
2022-09-01 18:24 ` [PULL 28/39] target/i386: Rewrite vector shift helper Paolo Bonzini
2022-09-01 18:24 ` [PULL 29/39] target/i386: Rewrite simple integer vector helpers Paolo Bonzini
2022-09-01 18:24 ` [PULL 30/39] target/i386: Misc integer AVX helper prep Paolo Bonzini
2022-09-01 18:24 ` [PULL 31/39] target/i386: Destructive vector helpers for AVX Paolo Bonzini
2022-09-01 18:24 ` [PULL 32/39] target/i386: Floating point arithmetic helper AVX prep Paolo Bonzini
2022-09-01 18:24 ` [PULL 33/39] target/i386: reimplement AVX comparison helpers Paolo Bonzini
2022-09-01 18:24 ` [PULL 34/39] target/i386: Dot product AVX helper prep Paolo Bonzini
2022-09-01 18:24 ` [PULL 35/39] target/i386: Destructive FP helpers for AVX Paolo Bonzini
2022-09-01 18:24 ` [PULL 36/39] target/i386: Misc AVX helper prep Paolo Bonzini
2022-09-01 18:24 ` [PULL 37/39] target/i386: Rewrite blendv helpers Paolo Bonzini
2022-09-01 18:24 ` [PULL 38/39] target/i386: AVX pclmulqdq prep Paolo Bonzini
2022-09-01 18:24 ` [PULL 39/39] target/i386: AVX+AES helpers prep Paolo Bonzini
2022-09-02 20:34 ` [PULL 00/39] i386, SCSI, build system changes for 2022-09-01 Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220901182429.93533-24-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).