From patchwork Thu Feb 18 09:46:55 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: 384361 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp3526032jao; Thu, 18 Feb 2021 01:48:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3zQA4SD8yRE33ganaw+Ut7g8WJLMsaIjCau7GWt6nERdjWKImg3gtdbrDrIwBF+oNludx X-Received: by 2002:a25:3387:: with SMTP id z129mr5668228ybz.239.1613641728845; Thu, 18 Feb 2021 01:48:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613641728; cv=none; d=google.com; s=arc-20160816; b=xQ3/VjdwVqt2FRs34M9Md91txWwxaBwNIsnn9LKb/90l/lMaxqBH1R+aFf+CChfs1k t7kaPAhWvqtlNwFpaPlT9xICe0FkApM8xGZcvLan0pmcV4+XhKgndgP2z+PkvkOpKz2X 9aY19sCpH6ouJCT5/mOXCWfZs694i3AfqmJcmjPTqQBpKB9M051j1o7PxYdr/rfHI4UB Rqb3xvWCOUTt9JiZo8HNWzClHwJsXNBiuNjg3bCtfkh/7fdVOsX7tqGC8LES23ujAhZI GZj3OzK8iUvsBhk+6FITJ92pn3Ta4RxysuJ7JueKT/XTBPk2pj2CmDxpNHE78WdBhGH4 ndVw== 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=FZz7tACrz3U3GSG6bPqxjSOF4K+wZRJaKMNCtQxN5KM=; b=iRtsCt01Wfy2fIJc9UuI6+aPgrRh/ZsC1aYRJPPQ62s9O+us6fEeKWSHU2U0N5/5Y1 eIpkqhA0zoDPesXQND0zis9OSjweXX6A8F8gELisWWXt5DIHhT43pO+6jOknjI1ENlWT 5h3Hypz9yzuqLM/XXYcjJhDVB/blxWgg++ca1AmPxTCWHlMsDhOh3joGmODiAaLvn9z0 zVqxX3qPILrmQhv4fUimVJBfwRjZlPqUtuO2FalM7AlnAz9HmaadgOzVPQOAE6x+eB+z ZjHZUYG9VFwU7+wbnTM8YSPQi+zY2aGQLesI9jnOoKE5QtsXJ2mcS+9yY44IVorI7hzq SHuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rnxtAHO+; 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 l63si2885659ybf.74.2021.02.18.01.48.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Feb 2021 01:48:48 -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=rnxtAHO+; 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]:57894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCfvU-0006iw-B4 for patch@linaro.org; Thu, 18 Feb 2021 04:48:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCfu5-0006g5-86 for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:47:21 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCfu2-0007Cw-2P for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:47:20 -0500 Received: by mail-wm1-x332.google.com with SMTP id m1so2379421wml.2 for ; Thu, 18 Feb 2021 01:47:17 -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=FZz7tACrz3U3GSG6bPqxjSOF4K+wZRJaKMNCtQxN5KM=; b=rnxtAHO+6EeH2Zp0MHVbkW34s/wMVJ2eNeoAKmbMNr2zSr1ZkLPegwJg7zyx+aPjvf skY4JkFE/TW7jnQKCvex8iiTwxNDbqePw8VmkwNybLxt3j/dKo56J6JZsekkNWbR9W+A 1Zi9xBfW9hy1BmqgbFr7ChhIBVH6YqidNOw6CWzlTGGy6laew7agdmxyKwp79oAAt5IH rQV0Ssf93OemjL4F4v4YACmeeRKOHCoWAJcu6bns3EOVd4+kf0+INSzJVoIiGagg6RRw LZTYyIwrx4fiY0KoA15HqwmwCo6IeXdUqhRoYJdBv8uMKPkLmhpmiOs3tO76xpnoF9y/ 618Q== 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=FZz7tACrz3U3GSG6bPqxjSOF4K+wZRJaKMNCtQxN5KM=; b=YNlj+z2oKg+T75sszuk3Urm5mwW7Py575qYKfUJaHXpdSOLKAu1UJSaytRlOnfVTm5 /QxSygT9zBIEN6ZYuVXP/LdmtDRD90u1zS2TVsSY1w2h3iq3cmFzcdqSIzpkix3OPDgF wr60GThnEnNIie0VNiS13AnVZ/qMSM6p2XVUskP59mYUywJPmw6nHd49306iavQepOZH P1VDMzfrvCm/L/Uwn/sPpzDsyzYxAk1MBkQS8mgof9A/dRhWGI4GQ3XZurMquyX07/wp 2yTAno/0wl1PR9mnfRWMYWKnP0r1fyijDkx+Srg3fELs+t0AAULMmPRWseRQ1VELBxxC OVfA== X-Gm-Message-State: AOAM533gktTDs4ogYW+VwfMk4ZpynVzssO+IkpmoalXzZ8p4uL+xL/tt TmOUrz556OPQsSfDcPt836rSLw== X-Received: by 2002:a7b:c149:: with SMTP id z9mr2742335wmi.164.1613641636334; Thu, 18 Feb 2021 01:47:16 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g15sm8057078wrx.1.2021.02.18.01.47.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 01:47:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 213111FF9B; Thu, 18 Feb 2021 09:47:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/23] target/mips: Create mips_io_recompile_replay_branch Date: Thu, 18 Feb 2021 09:46:55 +0000 Message-Id: <20210218094706.23038-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210218094706.23038-1-alex.bennee@linaro.org> References: <20210218094706.23038-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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 , qemu-devel@nongnu.org, =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?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 Signed-off-by: Alex Bennée Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210208233906.479571-4-richard.henderson@linaro.org> Message-Id: <20210213130325.14781-13-alex.bennee@linaro.org> -- 2.20.1 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 99ca6f36b9..9fea5c0e59 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2418,7 +2418,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; @@ -2444,15 +2444,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 */