From 6767d33340994593840f23e56b54ee4d5f1562bc Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Mon, 27 Jul 2009 21:18:04 +0200 Subject: [PATCH] Ger rid of regs_to_env and env_to_regs, since they are they are no longer used. --- cpu-exec.c | 9 -------- target-alpha/exec.h | 8 ------- target-arm/exec.h | 8 ------- target-cris/exec.h | 8 ------- target-i386/exec.h | 56 ------------------------------------------------ target-m68k/exec.h | 8 ------- target-microblaze/exec.h | 8 ------- target-mips/exec.h | 8 ------- target-ppc/exec.h | 8 ------- target-sh4/exec.h | 10 --------- target-sparc/exec.h | 8 ------- 11 files changed, 139 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 1718dc4ebf..6820ddfe7a 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); @@ -571,7 +565,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); @@ -689,8 +682,6 @@ int cpu_exec(CPUState *env1) } #endif } /* for(;;) */ - } else { - env_to_regs(); } } /* for(;;) */ diff --git a/target-alpha/exec.h b/target-alpha/exec.h index 35d6a16775..8fc7edb677 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 always_inline void env_to_regs(void) -{ -} - -static always_inline void regs_to_env(void) -{ -} - static always_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 e9848e1d89..0225c3fcd3 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 0b6c5ebf2c..728aa8077c 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 c59c4e872b..fefd48136c 100644 --- a/target-i386/exec.h +++ b/target-i386/exec.h @@ -281,62 +281,6 @@ static inline void load_eflags(int eflags, int update_mask) (eflags & update_mask) | 0x2; } -static inline void env_to_regs(void) -{ -#ifdef reg_EAX - EAX = env->regs[R_EAX]; -#endif -#ifdef reg_ECX - ECX = env->regs[R_ECX]; -#endif -#ifdef reg_EDX - EDX = env->regs[R_EDX]; -#endif -#ifdef reg_EBX - EBX = env->regs[R_EBX]; -#endif -#ifdef reg_ESP - ESP = env->regs[R_ESP]; -#endif -#ifdef reg_EBP - EBP = env->regs[R_EBP]; -#endif -#ifdef reg_ESI - ESI = env->regs[R_ESI]; -#endif -#ifdef reg_EDI - EDI = env->regs[R_EDI]; -#endif -} - -static inline void regs_to_env(void) -{ -#ifdef reg_EAX - env->regs[R_EAX] = EAX; -#endif -#ifdef reg_ECX - env->regs[R_ECX] = ECX; -#endif -#ifdef reg_EDX - env->regs[R_EDX] = EDX; -#endif -#ifdef reg_EBX - env->regs[R_EBX] = EBX; -#endif -#ifdef reg_ESP - env->regs[R_ESP] = ESP; -#endif -#ifdef reg_EBP - env->regs[R_EBP] = EBP; -#endif -#ifdef reg_ESI - env->regs[R_ESI] = ESI; -#endif -#ifdef reg_EDI - env->regs[R_EDI] = EDI; -#endif -} - static inline int cpu_has_work(CPUState *env) { int work; diff --git a/target-m68k/exec.h b/target-m68k/exec.h index 43f1ce9e75..ece9aa09cd 100644 --- a/target-m68k/exec.h +++ b/target-m68k/exec.h @@ -24,14 +24,6 @@ register struct CPUM68KState *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-microblaze/exec.h b/target-microblaze/exec.h index 552f6224da..646701c214 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 8a118bb6b3..01e9c4d7a2 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 0481eb235c..05a5e2e5e4 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 always_inline void env_to_regs (void) -{ -} - -static always_inline void regs_to_env (void) -{ -} - static always_inline int cpu_has_work(CPUState *env) { return (msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD)); diff --git a/target-sh4/exec.h b/target-sh4/exec.h index 1c08eafa6c..edd667d703 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 e120d6fed4..cb6913e53a 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); -- 2.11.4.GIT