mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
ppc: Don't update NIP BookE 2.06 tlbwe
This is no longer necessary as the helpers will properly retrieve the return address when needed. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
57a2988b6f
commit
8c8966e218
|
@ -2598,9 +2598,9 @@ void helper_booke206_tlbwe(CPUPPCState *env)
|
|||
tlb = booke206_cur_tlb(env);
|
||||
|
||||
if (!tlb) {
|
||||
helper_raise_exception_err(env, POWERPC_EXCP_PROGRAM,
|
||||
POWERPC_EXCP_INVAL |
|
||||
POWERPC_EXCP_INVAL_INVAL);
|
||||
raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM,
|
||||
POWERPC_EXCP_INVAL |
|
||||
POWERPC_EXCP_INVAL_INVAL, GETPC());
|
||||
}
|
||||
|
||||
/* check that we support the targeted size */
|
||||
|
@ -2608,9 +2608,9 @@ void helper_booke206_tlbwe(CPUPPCState *env)
|
|||
size_ps = booke206_tlbnps(env, tlbn);
|
||||
if ((env->spr[SPR_BOOKE_MAS1] & MAS1_VALID) && (tlbncfg & TLBnCFG_AVAIL) &&
|
||||
!(size_ps & (1 << size_tlb))) {
|
||||
helper_raise_exception_err(env, POWERPC_EXCP_PROGRAM,
|
||||
POWERPC_EXCP_INVAL |
|
||||
POWERPC_EXCP_INVAL_INVAL);
|
||||
raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM,
|
||||
POWERPC_EXCP_INVAL |
|
||||
POWERPC_EXCP_INVAL_INVAL, GETPC());
|
||||
}
|
||||
|
||||
if (msr_gs) {
|
||||
|
|
|
@ -5849,7 +5849,6 @@ static void gen_tlbwe_booke206(DisasContext *ctx)
|
|||
GEN_PRIV;
|
||||
#else
|
||||
CHK_SV;
|
||||
gen_update_nip(ctx, ctx->nip - 4);
|
||||
gen_helper_booke206_tlbwe(cpu_env);
|
||||
#endif /* defined(CONFIG_USER_ONLY) */
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue