[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 35/68] target/nios2: Cleanup set of CR_EXCEPTION for do_interrupt
From: |
Richard Henderson |
Subject: |
[PULL 35/68] target/nios2: Cleanup set of CR_EXCEPTION for do_interrupt |
Date: |
Tue, 26 Apr 2022 11:18:34 -0700 |
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>
---
target/nios2/helper.c | 7 ++++---
1 file 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;
}
--
2.34.1
- [PULL 37/68] target/nios2: Prevent writes to read-only or reserved control fields, (continued)
- [PULL 37/68] target/nios2: Prevent writes to read-only or reserved control fields, Richard Henderson, 2022/04/26
- [PULL 39/68] target/nios2: Implement CR_STATUS.RSIE, Richard Henderson, 2022/04/26
- [PULL 09/68] target/nios2: Remove user-only nios2_cpu_do_interrupt, Richard Henderson, 2022/04/26
- [PULL 15/68] target/nios2: Add NUM_GP_REGS and NUM_CP_REGS, Richard Henderson, 2022/04/26
- [PULL 19/68] target/nios2: Do not create TCGv for control registers, Richard Henderson, 2022/04/26
- [PULL 24/68] target/nios2: Use hw/registerfields.h for CR_STATUS fields, Richard Henderson, 2022/04/26
- [PULL 27/68] target/nios2: Use hw/registerfields.h for CR_TLBACC fields, Richard Henderson, 2022/04/26
- [PULL 30/68] target/nios2: Move R_FOO and CR_BAR into enumerations, Richard Henderson, 2022/04/26
- [PULL 33/68] target/nios2: Hoist CPU_LOG_INT logging, Richard Henderson, 2022/04/26
- [PULL 34/68] target/nios2: Handle EXCP_UNALIGN and EXCP_UNALIGND, Richard Henderson, 2022/04/26
- [PULL 35/68] target/nios2: Cleanup set of CR_EXCEPTION for do_interrupt,
Richard Henderson <=
- [PULL 31/68] target/nios2: Create EXCP_SEMIHOST for semi-hosting, Richard Henderson, 2022/04/26
- [PULL 36/68] target/nios2: Clean up handling of tlbmisc in do_exception, Richard Henderson, 2022/04/26
- [PULL 40/68] target/nios2: Remove CPU_INTERRUPT_NMI, Richard Henderson, 2022/04/26
- [PULL 43/68] target/nios2: Split out named structs for [IRJ]_TYPE, Richard Henderson, 2022/04/26
- [PULL 46/68] target/nios2: Split out helpers for gen_r_math_logic, Richard Henderson, 2022/04/26
- [PULL 44/68] target/nios2: Split out helpers for gen_i_cmpxx, Richard Henderson, 2022/04/26
- [PULL 49/68] target/nios2: Introduce dest_gpr, Richard Henderson, 2022/04/26
- [PULL 51/68] target/nios2: Enable unaligned traps for system mode, Richard Henderson, 2022/04/26
- [PULL 56/68] target/nios2: Implement Misaligned destination exception, Richard Henderson, 2022/04/26
- [PULL 53/68] target/nios2: Hoist set of is_jmp into gen_goto_tb, Richard Henderson, 2022/04/26