[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 47/64] target/nios2: Enable unaligned traps for system mode
From: |
Richard Henderson |
Subject: |
[PATCH v7 47/64] target/nios2: Enable unaligned traps for system mode |
Date: |
Thu, 21 Apr 2022 08:17:18 -0700 |
Unaligned traps are optional, but required with an mmu.
Turn them on always, because the fallback behaviour undefined.
Enable alignment checks in the config file.
Unwind the guest pc properly from do_unaligned_access.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
configs/targets/nios2-softmmu.mak | 1 +
target/nios2/helper.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configs/targets/nios2-softmmu.mak
b/configs/targets/nios2-softmmu.mak
index 9a372f0717..1e93b54cd1 100644
--- a/configs/targets/nios2-softmmu.mak
+++ b/configs/targets/nios2-softmmu.mak
@@ -1 +1,2 @@
TARGET_ARCH=nios2
+TARGET_ALIGNED_ONLY=y
diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index c5a2dd65b1..2e9fea4a01 100644
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -241,8 +241,8 @@ void nios2_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
CPUNios2State *env = &cpu->env;
env->ctrl[CR_BADADDR] = addr;
- env->ctrl[CR_EXCEPTION] = FIELD_DP32(0, CR_EXCEPTION, CAUSE, EXCP_UNALIGN);
- helper_raise_exception(env, EXCP_UNALIGN);
+ cs->exception_index = EXCP_UNALIGN;
+ cpu_loop_exit_restore(cs, retaddr);
}
bool nios2_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
--
2.34.1
- [PATCH v7 42/64] target/nios2: Use tcg_constant_tl, (continued)
- [PATCH v7 42/64] target/nios2: Use tcg_constant_tl, Richard Henderson, 2022/04/21
- [PATCH v7 41/64] target/nios2: Support division error exception, Richard Henderson, 2022/04/21
- [PATCH v7 44/64] target/nios2: Split out helpers for gen_* translate macros, Richard Henderson, 2022/04/21
- [PATCH v7 43/64] target/nios2: Split out named structs for [IRJ]_TYPE, Richard Henderson, 2022/04/21
- [PATCH v7 48/64] target/nios2: Create gen_jumpr, Richard Henderson, 2022/04/21
- [PATCH v7 40/64] target/nios2: Remove CPU_INTERRUPT_NMI, Richard Henderson, 2022/04/21
- [PATCH v7 51/64] target/nios2: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2022/04/21
- [PATCH v7 45/64] target/nios2: Introduce dest_gpr, Richard Henderson, 2022/04/21
- [PATCH v7 47/64] target/nios2: Enable unaligned traps for system mode,
Richard Henderson <=
- [PATCH v7 46/64] target/nios2: Drop CR_STATUS_EH from tb->flags, Richard Henderson, 2022/04/21
- [PATCH v7 49/64] target/nios2: Hoist set of is_jmp into gen_goto_tb, Richard Henderson, 2022/04/21
- [PATCH v7 50/64] target/nios2: Use gen_goto_tb for DISAS_TOO_MANY, Richard Henderson, 2022/04/21
- [PATCH v7 52/64] target/nios2: Implement Misaligned destination exception, Richard Henderson, 2022/04/21
- [PATCH v7 58/64] linux-user/nios2: Handle various SIGILL exceptions, Richard Henderson, 2022/04/21
- [PATCH v7 61/64] hw/nios2: Move memory regions into Nios2Machine, Richard Henderson, 2022/04/21
- [PATCH v7 56/64] target/nios2: Implement EIC interrupt processing, Richard Henderson, 2022/04/21
- [PATCH v7 55/64] target/nios2: Update helper_eret for shadow registers, Richard Henderson, 2022/04/21
- [PATCH v7 59/64] hw/intc: Vectored Interrupt Controller (VIC), Richard Henderson, 2022/04/21