inline cpu_halted into sole caller

[qemu.git] / target-sh4 / exec.h

diff --git a/target-sh4/exec.h b/target-sh4/exec.h
index 1c08eafa6ccd0bbe6af71b9c821c231ec6637a4f..9f1c1f6a005ebb2f529ccbafc7321ebc42871c53 100644 (file)
--- a/target-sh4/exec.h
+++ b/target-sh4/exec.h
@@ -32,29 +32,14 @@ static inline int cpu_has_work(CPUState *env)
     return (env->interrupt_request & CPU_INTERRUPT_HARD);
 }
 
-static inline int cpu_halted(CPUState *env) {
-    if (!env->halted)
-        return 0;
-    if (cpu_has_work(env)) {
-        env->halted = 0;
-        env->intr_at_halt = 1;
-        return 0;
-    }
-    return EXCP_HALTED;
-}
-
 #ifndef CONFIG_USER_ONLY
 #include "softmmu_exec.h"
 #endif
 
-static inline void regs_to_env(void)
-{
-    /* XXXXX */
-}
-
-static inline void env_to_regs(void)
+static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
 {
-    /* XXXXX */
+    env->pc = tb->pc;
+    env->flags = tb->flags;
 }
 
 #endif                         /* _EXEC_SH4_H */