diff options
| author | Fabiano Rosas <farosas@linux.ibm.com> | 2022-01-28 13:15:05 +0100 |
|---|---|---|
| committer | Cédric Le Goater <clg@kaod.org> | 2022-01-28 13:15:05 +0100 |
| commit | 64e62cfbec19ed22d097645219bdddb55df6f562 (patch) | |
| tree | cec5711aa8439e0ed9275b660df8960864a9d277 | |
| parent | 35f579f5c21682311039f84e2e81254937e6ff78 (diff) | |
| download | focaccia-qemu-64e62cfbec19ed22d097645219bdddb55df6f562.tar.gz focaccia-qemu-64e62cfbec19ed22d097645219bdddb55df6f562.zip | |
target/ppc: 405: Program exception cleanup
The 405 Program Interrupt does not set SRR1 with any diagnostic bits, just a clean copy of the MSR. We're using the BookE Exception Syndrome Register which is different from the 405. Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> [ clg: restored SPR_40x_ESR settings ] Message-Id: <20220118184448.852996-14-farosas@linux.ibm.com> Signed-off-by: Cédric Le Goater <clg@kaod.org>
| -rw-r--r-- | target/ppc/excp_helper.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 7d89bd0651..b528457d92 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -483,30 +483,19 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp) env->error_code = 0; return; } - - /* - * FP exceptions always have NIP pointing to the faulting - * instruction, so always use store_next and claim we are - * precise in the MSR. - */ - msr |= 0x00100000; - env->spr[SPR_BOOKE_ESR] = ESR_FP; + env->spr[SPR_40x_ESR] = ESR_FP; break; case POWERPC_EXCP_INVAL: trace_ppc_excp_inval(env->nip); - msr |= 0x00080000; - env->spr[SPR_BOOKE_ESR] = ESR_PIL; + env->spr[SPR_40x_ESR] = ESR_PIL; break; case POWERPC_EXCP_PRIV: - msr |= 0x00040000; - env->spr[SPR_BOOKE_ESR] = ESR_PPR; + env->spr[SPR_40x_ESR] = ESR_PPR; break; case POWERPC_EXCP_TRAP: - msr |= 0x00020000; - env->spr[SPR_BOOKE_ESR] = ESR_PTR; + env->spr[SPR_40x_ESR] = ESR_PTR; break; default: - /* Should never occur */ cpu_abort(cs, "Invalid program exception %d. Aborting\n", env->error_code); break; |