[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/23] accel/tcg: Create io_recompile_replay_branch hook
From: |
Alex Bennée |
Subject: |
[PATCH v3 11/23] accel/tcg: Create io_recompile_replay_branch hook |
Date: |
Sat, 13 Feb 2021 13:03:13 +0000 |
From: Richard Henderson <richard.henderson@linaro.org>
Create a hook in which to split out the mips and
sh4 ifdefs from cpu_io_recompile.
[AJB: s/stoped/stopped/]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210208233906.479571-3-richard.henderson@linaro.org>
Message-Id: <20210209182749.31323-3-alex.bennee@linaro.org>
Message-Id: <20210210221053.18050-12-alex.bennee@linaro.org>
---
include/hw/core/tcg-cpu-ops.h | 10 ++++++++++
accel/tcg/translate-all.c | 17 +++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h
index ac3bb051f2..72d791438c 100644
--- a/include/hw/core/tcg-cpu-ops.h
+++ b/include/hw/core/tcg-cpu-ops.h
@@ -88,6 +88,16 @@ struct TCGCPUOps {
*/
bool (*debug_check_watchpoint)(CPUState *cpu, CPUWatchpoint *wp);
+ /**
+ * @io_recompile_replay_branch: Callback for cpu_io_recompile.
+ *
+ * The cpu has been stopped, and cpu_restore_state_from_tb has been
+ * called. If the faulting instruction is in a delay slot, and the
+ * target architecture requires re-execution of the branch, then
+ * adjust the cpu state as required and return true.
+ */
+ bool (*io_recompile_replay_branch)(CPUState *cpu,
+ const TranslationBlock *tb);
#endif /* CONFIG_SOFTMMU */
#endif /* NEED_CPU_H */
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 81d4c83f22..6eb37883bd 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -60,6 +60,7 @@
#include "sysemu/cpu-timers.h"
#include "sysemu/tcg.h"
#include "qapi/error.h"
+#include "hw/core/tcg-cpu-ops.h"
#include "internal.h"
/* #define DEBUG_TB_INVALIDATE */
@@ -2420,6 +2421,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)
CPUArchState *env = cpu->env_ptr;
#endif
TranslationBlock *tb;
+ CPUClass *cc;
uint32_t n;
tb = tcg_tb_lookup(retaddr);
@@ -2429,11 +2431,18 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)
}
cpu_restore_state_from_tb(cpu, tb, retaddr, true);
- /* On MIPS and SH, delay slot instructions can only be restarted if
- they were already the first instruction in the TB. If this is not
- the first instruction in a TB then re-execute the preceding
- branch. */
+ /*
+ * Some guests must re-execute the branch when re-executing a delay
+ * slot instruction. When this is the case, adjust icount and N
+ * to account for the re-execution of the branch.
+ */
n = 1;
+ cc = CPU_GET_CLASS(cpu);
+ if (cc->tcg_ops->io_recompile_replay_branch &&
+ cc->tcg_ops->io_recompile_replay_branch(cpu, tb)) {
+ cpu_neg(cpu)->icount_decr.u16.low++;
+ n = 2;
+ }
#if defined(TARGET_MIPS)
if ((env->hflags & MIPS_HFLAG_BMASK) != 0
&& env->active_tc.PC != tb->pc) {
--
2.20.1
- [PATCH v3 08/23] contrib: Open brace '{' following struct go on the same line, (continued)
- [PATCH v3 08/23] contrib: Open brace '{' following struct go on the same line, Alex Bennée, 2021/02/13
- [PATCH v3 06/23] contrib: Add spaces around operator, Alex Bennée, 2021/02/13
- [PATCH v3 09/23] accel/tcg/plugin-gen: fix the call signature for inline callbacks, Alex Bennée, 2021/02/13
- [PATCH v3 05/23] contrib: Fix some code style problems, ERROR: "foo * bar" should be "foo *bar", Alex Bennée, 2021/02/13
- [PATCH v3 07/23] contrib: space required after that ',', Alex Bennée, 2021/02/13
- [PATCH v3 18/23] accel/tcg: re-factor non-RAM execution code, Alex Bennée, 2021/02/13
- [PATCH v3 14/23] tests/plugin: expand insn test to detect duplicate instructions, Alex Bennée, 2021/02/13
- [PATCH v3 20/23] accel/tcg: allow plugin instrumentation to be disable via cflags, Alex Bennée, 2021/02/13
- [PATCH v3 11/23] accel/tcg: Create io_recompile_replay_branch hook,
Alex Bennée <=
- [PATCH v3 19/23] accel/tcg: remove CF_NOCACHE and special cases, Alex Bennée, 2021/02/13
- [PATCH v3 13/23] target/sh4: Create superh_io_recompile_replay_branch, Alex Bennée, 2021/02/13
- [PATCH v3 22/23] tests/plugin: allow memory plugin to do both inline and callbacks, Alex Bennée, 2021/02/13
- [PATCH v3 21/23] tests/acceptance: add a new tests to detect counting errors, Alex Bennée, 2021/02/13
- [PATCH v3 23/23] tests/acceptance: add a memory callback check, Alex Bennée, 2021/02/13
- [PATCH v3 17/23] accel/tcg: cache single instruction TB on pending replay exception, Alex Bennée, 2021/02/13