@@ -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(;;) */
@@ -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);
@@ -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 &
@@ -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
@@ -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;
@@ -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
@@ -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
@@ -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 &
@@ -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));
@@ -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) {
@@ -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 */
@@ -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);
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(-)