[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v16 49/99] target/arm: make further preparation for the exception
From: |
Alex Bennée |
Subject: |
[PATCH v16 49/99] target/arm: make further preparation for the exception code to move |
Date: |
Fri, 4 Jun 2021 16:52:22 +0100 |
From: Claudio Fontana <cfontana@suse.de>
the exception code in tcg/ needs some adjustment before being exposed
to KVM-only builds. We need to call arm_rebuild_hflags only when
TCG is enabled, or we will error out.
The direct call to helper_rebuild_hflags_a64(env, new_el) will not
be possible when extracting out to common code,
it seems safe to replace it with a call to arm_rebuild_hflags, since
the write to pstate is already done.
Also, some CONFIG_TCG needs to be extended further, so that all
the tcg-only code is marked as such.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
target/arm/tcg/helper.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/target/arm/tcg/helper.c b/target/arm/tcg/helper.c
index e55209491f..7a9eaec5cb 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -755,7 +755,9 @@ static void take_aarch32_exception(CPUARMState *env, int
new_mode,
env->regs[14] = env->regs[15] + offset;
}
env->regs[15] = newpc;
- arm_rebuild_hflags(env);
+ if (tcg_enabled()) {
+ arm_rebuild_hflags(env);
+ }
}
static void arm_cpu_do_interrupt_aarch32_hyp(CPUState *cs)
@@ -1242,7 +1244,11 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs)
pstate_write(env, PSTATE_DAIF | new_mode);
env->aarch64 = 1;
aarch64_restore_sp(env, new_el);
- helper_rebuild_hflags_a64(env, new_el);
+
+ if (tcg_enabled()) {
+ /* pstate already written, so we can use arm_rebuild_hflags here */
+ arm_rebuild_hflags(env);
+ }
env->pc = addr;
@@ -1306,6 +1312,7 @@ void arm_cpu_do_interrupt(CPUState *cs)
env->exception.syndrome);
}
+#ifdef CONFIG_TCG
if (arm_is_psci_call(cpu, cs->exception_index)) {
arm_handle_psci_call(cpu);
qemu_log_mask(CPU_LOG_INT, "...handled as PSCI call\n");
@@ -1317,7 +1324,6 @@ void arm_cpu_do_interrupt(CPUState *cs)
* that caused the exception, not the target exception level, so
* must be handled here.
*/
-#ifdef CONFIG_TCG
if (cs->exception_index == EXCP_SEMIHOST) {
handle_semihosting(cs);
return;
--
2.20.1
- [PATCH v16 73/99] target/arm: cpu-sve: split TCG and KVM functionality, (continued)
- [PATCH v16 73/99] target/arm: cpu-sve: split TCG and KVM functionality, Alex Bennée, 2021/06/04
- [PATCH v16 38/99] target/arm: move arm_sctlr away from tcg helpers, Alex Bennée, 2021/06/04
- [PATCH v16 57/99] target/arm: remove kvm include file for PSCI and arm-powerctl, Alex Bennée, 2021/06/04
- [PATCH v16 27/99] target/arm: fix style in preparation of new cpregs module, Alex Bennée, 2021/06/04
- [PATCH v16 48/99] target/arm: remove now useless ifndef from fp_exception_el, Alex Bennée, 2021/06/04
- [PATCH v16 90/99] XXX target/arm: experiment refactoring cpu "max", Alex Bennée, 2021/06/04
- [PATCH v16 49/99] target/arm: make further preparation for the exception code to move,
Alex Bennée <=
- [PATCH v16 98/99] configure: allow the overriding of default-config in the build, Alex Bennée, 2021/06/04
- [PATCH v16 91/99] target/arm: tcg: remove superfluous CONFIG_TCG check, Alex Bennée, 2021/06/04
- [PATCH v16 22/99] target/arm: tcg: split m_helper user-only and sysemu-only parts, Alex Bennée, 2021/06/04
- [PATCH v16 81/99] target/arm: tcg-sve: rename the narrow_vq and change_el functions, Alex Bennée, 2021/06/04
- [PATCH v16 66/99] tests: do not run qom-test on all machines for ARM KVM-only, Alex Bennée, 2021/06/04
- [PATCH v16 65/99] tests: device-introspect-test: cope with ARM TCG-only devices, Alex Bennée, 2021/06/04