haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target-i386: Rearrange processing of 0F 01

Browse source 
Rather than nesting tests of OP, MOD, and RM, decode them
all at once with a switch.  Fixes incorrect decoding of
AMD Pacifica extensions (aka vmrun et al) via op==2 path.

Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2015-07-02 13:59:21 +01:00
parent 64dbaff09b
commit 1906b2af7c
1 changed files with 247 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

238
target-i386/translate.c
View file

@ -56,6 +56,12 @@
# define clztl clz32 # define clztl clz32
#endif #endif
/* For a switch indexed by MODRM, match all memory operands for a given OP. */
#define CASE_MEM_OP(OP) \
case (0 << 6) | (OP << 3) | 0 ... (0 << 6) | (OP << 3) | 7: \
case (1 << 6) | (OP << 3) | 0 ... (1 << 6) | (OP << 3) | 7: \
case (2 << 6) | (OP << 3) | 0 ... (2 << 6) | (OP << 3) | 7
//#define MACRO_TEST 1 //#define MACRO_TEST 1
/* global register indexes */ /* global register indexes */
@ -7000,15 +7006,11 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
goto illegal_op; goto illegal_op;
} }
break; break;
case 0x101: case 0x101:
modrm = cpu_ldub_code(env, s->pc++); modrm = cpu_ldub_code(env, s->pc++);
mod = (modrm >> 6) & 3; switch (modrm) {
op = (modrm >> 3) & 7; CASE_MEM_OP(0): /* sgdt */
rm = modrm & 7;
switch(op) {
case 0: /* sgdt */
if (mod == 3)
goto illegal_op;
gen_svm_check_intercept(s, pc_start, SVM_EXIT_GDTR_READ); gen_svm_check_intercept(s, pc_start, SVM_EXIT_GDTR_READ);
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
tcg_gen_ld32u_tl(cpu_T0, tcg_gen_ld32u_tl(cpu_T0,
@ -7021,13 +7023,11 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
} }
gen_op_st_v(s, CODE64(s) + MO_32, cpu_T0, cpu_A0); gen_op_st_v(s, CODE64(s) + MO_32, cpu_T0, cpu_A0);
break; break;
case 1:
if (mod == 3) { case 0xc8: /* monitor */
switch (rm) { if (!(s->cpuid_ext_features & CPUID_EXT_MONITOR) || s->cpl != 0) {
case 0: /* monitor */
if (!(s->cpuid_ext_features & CPUID_EXT_MONITOR) ||
s->cpl != 0)
goto illegal_op; goto illegal_op;
}
gen_update_cc_op(s); gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
tcg_gen_mov_tl(cpu_A0, cpu_regs[R_EAX]); tcg_gen_mov_tl(cpu_A0, cpu_regs[R_EAX]);
@ -7035,143 +7035,159 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
gen_add_A0_ds_seg(s); gen_add_A0_ds_seg(s);
gen_helper_monitor(cpu_env, cpu_A0); gen_helper_monitor(cpu_env, cpu_A0);
break; break;
case 1: /* mwait */
if (!(s->cpuid_ext_features & CPUID_EXT_MONITOR) || case 0xc9: /* mwait */
s->cpl != 0) if (!(s->cpuid_ext_features & CPUID_EXT_MONITOR) || s->cpl != 0) {
goto illegal_op; goto illegal_op;
}
gen_update_cc_op(s); gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_mwait(cpu_env, tcg_const_i32(s->pc - pc_start)); gen_helper_mwait(cpu_env, tcg_const_i32(s->pc - pc_start));
gen_eob(s); gen_eob(s);
break; break;
case 2: /* clac */
if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_SMAP) || case 0xca: /* clac */
s->cpl != 0) { if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_SMAP)
|| s->cpl != 0) {
goto illegal_op; goto illegal_op;
} }
gen_helper_clac(cpu_env); gen_helper_clac(cpu_env);
gen_jmp_im(s->pc - s->cs_base); gen_jmp_im(s->pc - s->cs_base);
gen_eob(s); gen_eob(s);
break; break;
case 3: /* stac */
if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_SMAP) || case 0xcb: /* stac */
s->cpl != 0) { if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_SMAP)
|| s->cpl != 0) {
goto illegal_op; goto illegal_op;
} }
gen_helper_stac(cpu_env); gen_helper_stac(cpu_env);
gen_jmp_im(s->pc - s->cs_base); gen_jmp_im(s->pc - s->cs_base);
gen_eob(s); gen_eob(s);
break; break;
default:
goto illegal_op; CASE_MEM_OP(1): /* sidt */
}
} else { /* sidt */
gen_svm_check_intercept(s, pc_start, SVM_EXIT_IDTR_READ); gen_svm_check_intercept(s, pc_start, SVM_EXIT_IDTR_READ);
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
tcg_gen_ld32u_tl(cpu_T0, tcg_gen_ld32u_tl(cpu_T0, cpu_env, offsetof(CPUX86State, idt.limit));
cpu_env, offsetof(CPUX86State, idt.limit));
gen_op_st_v(s, MO_16, cpu_T0, cpu_A0); gen_op_st_v(s, MO_16, cpu_T0, cpu_A0);
gen_add_A0_im(s, 2); gen_add_A0_im(s, 2);
tcg_gen_ld_tl(cpu_T0, tcg_gen_ld_tl(cpu_T0, cpu_env, offsetof(CPUX86State, idt.base));
cpu_env, offsetof(CPUX86State, idt.base));
if (dflag == MO_16) { if (dflag == MO_16) {
tcg_gen_andi_tl(cpu_T0, cpu_T0, 0xffffff); tcg_gen_andi_tl(cpu_T0, cpu_T0, 0xffffff);
} }
gen_op_st_v(s, CODE64(s) + MO_32, cpu_T0, cpu_A0); gen_op_st_v(s, CODE64(s) + MO_32, cpu_T0, cpu_A0);
}
break; break;
case 2: /* lgdt */
case 3: /* lidt */ case 0xd8: /* VMRUN */
if (mod == 3) { if (!(s->flags & HF_SVME_MASK) || !s->pe) {
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
switch(rm) {
case 0: /* VMRUN */
if (!(s->flags & HF_SVME_MASK) || !s->pe)
goto illegal_op; goto illegal_op;
}
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
break; break;
} else { }
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_vmrun(cpu_env, tcg_const_i32(s->aflag - 1), gen_helper_vmrun(cpu_env, tcg_const_i32(s->aflag - 1),
tcg_const_i32(s->pc - pc_start)); tcg_const_i32(s->pc - pc_start));
tcg_gen_exit_tb(0); tcg_gen_exit_tb(0);
s->is_jmp = DISAS_TB_JUMP; s->is_jmp = DISAS_TB_JUMP;
}
break; break;
case 1: /* VMMCALL */
if (!(s->flags & HF_SVME_MASK)) case 0xd9: /* VMMCALL */
if (!(s->flags & HF_SVME_MASK)) {
goto illegal_op; goto illegal_op;
}
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_vmmcall(cpu_env); gen_helper_vmmcall(cpu_env);
break; break;
case 2: /* VMLOAD */
if (!(s->flags & HF_SVME_MASK) || !s->pe) case 0xda: /* VMLOAD */
if (!(s->flags & HF_SVME_MASK) || !s->pe) {
goto illegal_op; goto illegal_op;
}
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
break; break;
} else { }
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_vmload(cpu_env, tcg_const_i32(s->aflag - 1)); gen_helper_vmload(cpu_env, tcg_const_i32(s->aflag - 1));
}
break; break;
case 3: /* VMSAVE */
if (!(s->flags & HF_SVME_MASK) || !s->pe) case 0xdb: /* VMSAVE */
if (!(s->flags & HF_SVME_MASK) || !s->pe) {
goto illegal_op; goto illegal_op;
}
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
break; break;
} else { }
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_vmsave(cpu_env, tcg_const_i32(s->aflag - 1)); gen_helper_vmsave(cpu_env, tcg_const_i32(s->aflag - 1));
}
break; break;
case 4: /* STGI */
if ((!(s->flags & HF_SVME_MASK) && case 0xdc: /* STGI */
!(s->cpuid_ext3_features & CPUID_EXT3_SKINIT)) || if ((!(s->flags & HF_SVME_MASK)
!s->pe) && !(s->cpuid_ext3_features & CPUID_EXT3_SKINIT))
|| !s->pe) {
goto illegal_op; goto illegal_op;
}
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
break; break;
} else { }
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_stgi(cpu_env); gen_helper_stgi(cpu_env);
}
break; break;
case 5: /* CLGI */
if (!(s->flags & HF_SVME_MASK) || !s->pe) case 0xdd: /* CLGI */
if (!(s->flags & HF_SVME_MASK) || !s->pe) {
goto illegal_op; goto illegal_op;
}
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
break; break;
} else {
gen_helper_clgi(cpu_env);
} }
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_clgi(cpu_env);
break; break;
case 6: /* SKINIT */
if ((!(s->flags & HF_SVME_MASK) && case 0xde: /* SKINIT */
!(s->cpuid_ext3_features & CPUID_EXT3_SKINIT)) || if ((!(s->flags & HF_SVME_MASK)
!s->pe) && !(s->cpuid_ext3_features & CPUID_EXT3_SKINIT))
|| !s->pe) {
goto illegal_op; goto illegal_op;
}
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_skinit(cpu_env); gen_helper_skinit(cpu_env);
break; break;
case 7: /* INVLPGA */
if (!(s->flags & HF_SVME_MASK) || !s->pe) case 0xdf: /* INVLPGA */
if (!(s->flags & HF_SVME_MASK) || !s->pe) {
goto illegal_op; goto illegal_op;
}
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
break; break;
} else {
gen_helper_invlpga(cpu_env,
tcg_const_i32(s->aflag - 1));
} }
gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base);
gen_helper_invlpga(cpu_env, tcg_const_i32(s->aflag - 1));
break; break;
default:
goto illegal_op; CASE_MEM_OP(2): /* lgdt */
} if (s->cpl != 0) {
} else if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
} else { break;
gen_svm_check_intercept(s, pc_start, }
op==2 ? SVM_EXIT_GDTR_WRITE : SVM_EXIT_IDTR_WRITE); gen_svm_check_intercept(s, pc_start, SVM_EXIT_GDTR_WRITE);
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
gen_op_ld_v(s, MO_16, cpu_T1, cpu_A0); gen_op_ld_v(s, MO_16, cpu_T1, cpu_A0);
gen_add_A0_im(s, 2); gen_add_A0_im(s, 2);
@ -7179,20 +7195,28 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
if (dflag == MO_16) { if (dflag == MO_16) {
tcg_gen_andi_tl(cpu_T0, cpu_T0, 0xffffff); tcg_gen_andi_tl(cpu_T0, cpu_T0, 0xffffff);
} }
if (op == 2) { tcg_gen_st_tl(cpu_T0, cpu_env, offsetof(CPUX86State, gdt.base));
tcg_gen_st_tl(cpu_T0, cpu_env, tcg_gen_st32_tl(cpu_T1, cpu_env, offsetof(CPUX86State, gdt.limit));
offsetof(CPUX86State, gdt.base));
tcg_gen_st32_tl(cpu_T1, cpu_env,
offsetof(CPUX86State, gdt.limit));
} else {
tcg_gen_st_tl(cpu_T0, cpu_env,
offsetof(CPUX86State, idt.base));
tcg_gen_st32_tl(cpu_T1, cpu_env,
offsetof(CPUX86State, idt.limit));
}
}
break; break;
case 4: /* smsw */
CASE_MEM_OP(3): /* lidt */
if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
break;
}
gen_svm_check_intercept(s, pc_start, SVM_EXIT_IDTR_WRITE);
gen_lea_modrm(env, s, modrm);
gen_op_ld_v(s, MO_16, cpu_T1, cpu_A0);
gen_add_A0_im(s, 2);
gen_op_ld_v(s, CODE64(s) + MO_32, cpu_T0, cpu_A0);
if (dflag == MO_16) {
tcg_gen_andi_tl(cpu_T0, cpu_T0, 0xffffff);
}
tcg_gen_st_tl(cpu_T0, cpu_env, offsetof(CPUX86State, idt.base));
tcg_gen_st32_tl(cpu_T1, cpu_env, offsetof(CPUX86State, idt.limit));
break;
CASE_MEM_OP(4): /* smsw */
gen_svm_check_intercept(s, pc_start, SVM_EXIT_READ_CR0); gen_svm_check_intercept(s, pc_start, SVM_EXIT_READ_CR0);
#if defined TARGET_X86_64 && defined HOST_WORDS_BIGENDIAN #if defined TARGET_X86_64 && defined HOST_WORDS_BIGENDIAN
tcg_gen_ld32u_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]) + 4); tcg_gen_ld32u_tl(cpu_T0, cpu_env, offsetof(CPUX86State, cr[0]) + 4);
@ -7201,32 +7225,33 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
#endif #endif
gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 1); gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 1);
break; break;
case 6: /* lmsw */
CASE_MEM_OP(6): /* lmsw */
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
} else { break;
}
gen_svm_check_intercept(s, pc_start, SVM_EXIT_WRITE_CR0); gen_svm_check_intercept(s, pc_start, SVM_EXIT_WRITE_CR0);
gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0); gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0);
gen_helper_lmsw(cpu_env, cpu_T0); gen_helper_lmsw(cpu_env, cpu_T0);
gen_jmp_im(s->pc - s->cs_base); gen_jmp_im(s->pc - s->cs_base);
gen_eob(s); gen_eob(s);
}
break; break;
case 7:
if (mod != 3) { /* invlpg */ CASE_MEM_OP(7): /* invlpg */
if (s->cpl != 0) { if (s->cpl != 0) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base); gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
} else { break;
}
gen_update_cc_op(s); gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
gen_helper_invlpg(cpu_env, cpu_A0); gen_helper_invlpg(cpu_env, cpu_A0);
gen_jmp_im(s->pc - s->cs_base); gen_jmp_im(s->pc - s->cs_base);
gen_eob(s); gen_eob(s);
} break;
} else {
switch (rm) { case 0xf8: /* swapgs */
case 0: /* swapgs */
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
if (CODE64(s)) { if (CODE64(s)) {
if (s->cpl != 0) { if (s->cpl != 0) {
@ -7242,9 +7267,11 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
} }
#endif #endif
goto illegal_op; goto illegal_op;
case 1: /* rdtscp */
if (!(s->cpuid_ext2_features & CPUID_EXT2_RDTSCP)) case 0xf9: /* rdtscp */
if (!(s->cpuid_ext2_features & CPUID_EXT2_RDTSCP)) {
goto illegal_op; goto illegal_op;
}
gen_update_cc_op(s); gen_update_cc_op(s);
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
if (s->tb->cflags & CF_USE_ICOUNT) { if (s->tb->cflags & CF_USE_ICOUNT) {
@ -7256,15 +7283,12 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
gen_jmp(s, s->pc - s->cs_base); gen_jmp(s, s->pc - s->cs_base);
} }
break; break;
default:
goto illegal_op;
}
}
break;
default: default:
goto illegal_op; goto illegal_op;
} }
break; break;
case 0x108: /* invd */ case 0x108: /* invd */
case 0x109: /* wbinvd */ case 0x109: /* wbinvd */
if (s->cpl != 0) { if (s->cpl != 0) {