All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Edgar E. Iglesias" <edgar.iglesias@axis.com>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 13/13] target-cris/translate.c: create LOG_DIS macro
Date: Thu, 11 Dec 2008 09:43:47 +0100	[thread overview]
Message-ID: <20081211084347.GB30591@edgar.se.axis.com> (raw)
In-Reply-To: <1228933464-7670-14-git-send-email-ehabkost@redhat.com>

On Wed, Dec 10, 2008 at 04:24:24PM -0200, Eduardo Habkost wrote:
> Instead of using DIS(fprintf(logfile, fmt)) everywhere, create and use
> a LOG_DIS(fmt) macro. This will make changing the logging code easier
> in the future.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Looks good, thanks.

Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

> ---
>  target-cris/translate.c |  289 ++++++++++++++++++++++++-----------------------
>  1 files changed, 146 insertions(+), 143 deletions(-)
> 
> diff --git a/target-cris/translate.c b/target-cris/translate.c
> index 242ef9c..a1769ac 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)
> @@ -1463,7 +1466,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);
> @@ -1477,7 +1480,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);
> @@ -1486,7 +1489,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);
>  
> @@ -1502,7 +1505,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;
> @@ -1511,7 +1514,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,
> @@ -1524,7 +1527,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,
> @@ -1537,7 +1540,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,
> @@ -1549,7 +1552,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,
> @@ -1560,7 +1563,7 @@ static unsigned int dec_btstq(DisasContext *dc)
>  {
>  	TCGv l0;
>  	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);
>  	l0 = tcg_temp_local_new();
> @@ -1575,7 +1578,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);
> @@ -1587,7 +1590,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);
>  
> @@ -1601,7 +1604,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);
>  
> @@ -1616,8 +1619,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) {
> @@ -1644,8 +1647,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)
>  	{
> @@ -1688,8 +1691,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);
>  
> @@ -1703,8 +1706,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);
> @@ -1718,8 +1721,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);
> @@ -1735,8 +1738,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);
> @@ -1752,8 +1755,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);
> @@ -1769,8 +1772,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]);
> @@ -1785,8 +1788,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]);
> @@ -1799,7 +1802,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);
> @@ -1810,8 +1813,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);
> @@ -1826,8 +1829,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);
> @@ -1840,8 +1843,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]);
> @@ -1855,8 +1858,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();
> @@ -1874,8 +1877,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]);
> @@ -1887,8 +1890,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);
>  	cris_cc_mask(dc, CC_MASK_NZVC);
>  	cris_alu(dc, CC_OP_ADDC,
> @@ -1898,8 +1901,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,
> @@ -1929,8 +1932,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();
> @@ -1953,8 +1956,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]);
> @@ -1966,8 +1969,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));
> @@ -1979,8 +1982,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));
> @@ -1993,8 +1996,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]);
> @@ -2007,8 +2010,8 @@ static unsigned int dec_neg_r(DisasContext *dc)
>  static unsigned int dec_btst_r(DisasContext *dc)
>  {
>  	TCGv l0;
> -	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);
>  
>  	l0 = tcg_temp_local_new();
> @@ -2024,8 +2027,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]);
> @@ -2039,9 +2042,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();
> @@ -2056,9 +2059,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();
> @@ -2075,9 +2078,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();
> @@ -2094,9 +2097,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();
> @@ -2113,9 +2116,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();
> @@ -2132,9 +2135,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();
> @@ -2155,15 +2158,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.  */
> @@ -2218,14 +2221,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;
> @@ -2234,7 +2237,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();
> @@ -2264,7 +2267,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)
> @@ -2282,10 +2285,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]);
> @@ -2325,10 +2328,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.  */
> @@ -2346,10 +2349,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.  */
> @@ -2367,10 +2370,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.  */
> @@ -2387,10 +2390,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.  */
> @@ -2407,10 +2410,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.  */
> @@ -2428,10 +2431,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]);
> @@ -2447,10 +2450,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]);
> @@ -2466,10 +2469,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]);
> @@ -2487,10 +2490,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]);
> @@ -2508,10 +2511,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);
>  
> @@ -2532,10 +2535,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]);
> @@ -2551,10 +2554,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]);
> @@ -2571,10 +2574,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]);
> @@ -2590,10 +2593,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();
> @@ -2610,9 +2613,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);
>  	cris_alu_m_alloc_temps(t);
> @@ -2629,10 +2632,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]);
> @@ -2648,10 +2651,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]);
> @@ -2669,11 +2672,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]);
> @@ -2702,9 +2705,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)
> @@ -2729,8 +2732,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.  */
> @@ -2773,8 +2776,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);
>  
> @@ -2802,8 +2805,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);
> @@ -2817,8 +2820,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;
> @@ -2834,7 +2837,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;
> @@ -2845,7 +2848,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);
> @@ -2860,7 +2863,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]);
> @@ -2878,7 +2881,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));
> @@ -2894,7 +2897,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));
> @@ -2906,7 +2909,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]);
> @@ -2922,9 +2925,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.  */
> @@ -2939,7 +2942,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));
> @@ -2954,7 +2957,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));
> @@ -2974,20 +2977,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);
> @@ -3339,7 +3342,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();
> -- 
> 1.5.5.GIT
> 
> 

  reply	other threads:[~2008-12-11  8:43 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-10 18:24 [Qemu-devel] [PATCH 00/13] Cleanup some logging code Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 01/13] hw/ppc.c: LOG_IRQ macro Eduardo Habkost
2008-12-11 21:45   ` Anthony Liguori
2008-12-11 22:54     ` Andreas Färber
2008-12-11 23:31       ` Eduardo Habkost
2008-12-14 18:09         ` Jamie Lokier
2008-12-12 14:31       ` Anthony Liguori
2008-12-10 18:24 ` [Qemu-devel] [PATCH 02/13] hw/ppc.c: use LOG_IRQ instead of #ifdefs Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 03/13] hw/ppc.c: LOG_TB macro Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 04/13] hw/ppc.c: use LOG_TB instead of #ifdefs Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 05/13] vl.c: LOG_IOPORT macro Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 06/13] vl.c: use LOG_IOPORT instead of #ifdefs Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 07/13] kqemu.c: LOG_INT macro Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 08/13] kqemu.c: use LOG_INT instead of #ifdefs Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 09/13] kqemu.c: LOG_INT_STATE macro Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 10/13] kqemu.c: use LOG_INT_STATE instead of #ifdefs Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 11/13] target-i386/op_helper.c: LOG_PCALL macro Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 12/13] target-i386/op_helper.c: use LOG_PCALL instead of #ifdefs Eduardo Habkost
2008-12-10 18:24 ` [Qemu-devel] [PATCH 13/13] target-cris/translate.c: create LOG_DIS macro Eduardo Habkost
2008-12-11  8:43   ` Edgar E. Iglesias [this message]
2008-12-10 21:37 ` [Qemu-devel] [PATCH 00/13] Cleanup some logging code Hollis Blanchard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081211084347.GB30591@edgar.se.axis.com \
    --to=edgar.iglesias@axis.com \
    --cc=ehabkost@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.