[v3] Misc clean ups to target/ppc exception handling

[PATCH v3 05/14] target/ppc: Remove some more local CPUState variables only used once

Posted by BALATON Zoltan 2 years, 7 months ago

Some helpers only have a CPUState local to call cpu_interrupt_exittb()
but we can use env_cpu for that and remove the local.

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

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 122e2a6e41..a175865fa9 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -2551,8 +2551,7 @@ void helper_store_msr(CPUPPCState *env, target_ulong val)
     uint32_t excp = hreg_store_msr(env, val, 0);
 
     if (excp != 0) {
-        CPUState *cs = env_cpu(env);
-        cpu_interrupt_exittb(cs);
+        cpu_interrupt_exittb(env_cpu(env));
         raise_exception(env, excp);
     }
 }
@@ -2589,8 +2588,6 @@ void helper_pminsn(CPUPPCState *env, uint32_t insn)
 
 static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
 {
-    CPUState *cs = env_cpu(env);
-
     /* MSR:POW cannot be set by any form of rfi */
     msr &= ~(1ULL << MSR_POW);
 
@@ -2614,7 +2611,7 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
      * No need to raise an exception here, as rfi is always the last
      * insn of a TB
      */
-    cpu_interrupt_exittb(cs);
+    cpu_interrupt_exittb(env_cpu(env));
     /* Reset the reservation */
     env->reserve_addr = -1;
 
-- 
2.30.9

Re: [PATCH v3 05/14] target/ppc: Remove some more local CPUState variables only used once

Posted by Nicholas Piggin 2 years, 7 months ago

On Fri Jun 16, 2023 at 9:03 AM AEST, BALATON Zoltan wrote:
> Some helpers only have a CPUState local to call cpu_interrupt_exittb()
> but we can use env_cpu for that and remove the local.
>
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>

I have less issue with this one.

Acked-by: Nicholas Piggin <npiggin@gmail.com>

> ---
>  target/ppc/excp_helper.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 122e2a6e41..a175865fa9 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -2551,8 +2551,7 @@ void helper_store_msr(CPUPPCState *env, target_ulong val)
>      uint32_t excp = hreg_store_msr(env, val, 0);
>  
>      if (excp != 0) {
> -        CPUState *cs = env_cpu(env);
> -        cpu_interrupt_exittb(cs);
> +        cpu_interrupt_exittb(env_cpu(env));
>          raise_exception(env, excp);
>      }
>  }
> @@ -2589,8 +2588,6 @@ void helper_pminsn(CPUPPCState *env, uint32_t insn)
>  
>  static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
>  {
> -    CPUState *cs = env_cpu(env);
> -
>      /* MSR:POW cannot be set by any form of rfi */
>      msr &= ~(1ULL << MSR_POW);
>  
> @@ -2614,7 +2611,7 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)
>       * No need to raise an exception here, as rfi is always the last
>       * insn of a TB
>       */
> -    cpu_interrupt_exittb(cs);
> +    cpu_interrupt_exittb(env_cpu(env));
>      /* Reset the reservation */
>      env->reserve_addr = -1;
>  
> -- 
> 2.30.9