[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] sh4: fix use_icount with linux-user
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 3/6] sh4: fix use_icount with linux-user |
Date: |
Mon, 20 Aug 2018 00:17:04 +0200 |
This fixes java in a linux-user chroot:
$ java --version
qemu-sh4: .../accel/tcg/cpu-exec.c:634: cpu_loop_exec_tb: Assertion
`use_icount' failed.
qemu: uncaught target signal 6 (Aborted) - core dumped
Aborted (core dumped)
In gen_conditional_jump() in the GUSA_EXCLUSIVE part, we must reset
base.is_jmp to DISAS_NEXT after the gen_goto_tb() as it is done in
gen_delayed_conditional_jump() after the gen_jump().
Bug: https://bugs.launchpad.net/qemu/+bug/1768246
Fixes: 4834871bc95b67343248100e2a75ae0d287bc08b
("target/sh4: Convert to DisasJumpType")
Reported-by: John Paul Adrian Glaubitz <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Aurelien Jarno <address@hidden>
Message-Id: <address@hidden>
---
target/sh4/translate.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index 1b9a201d6d..ab254b0e8d 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -293,6 +293,7 @@ static void gen_conditional_jump(DisasContext *ctx,
target_ulong dest,
disallow it in use_goto_tb, but it handles exit + singlestep. */
gen_goto_tb(ctx, 0, dest);
gen_set_label(l1);
+ ctx->base.is_jmp = DISAS_NEXT;
return;
}
--
2.17.1
- [Qemu-devel] [PULL 0/6] Linux user for 3.1 patches, Laurent Vivier, 2018/08/19
- [Qemu-devel] [PULL 2/6] linux-user: fix 32bit g2h()/h2g(), Laurent Vivier, 2018/08/19
- [Qemu-devel] [PULL 5/6] linux-user: update netlink route types, Laurent Vivier, 2018/08/19
- [Qemu-devel] [PULL 3/6] sh4: fix use_icount with linux-user,
Laurent Vivier <=
- [Qemu-devel] [PULL 4/6] linux-user: fix recvmsg()/recvfrom() with netlink and MSG_TRUNC, Laurent Vivier, 2018/08/19
- [Qemu-devel] [PULL 1/6] qemu-binfmt-conf.sh: add x86_64 target, Laurent Vivier, 2018/08/19
- [Qemu-devel] [PULL 6/6] linux-user: add QEMU_IFLA_INFO_KIND nested type for tun, Laurent Vivier, 2018/08/19
- Re: [Qemu-devel] [PULL 0/6] Linux user for 3.1 patches, no-reply, 2018/08/20
- Re: [Qemu-devel] [PULL 0/6] Linux user for 3.1 patches, Peter Maydell, 2018/08/20