ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-i386: tcg: Check right CPUID bits for clflushopt/pcommit 

Detect the clflushopt and pcommit instructions and check their
corresponding feature flags, instead of checking CPUID_SSE and
CPUID_CLFLUSH.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-11-04 19:24:46 -02:00
parent 5e1fac2dba
commit 891bc821a3
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target-i386/translate.c
View File

@ -7731,16 +7731,28 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
goto illegal_op; goto illegal_op;
} }
break; break;
case 7: /* sfence / clflush */ case 7: /* sfence / clflush / clflushopt / pcommit */
if ((modrm & 0xc7) == 0xc0) { if ((modrm & 0xc7) == 0xc0) {
/* sfence */ if (s->prefix & PREFIX_DATA) {
/* XXX: also check for cpuid_ext2_features & CPUID_EXT2_EMMX */ /* pcommit */
if (!(s->cpuid_features & CPUID_SSE)) if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_PCOMMIT))
goto illegal_op; goto illegal_op;
} else {
/* sfence */
/* XXX: also check for cpuid_ext2_features & CPUID_EXT2_EMMX */
if (!(s->cpuid_features & CPUID_SSE))
goto illegal_op;
}
} else { } else {
/* clflush */ if (s->prefix & PREFIX_DATA) {
if (!(s->cpuid_features & CPUID_CLFLUSH)) /* clflushopt */
goto illegal_op; if (!(s->cpuid_7_0_ebx_features & CPUID_7_0_EBX_CLFLUSHOPT))
goto illegal_op;
} else {
/* clflush */
if (!(s->cpuid_features & CPUID_CLFLUSH))
goto illegal_op;
}
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
} }
break; break;