From patchwork Sat Jul 10 15:31:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 472354 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1369445jao; Sat, 10 Jul 2021 08:45:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwB/RFRNorMG9q8wnNZUEFge9+lfs8PLxpQyzJW+Nld4F+Uao59gk+GzCJcptnkiPdseT0l X-Received: by 2002:a5d:8b8b:: with SMTP id p11mr33288784iol.77.1625931951949; Sat, 10 Jul 2021 08:45:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625931951; cv=none; d=google.com; s=arc-20160816; b=KPIPVTXQ6xPoN/hTXGu0qNCVfS3jQVaxHbiy6cGSGQCXpUB1BDDzB41csOt92DB0HH FnYCKc1dZvAwKy9i8DlMYMRf/uSafd3mQLpvglIMwLl8Y9DYyghsaGKbRNKUDLtvlKo2 2TX3Zmn77UEEPz20sFp/S2nmgvQF95RgKwaN4fnStaMThu5HokLInS5La0ko98v9SLnr Dr3ms6MuKlaKHzy0zK4pzkK5wKGu1woqJ5hwEY/Xdh4ZkoDT4RKAL8mWf5zxb1V5hcQ8 MlJKpMch5kl4fcLmWEjkyH2We3uewBpkI8RoWcapZ+5js3clnkpOgEmJEaLIPs19xGOj AmDQ== 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=sdOgSd63WVU1p/GLMq6rl3ZMILt/ihpRB26uHAUfMXo=; b=oZUyKM7esa64jQYYF2vOfcHDRdF9ygd7bGe//Sji4UDgX9JA913KXuPTVS7TK7MiQX 04BES4JJWcSkrWhAuz90MVSxngySQevSm/MCu3Vs4Z5QVFOVbwJyXYFqS2AelNENYkbQ zT5iBVgrsQ3tp29TW+GcvLRv0NN5dePoWLztlCgwBdnrva1k4g/wOcnbgF9w1yD6FxG3 Ulwu8f1Dtyr42UI+sgw1IxOTHGbBdS+79v36DfRBxYHNcs1joZNt1cLCw8nOz94Ll047 zCHUNa+pugVB2eatc6BEOdTe9ML1v3Zbdx13VPpgy2mHmggziaXPcvAHDSIn5RXcTXSs FjHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qSSz5CLa; 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 v1si10068283iot.7.2021.07.10.08.45.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Jul 2021 08:45:51 -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=qSSz5CLa; 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]:38130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2FAt-0001uW-EA for patch@linaro.org; Sat, 10 Jul 2021 11:45:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2ExU-0005UY-DL for qemu-devel@nongnu.org; Sat, 10 Jul 2021 11:32:00 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:36501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2ExS-0002KG-PH for qemu-devel@nongnu.org; Sat, 10 Jul 2021 11:32:00 -0400 Received: by mail-pf1-x436.google.com with SMTP id 21so11703617pfp.3 for ; Sat, 10 Jul 2021 08:31:58 -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=sdOgSd63WVU1p/GLMq6rl3ZMILt/ihpRB26uHAUfMXo=; b=qSSz5CLaMfP2Vu0D8doc5pjj540IkJ9engKjlilM28uz0d9g4KxBe79Wh9EKOxCRTS 1SJ4gXW88v4kodPKhlDJWA0lzFI4Y9xtmUYCemLXitz+Afe3mEDq4V2ESmniRA1Jr/3r RvuBezlYn3FPcbB49Zkg5J5MvXZyxXIlCtgd5KVV4qFKAWcCdjGaqGuaiGzcubPK5iFp Kh8Uv0X1J6QzhNa5lJrejwS+jsfgga8S1ouTmo57uqThBOeFpMKcD32AwsyW+TXdPc5e Tu4ru3s0q7j9lTbtVKncz6G+Qs37Rvqgtou/8u9iMVnsZD9jMAEYynfm7Taza+BeZpzb 1+Cg== 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=sdOgSd63WVU1p/GLMq6rl3ZMILt/ihpRB26uHAUfMXo=; b=Z/xb22IXdVcvvErgY+ZfHiFexvvaF+Iv913rC/EXN6aIRs/a+Jh7v5/bBTb7evFTH4 N8spO9PwhHrWyPUnS9DXIZcIYZV2Tmk1RTwEAkgV8l9kjLs3RxXeddFRcqWTOxx2NdEx K6AzLgQPmA9peGfmFCYVzykfDFnohG0K5IjsMRtz0FETpZkSezqM8oIXqXimr16vE831 pdjefZicPvZxL6p01ydo2RfbeKjZHyeOkaM04+4FTDBvQpebdOYgqnKFOl+76WgYTCzc 2bmRfPS7vRyhmq8ZFLxc62Q9iamuAPiQlM/yZa9+IM8qPn8RFdqwQCWJ1eowv6pIQQsy +zOg== X-Gm-Message-State: AOAM530V6u5bzuvfo3AL535kHF2tTabLDx+5Afc5J9YOyvxoiDq8gUsR muWsqzL20nz2pXzHWvu1N6jWNnZv5FF3tw== X-Received: by 2002:a63:5802:: with SMTP id m2mr29842992pgb.171.1625931117514; Sat, 10 Jul 2021 08:31:57 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id u23sm11975374pgk.38.2021.07.10.08.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 08:31:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 18/41] target/m68k: Use translator_use_goto_tb Date: Sat, 10 Jul 2021 08:31:20 -0700 Message-Id: <20210710153143.1320521-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210710153143.1320521-1-richard.henderson@linaro.org> References: <20210710153143.1320521-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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: Peter Maydell , Laurent Vivier 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. Acked-by: Laurent Vivier Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/m68k/translate.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.25.1 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 348fc6e844..1fee04b8dd 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1519,16 +1519,6 @@ static void gen_exit_tb(DisasContext *s) } \ } while (0) -static inline bool use_goto_tb(DisasContext *s, uint32_t dest) -{ -#ifndef CONFIG_USER_ONLY - return (s->base.pc_first & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK) - || (s->base.pc_next & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif -} - /* Generate a jump to an immediate address. */ static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest) { @@ -1536,7 +1526,7 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest) update_cc_op(s); tcg_gen_movi_i32(QREG_PC, dest); gen_singlestep_exception(s); - } else if (use_goto_tb(s, dest)) { + } else if (translator_use_goto_tb(&s->base, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(QREG_PC, dest); tcg_gen_exit_tb(s->base.tb, n);