SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386: rdpkru/wrpkru are no-prefix instructions

Browse Source 
Reject 0x66/0xf3/0xf2 in front of them.

Cc: qemu-stable@nongnu.org
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 40a3ec7b5ffde500789d016660a171057d6b467c)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Paolo Bonzini 2024-05-09 15:55:47 +02:00 committed by Michael Tokarev
parent 08eb23e4c9
commit 1e5c6ceb27
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6089,7 +6089,8 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1);
break; break;
case 0xee: /* rdpkru */ case 0xee: /* rdpkru */
if (prefixes & PREFIX_LOCK) { if (s->prefix & (PREFIX_LOCK | PREFIX_DATA
| PREFIX_REPZ | PREFIX_REPNZ)) {
goto illegal_op; goto illegal_op;
} }
tcg_gen_trunc_tl_i32(s->tmp2_i32, cpu_regs[R_ECX]); tcg_gen_trunc_tl_i32(s->tmp2_i32, cpu_regs[R_ECX]);
@ -6097,7 +6098,8 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
tcg_gen_extr_i64_tl(cpu_regs[R_EAX], cpu_regs[R_EDX], s->tmp1_i64); tcg_gen_extr_i64_tl(cpu_regs[R_EAX], cpu_regs[R_EDX], s->tmp1_i64);
break; break;
case 0xef: /* wrpkru */ case 0xef: /* wrpkru */
if (prefixes & PREFIX_LOCK) { if (s->prefix & (PREFIX_LOCK | PREFIX_DATA
| PREFIX_REPZ | PREFIX_REPNZ)) {
goto illegal_op; goto illegal_op;
} }
tcg_gen_concat_tl_i64(s->tmp1_i64, cpu_regs[R_EAX], tcg_gen_concat_tl_i64(s->tmp1_i64, cpu_regs[R_EAX],