diff options
author | Avi Kivity <avi@redhat.com> | 2010-05-09 14:45:35 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-05-09 14:45:35 +0300 |
commit | 8ed4b8695001d4ee8b1e481b0f5a26e6f3b3e204 (patch) | |
tree | 12710387618f60eeca15048d2524f7b0de49dc62 /cpu-exec.c | |
parent | 78b84fdb9b8319e42544fd01694dace7a6f99ad4 (diff) | |
parent | 72139e83a98eba2bfed2dbc2db2818fb19e47ca0 (diff) |
Merge commit '72139e83a98eba2bfed2dbc2db2818fb19e47ca0' into upstream-merge
* commit '72139e83a98eba2bfed2dbc2db2818fb19e47ca0': (23 commits)
mips-dis: Add missing static attributes
tcg: Add missing 'static' attribute
qcow2: Remove static forward declaration
Revert "Fix OpenBSD build"
Fill in unassigned mem read/write callbacks.
darwin-user: Add missing static attribute
Add missing 'static' attribute
sparc64: fix build with older gccs
sparc64: handle asi referencing nucleus and secondary MMU contexts
sparc64: implement global translation table entries v1
sparc64: more ultrasparc asi extensions for disassembler
qemu: address todo comment in exec.c
Fix zero-length write(2).
Better default guest_base
Remove PAGE_RESERVED
Avoid libaio for usermode
Enable -d cpu logging by default.
target-sh4: Remove duplicate CPU log.
target-ppc: Remove duplicate cpu log.
target-mips: Remove duplicate CPU log.
...
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r-- | cpu-exec.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index a45200a48..ae862731e 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -553,40 +553,24 @@ int cpu_exec(CPUState *env1) env->exception_index = EXCP_INTERRUPT; cpu_loop_exit(); } -#ifdef CONFIG_DEBUG_EXEC +#if defined(DEBUG_DISAS) || defined(CONFIG_DEBUG_EXEC) if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) { /* restore flags in standard format */ #if defined(TARGET_I386) env->eflags = env->eflags | helper_cc_compute_all(CC_OP) | (DF & DF_MASK); log_cpu_state(env, X86_DUMP_CCOP); env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); -#elif defined(TARGET_ARM) - log_cpu_state(env, 0); -#elif defined(TARGET_SPARC) - log_cpu_state(env, 0); -#elif defined(TARGET_PPC) - log_cpu_state(env, 0); #elif defined(TARGET_M68K) cpu_m68k_flush_flags(env, env->cc_op); env->cc_op = CC_OP_FLAGS; env->sr = (env->sr & 0xffe0) | env->cc_dest | (env->cc_x << 4); log_cpu_state(env, 0); -#elif defined(TARGET_MICROBLAZE) - log_cpu_state(env, 0); -#elif defined(TARGET_MIPS) - log_cpu_state(env, 0); -#elif defined(TARGET_SH4) - log_cpu_state(env, 0); -#elif defined(TARGET_ALPHA) - log_cpu_state(env, 0); -#elif defined(TARGET_CRIS) - log_cpu_state(env, 0); #else -#error unsupported target CPU + log_cpu_state(env, 0); #endif } -#endif +#endif /* DEBUG_DISAS || CONFIG_DEBUG_EXEC */ spin_lock(&tb_lock); tb = tb_find_fast(); /* Note: we do it here to avoid a gcc bug on Mac OS X when |