From patchwork Fri May 26 21:16:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 767586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wZK5q26l3z9s75 for ; Sat, 27 May 2017 07:29:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sVW3jOU9"; dkim-atps=neutral Received: from localhost ([::1]:38580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEMnd-00076u-0Q for incoming@patchwork.ozlabs.org; Fri, 26 May 2017 17:29:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEMbc-0000q0-Vt for qemu-devel@nongnu.org; Fri, 26 May 2017 17:17:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEMbc-0008Ox-4N for qemu-devel@nongnu.org; Fri, 26 May 2017 17:17:08 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dEMbc-0008Or-0e for qemu-devel@nongnu.org; Fri, 26 May 2017 17:17:08 -0400 Received: by mail-qt0-x241.google.com with SMTP id l39so2853017qtb.1 for ; Fri, 26 May 2017 14:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=qKkRSYH8KQ6kF7pRf4T5NFHb6pAgyfU5JGm5Tjs0Cww=; b=sVW3jOU9ghzqIU0HAxAd1V2w3v5yaRLTmHXXrDbl65JMX1Z/fqfM7DsOz+fGILRQn9 KTosmpvyzfz/KcWzrzmQAxeQluec8zVgOnli2Vd7HqxIsMIGtgYyVnJEdiN5RBrLSMpK jLiABiM+gN0M0vG2yQawEe+GGCsStgenJLV35pZixC+8V3oQQkHnLAAjwiAJqy+7W5lh AKKizI37xWvzCj83pdkuFSijD4m2oBBIx9mgIb+PtZXkGs+NZ6BvP2lWBCkitgtzSE0b lFyNYQcHpImUNocTRK32QW3tqPB1brVuz6kqJmuLLsi+wdTMApvRoPjPrWFy/K31+RsS KlbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=qKkRSYH8KQ6kF7pRf4T5NFHb6pAgyfU5JGm5Tjs0Cww=; b=CNj5dtKri9M2WoXjrqH7R/mjcdedOn/Ci72ZuuFdJmkNLMLe+gN8aOgwjIyNctWKaW F2T69Ta6xAY+qy7v8ZRTgr2FSNAPVWplYmAX4Xamd+HnBQO92NtbPjyqwzH3XyrC5QWT a7XfSCwrbj8wRFB6oUpuEc0SxFf3kDD0y639MrMeyYBjAgJmXWmUd2U7FAowFHKLTRmw FazdQo3T2PCNyw87DXID7Ue29fwrcm40LFngztrMpLimWl4BCsIixMI4wRVg/3AADaVf 5SQQboW5TT+zik6HBFQXOUQ/MSaL2hdwUdilT8fKQbQAoCu775n7Act8ECxJVrCm1vKO yjtQ== X-Gm-Message-State: AODbwcAZ8pMA2zvSXvU7Oy8dLitcPDlEmd8+HaKev+5uH3XEZdbALVWL 0ad3onA+FhLSUZbVzwI= X-Received: by 10.237.62.229 with SMTP id o34mr5039537qtf.4.1495833427383; Fri, 26 May 2017 14:17:07 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id u19sm1262380qtc.64.2017.05.26.14.17.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 May 2017 14:17:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 May 2017 14:16:31 -0700 Message-Id: <20170526211638.32301-20-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170526211638.32301-1-rth@twiddle.net> References: <20170526211638.32301-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v7 19/26] target/s390: Use tcg_gen_lookup_and_goto_ptr 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Tested-by: Aurelien Jarno Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/translate.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 4c48c59..628fb86 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -608,11 +608,16 @@ static void gen_op_calc_cc(DisasContext *s) set_cc_static(s); } -static int use_goto_tb(DisasContext *s, uint64_t dest) +static bool use_exit_tb(DisasContext *s) { - if (unlikely(s->singlestep_enabled) || - (s->tb->cflags & CF_LAST_IO) || - (s->tb->flags & FLAG_MASK_PER)) { + return (s->singlestep_enabled || + (s->tb->cflags & CF_LAST_IO) || + (s->tb->flags & FLAG_MASK_PER)); +} + +static bool use_goto_tb(DisasContext *s, uint64_t dest) +{ + if (unlikely(use_exit_tb(s))) { return false; } #ifndef CONFIG_USER_ONLY @@ -5461,8 +5466,10 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb) /* Exit the TB, either by raising a debug exception or by return. */ if (do_debug) { gen_exception(EXCP_DEBUG); - } else { + } else if (use_exit_tb(&dc)) { tcg_gen_exit_tb(0); + } else { + tcg_gen_lookup_and_goto_ptr(psw_addr); } break; default: