[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/14] target/ppc: Remove some more local CPUState variables o
From: |
BALATON Zoltan |
Subject: |
[PATCH v3 05/14] target/ppc: Remove some more local CPUState variables only used once |
Date: |
Fri, 16 Jun 2023 01:03:14 +0200 (CEST) |
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
- [PATCH v3 00/14] Misc clean ups to target/ppc exception handling, BALATON Zoltan, 2023/06/15
- [PATCH v3 01/14] target/ppc: Remove some superfluous parentheses, BALATON Zoltan, 2023/06/15
- [PATCH v3 05/14] target/ppc: Remove some more local CPUState variables only used once,
BALATON Zoltan <=
- [PATCH v3 03/14] target/ppc: Move common check in exception handlers to a function, BALATON Zoltan, 2023/06/15
- [PATCH v3 04/14] target/ppc: Use env_cpu for cpu_abort in excp_helper, BALATON Zoltan, 2023/06/15
- [PATCH v3 07/14] target/ppd: Remove unused define, BALATON Zoltan, 2023/06/15
- [PATCH v3 06/14] target/ppc: Readability improvements in exception handlers, BALATON Zoltan, 2023/06/15
- [PATCH v3 08/14] target/ppc: Fix gen_sc to use correct nip, BALATON Zoltan, 2023/06/15