From patchwork Wed Jun 30 18:32:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 468719 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp612508jao; Wed, 30 Jun 2021 11:40:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyXI22MVIod8cygFi8lTKUOf4d8cIxZLhFYZHI+IAWmsFV3ySPjx+exPD5vHiuaSeQkpap X-Received: by 2002:a25:11c5:: with SMTP id 188mr46595365ybr.322.1625078442201; Wed, 30 Jun 2021 11:40:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625078442; cv=none; d=google.com; s=arc-20160816; b=AFU1b8wlabYFucwT/HoBzmvsyM//k0xSP+3shHbwZTxZXX3wiGMqIYYgwDPo/q5Iyg Tt7kSkUs4JxMwNlmLuGD/P9jNZGGnzc7zWhjjz7UD1kLxJPcsNIn2xEiAHYKEruHZ3nD uMSElJtZ+r4kWahMGPADV9OQGGYkJ8IgCWPxXbvrg7oAbj4dON/rFgk2h8IuThRzJ7h3 VuO8NTrEqaBNo6fmaiauKPkPRt31mh2/ucF5IkrLCHHFAs1wMIemHi64ghDrIOPXzcIy H+YvEDUFI3X42+2Pt8A8ODh076ZBskPQe0QfI1JdjEGippKkS+w+22QfEuKu8Lzf2dGx Tomw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=EuLUTgtrIq55E1MmI7/EbN0xfKvn2I2h2MjVLgAIedQ=; b=rw9sLJ7zdv8MM9xU8Nu9XLsf6j2pYS4u0YZ2Bq8KHX6UUxhHYBZV1z1QdFxinqucTc 8KLhl5eWi+Xkt1ZAXJqvp1AiQdp4JBOdHgAlZBhYdqujyCFCHokmVpMzHLxY/NLATfsa R42pnQn6SjC98ULBdcxLR/uuZwtCrgZsiRp8L443ftFGjFWl3mmuPYI560eao9h+fOxi tzSRjBEuUy74R9yGscFP2X+a6jJVlreePdCxsgm/OdWa3Xh8GuWyqMLJ/kqEkVOC/5FW irizZmD/hAGv9y1TZ/HCZPdo8R9Orrk+FyvsYaj6aDlOoYto7R3HjzFqnOsTGYMHHwEP j3/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UrOWh+BK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t90si10629062ybi.283.2021.06.30.11.40.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jun 2021 11:40:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UrOWh+BK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyf8b-0008Vf-KA for patch@linaro.org; Wed, 30 Jun 2021 14:40:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyf0r-0005PF-Bt for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:32:41 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:33523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyf0p-00024V-4n for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:32:41 -0400 Received: by mail-pf1-x42e.google.com with SMTP id s14so3383874pfg.0 for ; Wed, 30 Jun 2021 11:32:38 -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=EuLUTgtrIq55E1MmI7/EbN0xfKvn2I2h2MjVLgAIedQ=; b=UrOWh+BK3L8ETRDsP8Ny8m/0mTdoevAuICl3w6B7WefVtUFRDoawh8Amb81zHoohfY 9LwI+4N0jm2IWPzZJfXQdPX5o1P8qYOl5HAg/zqmyxhuJOg9Joavv0upY9+ls/YYm749 7r/KGdbr6PcQ6umWu0ZxG91l/NHCVQImpTKUGrR+xPC/uozb4n3Yj4NuhrnhME+ZAA8a IRH40ySPVuQmIsXwkXDLBSidRdEWtJ1apzFRgjWb7D8NK0Y+FfnbB7QuAY5ek04ZZDrO BHSifbV5MUatkfpmHNhsBheiqFwBxHPiHb8AAjYcYNe+lnTq8AKICwcRLeOliriivJkb uXEQ== 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=EuLUTgtrIq55E1MmI7/EbN0xfKvn2I2h2MjVLgAIedQ=; b=fn246X42lWFPEAF53RNfDsRbDIVWTmNaS+tGncOVnIw/iFPVgZCK6El9hCJ1rqq1BA QZakMB4lTM8y9BVZ07USTFRcpxSucvV+ady6TUIBWBTz2ELsPuSysy4/UobZ/BXGCb49 t5+RJSzr9Qg3JeO+oyoz1MQsNzhuS7n0Hz1GhO3Q0Q9eSOSm3V1qREmYJ7G7pjGd/nrr h7KoAIoSojX6tFIpkgPvIMbxfrARbkeGkrHQZIxlO/CPwXpdK0yO6n17HQqhdQVFalna AD/QcVFirpd4NDiVdX0K7EsPiXPr+N6lU8F8dLH82cwYCuINy3v9mUOoeRkDqxdO8nzQ sdkg== X-Gm-Message-State: AOAM531x0IxxY7zCKiRKvZfXd7OhHimzlioOBB6UdcCDqLJh9gBFM0NA Nz5BuI4jXSr17+hMgfuF0Q+bRbyLmf8UMg== X-Received: by 2002:aa7:9a5e:0:b029:305:5d37:7622 with SMTP id x30-20020aa79a5e0000b02903055d377622mr6682982pfj.2.1625077957884; Wed, 30 Jun 2021 11:32:37 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id m18sm23909517pff.88.2021.06.30.11.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 11:32:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 17/28] target/nios2: Use translator_use_goto_tb Date: Wed, 30 Jun 2021 11:32:15 -0700 Message-Id: <20210630183226.3290849-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210630183226.3290849-1-richard.henderson@linaro.org> References: <20210630183226.3290849-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Chris Wulff Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Just use translator_use_goto_tb directly at the one call site, rather than maintaining a local wrapper. Cc: Chris Wulff Cc: Marek Vasut Signed-off-by: Richard Henderson --- target/nios2/translate.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) -- 2.25.1 Reviewed-by: Peter Maydell diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 930f3d3395..17742cebc7 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -150,24 +150,11 @@ static void t_gen_helper_raise_exception(DisasContext *dc, dc->base.is_jmp = DISAS_NORETURN; } -static bool use_goto_tb(DisasContext *dc, uint32_t dest) -{ - if (unlikely(dc->base.singlestep_enabled)) { - return false; - } - -#ifndef CONFIG_USER_ONLY - return (dc->base.pc_first & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif -} - static void gen_goto_tb(DisasContext *dc, int n, uint32_t dest) { const TranslationBlock *tb = dc->base.tb; - if (use_goto_tb(dc, dest)) { + if (translator_use_goto_tb(&dc->base, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_tl(cpu_R[R_PC], dest); tcg_gen_exit_tb(tb, n);