From patchwork Tue Feb 9 18:27:39 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: 379379 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp490140jah; Tue, 9 Feb 2021 10:37:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUXf/SxfrpMlbgb31X8VesPfhRlK8KSFjysf/dbm6eK9Fzm6dZf8QW41vvRtnG9EirrXb/ X-Received: by 2002:a25:1002:: with SMTP id 2mr35408937ybq.410.1612895842854; Tue, 09 Feb 2021 10:37:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612895842; cv=none; d=google.com; s=arc-20160816; b=sSc07mNMVgN+WtwH84sb6UCipRfcWX1ncLFnnxRY851oBtJZjF7MKphS2q7lEsbVoX 93djG51VHHOyzu3ea1p869Qxz289kVMMuZgivq3P5q18BbHnuJGAfZGVY5jtF1oOpszS c04iT+3QpON23ut9PY+fJ0Mb90fk/VxcJqvZNxf+D+gSNDMc7XXBcxJQHR0cV9eSShCB 5GvAEkE1gkyxGPdpOiE9hyQtGyd1p7nBHKT6kfiR1V8Set71hrttq+gvRNrZ2FQ0p+Pb dowUkcAv9y34vcArVkp+QL06LBrPTF4w9qmB7FWu/F7uTYj+oavT60+Z3KuUtn7RiN/k pGPA== 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=/09yZXBu/IIBdtGKto41tx2iEh/nEfZf6dGwHzi/lkI=; b=T+fkV6sMuikPiQ5KAIHF/GImXbRoKCEuk2nYmRgyuR3a4USWCBuig27T+sNk8WtB9M FZIUNjG1DXZnKe+i0a9Zai9RT3Wv35NYDuhyClZu3EzqRVHoI/NEa/Dzjbd9AqomjVTy /Fx2EtETE4uVZLWDW4Lz6/mwj1Be5AOZcS7HEaKMCjre1Zu/y3hb+APe2in1g6FQD0cx gJmBR3k39G0es4s+1uJFgSuhADrK1dvDa/ixmGpLfdLyCMFUpb+nmmMRIvdYxFOW/8Wf dvLKpicA9gkLjmqX+hLxSTjBATrA5hK94wVOtjMcDyrRESLjrhSGZpP3aW+TVro1b2tJ LyUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XAICnjr5; 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 f76si26597126ybg.189.2021.02.09.10.37.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Feb 2021 10:37:22 -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=XAICnjr5; 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]:54568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Xt4-0005TM-9q for patch@linaro.org; Tue, 09 Feb 2021 13:37:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9Xjz-0002pY-BA for qemu-devel@nongnu.org; Tue, 09 Feb 2021 13:27:59 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9Xjx-0007mc-2z for qemu-devel@nongnu.org; Tue, 09 Feb 2021 13:27:59 -0500 Received: by mail-wr1-x432.google.com with SMTP id r21so6986815wrr.9 for ; Tue, 09 Feb 2021 10:27:56 -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=/09yZXBu/IIBdtGKto41tx2iEh/nEfZf6dGwHzi/lkI=; b=XAICnjr5aUDi2vKoKu3eqA52NHh2FT2ysPULfHaECaTigveQaCW34PjBbDGJ0W3PxB IP1Unjnug85UpFZfHGiBE7WDGc6Q1fkn+1+c0ukr+xWZpLrjO4WsCkU/nmUrKOtjn1cR mWx3UMPrKJysrLLntYNIu0uFTxw4G7GFYvtHJfQlq6ej45yOnIP0vZQTiTMzGHKOZfWe C2XtLZgzramSJoqx2/3BfqXEnBk08wlt2VSzGQPDs7elAN4T60gkZhma3BWxNfhy28HB hXmfu/Lwh3ayJEndMiU4DwoGR+zmyzMmheqhWaf/wSADVK8SlMg+qkaiSwVWFIaQ5ECi CbWA== 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=/09yZXBu/IIBdtGKto41tx2iEh/nEfZf6dGwHzi/lkI=; b=Spm9VSHm59vk+o2dKnzl5rWI8T0FHoSsSFrcP66ifaLaqB/BUM2yAQrc+qGO6gFTdW UzWO9TGF5zusc6kUZD06RU2Z+hyrJjlirTUgxcKy3kPEcgLsCk/tQvAQ1rRguNs8A9JF 7Isek/JzP01vHhS0mrt/rePyKYr44f0SlesXQkesDawGB9zCRAHr0BkKiBsPn2hwiNpX NP259O1YRMaftnsTg66JkFnriNvrNwHmbOfeMwrm/L65yO/YGmNGamMMdtFJe6LUl8G1 XlLSpynmvS89eIOecNoLwRRprRP+qRJfJStNuRGq/FFbY9I+fqY50lMAQGSGSqJ1MYvh 4gRg== X-Gm-Message-State: AOAM533bxtZoViX5f0on3QDSCa4loyQz7lXDrXNZGoAHqPY8DwhY+xS0 20MU/EODp9IEbINdwKqo9kzDV/VTRPx/yifq X-Received: by 2002:adf:dd10:: with SMTP id a16mr27236303wrm.207.1612895275667; Tue, 09 Feb 2021 10:27:55 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s23sm5670539wmc.29.2021.02.09.10.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 10:27:50 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 014631FF8F; 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 03/12] target/mips: Create mips_io_recompile_replay_branch Date: Tue, 9 Feb 2021 18:27:39 +0000 Message-Id: <20210209182749.31323-4-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::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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: Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , robhenry@microsoft.com, aaron@os.amperecomputing.com, cota@braap.org, Paolo Bonzini , kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno 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/mips/cpu.c. Signed-off-by: Richard Henderson Message-Id: <20210208233906.479571-4-richard.henderson@linaro.org> Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée --- accel/tcg/translate-all.c | 12 ++---------- target/mips/cpu.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 6eb37883bd..470657b02a 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2417,7 +2417,7 @@ void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr) */ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) { -#if defined(TARGET_MIPS) || defined(TARGET_SH4) +#if defined(TARGET_SH4) CPUArchState *env = cpu->env_ptr; #endif TranslationBlock *tb; @@ -2443,15 +2443,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) cpu_neg(cpu)->icount_decr.u16.low++; n = 2; } -#if defined(TARGET_MIPS) - if ((env->hflags & MIPS_HFLAG_BMASK) != 0 - && env->active_tc.PC != tb->pc) { - env->active_tc.PC -= (env->hflags & MIPS_HFLAG_B16 ? 2 : 4); - cpu_neg(cpu)->icount_decr.u16.low++; - env->hflags &= ~MIPS_HFLAG_BMASK; - n = 2; - } -#elif defined(TARGET_SH4) +#if defined(TARGET_SH4) if ((env->flags & ((DELAY_SLOT | DELAY_SLOT_CONDITIONAL))) != 0 && env->pc != tb->pc) { env->pc -= 2; diff --git a/target/mips/cpu.c b/target/mips/cpu.c index ad163ead62..bf70c77295 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -268,6 +268,23 @@ static void mips_cpu_synchronize_from_tb(CPUState *cs, env->hflags &= ~MIPS_HFLAG_BMASK; env->hflags |= tb->flags & MIPS_HFLAG_BMASK; } + +# ifndef CONFIG_USER_ONLY +static bool mips_io_recompile_replay_branch(CPUState *cs, + const TranslationBlock *tb) +{ + MIPSCPU *cpu = MIPS_CPU(cs); + CPUMIPSState *env = &cpu->env; + + if ((env->hflags & MIPS_HFLAG_BMASK) != 0 + && env->active_tc.PC != tb->pc) { + env->active_tc.PC -= (env->hflags & MIPS_HFLAG_B16 ? 2 : 4); + env->hflags &= ~MIPS_HFLAG_BMASK; + return true; + } + return false; +} +# endif /* !CONFIG_USER_ONLY */ #endif /* CONFIG_TCG */ static bool mips_cpu_has_work(CPUState *cs) @@ -679,6 +696,7 @@ static struct TCGCPUOps mips_tcg_ops = { .do_interrupt = mips_cpu_do_interrupt, .do_transaction_failed = mips_cpu_do_transaction_failed, .do_unaligned_access = mips_cpu_do_unaligned_access, + .io_recompile_replay_branch = mips_io_recompile_replay_branch, #endif /* !CONFIG_USER_ONLY */ }; #endif /* CONFIG_TCG */