diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 19:38:52 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 19:38:52 -0200 |
| commit | 173a233e65e02f1f140b4c109f3d17eebe6c3abf (patch) | |
| tree | f5508496c09232280fa06ca88225eba3b1544db6 /cpu-exec.c | |
| parent | 3e446abd89287bcb296531616b5c873b4275f7d8 (diff) | |
| parent | 49a945a3c0107463de3e57394622eff251e52fc4 (diff) | |
Merge commit '49a945a3c0107463de3e57394622eff251e52fc4' into upstream-merge
* commit '49a945a3c0107463de3e57394622eff251e52fc4': (28 commits)
kill regs_to_env and env_to_regs
remove dead code from target-i386/exec.h
rtl8139: fix clang reporting unused assignment of VLAN tagging data
eepro100: Fix multicast support
eepro100: Restructure code (new function tx_command)
Sparc32: Update OpenBIOS image to r666
Sparc: improve CPU register dump
fix linux-user microblaze ELF_ARCH definition
audio: include more information into audio_bug's output
Revert "sdlaudio: make it suck less"
Sparc32: improve DMA controller IRQ debugging
ESP: improve IRQ debugging
sparc32 do not clear interrupts when masking
Update Sparc OpenBIOS images to r665
sparc32 do_unassigned_access overhaul v2
tcg/x86_64: Avoid unnecessary REX.B prefixes.
nand: Correct random data reads.
Makefile: Fix message for missing configure
target-m68k: fix a typo in 'P' packet processing
tcg/x86_64: Special-case all 32-bit AND operands.
...
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 350d743f1..8056b203c 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -60,9 +60,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); } @@ -134,8 +131,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; @@ -234,7 +229,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); @@ -551,7 +545,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); @@ -658,8 +651,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(;;) */ |