From patchwork Wed Jun 30 18:32:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 468720 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp612942jao; Wed, 30 Jun 2021 11:41:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOl8O5QFkPtYMkdTLMx8u4IBf9PU3TnAsA/rvcnHPyRNERmD3kA3a2mHzVL2pJbx7dwNT6 X-Received: by 2002:a25:bd84:: with SMTP id f4mr51058807ybh.143.1625078475427; Wed, 30 Jun 2021 11:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625078475; cv=none; d=google.com; s=arc-20160816; b=Ae7lnKym/FR0nFSetYYHloQXQNGDbcdRgp84OfDrSN8EuVEkjXENDUdlKMLMGqSncf FNuKRS+TRz+c8j/Tr2Fqd3pQRgP5COoKSOHpV4FaZ9SkK+2YtiMjpIkY41XWzXRoJe9A QHP+mJNhPnsopjgE/xvyue5QgPgxlQsxXI+ugBEQdN9xgPqcqzP3i6mlkgjNXM7Jxc/P Cm3puw7htq3Mtje3d+UfOrasA0KXOkgG8UbCCBDM7QwiyQAZbBy6obEfpg+P7IzHt0hy FUYCyHINcNd9PkbkL5xhxRMZzj6KzTO/bSONuDy1mjJzdGH8IqdwnqU/TthaSxTTDW0Z yPxA== 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=+Jf1hfNBd506pP5UotsDrbYdrcf9l5zM5YtUqqOrZ/M=; b=IsFm1K861D6rr6htWL391O6kxr0MznQh0Vrfomz0cPiWBvT++9PLgmlpmaqeYzHnjl 3JDgVAhkwQxG6fs8/5Mad6yGA2v3494Vu8XYnGMZNszFtLf3tXwlc3eRTZ0w+CkqBnmz ToxJ5RaENjvPX3tE0lFOsz0NTvTFqxUVnsc6YxK8vRqTPb/e97K7hWopsRy3iylvy1KI UEs4IpvxujTiluiaqiNpRtHP2Fs7IQBbN644p+DouiWjyWtNHiXfBJbC1fUUYFHNoLFV IicbUpZpsgDTgM8O+yZIC4dnrbNI50/Ck1gcxI9vz42SYdC/Fr2yx8gCxCSHtcQ3Ie4O vINQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U59gzQAH; 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 e2si20641448ybn.363.2021.06.30.11.41.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jun 2021 11:41:15 -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=U59gzQAH; 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]:55458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyf98-00018l-TU for patch@linaro.org; Wed, 30 Jun 2021 14:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyf0p-0005GY-4j for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:32:39 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:37715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyf0m-00022Q-Sw for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:32:38 -0400 Received: by mail-pg1-x529.google.com with SMTP id t9so3196981pgn.4 for ; Wed, 30 Jun 2021 11:32:36 -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=+Jf1hfNBd506pP5UotsDrbYdrcf9l5zM5YtUqqOrZ/M=; b=U59gzQAHTzh+//CyTQHvff5KXBoJ9wsWtQhtp8j4riQi/H1ZfbP50QZJyRjX+h2JJD +fKddZU0NtYQ+WfCoasWpDXDdutZKwaYBN5PaJvO5i2Rk3F1xgvKcgBMzJkp/ieo68R8 AuwXOeh/eKUm0ir8s271DZLIbJSIEgAvl89kgJ1NwB1PV598Ez61ZdwyKR8AZd9M3VYJ 2O5BlPQ94tbXm1qbldZIcxF2MbpfaOeloX7DGvsMszzEURhs9c4AH7ZuBCNJngAr1HBz VEuYOc3ClbrEzhtuqGF1Tb08p++cRF1L0W1+aXZEvSDck/3+IIV7k7/azfD+r8DYkpJi lu/w== 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=+Jf1hfNBd506pP5UotsDrbYdrcf9l5zM5YtUqqOrZ/M=; b=sZZXaO551wi+cWW57gIECktDUF4yiiV+QVYGUTnTqGmN+sh9ynjXfyu34nJKEPWtZt 2rgPYCCUMOp/Tcn0FqacAkZ46zO+cQQD7hZdHzuL2NOaJNe0ui7PdmBjRF6ZaUuVZCXe CPMl06FKbUcpJM21Q7LUzIvqtZr0ktfJdopEPE/el2JhHlEaTxsOhNT0a8RQ5GJ9znTg OsIzlmqL7bI2u5gLFNIItPuyP6Q2mzxzrjgPxF/XVLze4B2adznJ5oanXrg2Z4ot2EGC eVMcVyOnty/9jiY37y6kj2IVfezn8q+LHS4JIja6wN0S/+djQZpNgsMptREoEKkCfjBb lDDw== X-Gm-Message-State: AOAM533YSlWTdioncG04zKuI87DmzYRbqSLNIIgNXauTtW9wIAv/Dywq s/6q+zGOmUPzn7XL/JoapWzwQSskCo6NXw== X-Received: by 2002:a62:b502:0:b029:2ec:a539:e29b with SMTP id y2-20020a62b5020000b02902eca539e29bmr37269229pfe.37.1625077955432; Wed, 30 Jun 2021 11:32:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id m18sm23909517pff.88.2021.06.30.11.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 11:32:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 13/28] target/m68k: Use translator_use_goto_tb Date: Wed, 30 Jun 2021 11:32:11 -0700 Message-Id: <20210630183226.3290849-14-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::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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: 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 Signed-off-by: Richard Henderson --- target/m68k/translate.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.25.1 Reviewed-by: Peter Maydell diff --git a/target/m68k/translate.c b/target/m68k/translate.c index f0c5bf9154..05b96fdda7 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1520,16 +1520,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) { @@ -1537,7 +1527,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);