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

target/i386: Split out check_vm86_iopl

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

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

@ -1292,6 +1292,16 @@ static bool check_cpl0(DisasContext *s)
return false; return false;
} }
/* If vm86, check for iopl == 3; if not, raise #GP and return false. */
static bool check_vm86_iopl(DisasContext *s)
{
if (!s->vm86 || s->iopl == 3) {
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)
{ {
@ -6579,8 +6589,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
gen_svm_check_intercept(s, pc_start, SVM_EXIT_IRET); gen_svm_check_intercept(s, pc_start, SVM_EXIT_IRET);
if (!s->pe || s->vm86) { if (!s->pe || s->vm86) {
/* real mode or vm86 mode */ /* real mode or vm86 mode */
if (s->vm86 && s->iopl != 3) { if (!check_vm86_iopl(s)) {
gen_exception_gpf(s);
break; break;
} }
gen_helper_iret_real(cpu_env, tcg_const_i32(dflag - 1)); gen_helper_iret_real(cpu_env, tcg_const_i32(dflag - 1));
@ -6700,9 +6709,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
/* flags */ /* flags */
case 0x9c: /* pushf */ case 0x9c: /* pushf */
gen_svm_check_intercept(s, pc_start, SVM_EXIT_PUSHF); gen_svm_check_intercept(s, pc_start, SVM_EXIT_PUSHF);
if (s->vm86 && s->iopl != 3) { if (check_vm86_iopl(s)) {
gen_exception_gpf(s);
} else {
gen_update_cc_op(s); gen_update_cc_op(s);
gen_helper_read_eflags(s->T0, cpu_env); gen_helper_read_eflags(s->T0, cpu_env);
gen_push_v(s, s->T0); gen_push_v(s, s->T0);
@ -6710,9 +6717,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
break; break;
case 0x9d: /* popf */ case 0x9d: /* popf */
gen_svm_check_intercept(s, pc_start, SVM_EXIT_POPF); gen_svm_check_intercept(s, pc_start, SVM_EXIT_POPF);
if (s->vm86 && s->iopl != 3) { if (check_vm86_iopl(s)) {
gen_exception_gpf(s);
} else {
ot = gen_pop_T0(s); ot = gen_pop_T0(s);
if (s->cpl == 0) { if (s->cpl == 0) {
if (dflag != MO_16) { if (dflag != MO_16) {
@ -7072,9 +7077,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
break; break;
case 0xcd: /* int N */ case 0xcd: /* int N */
val = x86_ldub_code(env, s); val = x86_ldub_code(env, s);
if (s->vm86 && s->iopl != 3) { if (check_vm86_iopl(s)) {
gen_exception_gpf(s);
} else {
gen_interrupt(s, val, pc_start - s->cs_base, s->pc - s->cs_base); gen_interrupt(s, val, pc_start - s->cs_base, s->pc - s->cs_base);
} }
break; break;