mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This fixes a target-i386 emulation regression

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTBNDUAAoJEH8JsnLIjy/WcCgQAIuAeFf5GEnWni7PefXtg/w8
 8kfuzOQgfL9JH+IzUdMSz9M2aUwxpzlp7gxbF5J/LE3D6cQDu85Lyhb/09fbu29J
 7md62kbgLyHwETkqXwa8V/el62IMpV4WQCd5hpHNyajzFP8WtCVrYZEOfUPoAE3i
 w6Ze0ArE9kBptrkojGOs4NFpONn06wlo0q3sj6fK1DQpObpd+YPb8Nz65XFglGPg
 B+G7wkkygLEsa7J5c9eU4dYUXXAvzvHZ/TEzoWLbAjEtWDekHO7sHzz6lI3wF4Ho
 elDjuKTj2flyYV4x/bHw0sJIiN5RT33En3ApPmBpB8xlTYpjKiXasR0hhaEcqPcJ
 BQXAlZM9eiK2D0rB2godJFFxCXkHJatmWihvFAgaFrH9pvWT8m9HU2R6ytybd2Oe
 jOnOd9Z+h+fRH8p9jkKKhyOZyFlEFsx2Iz6OAhH+t54tv9seO/6N7H8hJjqy+Jl9
 0DRAsd22lejTLndiny13Kn/qjIVh/5OQhTB37FQA0HOijcTLxbAg0QRG6FN1cEzI
 88lZLvoC7cvZAdWQqaAw45V82g0MH81tbdD3NO286+APydot130Mc5k7pMWz8Znm
 xiB72N/xFXEac3apnDU/A+2JQe74xT4yPHjwHXucz5ZCMItHNGJ2BYoMW7rzGw8W
 rmO4TAkcwYDctK9kEkEb
 =Tqyg
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-02-21 14:31:05 +00:00
commit e607784fed
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-i386/translate.c
View File

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