From patchwork Mon Jun 21 01:34:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464481 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2116951jao; Sun, 20 Jun 2021 18:46:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9OfglhPpvMkqo5KDr3S+6kVelgNKNgJFE80KCYUcPkdOjP4z9Sv88id6ZS0l8OtNBoYPG X-Received: by 2002:a05:6214:80c:: with SMTP id df12mr17603101qvb.18.1624239975064; Sun, 20 Jun 2021 18:46:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239975; cv=none; d=google.com; s=arc-20160816; b=s7+4PTE4ZUZJqGlQp3KRLGB+rwA7vRTIiNk2WMrwB+72OyizINnbNQr3xIVxqAhcZR FUwiqEp/UKBMhAE9TitKxanqMvLUkE+Roz0NqCTmmHPEwGkZFxydXUvIlnWRJXCFrkmI wVDm5PmafeQc/taxCncywC7UF5z/j7ARU9CkiypkTyyYqSS3c6p+FIJeGc4kMy6HPfFm NSDWccSzBVIgpug8PkUadPd2st2OQt0+Mkm3tqKYqGe1ttfit7pTtsJddHuZsA/0LDUc fJBHWqujjAtO+3z3G7r7ErXQVYX5dDbt6HJHhN+xztmTMtrIm0t+62C3N05dtyZgxBdL fQmA== 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=GyMXFOHuukBywR7FyV+46rTH8YDdZbnYXS3wX0EtO3c=; b=h/NRfm5cnEbVxSAU4ctXz3oXLASJadY0WbAZdujeU+cDGba7UffcnQqb50VasV9GvF 4WTPDW7U8JB7JAii6WbE8Q3h8invSLTyuOM0cHSw6V36bz6k60kjj7reDIt3S2pqHMXW yF5+KpNtQikN2GL4m7iFOzoE79jKI/oxdjHbPhOWDE6qVgR1jW/5qxOZEfGjSqzP5ihB AehAevAvPZ9l3bRaD1YO9xZx84sOTdMiHza6fM3XQzXZpQJq5C0BtQk1TFpUmKwUPrt6 MvPKJGlbDSNwNDb48pqTywgqnTc/u5xFfUe9brD2Z0CzCA0yv1Vr+gh34tQl89C7riVF 6FgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LhGPeMbP; 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 p25si9862190qkh.339.2021.06.20.18.46.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:46: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=LhGPeMbP; 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]:42030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv90w-0002Iz-Ec for patch@linaro.org; Sun, 20 Jun 2021 21:46:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8pw-0003me-T7 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:52 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:33751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8ps-0005C7-GI for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:52 -0400 Received: by mail-pf1-x42b.google.com with SMTP id p13so12464264pfw.0 for ; Sun, 20 Jun 2021 18:34:48 -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=GyMXFOHuukBywR7FyV+46rTH8YDdZbnYXS3wX0EtO3c=; b=LhGPeMbPnbEOW2I3m5SJzeWAzM4qVQHV271Qsleb4tROvW/HRxjXI3pcHuGfxot3R8 VSnFp2Jq46jHw1iaOpVTrgfAmg8mH2fIAi8AzYfGJMC+ZBaTnkgg2w0WNnuEPbVCqoA1 NOWLHRgDimmEYS754Sl2l/n13KNbbRhcrQtvucxo4u4Fmo0sufWqpWiWs/nYevQMcL+F OGWJloJ0dJfTxtUKRqHy7OtGwBHncec7R+Dtmfp6F0nu5bGmC3AZhFe8im819AskyuX2 dngcfAnW0fJEo8uYXuqMOkLaiRXbJufNn9JGXFXtMZjQx2IlWzblzpJ/blLe3NnSZ1XP UoIA== 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=GyMXFOHuukBywR7FyV+46rTH8YDdZbnYXS3wX0EtO3c=; b=gsyXWmqspYfqvRnp3iCG8yJc8/z2XRLNod3pKNWXax3UsNXM1/u/NIR/NkTBKj+3ya HD/tjT4hlZ79ThcuVKnWAwNzUA42k+6sLBk1alHHhQ95qKo46OH45IxplWf1JApM3/iP 53C7Pg0mwGSAZRFUlTQyvka0TlnXjXZEvSz40WVgi5C8g+OSLPigwCYa9D6TxtF3sC8v B0G8KmE1dBtB4h5sT65W7ZTmYb5oqZGoBCwTY8WgNdG2XaVzMpsIfEwyNXkKvsy+WG/U 5SHBmdz7mAclh1su2d7Qm2mUSnxz9cNKyYGXYeZAo1S/d8B08BNNGkmOJKPP5aZjGE/Z hQfA== X-Gm-Message-State: AOAM532ktTZWY5T4uLO386HVp9lfPdEK5Sbfo1ul9UrQzzTOs/Uo4lf0 r3gU0fVomRi1hwhRmVhnI4yCk6nyvC/UhA== X-Received: by 2002:a62:b502:0:b029:2ec:a539:e29b with SMTP id y2-20020a62b5020000b02902eca539e29bmr17017986pfe.37.1624239287263; Sun, 20 Jun 2021 18:34:47 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 11/26] target/m68k: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:24 -0700 Message-Id: <20210621013439.1791385-12-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::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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. Cc: Laurent Vivier Signed-off-by: Richard Henderson --- target/m68k/translate.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.25.1 Acked-by: Laurent Vivier 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);