Re: [PATCH v5 1/9] target/ppc: Use env_cpu for cpu_abort in excp

qemu-ppc

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v5 1/9] target/ppc: Use env_cpu for cpu_abort in excp_helper

From:	Harsh Prateek Bora
Subject:	Re: [PATCH v5 1/9] target/ppc: Use env_cpu for cpu_abort in excp_helper
Date:	Wed, 21 Feb 2024 14:40:37 +0530
User-agent:	Mozilla Thunderbird



On 1/19/24 03:31, BALATON Zoltan wrote:

Use the env_cpu function to get the CPUState for cpu_abort. These are
only needed in case of fatal errors so this allows to avoid casting
and storing CPUState in a local variable wnen not needed.


I wish the patch could have broader scope to cover whole file and not
just cpu_abort, however, this is good to begin with.

Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
  target/ppc/excp_helper.c | 118 +++++++++++++++++++++------------------
  1 file changed, 63 insertions(+), 55 deletions(-)

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 2ec6429e36..b8fd01d04c 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -445,7 +445,6 @@ static void powerpc_mcheck_checkstop(CPUPPCState *env)

static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)

  {
-    CPUState *cs = CPU(cpu);
      CPUPPCState *env = &cpu->env;
      target_ulong msr, new_msr, vector;
      int srr0, srr1;
@@ -473,8 +472,8 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)

vector = env->excp_vectors[excp];

      if (vector == (target_ulong)-1ULL) {
-        cpu_abort(cs, "Raised an exception without defined vector %d\n",
-                  excp);
+        cpu_abort(env_cpu(env),
+                  "Raised an exception without defined vector %d\n", excp);
      }

vector |= env->excp_prefix;

@@ -523,7 +522,7 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
              env->spr[SPR_40x_ESR] = ESR_PTR;
              break;
          default:
-            cpu_abort(cs, "Invalid program exception %d. Aborting\n",
+            cpu_abort(env_cpu(env), "Invalid program exception %d. Aborting\n",
                        env->error_code);
              break;
          }
@@ -550,11 +549,12 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
          trace_ppc_excp_print("PIT");
          break;
      case POWERPC_EXCP_DEBUG:     /* Debug interrupt                          
*/
-        cpu_abort(cs, "%s exception not implemented\n",
+        cpu_abort(env_cpu(env), "%s exception not implemented\n",
                    powerpc_excp_name(excp));
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
+        cpu_abort(env_cpu(env), "Invalid PowerPC exception %d. Aborting\n",
+                  excp);
          break;
      }

@@ -569,7 +569,6 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)

  {
-    CPUState *cs = CPU(cpu);
      CPUPPCState *env = &cpu->env;
      target_ulong msr, new_msr, vector;

@@ -592,8 +591,8 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)vector = env->excp_vectors[excp];

      if (vector == (target_ulong)-1ULL) {
-        cpu_abort(cs, "Raised an exception without defined vector %d\n",
-                  excp);
+        cpu_abort(env_cpu(env),
+                  "Raised an exception without defined vector %d\n", excp);
      }

vector |= env->excp_prefix;

@@ -653,7 +652,7 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
              break;
          default:
              /* Should never occur */
-            cpu_abort(cs, "Invalid program exception %d. Aborting\n",
+            cpu_abort(env_cpu(env), "Invalid program exception %d. Aborting\n",
                        env->error_code);
              break;
          }
@@ -675,8 +674,9 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
          break;
      case POWERPC_EXCP_RESET:     /* System reset exception                   
*/
          if (FIELD_EX64(env->msr, MSR, POW)) {
-            cpu_abort(cs, "Trying to deliver power-saving system reset "
-                      "exception %d with no HV support\n", excp);
+            cpu_abort(env_cpu(env),
+                      "Trying to deliver power-saving system reset exception "
+                      "%d with no HV support\n", excp);
          }
          break;
      case POWERPC_EXCP_TRACE:     /* Trace exception                          
*/
@@ -703,11 +703,12 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
      case POWERPC_EXCP_SMI:       /* System management interrupt              
*/
      case POWERPC_EXCP_MEXTBR:    /* Maskable external breakpoint             
*/
      case POWERPC_EXCP_NMEXTBR:   /* Non maskable external breakpoint         
*/
-        cpu_abort(cs, "%s exception not implemented\n",
+        cpu_abort(env_cpu(env), "%s exception not implemented\n",
                    powerpc_excp_name(excp));
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
+        cpu_abort(env_cpu(env), "Invalid PowerPC exception %d. Aborting\n",
+                  excp);
          break;
      }

@@ -730,7 +731,6 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)

  {
-    CPUState *cs = CPU(cpu);
      CPUPPCState *env = &cpu->env;
      target_ulong msr, new_msr, vector;

@@ -753,8 +753,8 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)vector = env->excp_vectors[excp];

      if (vector == (target_ulong)-1ULL) {
-        cpu_abort(cs, "Raised an exception without defined vector %d\n",
-                  excp);
+        cpu_abort(env_cpu(env),
+                  "Raised an exception without defined vector %d\n", excp);
      }

vector |= env->excp_prefix;

@@ -812,7 +812,7 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
              break;
          default:
              /* Should never occur */
-            cpu_abort(cs, "Invalid program exception %d. Aborting\n",
+            cpu_abort(env_cpu(env), "Invalid program exception %d. Aborting\n",
                        env->error_code);
              break;
          }
@@ -854,8 +854,9 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
          break;
      case POWERPC_EXCP_RESET:     /* System reset exception                   
*/
          if (FIELD_EX64(env->msr, MSR, POW)) {
-            cpu_abort(cs, "Trying to deliver power-saving system reset "
-                      "exception %d with no HV support\n", excp);
+            cpu_abort(env_cpu(env),
+                      "Trying to deliver power-saving system reset exception "
+                      "%d with no HV support\n", excp);
          }
          break;
      case POWERPC_EXCP_TRACE:     /* Trace exception                          
*/
@@ -875,11 +876,12 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
      case POWERPC_EXCP_SMI:       /* System management interrupt              
*/
      case POWERPC_EXCP_THERM:     /* Thermal interrupt                        
*/
      case POWERPC_EXCP_PERFM:     /* Embedded performance monitor interrupt   
*/
-        cpu_abort(cs, "%s exception not implemented\n",
+        cpu_abort(env_cpu(env), "%s exception not implemented\n",
                    powerpc_excp_name(excp));
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
+        cpu_abort(env_cpu(env), "Invalid PowerPC exception %d. Aborting\n",
+                  excp);
          break;
      }

@@ -902,7 +904,6 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)

  {
-    CPUState *cs = CPU(cpu);
      CPUPPCState *env = &cpu->env;
      target_ulong msr, new_msr, vector;

@@ -925,8 +926,8 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)vector = env->excp_vectors[excp];

      if (vector == (target_ulong)-1ULL) {
-        cpu_abort(cs, "Raised an exception without defined vector %d\n",
-                  excp);
+        cpu_abort(env_cpu(env),
+                  "Raised an exception without defined vector %d\n", excp);
      }

vector |= env->excp_prefix;

@@ -984,7 +985,7 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)
              break;
          default:
              /* Should never occur */
-            cpu_abort(cs, "Invalid program exception %d. Aborting\n",
+            cpu_abort(env_cpu(env), "Invalid program exception %d. Aborting\n",
                        env->error_code);
              break;
          }
@@ -1026,7 +1027,8 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)
          break;
      case POWERPC_EXCP_RESET:     /* System reset exception                   
*/
          if (FIELD_EX64(env->msr, MSR, POW)) {
-            cpu_abort(cs, "Trying to deliver power-saving system reset "
+            cpu_abort(env_cpu(env),
+                      "Trying to deliver power-saving system reset "
                        "exception %d with no HV support\n", excp);
          }
          break;
@@ -1039,11 +1041,12 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)
      case POWERPC_EXCP_THERM:     /* Thermal interrupt                        
*/
      case POWERPC_EXCP_PERFM:     /* Embedded performance monitor interrupt   
*/
      case POWERPC_EXCP_VPUA:      /* Vector assist exception                  
*/
-        cpu_abort(cs, "%s exception not implemented\n",
+        cpu_abort(env_cpu(env), "%s exception not implemented\n",
                    powerpc_excp_name(excp));
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
+        cpu_abort(env_cpu(env), "Invalid PowerPC exception %d. Aborting\n",
+                  excp);
          break;
      }

@@ -1066,7 +1069,6 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)

  {
-    CPUState *cs = CPU(cpu);
      CPUPPCState *env = &cpu->env;
      target_ulong msr, new_msr, vector;
      int srr0, srr1;
@@ -1103,8 +1105,8 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)

vector = env->excp_vectors[excp];

      if (vector == (target_ulong)-1ULL) {
-        cpu_abort(cs, "Raised an exception without defined vector %d\n",
-                  excp);
+        cpu_abort(env_cpu(env),
+                  "Raised an exception without defined vector %d\n", excp);
      }

vector |= env->excp_prefix;

@@ -1135,6 +1137,7 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
          break;
      case POWERPC_EXCP_EXTERNAL:  /* External input                           
*/
          if (env->mpic_proxy) {
+            CPUState *cs = env_cpu(env);
              /* IACK the IRQ on delivery */
              env->spr[SPR_BOOKE_EPR] = ldl_phys(cs->as, env->mpic_iack);
          }
@@ -1173,7 +1176,7 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
              break;
          default:
              /* Should never occur */
-            cpu_abort(cs, "Invalid program exception %d. Aborting\n",
+            cpu_abort(env_cpu(env), "Invalid program exception %d. Aborting\n",
                        env->error_code);
              break;
          }
@@ -1214,7 +1217,8 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)

/* DBSR already modified by caller */

          } else {
-            cpu_abort(cs, "Debug exception triggered on unsupported model\n");
+            cpu_abort(env_cpu(env),
+                      "Debug exception triggered on unsupported model\n");
          }
          break;
      case POWERPC_EXCP_SPEU:   /* SPE/embedded floating-point unavailable/VPU  
*/
@@ -1228,17 +1232,19 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int 
excp)
          break;
      case POWERPC_EXCP_RESET:     /* System reset exception                   
*/
          if (FIELD_EX64(env->msr, MSR, POW)) {
-            cpu_abort(cs, "Trying to deliver power-saving system reset "
+            cpu_abort(env_cpu(env),
+                      "Trying to deliver power-saving system reset "
                        "exception %d with no HV support\n", excp);
          }
          break;
      case POWERPC_EXCP_EFPDI:     /* Embedded floating-point data interrupt   
*/
      case POWERPC_EXCP_EFPRI:     /* Embedded floating-point round interrupt  
*/
-        cpu_abort(cs, "%s exception not implemented\n",
+        cpu_abort(env_cpu(env), "%s exception not implemented\n",
                    powerpc_excp_name(excp));
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
+        cpu_abort(env_cpu(env), "Invalid PowerPC exception %d. Aborting\n",
+                  excp);
          break;
      }

@@ -1367,7 +1373,6 @@ static bool is_prefix_insn_excp(PowerPCCPU *cpu, int excp)static void powerpc_excp_books(PowerPCCPU *cpu, int excp)

  {
-    CPUState *cs = CPU(cpu);
      CPUPPCState *env = &cpu->env;
      target_ulong msr, new_msr, vector;
      int srr0, srr1, lev = -1;
@@ -1406,8 +1411,8 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)

vector = env->excp_vectors[excp];

      if (vector == (target_ulong)-1ULL) {
-        cpu_abort(cs, "Raised an exception without defined vector %d\n",
-                  excp);
+        cpu_abort(env_cpu(env),
+                  "Raised an exception without defined vector %d\n", excp);
      }

vector |= env->excp_prefix;

@@ -1503,7 +1508,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
              break;
          default:
              /* Should never occur */
-            cpu_abort(cs, "Invalid program exception %d. Aborting\n",
+            cpu_abort(env_cpu(env), "Invalid program exception %d. Aborting\n",
                        env->error_code);
              break;
          }
@@ -1569,7 +1574,8 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
              new_msr |= (target_ulong)MSR_HVB;
          } else {
              if (FIELD_EX64(env->msr, MSR, POW)) {
-                cpu_abort(cs, "Trying to deliver power-saving system reset "
+                cpu_abort(env_cpu(env),
+                          "Trying to deliver power-saving system reset "
                            "exception %d with no HV support\n", excp);
              }
          }
@@ -1641,11 +1647,12 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int 
excp)
      case POWERPC_EXCP_VPUA:      /* Vector assist exception                  
*/
      case POWERPC_EXCP_MAINT:     /* Maintenance exception                    
*/
      case POWERPC_EXCP_HV_MAINT:  /* Hypervisor Maintenance exception         
*/
-        cpu_abort(cs, "%s exception not implemented\n",
+        cpu_abort(env_cpu(env), "%s exception not implemented\n",
                    powerpc_excp_name(excp));
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
+        cpu_abort(env_cpu(env), "Invalid PowerPC exception %d. Aborting\n",
+                  excp);
          break;
      }

@@ -1678,8 +1685,8 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)

      } else {
          /* Sanity check */
          if (!(env->msr_mask & MSR_HVB) && srr0 == SPR_HSRR0) {
-            cpu_abort(cs, "Trying to deliver HV exception (HSRR) %d with "
-                      "no HV support\n", excp);
+            cpu_abort(env_cpu(env), "Trying to deliver HV exception (HSRR) %d "
+                      "with no HV support\n", excp);
          }

/* This can update new_msr and vector if AIL applies */

@@ -1697,11 +1704,11 @@ static inline void powerpc_excp_books(PowerPCCPU *cpu, 
int excp)

static void powerpc_excp(PowerPCCPU *cpu, int excp)

  {
-    CPUState *cs = CPU(cpu);
      CPUPPCState *env = &cpu->env;

if (excp <= POWERPC_EXCP_NONE || excp >= POWERPC_EXCP_NB) {

-        cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
+        cpu_abort(env_cpu(env), "Invalid PowerPC exception %d. Aborting\n",
+                  excp);
      }

qemu_log_mask(CPU_LOG_INT, "Raise exception at " TARGET_FMT_lx

@@ -2235,7 +2242,6 @@ void ppc_maybe_interrupt(CPUPPCState *env)
  static void p7_deliver_interrupt(CPUPPCState *env, int interrupt)
  {
      PowerPCCPU *cpu = env_archcpu(env);
-    CPUState *cs = env_cpu(env);

switch (interrupt) {

      case PPC_INTERRUPT_MCK: /* Machine check exception */
@@ -2279,14 +2285,14 @@ static void p7_deliver_interrupt(CPUPPCState *env, int 
interrupt)
          assert(!env->resume_as_sreset);
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC interrupt %d. Aborting\n", interrupt);
+        cpu_abort(env_cpu(env), "Invalid PowerPC interrupt %d. Aborting\n",
+                  interrupt);
      }
  }

static void p8_deliver_interrupt(CPUPPCState *env, int interrupt)

  {
      PowerPCCPU *cpu = env_archcpu(env);
-    CPUState *cs = env_cpu(env);

switch (interrupt) {

      case PPC_INTERRUPT_MCK: /* Machine check exception */
@@ -2350,7 +2356,8 @@ static void p8_deliver_interrupt(CPUPPCState *env, int 
interrupt)
          assert(!env->resume_as_sreset);
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC interrupt %d. Aborting\n", interrupt);
+        cpu_abort(env_cpu(env), "Invalid PowerPC interrupt %d. Aborting\n",
+                  interrupt);
      }
  }

@@ -2429,7 +2436,8 @@ static void p9_deliver_interrupt(CPUPPCState *env, int interrupt)

          assert(!env->resume_as_sreset);
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC interrupt %d. Aborting\n", interrupt);
+        cpu_abort(env_cpu(env), "Invalid PowerPC interrupt %d. Aborting\n",
+                  interrupt);
      }
  }
  #endif
@@ -2437,7 +2445,6 @@ static void p9_deliver_interrupt(CPUPPCState *env, int 
interrupt)
  static void ppc_deliver_interrupt_generic(CPUPPCState *env, int interrupt)
  {
      PowerPCCPU *cpu = env_archcpu(env);
-    CPUState *cs = env_cpu(env);

switch (interrupt) {

      case PPC_INTERRUPT_RESET: /* External reset */
@@ -2534,7 +2541,8 @@ static void ppc_deliver_interrupt_generic(CPUPPCState 
*env, int interrupt)
          assert(!env->resume_as_sreset);
          break;
      default:
-        cpu_abort(cs, "Invalid PowerPC interrupt %d. Aborting\n", interrupt);
+        cpu_abort(env_cpu(env), "Invalid PowerPC interrupt %d. Aborting\n",
+                  interrupt);
      }
  }

[Prev in Thread]

Current Thread

[Next in Thread]

Re: [PATCH v5 1/9] target/ppc: Use env_cpu for cpu_abort in excp_helper, Harsh Prateek Bora <=

Prev by Date: Re: [PATCH v5 5/9] target/ppc: Simplify syscall exception handlers
Next by Date: [PATCH 1/3] target/ppc/kvm: Replace variable length array in kvmppc_save_htab()
Previous by thread: Re: [PATCH v5 5/9] target/ppc: Simplify syscall exception handlers
Next by thread: [PATCH 0/3] Replace variable length arrays in ppc KVM code
Index(es):
- Date
- Thread