diff options
| author | Richard Henderson <rth@twiddle.net> | 2010-04-28 16:07:57 -0700 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-05-05 12:20:06 +0200 |
| commit | a73b1fd9afe937d70be82a0b3994c8844c072085 (patch) | |
| tree | a4c7bae8ccc8bc0ee067f783cdc9e96f1c3b5eb9 | |
| parent | 6f0f607f96f4af5ed54391b960686c557f8738d6 (diff) | |
Enable -d cpu logging by default.
When -d cpu logging was handled by target-foo/translate.c,
it was controled by DEBUG_DISAS, which is enabled by default.
Use the same condition in cpu_exec.
At the same time, reduce the if-deffery by assuming no flags
update is required for the target.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -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 0f84857b1f..dc81e79435 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -546,40 +546,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 |