target/ppc: powerpc_excp: Move system call vectored code together
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> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20211229165751.3774248-5-farosas@linux.ibm.com> Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
parent
d1cbee61ab
commit
5ac11b126d
|
@ -623,6 +623,11 @@ static void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)
|
||||||
env->nip += 4;
|
env->nip += 4;
|
||||||
new_msr |= env->msr & ((target_ulong)1 << MSR_EE);
|
new_msr |= env->msr & ((target_ulong)1 << MSR_EE);
|
||||||
new_msr |= env->msr & ((target_ulong)1 << MSR_RI);
|
new_msr |= env->msr & ((target_ulong)1 << MSR_RI);
|
||||||
|
|
||||||
|
vector += lev * 0x20;
|
||||||
|
|
||||||
|
env->lr = env->nip;
|
||||||
|
env->ctr = msr;
|
||||||
break;
|
break;
|
||||||
case POWERPC_EXCP_FPU: /* Floating-point unavailable exception */
|
case POWERPC_EXCP_FPU: /* Floating-point unavailable exception */
|
||||||
case POWERPC_EXCP_APU: /* Auxiliary processor unavailable */
|
case POWERPC_EXCP_APU: /* Auxiliary processor unavailable */
|
||||||
|
@ -936,14 +941,6 @@ static void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)
|
||||||
|
|
||||||
/* Save MSR */
|
/* Save MSR */
|
||||||
env->spr[srr1] = 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 */
|
/* This can update new_msr and vector if AIL applies */
|
||||||
|
|
Loading…
Reference in New Issue