Skip to content

Commit

Permalink
target/ppc: Remove some more local CPUState variables only used once
Browse files Browse the repository at this point in the history
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>
Acked-by: Nicholas Piggin <npiggin@gmail.com>
Message-ID: <aa34e449552c6ab52d48938ccbe762fc06adac01.1686868895.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
  • Loading branch information
zbalaton authored and danielhb committed Jul 7, 2023
1 parent 819b31b commit 0661329
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions target/ppc/excp_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -2653,8 +2653,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);
}
}
Expand Down Expand Up @@ -2691,8 +2690,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);

Expand All @@ -2716,7 +2713,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;

Expand Down

0 comments on commit 0661329

Please sign in to comment.