kill regs_to_env and env_to_regs

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/cpu-exec.c b/cpu-exec.c
index 4635be34f562cef259291c52b4b0bb75171b4dba..a426db9cc0d9b68956d869a46de2074f12656dbf 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -56,9 +56,6 @@ int qemu_cpu_has_work(CPUState *env)
 
 void cpu_loop_exit(void)
 {
-    /* NOTE: the register at this point must be saved by hand because
-       longjmp restore them */
-    regs_to_env();
     longjmp(env->jmp_env, 1);
 }
 
@@ -130,8 +127,6 @@ static TranslationBlock *tb_find_slow(target_ulong pc,
 
     tb_invalidated_flag = 0;
 
-    regs_to_env(); /* XXX: do it just before cpu_gen_code() */
-
     /* find translated block using physical mappings */
     phys_pc = get_phys_addr_code(env, pc);
     phys_page1 = phys_pc & TARGET_PAGE_MASK;
@@ -230,7 +225,6 @@ int cpu_exec(CPUState *env1)
 #include "hostregs_helper.h"
     env = env1;
 
-    env_to_regs();
 #if defined(TARGET_I386)
     /* put eflags in CPU temporary format */
     CC_SRC = env->eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
@@ -544,7 +538,6 @@ int cpu_exec(CPUState *env1)
 #ifdef CONFIG_DEBUG_EXEC
                 if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) {
                     /* restore flags in standard format */
-                    regs_to_env();
 #if defined(TARGET_I386)
                     env->eflags = env->eflags | helper_cc_compute_all(CC_OP) | (DF & DF_MASK);
                     log_cpu_state(env, X86_DUMP_CCOP);
@@ -651,8 +644,6 @@ int cpu_exec(CPUState *env1)
                 /* reset soft MMU for next block (it can currently
                    only be set by a memory fault) */
             } /* for(;;) */
-        } else {
-            env_to_regs();
         }
     } /* for(;;) */
 

diff --git a/target-alpha/exec.h b/target-alpha/exec.h
index 3533eb1719abc05e36e2aeb2b2eb62eb64b4908c..66526e24bc6b2f673128cbdbd74294ac79102acb 100644 (file)
--- a/target-alpha/exec.h
+++ b/target-alpha/exec.h
@@ -39,14 +39,6 @@ register struct CPUAlphaState *env asm(AREG0);
 #include "softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 static inline int cpu_has_work(CPUState *env)
 {
     return (env->interrupt_request & CPU_INTERRUPT_HARD);

diff --git a/target-arm/exec.h b/target-arm/exec.h
index e9848e1d898ebcead958d3d9235286fdcf5a3f41..0225c3fcd3540d44dc535ab68c478c5b6e9840a9 100644 (file)
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -26,14 +26,6 @@ register struct CPUARMState *env asm(AREG0);
 #include "cpu.h"
 #include "exec-all.h"
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 static inline int cpu_has_work(CPUState *env)
 {
     return (env->interrupt_request &

diff --git a/target-cris/exec.h b/target-cris/exec.h
index 0b6c5ebf2c3f8aa0f84d4e2295d78ff002978e0a..728aa8077cbd3d1d8b19ce0b78d83b5e99604055 100644 (file)
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -24,14 +24,6 @@ register struct CPUCRISState *env asm(AREG0);
 #include "cpu.h"
 #include "exec-all.h"
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 #if !defined(CONFIG_USER_ONLY)
 #include "softmmu_exec.h"
 #endif

diff --git a/target-i386/exec.h b/target-i386/exec.h
index e8365b193dc5261f80eb9d14780bc14473b4afb3..1fd74fd6953ba010cdf4f23214215a3c91f4c835 100644 (file)
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -290,14 +290,6 @@ static inline void load_eflags(int eflags, int update_mask)
         (eflags & update_mask) | 0x2;
 }
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 static inline int cpu_has_work(CPUState *env)
 {
     int work;

diff --git a/target-m68k/exec.h b/target-m68k/exec.h
index 9aad5fa1ec6410f752a0853de706f4da489ee650..1267bb600fdd27fcc3dd7f48d862225e6e81b8ff 100644 (file)
--- a/target-m68k/exec.h
+++ b/target-m68k/exec.h
@@ -28,14 +28,6 @@ register uint32_t T0 asm(AREG1);
 #include "cpu.h"
 #include "exec-all.h"
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 #if !defined(CONFIG_USER_ONLY)
 #include "softmmu_exec.h"
 #endif

diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h
index 552f6224da879c3c7f32a964a2de3c75aea25cc5..646701c2142524a6b4effa1b6673c24a12c9e017 100644 (file)
--- a/target-microblaze/exec.h
+++ b/target-microblaze/exec.h
@@ -23,14 +23,6 @@ register struct CPUMBState *env asm(AREG0);
 #include "cpu.h"
 #include "exec-all.h"
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 #if !defined(CONFIG_USER_ONLY)
 #include "softmmu_exec.h"
 #endif

diff --git a/target-mips/exec.h b/target-mips/exec.h
index 8a118bb6b3b18da5ec67a692c33692d91ad4a826..01e9c4d7a24e637c2892ddd3dd552fc2bb25fd17 100644 (file)
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -25,14 +25,6 @@ void fpu_dump_state(CPUState *env, FILE *f,
 void cpu_mips_clock_init (CPUState *env);
 void cpu_mips_tlb_flush (CPUState *env, int flush_global);
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 static inline int cpu_has_work(CPUState *env)
 {
     return (env->interrupt_request &

diff --git a/target-ppc/exec.h b/target-ppc/exec.h
index ef1e44bda467586591b0c3473d6b111d1a666cd4..09f592c2a39a225f3187c9b40e4e9b3868fa76bf 100644 (file)
--- a/target-ppc/exec.h
+++ b/target-ppc/exec.h
@@ -35,14 +35,6 @@ register struct CPUPPCState *env asm(AREG0);
 #include "softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 static inline int cpu_has_work(CPUState *env)
 {
     return (msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD));

diff --git a/target-s390x/exec.h b/target-s390x/exec.h
index 13dc7dd0667da09fa302830cca8949be3177da16..8ac3d8d29f2d82bb3b0a135e2b6b0724f3c6bfdc 100644 (file)
--- a/target-s390x/exec.h
+++ b/target-s390x/exec.h
@@ -35,14 +35,6 @@ static inline int cpu_has_work(CPUState *env)
     return env->interrupt_request & CPU_INTERRUPT_HARD; // guess
 }
 
-static inline void regs_to_env(void)
-{
-}
-
-static inline void env_to_regs(void)
-{
-}
-
 static inline int cpu_halted(CPUState *env)
 {
     if (!env->halted) {

diff --git a/target-sh4/exec.h b/target-sh4/exec.h
index 1c08eafa6ccd0bbe6af71b9c821c231ec6637a4f..edd667d70316e81b0f42e73f8e6d27f6e23457bd 100644 (file)
--- a/target-sh4/exec.h
+++ b/target-sh4/exec.h
@@ -47,14 +47,4 @@ static inline int cpu_halted(CPUState *env) {
 #include "softmmu_exec.h"
 #endif
 
-static inline void regs_to_env(void)
-{
-    /* XXXXX */
-}
-
-static inline void env_to_regs(void)
-{
-    /* XXXXX */
-}
-
 #endif                         /* _EXEC_SH4_H */

diff --git a/target-sparc/exec.h b/target-sparc/exec.h
index 3e021e93cfde2eaf3ae14f53229d62abe5b9fefc..70df828d234f3934a7c0d44a8a8878bd8e054b8a 100644 (file)
--- a/target-sparc/exec.h
+++ b/target-sparc/exec.h
@@ -13,14 +13,6 @@ register struct CPUSPARCState *env asm(AREG0);
 #include "cpu.h"
 #include "exec-all.h"
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 /* op_helper.c */
 void do_interrupt(CPUState *env);