From patchwork Tue Feb 9 18:27:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 379375 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp487856jah; Tue, 9 Feb 2021 10:34:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxuamNxIV+oP9R3UmYPvXMpRuehVV1vZ7XNRMLLpJoXsxJegWNWGDVr0ePOxm7yUl7+SoFY X-Received: by 2002:a25:3c44:: with SMTP id j65mr48055yba.323.1612895664234; Tue, 09 Feb 2021 10:34:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612895664; cv=none; d=google.com; s=arc-20160816; b=G7S1AwlNi3atBZnxmBvU5aIVg98OZo5EnFq4qIcV6JJFU+IQ3MsWhx8l8GnMMr6NOS 2bJnUelwVoAnpL16Okgo5QpUGz1r3pYk9JkTESfTHFoLAEIdUOTYXcu2O/uKhusY3klM 7o+SCcdVo8ulqwIY7hJAlD3hXZVnkP693oizsfELMVE55vPlKCtgEz6RH6WV02vRA2Y9 co4r4nzA7yCtIZWryCHMv8c7QiDydhSOAdzcuCr72zXiB55Qa7OMHQz2Czppxugarmuu M8yWOPog6LioTuw+eGSH76TOtOcCTcWGqrYW33L1ptV8wedRv+ItsU0w/Njk2LwfzSLL /VWA== 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=DCYLKD8lKHBC7zqZxsTt0jNxWwRKIBBIOHuXIK5gJKg=; b=sXgj8H73v+l6K8CbpNaAh/xNYa4JTRrALTG859oWYaXpocsGmxyXWGKg9TcZQPHblf qfwbdFyqiePIRZY2UyDTPKsRTrexc7gaJlCLykKyNogcOIp4TpTy/lQC8DftS4je2Z/+ BVpvc4zHqSH3bvlluRNCi1EzgPhfwLjpKZqKHOuNkpwlgtj0LHQ60lRQRPunVWzy5aVY U5GkGzee6PqyVT66BgkN1KdnL2qlgPAGHV8wkSbD6EGp/vDWWzxeixa091tffWvDrdNz A7GlL7ubpnoRTpniBaI/gor36oQpcoaovfV11piuNps2a34ckCkZOyK474Qwjw3pKtUj iqsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZT+jFby6; 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 x4si21074772ybo.323.2021.02.09.10.34.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Feb 2021 10:34:24 -0800 (PST) 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=ZT+jFby6; 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]:45984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9XqB-0001fB-HD for patch@linaro.org; Tue, 09 Feb 2021 13:34:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9Xjx-0002mS-U1 for qemu-devel@nongnu.org; Tue, 09 Feb 2021 13:27:57 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:50782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9Xjw-0007mO-27 for qemu-devel@nongnu.org; Tue, 09 Feb 2021 13:27:57 -0500 Received: by mail-wm1-x333.google.com with SMTP id 190so4176221wmz.0 for ; Tue, 09 Feb 2021 10:27:55 -0800 (PST) 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=DCYLKD8lKHBC7zqZxsTt0jNxWwRKIBBIOHuXIK5gJKg=; b=ZT+jFby6CcB/HaeXekybKcyT8N1uK8Tc69ilxcaQv0BcLI8N2QLBrGIrltXQyfDmcl 4w9L3WV6wD02OA0m0XDvLDxYwr+3hAQ0e7s5/IOgBxl29uRQTU6gTfxRfe+Fh7sKR7IC JuObPYX9Awt2twZKss0KRsrakWq2Sd4TmN/51xq0VMKen7iC79yUdjDJV8wc+L43Rq3h k43Cb3sgT4qOGeAvjlVa6EvKGwobKk8sCP3qLNxCHHdMZKfvFlrI/pV3GJq5uKZnzB0n ngXxEivwOreb4JYGcSsJ5IfmH2Nhtn325NXVUbiRxsH1X2GrizKlPZz+xJddqjTbyzLw FeUQ== 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=DCYLKD8lKHBC7zqZxsTt0jNxWwRKIBBIOHuXIK5gJKg=; b=taoiPOFm35jAZRgsTPc7JEIB/6rn4fE95rO/ajG6r+0hkQDcXWmMTt6voR9fif+2yz N6ZrHubB3NMtNa29hcaCkSk6S6dhaHe3MpYsfmGgGFZltWxgrUqi02eeEy7BHkK5afyv pvjetRZoMZwgmVxN0s1Mhukw70BiFdHtO+WpP3kKzGALZb7EJb35ldBL17pL/JIOPppx 7qqny3JzOyfUsBFo4RDRcGB1ZBeMmy6/2RZcLiwP5TFvzO7+mS61O6BnrRR0e7sVd6W1 dE423nhq9U/OuYZ0w7y5uWW3aZBQCW+ls56sLbUpSMR0UzQrHS9MmyoTGl22Nl9S5m9N omLQ== X-Gm-Message-State: AOAM530BIkZWJbirK/f5pbExe2dBga0KmRv1VIekE4blu/rtQY6rMOw5 2sQyxM6qkny2ZbmQqYQiDxshOA== X-Received: by 2002:a05:600c:47d7:: with SMTP id l23mr4833252wmo.16.1612895274745; Tue, 09 Feb 2021 10:27:54 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e4sm37194265wrw.96.2021.02.09.10.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 10:27:51 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3564D1FF90; Tue, 9 Feb 2021 18:27:50 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/12] target/sh4: Create superh_io_recompile_replay_branch Date: Tue, 9 Feb 2021 18:27:40 +0000 Message-Id: <20210209182749.31323-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209182749.31323-1-alex.bennee@linaro.org> References: <20210209182749.31323-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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 , Richard Henderson , robhenry@microsoft.com, aaron@os.amperecomputing.com, cota@braap.org, Paolo Bonzini , kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Move the code from accel/tcg/translate-all.c to target/sh4/cpu.c. Signed-off-by: Richard Henderson Message-Id: <20210208233906.479571-5-richard.henderson@linaro.org> Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée --- accel/tcg/translate-all.c | 12 ------------ target/sh4/cpu.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) -- 2.20.1 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 470657b02a..b8ad95aa1b 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2417,9 +2417,6 @@ void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr) */ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) { -#if defined(TARGET_SH4) - CPUArchState *env = cpu->env_ptr; -#endif TranslationBlock *tb; CPUClass *cc; uint32_t n; @@ -2443,15 +2440,6 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) cpu_neg(cpu)->icount_decr.u16.low++; n = 2; } -#if defined(TARGET_SH4) - if ((env->flags & ((DELAY_SLOT | DELAY_SLOT_CONDITIONAL))) != 0 - && env->pc != tb->pc) { - env->pc -= 2; - cpu_neg(cpu)->icount_decr.u16.low++; - env->flags &= ~(DELAY_SLOT | DELAY_SLOT_CONDITIONAL); - n = 2; - } -#endif /* Generate a new TB executing the I/O insn. */ cpu->cflags_next_tb = curr_cflags() | CF_LAST_IO | n; diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index a78d283bc8..ac65c88f1f 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -43,6 +43,23 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; } +#ifndef CONFIG_USER_ONLY +static bool superh_io_recompile_replay_branch(CPUState *cs, + const TranslationBlock *tb) +{ + SuperHCPU *cpu = SUPERH_CPU(cs); + CPUSH4State *env = &cpu->env; + + if ((env->flags & ((DELAY_SLOT | DELAY_SLOT_CONDITIONAL))) != 0 + && env->pc != tb->pc) { + env->pc -= 2; + env->flags &= ~(DELAY_SLOT | DELAY_SLOT_CONDITIONAL); + return true; + } + return false; +} +#endif + static bool superh_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; @@ -217,6 +234,7 @@ static struct TCGCPUOps superh_tcg_ops = { #ifndef CONFIG_USER_ONLY .do_interrupt = superh_cpu_do_interrupt, .do_unaligned_access = superh_cpu_do_unaligned_access, + .io_recompile_replay_branch = superh_io_recompile_replay_branch, #endif /* !CONFIG_USER_ONLY */ };