Commit 6d093a4f authored by Kevin Wolf's avatar Kevin Wolf
Browse files

target-i386: Fix I/O bitmap checks for in/out 



Commit 1b90d56e changed the implementation of in/out imm to not assign
the accessed port number to cpu_T[0] as it appeared unnecessary.
However, currently gen_check_io() makes use of cpu_T[0] to implement the
I/O bitmap checks, so it's in fact still used and the change broke the
check, leading to #GP in legitimate cases (and probably also allowing
access to ports that shouldn't be allowed).

This patch reintroduces the missing assignment for these cases.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
parent 46eef33b

target-i386/translate.c

+2 −0
Original line number Diff line number Diff line
@@ -6284,6 +6284,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, 
    case 0xe5:

        ot = mo_b_d32(b, dflag);

        val = cpu_ldub_code(env, s->pc++);

        tcg_gen_movi_tl(cpu_T[0], val);

        gen_check_io(s, ot, pc_start - s->cs_base,

                     SVM_IOIO_TYPE_MASK | svm_is_rep(prefixes));

        if (use_icount)
@@ -6300,6 +6301,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, 
    case 0xe7:

        ot = mo_b_d32(b, dflag);

        val = cpu_ldub_code(env, s->pc++);

        tcg_gen_movi_tl(cpu_T[0], val);

        gen_check_io(s, ot, pc_start - s->cs_base,

                     svm_is_rep(prefixes));

        gen_op_mov_v_reg(ot, cpu_T[1], R_EAX);