Convert references to logfile/loglevel to use qemu_log*() macros

[qemu.git] / target-cris / translate.c

diff --git a/target-cris/translate.c b/target-cris/translate.c
index c53663565ab87740d5ece0244e8fad8a57c69f45..8bd2136677f6598f20cf98957ea4348a62659965 100644 (file)
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -44,10 +44,7 @@
 
 #define DISAS_CRIS 0
 #if DISAS_CRIS
-#  define LOG_DIS(...) do {               \
-     if (loglevel & CPU_LOG_TB_IN_ASM)    \
-       fprintf(logfile, ## __VA_ARGS__);  \
-   } while (0)
+#  define LOG_DIS(...) qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__)
 #else
 #  define LOG_DIS(...) do { } while (0)
 #endif
@@ -131,7 +128,7 @@ typedef struct DisasContext {
 static void gen_BUG(DisasContext *dc, const char *file, int line)
 {
        printf ("BUG: pc=%x %s %d\n", dc->pc, file, line);
-       fprintf (logfile, "BUG: pc=%x %s %d\n", dc->pc, file, line);
+       qemu_log("BUG: pc=%x %s %d\n", dc->pc, file, line);
        cpu_abort(dc->env, "%s:%d\n", file, line);
 }
 
@@ -798,7 +795,7 @@ static void cris_alu_op_exec(DisasContext *dc, int op,
                        t_gen_subx_carry(dc, dst);
                        break;
                default:
-                       fprintf (logfile, "illegal ALU op.\n");
+                       qemu_log("illegal ALU op.\n");
                        BUG();
                        break;
        }
@@ -3147,8 +3144,7 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
         int num_insns;
         int max_insns;
 
-       if (!logfile)
-               logfile = stderr;
+       qemu_log_try_set_file(stderr);
 
        /* Odd PC indicates that branch is rexecuting due to exception in the
         * delayslot, like in real hw.
@@ -3184,7 +3180,7 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
        dc->cpustate_changed = 0;
 
        if (loglevel & CPU_LOG_TB_IN_ASM) {
-               fprintf(logfile,
+               qemu_log(
                        "srch=%d pc=%x %x flg=%llx bt=%x ds=%u ccs=%x\n"
                        "pid=%x usp=%x\n"
                        "%x.%x.%x.%x\n"
@@ -3202,8 +3198,8 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
                        env->regs[10], env->regs[11],
                        env->regs[12], env->regs[13],
                        env->regs[14], env->regs[15]);
-               fprintf(logfile, "--------------\n");
-               fprintf(logfile, "IN: %s\n", lookup_symbol(pc_start));
+               qemu_log("--------------\n");
+               qemu_log("IN: %s\n", lookup_symbol(pc_start));
        }
 
        next_page_start = (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
@@ -3336,8 +3332,8 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
 #ifdef DEBUG_DISAS
 #if !DISAS_CRIS
        if (loglevel & CPU_LOG_TB_IN_ASM) {
-               target_disas(logfile, pc_start, dc->pc - pc_start, 0);
-               fprintf(logfile, "\nisize=%d osize=%zd\n",
+               log_target_disas(pc_start, dc->pc - pc_start, 0);
+               qemu_log("\nisize=%d osize=%zd\n",
                        dc->pc - pc_start, gen_opc_ptr - gen_opc_buf);
        }
 #endif