| Message ID | 2261dffe335cc7fd1eade43cf569ae1cc640ed98.1686522199.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | Misc clean ups to target/ppc exception handling | expand |
On Mon Jun 12, 2023 at 8:42 AM AEST, BALATON Zoltan wrote: > CPUState is rarely needed by this function (only for logging a fatal > error) and it's easy to get from the env parameter so passing it > separately is not necessary. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Caller does have env already, but I don't mind much either way. Acked-by: Nicholas Piggin <npiggin@gmail.com> > --- > target/ppc/excp_helper.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 8298217e78..3783315fdb 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -166,8 +166,7 @@ static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp) > } > > #if defined(TARGET_PPC64) > -static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, > - target_ulong *msr) > +static int powerpc_reset_wakeup(CPUPPCState *env, int excp, target_ulong *msr) > { > /* We no longer are in a PM state */ > env->resume_as_sreset = false; > @@ -202,8 +201,8 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, > *msr |= SRR1_WAKEHVI; > break; > default: > - cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", > - excp); > + cpu_abort(env_cpu(env), > + "Unsupported exception %d in Power Save mode\n", excp); > } > return POWERPC_EXCP_RESET; > } > @@ -1353,7 +1352,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp) > * P7/P8/P9 > */ > if (env->resume_as_sreset) { > - excp = powerpc_reset_wakeup(cs, env, excp, &msr); > + excp = powerpc_reset_wakeup(env, excp, &msr); > } > > /* > -- > 2.30.9
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 8298217e78..3783315fdb 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -166,8 +166,7 @@ static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp) } #if defined(TARGET_PPC64) -static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, - target_ulong *msr) +static int powerpc_reset_wakeup(CPUPPCState *env, int excp, target_ulong *msr) { /* We no longer are in a PM state */ env->resume_as_sreset = false; @@ -202,8 +201,8 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, *msr |= SRR1_WAKEHVI; break; default: - cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", - excp); + cpu_abort(env_cpu(env), + "Unsupported exception %d in Power Save mode\n", excp); } return POWERPC_EXCP_RESET; } @@ -1353,7 +1352,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp) * P7/P8/P9 */ if (env->resume_as_sreset) { - excp = powerpc_reset_wakeup(cs, env, excp, &msr); + excp = powerpc_reset_wakeup(env, excp, &msr); } /*
CPUState is rarely needed by this function (only for logging a fatal error) and it's easy to get from the env parameter so passing it separately is not necessary. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- target/ppc/excp_helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)