From patchwork Thu Jul 13 14:19:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 787773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7dKW0LsZz9ryv for ; Fri, 14 Jul 2017 00:21:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="gQvsfGiQ"; dkim-atps=neutral Received: from localhost ([::1]:60337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVezS-00055a-13 for incoming@patchwork.ozlabs.org; Thu, 13 Jul 2017 10:21:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVeyr-00053E-I1 for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVeyq-0007Bn-DN for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:20:37 -0400 Received: from mail-wr0-f179.google.com ([209.85.128.179]:33445) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVeyq-0007AV-6U for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:20:36 -0400 Received: by mail-wr0-f179.google.com with SMTP id r103so53943315wrb.0 for ; Thu, 13 Jul 2017 07:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=liCe85V904f4u71sULXskHELisZZqwQo3QCIbYOEZro=; b=gQvsfGiQtEIWbv+HK5O2Qr8OrWRrHWeKdh7OEd4H2NgcPPPRygdB54JnKovfuDYC80 ZXxbpMhv+0gW2vLlkuzmQlV15ynnqoqojZcTZhun/YLn5fZcbCAgyJjA0OIRbgYnT3f1 xoD3BL8SIpIMAyDnNkfoO7uAqolwwSgn0QyMg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=liCe85V904f4u71sULXskHELisZZqwQo3QCIbYOEZro=; b=Zx0cNXqwJ0F/x3fMLqklFQ9RYnpmSbdeY3uclRXNGOsf+vUSV85ETfdKHYCGGXZb/0 d9Sp+EwsbQ91HXdKJq+K4Kz8Ud///ClKqPbmdisIn3xbT66IBkpYgkkYxt6bXLAE2MsM LFkDOUD0cORMx10aqsicbYZK7x7WAz32kEU7KGsL7KG0adKx64k820OtwQyFVqo3quY8 Sfd491OoKMCG8dJeSV8+zssvpMT0Vwh0ud/efA9lugznaSc+kYAmLAN1LQmhDV1zdr9a xk95va1gI+Qo+u+qjieY6Ik/s7qAY7cbmTRtvIruUBw6h6QsFX37eexeO09bwvGq4JW1 MRVw== X-Gm-Message-State: AIVw113PcqXKHPvqjxPE3AL4+yh8JeNaF1WrxvBbtJj6C+WCcwp79Ya3 sFBFHS5D4gfhiPWP3OGekQ== X-Received: by 10.223.170.194 with SMTP id i2mr2010964wrc.143.1499955575158; Thu, 13 Jul 2017 07:19:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z108sm4258811wrb.41.2017.07.13.07.19.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 07:19:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2D0503E07A1; Thu, 13 Jul 2017 15:19:29 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 13 Jul 2017 15:19:26 +0100 Message-Id: <20170713141928.25419-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170713141928.25419-1-alex.bennee@linaro.org> References: <20170713141928.25419-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.128.179 Subject: [Qemu-devel] [PATCH v4 4/6] target/arm/translate: ensure gen_goto_tb sets exit flags 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: qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As the gen_goto_tb function can do both static and dynamic jumps it should also set the is_jmp field. This matches the behaviour of the a64 code. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v4 - set s->is_jmp = DISAS_TB_JUMP in both cases --- target/arm/translate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 5f2cea8641..493a7b424a 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -4158,6 +4158,9 @@ static void gen_goto_ptr(void) tcg_temp_free(addr); } +/* This will end the TB but doesn't guarantee we'll return to + * cpu_loop_exec. Any live exit_requests will be processed as we + * enter the next TB. */ static void gen_goto_tb(DisasContext *s, int n, target_ulong dest) { if (use_goto_tb(s, dest)) { @@ -4168,6 +4171,7 @@ static void gen_goto_tb(DisasContext *s, int n, target_ulong dest) gen_set_pc_im(s, dest); gen_goto_ptr(); } + s->is_jmp = DISAS_TB_JUMP; } static inline void gen_jmp (DisasContext *s, uint32_t dest) @@ -4179,7 +4183,6 @@ static inline void gen_jmp (DisasContext *s, uint32_t dest) gen_bx_im(s, dest); } else { gen_goto_tb(s, 0, dest); - s->is_jmp = DISAS_TB_JUMP; } }