Patchwork [2/3] kill regs_to_env and env_to_regs

login
register
mail settings
Submitter Paolo Bonzini
Date Jan. 15, 2010, 7:56 a.m.
Message ID <1263542196-12842-3-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/42952/
State New
Headers show

Comments

Paolo Bonzini - Jan. 15, 2010, 7:56 a.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 cpu-exec.c               |    9 ---------
 target-alpha/exec.h      |    8 --------
 target-arm/exec.h        |    8 --------
 target-cris/exec.h       |    8 --------
 target-i386/exec.h       |    8 --------
 target-m68k/exec.h       |    8 --------
 target-microblaze/exec.h |    8 --------
 target-mips/exec.h       |    8 --------
 target-ppc/exec.h        |    8 --------
 target-s390x/exec.h      |    8 --------
 target-sh4/exec.h        |   10 ----------
 target-sparc/exec.h      |    8 --------
 12 files changed, 0 insertions(+), 99 deletions(-)

Patch

diff --git a/cpu-exec.c b/cpu-exec.c
index 4635be3..a426db9 100644
--- 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 3533eb1..66526e2 100644
--- 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 e9848e1..0225c3f 100644
--- 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 0b6c5eb..728aa80 100644
--- 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 e8365b1..1fd74fd 100644
--- 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 9aad5fa..1267bb6 100644
--- 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 552f622..646701c 100644
--- 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 8a118bb..01e9c4d 100644
--- 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 ef1e44b..09f592c 100644
--- 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 13dc7dd..8ac3d8d 100644
--- 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 1c08eaf..edd667d 100644
--- 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 3e021e9..70df828 100644
--- 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);