From d12d51d5ba84817e2e7dcc95aeabebb230cc3781 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 15 Jan 2009 21:48:06 +0000 Subject: Clean up debugging code #ifdefs (Eduardo Habkost) Use macros to avoid #ifdefs on debugging code. This patch doesn't try to merge logging macros from different files, but just unify the debugging code #ifdefs onto a macro on each file. A further cleanup can unify the debugging macros on a common header, later Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6332 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-cris/helper.c | 26 +++-- target-cris/mmu.c | 12 +- target-cris/op_helper.c | 26 +++-- target-cris/translate.c | 289 ++++++++++++++++++++++++------------------------ 4 files changed, 187 insertions(+), 166 deletions(-) (limited to 'target-cris') diff --git a/target-cris/helper.c b/target-cris/helper.c index 6bd7aaf..e24ba13 100644 --- a/target-cris/helper.c +++ b/target-cris/helper.c @@ -28,7 +28,17 @@ #include "exec-all.h" #include "host-utils.h" + +//#define CRIS_HELPER_DEBUG + + +#ifdef CRIS_HELPER_DEBUG +#define D(x) x +#define D_LOG(...) fprintf(logfile, ## __VA_ARGS__) +#else #define D(x) +#define D_LOG(...) do { } while (0) +#endif #if defined(CONFIG_USER_ONLY) @@ -98,10 +108,10 @@ int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, r = tlb_set_page(env, address, phy, prot, mmu_idx, is_softmmu); } if (r > 0) - D(fprintf(logfile, "%s returns %d irqreq=%x addr=%x" + D_LOG("%s returns %d irqreq=%x addr=%x" " phy=%x ismmu=%d vec=%x pc=%x\n", __func__, r, env->interrupt_request, - address, res.phy, is_softmmu, res.bf_vec, env->pc)); + address, res.phy, is_softmmu, res.bf_vec, env->pc); return r; } @@ -109,9 +119,9 @@ void do_interrupt(CPUState *env) { int ex_vec = -1; - D(fprintf (logfile, "exception index=%d interrupt_req=%d\n", + D_LOG( "exception index=%d interrupt_req=%d\n", env->exception_index, - env->interrupt_request)); + env->interrupt_request); switch (env->exception_index) { @@ -147,13 +157,13 @@ void do_interrupt(CPUState *env) env->pregs[PR_EXS] = (ex_vec & 0xff) << 8; if (env->dslot) { - D(fprintf(logfile, "excp isr=%x PC=%x ds=%d SP=%x" + D_LOG("excp isr=%x PC=%x ds=%d SP=%x" " ERP=%x pid=%x ccs=%x cc=%d %x\n", ex_vec, env->pc, env->dslot, env->regs[R_SP], env->pregs[PR_ERP], env->pregs[PR_PID], env->pregs[PR_CCS], - env->cc_op, env->cc_mask)); + env->cc_op, env->cc_mask); /* We loose the btarget, btaken state here so rexec the branch. */ env->pregs[PR_ERP] -= env->dslot; @@ -171,11 +181,11 @@ void do_interrupt(CPUState *env) /* Apply the CRIS CCS shift. Clears U if set. */ cris_shift_ccs(env); - D(fprintf (logfile, "%s isr=%x vec=%x ccs=%x pid=%d erp=%x\n", + D_LOG("%s isr=%x vec=%x ccs=%x pid=%d erp=%x\n", __func__, env->pc, ex_vec, env->pregs[PR_CCS], env->pregs[PR_PID], - env->pregs[PR_ERP])); + env->pregs[PR_ERP]); } target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) diff --git a/target-cris/mmu.c b/target-cris/mmu.c index 334b2b6..dd4fb3f 100644 --- a/target-cris/mmu.c +++ b/target-cris/mmu.c @@ -32,8 +32,10 @@ #ifdef DEBUG #define D(x) x +#define D_LOG(...) fprintf(logfile, ## __VA_ARGS__) #else #define D(x) +#define D_LOG(...) do { } while (0) #endif void cris_mmu_init(CPUState *env) @@ -180,9 +182,8 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res, tlb_pid = EXTRACT_FIELD(hi, 0, 7); tlb_g = EXTRACT_FIELD(lo, 4, 4); - D(fprintf(logfile, - "TLB[%d][%d][%d] v=%x vpage=%x lo=%x hi=%x\n", - mmu, set, idx, tlb_vpn, vpage, lo, hi)); + D_LOG("TLB[%d][%d][%d] v=%x vpage=%x lo=%x hi=%x\n", + mmu, set, idx, tlb_vpn, vpage, lo, hi); if ((tlb_g || (tlb_pid == pid)) && tlb_vpn == vpage) { match = 1; @@ -314,9 +315,8 @@ void cris_mmu_flush_pid(CPUState *env, uint32_t pid) if (tlb_v && !tlb_g && (tlb_pid == pid)) { vaddr = tlb_vpn << TARGET_PAGE_BITS; - D(fprintf(logfile, - "flush pid=%x vaddr=%x\n", - pid, vaddr)); + D_LOG("flush pid=%x vaddr=%x\n", + pid, vaddr); tlb_flush_page(env, vaddr); } } diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index c96e48d..c55ce86 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -25,7 +25,16 @@ #include "helper.h" #include "host-utils.h" +//#define CRIS_OP_HELPER_DEBUG + + +#ifdef CRIS_OP_HELPER_DEBUG +#define D(x) x +#define D_LOG(...) fprintf(logfile, ## __VA_ARGS__) +#else #define D(x) +#define D_LOG(...) do { } while (0) +#endif #if !defined(CONFIG_USER_ONLY) @@ -59,8 +68,8 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) saved_env = env; env = cpu_single_env; - D(fprintf(logfile, "%s pc=%x tpc=%x ra=%x\n", __func__, - env->pc, env->debug1, retaddr)); + D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__, + env->pc, env->debug1, retaddr); ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx, 1); if (unlikely(ret)) { if (retaddr) { @@ -155,9 +164,8 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) env->tlbsets[srs - 1][set][idx].lo = lo; env->tlbsets[srs - 1][set][idx].hi = hi; - D(fprintf(logfile, - "tlb flush vaddr=%x v=%d pc=%x\n", - vaddr, tlb_v, env->pc)); + D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", + vaddr, tlb_v, env->pc); tlb_flush_page(env, vaddr); } } @@ -213,10 +221,10 @@ void helper_rfe(void) { int rflag = env->pregs[PR_CCS] & R_FLAG; - D(fprintf(logfile, "rfe: erp=%x pid=%x ccs=%x btarget=%x\n", + D_LOG("rfe: erp=%x pid=%x ccs=%x btarget=%x\n", env->pregs[PR_ERP], env->pregs[PR_PID], env->pregs[PR_CCS], - env->btarget)); + env->btarget); cris_ccs_rshift(env); @@ -229,10 +237,10 @@ void helper_rfn(void) { int rflag = env->pregs[PR_CCS] & R_FLAG; - D(fprintf(logfile, "rfn: erp=%x pid=%x ccs=%x btarget=%x\n", + D_LOG("rfn: erp=%x pid=%x ccs=%x btarget=%x\n", env->pregs[PR_ERP], env->pregs[PR_PID], env->pregs[PR_CCS], - env->btarget)); + env->btarget); cris_ccs_rshift(env); diff --git a/target-cris/translate.c b/target-cris/translate.c index 03ac7ea..c536635 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -44,9 +44,12 @@ #define DISAS_CRIS 0 #if DISAS_CRIS -#define DIS(x) if (loglevel & CPU_LOG_TB_IN_ASM) x +# define LOG_DIS(...) do { \ + if (loglevel & CPU_LOG_TB_IN_ASM) \ + fprintf(logfile, ## __VA_ARGS__); \ + } while (0) #else -#define DIS(x) +# define LOG_DIS(...) do { } while (0) #endif #define D(x) @@ -1344,7 +1347,7 @@ static unsigned int dec_bccq(DisasContext *dc) tmp = offset; offset = sign_extend(offset, 8); - DIS(fprintf (logfile, "b%s %x\n", cc_name(cond), dc->pc + offset)); + LOG_DIS("b%s %x\n", cc_name(cond), dc->pc + offset); /* op2 holds the condition-code. */ cris_cc_mask(dc, 0); @@ -1358,7 +1361,7 @@ static unsigned int dec_addoq(DisasContext *dc) dc->op1 = EXTRACT_FIELD(dc->ir, 0, 7); imm = sign_extend(dc->op1, 7); - DIS(fprintf (logfile, "addoq %d, $r%u\n", imm, dc->op2)); + LOG_DIS("addoq %d, $r%u\n", imm, dc->op2); cris_cc_mask(dc, 0); /* Fetch register operand, */ tcg_gen_addi_tl(cpu_R[R_ACR], cpu_R[dc->op2], imm); @@ -1367,7 +1370,7 @@ static unsigned int dec_addoq(DisasContext *dc) } static unsigned int dec_addq(DisasContext *dc) { - DIS(fprintf (logfile, "addq %u, $r%u\n", dc->op1, dc->op2)); + LOG_DIS("addq %u, $r%u\n", dc->op1, dc->op2); dc->op1 = EXTRACT_FIELD(dc->ir, 0, 5); @@ -1383,7 +1386,7 @@ static unsigned int dec_moveq(DisasContext *dc) dc->op1 = EXTRACT_FIELD(dc->ir, 0, 5); imm = sign_extend(dc->op1, 5); - DIS(fprintf (logfile, "moveq %d, $r%u\n", imm, dc->op2)); + LOG_DIS("moveq %d, $r%u\n", imm, dc->op2); tcg_gen_mov_tl(cpu_R[dc->op2], tcg_const_tl(imm)); return 2; @@ -1392,7 +1395,7 @@ static unsigned int dec_subq(DisasContext *dc) { dc->op1 = EXTRACT_FIELD(dc->ir, 0, 5); - DIS(fprintf (logfile, "subq %u, $r%u\n", dc->op1, dc->op2)); + LOG_DIS("subq %u, $r%u\n", dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); cris_alu(dc, CC_OP_SUB, @@ -1405,7 +1408,7 @@ static unsigned int dec_cmpq(DisasContext *dc) dc->op1 = EXTRACT_FIELD(dc->ir, 0, 5); imm = sign_extend(dc->op1, 5); - DIS(fprintf (logfile, "cmpq %d, $r%d\n", imm, dc->op2)); + LOG_DIS("cmpq %d, $r%d\n", imm, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); cris_alu(dc, CC_OP_CMP, @@ -1418,7 +1421,7 @@ static unsigned int dec_andq(DisasContext *dc) dc->op1 = EXTRACT_FIELD(dc->ir, 0, 5); imm = sign_extend(dc->op1, 5); - DIS(fprintf (logfile, "andq %d, $r%d\n", imm, dc->op2)); + LOG_DIS("andq %d, $r%d\n", imm, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_alu(dc, CC_OP_AND, @@ -1430,7 +1433,7 @@ static unsigned int dec_orq(DisasContext *dc) uint32_t imm; dc->op1 = EXTRACT_FIELD(dc->ir, 0, 5); imm = sign_extend(dc->op1, 5); - DIS(fprintf (logfile, "orq %d, $r%d\n", imm, dc->op2)); + LOG_DIS("orq %d, $r%d\n", imm, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_alu(dc, CC_OP_OR, @@ -1440,7 +1443,7 @@ static unsigned int dec_orq(DisasContext *dc) static unsigned int dec_btstq(DisasContext *dc) { dc->op1 = EXTRACT_FIELD(dc->ir, 0, 4); - DIS(fprintf (logfile, "btstq %u, $r%d\n", dc->op1, dc->op2)); + LOG_DIS("btstq %u, $r%d\n", dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_evaluate_flags(dc); @@ -1455,7 +1458,7 @@ static unsigned int dec_btstq(DisasContext *dc) static unsigned int dec_asrq(DisasContext *dc) { dc->op1 = EXTRACT_FIELD(dc->ir, 0, 4); - DIS(fprintf (logfile, "asrq %u, $r%d\n", dc->op1, dc->op2)); + LOG_DIS("asrq %u, $r%d\n", dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); tcg_gen_sari_tl(cpu_R[dc->op2], cpu_R[dc->op2], dc->op1); @@ -1467,7 +1470,7 @@ static unsigned int dec_asrq(DisasContext *dc) static unsigned int dec_lslq(DisasContext *dc) { dc->op1 = EXTRACT_FIELD(dc->ir, 0, 4); - DIS(fprintf (logfile, "lslq %u, $r%d\n", dc->op1, dc->op2)); + LOG_DIS("lslq %u, $r%d\n", dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); @@ -1481,7 +1484,7 @@ static unsigned int dec_lslq(DisasContext *dc) static unsigned int dec_lsrq(DisasContext *dc) { dc->op1 = EXTRACT_FIELD(dc->ir, 0, 4); - DIS(fprintf (logfile, "lsrq %u, $r%d\n", dc->op1, dc->op2)); + LOG_DIS("lsrq %u, $r%d\n", dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); @@ -1496,8 +1499,8 @@ static unsigned int dec_move_r(DisasContext *dc) { int size = memsize_zz(dc); - DIS(fprintf (logfile, "move.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("move.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); if (size == 4) { @@ -1524,8 +1527,8 @@ static unsigned int dec_scc_r(DisasContext *dc) { int cond = dc->op2; - DIS(fprintf (logfile, "s%s $r%u\n", - cc_name(cond), dc->op1)); + LOG_DIS("s%s $r%u\n", + cc_name(cond), dc->op1); if (cond != CC_A) { @@ -1568,8 +1571,8 @@ static unsigned int dec_and_r(DisasContext *dc) TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "and.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("and.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); @@ -1583,8 +1586,8 @@ static unsigned int dec_and_r(DisasContext *dc) static unsigned int dec_lz_r(DisasContext *dc) { TCGv t0; - DIS(fprintf (logfile, "lz $r%u, $r%u\n", - dc->op1, dc->op2)); + LOG_DIS("lz $r%u, $r%u\n", + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); t0 = tcg_temp_new(); dec_prep_alu_r(dc, dc->op1, dc->op2, 4, 0, cpu_R[dc->op2], t0); @@ -1598,8 +1601,8 @@ static unsigned int dec_lsl_r(DisasContext *dc) TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "lsl.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("lsl.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_alu_alloc_temps(dc, size, t); @@ -1615,8 +1618,8 @@ static unsigned int dec_lsr_r(DisasContext *dc) TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "lsr.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("lsr.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_alu_alloc_temps(dc, size, t); @@ -1632,8 +1635,8 @@ static unsigned int dec_asr_r(DisasContext *dc) TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "asr.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("asr.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_alu_alloc_temps(dc, size, t); @@ -1649,8 +1652,8 @@ static unsigned int dec_muls_r(DisasContext *dc) TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "muls.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("muls.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZV); cris_alu_alloc_temps(dc, size, t); dec_prep_alu_r(dc, dc->op1, dc->op2, size, 1, t[0], t[1]); @@ -1665,8 +1668,8 @@ static unsigned int dec_mulu_r(DisasContext *dc) TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "mulu.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("mulu.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZV); cris_alu_alloc_temps(dc, size, t); dec_prep_alu_r(dc, dc->op1, dc->op2, size, 0, t[0], t[1]); @@ -1679,7 +1682,7 @@ static unsigned int dec_mulu_r(DisasContext *dc) static unsigned int dec_dstep_r(DisasContext *dc) { - DIS(fprintf (logfile, "dstep $r%u, $r%u\n", dc->op1, dc->op2)); + LOG_DIS("dstep $r%u, $r%u\n", dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_alu(dc, CC_OP_DSTEP, cpu_R[dc->op2], cpu_R[dc->op2], cpu_R[dc->op1], 4); @@ -1690,8 +1693,8 @@ static unsigned int dec_xor_r(DisasContext *dc) { TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "xor.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("xor.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); BUG_ON(size != 4); /* xor is dword. */ cris_cc_mask(dc, CC_MASK_NZ); cris_alu_alloc_temps(dc, size, t); @@ -1706,8 +1709,8 @@ static unsigned int dec_bound_r(DisasContext *dc) { TCGv l0; int size = memsize_zz(dc); - DIS(fprintf (logfile, "bound.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("bound.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); l0 = tcg_temp_local_new(); dec_prep_move_r(dc, dc->op1, dc->op2, size, 0, l0); @@ -1720,8 +1723,8 @@ static unsigned int dec_cmp_r(DisasContext *dc) { TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "cmp.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("cmp.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); cris_alu_alloc_temps(dc, size, t); dec_prep_alu_r(dc, dc->op1, dc->op2, size, 0, t[0], t[1]); @@ -1735,8 +1738,8 @@ static unsigned int dec_abs_r(DisasContext *dc) { TCGv t0; - DIS(fprintf (logfile, "abs $r%u, $r%u\n", - dc->op1, dc->op2)); + LOG_DIS("abs $r%u, $r%u\n", + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); t0 = tcg_temp_new(); @@ -1754,8 +1757,8 @@ static unsigned int dec_add_r(DisasContext *dc) { TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "add.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("add.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); cris_alu_alloc_temps(dc, size, t); dec_prep_alu_r(dc, dc->op1, dc->op2, size, 0, t[0], t[1]); @@ -1767,8 +1770,8 @@ static unsigned int dec_add_r(DisasContext *dc) static unsigned int dec_addc_r(DisasContext *dc) { - DIS(fprintf (logfile, "addc $r%u, $r%u\n", - dc->op1, dc->op2)); + LOG_DIS("addc $r%u, $r%u\n", + dc->op1, dc->op2); cris_evaluate_flags(dc); /* Set for this insn. */ dc->flagx_known = 1; @@ -1782,8 +1785,8 @@ static unsigned int dec_addc_r(DisasContext *dc) static unsigned int dec_mcp_r(DisasContext *dc) { - DIS(fprintf (logfile, "mcp $p%u, $r%u\n", - dc->op2, dc->op1)); + LOG_DIS("mcp $p%u, $r%u\n", + dc->op2, dc->op1); cris_evaluate_flags(dc); cris_cc_mask(dc, CC_MASK_RNZV); cris_alu(dc, CC_OP_MCP, @@ -1813,8 +1816,8 @@ static unsigned int dec_swap_r(DisasContext *dc) #if DISAS_CRIS char modename[4]; #endif - DIS(fprintf (logfile, "swap%s $r%u\n", - swapmode_name(dc->op2, modename), dc->op1)); + LOG_DIS("swap%s $r%u\n", + swapmode_name(dc->op2, modename), dc->op1); cris_cc_mask(dc, CC_MASK_NZ); t0 = tcg_temp_new(); @@ -1837,8 +1840,8 @@ static unsigned int dec_or_r(DisasContext *dc) { TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "or.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("or.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_alu_alloc_temps(dc, size, t); dec_prep_alu_r(dc, dc->op1, dc->op2, size, 0, t[0], t[1]); @@ -1850,8 +1853,8 @@ static unsigned int dec_or_r(DisasContext *dc) static unsigned int dec_addi_r(DisasContext *dc) { TCGv t0; - DIS(fprintf (logfile, "addi.%c $r%u, $r%u\n", - memsize_char(memsize_zz(dc)), dc->op2, dc->op1)); + LOG_DIS("addi.%c $r%u, $r%u\n", + memsize_char(memsize_zz(dc)), dc->op2, dc->op1); cris_cc_mask(dc, 0); t0 = tcg_temp_new(); tcg_gen_shl_tl(t0, cpu_R[dc->op2], tcg_const_tl(dc->zzsize)); @@ -1863,8 +1866,8 @@ static unsigned int dec_addi_r(DisasContext *dc) static unsigned int dec_addi_acr(DisasContext *dc) { TCGv t0; - DIS(fprintf (logfile, "addi.%c $r%u, $r%u, $acr\n", - memsize_char(memsize_zz(dc)), dc->op2, dc->op1)); + LOG_DIS("addi.%c $r%u, $r%u, $acr\n", + memsize_char(memsize_zz(dc)), dc->op2, dc->op1); cris_cc_mask(dc, 0); t0 = tcg_temp_new(); tcg_gen_shl_tl(t0, cpu_R[dc->op2], tcg_const_tl(dc->zzsize)); @@ -1877,8 +1880,8 @@ static unsigned int dec_neg_r(DisasContext *dc) { TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "neg.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("neg.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); cris_alu_alloc_temps(dc, size, t); dec_prep_alu_r(dc, dc->op1, dc->op2, size, 0, t[0], t[1]); @@ -1890,8 +1893,8 @@ static unsigned int dec_neg_r(DisasContext *dc) static unsigned int dec_btst_r(DisasContext *dc) { - DIS(fprintf (logfile, "btst $r%u, $r%u\n", - dc->op1, dc->op2)); + LOG_DIS("btst $r%u, $r%u\n", + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); cris_evaluate_flags(dc); gen_helper_btst(cpu_PR[PR_CCS], cpu_R[dc->op2], @@ -1907,8 +1910,8 @@ static unsigned int dec_sub_r(DisasContext *dc) { TCGv t[2]; int size = memsize_zz(dc); - DIS(fprintf (logfile, "sub.%c $r%u, $r%u\n", - memsize_char(size), dc->op1, dc->op2)); + LOG_DIS("sub.%c $r%u, $r%u\n", + memsize_char(size), dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); cris_alu_alloc_temps(dc, size, t); dec_prep_alu_r(dc, dc->op1, dc->op2, size, 0, t[0], t[1]); @@ -1922,9 +1925,9 @@ static unsigned int dec_movu_r(DisasContext *dc) { TCGv t0; int size = memsize_z(dc); - DIS(fprintf (logfile, "movu.%c $r%u, $r%u\n", + LOG_DIS("movu.%c $r%u, $r%u\n", memsize_char(size), - dc->op1, dc->op2)); + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); t0 = tcg_temp_new(); @@ -1939,9 +1942,9 @@ static unsigned int dec_movs_r(DisasContext *dc) { TCGv t0; int size = memsize_z(dc); - DIS(fprintf (logfile, "movs.%c $r%u, $r%u\n", + LOG_DIS("movs.%c $r%u, $r%u\n", memsize_char(size), - dc->op1, dc->op2)); + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZ); t0 = tcg_temp_new(); @@ -1958,9 +1961,9 @@ static unsigned int dec_addu_r(DisasContext *dc) { TCGv t0; int size = memsize_z(dc); - DIS(fprintf (logfile, "addu.%c $r%u, $r%u\n", + LOG_DIS("addu.%c $r%u, $r%u\n", memsize_char(size), - dc->op1, dc->op2)); + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); t0 = tcg_temp_new(); @@ -1977,9 +1980,9 @@ static unsigned int dec_adds_r(DisasContext *dc) { TCGv t0; int size = memsize_z(dc); - DIS(fprintf (logfile, "adds.%c $r%u, $r%u\n", + LOG_DIS("adds.%c $r%u, $r%u\n", memsize_char(size), - dc->op1, dc->op2)); + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); t0 = tcg_temp_new(); @@ -1996,9 +1999,9 @@ static unsigned int dec_subu_r(DisasContext *dc) { TCGv t0; int size = memsize_z(dc); - DIS(fprintf (logfile, "subu.%c $r%u, $r%u\n", + LOG_DIS("subu.%c $r%u, $r%u\n", memsize_char(size), - dc->op1, dc->op2)); + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); t0 = tcg_temp_new(); @@ -2015,9 +2018,9 @@ static unsigned int dec_subs_r(DisasContext *dc) { TCGv t0; int size = memsize_z(dc); - DIS(fprintf (logfile, "subs.%c $r%u, $r%u\n", + LOG_DIS("subs.%c $r%u, $r%u\n", memsize_char(size), - dc->op1, dc->op2)); + dc->op1, dc->op2); cris_cc_mask(dc, CC_MASK_NZVC); t0 = tcg_temp_new(); @@ -2038,15 +2041,15 @@ static unsigned int dec_setclrf(DisasContext *dc) flags = (EXTRACT_FIELD(dc->ir, 12, 15) << 4) | EXTRACT_FIELD(dc->ir, 0, 3); if (set && flags == 0) { - DIS(fprintf (logfile, "nop\n")); + LOG_DIS("nop\n"); return 2; } else if (!set && (flags & 0x20)) { - DIS(fprintf (logfile, "di\n")); + LOG_DIS("di\n"); } else { - DIS(fprintf (logfile, "%sf %x\n", + LOG_DIS("%sf %x\n", set ? "set" : "clr", - flags)); + flags); } /* User space is not allowed to touch these. Silently ignore. */ @@ -2101,14 +2104,14 @@ static unsigned int dec_setclrf(DisasContext *dc) static unsigned int dec_move_rs(DisasContext *dc) { - DIS(fprintf (logfile, "move $r%u, $s%u\n", dc->op1, dc->op2)); + LOG_DIS("move $r%u, $s%u\n", dc->op1, dc->op2); cris_cc_mask(dc, 0); gen_helper_movl_sreg_reg(tcg_const_tl(dc->op2), tcg_const_tl(dc->op1)); return 2; } static unsigned int dec_move_sr(DisasContext *dc) { - DIS(fprintf (logfile, "move $s%u, $r%u\n", dc->op2, dc->op1)); + LOG_DIS("move $s%u, $r%u\n", dc->op2, dc->op1); cris_cc_mask(dc, 0); gen_helper_movl_reg_sreg(tcg_const_tl(dc->op1), tcg_const_tl(dc->op2)); return 2; @@ -2117,7 +2120,7 @@ static unsigned int dec_move_sr(DisasContext *dc) static unsigned int dec_move_rp(DisasContext *dc) { TCGv t[2]; - DIS(fprintf (logfile, "move $r%u, $p%u\n", dc->op1, dc->op2)); + LOG_DIS("move $r%u, $p%u\n", dc->op1, dc->op2); cris_cc_mask(dc, 0); t[0] = tcg_temp_new(); @@ -2147,7 +2150,7 @@ static unsigned int dec_move_rp(DisasContext *dc) static unsigned int dec_move_pr(DisasContext *dc) { TCGv t0; - DIS(fprintf (logfile, "move $p%u, $r%u\n", dc->op1, dc->op2)); + LOG_DIS("move $p%u, $r%u\n", dc->op1, dc->op2); cris_cc_mask(dc, 0); if (dc->op2 == PR_CCS) @@ -2165,10 +2168,10 @@ static unsigned int dec_move_mr(DisasContext *dc) { int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "move.%c [$r%u%s, $r%u\n", + LOG_DIS("move.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); if (memsize == 4) { insn_len = dec_prep_move_m(dc, 0, 4, cpu_R[dc->op2]); @@ -2208,10 +2211,10 @@ static unsigned int dec_movs_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "movs.%c [$r%u%s, $r%u\n", + LOG_DIS("movs.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); /* sign extend. */ @@ -2229,10 +2232,10 @@ static unsigned int dec_addu_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "addu.%c [$r%u%s, $r%u\n", + LOG_DIS("addu.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); /* sign extend. */ @@ -2250,10 +2253,10 @@ static unsigned int dec_adds_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "adds.%c [$r%u%s, $r%u\n", + LOG_DIS("adds.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); /* sign extend. */ @@ -2270,10 +2273,10 @@ static unsigned int dec_subu_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "subu.%c [$r%u%s, $r%u\n", + LOG_DIS("subu.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); /* sign extend. */ @@ -2290,10 +2293,10 @@ static unsigned int dec_subs_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "subs.%c [$r%u%s, $r%u\n", + LOG_DIS("subs.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); /* sign extend. */ @@ -2311,10 +2314,10 @@ static unsigned int dec_movu_m(DisasContext *dc) int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "movu.%c [$r%u%s, $r%u\n", + LOG_DIS("movu.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2330,10 +2333,10 @@ static unsigned int dec_cmpu_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "cmpu.%c [$r%u%s, $r%u\n", + LOG_DIS("cmpu.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2349,10 +2352,10 @@ static unsigned int dec_cmps_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_z(dc); int insn_len; - DIS(fprintf (logfile, "cmps.%c [$r%u%s, $r%u\n", + LOG_DIS("cmps.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 1, memsize, t[0], t[1]); @@ -2370,10 +2373,10 @@ static unsigned int dec_cmp_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "cmp.%c [$r%u%s, $r%u\n", + LOG_DIS("cmp.%c [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2391,10 +2394,10 @@ static unsigned int dec_test_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "test.%d [$r%u%s] op2=%x\n", + LOG_DIS("test.%d [$r%u%s] op2=%x\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_evaluate_flags(dc); @@ -2415,10 +2418,10 @@ static unsigned int dec_and_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "and.%d [$r%u%s, $r%u\n", + LOG_DIS("and.%d [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2434,10 +2437,10 @@ static unsigned int dec_add_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "add.%d [$r%u%s, $r%u\n", + LOG_DIS("add.%d [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2454,10 +2457,10 @@ static unsigned int dec_addo_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "add.%d [$r%u%s, $r%u\n", + LOG_DIS("add.%d [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 1, memsize, t[0], t[1]); @@ -2473,10 +2476,10 @@ static unsigned int dec_bound_m(DisasContext *dc) TCGv l[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "bound.%d [$r%u%s, $r%u\n", + LOG_DIS("bound.%d [$r%u%s, $r%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); l[0] = tcg_temp_local_new(); l[1] = tcg_temp_local_new(); @@ -2493,9 +2496,9 @@ static unsigned int dec_addc_mr(DisasContext *dc) { TCGv t[2]; int insn_len = 2; - DIS(fprintf (logfile, "addc [$r%u%s, $r%u\n", + LOG_DIS("addc [$r%u%s, $r%u\n", dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_evaluate_flags(dc); @@ -2517,10 +2520,10 @@ static unsigned int dec_sub_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "sub.%c [$r%u%s, $r%u ir=%x zz=%x\n", + LOG_DIS("sub.%c [$r%u%s, $r%u ir=%x zz=%x\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2, dc->ir, dc->zzsize)); + dc->op2, dc->ir, dc->zzsize); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2536,10 +2539,10 @@ static unsigned int dec_or_m(DisasContext *dc) TCGv t[2]; int memsize = memsize_zz(dc); int insn_len; - DIS(fprintf (logfile, "or.%d [$r%u%s, $r%u pc=%x\n", + LOG_DIS("or.%d [$r%u%s, $r%u pc=%x\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2, dc->pc)); + dc->op2, dc->pc); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2557,11 +2560,11 @@ static unsigned int dec_move_mp(DisasContext *dc) int memsize = memsize_zz(dc); int insn_len = 2; - DIS(fprintf (logfile, "move.%c [$r%u%s, $p%u\n", + LOG_DIS("move.%c [$r%u%s, $p%u\n", memsize_char(memsize), dc->op1, dc->postinc ? "+]" : "]", - dc->op2)); + dc->op2); cris_alu_m_alloc_temps(t); insn_len = dec_prep_alu_m(dc, 0, memsize, t[0], t[1]); @@ -2590,9 +2593,9 @@ static unsigned int dec_move_pm(DisasContext *dc) memsize = preg_sizes[dc->op2]; - DIS(fprintf (logfile, "move.%c $p%u, [$r%u%s\n", + LOG_DIS("move.%c $p%u, [$r%u%s\n", memsize_char(memsize), - dc->op2, dc->op1, dc->postinc ? "+]" : "]")); + dc->op2, dc->op1, dc->postinc ? "+]" : "]"); /* prepare store. Address in T0, value in T1. */ if (dc->op2 == PR_CCS) @@ -2617,8 +2620,8 @@ static unsigned int dec_movem_mr(DisasContext *dc) int i; int nr = dc->op2 + 1; - DIS(fprintf (logfile, "movem [$r%u%s, $r%u\n", dc->op1, - dc->postinc ? "+]" : "]", dc->op2)); + LOG_DIS("movem [$r%u%s, $r%u\n", dc->op1, + dc->postinc ? "+]" : "]", dc->op2); addr = tcg_temp_new(); /* There are probably better ways of doing this. */ @@ -2661,8 +2664,8 @@ static unsigned int dec_movem_rm(DisasContext *dc) TCGv addr; int i; - DIS(fprintf (logfile, "movem $r%u, [$r%u%s\n", dc->op2, dc->op1, - dc->postinc ? "+]" : "]")); + LOG_DIS("movem $r%u, [$r%u%s\n", dc->op2, dc->op1, + dc->postinc ? "+]" : "]"); cris_flush_cc_state(dc); @@ -2690,8 +2693,8 @@ static unsigned int dec_move_rm(DisasContext *dc) memsize = memsize_zz(dc); - DIS(fprintf (logfile, "move.%d $r%u, [$r%u]\n", - memsize, dc->op2, dc->op1)); + LOG_DIS("move.%d $r%u, [$r%u]\n", + memsize, dc->op2, dc->op1); /* prepare store. */ cris_flush_cc_state(dc); @@ -2705,8 +2708,8 @@ static unsigned int dec_move_rm(DisasContext *dc) static unsigned int dec_lapcq(DisasContext *dc) { - DIS(fprintf (logfile, "lapcq %x, $r%u\n", - dc->pc + dc->op1*2, dc->op2)); + LOG_DIS("lapcq %x, $r%u\n", + dc->pc + dc->op1*2, dc->op2); cris_cc_mask(dc, 0); tcg_gen_movi_tl(cpu_R[dc->op2], dc->pc + dc->op1 * 2); return 2; @@ -2722,7 +2725,7 @@ static unsigned int dec_lapc_im(DisasContext *dc) cris_cc_mask(dc, 0); imm = ldl_code(dc->pc + 2); - DIS(fprintf (logfile, "lapc 0x%x, $r%u\n", imm + dc->pc, dc->op2)); + LOG_DIS("lapc 0x%x, $r%u\n", imm + dc->pc, dc->op2); pc = dc->pc; pc += imm; @@ -2733,7 +2736,7 @@ static unsigned int dec_lapc_im(DisasContext *dc) /* Jump to special reg. */ static unsigned int dec_jump_p(DisasContext *dc) { - DIS(fprintf (logfile, "jump $p%u\n", dc->op2)); + LOG_DIS("jump $p%u\n", dc->op2); if (dc->op2 == PR_CCS) cris_evaluate_flags(dc); @@ -2748,7 +2751,7 @@ static unsigned int dec_jump_p(DisasContext *dc) /* Jump and save. */ static unsigned int dec_jas_r(DisasContext *dc) { - DIS(fprintf (logfile, "jas $r%u, $p%u\n", dc->op1, dc->op2)); + LOG_DIS("jas $r%u, $p%u\n", dc->op1, dc->op2); cris_cc_mask(dc, 0); /* Store the return address in Pd. */ tcg_gen_mov_tl(env_btarget, cpu_R[dc->op1]); @@ -2766,7 +2769,7 @@ static unsigned int dec_jas_im(DisasContext *dc) imm = ldl_code(dc->pc + 2); - DIS(fprintf (logfile, "jas 0x%x\n", imm)); + LOG_DIS("jas 0x%x\n", imm); cris_cc_mask(dc, 0); /* Store the return address in Pd. */ t_gen_mov_preg_TN(dc, dc->op2, tcg_const_tl(dc->pc + 8)); @@ -2782,7 +2785,7 @@ static unsigned int dec_jasc_im(DisasContext *dc) imm = ldl_code(dc->pc + 2); - DIS(fprintf (logfile, "jasc 0x%x\n", imm)); + LOG_DIS("jasc 0x%x\n", imm); cris_cc_mask(dc, 0); /* Store the return address in Pd. */ t_gen_mov_preg_TN(dc, dc->op2, tcg_const_tl(dc->pc + 8 + 4)); @@ -2794,7 +2797,7 @@ static unsigned int dec_jasc_im(DisasContext *dc) static unsigned int dec_jasc_r(DisasContext *dc) { - DIS(fprintf (logfile, "jasc_r $r%u, $p%u\n", dc->op1, dc->op2)); + LOG_DIS("jasc_r $r%u, $p%u\n", dc->op1, dc->op2); cris_cc_mask(dc, 0); /* Store the return address in Pd. */ tcg_gen_mov_tl(env_btarget, cpu_R[dc->op1]); @@ -2810,9 +2813,9 @@ static unsigned int dec_bcc_im(DisasContext *dc) offset = ldsw_code(dc->pc + 2); - DIS(fprintf (logfile, "b%s %d pc=%x dst=%x\n", + LOG_DIS("b%s %d pc=%x dst=%x\n", cc_name(cond), offset, - dc->pc, dc->pc + offset)); + dc->pc, dc->pc + offset); cris_cc_mask(dc, 0); /* op2 holds the condition-code. */ @@ -2827,7 +2830,7 @@ static unsigned int dec_bas_im(DisasContext *dc) simm = ldl_code(dc->pc + 2); - DIS(fprintf (logfile, "bas 0x%x, $p%u\n", dc->pc + simm, dc->op2)); + LOG_DIS("bas 0x%x, $p%u\n", dc->pc + simm, dc->op2); cris_cc_mask(dc, 0); /* Store the return address in Pd. */ t_gen_mov_preg_TN(dc, dc->op2, tcg_const_tl(dc->pc + 8)); @@ -2842,7 +2845,7 @@ static unsigned int dec_basc_im(DisasContext *dc) int32_t simm; simm = ldl_code(dc->pc + 2); - DIS(fprintf (logfile, "basc 0x%x, $p%u\n", dc->pc + simm, dc->op2)); + LOG_DIS("basc 0x%x, $p%u\n", dc->pc + simm, dc->op2); cris_cc_mask(dc, 0); /* Store the return address in Pd. */ t_gen_mov_preg_TN(dc, dc->op2, tcg_const_tl(dc->pc + 12)); @@ -2866,20 +2869,20 @@ static unsigned int dec_rfe_etc(DisasContext *dc) switch (dc->op2 & 7) { case 2: /* rfe. */ - DIS(fprintf(logfile, "rfe\n")); + LOG_DIS("rfe\n"); cris_evaluate_flags(dc); gen_helper_rfe(); dc->is_jmp = DISAS_UPDATE; break; case 5: /* rfn. */ - DIS(fprintf(logfile, "rfn\n")); + LOG_DIS("rfn\n"); cris_evaluate_flags(dc); gen_helper_rfn(); dc->is_jmp = DISAS_UPDATE; break; case 6: - DIS(fprintf(logfile, "break %d\n", dc->op1)); + LOG_DIS("break %d\n", dc->op1); cris_evaluate_flags (dc); /* break. */ tcg_gen_movi_tl(env_pc, dc->pc + 2); @@ -3231,7 +3234,7 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb, } /* Pretty disas. */ - DIS(fprintf(logfile, "%8.8x:\t", dc->pc)); + LOG_DIS("%8.8x:\t", dc->pc); if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO)) gen_io_start(); -- cgit v1.1