From patchwork Wed Jun 30 18:32:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 468726 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp616758jao; Wed, 30 Jun 2021 11:46:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRhPFVvcylN/DGzhKRNjszGMACQ+B4GR0K9HrrDfsvEqiH0pILQGB9DUqPlVucc5QNn8R2 X-Received: by 2002:a67:edd4:: with SMTP id e20mr32426561vsp.52.1625078812178; Wed, 30 Jun 2021 11:46:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625078812; cv=none; d=google.com; s=arc-20160816; b=t7p4wmX4hvAjsSdQ6TamKzII/Z3vP71RaURM7+U70xQNs+QfnoxEpJwqmyZ+GxRq00 GEx1ruvAggrfO0XHzlaUMkGEy/SNfj8fhlrUdaCwBcoMwE6qftCKDqhrSdaIBFL+YQiv 84yFofW061+iPc16pWdY4jg3NDU8bNLgUN4XvvH03nlZ6DyM08rDaF6RTxu8MlH/0cDg Qnl4bW53hTRfeKLEgZfQIMs76nLHoY2n5H0lugG2wRY4m+6VeMMfrnPV58BQoo2MPv1l x782Bt6gENvsk9wwFz156/DZxasX1J990J70oz0JkJbVNA96CgTMloBE/JxWrtNSS5xX 3+5Q== 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=1HJD3JCb9LiRtjNiA/n4zNuSXKpMe99KSR3Hi1PuyQo=; b=sqH4pkNs/vfHKh3aNuyhKP6z1cWlFVr4pwXSQA9eT8Yg9dZRsKCqTPUeMOlTCugKeF rwfoeZL9SPGwj30OVJbcz6/vjU7y0dMiEbMe57mM8q8UgF0ztu3glLcz9fCh3nq6ckds ZhPgHkiNfSFR5qTOfmna5RhbH4IBxesoT9TtEe3/9eoEZVv05s4qvyqtDmkwz/GYAnNV gGUSbAXOIWxU4iUHlbG5GknPZQi8VX5srXexF3NdRJCgbM+tYT45GgIqN6AuMJiN2+Te JD4HY7o/+2ZLlGq2Dcspzj3epavQqUZDs6v3Fvx9Vu9SmP2NRidynVSkmnTUo4xCM0Sf 5pbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="B4/45vN1"; 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 a4si14062951vsn.4.2021.06.30.11.46.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jun 2021 11:46:52 -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="B4/45vN1"; 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]:38100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyfEZ-0008O8-I1 for patch@linaro.org; Wed, 30 Jun 2021 14:46:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyf0q-0005Ju-1K for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:32:40 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:41920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyf0n-00023V-Ns for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:32:39 -0400 Received: by mail-pg1-x52f.google.com with SMTP id m26so3178534pgb.8 for ; Wed, 30 Jun 2021 11:32:37 -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=1HJD3JCb9LiRtjNiA/n4zNuSXKpMe99KSR3Hi1PuyQo=; b=B4/45vN1alKBnuNUinuR/wim9yW576/vzDaJwEjBTQYfzycPESOo6eod6Dc3Ws7P29 +GTlvYwBQwkyzPgJbt0D/ayimzSpUIxOkyY0+93cgBo8p6sxZmMOM+w+OIszoZubOHCz wRUUl+Oy2RDfrkMNqXR5/8MweENDB2BOujfTpTlFMIdAfYZ0TSB00E6WikdL5w3lDMIm HQMEYNiFFzecbjiN5oUOIBXXA2dtWj8abchnrDy1dHsRWLxKtO2X68eQLvUxoFb1AAB2 HA41381pqzwktExeKIrcFtHkvJELFwsKwQ/wrWAZIwlO3d5qdbwN/0sK6fI78lcQKonb KwCA== 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=1HJD3JCb9LiRtjNiA/n4zNuSXKpMe99KSR3Hi1PuyQo=; b=hKVgEQ3UIkF1U7bx7ElkwiZycgNIxd9NzauSlSltzjbUgnKD+KM+11YDhRGVyYqt5V GytJ/+CUA4y2i+cBi1genCsEAi8BArhFgOd3tJ6e48hCuVd12MtVn1S9rSe6ltzML9xr nN2D38tWa5I3DE4HU+4OEVNEtLIoZ3m/IObGISvUgWbCoilX3G+faCuIdM64K9iZrhFg qjLjpSDA+ox45qoSO3Ip9hWcAu4+ax8lCFYomb420v4REaKwYCU6wDmvSWFlIt9iEJhb 1CZz2rZiTTRKjWyUcnkA0kFbCuLWDbX1+IGLiWGYlTzNSQqqYjSg4pf7CS5QF+++wIYw oTXQ== X-Gm-Message-State: AOAM531aEOndlyC8L2ALlwPitISGvwmLhmv4GX5IePKfLuAX9gbsY7I6 HbtmYk5jdgBGimMHP4+umjki+mHH2T7DQA== X-Received: by 2002:a05:6a00:2403:b029:309:8a37:2d51 with SMTP id z3-20020a056a002403b02903098a372d51mr29424617pfh.79.1625077956640; Wed, 30 Jun 2021 11:32:36 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id m18sm23909517pff.88.2021.06.30.11.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 11:32:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 15/28] target/mips: Use translator_use_goto_tb Date: Wed, 30 Jun 2021 11:32:13 -0700 Message-Id: <20210630183226.3290849-16-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::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/mips/tcg/translate.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) -- 2.25.1 Reviewed-by: Peter Maydell diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index b4a454ec09..52ae88b777 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -5019,22 +5019,9 @@ static void gen_trap(DisasContext *ctx, uint32_t opc, tcg_temp_free(t1); } -static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) +static void gen_goto_tb(DisasContext *ctx, int n, 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 inline 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);