SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/ppc: Remove some more local CPUState variables only used once

Browse Source 
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>
This commit is contained in:
BALATON Zoltan 2023-06-16 01:03:14 +02:00 committed by Daniel Henrique Barboza
parent 819b31b0b4
commit 0661329a35
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/ppc/excp_helper.c
View File

@ -2653,8 +2653,7 @@ void helper_store_msr(CPUPPCState *env, target_ulong val)
uint32_t excp = hreg_store_msr(env, val, 0); uint32_t excp = hreg_store_msr(env, val, 0);
if (excp != 0) { if (excp != 0) {
CPUState *cs = env_cpu(env); cpu_interrupt_exittb(env_cpu(env));
cpu_interrupt_exittb(cs);
raise_exception(env, excp); raise_exception(env, excp);
} }
} }
@ -2691,8 +2690,6 @@ void helper_pminsn(CPUPPCState *env, uint32_t insn)
static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr) 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:POW cannot be set by any form of rfi */
msr &= ~(1ULL << MSR_POW); msr &= ~(1ULL << MSR_POW);
@ -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 * No need to raise an exception here, as rfi is always the last
* insn of a TB * insn of a TB
*/ */
cpu_interrupt_exittb(cs); cpu_interrupt_exittb(env_cpu(env));
/* Reset the reservation */ /* Reset the reservation */
env->reserve_addr = -1; env->reserve_addr = -1;