diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-15 22:34:14 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-15 22:34:14 +0000 |
| commit | 93fcfe39a0383377e647b821c9f165fd927cd4e0 (patch) | |
| tree | 0c89165b2c8331045c6da46eb2dc4154ef69293a /target-sparc | |
| parent | 6cec5487990bf3f1f22b3fcb871978255e92ae0d (diff) | |
| download | qemu-93fcfe39a0383377e647b821c9f165fd927cd4e0.zip qemu-93fcfe39a0383377e647b821c9f165fd927cd4e0.tar.gz qemu-93fcfe39a0383377e647b821c9f165fd927cd4e0.tar.bz2 | |
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 <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6338 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-sparc')
| -rw-r--r-- | target-sparc/op_helper.c | 20 | ||||
| -rw-r--r-- | target-sparc/translate.c | 15 |
2 files changed, 16 insertions, 19 deletions
diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index 0cde695..0ba4cae 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -2829,23 +2829,23 @@ void do_interrupt(CPUState *env) name = "Unknown"; } - fprintf(logfile, "%6d: %s (v=%04x) pc=%016" PRIx64 " npc=%016" PRIx64 + qemu_log("%6d: %s (v=%04x) pc=%016" PRIx64 " npc=%016" PRIx64 " SP=%016" PRIx64 "\n", count, name, intno, env->pc, env->npc, env->regwptr[6]); - cpu_dump_state(env, logfile, fprintf, 0); + log_cpu_state(env, 0); #if 0 { int i; uint8_t *ptr; - fprintf(logfile, " code="); + qemu_log(" code="); ptr = (uint8_t *)env->pc; for(i = 0; i < 16; i++) { - fprintf(logfile, " %02x", ldub(ptr + i)); + qemu_log(" %02x", ldub(ptr + i)); } - fprintf(logfile, "\n"); + qemu_log("\n"); } #endif count++; @@ -2956,22 +2956,22 @@ void do_interrupt(CPUState *env) name = "Unknown"; } - fprintf(logfile, "%6d: %s (v=%02x) pc=%08x npc=%08x SP=%08x\n", + qemu_log("%6d: %s (v=%02x) pc=%08x npc=%08x SP=%08x\n", count, name, intno, env->pc, env->npc, env->regwptr[6]); - cpu_dump_state(env, logfile, fprintf, 0); + log_cpu_state(env, 0); #if 0 { int i; uint8_t *ptr; - fprintf(logfile, " code="); + qemu_log(" code="); ptr = (uint8_t *)env->pc; for(i = 0; i < 16; i++) { - fprintf(logfile, " %02x", ldub(ptr + i)); + qemu_log(" %02x", ldub(ptr + i)); } - fprintf(logfile, "\n"); + qemu_log("\n"); } #endif count++; diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 37530e3..8b380e8 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -4829,8 +4829,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb, } } if (spc) { - if (loglevel > 0) - fprintf(logfile, "Search PC...\n"); + qemu_log("Search PC...\n"); j = gen_opc_ptr - gen_opc_buf; if (lj < j) { lj++; @@ -4897,9 +4896,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb, while (lj <= j) gen_opc_instr_start[lj++] = 0; #if 0 - if (loglevel > 0) { - page_dump(logfile); - } + log_page_dump(); #endif gen_opc_jump_pc[0] = dc->jump_pc[0]; gen_opc_jump_pc[1] = dc->jump_pc[1]; @@ -4909,10 +4906,10 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb, } #ifdef DEBUG_DISAS if (loglevel & CPU_LOG_TB_IN_ASM) { - fprintf(logfile, "--------------\n"); - fprintf(logfile, "IN: %s\n", lookup_symbol(pc_start)); - target_disas(logfile, pc_start, last_pc + 4 - pc_start, 0); - fprintf(logfile, "\n"); + qemu_log("--------------\n"); + qemu_log("IN: %s\n", lookup_symbol(pc_start)); + log_target_disas(pc_start, last_pc + 4 - pc_start, 0); + qemu_log("\n"); } #endif } |