From patchwork Wed Oct 26 02:11:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 618766 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp113307pvb; Tue, 25 Oct 2022 19:19:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5RtShkOz0FDMZXH7oy4zr3m0eQVENtIwK32mORg2Vb7uQcwz4DOyIyigVcw61qpcRqhvI1 X-Received: by 2002:ac8:5fc5:0:b0:39c:bb48:e42f with SMTP id k5-20020ac85fc5000000b0039cbb48e42fmr34404809qta.586.1666750788156; Tue, 25 Oct 2022 19:19:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666750788; cv=none; d=google.com; s=arc-20160816; b=w5cfUjM8JZnPU9mvEBuR+PwJhjpxTioltri5NFW4G4Z9ok78z//64Qy9AiWnxS1uHx CjmsPrsumvA4jATP/W8Y1DuwvVb0oyk5HJYdVYrAk8U5RmomHDOKWMLGY7dwXy2Hv1ow nlRjV9SfmETufE8Sc209o2+O/7I0kYUQS9ThOKWbHdrj6gXtp8jOs3gKWwcBVTmxrurP 8+QJrhsJBEVz/vZUIoTYdiuMw3iLM19CEdGB7wWMjn3JbA6T2vILWLI1nAKHvXb4OXMW wCA2Z6I05gl/5Fm0NNDQXQFhEaUjK89sv7RC3TFyIR4N7CaGNd61KgwYZ9Jwj4slWDbY algA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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:cc:to :from:dkim-signature; bh=bNZP9ZbaRsIjl4oUm/zT0jhrd1DGs2Oik+dsf8zhpAU=; b=PIaWHLHrKHUEdoiqmvxLPT23pZIeJZqyoxmsBujUIiITcNScUClYLOUq3ziR9Aw/NP 9BxV3xbd6s+i4CNx/UlyeTqLmZ+BXIXNLQmEmwPDxzQ+5yzysHi1hCgXJPerwfRv5DJw DjBlr0V2CE3UYZALNbkxiaYU/E/vgcrkr6w02LIgs2qUmfL07zY/eQnOuHtMKLKgrjhw rqN8/v6Kpl6IbWpPHxbPzOH8i253n0IhLNigEw4itplRExZDIfVhw5g8uG3cZrglrTHM RvmSiSh7DsGpophZQLvFP9jFF/7tF+yFctstl/rIbhwKV6Xl4ih25Oj0Q4dEJmOZNb8R 6ooQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pvlP5gme; 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 hr15-20020a05621423cf00b004ad26a4e7e2si2576219qvb.74.2022.10.25.19.19.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Oct 2022 19:19:48 -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=pvlP5gme; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onVuq-0005Yb-FI; Tue, 25 Oct 2022 22:13:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onVup-0005YC-26 for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:13:11 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onVun-0001LI-Io for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:13:10 -0400 Received: by mail-pf1-x42d.google.com with SMTP id e4so9970732pfl.2 for ; Tue, 25 Oct 2022 19:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bNZP9ZbaRsIjl4oUm/zT0jhrd1DGs2Oik+dsf8zhpAU=; b=pvlP5gme3RKxIRmV8nak1dcYivFY90NgvVYqP8Hc+SrV1UBcSdC1SHgwRnwAeeC5sh yJdkmFPVbHETl+vt9mUGXJA8t8YubdogjkJK10eWdyBdmYuV0zpqmBpAUET1/LETKwzN XC/meCvlYSIACG1J8bsbK+llGtrT/dJA1wVUDHgTofLpvFamKkUrP9j2HFYLo3D6Oqnq NPu/MsC8FIdhPKVh5SqFeU2Sap1XhcsU6b27Otq1ytZTH4ypq6HpYaLwTb8x0HWqPWxU I82pKoZ2g1Ts5oSF5MadpsX4MaXJ5ZwXNQ3RvMoEGqqLXDZT8CFq4L3jYxu2C/e/IpVp 6mZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bNZP9ZbaRsIjl4oUm/zT0jhrd1DGs2Oik+dsf8zhpAU=; b=cYajfmOV1fNb+6kZMGXJCa72oum8+WFdwc3D/8tX/wItRj4lshtpsHR3nI8y7lxsyy kNFFrEBBWLJN3NKs5eDTfi93uxVpdVswAs+IdEvOu6bH6YxkPGdwgOGuIYZcq7SVOrR4 2xulrC4CsW/qf9gG9pRB8dRJd8KAonhGs0FKLZbjbtJR3oPPvsnvjs/gIvb8I+NzjTOq CX2Jz7/MYjCSiZoy5fbl3xxODIbHXKTijDw/E/0Fsxk2FE5f8eZjmiIX9/0Z5wLDKUzV ZWErRevKO12UBXYGo9Jf01Mpk7oQA/5c+9tdOC6c6H2+cnfGEJg7YeTj7+xwd0ZkMQ2i hkHw== X-Gm-Message-State: ACrzQf2qmy0u4VvyQzYWEArS2QFMHjxNyFanpU7gwWN92omUu0U0wu/R 8J/j8XCw/x8m8sWXS5gi6EJMnIrCTCF/s2/v X-Received: by 2002:a05:6a00:1707:b0:562:e790:dfc3 with SMTP id h7-20020a056a00170700b00562e790dfc3mr41941861pfc.59.1666750388395; Tue, 25 Oct 2022 19:13:08 -0700 (PDT) Received: from stoup.hotspotlogin.services ([103.100.225.182]) by smtp.gmail.com with ESMTPSA id o29-20020a635d5d000000b0043c9da02729sm1897833pgm.6.2022.10.25.19.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 19:13:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 38/47] target/openrisc: Convert to tcg_ops restore_state_to_opc Date: Wed, 26 Oct 2022 12:11:07 +1000 Message-Id: <20221026021116.1988449-39-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026021116.1988449-1-richard.henderson@linaro.org> References: <20221026021116.1988449-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/openrisc/cpu.c | 13 +++++++++++++ target/openrisc/translate.c | 10 ---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index f6fd437785..de0176cd20 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -46,6 +46,18 @@ static void openrisc_cpu_synchronize_from_tb(CPUState *cs, cpu->env.pc = tb_pc(tb); } +static void openrisc_restore_state_to_opc(CPUState *cs, + const TranslationBlock *tb, + const uint64_t *data) +{ + OpenRISCCPU *cpu = OPENRISC_CPU(cs); + + cpu->env.pc = data[0]; + cpu->env.dflag = data[1] & 1; + if (data[1] & 2) { + cpu->env.ppc = cpu->env.pc - 4; + } +} static bool openrisc_cpu_has_work(CPUState *cs) { @@ -203,6 +215,7 @@ static const struct SysemuCPUOps openrisc_sysemu_ops = { static const struct TCGCPUOps openrisc_tcg_ops = { .initialize = openrisc_translate_init, .synchronize_from_tb = openrisc_cpu_synchronize_from_tb, + .restore_state_to_opc = openrisc_restore_state_to_opc, #ifndef CONFIG_USER_ONLY .tlb_fill = openrisc_cpu_tlb_fill, diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 8154f9d744..2f3d7c5fd1 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1726,13 +1726,3 @@ void openrisc_cpu_dump_state(CPUState *cs, FILE *f, int flags) (i % 4) == 3 ? '\n' : ' '); } } - -void restore_state_to_opc(CPUOpenRISCState *env, TranslationBlock *tb, - target_ulong *data) -{ - env->pc = data[0]; - env->dflag = data[1] & 1; - if (data[1] & 2) { - env->ppc = env->pc - 4; - } -}