| Message ID | 20211220181903.3456898-4-farosas@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: powerpc_excp improvements | expand |
Adding Nicholas. On 12/20/21 19:18, Fabiano Rosas wrote: > Now that 'vector' is known before calling the interrupt-specific setup > code, we can move all of the scv setup into one place. > > No functional change intended. > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > target/ppc/excp_helper.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 14fd0213a0..7bdc1e8410 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -549,6 +549,11 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > env->nip += 4; > new_msr |= env->msr & ((target_ulong)1 << MSR_EE); > new_msr |= env->msr & ((target_ulong)1 << MSR_RI); > + > + vector += lev * 0x20; > + > + env->lr = env->nip; > + env->ctr = msr; > break; > case POWERPC_EXCP_FPU: /* Floating-point unavailable exception */ > case POWERPC_EXCP_APU: /* Auxiliary processor unavailable */ > @@ -862,14 +867,6 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > > /* Save MSR */ > env->spr[srr1] = msr; > - > -#if defined(TARGET_PPC64) > - } else { > - vector += lev * 0x20; > - > - env->lr = env->nip; > - env->ctr = msr; > -#endif > } > > /* This can update new_msr and vector if AIL applies */ >
On 12/20/21 10:18 AM, Fabiano Rosas wrote: > Now that 'vector' is known before calling the interrupt-specific setup > code, we can move all of the scv setup into one place. > > No functional change intended. > > Signed-off-by: Fabiano Rosas<farosas@linux.ibm.com> > --- > target/ppc/excp_helper.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 14fd0213a0..7bdc1e8410 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -549,6 +549,11 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) env->nip += 4; new_msr |= env->msr & ((target_ulong)1 << MSR_EE); new_msr |= env->msr & ((target_ulong)1 << MSR_RI); + + vector += lev * 0x20; + + env->lr = env->nip; + env->ctr = msr; break; case POWERPC_EXCP_FPU: /* Floating-point unavailable exception */ case POWERPC_EXCP_APU: /* Auxiliary processor unavailable */ @@ -862,14 +867,6 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) /* Save MSR */ env->spr[srr1] = msr; - -#if defined(TARGET_PPC64) - } else { - vector += lev * 0x20; - - env->lr = env->nip; - env->ctr = msr; -#endif } /* This can update new_msr and vector if AIL applies */
Now that 'vector' is known before calling the interrupt-specific setup code, we can move all of the scv setup into one place. No functional change intended. Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- target/ppc/excp_helper.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)