From patchwork Wed Feb 10 22:10:44 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: 380250 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp1564995jah; Wed, 10 Feb 2021 14:31:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1t8YbOWw/7VXdtb91wlHqvyg7jlgL9IifCyvm9XjqxHwdviBEpGTU4YGo0oU5Oj1JPsIT X-Received: by 2002:a25:d803:: with SMTP id p3mr7575335ybg.98.1612996276635; Wed, 10 Feb 2021 14:31:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612996276; cv=none; d=google.com; s=arc-20160816; b=H7fZWQ+ChN0/MG9K+NqZNDttOeshJ2nukJn7BLB/om2YHm4qRLINQvq+I6jNNP+kCC KDJOVRPzyGg/BgSp3TaQa8DdRNiRidVUDVKNCTxHVL37DqHT3vsWSXkBKLmS0fpQoN6l PBl9gXD2U6f/zpl+YODU9ngaVk/AlimXNs+9EQ0DHfC/73Yj433YPbAnru7/LXAJnaEs QLw8P6xsc62BejmKGH/unPJ9oTpvh+4q6NGBL3Jrh78CJKDeST2q8j5cRGEV+J7wBXJ+ E5tVch4fuItzBw4u2wr4GTdo9fG6JUOY4vaRwebyKUB2ZbMukb38XDoiWnDU4ClJtgLq VPuQ== 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=maKaI/qzwTXOe899gbp1Af9qP827gN0VYDNXRtqE7f8=; b=YJ++Sc79sz1DoJVaukmZtb0H0M2yrrxPuRuAYTr7mzlmM10vhxGf/wcNvjsxJk7G7P sbBBUIvXpLG4v7hm8MqLfBfJ1oIQ6VZQpj1c7SL+Iw/+yNyQvCY7VF0C3gNoX7z5sRjW yL+Xmz06NNDVqieVbcgYzSdpH/nDHFV9Uf86Ys0h4kdAzoZtOLZzvbgmKrAlqtdNP1h6 nqzgvwNvfxifhYVZtDKxCCQna5ehMgBNl2HRTn1Zm/rvZaTGMRpgq0bVna6xHkafByVM Q5AjdFNRtQEoQqZIdaMVQ8ICBIoVBboe1ge6Y1F5IoRv8ILx4wXsXviEq1CX5d6d4I05 lPlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BnRJ6TMA; 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 x63si3026406ybh.326.2021.02.10.14.31.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Feb 2021 14:31:16 -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=BnRJ6TMA; 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]:60044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9y0x-0007Ik-Nd for patch@linaro.org; Wed, 10 Feb 2021 17:31:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9xhl-0006Ii-45 for qemu-devel@nongnu.org; Wed, 10 Feb 2021 17:11:26 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:38224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9xhg-0003L5-Ev for qemu-devel@nongnu.org; Wed, 10 Feb 2021 17:11:24 -0500 Received: by mail-wm1-x32b.google.com with SMTP id y134so3307329wmd.3 for ; Wed, 10 Feb 2021 14:11:20 -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=maKaI/qzwTXOe899gbp1Af9qP827gN0VYDNXRtqE7f8=; b=BnRJ6TMA1Fz8nSbo6qVYjZzR/6j+e3mCokFjSS18/v7JeRZUFspfyqFGl0fV4GocSI FvwLegdVMCNjiTfrq7n3B7eC7kqhgxKVl0BfwCQKi/AFsSSf1yerk8mp+fVFc0jdRpyo /chpAte7At3NS0x807qy+5SpuBCBlFUiFOipd9aoMAnlWgo7ADP+0pGU3U3/wrj5s2rE SKOBTHM66BACAUuSDaUbHxx3AdjsAFcmir2g+F1pq+Iw0D50IX1KIdE4CkrDOLkBsyIr jwSOfE91+2xIyX75wYV2SUVS5UIZvKyay0oosN1FWbSBXSwGZNxpO//4M7MW8L/C3MCQ /rtQ== 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=maKaI/qzwTXOe899gbp1Af9qP827gN0VYDNXRtqE7f8=; b=iQAz4vlTDP8oj453DH3qNmYEQO8YO9+iAw/tL8GTNh6oArdYLZx3u6EzcpfedSnzgj gKZ1gTRQ9dSUFBCUwDKQXf58RV/29pvHiWJ8QrXb9kFFd+2NLIlMHZ3N2yEcLrje65Ce pEFZtBWEPfBTVooD4IYKdt/PhuGFT9VYSkhCp0Oko4ulxrEbbIrhukdD/FwkuPeyrjc8 XUsJlvzVW6mfOceEHD0GetiSzeeuYR3xGhmhKpiLQAS7I0qlUSsrdHpTNVraFsgDpxEw 2Q/z1yesQOedPXsXLG24HWhiNj0gHdWqSL3cHM1Qk/dQz3KY1oguQFgDIp0sBu/Ya5j6 DOWg== X-Gm-Message-State: AOAM532GYhIz1yaiSMxiY8IpSmKzePgF3ajp6PEnn2DMccNcoAWq2ndW dkRYRNSOA61SjgROTCXcbsS7BA== X-Received: by 2002:a05:600c:3506:: with SMTP id h6mr1192328wmq.21.1612995079131; Wed, 10 Feb 2021 14:11:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j17sm4537337wmc.28.2021.02.10.14.11.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 14:11:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC52D1FF9B; Wed, 10 Feb 2021 22:10:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/21] target/mips: Create mips_io_recompile_replay_branch Date: Wed, 10 Feb 2021 22:10:44 +0000 Message-Id: <20210210221053.18050-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210210221053.18050-1-alex.bennee@linaro.org> References: <20210210221053.18050-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Paolo Bonzini , kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , 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 Message-Id: <20210208233906.479571-4-richard.henderson@linaro.org> Message-Id: <20210209182749.31323-4-alex.bennee@linaro.org> --- accel/tcg/translate-all.c | 12 ++---------- target/mips/cpu.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé 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 */