From d3d4468189618e89f74d8f51b8470f277e000938 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Tue, 10 May 2011 17:49:00 +0200
Subject: translate-all.c: minor integrate

---
 exec-all.h              | 3 +--
 sysemu.h                | 4 ----
 target-arm/translate.c  | 3 +--
 target-i386/translate.c | 7 +++----
 translate-all.c         | 2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/exec-all.h b/exec-all.h
index d2cadd4..2322c07 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -60,8 +60,7 @@ extern uint32_t gen_opc_hflags[OPC_BUF_SIZE];
 
 void gen_intermediate_code(CPUState *env, struct TranslationBlock *tb);
 void gen_intermediate_code_pc(CPUState *env, struct TranslationBlock *tb);
-void gen_pc_load(CPUState *env, struct TranslationBlock *tb,
-                 unsigned long searched_pc, int pc_pos, void *puc);
+void restore_state_to_opc(CPUState *env, struct TranslationBlock *tb, int pc_pos);
 
 unsigned long code_gen_max_block_size(void);
 void cpu_gen_init(void);
diff --git a/sysemu.h b/sysemu.h
index 3ab2382..f3b69ae 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -118,10 +118,6 @@ extern int semihosting_enabled;
 extern int old_param;
 extern QEMUClock *rtc_clock;
 
-#ifdef CONFIG_KQEMU
-extern int kqemu_allowed;
-#endif
-
 #define MAX_NODES 64
 extern int nb_numa_nodes;
 extern uint64_t node_mem[MAX_NODES];
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 93ff4ea..019c295 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -9185,8 +9185,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
 #endif
 }
 
-void gen_pc_load(CPUState *env, TranslationBlock *tb,
-                unsigned long searched_pc, int pc_pos, void *puc)
+void restore_state_to_opc(CPUState *env, TranslationBlock *tb, int pc_pos)
 {
     env->regs[15] = gen_opc_pc[pc_pos];
 }
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 29bf601..f4e295f 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -7787,8 +7787,7 @@ void gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
     gen_intermediate_code_internal(env, tb, 1);
 }
 
-void gen_pc_load(CPUState *env, TranslationBlock *tb,
-                unsigned long searched_pc, int pc_pos, void *puc)
+void restore_state_to_opc(CPUState *env, TranslationBlock *tb, int pc_pos)
 {
     int cc_op;
 #ifdef DEBUG_DISAS
@@ -7800,8 +7799,8 @@ void gen_pc_load(CPUState *env, TranslationBlock *tb,
                 qemu_log("0x%04x: " TARGET_FMT_lx "\n", i, gen_opc_pc[i]);
             }
         }
-        qemu_log("spc=0x%08lx pc_pos=0x%x eip=" TARGET_FMT_lx " cs_base=%x\n",
-                searched_pc, pc_pos, gen_opc_pc[pc_pos] - tb->cs_base,
+        qemu_log("pc_pos=0x%x eip=" TARGET_FMT_lx " cs_base=%x\n",
+                pc_pos, gen_opc_pc[pc_pos] - tb->cs_base,
                 (uint32_t)tb->cs_base);
     }
 #endif
diff --git a/translate-all.c b/translate-all.c
index 3830007..0dd742a 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -214,7 +214,7 @@ int cpu_restore_state(TranslationBlock *tb,
         j--;
     env->icount_decr.u16.low -= gen_opc_icount[j];
 
-    gen_pc_load(env, tb, searched_pc, j, puc);
+    restore_state_to_opc(env, tb, j);
 
 #ifdef CONFIG_PROFILER
     s->restore_time += profile_getclock() - ti;
-- 
cgit v1.1