[PATCH-for-5.1 6/7] target/sparc/int32_helper: Remove DEBUG_PCALL definition

Philippe Mathieu-Daudé posted 7 patches 5 years, 10 months ago
[PATCH-for-5.1 6/7] target/sparc/int32_helper: Remove DEBUG_PCALL definition
Posted by Philippe Mathieu-Daudé 5 years, 10 months ago
We define DEBUG_PCALL since b884fc5e (2012-10-06).
7.5 years later it is safe to assume we can remove it :)

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/sparc/int32_helper.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c
index 813b47dbb2..c56dd3df18 100644
--- a/target/sparc/int32_helper.c
+++ b/target/sparc/int32_helper.c
@@ -23,9 +23,7 @@
 #include "exec/log.h"
 #include "sysemu/runstate.h"
 
-#define DEBUG_PCALL
 
-#ifdef DEBUG_PCALL
 static const char * const excp_names[0x80] = {
     [TT_TFAULT] = "Instruction Access Fault",
     [TT_ILL_INSN] = "Illegal Instruction",
@@ -58,7 +56,6 @@ static const char * const excp_names[0x80] = {
     [TT_DIV_ZERO] = "Division By Zero",
     [TT_NCP_INSN] = "Coprocessor Disabled",
 };
-#endif
 
 void sparc_cpu_do_interrupt(CPUState *cs)
 {
@@ -71,7 +68,6 @@ void sparc_cpu_do_interrupt(CPUState *cs)
         cpu_get_psr(env);
     }
 
-#ifdef DEBUG_PCALL
     if (qemu_loglevel_mask(CPU_LOG_INT)) {
         static int count;
         const char *name;
@@ -104,7 +100,6 @@ void sparc_cpu_do_interrupt(CPUState *cs)
 #endif
         count++;
     }
-#endif
 #if !defined(CONFIG_USER_ONLY)
     if (env->psret == 0) {
         if (cs->exception_index == 0x80 &&
-- 
2.21.1


Re: [PATCH-for-5.1 6/7] target/sparc/int32_helper: Remove DEBUG_PCALL definition
Posted by KONRAD Frederic 5 years, 10 months ago

Le 3/31/20 à 12:50 PM, Philippe Mathieu-Daudé a écrit :
> We define DEBUG_PCALL since b884fc5e (2012-10-06).
> 7.5 years later it is safe to assume we can remove it :)
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>   target/sparc/int32_helper.c | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c
> index 813b47dbb2..c56dd3df18 100644
> --- a/target/sparc/int32_helper.c
> +++ b/target/sparc/int32_helper.c
> @@ -23,9 +23,7 @@
>   #include "exec/log.h"
>   #include "sysemu/runstate.h"
>   
> -#define DEBUG_PCALL
>   
> -#ifdef DEBUG_PCALL
>   static const char * const excp_names[0x80] = {
>       [TT_TFAULT] = "Instruction Access Fault",
>       [TT_ILL_INSN] = "Illegal Instruction",
> @@ -58,7 +56,6 @@ static const char * const excp_names[0x80] = {
>       [TT_DIV_ZERO] = "Division By Zero",
>       [TT_NCP_INSN] = "Coprocessor Disabled",
>   };
> -#endif
>   
>   void sparc_cpu_do_interrupt(CPUState *cs)
>   {
> @@ -71,7 +68,6 @@ void sparc_cpu_do_interrupt(CPUState *cs)
>           cpu_get_psr(env);
>       }
>   
> -#ifdef DEBUG_PCALL
>       if (qemu_loglevel_mask(CPU_LOG_INT)) {
>           static int count;
>           const char *name;
> @@ -104,7 +100,6 @@ void sparc_cpu_do_interrupt(CPUState *cs)
>   #endif

I was wonderring what was this #endif above:

#if 0
         {
             int i;
             uint8_t *ptr;

             qemu_log("       code=");
             ptr = (uint8_t *)env->pc;
             for (i = 0; i < 16; i++) {
                 qemu_log(" %02x", ldub(ptr + i));
             }
             qemu_log("\n");
         }
#endif

Should we drop that as well?

>           count++;
>       }
> -#endif
>   #if !defined(CONFIG_USER_ONLY)
>       if (env->psret == 0) {
>           if (cs->exception_index == 0x80 &&
> 

In any case LGTM:

Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>