mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 18:23:57 -06:00
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
This commit is contained in:
parent
6cec548799
commit
93fcfe39a0
40 changed files with 293 additions and 469 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue