Commit e607784f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



This fixes a target-i386 emulation regression

# gpg: Signature made Wed 19 Feb 2014 15:42:12 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  target-i386: Fix I/O bitmap checks for in/out

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9bd9d5e3 6d093a4f

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);