From 93fcfe39a0383377e647b821c9f165fd927cd4e0 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 15 Jan 2009 22:34:14 +0000 Subject: Convert references to logfile/loglevel to use qemu_log*() macros This is a large patch that changes all occurrences of logfile/loglevel global variables to use the new qemu_log*() macros. Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6338 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-sh4/helper.c | 6 +++--- target-sh4/translate.c | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'target-sh4') diff --git a/target-sh4/helper.c b/target-sh4/helper.c index a790aeb0..d4e0a84 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -151,9 +151,9 @@ void do_interrupt(CPUState * env) expname = do_irq ? "interrupt" : "???"; break; } - fprintf(logfile, "exception 0x%03x [%s] raised\n", - irq_vector, expname); - cpu_dump_state(env, logfile, fprintf, 0); + qemu_log("exception 0x%03x [%s] raised\n", + irq_vector, expname); + log_cpu_state(env, 0); } env->ssr = env->sr; diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 7e36cf8..0f48bf1 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -1840,11 +1840,9 @@ gen_intermediate_code_internal(CPUState * env, TranslationBlock * tb, ctx.features = env->features; #ifdef DEBUG_DISAS - if (loglevel & CPU_LOG_TB_CPU) { - fprintf(logfile, - "------------------------------------------------\n"); - cpu_dump_state(env, logfile, fprintf, 0); - } + qemu_log_mask(CPU_LOG_TB_CPU, + "------------------------------------------------\n"); + log_cpu_state_mask(CPU_LOG_TB_CPU, env, 0); #endif ii = -1; @@ -1937,13 +1935,12 @@ gen_intermediate_code_internal(CPUState * env, TranslationBlock * tb, #ifdef DEBUG_DISAS #ifdef SH4_DEBUG_DISAS - if (loglevel & CPU_LOG_TB_IN_ASM) - fprintf(logfile, "\n"); + qemu_log_mask(CPU_LOG_TB_IN_ASM, "\n"); #endif if (loglevel & CPU_LOG_TB_IN_ASM) { - fprintf(logfile, "IN:\n"); /* , lookup_symbol(pc_start)); */ - target_disas(logfile, pc_start, ctx.pc - pc_start, 0); - fprintf(logfile, "\n"); + qemu_log("IN:\n"); /* , lookup_symbol(pc_start)); */ + log_target_disas(pc_start, ctx.pc - pc_start, 0); + qemu_log("\n"); } #endif } -- cgit v1.1