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

target/i386: Split out check_iopl 

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210514151342.384376-6-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-05-14 10:12:57 -05:00
parent aa9f21b1f0
commit ca7874c2fa
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1302,6 +1302,16 @@ static bool check_vm86_iopl(DisasContext *s)
return false; return false;
} }
/* Check for iopl allowing access; if not, raise #GP and return false. */
static bool check_iopl(DisasContext *s)
{
if (s->vm86 ? s->iopl == 3 : s->cpl <= s->iopl) {
return true;
}
gen_exception_gpf(s);
return false;
}
/* if d == OR_TMP0, it means memory operand (address in A0) */ /* if d == OR_TMP0, it means memory operand (address in A0) */
static void gen_op(DisasContext *s1, int op, MemOp ot, int d) static void gen_op(DisasContext *s1, int op, MemOp ot, int d)
{ {
@ -7095,28 +7105,16 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
break; break;
#endif #endif
case 0xfa: /* cli */ case 0xfa: /* cli */
if (!s->vm86) { if (check_iopl(s)) {
if (s->cpl <= s->iopl) {
gen_helper_cli(cpu_env); gen_helper_cli(cpu_env);
} else {
gen_exception_gpf(s);
}
} else {
if (s->iopl == 3) {
gen_helper_cli(cpu_env);
} else {
gen_exception_gpf(s);
}
} }
break; break;
case 0xfb: /* sti */ case 0xfb: /* sti */
if (s->vm86 ? s->iopl == 3 : s->cpl <= s->iopl) { if (check_iopl(s)) {
gen_helper_sti(cpu_env); gen_helper_sti(cpu_env);
/* interruptions are enabled only the first insn after sti */ /* interruptions are enabled only the first insn after sti */
gen_jmp_im(s, s->pc - s->cs_base); gen_jmp_im(s, s->pc - s->cs_base);
gen_eob_inhibit_irq(s, true); gen_eob_inhibit_irq(s, true);
} else {
gen_exception_gpf(s);
} }
break; break;
case 0x62: /* bound */ case 0x62: /* bound */