[PULL 0/1] M68k next patches

[PULL 0/1] M68k next patches

[Laurent Vivier]

The following changes since commit 13356edb87506c148b163b8c7eb0695647d00c2a:

  Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2023-01-24 09:45:33 +0000)

are available in the Git repository at:

  https://github.com/vivier/qemu-m68k.git tags/m68k-next-pull-request

for you to fetch changes up to c1fc91b82545a2b8ab73f81e5b7b6b0fec292ea1:

  m68k: fix 'bkpt' instruction in softmmu mode (2023-02-01 10:18:21 +0100)

----------------------------------------------------------------
m68k pull request 20230201

fix 'bkpt' instruction in softmmu mode

----------------------------------------------------------------

Laurent Vivier (1):
  m68k: fix 'bkpt' instruction in softmmu mode

 target/m68k/translate.c | 4 ++++
 1 file changed, 4 insertions(+)

-- 
2.39.1

[PULL 1/1] m68k: fix 'bkpt' instruction in softmmu mode

[Laurent Vivier]

In linux-user mode, 'bkpt' generates an EXP_DEBUG exception to allow
QEMU gdb server to intercept and manage the operation with an external
debugger.

In softmmu mode, the instruction must generate an illegal instruction
exception as it is on real hardware to be managed by the kernel.

Buglink: https://gitlab.com/qemu-project/qemu/-/issues/1462
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230126125234.3186042-1-laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 target/m68k/translate.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 18418312b14b..31178c3b1d17 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -2774,7 +2774,11 @@ DISAS_INSN(swap)
 
 DISAS_INSN(bkpt)
 {
+#if defined(CONFIG_SOFTMMU)
+    gen_exception(s, s->base.pc_next, EXCP_ILLEGAL);
+#else
     gen_exception(s, s->base.pc_next, EXCP_DEBUG);
+#endif
 }
 
 DISAS_INSN(pea)
-- 
2.39.1

Re: [PULL 0/1] M68k next patches

[Peter Maydell]

On Wed, 1 Feb 2023 at 09:54, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 13356edb87506c148b163b8c7eb0695647d00c2a:
>
>   Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2023-01-24 09:45:33 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/vivier/qemu-m68k.git tags/m68k-next-pull-request
>
> for you to fetch changes up to c1fc91b82545a2b8ab73f81e5b7b6b0fec292ea1:
>
>   m68k: fix 'bkpt' instruction in softmmu mode (2023-02-01 10:18:21 +0100)
>
> ----------------------------------------------------------------
> m68k pull request 20230201
>
> fix 'bkpt' instruction in softmmu mode
>
> ----------------------------------------------------------------
>
> Laurent Vivier (1):
>   m68k: fix 'bkpt' instruction in softmmu mode
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.

-- PMM