diff options
| author | Richard Henderson | 2022-04-21 17:17:06 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-04-26 17:16:41 +0200 |
| commit | 34cccb7462e12737f04d59dffeea1389aa689d81 (patch) | |
| tree | ca1f6a054a12c38c7a5b457de1778c03953a37be | |
| parent | target/nios2: Handle EXCP_UNALIGN and EXCP_UNALIGND (diff) | |
| download | qemu-34cccb7462e12737f04d59dffeea1389aa689d81.tar.gz qemu-34cccb7462e12737f04d59dffeea1389aa689d81.tar.xz qemu-34cccb7462e12737f04d59dffeea1389aa689d81.zip | |
target/nios2: Cleanup set of CR_EXCEPTION for do_interrupt
The register is entirely read-only for software, and we do not
implement ECC, so we need not deposit the cause into an existing
value; just create a new value from scratch.
Furthermore, exception.CAUSE is not written for break exceptions.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220421151735.31996-36-richard.henderson@linaro.org>
| -rw-r--r-- | target/nios2/helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/nios2/helper.c b/target/nios2/helper.c index 25a89724d0..3d9869453b 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -54,9 +54,10 @@ static void do_exception(Nios2CPU *cpu, uint32_t exception_addr, bool is_break) new_status &= ~(CR_STATUS_PIE | CR_STATUS_U); env->ctrl[CR_STATUS] = new_status; - env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], - CR_EXCEPTION, CAUSE, - cs->exception_index); + if (!is_break) { + env->ctrl[CR_EXCEPTION] = FIELD_DP32(0, CR_EXCEPTION, CAUSE, + cs->exception_index); + } env->pc = exception_addr; } |