OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/i386: check SSE table flags instead of hardcoding opcodes 

Put more flags to work to avoid hardcoding lists of opcodes.  The op7 case
for SSE_OPF_CMP is included for homogeneity and because AVX needs it, but
it is never used by SSE or MMX.

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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-08-27 00:13:40 +02:00
parent 622ef8f291
commit 2607e76ffd
1 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
target/i386/tcg/translate.c
View File

@ -3909,7 +3909,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset); tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
op6->op[b1](cpu_env, s->ptr0, s->ptr1); op6->op[b1](cpu_env, s->ptr0, s->ptr1);
if (b == 0x17) { if (op6->flags & SSE_OPF_CMP) {
set_cc_op(s, CC_OP_EFLAGS); set_cc_op(s, CC_OP_EFLAGS);
} }
break; break;
@ -4463,6 +4463,9 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset); tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset); tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
op7->op[b1](cpu_env, s->ptr0, s->ptr1, tcg_const_i32(val)); op7->op[b1](cpu_env, s->ptr0, s->ptr1, tcg_const_i32(val));
if (op7->flags & SSE_OPF_CMP) {
set_cc_op(s, CC_OP_EFLAGS);
}
break; break;
case 0x33a: case 0x33a:
@ -4518,28 +4521,24 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
int sz = 4; int sz = 4;
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
op2_offset = offsetof(CPUX86State,xmm_t0); op2_offset = offsetof(CPUX86State, xmm_t0);
switch (b) { if (sse_op_flags & SSE_OPF_SCALAR) {
case 0x50 ... 0x5a: if (sse_op_flags & SSE_OPF_CMP) {
case 0x5c ... 0x5f: /* ucomis[sd], comis[sd] */
case 0xc2: if (b1 == 0) {
/* Most sse scalar operations. */ sz = 2;
if (b1 == 2) { } else {
sz = 2; sz = 3;
} else if (b1 == 3) { }
sz = 3;
}
break;
case 0x2e: /* ucomis[sd] */
case 0x2f: /* comis[sd] */
if (b1 == 0) {
sz = 2;
} else { } else {
sz = 3; /* Most sse scalar operations. */
if (b1 == 2) {
sz = 2;
} else if (b1 == 3) {
sz = 3;
}
} }
break;
} }
switch (sz) { switch (sz) {
@ -4585,26 +4584,14 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
return; return;
} }
} }
switch(b) { tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
case 0x70: /* pshufx insn */ tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
case 0xc6: /* pshufx insn */ if (sse_op_flags & SSE_OPF_SHUF) {
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);
/* XXX: introduce a new table? */ /* XXX: introduce a new table? */
sse_fn_ppi = (SSEFunc_0_ppi)sse_fn_epp; sse_fn_ppi = (SSEFunc_0_ppi)sse_fn_epp;
sse_fn_ppi(s->ptr0, s->ptr1, tcg_const_i32(val)); sse_fn_ppi(s->ptr0, s->ptr1, tcg_const_i32(val));
break; } else if (b == 0xf7) {
case 0xc2:
/* compare insns, bits 7:3 (7:5 for AVX) are ignored */
val = x86_ldub_code(env, s) & 7;
sse_fn_epp = sse_op_table4[val][b1];
tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
sse_fn_epp(cpu_env, s->ptr0, s->ptr1);
break;
case 0xf7:
/* maskmov : we must prepare A0 */ /* maskmov : we must prepare A0 */
if (mod != 3) { if (mod != 3) {
goto illegal_op; goto illegal_op;
@ -4613,19 +4600,19 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
gen_extu(s->aflag, s->A0); gen_extu(s->aflag, s->A0);
gen_add_A0_ds_seg(s); gen_add_A0_ds_seg(s);
tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset);
tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset);
/* XXX: introduce a new table? */ /* XXX: introduce a new table? */
sse_fn_eppt = (SSEFunc_0_eppt)sse_fn_epp; sse_fn_eppt = (SSEFunc_0_eppt)sse_fn_epp;
sse_fn_eppt(cpu_env, s->ptr0, s->ptr1, s->A0); sse_fn_eppt(cpu_env, s->ptr0, s->ptr1, s->A0);
break; } else if (b == 0xc2) {
default: /* compare insns, bits 7:3 (7:5 for AVX) are ignored */
tcg_gen_addi_ptr(s->ptr0, cpu_env, op1_offset); val = x86_ldub_code(env, s) & 7;
tcg_gen_addi_ptr(s->ptr1, cpu_env, op2_offset); sse_fn_epp = sse_op_table4[val][b1];
sse_fn_epp(cpu_env, s->ptr0, s->ptr1);
} else {
sse_fn_epp(cpu_env, s->ptr0, s->ptr1); sse_fn_epp(cpu_env, s->ptr0, s->ptr1);
break;
} }
if (b == 0x2e || b == 0x2f) {
if (sse_op_flags & SSE_OPF_CMP) {
set_cc_op(s, CC_OP_EFLAGS); set_cc_op(s, CC_OP_EFLAGS);
} }
} }