From patchwork Mon Jun 21 01:34:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464464 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2110866jao; Sun, 20 Jun 2021 18:35:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkZy0znmmx7jm5wEo0EYztgHZJl8scBFstBSIlqQ7at5SfaIVVL8ljpaVLHyu+ZIeBRaEo X-Received: by 2002:a02:b188:: with SMTP id t8mr14715291jah.102.1624239315573; Sun, 20 Jun 2021 18:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239315; cv=none; d=google.com; s=arc-20160816; b=s++Y1VeqSiZR7ef76Iasa1XXvJH+kcblOAwZH1eXE9ZYiL4RBaKnHCiANfmfUPAyTC QzrYAsM9KIYphZXU+CzYK7fYvoTr1RMq7A3eTU1HtIi19nWlx8BI0Tjht73jwQdQFCiZ 2JZfz1pdNVs4B81TU2wHid3RTH7/enYFlRTpD65etVY+ypEjAMcOWVbO4qkawEu/ybP9 ljPHcG1hCw6LhRJ/nEOc3sF03Dgb6dC7cM74ALEz5QHJyH9kFT4wZRpx39FJE495/TCi Cq9JMIqkkKD2i0bRWjIEGm9gXQKA/cLCnflPzk5fG4ryB2Nu8w57ffpYvi72x046Jx5K EApQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=3dD79hCWh72uwMhZlBZFNfcYw08w7axPQZvzJYA+xi4=; b=yJRK30ujBdU61VIWHz0YXV0Ivaxq5dy7l/46D2rxAfdlE5ZqyVFphEAItPX5Y1AB3+ aCu7SqhjQAOFZhLxub4f/ftejXetoBm81IH7vgAhgRpPGZ2tO8rhQwoCWBhMw9EAUXRA IEkYCGqtAyt1j3rXhmUxCO0Tvt6NxMezncSV3/30LxCRskkikXiDm65SD4rNRjM0yrcA FhfM0lINWQNd4m6+LzidufOBv7vhpLV7Yid9T7nQ4MG/uUI9fgVD4K0//IA7vN12XkiA 6z+CToKzQewlNhLhKvkY0HRzkoIOIW4kdit7rtAESW2uFb1tzrbapw9yRu9j9g7OD0cI zz6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pX9LHerK; 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 i19si12797684ilj.131.2021.06.20.18.35.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:35: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=pX9LHerK; 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]:35244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8qI-0003f2-TA for patch@linaro.org; Sun, 20 Jun 2021 21:35:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8pp-0003dw-W6 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:46 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:35421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pm-00058U-VA for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:45 -0400 Received: by mail-pf1-x436.google.com with SMTP id t32so1055335pfg.2 for ; Sun, 20 Jun 2021 18:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3dD79hCWh72uwMhZlBZFNfcYw08w7axPQZvzJYA+xi4=; b=pX9LHerKOlzU0GxHzfo3XshdwCqFttLfCYXxRHUcUHgxG9ititb4uFnfSoayPVi/RN XtY5EflFeOv9xmtzyGa3neeoRa38ILEHzaYVD5VUReVBWKjzWneTC5v5VuOEZRH3KwJi JQpmsfICjn5XjdedldDzhMYz0f4Sz3gV7gHtyYPXYDyEd6Ciww2vnwGXuDbUxTWSZhPO lkujm1GmCbeia96cD1kRgnGpuAbSFZPCEezoHsKPBJCp6qcDijSwkMCXE+Pc9CRYeacT g1TOjnpq9TSodZciwvkJ1mVoKy7YHmDBez0djqIxl+T8mb0bGhHdLhIr811X27LzkBgi 14+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3dD79hCWh72uwMhZlBZFNfcYw08w7axPQZvzJYA+xi4=; b=s+c675jPt44RTzw0VY4b1JW0RGLcM1etOddcYEmpR4WctyUsaJ1P23TWeSTphOwz9e nz+iGTNKaA1+mLPiX9H5GqKSf0mYsamxNwo6k7TlSAsqypm9Aj7tMbyhZYWMApRfuDpD 8MvfImT7vllCQG7HKfTdT1l6qTzSOMlWM7+CgCb9s8oW3XUW2a+fIm888Bas/nKdXQLa b3hH+wTfW+HxyygA6W/C+5x2CeUrtc5/UhxKMOvFczt/oBI+0Sk1DpJC4rRHS37T30ex 97i3+zBy1HzIw7Ymz7uBzJdtsaAxxiW7bcfUlXvpF2L1QzZmxsq8OQRnfYgNw3dUCFzB 87rg== X-Gm-Message-State: AOAM532fhmSUkJMIQCoXHq/RPMCwx4MONB/VlWtRM5jfG1uTEzjRzQl8 JVmMmVGQaOREzDtqCx7R18KKgTXqJlcEEA== X-Received: by 2002:a05:6a00:84d:b029:2fb:3d61:51dd with SMTP id q13-20020a056a00084db02902fb3d6151ddmr17157711pfk.11.1624239281573; Sun, 20 Jun 2021 18:34:41 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 01/26] accel/tcg: Introduce translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:14 -0700 Message-Id: <20210621013439.1791385-2-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::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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add a generic version of the common use_goto_tb test. Signed-off-by: Richard Henderson --- include/exec/translator.h | 10 ++++++++++ accel/tcg/translator.c | 11 +++++++++++ 2 files changed, 21 insertions(+) -- 2.25.1 Reviewed-by: Max Filippov Reviewed-by: Luis Pires Reviewed-by: Philippe Mathieu-Daudé diff --git a/include/exec/translator.h b/include/exec/translator.h index 24232ead41..dd9c06d40d 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -145,6 +145,16 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, void translator_loop_temp_check(DisasContextBase *db); +/** + * translator_use_goto_tb + * @db: Disassembly context + * @dest: target pc of the goto + * + * Return true if goto_tb is allowed between the current TB + * and the destination PC. + */ +bool translator_use_goto_tb(DisasContextBase *db, target_ulong dest); + /* * Translator Load Functions * diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 1d32732198..59804af37b 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -31,6 +31,17 @@ void translator_loop_temp_check(DisasContextBase *db) } } +bool translator_use_goto_tb(DisasContextBase *db, target_ulong dest) +{ + /* Suppress goto_tb in the case of single-steping. */ + if (db->singlestep_enabled || singlestep) { + return false; + } + + /* Check for the dest on the same page as the start of the TB. */ + return ((db->pc_first ^ dest) & TARGET_PAGE_MASK) == 0; +} + void translator_loop(const TranslatorOps *ops, DisasContextBase *db, CPUState *cpu, TranslationBlock *tb, int max_insns) { From patchwork Mon Jun 21 01:34:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464470 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2112609jao; Sun, 20 Jun 2021 18:38:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVoAKRtRxmuJr6iZ1RvS9+rzrIMCHa8ZWHY+cVe/4fJub30JsefoMVuQ8CY9farDEitdTR X-Received: by 2002:a0c:fa0d:: with SMTP id q13mr17557361qvn.43.1624239500416; Sun, 20 Jun 2021 18:38:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239500; cv=none; d=google.com; s=arc-20160816; b=nbeKgnIMwY1Rz4h1nTyITky8kCggbO5713vTA02t7HmkCRi6FiobjuKaiT1YC6RQmc OwsNZAvhND2VGa4ASprAc7OL9Xa8jCCr2yMSUGby9uWebvmUojGkZ5ZUpjSu55/1NLhp 2cjcHyFNiEjVNcpB8X5N/IicXOJtXCbOakwgmhtfq22AB5dkyysmlw6dltxHxu2dkmxO arJjZxJglMKPrgp8Jzqpv7vqctSE+2BX3h3BjNgJjprltS9BJqw23LKI1ENRZOaEk5Zo wVnm3qlmT7z43RHKzUhPpCp6Sl63qwrFE7JwF/VEYUqJnJEVEeATn1R7IBByM32qeHDS MsEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=N8g+aqSIVx1gl+cogu+CC6dpxUuqUQpSlSSilhD6d5A=; b=wzljtAjvwK7JVBEzj6A/cvmRsTD5hWJeZRJhOLsTfWB5QXSRxXxU/sgL3rJoVauUMo JCF4A7FYlR7E2M2b3h3EMCPu8Hwj6y8HRVroDXqKonV/cbUK0w/upg1F3372zANvhK3w 1hWsl7dvZHnYOtdqWA7yBiA5cTxWCJVRabx1LkkHjFQsHheEBI1cRbfYbOmzeP2q4lL8 b7RdnZQA2YI8pX8U3VeyRDA90ZQoGyK1fvq93t9MCMuOdQOwix4ORrA8/8DYv3D0rWCB Xvbu995MNVDYQK4XaZfM2UCA5KQKpk6mu46QM71zqPFBm0Pot2U/iSyYzLWH+uRvBE0O 4RcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LV2ilcqQ; 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 f13si13309646qth.235.2021.06.20.18.38.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:38:20 -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=LV2ilcqQ; 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]:43656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8tH-0000ya-QS for patch@linaro.org; Sun, 20 Jun 2021 21:38:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8pq-0003eK-Qb for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:46 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:37756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pn-00058Z-HV for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:46 -0400 Received: by mail-pg1-x52b.google.com with SMTP id t9so12822723pgn.4 for ; Sun, 20 Jun 2021 18:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=N8g+aqSIVx1gl+cogu+CC6dpxUuqUQpSlSSilhD6d5A=; b=LV2ilcqQXl3yoBtJxClrtrEJZquWSmfBxWuCV63iW3VeP+l+QEkf+w11XgYBBFQjUJ hdKb5hRYfNes4A4CquRGr4FO5eGHUHlm4G/QoZMSvkfCrGjqrFWlMwgZxnLRgrZZX9KO Jg3q6ulSOdYom3xvt21aEA7Iht/4AlOH6HIXzmS/kJgvPjr2LJ4BJwjY0H6/p1quii7O W1JUg7MeUkcj9beoYdUcKg4nxyfA6xY+Ixg27uzqRNzaZ1YxfWkhIkBcvpfWk8pNu+HO Wi35iNJj4bMxbIHQcfUsDH6Za28pRD9OWDMouwAWowF/D5MU7UmqvfrsWDMAySwFk3YB wnLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N8g+aqSIVx1gl+cogu+CC6dpxUuqUQpSlSSilhD6d5A=; b=bMmYfLv43ppE6MmeAYP632SXujGHtLKwp6J3szkIDzSWygsDXenNiJNEgfJO8MGKfq Xzpr5aFOU5iuWNXlxXqJmagLC9wmAaLjwVuZ3zsYjWGMuC3EeRvmQZNyl0X08L4QXKfK pnz22n/zedoa+fgwI61aqxYD4EQAppQQ2P3zsbnSXYOWByGHjmWlP9Rd3sbkIfX8+wBR sWdmsEg/vlZbfd37LqvaRYVvkkFuZXX0O0eNLehwMUvtJy0x826ld2S13OCGC0DwmfLr 6xhyIubzNmZx2vF4oZRfTIQCKTuTWAmPcyRBduqv8YrPKMoPwqWy8JLNAaWvW44rXdWp 7Apw== X-Gm-Message-State: AOAM531acAAZoiwstC55rhXji3a1GMQY6+aOVdZVKHOY9wUDnoc2wn4T GtfzLB+WllCuTSKa8UKkD/4t9+sRl3azbg== X-Received: by 2002:a62:d447:0:b029:291:19f7:ddcd with SMTP id u7-20020a62d4470000b029029119f7ddcdmr17030953pfl.54.1624239282158; Sun, 20 Jun 2021 18:34:42 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 02/26] target/alpha: Remove use_exit_tb Date: Sun, 20 Jun 2021 18:34:15 -0700 Message-Id: <20210621013439.1791385-3-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::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have not needed to end a TB for I/O since ba3e7926691 ("icount: clean up cpu_can_io at the entry to the block"). We do not need to use exit_tb for singlestep, which only means generate one insn per TB. Which leaves only singlestep_enabled, which means raise a debug trap after every TB, which does not use exit_tb, which would leave the function mis-named. Signed-off-by: Richard Henderson --- target/alpha/translate.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -- 2.25.1 diff --git a/target/alpha/translate.c b/target/alpha/translate.c index f454adea5e..70ba4a67c7 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -450,19 +450,8 @@ static bool in_superpage(DisasContext *ctx, int64_t addr) #endif } -static bool use_exit_tb(DisasContext *ctx) -{ - return ((tb_cflags(ctx->base.tb) & CF_LAST_IO) - || ctx->base.singlestep_enabled - || singlestep); -} - static bool use_goto_tb(DisasContext *ctx, uint64_t dest) { - /* Suppress goto_tb in the case of single-steping and IO. */ - if (unlikely(use_exit_tb(ctx))) { - return false; - } #ifndef CONFIG_USER_ONLY /* If the destination is in the superpage, the page perms can't change. */ if (in_superpage(ctx, dest)) { @@ -1271,7 +1260,7 @@ static DisasJumpType gen_call_pal(DisasContext *ctx, int palcode) need the page permissions check. We'll see the existence of the page when we create the TB, and we'll flush all TBs if we change the PAL base register. */ - if (!use_exit_tb(ctx)) { + if (!ctx->base.singlestep_enabled) { tcg_gen_goto_tb(0); tcg_gen_movi_i64(cpu_pc, entry); tcg_gen_exit_tb(ctx->base.tb, 0); @@ -3020,7 +3009,7 @@ static void alpha_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next); /* FALLTHRU */ case DISAS_PC_UPDATED: - if (!use_exit_tb(ctx)) { + if (!ctx->base.singlestep_enabled) { tcg_gen_lookup_and_goto_ptr(); break; } From patchwork Mon Jun 21 01:34:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464475 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2114335jao; Sun, 20 Jun 2021 18:41:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNOMRfnSjDu6xHrRIwvlOqelvGXi+fZlDKhzt76ThjqSprm8PkoZUwuF1cnTaB5uJ6PfRb X-Received: by 2002:a92:a302:: with SMTP id a2mr16001971ili.184.1624239674443; Sun, 20 Jun 2021 18:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239674; cv=none; d=google.com; s=arc-20160816; b=dKoEhKOEMgN1bukvonTqOCFV7nEWPhEYpAWK/szdKCjGf03wV7kJn4O7Pwy2TfqOfn K3f+9KaDa9Ay37SDap3Oz6d1JNW87rOa5GuZU63yKc2yudzYvoGVxjAzWPlt34T9g1mn YaKUiIX+gDR0vLb0Jx3fW0NlFEYjZGKiRSCTvDfttkt9Gcb+l2GuQp6NV5qC4SSrTyku r3Dnygh9sdHmtudb8pA3HrXTuwDERWGm4iugD2WysghZCRo5aei82mSb7fcOV6q5BuiR /iSXFUgMUhVnCiSpFoG+n8WtsC2NcT3znMbVy9+wKCuq5Ob4Hi6d00XbipXJV0Wv2lmM Iy+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=XmpHG5qWHga2DrUxm66yiT1xDZZbA3TthH2EU3CwRBo=; b=SIMcRmnFMeufJ3/Gjtx7PFZ1jMtK9Xro79lVYiSy+e1ZdUdoViJenJFEZW71KdGq/3 t+I6e9iljtZNp3RCywX0JIE5jUZe/R1+GYKSsRGqcNDxMxes5ie7YHOrocBVdb/uC0jy TOUWEzUlH3fe6AFxhbKY/ReMnimkRKERug/Ks9Jrcz4/JxnTRHTKDAMXi77GLTEEd+Ki t/XfnA0eHqedPmtLtLzkKgT9pcwZBBRhHj5ZA+xS8mFKu57ko8qfbygfcJgDZvGvV3tK oLZ34rVb/BkJ/ilBb0pd4WLC5EYV3SF1IhVJEEfre4fa2Noz4FBWtwJfcdq+OVaPKrDX HcLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xylRNmWb; 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 w10si8996171jao.68.2021.06.20.18.41.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:41:14 -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=xylRNmWb; 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]:52042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8w5-0006eq-Ry for patch@linaro.org; Sun, 20 Jun 2021 21:41:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8pu-0003iJ-HV for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:50 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:39635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pn-00058s-Vg for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:50 -0400 Received: by mail-pg1-x530.google.com with SMTP id w31so12830908pga.6 for ; Sun, 20 Jun 2021 18:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XmpHG5qWHga2DrUxm66yiT1xDZZbA3TthH2EU3CwRBo=; b=xylRNmWbryrU3eyR/TMxLe00WWDmc0rbCZu2gTQXoUkRQCRg0+/SctiCCGQ/YEPC9w eAdwT+cjOhfQyxmG028poOZMJGUJlZo4HRBn7DmaZPFGKiKBW9UCI4kLxhtY+I/fgl/J TsDhaNG7RawYYgnpqz4aX0OG7nYV5PLGmM1QyAyu6pXHYYu9ZQTmHbfFDDsidhcGf29E xCIJX4y1PQ4j1ZvS6mS4n7i6WwnwEkRaJeqyCIx1qGfAJrau3uvADCwmqfma4OoPU/YP TyWELAVbMRCkK/V/UTYeG+HAAvqheBObfglGTqzo7522I0hQ1vKTLRrhyog8dr2qjXrI 8T/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XmpHG5qWHga2DrUxm66yiT1xDZZbA3TthH2EU3CwRBo=; b=UOMCOT6Lqm/CrIm9YJxZwbqPYi+70Oze4f8TkfUoU40MRhgyQIySjzu62uHsCmf5eD aUfGkNOVccjrIWYjTIJl/fpLYDfycupavdJeYLsfylL4Uz6uMrq5xpcppv1Jl2h/7fJM Q8jSW73LWxz1tRHJaMgGWxdRu7Unl8jzkd3674qYQgOflidM7gD0XZ7fg+1jNwBiA6oG sKydQUU5dl9EfRifwqapJU4KeyOtlNpuEamrTuM4XeJ9r2rxJ7U8sh4L0qi1PsVyWpY9 GXzQNdd9GyXIbPmc0SqIQI1B+LiDShkH/OojtYicVJ7MuiTDHnhzSBdDSd7lm5QgymP8 aEPA== X-Gm-Message-State: AOAM5310lU+a6/aeVQrrKru8NW2yuJcytAkoI9wKqiztDEdjAgEnu8rk q510NzxkV4NYFHugLAv3MHY2K389esF4Dg== X-Received: by 2002:a63:9f02:: with SMTP id g2mr21617381pge.141.1624239282769; Sun, 20 Jun 2021 18:34:42 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 03/26] target/alpha: Remove in_superpage Date: Sun, 20 Jun 2021 18:34:16 -0700 Message-Id: <20210621013439.1791385-4-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::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The number of links across (normal) pages using this is low, and it will shortly violate the contract for breakpoints. Signed-off-by: Richard Henderson --- target/alpha/translate.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) -- 2.25.1 diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 70ba4a67c7..6ea19a1d4c 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -439,24 +439,9 @@ static DisasJumpType gen_store_conditional(DisasContext *ctx, int ra, int rb, return DISAS_NEXT; } -static bool in_superpage(DisasContext *ctx, int64_t addr) -{ -#ifndef CONFIG_USER_ONLY - return ((ctx->tbflags & ENV_FLAG_PS_USER) == 0 - && addr >> TARGET_VIRT_ADDR_SPACE_BITS == -1 - && ((addr >> 41) & 3) == 2); -#else - return false; -#endif -} - static bool use_goto_tb(DisasContext *ctx, uint64_t dest) { #ifndef CONFIG_USER_ONLY - /* If the destination is in the superpage, the page perms can't change. */ - if (in_superpage(ctx, dest)) { - return true; - } /* Check for the dest on the same page as the start of the TB. */ return ((ctx->base.tb->pc ^ dest) & TARGET_PAGE_MASK) == 0; #else @@ -2916,7 +2901,7 @@ static void alpha_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *ctx = container_of(dcbase, DisasContext, base); CPUAlphaState *env = cpu->env_ptr; - int64_t bound, mask; + int64_t bound; ctx->tbflags = ctx->base.tb->flags; ctx->mem_idx = cpu_mmu_index(env, false); @@ -2945,12 +2930,7 @@ static void alpha_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu) ctx->lit = NULL; /* Bound the number of insns to execute to those left on the page. */ - if (in_superpage(ctx, ctx->base.pc_first)) { - mask = -1ULL << 41; - } else { - mask = TARGET_PAGE_MASK; - } - bound = -(ctx->base.pc_first | mask) / 4; + bound = -(ctx->base.pc_first | TARGET_PAGE_MASK) / 4; ctx->base.max_insns = MIN(ctx->base.max_insns, bound); } From patchwork Mon Jun 21 01:34:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464469 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2112567jao; Sun, 20 Jun 2021 18:38:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJz7GnpFyvs2no4yKLEgdAwi4V0EjABxhpj9J2GtLQQAR21Ahhs92i/hp0kCWc83mJZ+Ii X-Received: by 2002:a0c:b752:: with SMTP id q18mr731858qve.6.1624239494750; Sun, 20 Jun 2021 18:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239494; cv=none; d=google.com; s=arc-20160816; b=z4ThinW/W0d5QYJ7c40/Dj06PTABxKBGTP0wNPHIXO2HRjnRgPrLCKyYFLv0//ZAoy yvUcj7hwxtubMi4PpD9oRGA7wdW0wxNIPpXWfVhMc+moW9MdRgMMb0CJvSzVQB5PnHPa 2kPYLgWoKGrt5/pZrXoHfodi5Gi7t2wMBy4/6wW3v2DMXBzcmxYsvAqAVSqEkZTMvR8/ aeyIKcCi3Pa98QvZKfPdt6PW2pQ4kdkmE6gHRQASF2DGj8HuE36iY3bG65vQV3jGigoY UYo9S3/WHXsF6s7V2p94EnW1awivxEQzD/UGt6TdZtcXr/Fjb+I+gjm5HUWF62pSG9KQ sqhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=6WQ3bnQo/skjw94EgsrmvIJtusx9rxJm6Wr3acFcG08=; b=wSws6StsevRT7DoDYQhz0Va5KTZIezOXRBgxfHNoCiKPUNX8FlA68zvYZCiy35K1sc 7nqkQrGiKZ/tPgocszamKf8RQygBBzPTgpFfyDrqHLf6J1d2d0Aku5dAe50z5gdN1YoO R248OlbQqOgp5Xr62uBACdzpZeCaKqBVDvA12U19PIP+o/+/nhQHa5jEpbBJCBYKEvio Wv0Rbzo+a9QpxJH7LCn9qAtkSGQGB58T2HVI+FxPn7gUsqR8PFtQR5f2r+Bjnp0xz6wG f653XOQjlTPIomn26EKeNuf/2RLZlJwMOgUGRZxwPhmsgkkHfXakwSac1GatKH4Nwxuc AM5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KRhJJj2x; 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 p7si9917314qkh.256.2021.06.20.18.38.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:38:14 -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=KRhJJj2x; 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]:43498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8tC-0000sL-6d for patch@linaro.org; Sun, 20 Jun 2021 21:38:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8pq-0003e4-8g for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:46 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:42886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8po-00059Y-N5 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:46 -0400 Received: by mail-pg1-x52f.google.com with SMTP id i34so7202404pgl.9 for ; Sun, 20 Jun 2021 18:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6WQ3bnQo/skjw94EgsrmvIJtusx9rxJm6Wr3acFcG08=; b=KRhJJj2xrHqG0+pPyEIHgjis6Odgl5PSBgwwPYxuRREaYVPHGC9SgbHihEGiXbY4/G FPbHD+Jstgzs3cL4Bevb9G7hm8v1i+DSvCgoWpMY3uLF25C6mq+XqSnUFBqnDuJ8QnBU hm76MvLA0975exeHvHzpSka4pOPA1V8dDr0Ihqy+ti333Q+0RP/v0j529qIEAf0GwtAB i0CVwGNUoX3Sk5gSW5JeDf3rPAfrTIDPst8WI5OxOL5cu5y0BfuhPm1ni12UvcDqKejc RX7Bb5+oT3QgwVz2uHG6GbLVSRMBTk5oRXEbzmVn8VJEHJhg9kwwWjkykB696bpolEJG /0Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6WQ3bnQo/skjw94EgsrmvIJtusx9rxJm6Wr3acFcG08=; b=bfO3Q2WYkxfx+TCD9ot2Fwny9eQEPl7iIIK49u2/MIB7GAeJ5yIzUDo8SSRV+zZmi5 8GhyQcIZ9EjCEwHyhmA3Ky4DeKSjgTQNc14Aea9W3I+XhSc+CnXbikfj8YiXDLyQ+wIU jzJVRm+8A5caBUuonoGCIN3shTE/kgYRyaiLxfD+9NRpOARPA1sFNF/UXLVA86HqQRXm EgcQrbWY3Ry3MvjRw7u8HZ9mdBMgdxLI5/ugc3XjH9ZtWuRRKrbewI9CYAMw/eFodiVL axrFguIRLOBwMoM+mAvNdPsNGdDuUqVwvLCZ+HYVSG8b4as0ajVxE3zcrhKpTXi4rSC3 FqHA== X-Gm-Message-State: AOAM531tyEe2kJqEj8g1b9YyDhj+g9JYs3Ze4vSOO96vzvAdhpMhQu// WqHeHUXd5VBKXk5JzL3mp4RSCzebFoZ6+A== X-Received: by 2002:a62:76ce:0:b029:2fe:f4fc:b2db with SMTP id r197-20020a6276ce0000b02902fef4fcb2dbmr16844933pfc.12.1624239283448; Sun, 20 Jun 2021 18:34:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 04/26] target/alpha: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:17 -0700 Message-Id: <20210621013439.1791385-5-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::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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/alpha/translate.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.25.1 diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 6ea19a1d4c..1aa6d24d83 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -441,12 +441,7 @@ static DisasJumpType gen_store_conditional(DisasContext *ctx, int ra, int rb, static bool use_goto_tb(DisasContext *ctx, uint64_t dest) { -#ifndef CONFIG_USER_ONLY - /* Check for the dest on the same page as the start of the TB. */ - return ((ctx->base.tb->pc ^ dest) & TARGET_PAGE_MASK) == 0; -#else - return true; -#endif + return translator_use_goto_tb(&ctx->base, dest); } static DisasJumpType gen_bdirect(DisasContext *ctx, int ra, int32_t disp) From patchwork Mon Jun 21 01:34:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464472 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2113910jao; Sun, 20 Jun 2021 18:40:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbCRWVi4crhl5lMefvLSO44jkYJV0mrb6JCXNVrPGT6v2isKXC1hTgGV/RksNb0iGbT9br X-Received: by 2002:a05:6638:3898:: with SMTP id b24mr12213366jav.17.1624239628746; Sun, 20 Jun 2021 18:40:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239628; cv=none; d=google.com; s=arc-20160816; b=DJSRpmtIH9hG8J5uExBh6c26Kq91SwYWVI91fYkxbcAHuL8BVhB0lIvggO61ne4QOl ZQ+w0D42Tnua7UTrF6YvfcZ6zlb2X+Em0TWnZdj720vE3AGfxCPUZ9u/kFBPx9gHQjI/ WiWR3LdeIjMsBqU1PdbOnIrUr9TorSrQo8672v2+iRHq8232SjxxFJe/e7XEKBsMgS1i cuwaKrpJX+w8El/yjObjvRkEMZIMbByWMiKWQ1aowwCN5Q73fhBiuocttoluB3Qqshep vzz9Rgn+VYrY4FQrJ+jxSS613Atp6QHM76YqLoZHYasz4wKhbuPFzKGZn/m9P4TXXIhZ skDg== 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=Fo35LiJLxzJ5QjaCRAy6ykdp6FMMYOby7BAD/sQfZQU=; b=r+lnvmFte9MtiIp1h0XmX0OuO8sRCzxkmNAIm0P+yzuza4i6bV+hMUASdDVQVxuVIO FbMNAS9IHM+K75i/1Rn36R7WjW5LeOefEjQ5qYnk4ZTl+LFwatsFtDB2Ew+w0lepS+5j UjTWqMD4TIqLmUtC9v+1AVCkMp/CilO3Afg5+Y/fyTIPWVfT8fuO0Of7jDwM+ZseHKfw RCmPaVZ+WSG887Rx5I369DshCUmTys7dZU3w0+NOXVqbZqEf4xF7jfillRIVSheCbiBn sHkDyvSekabT1VJb6ZqToted+mgavs4fC+ULNX7hYrUSJr10DsgtJNofuEUZUjFTGX2T CdTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="urnw/uyc"; 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 k6si13108226iow.10.2021.06.20.18.40.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:40:28 -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="urnw/uyc"; 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]:52436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8vM-0006un-6w for patch@linaro.org; Sun, 20 Jun 2021 21:40:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8ps-0003gy-MG for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:48 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:33771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pp-0005A1-AK for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:48 -0400 Received: by mail-pg1-x536.google.com with SMTP id e20so12863002pgg.0 for ; Sun, 20 Jun 2021 18:34:44 -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=Fo35LiJLxzJ5QjaCRAy6ykdp6FMMYOby7BAD/sQfZQU=; b=urnw/uyckTRcrz9lokvO8z/9sBLJsRPCjrU24bmLZUFCS3m7znSJ98SdgkIG/ejhf4 80oavddRacwR+GaMFsmErSxQ5NPIRzrJ7bbe7aa6OYkHbmrzZmL5bT/wHaC0STfGeFP8 K1IyB1ZWQONoHW8bJhUKsfafJMXVqn7tJuYTToa4Fe06PRp8AbmnHAr8lboOxfXjqkAk C0lqbYsrD+LRkOpR5a44U4selX4L+rR3ffBZR0PQXQJIFSkX7EBSpUzU4EwA1ostvGfw RaR2MRSGHiNhzuCKuHYu8Cdl1PJp/cz3HJr4C7nc+NHd5VjriqpZ3v74KLMmbYQkD3nX kxRg== 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=Fo35LiJLxzJ5QjaCRAy6ykdp6FMMYOby7BAD/sQfZQU=; b=aCluqmxNPIISgK+xfgOfnNSDpk4xiVnWBENngOkyvOQQl9IBwz8E82f8ihn+/SIcAM FOL+34hAhqt4TLIJp6HR85kZRAwpJVtJ52E1wCNbqM0yPlcFrIEQlJTOvORSrQKBRSFz HM7mE+EIM5OsnT0u/PR8c8AHVgBf+Lu5fFlhRityxPtlFHGeWiEiD7xNbnkOUdDPpSp3 oMkO2Ub82mXFjH8x4DmDPUtoIl7PYTNg1GIQ1b2PYP4956XBELoOdF2PbSapQPRQWXxh As65+V+nU8l+4TtsOlnLwurCj5DSv47zLHDNpE4HJsbjnw5UCk5afveTFdtWe+Q5TrGD UKiw== X-Gm-Message-State: AOAM533T2n62YLM0ZcLiw+aZ73AYVSa9Qu7oE94c4fTMOtf7U4fHoJin fwrcyCczXQq2qwrJMxIHILpCpuuuH+RIBQ== X-Received: by 2002:aa7:9729:0:b029:2ff:1e52:e284 with SMTP id k9-20020aa797290000b02902ff1e52e284mr16669103pfg.71.1624239283986; Sun, 20 Jun 2021 18:34:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 05/26] target/arm: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:18 -0700 Message-Id: <20210621013439.1791385-6-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::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Put a wrapper in translate.h, which also checks for ss_active. The ss_active test was incorrectly missing from the a32 version. Cc: qemu-arm@nongnu.org Signed-off-by: Richard Henderson --- target/arm/translate.h | 13 +++++++++++++ target/arm/translate-a64.c | 22 +--------------------- target/arm/translate.c | 10 ---------- 3 files changed, 14 insertions(+), 31 deletions(-) -- 2.25.1 diff --git a/target/arm/translate.h b/target/arm/translate.h index 2821b325e3..3a62f50faf 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -116,6 +116,19 @@ typedef struct DisasContext { TCGv_i64 tmp_a64[TMP_A64_MAX]; } DisasContext; +static inline bool use_goto_tb(DisasContext *s, target_ulong dest) +{ + /* + * No direct tb linking with singlestep. + * This handles the ARM debug architecture kind; the QEMU kind + * is handled inside translator_use_goto_tb. + */ + if (s->ss_active) { + return false; + } + return translator_use_goto_tb(&s->base, dest); +} + typedef struct DisasCompare { TCGCond cond; TCGv_i32 value; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 7f74d0e81a..ac58a86e59 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -386,32 +386,12 @@ static void gen_step_complete_exception(DisasContext *s) s->base.is_jmp = DISAS_NORETURN; } -static inline bool use_goto_tb(DisasContext *s, int n, uint64_t dest) -{ - /* No direct tb linking with singlestep (either QEMU's or the ARM - * debug architecture kind) or deterministic io - */ - if (s->base.singlestep_enabled || s->ss_active || - (tb_cflags(s->base.tb) & CF_LAST_IO)) { - return false; - } - -#ifndef CONFIG_USER_ONLY - /* Only link tbs from inside the same guest page */ - if ((s->base.tb->pc & TARGET_PAGE_MASK) != (dest & TARGET_PAGE_MASK)) { - return false; - } -#endif - - return true; -} - static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest) { const TranslationBlock *tb; tb = s->base.tb; - if (use_goto_tb(s, n, dest)) { + if (use_goto_tb(s, dest)) { tcg_gen_goto_tb(n); gen_a64_set_pc_im(dest); tcg_gen_exit_tb(tb, n); diff --git a/target/arm/translate.c b/target/arm/translate.c index 9e2cca7707..3ac7943d86 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -2511,16 +2511,6 @@ static int disas_dsp_insn(DisasContext *s, uint32_t insn) return 1; } -static inline bool use_goto_tb(DisasContext *s, target_ulong dest) -{ -#ifndef CONFIG_USER_ONLY - return (s->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK) || - ((s->base.pc_next - 1) & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif -} - static void gen_goto_ptr(void) { tcg_gen_lookup_and_goto_ptr(); From patchwork Mon Jun 21 01:34:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464465 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2110913jao; Sun, 20 Jun 2021 18:35:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOeLu9SlkRFQcxulgwkuc5lC0boGRIrAlLpq0IuYBRoA/FOszN7PUfK+qyiZNXj5r3uGf3 X-Received: by 2002:a05:6e02:c7:: with SMTP id r7mr8547662ilq.76.1624239320796; Sun, 20 Jun 2021 18:35:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239320; cv=none; d=google.com; s=arc-20160816; b=QGeoiXs0IMnUMcTHh2kMUNT3ttUxUZv6v6jkcZKh56ewjaQ2fNCEgMsWMKppj4EhUe 9ekpgoreiDx6OKCHEP3Jcta3yLitxe6k4HfEN0sKmqDa92Fpl+r3qHWeDtkt4itdb0N/ lQj0NLa7PxyPB+hSn/51eYZ03A1eBEHDrVKBrHuY3bKNIsJtgtkDwUt5GZ/YVYW8BAuh RXX9F/4RpgzDTrqdq2Gx/Xn8mHSWw0vBIB4xX38Zi139de2bzdFRBspjPodWjiMCYXRZ kGPRHV5mplAbSS3QzlDJVmgsTJpF3rasDogQfHj9EHcveMKG+xMkPRYmzqlaxAmlajZo R8Bw== 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=8W3E8oUQSB677QQyABV7B4p2F0hPm4epmS7TTIJ96Bk=; b=aVr9GTS+x2qDIKBTGLBZe0W/lSJwMG9jyfjhB1tG4xEjHkW5lJheBOlTwy1U1NoNlB evfXJ7Fq8/EQA6Cz5dIMZXR4FeRDAZv9grymXHJKp1zHOUPJt2nxg/GMYDyez4u/2HIF fXzF9yOFHjwOAbw4rD5GuPGz6Jh4e2cG6TH0x+vmzo+jgZI29AcQStJwZDPKxO8eEZza uJQeRIJOuknQgjcrETbsUwhIsNN5Wtn6LXIWQ6iT1Y7cHppcjUIi4D98w4HArO4zASwc +MEmedjZQNMPYg4vchdy68GTW3x4sp4NJTkc2ZqXU1Jng4hKxr0UhMb0V4L8XCbZnt2A s9xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M4I3DRen; 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 b6si9474058ile.24.2021.06.20.18.35.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:35:20 -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=M4I3DRen; 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]:35542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8qO-0003sK-6M for patch@linaro.org; Sun, 20 Jun 2021 21:35:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8px-0003n4-24 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:53 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:39638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pp-0005Ak-Pg for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:52 -0400 Received: by mail-pg1-x533.google.com with SMTP id w31so12830945pga.6 for ; Sun, 20 Jun 2021 18:34:45 -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=8W3E8oUQSB677QQyABV7B4p2F0hPm4epmS7TTIJ96Bk=; b=M4I3DRen5KFnW0x+9OukwYD1Je20YCMqH2ORkp0fb+Iv733BWZSOx4gvsYGQyTxIOl YCx+pzgDbunXrsoAe6eY9cvLj6QFIkKguZh+7PYLgQLUAOEqukAMZQBC2V+iALATaD0B ETdMJly+BLzOAQsO0FHxHcZLdkLcUxcCXnRBLuahKWhYQzwnH4X080/JjOOGnw0O6Am9 t7o2tgJiPl8/lAkQYNCvhc9SZBDyYmEGDiVzCjKPHE+MOK/cExXbQYpYtzmRJapQ8+4n eMCkNaV9B7xaOUnCMdCtaARPxu/3FYDtRHWo8fYsXIMb8VoAArV6o5LX5pijWCJMrEtQ rBLw== 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=8W3E8oUQSB677QQyABV7B4p2F0hPm4epmS7TTIJ96Bk=; b=rPcXR1KTRMy0xl3wSw0b8RJYWY2zV4fRPsqsQ9L95H9va+YL9kxAeAvdiodlYl5ttb 4d7DwXpQy/xeB3M0P3ixg7q+cjCaPjtoRMk9eBZ8Ydtv10st/yO/+fo7TFkEeLf3V7Mk cydtPdEPrkWer0zPc34YwCZXfiIYbRuorgs7PRn0C0xB3ufzU2kgas/2pGJZgZOPvbQn DIMSVtx13FHHP1AJoB3IFtKDHd548uYPoZUBhvanco2/Z7XbLjJ09LSo0H1hNMevm+TO 8rDCvvhAx3e87/Qxe5S/Ui4Jzz5Jars+VNcJf7G8dRu7TJcCFCrRKVWzAZTfFGBhl5yA m4Ww== X-Gm-Message-State: AOAM532r2iBQJIhuDkm6qEfIa/64ZHbp3i9dsDqISmUjRqmKcKxR+MKr L+89RZ5fZNdW90XGmFEauKUTevn8eSw4NA== X-Received: by 2002:a63:da0a:: with SMTP id c10mr21433072pgh.255.1624239284611; Sun, 20 Jun 2021 18:34:44 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 06/26] target/avr: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:19 -0700 Message-Id: <20210621013439.1791385-7-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::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.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: Michael Rolnik Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Single stepping is not the only reason not to use goto_tb. If goto_tb is disallowed, and single-stepping is not enabled, then use tcg_gen_lookup_and_goto_tb to indirectly chain. Cc: Michael Rolnik Signed-off-by: Richard Henderson --- target/avr/translate.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/target/avr/translate.c b/target/avr/translate.c index c06ce45bc7..8237a03c23 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -1083,14 +1083,17 @@ static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) { const TranslationBlock *tb = ctx->base.tb; - if (!ctx->base.singlestep_enabled) { + if (translator_use_goto_tb(&ctx->base, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(cpu_pc, dest); tcg_gen_exit_tb(tb, n); } else { tcg_gen_movi_i32(cpu_pc, dest); - gen_helper_debug(cpu_env); - tcg_gen_exit_tb(NULL, 0); + if (ctx->base.singlestep_enabled) { + gen_helper_debug(cpu_env); + } else { + tcg_gen_lookup_and_goto_ptr(); + } } ctx->base.is_jmp = DISAS_NORETURN; } From patchwork Mon Jun 21 01:34:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464478 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2115816jao; Sun, 20 Jun 2021 18:44:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwEhfj6yX0iatnzNFGBkyf8QiEiCKzOtTko/rc629r2cItgbSZjmX7NNUZ88t2zJGsv5Fx X-Received: by 2002:a05:622a:1886:: with SMTP id v6mr21937537qtc.91.1624239844882; Sun, 20 Jun 2021 18:44:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239844; cv=none; d=google.com; s=arc-20160816; b=0elf1aQz1qmtyrh1/YNP0hpvOYEOdecb9gtnJ/vgZ6kQN7NggbljS/ClKvqRB8fJRv yanyoh5mT9BUKVoZL2+ujhCZ2YjOi+VkjH9k8hI/KJ49XOxJTDJ4fOI6QF1t8qydyOzQ s/8eP1eSExLHW2ntmymbHV5BhUIYPmHmBkAzAcsCW7chachUuAFTTCdr+shLzLhurmIb pFr5VE8TMvNtMtAcf2qgk41TsHkZ7w2R9CYwPw1K3PDGNhQwucbSc3Ct8WH739BpLLHO Jw5V5e3SvKcE5Pf0DgmPuaFjol4J12np+CmNxC1AZ0Z6Bfiww0LsFl5FmiytFVXelaLV LsbQ== 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=jRMrTx4NopqOKJx2Uk7lglqxDnltwjXqtnzEu6kn91s=; b=ktFA99HfbxgemKqv7GNmELgCRiHD0fsPNs8zazNymaXJ5/Dhhorhvx06kIAcWOAciA Wyetf11LEBrHNEzjSK60sFFpCMeh1+asg/DK7U7D5DuLprqCg84mwVkz0YG9ms9W8mz6 Aj7Q+vs/zi36iFcu90/J6fi2vEp9cTQ8IAUupzEe5soQ01DNBOFd+Y1zzaCYrSD9hO8/ muotAZOteI1ni+PQ8Fp/g64NPS2/eYLFXDCuBPa7pyphfMHg1dcFodDq1b+5NDwBhiFA ThkVO7D+EjUDfXbIjv3BpCjqqwNKYeNatmgwJKz5q/P7w40lGEomzawfFDbipXXUAT8y HBYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lmzWe61B; 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 d6si1200565qty.361.2021.06.20.18.44.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:44:04 -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=lmzWe61B; 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]:35752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8yq-0006Ql-9d for patch@linaro.org; Sun, 20 Jun 2021 21:44:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8pu-0003ii-O8 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:50 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:34815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pq-0005As-Ba for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:50 -0400 Received: by mail-pl1-x62a.google.com with SMTP id h1so7663215plt.1 for ; Sun, 20 Jun 2021 18:34:45 -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=jRMrTx4NopqOKJx2Uk7lglqxDnltwjXqtnzEu6kn91s=; b=lmzWe61B2HYcthxnMJUxKtS2qgp07znoEMfMaNOpIIbbliJ77Ln21Vh7fajq1DzPfB e4v3lcSrqRWEDnboFxYspTG/QaP4d+WaR9zbYq6pb+blkaOCLMfxt0E5JRnDSohoxfu9 xtEnVO8ndDwiOYwZsRET+PvyHzwio8S3fmJgbbGevrrkn22xmvkuTPJOTlHshx8eGZBi yba+KykPsYPe6ARSOONc9sey7ZfJUt6vKw14Wt4OJpRkQXTrQbSyDPVcEZ546mlC1VWZ HfmjDWIJKxP/HjJJnggwSN6NUBILSbx+c/+gTQiqQsIzJ6wGq++Iw899nST8knX/cAkh wfUQ== 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=jRMrTx4NopqOKJx2Uk7lglqxDnltwjXqtnzEu6kn91s=; b=QgkGEXYlNYfSoSo5iFVtClQ3kjB2h4csKANs2oUsLdJjSkhCrprPFmTeiHdBpdfMf5 wmeOwjqvodzGDboxtgZAkuGlv6gDEUVhHcaPT0Zy4qdZXPUH1Q1SaamkxLtMKVALGGK6 T71oDVVhvTDVoYO5vkAaed8RitD6YjtbGLTCoZ/uqpndGcwPrey9+bqw8f4rfvZZf1Rw RCmtv/kD0sspWQeGc1Cd1l7MFdv+ZE3fYiR2REaf0X/GOB6s3nXgtaPzjjhxOGdenHmh xDRE0XfRhybq49C/jcZaWxyEm07vU6yGLROwemUNSUkEpQFSCwbo26mF9staRdve1Fla 1TUw== X-Gm-Message-State: AOAM530wXIiZxliyUXIpLmzwJksqMd8wwUMr5A4lUeB95O21vH+0chsI Emu1sj4RvlBT3Nl/jrkydi/Yxtp7OV9Low== X-Received: by 2002:a17:902:a981:b029:116:a139:6054 with SMTP id bh1-20020a170902a981b0290116a1396054mr15453997plb.60.1624239285064; Sun, 20 Jun 2021 18:34:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 07/26] target/avr: Mark some helpers noreturn Date: Sun, 20 Jun 2021 18:34:20 -0700 Message-Id: <20210621013439.1791385-8-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::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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: Michael Rolnik Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" All of these helpers end with cpu_loop_exit. Cc: Michael Rolnik Signed-off-by: Richard Henderson --- target/avr/helper.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.25.1 Reviewed-by: Michael Rolnik Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/avr/helper.h b/target/avr/helper.h index 8e1ae7fda0..4d02e648fa 100644 --- a/target/avr/helper.h +++ b/target/avr/helper.h @@ -19,10 +19,10 @@ */ DEF_HELPER_1(wdr, void, env) -DEF_HELPER_1(debug, void, env) -DEF_HELPER_1(break, void, env) -DEF_HELPER_1(sleep, void, env) -DEF_HELPER_1(unsupported, void, env) +DEF_HELPER_1(debug, noreturn, env) +DEF_HELPER_1(break, noreturn, env) +DEF_HELPER_1(sleep, noreturn, env) +DEF_HELPER_1(unsupported, noreturn, env) DEF_HELPER_3(outb, void, env, i32, i32) DEF_HELPER_2(inb, tl, env, i32) DEF_HELPER_3(fullwr, void, env, i32, i32) From patchwork Mon Jun 21 01:34:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464476 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2115248jao; Sun, 20 Jun 2021 18:42:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+dQ1pDCm9xN5sv9JWaZTgI6HJLl6Z/NiweI47ka4WCya8EpeFWIlkSCwx4cYGu/2zsI1V X-Received: by 2002:a05:6214:883:: with SMTP id cz3mr17614330qvb.38.1624239775284; Sun, 20 Jun 2021 18:42:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239775; cv=none; d=google.com; s=arc-20160816; b=MvFuOsGXSfku0LeePjkI12MfkYDXJahm0f3Fsohcc7dmGWC5BFTDOHvhTjMTAg8vuS IUBFfhecsYW6IzzYqZVxeS2204Sp43KDfD2CGCwv3JVZbFvmjq2pSNU/r1QFusiZUYgi RaDXKCbjHdSbN/oKXVLapoTp0I9Mf/T5X3nLuNtYGHEbOXoUbX3OQkgeqBMDYKXTRdwD rGnbPOqQv6xUZESJGe4Ozsl36ME0jZtGUNGARjeTEM6iPqAakugHwcADitXdAAr9D9b0 dlWnFI1QWJca9NIEFqPhp0+E1yUO1IEe/tM9ZkjJaCovmqxhzWxpyO64uR0K0S/PT8/K OSQQ== 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=rxkDq96k3ZTvlscbiDlbIOM0PupnkbICBsbxK69yAjc=; b=MelwSgAe4m5g+xJ8jGNIV/+KExsyjJ4stJCykT4hmQ+U4rvO84u6qcnDo3OkAGXRF0 jEnBGW6ijBdZ8zM5/WKltmwVwTV4BPDNScWpXq0FigdOJTdFfu6KUCHZJ103PDYCewoJ oYqX5lSpzL5Vp6lUj6/BlrT4OpnUTQn+pPsxRHQBHqu1pJNMTjTPwZGycP0pnGCTXZpv UTRkyL1fMCfhA525tiDx8MAKFnB2sSzBi1HXm7GRZF4yAFxSBhxfR+4CmvIGxJOk6bIQ w3p5S9SPlRgmjBLImmupggLzeQktHTcbZsVCKD+JTUN32CJLciBs05IYeKVKfhFwLqUQ xk9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kDLZmVfW; 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 m9si4458969qkp.114.2021.06.20.18.42.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:42:55 -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=kDLZmVfW; 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]:60460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8xi-00041k-Mv for patch@linaro.org; Sun, 20 Jun 2021 21:42:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8q5-0003tm-Gs for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:03 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:41617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pq-0005B2-TV for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:59 -0400 Received: by mail-pf1-x429.google.com with SMTP id x73so12390110pfc.8 for ; Sun, 20 Jun 2021 18:34:46 -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=rxkDq96k3ZTvlscbiDlbIOM0PupnkbICBsbxK69yAjc=; b=kDLZmVfWV4wsFpjzZJ1pENqklXd1jt0r9hUjELIfbjAwyeYjcAclqz1gTLDWIm8elc O58M0MW4+5khnk2t0P2/tcA5R2ZsBQ03l3T4oQy8FtgHSNKYqgJJwWlQYLvKNEGHGOi8 Vx/AYgTs789FSN6kwig2nshEaIxhDh9PQ8/GJxSh2FUPhfZJ/ve2WaDi7NQBf8U0h783 DR08/GV5n7mwjVmOusXzZk/7S2g9Rbl37PEqVR0RyxiElyE2OIVKy9/W/Rz4DUOWg8R8 Ch562A/I6fgbDTOReG9Qu3pf+5qfDxdRtQQXfB8Yq3XVcqqE/K155S8p5WAbA2rl7Gqc xPeg== 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=rxkDq96k3ZTvlscbiDlbIOM0PupnkbICBsbxK69yAjc=; b=DkgFleD6zu0GL9K5T2kuYnDNk6TuSkqK2/E04cZii3IFYEWFVj6A1LeoF+VkXFt7KW 3SJyk/nvuwZezx2R5SAsqkktqMIZGOzjESBlX9wOZZ8q7PPutV7pM6XzYF5cV3MyY6pU mtT4Hi9r2v7AiwUsXqytVT+zUNNXJzVvChSvQivqUmY/G0fuRVzQj2zsRj6EzxcVA+UU cuHYykrlPGl087jLOklO37h5xIztzgPgpuR88DSwLw88tNYBDXPPxbrzKoE+uhcOoba3 PQNquhuw4jQvUcwrrTAhfdwiODKZ8++NcjpEXqEzRql3fM3DcR9h1MmiIjSHKbgvZLBi 7Ilw== X-Gm-Message-State: AOAM53122lNSuHnGMncwHDkyYuZAD4wCyIjiOs8L6PoAnj+AgI+iop9L PZfRk9R7QPsRHXe9DlzA1bguKeDyo0ahcw== X-Received: by 2002:aa7:8702:0:b029:303:6c92:dc8e with SMTP id b2-20020aa787020000b02903036c92dc8emr2663686pfo.63.1624239285642; Sun, 20 Jun 2021 18:34:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 08/26] target/cris: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:21 -0700 Message-Id: <20210621013439.1791385-9-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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=unavailable 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: "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The test for singlestepping is done in translator_use_goto_tb, so we may elide it from cris_tr_tb_stop. Cc: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/cris/translate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/target/cris/translate.c b/target/cris/translate.c index 3200819f32..33ad76c0a8 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -517,7 +517,7 @@ static void t_gen_swapr(TCGv d, TCGv s) static bool use_goto_tb(DisasContext *dc, target_ulong dest) { - return ((dest ^ dc->base.pc_first) & TARGET_PAGE_MASK) == 0; + return translator_use_goto_tb(&dc->base, dest); } static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) @@ -3275,8 +3275,7 @@ static void cris_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) * Use a conditional branch if either taken or not-taken path * can use goto_tb. If neither can, then treat it as indirect. */ - if (likely(!dc->base.singlestep_enabled) - && (use_goto_tb(dc, dc->jmp_pc) || use_goto_tb(dc, npc))) { + if (use_goto_tb(dc, dc->jmp_pc) || use_goto_tb(dc, npc)) { TCGLabel *not_taken = gen_new_label(); tcg_gen_brcondi_tl(TCG_COND_EQ, env_btaken, 0, not_taken); From patchwork Mon Jun 21 01:34:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464467 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2111177jao; Sun, 20 Jun 2021 18:35:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhP+JDthF+vmAV0NEaA6WGnK1e63AphVWVBKi342eYGGpAm3XWY+h+1G4pBn/V1xYg4FpP X-Received: by 2002:a02:b897:: with SMTP id p23mr15065043jam.71.1624239349106; Sun, 20 Jun 2021 18:35:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239349; cv=none; d=google.com; s=arc-20160816; b=s5EZxZ0Z75tOb3knPahadeyw9Ya9SjNP6Pnqj8eR+td6bjw/kJTrK5yMxgLW+kId4v 61bVzwxbcLjLYgWoeRa7+oSNOQwprrA1t0A1Cu9UHMOK1wwO7B58doLJvbHf/Mn/eDpy LbERRkNcKWyF2uY7L8ZFWyX/OGMG7jXJip8mKjxt3hSDXhvjfB8YK0R9szMQasNPCwIR qszQwgcJIZiukGanFHGFJuVQhngLoQlUNYNyQrkPJVF0xuHavcm4r2vD9agQ/ryXZvge TQYkbXML/6+3ALstc179cmRVCk+5gM8V21NpycuZmjTQCSLPwFVe9WL+UOODycsYzj8U b/6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=cH+sdopDqg3AA/XmKjvzj97BFIKh2FfG1/i/yI9Y2V4=; b=M6sMfSPTK4jOURPt+CDG8nXSgaWaM23Ky3E+Ejp9+buAT+k79LSyuBGdcs59CL0Zcn hq8rWDgkXO/c6QKuqFbemiEfEAugpegxSf8/QDBeD8m6+3RlDpmTWyoKrV/ywu+xNIpM IoyJuAyfRGcpFVa0iCmDMVqDiH/Ig2HvN76DGwQk042cS7mB3ViuzxoPGKtVtFToxow0 0uaK1y1RrN3Y9IWKYwwxm4hZkFelEIQcONvhZpHoz1AuMw8j1jNjZA3W3lhHsXS9R5Ia VQ5FFNXGC3KC0LBV7+5hKrU8lPX5ArbzjJ5/X2M2oBjRvJUZKsJ4SuRHMjFUOmIo7lpd Kt4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zk4xhm4f; 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 g2si12745645ioo.75.2021.06.20.18.35.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:35:49 -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=zk4xhm4f; 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]:35598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8qq-0003us-FX for patch@linaro.org; Sun, 20 Jun 2021 21:35:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8pv-0003jv-M8 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:51 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:45824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8ps-0005BB-DF for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:51 -0400 Received: by mail-pg1-x533.google.com with SMTP id y14so1402908pgs.12 for ; Sun, 20 Jun 2021 18:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cH+sdopDqg3AA/XmKjvzj97BFIKh2FfG1/i/yI9Y2V4=; b=zk4xhm4feVb+xK3F4e11ZLuwU7VudoskD1fKArb/lYaaXA3eyYQ3Iy6zcdnWp8n69a 33rVAamHYpZ3h+fgIWZVnPL7LtqP8mmpZeLEFYO/MesIn8TatVl7aB2n9yM2sNZwcaU2 9eXgKEnfY4tGibFDF/kGZXZ0opDUxX7wueoCBTAQViN8Pj5E7n/PRrzEOwWqdmlseVDy 6DT5C5ilXVE/MvWHViRjlR7yAtmhQOaB+8OKUbfVL5nLHEkgj62VwnrT97q1vecbBgB9 l8ISh1bz52wxYM/0CSbqdKffT02J0mEfN2mGYQhhjhA7L7TK61yx/1MdQdoONiAsRWZe 6d9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cH+sdopDqg3AA/XmKjvzj97BFIKh2FfG1/i/yI9Y2V4=; b=mumcvV7srwwKE2cBEQSk9NhpEPKwhAw+BTh3OdNBo6bBkkeWoIWlr3YG4usIKZ3jlJ rUkp1HZpbeqZMnZoAxrANpUux9Ak1uH5pq0f6QgrQ2bvcCq2xHMG51jTGoY1m8/wjoUv P9FzVrwI5CGB0pK2+9C3NwpNOHdsS9wsm8fkSYAe0SZtp609kk5igYcjqOKkjAkfHP0g wkMvGpz8i+16GNc+AzYZecX0rtSPM/m5uh7/eKNOL2a04QCD+TooWMK60MQvWKzrSkcI 7zXbdqYIrHbeSjjPZRwLJu0TxYIXgmXlWg9J2Ysh8k4x3lNJoj7tRcKapLI6dqjOiNaO OQRg== X-Gm-Message-State: AOAM533C9YhtJZve6wkI7vIhLIwrQH2xEk/S3NeULbC6/xnPR8j0frgU Ciyqy04QywkD7rhbQ3xwrsmAE7qACaw1vw== X-Received: by 2002:a63:b60c:: with SMTP id j12mr21757569pgf.393.1624239286198; Sun, 20 Jun 2021 18:34:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 09/26] target/hppa: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:22 -0700 Message-Id: <20210621013439.1791385-10-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::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/hppa/translate.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.25.1 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 64af1e0d5c..952cfe09a6 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -817,10 +817,7 @@ static bool gen_illegal(DisasContext *ctx) static bool use_goto_tb(DisasContext *ctx, target_ureg dest) { - /* Suppress goto_tb for page crossing, IO, or single-steping. */ - return !(((ctx->base.pc_first ^ dest) & TARGET_PAGE_MASK) - || (tb_cflags(ctx->base.tb) & CF_LAST_IO) - || ctx->base.singlestep_enabled); + return translator_use_goto_tb(&ctx->base, dest); } /* If the next insn is to be nullified, and it's on the same page, From patchwork Mon Jun 21 01:34:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464471 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2112669jao; Sun, 20 Jun 2021 18:38:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVWAaGCzNKrQ3o6zk9TFHAICkP2nGPuOBUH3nZabjy/QiqQ0+AwKzy7H8AvvVQI4ksAKYO X-Received: by 2002:a05:620a:12ed:: with SMTP id f13mr16800238qkl.261.1624239508830; Sun, 20 Jun 2021 18:38:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239508; cv=none; d=google.com; s=arc-20160816; b=cwxlXeE4wg6x9Y6rDqZlg3mhqEuDavUDo+z142gNEcJtp93ZnP44+HgegmSdN9GoxI 5fCNZOXzPyEZSaA4slfaYnt+alMFjKKfgEcVx8pPBNt0e2k0Re1oC42/faVMV3SBexY3 6eqdTi9RggDGsatezbLI+qgejFBa2GYBh0IiccWsr/x0un2BiLflBw4C7uw7crdpNjvW bnx6RmH+1MNYuslERyo7DXOGfbc5SS/x0cKpUvHf3yW4Y0wUblLq2uj7+QIvS/iLsTIx PayL2qL+KCyXqVqXy9lYC3uhElbcGAeeaA5P2MbgFH234iq8t8uy8wMLFoZylSnEq51w 5DTg== 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=GMkVnaoY765gCHKs02WDkaTKMwEGdS0qsbGYx4hCN/s=; b=spV8pdNPQxbbaNb0HapzLozvVUNQJ811o4hSEpu7F2PyWTdOIV+gxVlHNlcb5c5eXT A1EUIEsxC1JcYGZLKvk+4ngKqIPfEpPBnm4xV4fk9mmgm4eJhrkH4EIqdetumBWMEGO1 +gCHIY/04elYohXUHzTiZBjZ1Po9H0V4uOZHhmtrOLEeEW0l40JIEzX4TRq1Smo6Rv4q 8c2bTN1CnVLblRbFcAva0G1tu7WNyJmS4BZl8YnYRBLJFhCLowGrs+wtSVGQkoPNz/2J 1yehxZHVthmdR0d8C3HpLmzwkDxz8bwxZSKrFTaDd6rYMQdpH+fszXqixYDo2ifTmZT7 ASiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YYsO7F/c"; 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 u10si7995690qtg.362.2021.06.20.18.38.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:38:28 -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="YYsO7F/c"; 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]:44246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8tQ-0001LP-4f for patch@linaro.org; Sun, 20 Jun 2021 21:38:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0003st-PE for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:00 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:34590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8ps-0005Bw-DL for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:57 -0400 Received: by mail-pj1-x102a.google.com with SMTP id g6-20020a17090adac6b029015d1a9a6f1aso9328353pjx.1 for ; Sun, 20 Jun 2021 18:34:47 -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=GMkVnaoY765gCHKs02WDkaTKMwEGdS0qsbGYx4hCN/s=; b=YYsO7F/cWLfhAMJMd/DPnzTFb1cA/kwTdhlJmoqgipATMcreq1eVCnld6T2txfnKNO ArRI4lP9tahNnReRW0YoZ13W5yJyJKy7a/l4rN5hpNyQHANM4yWOuDmN8pG7pRujcGgf lOFMCvKRFkMLh0gwOMhovR9/DiIXsieDcQMZkBJpl+3NGmavjLT0NwkUPoAV25K1d+nu UFE5pH/cK5iYzN7+/nY0PRjJK4pYOm0pwpNBxhH3BfakPaJ3ckwbr3tUA8gv83OGrReq UpRtXJdLbg70nqgy+0xSu12M61TnpXEdTzn6Y4zNDVzYpYTLPErPqf0eVFLen+u+7vMI te7A== 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=GMkVnaoY765gCHKs02WDkaTKMwEGdS0qsbGYx4hCN/s=; b=RXExHktBYki5EKeICHMgqW050o7sRQjYR2Z444UeDpaX4ylH9XhqyGfqsqcCJJE490 bIpgTXoqrQoVheeqG+fbewyHK8yNVfvpMUe0bUiKRMdBqR6IkrO3DbJclMK0P5AUEWhh NyzeVNusnwtE7UuQkhTTeQMFDWnqOyaEHDTcvrE9nv9HkoK5EHqbwnyBtOmnlnRangUh RhLzB0ThpQ2Or64vd+dbX2+TsrCvRxbvjkmvf5k741m4SPDby1Quz6nEyRBuxbuwRkQY 2K6IZqh4dRvI0aM+zJ4bnJbwlqsuxxW4a2wJUaqdNuNrFYWocX0f10/LJnIvky2Z9/1X z6hg== X-Gm-Message-State: AOAM532VSAEgjXNu8NFPR3hz2T1+4/AoiKhFj17hbo6nlgavgodTt/R+ lp7in2Ebd27J4gJ8zbesD9XikbUDzum9jw== X-Received: by 2002:a17:902:8641:b029:117:7a89:b42 with SMTP id y1-20020a1709028641b02901177a890b42mr15669659plt.58.1624239286684; Sun, 20 Jun 2021 18:34:46 -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:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 10/26] target/i386: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:23 -0700 Message-Id: <20210621013439.1791385-11-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::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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: Paolo Bonzini , Eduardo Habkost 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: Paolo Bonzini Cc: Eduardo Habkost Signed-off-by: Richard Henderson --- target/i386/tcg/translate.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index a7f5c0c8f2..e47b220ce7 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2314,21 +2314,11 @@ static inline int insn_const_size(MemOp ot) } } -static inline bool use_goto_tb(DisasContext *s, target_ulong pc) -{ -#ifndef CONFIG_USER_ONLY - return (pc & TARGET_PAGE_MASK) == (s->base.tb->pc & TARGET_PAGE_MASK) || - (pc & TARGET_PAGE_MASK) == (s->pc_start & TARGET_PAGE_MASK); -#else - return true; -#endif -} - -static inline void gen_goto_tb(DisasContext *s, int tb_num, target_ulong eip) +static void gen_goto_tb(DisasContext *s, int tb_num, target_ulong eip) { target_ulong pc = s->cs_base + eip; - if (use_goto_tb(s, pc)) { + if (translator_use_goto_tb(&s->base, pc)) { /* jump to same page: we can use a direct jump */ tcg_gen_goto_tb(tb_num); gen_jmp_im(s, eip); 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); From patchwork Mon Jun 21 01:34:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464468 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2112073jao; Sun, 20 Jun 2021 18:37:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvX9YlLjkB63YKEtxEWGB/BD1qEVHMngES/kKadLnYBfIhUSDhA02MP/gwByz99ucIAu9S X-Received: by 2002:a37:684b:: with SMTP id d72mr21137662qkc.372.1624239440783; Sun, 20 Jun 2021 18:37:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239440; cv=none; d=google.com; s=arc-20160816; b=WBnmBfq4QUb5LIpfui3yzIYslf8onxS3mA5Jp8cGcLS8DIBoCxVQpXkXNPApX+25PK wMbXV+8yX77pZiH2xe+gGci54Ruyc1uA2Gu89GMkFcI8OmMPWwXEP7dcwcNAHWDXMkfo 5YLBX1z1r113Mj6qO1nsyc0jEYXGgGZOnG/WIaTNhqj3Xoxfit3kvl9xAUzdaSQc2KBE cRuui79C2RbE7S/anbXjnrDD8PJmHKdwUai0/ri7EqEzBhN/VPZSBkGSaU/jvXGPyM6g ZfFUP32Aq2NjWJYsn+WAeXkyfAErBKSUZxcxqyYp0eYyVuh9bInuxxshWM8FyFONtdWq o93w== 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=lDoRcLaC7/1E4QoRTMLY4EqhrZiViuK6qiqJLkoqpZM=; b=JiJpvYmovDkRGtDbqi0kiGzxTyHOyCba/riVro3mWDoMPtfCt7CM/rcNV8tcZMO3wn UxHtKiY/ka170XMcIMI/qmWKiY1DVURt1bDzRgFvdBRfW9aL9Jz5jTuQEY6aWihZjVE5 lNMwMqks55qFradvCWUn376QohO86v+OByuQFPs1+rsEeN9puzl0FXQy6BX6xsORrDtv z2dKPo2G0BYYBVcHPOPA+Aym54rIXwspoHcRVeGqpWQ9vM+r+KvtVCghX6wWGtnZnx92 booPmFTv5zzKqZWPepyp1DWBbow0YFud+rC5qKpyWrdm6pOvPT6r7us+ISdlEMivMmAJ h8yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H6QBidGw; 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 o134si5456670qke.134.2021.06.20.18.37.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:37:20 -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=H6QBidGw; 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]:44164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8sK-0001IM-5T for patch@linaro.org; Sun, 20 Jun 2021 21:37:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8q2-0003sx-Ky for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:00 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:34752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pu-0005CB-0k for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:34:58 -0400 Received: by mail-pf1-x431.google.com with SMTP id g6so12427360pfq.1 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=lDoRcLaC7/1E4QoRTMLY4EqhrZiViuK6qiqJLkoqpZM=; b=H6QBidGwrGYXr/4GpMfmLe4fynoP8jjiU6a0oWcXUaQnE145byLrV3YSN/NeGJlrkC nIo03mdJZqD90AlhK3eN5iiiP1LZAbCZyzZO8C1msnYH7UC0o08Zibx4IA0xE5Vr5bKL OGTpW6vwe4eeTYnXULxYpXD/amjln51VtpnE3pvndS6ElSTomPHTyOaxGnqrUv6NUlfR RO+nAW6MgEa1kHE1E2DDv8j6N4DNvDKOpmWgGfDBFJ8YHG5LHhFAtAA90vailn6kByQr qgI2YNfLrz4wRbsZrN0bc1ItOrzfzDMmtr8e5bLaVrCkxO5pOqyipDwaDn6tdRYD8xUF 2HVg== 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=lDoRcLaC7/1E4QoRTMLY4EqhrZiViuK6qiqJLkoqpZM=; b=hYjL6M1aUQQd84t+51Vg9rL6Oac1afxXJDe00DSjfUJ8YLovyuGMQzuuemswe3p48N NZ50RlOJjwCh6xgPAF8MexLdweN8gYKCkNSfR9POolSgG0OCOREJDMnIE5ZhpIqaPl9Q zffTKKlRwomDr3yST91uV0gzUn7yVHPnSJWI1tRQs8ch/E888Vs2WcInJnFnrZXFFmG+ whaMwLsTowdIjABTnm7B5rmnueiXr/7xTBmijVoTgsuKRCqJMyuMIIzQvuAYeSNVQnNw H02HBjnpMIJYQaD9H0WnbX9zR4lZo1Z12G/YbFHJfwpVoqkKFYu5sHzF/r/x8+le5T5t BnMg== X-Gm-Message-State: AOAM530yaQ3TkS7UTAz5O2uYaiK/Dhlft3KlFJAs/7jdYLaRWtHYcYDQ BtWUX3qVthq6EJFoEoLxtcsMigHISNAIrg== X-Received: by 2002:a63:471f:: with SMTP id u31mr21575144pga.85.1624239287875; 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.47 (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 12/26] target/microblaze: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:25 -0700 Message-Id: <20210621013439.1791385-13-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::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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: "Edgar E . Iglesias" 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: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/microblaze/translate.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) -- 2.25.1 diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index c1b13f4c7d..b753f080e7 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -125,15 +125,6 @@ static void gen_raise_hw_excp(DisasContext *dc, uint32_t esr_ec) gen_raise_exception_sync(dc, EXCP_HW_EXCP); } -static inline bool use_goto_tb(DisasContext *dc, target_ulong dest) -{ -#ifndef CONFIG_USER_ONLY - return (dc->base.pc_first & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif -} - static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) { if (dc->base.singlestep_enabled) { @@ -141,7 +132,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) tcg_gen_movi_i32(cpu_pc, dest); gen_helper_raise_exception(cpu_env, tmp); tcg_temp_free_i32(tmp); - } else if (use_goto_tb(dc, dest)) { + } else if (translator_use_goto_tb(&dc->base, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(cpu_pc, dest); tcg_gen_exit_tb(dc->base.tb, n); 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); From patchwork Mon Jun 21 01:34:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464479 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2116672jao; Sun, 20 Jun 2021 18:45:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTqJ3R4DE+s84t6l70M74PkQ0MmuZO4aY50JVf4S71rWLfAupE+El8h9k824B4q/tZE8RC X-Received: by 2002:a0c:cb8a:: with SMTP id p10mr11445396qvk.56.1624239940883; Sun, 20 Jun 2021 18:45:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239940; cv=none; d=google.com; s=arc-20160816; b=KjdnuBJM0CIiWNOWwgXOPI0+TXSC1MkxeRoKaLo7rhyIicfLk/XW+hSspRE+ES542F rDYyEIGAY//ZwzX6hVVDml2MXBldmC9YT19IXb0bagi6RCaT93i1k9q8csNSVt4i3O0p uou16Rx/a/adRy+s8Bti7Jqzo39fiRM2PFT/NS5WCH5sPGsqAPMT8kILpqOtLwEhbEtT oS8AgbvHyawH31cC9JGJwIRNevrms2oSfS6PsWxDxu0q5mRsn9m1ErGg2X3erbg7zSN1 jLWpMwFwCzGqJzncJRCpEwQqo50glsUk7My+ODMh9u6q0lNuHBJ9PxifJKUlclbJZz0h hhqw== 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=wtlIXfVTIDAcxOMm3S62qcgJG1xzrj7M5573CnR6cAM=; b=FlLMYy8ILQLEN6lBx6MINMMhlLHuEQLX59CZKCQuce1xdsATc+fP7/HB5wj9Z25CCZ fxZHs4qrKJNl48vW/YBy/o6yPCSxreNMVG7Y5scw50zLBuACRNApohv2B1f0agc9SxAO 9DM0CMsXNpJB4aA++CY/2offiCGbeob/nf7dZ6nDqWzVo/DosfgkO8dZE+u951xMLqV6 2fGUJ68koIx7xFgi/qnRerFs7iFQl0RHJwWsdafONeWCT5dtYvR+BGlMXEZzPx/JeWAI vjJl193Dg5KalUKlePBthRgvLumSdex7RaDHprbTvtwfA5PmKHs4Q5bT1KGYRK6bpswo O+jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZPxUmzqV; 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 k4si4927730qvj.169.2021.06.20.18.45.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:45:40 -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=ZPxUmzqV; 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]:38630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv90O-0008Og-8e for patch@linaro.org; Sun, 20 Jun 2021 21:45:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8q8-0003wn-6i for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:05 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:40466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pu-0005CX-AQ for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:03 -0400 Received: by mail-pf1-x42b.google.com with SMTP id q192so5839041pfc.7 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=wtlIXfVTIDAcxOMm3S62qcgJG1xzrj7M5573CnR6cAM=; b=ZPxUmzqV8Qx/mMGuqNNL0Yd/NspN+N7734ReQNBEblNncmLWjNIpE0d0GmwHUFSMKv 7LaV7ehjWMRJLnWrSvyu9qLaZwnnZv8ZWCfxCHLUepMDN3YjRuuL5Zu9ov83cXNYku3S O+3TKyk5MHO5Pgple5C9N2B/PhGh7KiNpTeNX082tJeDsqioYImjC+rVjP6DC2P+Awe+ WtoVvT8Rm2Wz/qcHEUXrGOndLBSk/LhrkKd7GsxAUAy3KFN6oulWb6o3N+k+OdWJcwyC s6FrpotJgAH/Uq0IVRbzoY9IZdFct6twKEL6saTkTwQuyjuAFkoT8i5ocWHaCi2T1ZVC A40w== 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=wtlIXfVTIDAcxOMm3S62qcgJG1xzrj7M5573CnR6cAM=; b=jpW1U2c9Dets1suCVCkaUH4mccOW0AjML2HnO3Vcoy/yu5OS/rdgN+zsFq5UOrHLa1 WviqSP58Yj47I5AdoRVNxBok112lRvplJfL4KNUXgJFk4Ltg6SLzCDSAsrFvn+q4MLFF hiYFAaCk4FPHpmQMP51dfTdIo4RIk8KyqdXuZ9BmmTbCDRDDP9wYMR3K8GCw6PWvkqe3 +w7Wnf48k/pzO8FGRBTptp+qX7ffHhjRho6RJuMXTtDgRYrfY7m2UFzN9Gn4pfzJg9E/ HYBm2H17KDUmw8GOMzyi7WoNRigIKaBhr5bGnpVZ3iJRL0eo/O9oWScVXqUQsLwvFV1N wXqw== X-Gm-Message-State: AOAM531HP+obZf8rj6ltaZ67EV/u1pGEOvSeViNVN4wtnIOQGlKEgwxx PqduuGQZCdiry7yIXCV3MKX5BW3jhb371g== X-Received: by 2002:a05:6a00:810:b029:301:f08c:6b0d with SMTP id m16-20020a056a000810b0290301f08c6b0dmr7830708pfk.8.1624239289106; Sun, 20 Jun 2021 18:34:49 -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 14/26] target/mips: Fix missing else in gen_goto_tb Date: Sun, 20 Jun 2021 18:34:27 -0700 Message-Id: <20210621013439.1791385-15-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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Do not emit dead code for the singlestep_enabled case, after having exited the TB with a debug exception. Cc: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/mips/tcg/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index d59986b340..99827ee740 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -5030,8 +5030,9 @@ static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) if (ctx->base.singlestep_enabled) { save_cpu_state(ctx, 0); gen_helper_raise_exception_debug(cpu_env); + } else { + tcg_gen_lookup_and_goto_ptr(); } - tcg_gen_lookup_and_goto_ptr(); } } From patchwork Mon Jun 21 01:34:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464474 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2114050jao; Sun, 20 Jun 2021 18:40:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN/KUMd6+KxWqhuAGGqNprjTOWaIHnVQaUMO3eqLRy8t+KgqEHvuvsvR+oQ6LlKT3HWnLE X-Received: by 2002:a92:364f:: with SMTP id d15mr16629812ilf.26.1624239643684; Sun, 20 Jun 2021 18:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239643; cv=none; d=google.com; s=arc-20160816; b=tP0nxPHIrfvW6YNuJf4cxgIu/IpMADzxplXXpKoJX4wjjaKP8oKZPMBUpiWOUhM0bs s94x2yRfEUjDcaYQQtRTmUs9piSxMwctxWaW7+h++bgz7xKCUnGLh4bq41IsuV7xHLzY qbSWStlhvX0hUFADSARPaYQ6PKwAdOo1hgGUt0b2QjoP7KsLwsOdSFlPqYfuatQznd0R /QulOsqV3aGH3b4w/ANbtGlO5Sf9w2b77OsnrJz1NiSIy0aCQZUbLs/cfpGnkFSYvamF QL/AGhSwegPJV3BMfuRtKQVsEEw42wJh7B5nv+DXluBnGUhU6BAJ2C5JlGsDAudHnzv/ 7HaQ== 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=y+A+nkJp2mLCVWp/nN9qk7znE4gchviqhiQyiO9wFNI=; b=R87gPSVkwOf4cu3tt1Ac5towECjw3d6JjjU+tMuCx4m15tWkh0FIgz6uOrAnChsTh/ BnzSqB54CkSg7XXUuPglELW02glolJnl1w1fHCfSbuBJJgYdY8iEcu4S4reeTr7muSXd pHsO4fBJL8VGpYlAItTwVCameXloMCVKGWZQYvylMKi/vJzegRQEfrzEb0x9mvbeYHdD ZYHH+SgAfNjmnPDc55iYjA82T8d2AAXjBD58ypKcklL9sPkzD5HSkmbKM+UxsAWdRM+p 3Mraaxmi+CJbgXmCA2gHuCt1Jt9TDAfC2cfN5GNqlhKy4g4HT13tHlvITwqoOFxaokpC M4Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eEPW0PV6; 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 z8si18126650jao.3.2021.06.20.18.40.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:40:43 -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=eEPW0PV6; 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]:52810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8vb-00079M-5W for patch@linaro.org; Sun, 20 Jun 2021 21:40:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8q5-0003tn-Hc for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:03 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:35416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pv-0005Cd-Ct for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:01 -0400 Received: by mail-pf1-x430.google.com with SMTP id t32so1055498pfg.2 for ; Sun, 20 Jun 2021 18:34:50 -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=y+A+nkJp2mLCVWp/nN9qk7znE4gchviqhiQyiO9wFNI=; b=eEPW0PV6a78eUSDanE2/wuTEz1mk/7zCcpdaOFY7DuejgymgV6+AGycj6fweELofWm 5jvCqEXx7M3xsa6DO8+2KzzeuaxIfv20n45aE0b90a4MZSoLglwjFbBoysh5c5rdeCSR oaCxblSXly5vhn7FgRP9rzEyZuPtws1GAas8Ps5FwD5oWJx+umk27ZqJiVPUyeDY4mqJ ggikpKsx/ZZoCebnbeYrKj9LwqBvJPlq4r7EKTENTEJ8cmIZ2TfwCPBI49In71UGl7tb Ol50oTGm/afTouVQ5/iYyEtPIVWV4Te+m9jlTMwg6BhGXiKqZ7TCJIC4D8DNQTuXjxbT MHDg== 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=y+A+nkJp2mLCVWp/nN9qk7znE4gchviqhiQyiO9wFNI=; b=c2qx49K8d8TYCzwvX3RtbCcEWZ8ou3kFnj7oDk1svs4iwKzG0WGjmr0gAu6VJCjrfV PotKUZ8r2wvAv08aw3YF+e6IUOJLsOAUTp1x+ij9IkcNIZbkYCfK9q2bMJ+UAZBaGGhV I9ynNpfBQLSvMKqDw9QCTWavtU5PBcUNpkK0mMyf3tT2F+sFWZzsRiOGTHX1pRcv9hur HtYgKNm3613gWOaSZ+9d10PI1OKwJqvUpW6DGMFkbvS/r80y/UQvzpgsENlb5dZL1JDd 4JgS3VHMPUyRFNzXBEfxx1HAC46jxcu72w/RePqOXJ1TpT2BtD/uBAzy4urYiPUBJkdF J4yQ== X-Gm-Message-State: AOAM531uPTZZS+2G7kyHSVhZb045L3S0gfiBak/JtMHBjPfqmVtWG1eq 7EFS2WeJYkuYDPL+zuiqUA17kFXmAb1mLg== X-Received: by 2002:a63:5fc5:: with SMTP id t188mr13033677pgb.10.1624239289727; Sun, 20 Jun 2021 18:34:49 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 15/26] target/nios2: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:28 -0700 Message-Id: <20210621013439.1791385-16-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::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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: Marek Vasut , Chris Wulff 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: Chris Wulff Cc: Marek Vasut Signed-off-by: Richard Henderson --- target/nios2/translate.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) -- 2.25.1 diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 276643cee0..2e2c83f3ad 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -150,24 +150,11 @@ static void t_gen_helper_raise_exception(DisasContext *dc, dc->base.is_jmp = DISAS_NORETURN; } -static bool use_goto_tb(DisasContext *dc, uint32_t dest) -{ - if (unlikely(dc->base.singlestep_enabled)) { - return false; - } - -#ifndef CONFIG_USER_ONLY - return (dc->base.pc_first & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif -} - static void gen_goto_tb(DisasContext *dc, int n, uint32_t dest) { const TranslationBlock *tb = dc->base.tb; - if (use_goto_tb(dc, dest)) { + if (translator_use_goto_tb(&dc->base, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_tl(cpu_R[R_PC], dest); tcg_gen_exit_tb(tb, n); From patchwork Mon Jun 21 01:34:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464485 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2118256jao; Sun, 20 Jun 2021 18:48:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlYFQht9r1iPchRAVZaUzLGliu/gLDDZQrW3A5zvbgWjsY/VsgmqDBK60QAu/R8e6uDaBa X-Received: by 2002:a02:9f12:: with SMTP id z18mr15230678jal.54.1624240133751; Sun, 20 Jun 2021 18:48:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240133; cv=none; d=google.com; s=arc-20160816; b=vsF3WfUyEtRc4c00+TMUwykvsgF0QnPPtT4+DPzN+Giag2kq+71y/4e++4z/y34+Fs mhqn83Gike/HQ7uIQCqJlQS2FeuSW14S7xfeIzqFzx6FDH4MZ+4AU15bCRRvHsTZq7/L 05VzkGtWvRjiBR7Y18RD3QWsgIqYwcqRN4jMhAOZunubjxKmBqqdfxcuUkvk9M0QnxTf WfkAoqdkG4ILpSLc/UzVZzzSw76f+u2szSHBdLUhJkfmsWR03uNEDeIAu08/xbnAWLDV d6j4gXgB2ZX3WR0+aizpGbf2eneAJePONQTyr8zWKgTpTubOU7qfTFlaeUqzaw2P35OX 6BdA== 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=zAnCrHtff6jPTMINAA/XQ8amtOalFE7ZmPKzxH7D+ug=; b=KbjK1P5/SdvcO/UBp9Bk9R0oLK75uhQedZZe5z65XhvpAyykczk7+SaoPqxdlSj1Z5 pq+KaMxnDr5YoodfL/lpsNmXUQBVNciy0O9KT/0DRVE+IV29X9ZajyyXQgUyuYb0GvjK ISWCKkNWW3RSeqNAoxHN2ntvTDZIR7JmU/t0u1j4keQJTNaVWFM86F6jV7TEFRvc8/N7 pxVAVss4r1UoGm12JUgkPZYeZvOu+Lmq3Y6w3Td1hKcqj2TxyFg16NMB7R8LATJ/lkXo m2FUyLIvrXaVXirh7R4efV4B9a6z+udmUMes+9Jlbl2oRWOAvs7mDwxrpE4WYlbewGvi LNNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DQX6H5NH; 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 b6si9502777ile.24.2021.06.20.18.48.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:48:53 -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=DQX6H5NH; 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]:51156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv93V-00009w-7l for patch@linaro.org; Sun, 20 Jun 2021 21:48:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qC-00041R-Ch for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:08 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:42580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pw-0005Cz-5G for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:07 -0400 Received: by mail-pf1-x42c.google.com with SMTP id y4so5415847pfi.9 for ; Sun, 20 Jun 2021 18:34:51 -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=zAnCrHtff6jPTMINAA/XQ8amtOalFE7ZmPKzxH7D+ug=; b=DQX6H5NH4cdN8kyse3Yo0cyN0dcwF7TEuK4vsiLjL46JHZkD6OuwtGEq1qnMQDeZGW SFvRGpZdgc44acLwZMrkVlUBQG4+nA8dFo76b/GmPqcm16xqbf2ihM+m8ZUqEuaQURGP 0FPCme85EE6jeq9gpndi990EUydGqkK+ZXGu6WIfbGfAi/XQeaNQbo5isBDCGqFSzanL l9K8fxV+35mGlTfuU3FQDDmpidSDFyEc6KBUY8KL6db3v/MbsEaSmoMyITJp6lGIKUKR 6xIJFW4Jf30+b+Y9HdVGpmuYtEmTnwq4l9kT7h9oe/WjPb0jsMDhfhrq+f+856dYEsL2 wXdg== 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=zAnCrHtff6jPTMINAA/XQ8amtOalFE7ZmPKzxH7D+ug=; b=mTxznlGGOyLCCPpPhr5Wzb+YJs8TVeZwFW0x2+FQgznj+GyY0WQB/OLat6a+LDXTBF cxs2ToehLPP6a6HcP/YbTyvI2QVy6NnBy959ZZ9mJFRJOtf7onPyTqQKt9gNHMBQIIzU rDtNeoDqnuj6zB9JC1LRNJKlx9DsivsMQHSmgGLQDmyeHBcb4CHJSQXNpkJJRbZAHqco b47mg84lf48B7+wjHUsBCrW0MC40SgCREMgW7GrZGndVHiVH4DpHac9FoS2rV2oQgGVk qXaIc5BB93okEIgRb144hVlzmu/j+L5C7Pfb5VY/KL6TsDcxOAqcJNGsqs6skexZRkSc /fTQ== X-Gm-Message-State: AOAM531uG9wLeT1nvSFszdDfYm3jTetlub/19AhtZY06XYVU5AuwTITO Eg41CvN47P1YwpRW0/c4PUm2KYqNW8BkqA== X-Received: by 2002:a62:9203:0:b029:2f1:e21a:c545 with SMTP id o3-20020a6292030000b02902f1e21ac545mr16815929pfd.60.1624239290347; Sun, 20 Jun 2021 18:34:50 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 16/26] target/openrisc: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:29 -0700 Message-Id: <20210621013439.1791385-17-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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=unavailable 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: Stafford Horne Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reorder the cases in openrisc_tr_tb_stop to make this easier to read. Cc: Stafford Horne Signed-off-by: Richard Henderson --- target/openrisc/translate.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index a9c81f8bd5..2d142d8577 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1720,16 +1720,17 @@ static void openrisc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) /* fallthru */ case DISAS_TOO_MANY: - if (unlikely(dc->base.singlestep_enabled)) { - tcg_gen_movi_tl(cpu_pc, jmp_dest); - gen_exception(dc, EXCP_DEBUG); - } else if ((dc->base.pc_first ^ jmp_dest) & TARGET_PAGE_MASK) { - tcg_gen_movi_tl(cpu_pc, jmp_dest); - tcg_gen_lookup_and_goto_ptr(); - } else { + if (translator_use_goto_tb(&dc->base, jmp_dest)) { tcg_gen_goto_tb(0); tcg_gen_movi_tl(cpu_pc, jmp_dest); tcg_gen_exit_tb(dc->base.tb, 0); + break; + } + tcg_gen_movi_tl(cpu_pc, jmp_dest); + if (unlikely(dc->base.singlestep_enabled)) { + gen_exception(dc, EXCP_DEBUG); + } else { + tcg_gen_lookup_and_goto_ptr(); } break; From patchwork Mon Jun 21 01:34:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464482 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2117437jao; Sun, 20 Jun 2021 18:47:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8ubVNnCnXTYxqot5lHZmYyaommGQIcSYST+yA7VqEctuCmjk/ZxEYGDxY6GJhm3VkUWeq X-Received: by 2002:a92:c98a:: with SMTP id y10mr7194262iln.226.1624240038323; Sun, 20 Jun 2021 18:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240038; cv=none; d=google.com; s=arc-20160816; b=E00qq0YQD0wcdF8UoA6rvwo/vGV5eEFvS56A7Zk1Hl+4tM4Ahe6u1c9U1wZDeKAHoo wfXbe+ARjT3EaIdr/6ap7In/LQGCBeZ1nf+IwGaOGfSxV2TkwqPSSDOEHOYrL7w19u+y a+x9SMiSMrgw53NOvCZ3XpulhFuIZu1aArP4pMjLidtjc+i6jH8mgvz9s8iMCeNNbmsK zBJF2FXugo3tZ1eUKPqPty24/YKZxOtgf17P83osXDw6i8NAbyVGGd2QbRuZUelH5CPB Vcfnx+wyp4PISSEpOkXMqDp/eHBR9oZjqNJbMjuYgH2yvFQ35ljtdXj0TVPMliLiMDcx ffOQ== 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=PwYY5dSeWSmGGmBhQNMUtGlmdzOhLZK9MJXdyKrBIlg=; b=VyiW/Z8nm0XvKAFr0Sc0zn6vpnbM8cDbKb31k3CZPyHNaMkUiBrR1Kegih8kNQmPA4 4rS47ZVr/IVndIeZsXUh6JDkXumcPay69YH8TvTZ20XHtgJFs2GT5TNHchmzQupCHC+t yJvMi0fhJ4o+Ti15mG7HzQmjUK7e8d6eVqzIW8FR0yIyWsEjLGbvXhVB5f8x/IJi3X7H o/o8QvXtiVWiidw6Jv9aYBAUzAvf0NXciDV2n9OOSq+eEenigyEkml5oL/xMM8NfdSUI 90cI66z2LjIpA74xp3cFA2UPu/yQMhjE4phFD6PPSr1zhoLtUu/MpcPhH1hSzHMIT8R0 1Nyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Wbm4H0Vz; 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 t44si17428475jal.72.2021.06.20.18.47.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:47:18 -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=Wbm4H0Vz; 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]:44892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv91x-0004LB-Pg for patch@linaro.org; Sun, 20 Jun 2021 21:47:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qB-0003zL-63 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:07 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:46713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pw-0005DX-5W for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:06 -0400 Received: by mail-pg1-x536.google.com with SMTP id n12so4084344pgs.13 for ; Sun, 20 Jun 2021 18:34:51 -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=PwYY5dSeWSmGGmBhQNMUtGlmdzOhLZK9MJXdyKrBIlg=; b=Wbm4H0VzQw11w3Vq0kX838OumjE6H4WhVGjVWwnW2cyh4ZVch9vgj/GqfqyqQqbsiM WjT6Fjhy2jSJ+URdpvdh0JWjSZ6R/m9xETSzeXMoFH3ySaT+Fk+an+E6LP86o12DJPYJ wEAJvQQyJn4m7Ap4IWIIYZpjXGtDTMUx9cXli5OpCUdZTlJNyFaWyU0/zvsA2L3N7JY1 nQexC+dugIgb8Qf2nlM3nKTG9KEowVnpqQ54Y6KQhnauKvlHN0thIhQRbB5T2dKKLTiP it5iZFaiW+Pl3l0HkCYh9nAi8qYECL31s9uBgS/JeDNLY5gvnazcoMD6uFjH/mlg2Bmv ALEA== 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=PwYY5dSeWSmGGmBhQNMUtGlmdzOhLZK9MJXdyKrBIlg=; b=HjsDhGMpoMeqCGoAH7vtg+nSdKRdzjxXOcBWQrAqrn4Yq7Abw5v5+ijlJrStwY5/T/ 2we0fHwMT1/alDMJjbNKE0qOA/HWtgk8CYZXO127nzizVkPsre5VVbNTI3QUPP+Lo7h0 sslDxBhcPcoseTc79RFcoiJ9N/Xe/+APdUIo5ghqzULLJxMpNjS8Bpu8h31IRWdrZ8Y+ xBeicP6sa/qnd0dhdTH000sF3EQMrwakj1m4r5Gt6/vVaohXu9EedBu1J/hhfPtXM12f bn1JmL1754/46aZsfDhNtIS47znFgH+85stKrYBmyNGPvhRep4b77Itn+sDYuepHG1TW +jSg== X-Gm-Message-State: AOAM530+ZyPorz9Q39Dvrw/717us9rI1lnLH+N6y4/Q5YJWJoMOq7NDG EvbPpBsAqYbZAvbE61XcGOJnXrbbUB2ADA== X-Received: by 2002:a65:438c:: with SMTP id m12mr21743183pgp.425.1624239290794; Sun, 20 Jun 2021 18:34:50 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 17/26] target/ppc: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:30 -0700 Message-Id: <20210621013439.1791385-18-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::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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: David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: David Gibson Signed-off-by: Richard Henderson --- target/ppc/translate.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) -- 2.25.1 Reviewed-by: Luis Pires diff --git a/target/ppc/translate.c b/target/ppc/translate.c index f65d1e81ea..0fb09f2301 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -4302,15 +4302,7 @@ static inline void gen_update_cfar(DisasContext *ctx, target_ulong nip) static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) { - if (unlikely(ctx->singlestep_enabled)) { - return false; - } - -#ifndef CONFIG_USER_ONLY - return (ctx->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif + return translator_use_goto_tb(&ctx->base, dest); } static void gen_lookup_and_goto_ptr(DisasContext *ctx) From patchwork Mon Jun 21 01:34:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464483 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2117851jao; Sun, 20 Jun 2021 18:48:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySkG/2kbk8P/+mKe9/bnMW88Lyb1zxDn7KLH9DVTGX275h7PnJ4WKHPLXiAbaeYhz99waq X-Received: by 2002:ac8:505a:: with SMTP id h26mr21775626qtm.225.1624240084038; Sun, 20 Jun 2021 18:48:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240084; cv=none; d=google.com; s=arc-20160816; b=nweX1IXA2VVnry9Y49FAwsp95dYooRtuIWl5+EiIyMtlRNG1Idp9GIORlJWq42BWNI Mpf3yL1U88zJKbNL5DJYQ7hjslt4cGPdIaExozD0jzfiHqZ6wpMj5tw+TIN5rC29h7hW a6Pj4TDA+e5a1wEo8prNUgF8pzxJcYtV5p2cikByup+p+5JPomApkKU3nJwif9VXu4sG HRHFs42R8ue+sqk6O+BeQ+E6i9Xq8h+TMIbOAop8ZQIgJ7j61zUgiKLK5lRxLq+pc/5j K41yNVhER+NGtgQO8BE9JOknYJyPkNPvhCHXXWtM8OiUH2L2BeZ2lTN2ED6i5OCzR2hx 8OmA== 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=O6AUcaQKGYp2fnjEQWNm+lyORkEWoJzEefRINwnH5dY=; b=toExmkfIpHFXFdiTP2lJY2gEtY6BTHA/QXtbWh9aGITJfi3ya5Ae6eXKVCi0UeSgAk DvPPATOvZTFCNdmJIjU2OIpz6kceZwuYu4ngasdRJnBsx9NRIp39Td/HHxg8c5mZAWgE a6nvKb0Mz04NzA3aVrfkEEw5U4CbExDf8m9PdOBQ49v4u8gHsldPtDdZBT99kQYY2oL2 zthJYKax/Hptx6NKKWslQ4JU37WcJseqfvILWFt2XFAZ8sDuii3OipreBUA0wlN5/eWx dv/ddwSHZDJ3dfmdUBigXETplGSHuVAKueyUCcY1/XKaUJkbmhF8uNdoG7rXBg5yePT2 inwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u3xxZLSc; 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 8si15318803qtr.394.2021.06.20.18.48.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:48:04 -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=u3xxZLSc; 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]:45372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv92h-0004fV-Ea for patch@linaro.org; Sun, 20 Jun 2021 21:48:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qD-00045B-DI for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:09 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:38604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pw-0005Dj-Iz for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:09 -0400 Received: by mail-pg1-x529.google.com with SMTP id h4so1303296pgp.5 for ; Sun, 20 Jun 2021 18:34:52 -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=O6AUcaQKGYp2fnjEQWNm+lyORkEWoJzEefRINwnH5dY=; b=u3xxZLScRlSx0Ro0I4YZJHaWX2MDKXN2uW7NENwfTZJofE1oDD1iwRRdEtsMD/5F6K aynU7r+1RTs63pw7s6vnwzvhRQYlijyW+x3clSgpHWzM14py2b5Sdly7She0wgnCVH1C O6Tt6dD0ajTcgPi9DKrTlpNoI8Fgo43VnPOpMZXEDw7mghtBe1iV1rO2aoU9AZl3Us2R 4BZkJaxLYAvvkTOx3B3ZV5qkuWpQaAi56ExDZmbdZxnkybQQ/CzCgqDWKrUVmCMRkIXl 1SiptWZp5IuGOPSiXHPz+M0JdCEn87lilNgrRWJRiDvrNrcCd7KJoy+NduzN+EQo+Uq1 6mmA== 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=O6AUcaQKGYp2fnjEQWNm+lyORkEWoJzEefRINwnH5dY=; b=ENO6BHVqCpJmTHEqlxn2SfMPdnGlBrO6+xiTnQEv3bh8qNEu6hav+CcjJ8O+La9ZQU Xhkv2PvB0IbJiSXwNaci3aYQOoCsE8z5Ri5xgLNneioQI5/XYuRcwUc35p/3809WG/fJ nNtUqHCuhtun5wmh6MuekhRtL3bpzA4QYEzPwVgjMOfHGXE3yMhjB93t/hAPP2+Tr47Q Mtai/+Okh7W3ZoLFVwjJcLCDdKqkNk2wWsFTGC3SwS6jMcQ2v+87OMDRi3n94nIo+n0/ iS3aKFp4D5XYMDSFiFV2e1T3tbQI09N+06eKW+hEFpucOV4Jo2NdoX5Iq1EcWlUm3OMt Z36Q== X-Gm-Message-State: AOAM5324BOQGItk/1VJnbgQT+qyvG0dGlDemd0/LrTa4Ohv9iV72jEv1 mYeU870/5dC7TrpnMMqlp0ibs8wL5k69gg== X-Received: by 2002:a63:ff20:: with SMTP id k32mr21772363pgi.82.1624239291358; Sun, 20 Jun 2021 18:34:51 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 18/26] target/riscv: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:31 -0700 Message-Id: <20210621013439.1791385-19-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::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=unavailable 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: qemu-riscv@nongnu.org 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: qemu-riscv@nongnu.org Signed-off-by: Richard Henderson --- target/riscv/translate.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) -- 2.25.1 Reviewed-by: Alistair Francis diff --git a/target/riscv/translate.c b/target/riscv/translate.c index c6e8739614..ecd3764338 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -168,29 +168,11 @@ static void gen_exception_inst_addr_mis(DisasContext *ctx) generate_exception_mtval(ctx, RISCV_EXCP_INST_ADDR_MIS); } -static inline bool use_goto_tb(DisasContext *ctx, 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 void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) { - if (use_goto_tb(ctx, dest)) { - /* chaining is only allowed when the jump is to the same page */ + if (translator_use_goto_tb(&ctx->base, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_tl(cpu_pc, dest); - - /* No need to check for single stepping here as use_goto_tb() will - * return false in case of single stepping. - */ tcg_gen_exit_tb(ctx->base.tb, n); } else { tcg_gen_movi_tl(cpu_pc, dest); From patchwork Mon Jun 21 01:34:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464490 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2120964jao; Sun, 20 Jun 2021 18:54:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxL3sRc/wXmDN0/b4lcBaABWqJIq4YOYPDzdX7pPLi7dXhLCVf4rG9m7PTKR1caH8zsdlfR X-Received: by 2002:a5d:960b:: with SMTP id w11mr18142109iol.138.1624240466604; Sun, 20 Jun 2021 18:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240466; cv=none; d=google.com; s=arc-20160816; b=QJidq1gL9oWFL1ZDNH0oxNzn2xaoG5aa3fjep3WyICA+9zP6vobbnjyA1jyzozV2rO mnAkIm2b7uEBWen09bTFcTIlPqaSFf7hmCi7ynkFDXNubXg9wjuFzQkAPnhyQ+qQPOQ1 JGdvfE9423j9Mp0dr86nYw0P8TGCnbDccq67LMvP+r1O5OCk4chqLnlKIzyoydfcLTe+ 8P92DPjjaiS+jLFgzOMaPjNBJQTV0foDN59i1bEZ8fc7slb4qqN+rhxiKix9VOow/90l Y3OT9J6Q8ohDbTyetwY7dFSZ4tYQP/+2l2rORwch/exCFcouzJk4B6hWugT4RBOLDFuU uyow== 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=W7Bf8v32MRSYl5delt6pF1CYpdgvOX/1OeFQMhwwhYo=; b=HvDA44nQMEPCNQakm1cg7nvdVmteVAv0bhox+18fF5WBSouYpxrM0Cq5m3BiLQ8yIf gJX5EN80NrcbwZtZibKDTOPekzGRCQ9rkhKSVo3tC0j+HmYIjZCxgbihVeYPtQLPiPw8 1qSGtFA1pAaOcR6SkwTQlJHP1dGJgFvFOZnR/nLrTouwZ4FQT7llxlvHVffiPQKXzSH7 Daja7xYCpgoQWsisHUO+HNlek2bRR6p8xZk/B1l5JmegaMMtP95FKTVy4jz7K5rQs41i nd5rNE5R3EZULOhGVmg4MI78Jh3vEU1NWIHVjFvBvFlC0flXjGjSrCXMM8IpV6qr/8I9 LTSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uPo1F653; 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 p14si13305208ils.62.2021.06.20.18.54.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:54:26 -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=uPo1F653; 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]:35646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv98s-0000W3-11 for patch@linaro.org; Sun, 20 Jun 2021 21:54:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qH-0004IH-HY for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:13 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:41817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8py-0005E0-BH for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:13 -0400 Received: by mail-pg1-x52b.google.com with SMTP id u190so8992393pgd.8 for ; Sun, 20 Jun 2021 18:34:52 -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=W7Bf8v32MRSYl5delt6pF1CYpdgvOX/1OeFQMhwwhYo=; b=uPo1F653pu/v64dvBtaGFaYvjNeszL19xjF1FfzQG11B6Kh45t6gXWecaco/YQQKuf 3BCwYNAm53dsCmz47JDp4E4Njo2dYmRcLVHr/BNivtmC94WJKdTGN9ibrPrp1336jSkf MddRReDTEH+aahsLJB88H9XWC3ghItCVI9hjSnzmlUOkK6KlNJtnxzK6vP+Wn6E0NfPU n8Ehl5o7O33Ak8dIV8i0Rnslfr/N9+Zr2w0m+GAcRPWDWkTAZ/vxcLfGoYAY9Toy5/jl rC+MKhszn0pGpLaVTaxVliNsMdNi5+nK5y0xZav6oYaFxPTZGV3Mb+EVMKFdNdXwTCS7 a9zQ== 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=W7Bf8v32MRSYl5delt6pF1CYpdgvOX/1OeFQMhwwhYo=; b=Ae50Xj2ry5o6WV55y3ydm6ExVzyRbAIEgizkOMBqzgYcuEiqzl8nLXujYiRDGYsBhM qJ7o5nKu+trAV+MA6myMZTXFfEQToz0+s8Mnfg0DP1KUbj8EKIYoHaMK0mH+Ax5m30et a4uGxn9FNU5AqadPYBsTLBLNIKtl0sPfwPdYpr8PpWlzJ0f97hiZv7sByuc9Fr4bdMaH /I60qZMa3T2mZ2fQ8J6UAdJqFEyEScZSSzhKie3s/fImWnScLdwhVCjaXeiNSeGC6ZpH UtC/MiVOKOCO54RA9w8ZlQALUlQ7Cx0nRL+4zlE4H+5508u1SyWB33S2CeiPdqlbyUe1 BgcQ== X-Gm-Message-State: AOAM530SY+csZBEGGKq+wdoiM1aWBRs1Te0fTHGCqasHHTM4wob/7604 rXbwaF2tLu6cW5uHgN4FL1zaOZSdqq8SGw== X-Received: by 2002:a63:f19:: with SMTP id e25mr19190574pgl.278.1624239291985; Sun, 20 Jun 2021 18:34:51 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 19/26] target/rx: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:32 -0700 Message-Id: <20210621013439.1791385-20-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::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.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: Yoshinori Sato 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: Yoshinori Sato Signed-off-by: Richard Henderson --- target/rx/translate.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) -- 2.25.1 diff --git a/target/rx/translate.c b/target/rx/translate.c index 9ea941c630..2443406de5 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -143,18 +143,9 @@ void rx_cpu_dump_state(CPUState *cs, FILE *f, int flags) } } -static bool use_goto_tb(DisasContext *dc, target_ulong dest) -{ - if (unlikely(dc->base.singlestep_enabled)) { - return false; - } else { - return true; - } -} - static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) { - if (use_goto_tb(dc, dest)) { + if (translator_use_goto_tb(&dc->base, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(cpu_pc, dest); tcg_gen_exit_tb(dc->base.tb, n); From patchwork Mon Jun 21 01:34:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464480 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2116799jao; Sun, 20 Jun 2021 18:45:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztIO29ABqzHsIe8U5BxacqGa/rZaqjcycs+eUimpz943S905XHSz06kkfQyxgUMwjiyoVM X-Received: by 2002:ae9:d60b:: with SMTP id r11mr21039905qkk.259.1624239958949; Sun, 20 Jun 2021 18:45:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239958; cv=none; d=google.com; s=arc-20160816; b=SMRFbkxjGbHqA/1WtgY/RMMV4ic0zBarIK3Q/vgt9bcmuKj0DLJ7o0338eEgnUm1Am u/q0y+N61WCaLCXbi5MVJTYlcPEajuF9zKHkzM9UyKw85udhSjYNDhMb05fSTmUiQqzm Kk0Hh1V5uFAqB03RugyBwzJuIanpnAjTTbT+JFMth80eYMCDzbbOmXbVj4sl6s0XR7+4 V8mOBScy/VgMkpOF/119/nt+yw9PqehfEAlJxK3ZDmxDDGwvxYWH+eZZddy0buB1NS76 Aer2xczoGvr3dtZv1+SCT5Jbnc1Mu9dVEruam9oJV0+TOMZ425a6iEQycHERRdT4RmCt 9Jmg== 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=/XHDjw4MYlw4TzcceGLn/7Fa6hqyEFYWUnUbqhZR8HE=; b=dDVYF1bdt0LoyUuXi/qGXTZ80xWLYnZ+vKzuNg7/jkJwIBW2P8oZoPbgimLGwWyPeD 16abRIYkmhjDqwKYEwOKRqyF4mBP3J9FySeiLhn6zTsUgxzwohISLZW8vaHDgDFtDg0T EdzGXxzAMOIIwegof7MzUI0PtTJ4C2od5z3+BpVsKW471Cy6SA04kQ2c9ZT6feMkNofR afgsGDvhiya4opeg4NgCYnNohnqq5C5w0SF4lYkrN9q+iSAUVBrqvaiQUXYq9O5/3DRs eKFgL+yrs0hd2gIZOWhdLRB8FFCy8+hLyEBp0ji1tbXxT94O/xnqQbSQ/hEmidunVnOk NHRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dg8cqfzr; 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 p19si1306513qtx.270.2021.06.20.18.45.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:45:58 -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=Dg8cqfzr; 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]:39158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv90g-0000Iw-BT for patch@linaro.org; Sun, 20 Jun 2021 21:45:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qC-00041i-Eg for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:08 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:35419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8py-0005Eh-BK for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:08 -0400 Received: by mail-pf1-x433.google.com with SMTP id t32so1055567pfg.2 for ; Sun, 20 Jun 2021 18:34:53 -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=/XHDjw4MYlw4TzcceGLn/7Fa6hqyEFYWUnUbqhZR8HE=; b=Dg8cqfzr9Up7ZP3euQObJVampYAhWqPdptpZqslA3J1WAQ2dPJzwuQE5f9yt2KDHux iQy8RWe6nr0wodpdSVVCB0FR7DeoxgUtQpHpZa2nPXSC8+41zEWxpw1hKcig+diCmVqt 1jCw5pUk5BHajfO7W4J+R1N9cyjzgT4vI6HfDWJ8I/emJQhfALFWFMc9/BQXQGUC9Vyf 2/uVCazf9ZDKCoW7VKanKIF+78iYwboPiI+CcS0pOdDeaKlJLUB00M19rjgjjGzLXFvL DKCw13iSQ/EzW6RR5PMPho4qo+iDQRYCNTyvaPubMUMvuYfFRZJM/tSbW1Dah5yhPEwu 3YDg== 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=/XHDjw4MYlw4TzcceGLn/7Fa6hqyEFYWUnUbqhZR8HE=; b=QYbu++cNkHLKoQTEZgXCS8x46+ayht/RLIIWJahHT/Iekv+C8mfhnS8KMJ9pYK5yZg sCNTaawOtvR+Z6bI4cA7+c1AKrCanpGWTVdfX34K7G/IxKzBaHaQWeZATcYJLlSAahQZ 7tETRbvC7TIFFq1WWsf1cmIhmHxTPbOke4xE/2Kn3WhYmC34MQ6poc7godN6evxmo6Pb QoxGjJ2nBBJxhLtL4qj/aD1jrCONT3IunVF3Gn4qUSkm4tTcjgKQ6DHV1x7ZvVM4wq4m tpPIW8K/3y63HQ2vOuVe+R++UapnkEvcJ/x++FkAiO/HeQGtCx8bSvkrVe/aIR2tYy2w C1bg== X-Gm-Message-State: AOAM530AswPFmL4gsocHqnLDiUMRd3d4USB59ymHVZR3rSr0WrC8eppq DQFS7jSlRSKDgzVfegIdAhadz+joE1snlA== X-Received: by 2002:a62:ce4b:0:b029:301:ec00:eed9 with SMTP id y72-20020a62ce4b0000b0290301ec00eed9mr7864906pfg.44.1624239292580; Sun, 20 Jun 2021 18:34:52 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 20/26] target/s390x: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:33 -0700 Message-Id: <20210621013439.1791385-21-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::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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: David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: David Hildenbrand Signed-off-by: Richard Henderson --- target/s390x/translate.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.25.1 diff --git a/target/s390x/translate.c b/target/s390x/translate.c index e243624d2a..4bb5d82a37 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -697,12 +697,7 @@ static bool use_goto_tb(DisasContext *s, uint64_t dest) if (unlikely(use_exit_tb(s))) { return false; } -#ifndef CONFIG_USER_ONLY - return (dest & TARGET_PAGE_MASK) == (s->base.tb->pc & TARGET_PAGE_MASK) || - (dest & TARGET_PAGE_MASK) == (s->base.pc_next & TARGET_PAGE_MASK); -#else - return true; -#endif + return translator_use_goto_tb(&s->base, dest); } static void account_noninline_branch(DisasContext *s, int cc_op) From patchwork Mon Jun 21 01:34:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464488 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2119883jao; Sun, 20 Jun 2021 18:52:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx94sUxBb42LOwTkPu6Dw+SaI6CzFB+csqg5Dabo88Ip0lQ1SQkQe6ymMpT/IxkMceKAKYO X-Received: by 2002:a05:6e02:1d03:: with SMTP id i3mr16279045ila.35.1624240330170; Sun, 20 Jun 2021 18:52:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240330; cv=none; d=google.com; s=arc-20160816; b=KAVEWDeA16JdeOEJHUb3KRY1pzNojkSndKXwhsa6efYpSrN5PhrBzaPtmlj+sCy1Xr bNgA1uDTFj7hF1nbUwFuv/tYMYTwHhBJ3WXi2RmQd+fUZSJAC8vP7cufk4WwRNIFEQY9 z7Qo3ZcB2mVpDnZ+Np5D4yLioYkODmyVZxrnNXPl6T8QE2dC4h86LZR2RWfqH9WaY53P uSET5r0ZUk2kn6cWmkfTfPkDgaE1JWyNwdXfFQJfgCbHxtPhHPLY2z/jMMVuLquag6CK KuvfqJMXUCI02NA5NK518Mp12Ar6Y1WwtW9be60MBzQW2RxtfLN0mkAmRJDcK/Y+RTXH kW7w== 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=fUVtXMvYWuDrfg37hSagY/JJxiueWMrq3me9HN4AB0I=; b=ejMFjpB9rIkO7Bb6J6hzvNGU9fItv61v43DcO1KDwWqlyBTi3u7YtiHh4/fOHcTjpD oXlN4Pyc3lwomJp8p605n9LcyBGDhov4PZJ9xBPQbS6rAeMYO//QDRoTOFeoY3pBBP75 5QqCAri9xkTD2bPGMTkorr38TvT3pLo792Qz17v5cIr0+h2Kg6sAI7GHwP9dIbdKrpQI euyDcHMG1H2l4nVamDf2jDZR95gcuuiV15QAgd4VwYWM5K64xdbewn/85/b0s0qbK9cc dvFw9/6aBYYgdtb4EbAQ/LTZx0Du+OsFu7Wo4P505ZiNiUq52WkNj7qsRxFFZcAg1bE8 8DUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cLNvt2uZ; 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 y7si18210842jae.125.2021.06.20.18.52.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:52:10 -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=cLNvt2uZ; 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]:57446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv96f-0004WU-Kt for patch@linaro.org; Sun, 20 Jun 2021 21:52:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qD-00044e-7Z for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:09 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:34399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8py-0005Eu-Eo for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:08 -0400 Received: by mail-pg1-x52e.google.com with SMTP id g22so12832630pgk.1 for ; Sun, 20 Jun 2021 18:34:54 -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=fUVtXMvYWuDrfg37hSagY/JJxiueWMrq3me9HN4AB0I=; b=cLNvt2uZGegKENyxC2T6NtqoJC2Gmdwna53SKZbJXthaqxrvd1H5y9UtwlThvpSAJp SavL7RtXqq4pRKbb+RMH2pqA8UsJ17Dy5ddEB0CADaC5Se9q5vSPPOkin5ATz0Q3Fxqy TYG5qPG8i22D59wHh6xJLh1UQxcW6F6YbIi3cmsOJQPqOduhaQfQo9jvyTiOdbxtSelI 1E+QwSBkztEyLF469esrtOuey3eTHeQn9FaZyX2fc/RIsHRqzHWqqMLxOBTkzAX7t2gN C1IKQr+omtCu0m7qj94O1cFOMxeE9RtHgULIkx5VGxbP76aj5aGykspzmm6l6Nru/zyp 6u6Q== 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=fUVtXMvYWuDrfg37hSagY/JJxiueWMrq3me9HN4AB0I=; b=lkX7dwAfCXVq5lqsoGf5itKjWp6omKKovCcCEGfvDfBOotKktIYjaYq48rPMDBEipd RSqdepxnINvrugIrcqPYFHCbJzRLZjrDFKSk4lgNgO9PfzwgWzGYNARGop0GkFfwH9up adeEPmfUKGhnvlxbbY7e/T7GphOvLM5y31q7tBZTBQKXQ/Vj390WtVkPIyeeklrdJYSg sJn8u1SmRBEO5oTXi3VYpEbB9kOgasquEiBQmqsgQunWmMN6Uw2/zxfi2gbkZLhy9EaD ae9GfeIm7pmNFNNuDbvg6Af7hqKAUDMy6n1wu0i7OfYIHyEjFpVHI+So7j3Y357O38c1 5B/A== X-Gm-Message-State: AOAM530hIyDhpH4s3BwYuKoynFa0LQtIV6v/vXOrpsdu/yCUrPUSOIyr oOVg+Lw9gizHw05BTEk7TuaH5jc9ENdOow== X-Received: by 2002:a63:2011:: with SMTP id g17mr21520113pgg.195.1624239293202; Sun, 20 Jun 2021 18:34:53 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 21/26] target/s390x: Remove use_exit_tb Date: Sun, 20 Jun 2021 18:34:34 -0700 Message-Id: <20210621013439.1791385-22-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::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.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: David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have not needed to end a TB for I/O since ba3e7926691 ("icount: clean up cpu_can_io at the entry to the block"). In use_goto_tb, the check for singlestep_enabled is in the generic translator_use_goto_tb. In s390x_tr_tb_stop, the check for singlestep_enabled is in the preceeding do_debug test. Which leaves only FLAG_MASK_PER: fold that test alone into the two callers of use_exit tb. Cc: David Hildenbrand Signed-off-by: Richard Henderson --- target/s390x/translate.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 2.25.1 diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 4bb5d82a37..de7d846461 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -685,16 +685,9 @@ static void gen_op_calc_cc(DisasContext *s) set_cc_static(s); } -static bool use_exit_tb(DisasContext *s) -{ - return s->base.singlestep_enabled || - (tb_cflags(s->base.tb) & CF_LAST_IO) || - (s->base.tb->flags & FLAG_MASK_PER); -} - static bool use_goto_tb(DisasContext *s, uint64_t dest) { - if (unlikely(use_exit_tb(s))) { + if (unlikely(s->base.tb->flags & FLAG_MASK_PER)) { return false; } return translator_use_goto_tb(&s->base, dest); @@ -6634,7 +6627,7 @@ static void s390x_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) /* Exit the TB, either by raising a debug exception or by return. */ if (dc->do_debug) { gen_exception(EXCP_DEBUG); - } else if (use_exit_tb(dc) || + } else if ((dc->base.tb->flags & FLAG_MASK_PER) || dc->base.is_jmp == DISAS_PC_STALE_NOCHAIN) { tcg_gen_exit_tb(NULL, 0); } else { From patchwork Mon Jun 21 01:34:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464473 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2114045jao; Sun, 20 Jun 2021 18:40:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm3dVHgHk/8JjYZJM6TSi467znu8wbTEqk8Ksa45hk4AsTU/rhIK3bIYyT7F6api8z9NNk X-Received: by 2002:a05:6e02:1aa1:: with SMTP id l1mr459792ilv.141.1624239643417; Sun, 20 Jun 2021 18:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624239643; cv=none; d=google.com; s=arc-20160816; b=XZcl21eCMTeRFUBeLqqPKhD57L7EQvEQEk50hi4+jJb6yhR/meJRGimPd9Izr6rANM vTVQQiFdVqxHNkHxvuYcpMiiGEExKoPVlg9g59/AegEYDpsgP4l8kfFvAKsRNoSG/jn1 s4WaScPb8RqU6MKm38O4FRaDk1A2BqjWDx8K7qd0lfO28EtEKlnZ6pbQgI5NYS5Zs6py SYUfiXPZs78TKZM+nHUpUaqn0XbI0wb7kW5wirYMHpDk4ilxZRu/KQY9DUB5c3zDgAso QtaZxv3Ro+QTRPlgTPElJcXa4XMd2pOHvefVHcjsq+pTXvID0waD/z8JOjvDhZ1pqvJ7 ioBQ== 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=QjJQaVk4TJcc1Pr+MWyHRIaip7LxYhlzkm4i0kRZ5gY=; b=KO5FYllfiPyF6FopIw39V4rXVm1a7Qve6yKH4YFZkHK0ZnqJ690Q1sptwN77Q/LMKX mNIOoSAdkHTDWeKmOOO3i8alm4QVa5m6Xc2N3BwITgIr44XVKPxoppNsMguw7osWJ5Ar LlL8kzh1BgAgRntEhXkwdkOFxTXUq+M/v3iqC2uNvkHz9fI5h7NKqRcNjLOZFiOBStAN e+XCqbsX+T5RhDzKn6qwL28xd6gjLmHXKNdq27QNilEszmr/riisw0DusoaR75bW1ogG QTMzEYnB93u65AUWrelVPIGWg7YhpegEPAI06DB8xrEJ3ejWVf6taQfVEGF56+Rsvqia 7U+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ym/nxXLJ"; 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 w14si7549672ilg.134.2021.06.20.18.40.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:40:43 -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="ym/nxXLJ"; 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]:52710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv8va-000760-Sn for patch@linaro.org; Sun, 20 Jun 2021 21:40:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qF-00048v-4d for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:11 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:45827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0005Ey-HL for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:10 -0400 Received: by mail-pg1-x536.google.com with SMTP id y14so1403100pgs.12 for ; Sun, 20 Jun 2021 18:34:54 -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=QjJQaVk4TJcc1Pr+MWyHRIaip7LxYhlzkm4i0kRZ5gY=; b=ym/nxXLJLjB5Ns54EzuUTIWA71Iue6fpabWf1s0p8GuguZtVehMawvM3Tvv9jWXRVL IzuiODAIzF74jFjCJucLMjr9w7c1CQJZgpD20aOcGig1+Rzgels36sUcjwn4qlkZ3h2m vxI3XJRXHsvJln8SU4FMkqHvwxEOt3/Gz7TprBxO3CF9+7DEb9bK5Z7U1Jf/lrDlarvO ELaym3xnPN+tsJpJnDlQ63xF5mn6FnqEdoJJVVvbNsfdIKtnsbfHqk4354+1YhtzVkGk VLkIckkZ2JVulsSFzE1lNc+/vxKcYT0yK7+cYP2i4H7CJcWWBRJ3pHJJ3zuv1CkO51SA eNlw== 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=QjJQaVk4TJcc1Pr+MWyHRIaip7LxYhlzkm4i0kRZ5gY=; b=uT63+qykA6Mk9S6pxKgvu2OfB0lb5Abe0N+3RRRUkxOIN2zs54CwJm16n3WZz+dvlk lGfbnlmrPrsLKBXamkRlCGyzD/MgHQrcRMGolCInf11QzxLLb7ur0YcuGdasLQL1E4nI o/QUEZpjUJFEQsW9gzDSDfYBNFRKUBmZKNZbjVRjFzfLJWKC16pxn18XeDIpUGhAaV6n tjJkt4Pts7mRpLcaspTn1b/mbsbyZM6M8D/xF9udrudxcsmSRU1Fb1ssSwGZtZgYflr3 XdY+TRZDJ7wbGDfpNHWLiEEunm02PDC0CRq4dDbKoZgZvoHQDMnx7cETR+BRIFm5SAf/ VG2Q== X-Gm-Message-State: AOAM531EtpFlDfp//8fNDy6oCCzz+U2LU5UDJB1PQ2KMUf5xQyjCE0P+ LJSpk1YgiLKAYqrwbmn5skUiZBxYjmY8jQ== X-Received: by 2002:aa7:9507:0:b029:2df:b6dc:c68c with SMTP id b7-20020aa795070000b02902dfb6dcc68cmr17175056pfp.31.1624239293793; Sun, 20 Jun 2021 18:34:53 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 22/26] target/sh4: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:35 -0700 Message-Id: <20210621013439.1791385-23-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::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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: Yoshinori Sato Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Yoshinori Sato Signed-off-by: Richard Henderson --- target/sh4/translate.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.25.1 diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 9312790623..9ac9bc722e 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -225,17 +225,12 @@ static inline bool use_exit_tb(DisasContext *ctx) return (ctx->tbflags & GUSA_EXCLUSIVE) != 0; } -static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) +static bool use_goto_tb(DisasContext *ctx, target_ulong dest) { - /* Use a direct jump if in same page and singlestep not enabled */ - if (unlikely(ctx->base.singlestep_enabled || use_exit_tb(ctx))) { + if (use_exit_tb(ctx)) { return false; } -#ifndef CONFIG_USER_ONLY - return (ctx->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif + return translator_use_goto_tb(&ctx->base, dest); } static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) From patchwork Mon Jun 21 01:34:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464486 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2118662jao; Sun, 20 Jun 2021 18:49:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/QOw9AqFHN+Hllg8ixUyAjlilOKO933vU9N2wWSis8Lk7Ydy69C0ojyFyPDHnTZ4dWwo9 X-Received: by 2002:a05:6e02:1c85:: with SMTP id w5mr3002171ill.285.1624240179570; Sun, 20 Jun 2021 18:49:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240179; cv=none; d=google.com; s=arc-20160816; b=SAbOb/Nf81I5VU26Up9X3c9NsafQbPKDxCMBEsxEaed5icYM31H8KD62LpNo04mDFF dQRgldAzRRQKbfFlJqvLvpe2XyXYOZeXYlK8+AMuxaGYSG3ElQS/tOglWcXIaPO4L/a7 I4YnyRpQEu7DgNVB2haGDlGoUhoS7LPJ02kT1feqQ+bsgQlMp30/UfG0HlvVcb+a/Khh GugmUSyYDmaQ2aQFrVLxzs8uRs8DL0xE5pdKZw3Ph7U480Fq+UNQoyUz4AJiduWJgP5e AiJqbrNWep+eLirwhvAkMG8f/6cCDbWL4tb2dfrmKcDJmVVSpUlcCE504F7Q4DQGXVHd J8MQ== 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=Q2Ouh73hF0AN8kJMLg+kfMZ9F8C6D2HrVX+Y0FukeRM=; b=lm5k4alu6VfZxr3AIlGsqbxaf4FS72ZnOmldOhTYBmcfcUCOf1NajDrCplbh1+k3J7 yCu9VS9KY3HWYtw7Ez+SjGxKyNE660q5w6IHYFA819hYHeVOp8aNHJiYj34k3Liouq2q okVdPAzjSYuGddMeu8fPNveCVUECEkpVIAzIG6Mts46sV4fH3FOXBLlXdwjUbcEpzJ3I ElGRlitKLeLtQm/b/O/4vq8Nftjs03k5t/WL3WuqtXsLvnriRcvYisHQnTAShDMR6I+U vvVCnJ94h5mqksg19Cq+7b9fV8GSu8a3oo6teWJ8aP5/ZhujY5oldd3JWH6sH/DeVoLL SplA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EcaxYBWR; 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 s13si18147392jat.111.2021.06.20.18.49.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:49:39 -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=EcaxYBWR; 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]:51650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv94F-0000V3-1n for patch@linaro.org; Sun, 20 Jun 2021 21:49:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qF-00049n-Fu for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:11 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:38734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0005F6-Hr for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:11 -0400 Received: by mail-pl1-x629.google.com with SMTP id 69so7651782plc.5 for ; Sun, 20 Jun 2021 18:34:55 -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=Q2Ouh73hF0AN8kJMLg+kfMZ9F8C6D2HrVX+Y0FukeRM=; b=EcaxYBWRyh18mYoxCHXWUA7BGoSb1bRc0HD4P2Yr7aExkjdnVJVbTDi1avkWY1XggQ XgLdh7V06xcjs3Mu0Wa+XWl+Q6OtjN4AbxuDy2Uqa0XURIMc8XjfDsGvsi+EE/bjc0rM Ba34foj5s5EhNz3S7MBSZ9SPAx1wb1NYO50kJn4VcTpeHcKPxrTjs0Jbr6/IbENdhYLx 6sDsJGip5tQ1kwXllS+b0pQDOrHoGGHMozfBlVbTyDlEYZuhNO1girer33hxtIko/iu7 Nsxr3/xKtnvuptx51kj3BI3bvCAvde92c3MsBPxqXuqi6tQbl7kVg+tu1B+vJIT1P4en kajA== 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=Q2Ouh73hF0AN8kJMLg+kfMZ9F8C6D2HrVX+Y0FukeRM=; b=An3BapQUcrvurrPkfrwh87WvCFTovnAsISEZieYGWhWSwTY3PbBQRFGiZFThuKOahV WlFTMetlbudnZYPi8EoJ+ezQtzTcnFNnjwbDoL84zBXZETVh9zBHB9UAqJUFiSyP4r59 n4d+n1eG8P+4+1E6EjkhXzCqItsIwmvkrj75Zn71Y6+SlA8GRjCJnAzhlczwPwwDchLs 7GsHdlpBg4Cmcr5WZwl5570XWYTW2WY79ZVC4/qEF/nDQq5J4ez7sOS7aKLGcZSKhuw4 lBS854w+GFKllYfkyWKr1n1Aou2/BU8u4A00T9yPn4a0l84AHPWKF7YrjpTmvpndlCYM ZxyQ== X-Gm-Message-State: AOAM530w017lU2ofpiFDemfbzlMCr0L4GFnLuSAVsYFrEkV55pv1/Zbb JASGTlQzs22OAPOeC1ENSe7sgn00DGqrFA== X-Received: by 2002:a17:90b:8d:: with SMTP id bb13mr23683552pjb.98.1624239294431; Sun, 20 Jun 2021 18:34:54 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 23/26] target/sparc: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:36 -0700 Message-Id: <20210621013439.1791385-24-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::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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: Mark Cave-Ayland Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Mark Cave-Ayland Signed-off-by: Richard Henderson --- target/sparc/translate.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) -- 2.25.1 Reviewed-by: Mark Cave-Ayland diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 4bfa3179f8..fb0c242606 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -339,23 +339,14 @@ static inline TCGv gen_dest_gpr(DisasContext *dc, int reg) } } -static inline bool use_goto_tb(DisasContext *s, target_ulong pc, - target_ulong npc) +static bool use_goto_tb(DisasContext *s, target_ulong pc, target_ulong npc) { - if (unlikely(s->base.singlestep_enabled || singlestep)) { - return false; - } - -#ifndef CONFIG_USER_ONLY - return (pc & TARGET_PAGE_MASK) == (s->base.tb->pc & TARGET_PAGE_MASK) && - (npc & TARGET_PAGE_MASK) == (s->base.tb->pc & TARGET_PAGE_MASK); -#else - return true; -#endif + return translator_use_goto_tb(&s->base, pc) && + translator_use_goto_tb(&s->base, npc); } -static inline void gen_goto_tb(DisasContext *s, int tb_num, - target_ulong pc, target_ulong npc) +static void gen_goto_tb(DisasContext *s, int tb_num, + target_ulong pc, target_ulong npc) { if (use_goto_tb(s, pc, npc)) { /* jump to same page: we can use a direct jump */ From patchwork Mon Jun 21 01:34:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464489 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2120348jao; Sun, 20 Jun 2021 18:53:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBFWzapqeCBL8s8AwzV3GpR6KaHJTQakGQTpOeJuA8z9j39hQz2VQ4utyFX19pXWfMkwOg X-Received: by 2002:ac8:5e93:: with SMTP id r19mr18690632qtx.96.1624240384847; Sun, 20 Jun 2021 18:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240384; cv=none; d=google.com; s=arc-20160816; b=ghJeW8VwAET5Kx8PFv3p2FOxdPyrf8jzuLc9JBCVpcPRMqKVPYyslo03p6POlXxkb2 a5ezQBFLTdvPvl1yV55I7CBFnvG0JxrHpcTpwKPgymMzf5aJouiD9wSJheIAqXTqqpcT 9d4gBtrJbQtcrAgS46Jod6NTjhnus/9WMw4DAHzST95AQUNLe/VTvGEvXcimipeyvajw MnvyBR0rdjhY19wxCKFVcJ1GqTxL1AAPbMnuTuRv2y3yGnX4JVb3HQhO04p+P0BgjsWB 8bVnE876SpgM6ecnHEKmDI4r+O9P4MyvcK7uArIYv5jrQP6dPKpOL0FaF1KVHe/Ewlrx r2Rw== 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=lVjdPTEZr5bsk/W3c3tDkqvpodiVq7V2WUfItf4iddE=; b=AeeT15gru2tGNpVo0IYCOpBVh/LbU0pOi6JB0BE/EXRtSQ2qvVXUpD2U0JNUEJT+U+ wB0c2wDuuidIANiuvch9zyM0BGIZL0s2tv4A9IgO8xp1uMD9YBW6pmPSCPyg6VWsGPZ8 HKnU3jNZ2YfMggdhWUNNR/26EC6+9De57YvylibgzpeSaj9IbQypHAaTTKpY6TjsfWTs j5e03WKWz2yh5qbud13Jn2Zgejao7VzYFpreLoTiqvYpFsPRTtCF6njQ3cgejNDSr/ij Ql5syUA60COfuuHYk4xaWsPB0KsuW9RIQuu8ENB2HZ3EzvgQYiF3F35I4pypphjkcB6R a8MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DhpBdVEP; 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 y9si13056434qvf.64.2021.06.20.18.53.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:53:04 -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=DhpBdVEP; 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]:33556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv97Y-0007Vk-Ar for patch@linaro.org; Sun, 20 Jun 2021 21:53:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qG-0004ET-L6 for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:12 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:53840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0005Ff-Hl for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:12 -0400 Received: by mail-pj1-x1035.google.com with SMTP id bb20so4806819pjb.3 for ; Sun, 20 Jun 2021 18:34:55 -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=lVjdPTEZr5bsk/W3c3tDkqvpodiVq7V2WUfItf4iddE=; b=DhpBdVEPuUfQKvNhVYbT0h1zGeQqL3RGyCdF4XvAtX7csgnSSOUG+iaYjSpPbZ2ERB HCWxU2wbn0rkh4JLKr/JKk5L0KOVMxK1slc6iNBKv2N2Fx5jZYEaDdF2hCUfI9vuRbUW gJP3w5WqU+4OQZJA87VcYNuD5amugm5jLdDNpYEL3nG7WRcAAvYDoIM54ngh7sF2Df70 e3TfpZ5GdKppyq81HVEu5EHoGoYZJJy+tdSg45wwCXM8+EwBb96pJ3SM5gaiYwqOI987 v1JV16G0RawwgrSUemQHs2iaBG2AyragRXOhKqwO/f6D1aoSS4QuOKobqhLqgqwifsoA Ou8g== 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=lVjdPTEZr5bsk/W3c3tDkqvpodiVq7V2WUfItf4iddE=; b=J3XtoJ7D7KE7ZLDQEhJ+21o8CphC49nqmldEWoU6nNgrNcRFMvTQgblF8G2em4+W4+ EHDH2ypAwCOroJ1qsDMJ6qa1q2F10ZXXqatxT2CJKtAH/idhvE2tO6DoJ2M/68Ary3lN LBcak+mIIgyhVCRacgyK5i+/y3dPkZbClgnuFyAE66wqtHXCGmHniJ//LNu4RiY4t+4D 7YnF+n2iUh6TZX1hNczC0aVPG/7jH0227F5kHElBfjCabTMoFbgco6QLD5qP/DmQUg3H FgI9Si7YqauiPl0MVXeLj//R0OAa6CYhs9bt9gqSMB7flJNz1fWiUDQdCDKQPKSI+Xcj dXvw== X-Gm-Message-State: AOAM532GklcOGCOB3d9TeIovthZAEGxhVbA1708Oj3G64UTJRix0nqrL X2n+ly3xJvnWzppkLy/VOzx7MgDJ/KVN8w== X-Received: by 2002:a17:90a:5401:: with SMTP id z1mr23651272pjh.7.1624239294886; Sun, 20 Jun 2021 18:34:54 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 24/26] target/tricore: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:37 -0700 Message-Id: <20210621013439.1791385-25-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::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.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: Bastian Koppelmann 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: Bastian Koppelmann Signed-off-by: Richard Henderson --- target/tricore/translate.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) -- 2.25.1 Reviewed-by: Bastian Koppelmann diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 2a814263de..09465ea013 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -3225,19 +3225,6 @@ static inline void gen_save_pc(target_ulong pc) tcg_gen_movi_tl(cpu_PC, pc); } -static inline bool use_goto_tb(DisasContext *ctx, 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 void generate_qemu_excp(DisasContext *ctx, int excp) { TCGv_i32 tmp = tcg_const_i32(excp); @@ -3246,9 +3233,9 @@ static void generate_qemu_excp(DisasContext *ctx, int excp) tcg_temp_free(tmp); } -static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) +static 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); From patchwork Mon Jun 21 01:34:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464487 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2119614jao; Sun, 20 Jun 2021 18:51:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoy5XbUoLBqvuBwSw8HtcMAzA0hk0WQZv/1mIXUuMkafMPT6iRt4ScI3L468JwbOnkCuF+ X-Received: by 2002:a92:3004:: with SMTP id x4mr709638ile.269.1624240296806; Sun, 20 Jun 2021 18:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240296; cv=none; d=google.com; s=arc-20160816; b=BXSviGfbZkWzVB9F/jSCohje6SvhAzNXiT+FnzOehJdTjTf/3H0fijhT4dawkNQSVv TD7es1F25bGddE3ePaY4A2ZholsqXuM8qBtlhaWEUcNZogzCGCxkTXbF+19qHI5KHbDK 5FaAGThwRIUk30GY4TNSrEz60RKLKXHBfAlkGJk9QYYpUq8IyUqOGPi9M1y1qIME3rtc Z5A8BVlYzQTJuR/eQtgJa0iDv4K+UJxrmUv5sXhyrd1zUxCkiNtINQ1511DjnJLq1dp7 J6vcPkmZlf1KFYIwTvcIfuHEbRlAtFtKSVDEY/wxN+xC9co1DwyQTRe9qYPH4DpNENps +/gw== 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=FyYP01btqNHdTOFLIRaUteWZ03amrYw7Mq0xWdr/+oA=; b=Fg6JlY8yOFHL1oDHEbavg+9BnTu7RYzWuBpI4wQp7IAjjgcVsyGkM+HCznAXXK6wzZ L7GlnYG1ad+hfhzkisRPzriwixY2Ae0lavotpCqU6OJXCHyjY11Vq1A4GW/M5vrqtmve sSBhiYFnKU84RoW49/tY5HsXgAXInDg56IBYNs0D+yZZFk2PBUUMrciQZXNdfJs+7D8N KLsIp8HOT2GK47d3mAAQ9WXJ4jA03A8zILjMEPj0abnHpTVUXnBuLIcwCC3tpa9275yE nAuZ7yMLfTYvXRC8Ys7xC5Kyz8PkcKkhrPxuPXDtJDAoqrF78rdXo0RXl1h68o5r88Sd t31A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hQdA7rUD; 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 j1si16305111jar.65.2021.06.20.18.51.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:51:36 -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=hQdA7rUD; 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]:57764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv968-0004kT-2H for patch@linaro.org; Sun, 20 Jun 2021 21:51:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qG-0004Bv-2x for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:12 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:42924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0005Fk-Ha for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:11 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 13-20020a17090a08cdb029016eed209ca4so9292419pjn.1 for ; Sun, 20 Jun 2021 18:34:56 -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=FyYP01btqNHdTOFLIRaUteWZ03amrYw7Mq0xWdr/+oA=; b=hQdA7rUDm50MV6QRisqQw3w4PUj5b2FTh7YKG0/9wSct2BYIq1+e4we0aXPur0TYf3 DaSAxX9XVzckZ2h1+xXWaLc16H57Ka851OaKvLsoZtl9UizuU/EvraCzGc/C0BtAyI7F 5d4Qmb12vlxvpcmMWSptEMytxci8qF1P/g/0aE4XTq+CAEFGdzkPD5MtvKB3Hpx5Np85 s0MpXLOK/y0+c65Y41LnGVUQXlxwZF2QV7fl1BH6nyM6zwhkESFkOXVUKZWEF5QhoZd7 3KAnscVatFDt7WeQXxJbWGHi3RsuZEwSJTF29AR05GB/n10Wege/Vus9/CJeauhDUnGQ rD2A== 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=FyYP01btqNHdTOFLIRaUteWZ03amrYw7Mq0xWdr/+oA=; b=XeIuliNeBHOcg+FTHVHHsjauh9LtjA3SmgnsBYqZNYsEzGP9nqVDErfE1x6uJW14D2 n60Ilp0tPjOOd0iyAdIx+gGpw2cwSDzvovmxUSNPmbaNM1Gfc6rnBERQGIf30QH2NMZK WwZ1XqwGBaszcVdUueMcrt28jJdRFjB6okCwvwKEY725i1Vw7y/Hc0wu+wEW8G6SIm8c AqGZWg082qp0uBifQ1sKUBCmmdlPq5CmhEDTQ23bb1n+EzgxFffe+/v7dJiMCDe2nygz osqBeIPViEg9w8bKrS2c3A2OHKtfaAwSGNSHikAiK6dXks8tomrcBCWLzjOvm6jxse8b Iyew== X-Gm-Message-State: AOAM5319tIHpah/JALVTtYnrrIzsO6FOLaSKWg0i7YaLa69w1uJlI5lJ 5AF4cdFaFBnwC2YrBXj+7Rvb+RIYDDzmGA== X-Received: by 2002:a17:902:720b:b029:113:19d7:2da7 with SMTP id ba11-20020a170902720bb029011319d72da7mr15481603plb.55.1624239295362; Sun, 20 Jun 2021 18:34:55 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 25/26] target/tricore: Use tcg_gen_lookup_and_goto_ptr Date: Sun, 20 Jun 2021 18:34:38 -0700 Message-Id: <20210621013439.1791385-26-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::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.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: Bastian Koppelmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The non-single-step case of gen_goto_tb may use tcg_gen_lookup_and_goto_ptr to indirectly chain. Cc: Bastian Koppelmann Signed-off-by: Richard Henderson --- target/tricore/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 Reviewed-by: Bastian Koppelmann diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 09465ea013..865020754d 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -3243,8 +3243,9 @@ static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) gen_save_pc(dest); if (ctx->base.singlestep_enabled) { generate_qemu_excp(ctx, EXCP_DEBUG); + } else { + tcg_gen_lookup_and_goto_ptr(); } - tcg_gen_exit_tb(NULL, 0); } } From patchwork Mon Jun 21 01:34:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464484 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2118194jao; Sun, 20 Jun 2021 18:48:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlhHlTztWLw2NnBs+F1NbwFFXdvpFZYmJUdK3zq4mWKA11Hl+7Q32CEl4dfGl0bECUrlbj X-Received: by 2002:a02:5b45:: with SMTP id g66mr15357556jab.62.1624240125719; Sun, 20 Jun 2021 18:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240125; cv=none; d=google.com; s=arc-20160816; b=vsW4PnPXF6onCjJnhp53n1rxsQRAl7Q7Ezbew7it1ytDD6+6vfTVyF71tJyAqtpN49 AsePlEOZuVHQwdWuD1htMM0tXkeV6mIwP9sK85Je6dJTaAX+Okqb8HDPTwJrcbRyzH2w W9CIUOZbT2r8FCuS2QjPqf1cvIg2Ze/WGCsEo/+4cSeiAgt245Cx2HJEY3eoY9Ww3fGh U4nEdkNrdEZUsLoNmN/poi+VCCbpESQWj91ulQzMm61DTxvIOGlsFh5vjC200T++pIac uhXbtHudgndcpNv87PYWyFL+ycIm557eVYNdP7vjJUEzS79i3KXax3xbOUITRYAjMdUa FF3w== 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=fx8+qdcju9NPtj3eCrU8zuRjZGAw5A7xVtYSk1jWA7Q=; b=qAJ4JVuNy1BhPRMozNHzD+uPdTjdSDcvib/VfCrSA8xG1WlkIH4ekhzs8yrUvih6uF QNGiaDpv09wJgnOV35/RRfhd41ZaJJrMj1QWEbuzeZPEYJGrJ2ymwEfFM46ogVJtenks Nb4U5AxWHpD0jauEJqU92h132To2ePaEBJstOx8LXs3mJFfgvY6U0ZQ1otLFQGJDMmhb b4kofGZSxJUtwOm+byKsAKnOdIsMpkm5bhBUjVbUmxSHlA0st5zI27851YzZ3NX5iLZX 09esbqrX7htwjYrTS66oY/pZAMYrtp+VP+BFJn/8QrC8pnmqiCMGicLdy77H0UoObUet 5JHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s6RqCuzZ; 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 q14si237835ilv.161.2021.06.20.18.48.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:48:45 -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=s6RqCuzZ; 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]:48694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv93N-0006vC-5N for patch@linaro.org; Sun, 20 Jun 2021 21:48:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qF-0004Ay-SG for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:11 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:34599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8q1-0005Fo-Hj for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:11 -0400 Received: by mail-pj1-x1033.google.com with SMTP id g6-20020a17090adac6b029015d1a9a6f1aso9328511pjx.1 for ; Sun, 20 Jun 2021 18:34:56 -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=fx8+qdcju9NPtj3eCrU8zuRjZGAw5A7xVtYSk1jWA7Q=; b=s6RqCuzZOPMCNZR+2d6/X7WhC+ixC98pEIGIR4pG3nQCZ6/9j9EY86MDkab1ooMD7o dnMQnTILD4HQ92PrZ79ojF0tFhH4EEPkERvnMBDDBZUS3bCdlHW5WXg3oTTiJRup+siX E3QVJJVNuD7GjKWFTCSH34Tg2NcmwPGV8EJby0Z9Xw7TDM5mOPmqNGCLWcKPzzPGReVj pywTN/t5Jajj8dt5cep5C8UACWY1NIIBOaCvB+sUVNNDx6/L6DlcY6XMWjIUSnvnHhj+ Zhr1r31xhTboHkTfTzXVtjoQH/OTnNn2It9VZb1BtnB8igD3VJ1cFrLnIsEaatFJWST8 Kmcw== 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=fx8+qdcju9NPtj3eCrU8zuRjZGAw5A7xVtYSk1jWA7Q=; b=R2HWrwVlpJ3bzHguinxAccnkVHslb0y07q3hU6FI9tacwv9xrNhcz6cM4iuu1rK/mo RwVCePPKM8w8u+vAWM3uNPsfg2ade1+GMJdTFhJaZxZZoGLITy+OluZkdiBmeX4nHwF7 lxx1nKDVUoF8Ktw4rWD40/wTCUw2PQc5N9VhBaThsoAOdq71AwVrukmeYA7dLytySvpj PDHlUFc4q4ZodHtM/AMrZm2xBrnzcRWDdYj29Z0EdjJG1jYPEdIPZqhGGMYv01T2vuqt VGsxbdw1bOufxycW/kXg0TC+7t5G4WwEainnTOlzaaD0ZeS0NPT9MLvUYfcmoBqIs9cs q2mg== X-Gm-Message-State: AOAM530YiZrmwoJpcRaxxkNHJVUAoBDCxVUUXojr2+Ty7FlXamglImcp DeQwtFFXYGFe341uoa/nmJNkLaquiH1Qgg== X-Received: by 2002:a17:90a:f293:: with SMTP id fs19mr1431361pjb.149.1624239295878; Sun, 20 Jun 2021 18:34:55 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 26/26] target/xtensa: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:39 -0700 Message-Id: <20210621013439.1791385-27-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::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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: Max Filippov Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Max Filippov Signed-off-by: Richard Henderson --- target/xtensa/translate.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.25.1 Reviewed-by: Max Filippov diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 14028d307d..ac42f5efdc 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -406,11 +406,7 @@ static void gen_jump(DisasContext *dc, TCGv dest) static int adjust_jump_slot(DisasContext *dc, uint32_t dest, int slot) { - if (((dc->base.pc_first ^ dest) & TARGET_PAGE_MASK) != 0) { - return -1; - } else { - return slot; - } + return translator_use_goto_tb(&dc->base, dest) ? slot : -1; } static void gen_jumpi(DisasContext *dc, uint32_t dest, int slot)