[Qemu-devel] [PATCH 1/4] target-i386: Remove duplicate CPU log.

[Qemu-devel] [PATCH 1/4] target-i386: Remove duplicate CPU log.

[Richard Henderson]

The proper logging for -d cpu is done in generic code.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 target-i386/translate.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/target-i386/translate.c b/target-i386/translate.c
index 28d9940..66d8e75 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -7891,7 +7891,6 @@ 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 (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
         int disas_flags;
         qemu_log("----------------\n");
-- 
1.6.6.1

[Qemu-devel] [PATCH 2/4] target-mips: Remove duplicate CPU log.

[Richard Henderson]

Logging for -d cpu is done in generic code.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 target-mips/translate.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/target-mips/translate.c b/target-mips/translate.c
index 0ade3bd..b796b4f 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -9424,11 +9424,6 @@ gen_intermediate_code_internal (CPUState *env, TranslationBlock *tb,
     max_insns = tb->cflags & CF_COUNT_MASK;
     if (max_insns == 0)
         max_insns = CF_COUNT_MASK;
-#ifdef DEBUG_DISAS
-    qemu_log_mask(CPU_LOG_TB_CPU, "------------------------------------------------\n");
-    /* FIXME: This may print out stale hflags from env... */
-    log_cpu_state_mask(CPU_LOG_TB_CPU, env, 0);
-#endif
     LOG_DISAS("\ntb %p idx %d hflags %04x\n", tb, ctx.mem_idx, ctx.hflags);
     gen_icount_start();
     while (ctx.bstate == BS_NONE) {
@@ -9542,7 +9537,6 @@ done_generating:
         log_target_disas(pc_start, ctx.pc - pc_start, 0);
         qemu_log("\n");
     }
-    qemu_log_mask(CPU_LOG_TB_CPU, "---------------- %d %08x\n", ctx.bstate, ctx.hflags);
 #endif
 }
 
-- 
1.6.6.1

[Qemu-devel] [PATCH 3/4] target-ppc: Remove duplicate cpu log.

[Richard Henderson]

Logging for -d cpu is done in generic code.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 target-ppc/translate.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 0af7e4f..3a6146a 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -9111,8 +9111,6 @@ static inline void gen_intermediate_code_internal(CPUState *env,
         tb->icount = num_insns;
     }
 #if defined(DEBUG_DISAS)
-    qemu_log_mask(CPU_LOG_TB_CPU, "---------------- excp: %04x\n", ctx.exception);
-    log_cpu_state_mask(CPU_LOG_TB_CPU, env, 0);
     if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
         int flags;
         flags = env->bfd_mach;
-- 
1.6.6.1

[Qemu-devel] [PATCH 4/4] target-sh4: Remove duplicate CPU log.

[Richard Henderson]

Logging for -d cpu is done in generic code.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 target-sh4/translate.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index bff3188..391b762 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -1914,12 +1914,6 @@ gen_intermediate_code_internal(CPUState * env, TranslationBlock * tb,
     ctx.features = env->features;
     ctx.has_movcal = (tb->flags & TB_FLAG_PENDING_MOVCA);
 
-#ifdef DEBUG_DISAS
-    qemu_log_mask(CPU_LOG_TB_CPU,
-                 "------------------------------------------------\n");
-    log_cpu_state_mask(CPU_LOG_TB_CPU, env, 0);
-#endif
-
     ii = -1;
     num_insns = 0;
     max_insns = tb->cflags & CF_COUNT_MASK;
-- 
1.6.6.1

[Qemu-devel] [PATCH 0/4] Remove duplicate CPU logging

[Richard Henderson]

Generic code handles -d cpu in cpu_exec, amidst the horde of ifdefs.
These duplicates simply double the amount of output produced with no
extra information emitted.

Maintainers for mips, ppc and sh4 cc'd.


r~



Richard Henderson (4):
  target-i386: Remove duplicate CPU log.
  target-mips: Remove duplicate CPU log.
  target-ppc: Remove duplicate cpu log.
  target-sh4: Remove duplicate CPU log.

 target-i386/translate.c |    1 -
 target-mips/translate.c |    6 ------
 target-ppc/translate.c  |    2 --
 target-sh4/translate.c  |    6 ------
 4 files changed, 0 insertions(+), 15 deletions(-)

[Qemu-devel] Re: [PATCH 0/4] Remove duplicate CPU logging

[malc]

On Mon, 5 Apr 2010, Richard Henderson wrote:

> Generic code handles -d cpu in cpu_exec, amidst the horde of ifdefs.
> These duplicates simply double the amount of output produced with no
> extra information emitted.
> 
> Maintainers for mips, ppc and sh4 cc'd.

Fine by me, though i'm maintaining none of the above.

> 
> 
> r~
> 
> 
> 
> Richard Henderson (4):
>   target-i386: Remove duplicate CPU log.
>   target-mips: Remove duplicate CPU log.
>   target-ppc: Remove duplicate cpu log.
>   target-sh4: Remove duplicate CPU log.
> 
>  target-i386/translate.c |    1 -
>  target-mips/translate.c |    6 ------
>  target-ppc/translate.c  |    2 --
>  target-sh4/translate.c  |    6 ------
>  4 files changed, 0 insertions(+), 15 deletions(-)
> 

-- 
mailto:av1474@comtv.ru

Re: [Qemu-devel] [PATCH 0/4] Remove duplicate CPU logging

[Aurelien Jarno]

On Mon, Apr 05, 2010 at 04:03:06PM -0700, Richard Henderson wrote:
> Generic code handles -d cpu in cpu_exec, amidst the horde of ifdefs.
> These duplicates simply double the amount of output produced with no
> extra information emitted.

This is only true if cpu-exec.c is compiled with CONFIG_DEBUG_EXEC
enable, which is not the default. In the current state, this patch
series simply breaks the -cpu option. IMHO, a patch enabling
CONFIG_DEBUG_EXEC should be added to this patch series.

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net