5682929111
A few more bug fixes from upstream. Also stop using system membarriers, and revert a recent xen migration fix (not the right one). OBS-URL: https://build.opensuse.org/request/show/768144 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=528
101 lines
3.2 KiB
Diff
101 lines
3.2 KiB
Diff
From: Laurent Vivier <laurent@vivier.eu>
|
|
Date: Thu, 16 Jan 2020 17:54:54 +0100
|
|
Subject: m68k: Fix regression causing Single-Step via GDB/RSP to not single
|
|
step
|
|
|
|
Git-commit: 322f244aaa80a5208090d41481c1c09c6face66b
|
|
|
|
A regression that was introduced, with the refactor to TranslatorOps,
|
|
drops two lines that update the PC when single-stepping is being performed.
|
|
|
|
Fixes: 11ab74b01e0a ("target/m68k: Convert to TranslatorOps")
|
|
Reported-by: Lucien Murray-Pitts <lucienmp_antispam@yahoo.com>
|
|
Suggested-by: Lucien Murray-Pitts <lucienmp_antispam@yahoo.com>
|
|
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
Message-Id: <20200116165454.2076265-1-laurent@vivier.eu>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/m68k/translate.c | 42 ++++++++++++++++++++++++++---------------
|
|
1 file changed, 27 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
|
|
index fcdb7bc8e4eeabc2f3b0e336c064..16fae5ac9ec3f729ef402b805e41 100644
|
|
--- a/target/m68k/translate.c
|
|
+++ b/target/m68k/translate.c
|
|
@@ -289,16 +289,21 @@ static void gen_jmp(DisasContext *s, TCGv dest)
|
|
s->base.is_jmp = DISAS_JUMP;
|
|
}
|
|
|
|
-static void gen_exception(DisasContext *s, uint32_t dest, int nr)
|
|
+static void gen_raise_exception(int nr)
|
|
{
|
|
TCGv_i32 tmp;
|
|
|
|
- update_cc_op(s);
|
|
- tcg_gen_movi_i32(QREG_PC, dest);
|
|
-
|
|
tmp = tcg_const_i32(nr);
|
|
gen_helper_raise_exception(cpu_env, tmp);
|
|
tcg_temp_free_i32(tmp);
|
|
+}
|
|
+
|
|
+static void gen_exception(DisasContext *s, uint32_t dest, int nr)
|
|
+{
|
|
+ update_cc_op(s);
|
|
+ tcg_gen_movi_i32(QREG_PC, dest);
|
|
+
|
|
+ gen_raise_exception(nr);
|
|
|
|
s->base.is_jmp = DISAS_NORETURN;
|
|
}
|
|
@@ -6198,29 +6203,36 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
|
|
{
|
|
DisasContext *dc = container_of(dcbase, DisasContext, base);
|
|
|
|
- if (dc->base.is_jmp == DISAS_NORETURN) {
|
|
- return;
|
|
- }
|
|
- if (dc->base.singlestep_enabled) {
|
|
- gen_helper_raise_exception(cpu_env, tcg_const_i32(EXCP_DEBUG));
|
|
- return;
|
|
- }
|
|
-
|
|
switch (dc->base.is_jmp) {
|
|
+ case DISAS_NORETURN:
|
|
+ break;
|
|
case DISAS_TOO_MANY:
|
|
update_cc_op(dc);
|
|
- gen_jmp_tb(dc, 0, dc->pc);
|
|
+ if (dc->base.singlestep_enabled) {
|
|
+ tcg_gen_movi_i32(QREG_PC, dc->pc);
|
|
+ gen_raise_exception(EXCP_DEBUG);
|
|
+ } else {
|
|
+ gen_jmp_tb(dc, 0, dc->pc);
|
|
+ }
|
|
break;
|
|
case DISAS_JUMP:
|
|
/* We updated CC_OP and PC in gen_jmp/gen_jmp_im. */
|
|
- tcg_gen_lookup_and_goto_ptr();
|
|
+ if (dc->base.singlestep_enabled) {
|
|
+ gen_raise_exception(EXCP_DEBUG);
|
|
+ } else {
|
|
+ tcg_gen_lookup_and_goto_ptr();
|
|
+ }
|
|
break;
|
|
case DISAS_EXIT:
|
|
/*
|
|
* We updated CC_OP and PC in gen_exit_tb, but also modified
|
|
* other state that may require returning to the main loop.
|
|
*/
|
|
- tcg_gen_exit_tb(NULL, 0);
|
|
+ if (dc->base.singlestep_enabled) {
|
|
+ gen_raise_exception(EXCP_DEBUG);
|
|
+ } else {
|
|
+ tcg_gen_exit_tb(NULL, 0);
|
|
+ }
|
|
break;
|
|
default:
|
|
g_assert_not_reached();
|