Remove unused (for now) reg_REGWPTR (original patch by Glauber Costa)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4617 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/cpu-exec.c b/cpu-exec.c
index b660954..ea0e5b1 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -246,11 +246,6 @@ int cpu_exec(CPUState *env1)
 {
 #define DECLARE_HOST_REGS 1
 #include "hostregs_helper.h"
-#if defined(TARGET_SPARC)
-#if defined(reg_REGWPTR)
-    uint32_t *saved_regwptr;
-#endif
-#endif
     int ret, interrupt_request;
     TranslationBlock *tb;
     uint8_t *tc_ptr;
@@ -273,9 +268,6 @@ int cpu_exec(CPUState *env1)
     CC_OP = CC_OP_EFLAGS;
     env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
 #elif defined(TARGET_SPARC)
-#if defined(reg_REGWPTR)
-    saved_regwptr = REGWPTR;
-#endif
 #elif defined(TARGET_M68K)
     env->cc_op = CC_OP_FLAGS;
     env->cc_dest = env->sr & 0xf;
@@ -562,8 +554,6 @@ int cpu_exec(CPUState *env1)
 #elif defined(TARGET_ARM)
                     cpu_dump_state(env, logfile, fprintf, 0);
 #elif defined(TARGET_SPARC)
-                   REGWPTR = env->regbase + (env->cwp * 16);
-                   env->regwptr = REGWPTR;
                     cpu_dump_state(env, logfile, fprintf, 0);
 #elif defined(TARGET_PPC)
                     cpu_dump_state(env, logfile, fprintf, 0);
@@ -640,9 +630,6 @@ int cpu_exec(CPUState *env1)
 #elif defined(TARGET_ARM)
     /* XXX: Save/restore host fpu exception state?.  */
 #elif defined(TARGET_SPARC)
-#if defined(reg_REGWPTR)
-    REGWPTR = saved_regwptr;
-#endif
 #elif defined(TARGET_PPC)
 #elif defined(TARGET_M68K)
     cpu_m68k_flush_flags(env, env->cc_op);

diff --git a/target-sparc/exec.h b/target-sparc/exec.h
index 3ef0cf9..c6ff950 100644 (file)
--- a/target-sparc/exec.h
+++ b/target-sparc/exec.h
@@ -4,7 +4,6 @@
 #include "dyngen-exec.h"
 
 register struct CPUSPARCState *env asm(AREG0);
-#define REGWPTR env->regwptr
 
 #define FT0 (env->ft0)
 #define FT1 (env->ft1)
@@ -18,10 +17,6 @@ register struct CPUSPARCState *env asm(AREG0);
 
 static inline void env_to_regs(void)
 {
-#if defined(reg_REGWPTR)
-    REGWPTR = env->regbase + (env->cwp * 16);
-    env->regwptr = REGWPTR;
-#endif
 }
 
 static inline void regs_to_env(void)

diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c
index 2aae955..3c04fe5 100644 (file)
--- a/target-sparc/op_helper.c
+++ b/target-sparc/op_helper.c
@@ -2629,7 +2629,6 @@ void cpu_set_cwp(CPUState *env1, int new_cwp)
     if (new_cwp == (NWINDOWS - 1))
         memcpy32(env1->regbase + NWINDOWS * 16, env1->regbase);
     env1->regwptr = env1->regbase + (new_cwp * 16);
-    REGWPTR = env1->regwptr;
 }
 
 void set_cwp(int new_cwp)