From 8fec2b8c454f00d9200e6eb75c6cda73f8425c00 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 15 Jan 2009 22:36:53 +0000 Subject: global s/loglevel & X/qemu_loglevel_mask(X)/ (Eduardo Habkost) These are references to 'loglevel' that aren't on a simple 'if (loglevel & X) qemu_log()' statement. Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6340 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-i386/op_helper.c | 2 +- target-i386/translate.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target-i386') diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index 8ebc63b085..dcbc361a02 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -1206,7 +1206,7 @@ void do_interrupt_user(int intno, int is_int, int error_code, void do_interrupt(int intno, int is_int, int error_code, target_ulong next_eip, int is_hw) { - if (loglevel & CPU_LOG_INT) { + if (qemu_loglevel_mask(CPU_LOG_INT)) { if ((env->cr[0] & CR0_PE_MASK)) { static int count; qemu_log("%6d: v=%02x e=%04x i=%d cpl=%d IP=%04x:" TARGET_FMT_lx " pc=" TARGET_FMT_lx " SP=%04x:" TARGET_FMT_lx, diff --git a/target-i386/translate.c b/target-i386/translate.c index d7f97dc207..4b894fd708 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -3961,7 +3961,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) target_ulong next_eip, tval; int rex_w, rex_r; - if (unlikely(loglevel & CPU_LOG_TB_OP)) + if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP))) tcg_gen_debug_insn_start(pc_start); s->pc = pc_start; prefixes = 0; @@ -7676,7 +7676,7 @@ static inline void gen_intermediate_code_internal(CPUState *env, #ifdef DEBUG_DISAS log_cpu_state_mask(CPU_LOG_TB_CPU, env, X86_DUMP_CCOP); - if (loglevel & CPU_LOG_TB_IN_ASM) { + if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { int disas_flags; qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(pc_start)); @@ -7712,7 +7712,7 @@ void gen_pc_load(CPUState *env, TranslationBlock *tb, { int cc_op; #ifdef DEBUG_DISAS - if (loglevel & CPU_LOG_TB_OP) { + if (qemu_loglevel_mask(CPU_LOG_TB_OP)) { int i; qemu_log("RESTORE:\n"); for(i = 0;i <= pc_pos; i++) { -- cgit v1.2.1