commit bf7a22f3a6c38d359d2e933dec4706d1c7375f0a
author David 'Digit' Turner <digit@google.com> Tue Mar 25 16:36:03 2014 +0100
committer David 'Digit' Turner <digit@google.com> Wed Apr 09 19:43:25 2014 +0200
tree 3fa9c2d9cdd581ab2b6e4d1b89258e9edc0edfb6
parent fed223d2bab55eda155e3463b9cb6966e69dd73c

Move cpu_xxx functions to qom/cpu.h

This patch moves a few CPU-releated function declarations to
include/qom/cpu.h, while changing their signature to take a
CPUState instead of a CPUOldState.

Change-Id: I5f09b522dc755be334973a27f58b6704fbccc4c6

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index 3cfc079..026a251 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -45,9 +45,9 @@
 //#define CONFIG_DEBUG_EXEC
 //#define DEBUG_SIGNAL
 
-bool qemu_cpu_has_work(CPUOldState *env)
+bool qemu_cpu_has_work(CPUState *cpu)
 {
-    return cpu_has_work(ENV_GET_CPU(env));
+    return cpu_has_work(cpu);
 }
 
 void cpu_loop_exit(CPUArchState* env)
@@ -547,16 +547,16 @@
 #if defined(TARGET_I386)
                     env->eflags = env->eflags | cpu_cc_compute_all(env, CC_OP)
                         | (DF & DF_MASK);
-                    log_cpu_state(env, X86_DUMP_CCOP);
+                    log_cpu_state(cpu, X86_DUMP_CCOP);
                     env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
 #elif defined(TARGET_M68K)
                     cpu_m68k_flush_flags(env, env->cc_op);
                     env->cc_op = CC_OP_FLAGS;
                     env->sr = (env->sr & 0xffe0)
                               | env->cc_dest | (env->cc_x << 4);
-                    log_cpu_state(env, 0);
+                    log_cpu_state(cpu, 0);
 #else
-                    log_cpu_state(env, 0);
+                    log_cpu_state(cpu, 0);
 #endif
                 }
 #endif /* DEBUG_DISAS || CONFIG_DEBUG_EXEC */