From patchwork Mon Jun 21 01:34:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464477 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2115592jao; Sun, 20 Jun 2021 18:43:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKc+6pzE2TwIjudcd1mRbc95ielZItuF56cyPV0VSa0qs+HUO8cKzXtMegnbrr2Hq1tJc5 X-Received: by 2002:ac8:728c:: with SMTP id v12mr21259742qto.324.1624239818626; Sun, 20 Jun 2021 18:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239818; cv=none; d=google.com; s=arc-20160816; b=TM95XLpWDI06rkhKSEKk3LrNgQRR4JOOEMx9CvxCCmWAwQK6+IM1YBjUrhic7Yi7PR IWpp8vky9EA9cyRMWXs4gDD3yT7Ic0mLRPqg9/bF5qSMiR7edS32dCFuNOT1ZluU8H2c egNwAmtqHvldY8TCbVYUT9O2tGqnKHKq3VQxSQnilNLEYT3PI/3qEjCP/Ldu2L7qDgm5 0tvO+NKB5TXraUfRysJV4QCc1RM9/Dy8uFfgkNUpUXT924ij0vPCfb91bkLgxcIVbI3O 23PbhlJTvNWdT1mPlGGxD/sL+r2HUc1lGcmMzMLyaSdjY4f0oFzjip4U5AYM5Jzo9Tic zh7g== 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=qHC3jVIB4e+/pVCBe7FuoNbsxTyhoj4fhboHXtuba70=; b=vk/RzCmzR7K5RM+iXkD2gOl/O3G4E/CkO84Cs0syx+HfaIjO1+wcX0kiKgFf9J37qX jJqubIh//Cbf9Xlo/9EVAq7aVKAVwf9grjVykJCphxqsk2AvdFi05GbJ/OrDYaMUhvq5 nmVLM3q1rsVjwweIqZzuTNmtQY0ZgM5Dfy951jJLXLHlk8nN11Z1mE/P+NXgdJhVO/dw VBRMK3N7kyygG7I1BZxmTRs9FGwvlb0Ug4ONU7tQb9ViWAaINaks901vOhhl8EGE+D9L C//qMq9kW9pvzkQEHyYMHMMaVzsCw2nVjRjVuvQCL/rZHGZkes4mDAO5VXRa6AuBff7m mzxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EDUnLdsH; 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 d22si11942083qtn.282.2021.06.20.18.43.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:43:38 -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=EDUnLdsH; 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]:32910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8yQ-0004VG-2c for patch@linaro.org; Sun, 20 Jun 2021 21:43:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0003ss-NX for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:00 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:34592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pu-0005CP-0u for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:54 -0400 Received: by mail-pj1-x102c.google.com with SMTP id g6-20020a17090adac6b029015d1a9a6f1aso9328379pjx.1 for ; Sun, 20 Jun 2021 18:34:49 -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=qHC3jVIB4e+/pVCBe7FuoNbsxTyhoj4fhboHXtuba70=; b=EDUnLdsHnQS5QT/SVyv+z47A8UMpFKRqMphRK/WxJNuQAp53zJVKluEUsEjcRS546C J9XSL0cWBYIhi0Fvgs/eEz54B4nlSqXQI1ugtVRVP6UwEf9K88D+KbGK63v8WH4Jdeh+ XS+yi12bw7kC/TCVgBVKfVXhZ563KZxQutFlZUMh1C3RJOjh0l3S6A2beRTV4luN6sCS QeINN0FATNWCJ26YscchYz1qyx8GjIGfHTV2s9vYCnqHY28/Q487W4W2lvx7IxCxJfW1 ocbLavUpwH5PISd7TGHWJs1d6QzjoFTFO4pn+YepKUH4FUj9B3eXWgUtsPEh2WoVx7d+ V6rw== 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=qHC3jVIB4e+/pVCBe7FuoNbsxTyhoj4fhboHXtuba70=; b=UrJ2PGJ0UdFXwLjJRIWucc5lMjn2bpxfVS9w6+tO5HEKzAoleXTOUZDGwPLwOgnaFs EO9TRaUyurzhzMGuXKtqb06D9AdN4rYVYQbCcynYt8v2s/cSR6NjJ5vG3o8s/9YZYDbX bVxYrJUTIZ0syo5WDBwYRISjTELmbvsl8+M34IwHof7NVrxCbT8utSRDApnYUMu6mDfg hmFYwJkonSHY9QSICC05RTg3XT7y9EYYDx7WJE8K1i4tXOAQAss+5JJY/p/IC8XQcJht UVvJ9faca+GXz8MFEJ2G/0UYllstR0WrcEIrB4hBqpqJt+qVlEIOpRggojOTbpmlnuUI KDpQ== X-Gm-Message-State: AOAM530/iuX3qM7poGcbpzYC3Pr0rZUeCOKTmw31ABJh9Dy3AUEotZzK wfZ9boh/wGOLqA7lqpjnR3jT9lb3sgF+pA== X-Received: by 2002:a17:902:b616:b029:ee:c73b:163d with SMTP id b22-20020a170902b616b02900eec73b163dmr15619647pls.30.1624239288490; Sun, 20 Jun 2021 18:34:48 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 13/26] target/mips: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:26 -0700 Message-Id: <20210621013439.1791385-14-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::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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 diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 797eba4434..d59986b340 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);