Commit 75d0187a52af2afd92c6c7f34e3f089733946766
1 parent
bd0c5661
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
Showing
3 changed files
with
0 additions
and
19 deletions
cpu-exec.c
@@ -246,11 +246,6 @@ int cpu_exec(CPUState *env1) | @@ -246,11 +246,6 @@ int cpu_exec(CPUState *env1) | ||
246 | { | 246 | { |
247 | #define DECLARE_HOST_REGS 1 | 247 | #define DECLARE_HOST_REGS 1 |
248 | #include "hostregs_helper.h" | 248 | #include "hostregs_helper.h" |
249 | -#if defined(TARGET_SPARC) | ||
250 | -#if defined(reg_REGWPTR) | ||
251 | - uint32_t *saved_regwptr; | ||
252 | -#endif | ||
253 | -#endif | ||
254 | int ret, interrupt_request; | 249 | int ret, interrupt_request; |
255 | TranslationBlock *tb; | 250 | TranslationBlock *tb; |
256 | uint8_t *tc_ptr; | 251 | uint8_t *tc_ptr; |
@@ -273,9 +268,6 @@ int cpu_exec(CPUState *env1) | @@ -273,9 +268,6 @@ int cpu_exec(CPUState *env1) | ||
273 | CC_OP = CC_OP_EFLAGS; | 268 | CC_OP = CC_OP_EFLAGS; |
274 | env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); | 269 | env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); |
275 | #elif defined(TARGET_SPARC) | 270 | #elif defined(TARGET_SPARC) |
276 | -#if defined(reg_REGWPTR) | ||
277 | - saved_regwptr = REGWPTR; | ||
278 | -#endif | ||
279 | #elif defined(TARGET_M68K) | 271 | #elif defined(TARGET_M68K) |
280 | env->cc_op = CC_OP_FLAGS; | 272 | env->cc_op = CC_OP_FLAGS; |
281 | env->cc_dest = env->sr & 0xf; | 273 | env->cc_dest = env->sr & 0xf; |
@@ -562,8 +554,6 @@ int cpu_exec(CPUState *env1) | @@ -562,8 +554,6 @@ int cpu_exec(CPUState *env1) | ||
562 | #elif defined(TARGET_ARM) | 554 | #elif defined(TARGET_ARM) |
563 | cpu_dump_state(env, logfile, fprintf, 0); | 555 | cpu_dump_state(env, logfile, fprintf, 0); |
564 | #elif defined(TARGET_SPARC) | 556 | #elif defined(TARGET_SPARC) |
565 | - REGWPTR = env->regbase + (env->cwp * 16); | ||
566 | - env->regwptr = REGWPTR; | ||
567 | cpu_dump_state(env, logfile, fprintf, 0); | 557 | cpu_dump_state(env, logfile, fprintf, 0); |
568 | #elif defined(TARGET_PPC) | 558 | #elif defined(TARGET_PPC) |
569 | cpu_dump_state(env, logfile, fprintf, 0); | 559 | cpu_dump_state(env, logfile, fprintf, 0); |
@@ -640,9 +630,6 @@ int cpu_exec(CPUState *env1) | @@ -640,9 +630,6 @@ int cpu_exec(CPUState *env1) | ||
640 | #elif defined(TARGET_ARM) | 630 | #elif defined(TARGET_ARM) |
641 | /* XXX: Save/restore host fpu exception state?. */ | 631 | /* XXX: Save/restore host fpu exception state?. */ |
642 | #elif defined(TARGET_SPARC) | 632 | #elif defined(TARGET_SPARC) |
643 | -#if defined(reg_REGWPTR) | ||
644 | - REGWPTR = saved_regwptr; | ||
645 | -#endif | ||
646 | #elif defined(TARGET_PPC) | 633 | #elif defined(TARGET_PPC) |
647 | #elif defined(TARGET_M68K) | 634 | #elif defined(TARGET_M68K) |
648 | cpu_m68k_flush_flags(env, env->cc_op); | 635 | cpu_m68k_flush_flags(env, env->cc_op); |
target-sparc/exec.h
@@ -4,7 +4,6 @@ | @@ -4,7 +4,6 @@ | ||
4 | #include "dyngen-exec.h" | 4 | #include "dyngen-exec.h" |
5 | 5 | ||
6 | register struct CPUSPARCState *env asm(AREG0); | 6 | register struct CPUSPARCState *env asm(AREG0); |
7 | -#define REGWPTR env->regwptr | ||
8 | 7 | ||
9 | #define FT0 (env->ft0) | 8 | #define FT0 (env->ft0) |
10 | #define FT1 (env->ft1) | 9 | #define FT1 (env->ft1) |
@@ -18,10 +17,6 @@ register struct CPUSPARCState *env asm(AREG0); | @@ -18,10 +17,6 @@ register struct CPUSPARCState *env asm(AREG0); | ||
18 | 17 | ||
19 | static inline void env_to_regs(void) | 18 | static inline void env_to_regs(void) |
20 | { | 19 | { |
21 | -#if defined(reg_REGWPTR) | ||
22 | - REGWPTR = env->regbase + (env->cwp * 16); | ||
23 | - env->regwptr = REGWPTR; | ||
24 | -#endif | ||
25 | } | 20 | } |
26 | 21 | ||
27 | static inline void regs_to_env(void) | 22 | static inline void regs_to_env(void) |
target-sparc/op_helper.c
@@ -2629,7 +2629,6 @@ void cpu_set_cwp(CPUState *env1, int new_cwp) | @@ -2629,7 +2629,6 @@ void cpu_set_cwp(CPUState *env1, int new_cwp) | ||
2629 | if (new_cwp == (NWINDOWS - 1)) | 2629 | if (new_cwp == (NWINDOWS - 1)) |
2630 | memcpy32(env1->regbase + NWINDOWS * 16, env1->regbase); | 2630 | memcpy32(env1->regbase + NWINDOWS * 16, env1->regbase); |
2631 | env1->regwptr = env1->regbase + (new_cwp * 16); | 2631 | env1->regwptr = env1->regbase + (new_cwp * 16); |
2632 | - REGWPTR = env1->regwptr; | ||
2633 | } | 2632 | } |
2634 | 2633 | ||
2635 | void set_cwp(int new_cwp) | 2634 | void set_cwp(int new_cwp) |