From patchwork Mon Jun 21 01:34:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464489 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2120348jao; Sun, 20 Jun 2021 18:53:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBFWzapqeCBL8s8AwzV3GpR6KaHJTQakGQTpOeJuA8z9j39hQz2VQ4utyFX19pXWfMkwOg X-Received: by 2002:ac8:5e93:: with SMTP id r19mr18690632qtx.96.1624240384847; Sun, 20 Jun 2021 18:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240384; cv=none; d=google.com; s=arc-20160816; b=ghJeW8VwAET5Kx8PFv3p2FOxdPyrf8jzuLc9JBCVpcPRMqKVPYyslo03p6POlXxkb2 a5ezQBFLTdvPvl1yV55I7CBFnvG0JxrHpcTpwKPgymMzf5aJouiD9wSJheIAqXTqqpcT 9d4gBtrJbQtcrAgS46Jod6NTjhnus/9WMw4DAHzST95AQUNLe/VTvGEvXcimipeyvajw MnvyBR0rdjhY19wxCKFVcJ1GqTxL1AAPbMnuTuRv2y3yGnX4JVb3HQhO04p+P0BgjsWB 8bVnE876SpgM6ecnHEKmDI4r+O9P4MyvcK7uArIYv5jrQP6dPKpOL0FaF1KVHe/Ewlrx r2Rw== 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=lVjdPTEZr5bsk/W3c3tDkqvpodiVq7V2WUfItf4iddE=; b=AeeT15gru2tGNpVo0IYCOpBVh/LbU0pOi6JB0BE/EXRtSQ2qvVXUpD2U0JNUEJT+U+ wB0c2wDuuidIANiuvch9zyM0BGIZL0s2tv4A9IgO8xp1uMD9YBW6pmPSCPyg6VWsGPZ8 HKnU3jNZ2YfMggdhWUNNR/26EC6+9De57YvylibgzpeSaj9IbQypHAaTTKpY6TjsfWTs j5e03WKWz2yh5qbud13Jn2Zgejao7VzYFpreLoTiqvYpFsPRTtCF6njQ3cgejNDSr/ij Ql5syUA60COfuuHYk4xaWsPB0KsuW9RIQuu8ENB2HZ3EzvgQYiF3F35I4pypphjkcB6R a8MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DhpBdVEP; 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=pass (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 y9si13056434qvf.64.2021.06.20.18.53.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:53:04 -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=pass header.i=@linaro.org header.s=google header.b=DhpBdVEP; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv97Y-0007Vk-Ar for patch@linaro.org; Sun, 20 Jun 2021 21:53:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qG-0004ET-L6 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:12 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:53840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0005Ff-Hl for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:12 -0400 Received: by mail-pj1-x1035.google.com with SMTP id bb20so4806819pjb.3 for ; Sun, 20 Jun 2021 18:34:55 -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=lVjdPTEZr5bsk/W3c3tDkqvpodiVq7V2WUfItf4iddE=; b=DhpBdVEPuUfQKvNhVYbT0h1zGeQqL3RGyCdF4XvAtX7csgnSSOUG+iaYjSpPbZ2ERB HCWxU2wbn0rkh4JLKr/JKk5L0KOVMxK1slc6iNBKv2N2Fx5jZYEaDdF2hCUfI9vuRbUW gJP3w5WqU+4OQZJA87VcYNuD5amugm5jLdDNpYEL3nG7WRcAAvYDoIM54ngh7sF2Df70 e3TfpZ5GdKppyq81HVEu5EHoGoYZJJy+tdSg45wwCXM8+EwBb96pJ3SM5gaiYwqOI987 v1JV16G0RawwgrSUemQHs2iaBG2AyragRXOhKqwO/f6D1aoSS4QuOKobqhLqgqwifsoA Ou8g== 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=lVjdPTEZr5bsk/W3c3tDkqvpodiVq7V2WUfItf4iddE=; b=J3XtoJ7D7KE7ZLDQEhJ+21o8CphC49nqmldEWoU6nNgrNcRFMvTQgblF8G2em4+W4+ EHDH2ypAwCOroJ1qsDMJ6qa1q2F10ZXXqatxT2CJKtAH/idhvE2tO6DoJ2M/68Ary3lN LBcak+mIIgyhVCRacgyK5i+/y3dPkZbClgnuFyAE66wqtHXCGmHniJ//LNu4RiY4t+4D 7YnF+n2iUh6TZX1hNczC0aVPG/7jH0227F5kHElBfjCabTMoFbgco6QLD5qP/DmQUg3H FgI9Si7YqauiPl0MVXeLj//R0OAa6CYhs9bt9gqSMB7flJNz1fWiUDQdCDKQPKSI+Xcj dXvw== X-Gm-Message-State: AOAM532GklcOGCOB3d9TeIovthZAEGxhVbA1708Oj3G64UTJRix0nqrL X2n+ly3xJvnWzppkLy/VOzx7MgDJ/KVN8w== X-Received: by 2002:a17:90a:5401:: with SMTP id z1mr23651272pjh.7.1624239294886; Sun, 20 Jun 2021 18:34:54 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 24/26] target/tricore: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:37 -0700 Message-Id: <20210621013439.1791385-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210621013439.1791385-1-richard.henderson@linaro.org> References: <20210621013439.1791385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.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: Bastian Koppelmann 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: Bastian Koppelmann Signed-off-by: Richard Henderson --- target/tricore/translate.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) -- 2.25.1 Reviewed-by: Bastian Koppelmann diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 2a814263de..09465ea013 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -3225,19 +3225,6 @@ static inline void gen_save_pc(target_ulong pc) tcg_gen_movi_tl(cpu_PC, pc); } -static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) -{ - if (unlikely(ctx->base.singlestep_enabled)) { - return false; - } - -#ifndef CONFIG_USER_ONLY - return (ctx->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif -} - static void generate_qemu_excp(DisasContext *ctx, int excp) { TCGv_i32 tmp = tcg_const_i32(excp); @@ -3246,9 +3233,9 @@ static void generate_qemu_excp(DisasContext *ctx, int excp) tcg_temp_free(tmp); } -static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) +static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) { - if (use_goto_tb(ctx, dest)) { + if (translator_use_goto_tb(&ctx->base, dest)) { tcg_gen_goto_tb(n); gen_save_pc(dest); tcg_gen_exit_tb(ctx->base.tb, n);