public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target/ppc: Get CPUState in one step

Browse source 
We can get CPUState from env with env_cpu without going through
PowerPCCPU and casting that.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Acked-by: Nicholas Piggin <npiggin@gmail.com>
Message-ID: <28424220f37f51ce97f24cadc7538a9c0d16cb45.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:21 +02:00 committed by Daniel Henrique Barboza
parent 08d7cfd04c
commit 4e6b7db2c3
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
target/ppc/excp_helper.c
View file

@ -1770,8 +1770,8 @@ static int p7_interrupt_powersave(CPUPPCState *env)
static int p7_next_unmasked_interrupt(CPUPPCState *env) static int p7_next_unmasked_interrupt(CPUPPCState *env)
{ {
PowerPCCPU *cpu = env_archcpu(env); CPUState *cs = env_cpu(env);
CPUState *cs = CPU(cpu);
/* Ignore MSR[EE] when coming out of some power management states */ /* Ignore MSR[EE] when coming out of some power management states */
bool msr_ee = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset; bool msr_ee = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset;
@ -1860,8 +1860,8 @@ static int p8_interrupt_powersave(CPUPPCState *env)
static int p8_next_unmasked_interrupt(CPUPPCState *env) static int p8_next_unmasked_interrupt(CPUPPCState *env)
{ {
PowerPCCPU *cpu = env_archcpu(env); CPUState *cs = env_cpu(env);
CPUState *cs = CPU(cpu);
/* Ignore MSR[EE] when coming out of some power management states */ /* Ignore MSR[EE] when coming out of some power management states */
bool msr_ee = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset; bool msr_ee = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset;
@ -1981,8 +1981,8 @@ static int p9_interrupt_powersave(CPUPPCState *env)
static int p9_next_unmasked_interrupt(CPUPPCState *env) static int p9_next_unmasked_interrupt(CPUPPCState *env)
{ {
PowerPCCPU *cpu = env_archcpu(env); CPUState *cs = env_cpu(env);
CPUState *cs = CPU(cpu);
/* Ignore MSR[EE] when coming out of some power management states */ /* Ignore MSR[EE] when coming out of some power management states */
bool msr_ee = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset; bool msr_ee = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset;
@ -2675,9 +2675,8 @@ void helper_scv(CPUPPCState *env, uint32_t lev)
void helper_pminsn(CPUPPCState *env, uint32_t insn) void helper_pminsn(CPUPPCState *env, uint32_t insn)
{ {
CPUState *cs; CPUState *cs = env_cpu(env);
cs = env_cpu(env);
cs->halted = 1; cs->halted = 1;
/* Condition for waking up at 0x100 */ /* Condition for waking up at 0x100 */