From patchwork Sun Aug 19 22:17:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 959461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41tryd0BTtz9s4c for ; Mon, 20 Aug 2018 08:22:01 +1000 (AEST) Received: from localhost ([::1]:44283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frW58-00052f-Md for incoming@patchwork.ozlabs.org; Sun, 19 Aug 2018 18:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frW1P-0001y7-PP for qemu-devel@nongnu.org; Sun, 19 Aug 2018 18:18:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frW1M-00039J-3C for qemu-devel@nongnu.org; Sun, 19 Aug 2018 18:18:07 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:55421) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frW1L-00038m-R2 for qemu-devel@nongnu.org; Sun, 19 Aug 2018 18:18:04 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LgGuK-1gESHZ1wii-00nehN; Mon, 20 Aug 2018 00:17:25 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 00:17:04 +0200 Message-Id: <20180819221707.20693-4-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819221707.20693-1-laurent@vivier.eu> References: <20180819221707.20693-1-laurent@vivier.eu> X-Provags-ID: V03:K1:a7DLLDwKaWJb1yMnjRK6fCVasZN3JVN71jRl5nxfjsLejnWCs7Z VUjKx5PyDm24QsDW4twfYCZAiUPlzp6qDNQO5bExN60B3xZYUYOiUecXdauWExYaqEJfKd7 Ng4VYGpxkpgl6VpW3vz2h6Soqh9gv01mlYHzSBLN7wJAZ/4ofFdZ6muEn2NEnWPas91mOII HWhEKxIlDirGFJHGBJAeg== X-UI-Out-Filterresults: notjunk:1; V01:K0:wOznmNnbd4Q=:7cCkfJr0aVkShMSR47Pvvo WaTzfZWEqenqOB17PU+7bROhdMprEOHEVFW1azFg0aARxGLR3iZqaKStNphvA7zKL9vVWp+2l kGZTZqyGmuKM+c+IfI9ro1dMrNgTT9EA4IkvEUDRePlTG5b18SYA8n5x+8Hs6ZZUofAKwss6t 61tGZ4PS3KN1nFTSitrtnR+9sAf1sgxrKsFZd24L0RfHFiTWgeM+Y4N9QgsfpAgEfFkTiyv7L lKwm3iRA6CHwpI72cvtD/NmufetSUkUN2TevFpxi639C54B8SF2fdXcXZ+tKY9QkFOWFDNIea Tx2GdXQCsSUAGQkHavFRHbnvJ00njs89k5tLv5NIEk+5Y5fqA5uFaqBlORK0oq5Bapn4MDQhe j1HOI2+RFVcB9dz+9Bii4sU0ehn8eDggqQqqcnNSA34hiajVJX4P5LrkO9q7/ExmLFB6hSERf Gpei6cSQViV1tGs8+SgpMSDh71e4mwC/MwbkYMzI9JIYO06s/2IKKKlofyTNCJqvjp6jGY+xf 74FR+7RUsHBv69DBguVrJTfugYNu1XDMD413tPS5lVN8I6u6sKnJwPNOCZJZ2mcX7DUhAFMzM E2dwZHhkrUjUquWWiTwLU8sYr/HKBo6cvbCX8t5Oj1R3f40KC0FytLznPPhePSEkQzXJyVVBL yn0DW0yesSkrvRJTFz8qN1EQDhrLOrQi9pYC0kswrbOTLf64aMUik7DdnsMxd6tj/s2M= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 3/6] sh4: fix use_icount with linux-user X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Crosthwaite , Riku Voipio , Laurent Vivier , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Reviewed-by: Aurelien Jarno Message-Id: <20180811082328.11268-1-laurent@vivier.eu> --- 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; }