[Qemu-devel] [PATCH] i386: fix read/write cr with icount option

[Mihail Abakumov <mikhail.abakumov@ispras.ru>]

Running Windows with icount causes a crash in instruction of write cr. 
This patch fixes it.

Reading and writing cr cause an icount read because there are called 
cpu_get_apic_tpr and cpu_set_apic_tpr functions. So, there is need 
gen_io_start()/gen_io_end() calls.

---
  target/i386/translate.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)

diff --git a/target/i386/translate.c b/target/i386/translate.c
index 06d8833..3b009bd 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -7907,14 +7907,26 @@ static target_ulong disas_insn(CPUX86State *env, 
DisasContext *s,
                  gen_update_cc_op(s);
                  gen_jmp_im(pc_start - s->cs_base);
                  if (b & 2) {
+                    if (s->tb->cflags & CF_USE_ICOUNT) {
+                        gen_io_start();
+                    }
                      gen_op_mov_v_reg(ot, cpu_T0, rm);
                      gen_helper_write_crN(cpu_env, tcg_const_i32(reg),
                                           cpu_T0);
+                    if (s->tb->cflags & CF_USE_ICOUNT) {
+                        gen_io_end();
+                    }
                      gen_jmp_im(s->pc - s->cs_base);
                      gen_eob(s);
                  } else {
+                    if (s->tb->cflags & CF_USE_ICOUNT) {
+                        gen_io_start();
+                    }
                      gen_helper_read_crN(cpu_T0, cpu_env, 
tcg_const_i32(reg));
                      gen_op_mov_reg_v(ot, rm, cpu_T0);
+                    if (s->tb->cflags & CF_USE_ICOUNT) {
+                        gen_io_end();
+                    }
                  }
                  break;
              default:
-- 
1.9.1