From patchwork Wed Oct 26 02:11:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 618772 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp114064pvb; Tue, 25 Oct 2022 19:21:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7x2NWWahJjuu2rwmQJL0oM/wrrLN7xSlBbSXOBM9Sw2rk4JHNhiAQ3X8Cg3guXXBk+NqYG X-Received: by 2002:a05:620a:440e:b0:6f6:2a21:3630 with SMTP id v14-20020a05620a440e00b006f62a213630mr7735248qkp.640.1666750902401; Tue, 25 Oct 2022 19:21:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666750902; cv=none; d=google.com; s=arc-20160816; b=AhRoSWGE95uxFkOODsjpUrbKC1jLBQTupQThHvONu1E5zozk7puUS4MQHP5UjP7WnL u5/hA9oxaMb9vktdIcTZLIy4Lhz1QCfysVt9EPff6MwyR0p7psw2HHp1AA6H+QgNvYzd ZQcs5O2aEICCbJCihNDQEjKb5yNsRi6Mfjqfm93THqikCiohsUud3hdXaVTMr1TlA5ju palWK7flZe2sEYOf/wnzEopUC6FAbzeM+2IaIhhNhxceSvNGov6Ihct2k0TjbSInYSXA z8t2EMB7B+fLjaP8Ea4kOKV0i00lq/mOdMyIZFgPF++StQqUDs8J8uUsin0YR2v4ifF7 0obA== 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=i7vVd4Q5V6HW/R+ICEMk6aJDNyn3ol3YXdsq0hzOo+k=; b=Bt3LMZy8BgsMPT7OKpWYRWvs5v4XrRgtzaeqYmQjHezHmfcnBepUOALw/QgYQXLvTf 9Qe0meHbJnv/pGQkNJQdpwi9ytG8lye1eakXWyJ56oFwXU/cLD0fUuQXR0hl7RRnCRwv bJ2NRYEf6E06j/kh5VZzn6zQFw0aJU8tKdYeLiUQ1MdxWsHJOMoU/3E9ZEO6RhdGuq2v K5w7A9s/CXNs023dp4eU1T5YfzquhoMgZybz7tuvu8P0nuK5WAyJw+TEOeqNxv5THOi9 sgP/ZQh4r6PjxoDMVBA89/E2wVx0RHSrs3RN1WbD8VA7OzjZ4nKgrGneSnxCFFRKcWG9 OElQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="aysdxu/6"; 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 fy27-20020a05622a5a1b00b0039a2f191254si2613360qtb.8.2022.10.25.19.21.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Oct 2022 19:21:42 -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="aysdxu/6"; 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 1onVxu-0007Xi-At; Tue, 25 Oct 2022 22:16:22 -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 1onVxs-0007Th-3i for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:16:20 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onVxq-0001rx-Iv for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:16:19 -0400 Received: by mail-pj1-x1036.google.com with SMTP id h14so12694010pjv.4 for ; Tue, 25 Oct 2022 19:16:18 -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=i7vVd4Q5V6HW/R+ICEMk6aJDNyn3ol3YXdsq0hzOo+k=; b=aysdxu/6VQOIo/oAwqtR0/oWYhF4dAw4yoV83SA9pjALgrE65na+qK3HCYrjTwcL1o EX+jrg6B452xYmpF5Dg6SZvDjL9LFE8HElRavuZMUpb5eEgJjtZt7mcNM1e2L/TPD/Kq bli2Wa4EJcS2kjmU0ETIAz9n9nX8y9ToSrjiYwWzi3y/3hk2wrLpOuulK1fzthXpyZ+C JvDvCDjiUeLhdhUW4kW2hoSVCH8pPnaDl3cFYSFdsluaTfI4ZkzDcPtPAx+3o4MCGgb4 +DWW/hP2RoZTCiWijlWkyRshb5yv0NqQugnX7kbM77cAJCLnYsSUDowq0oU4AtRpbKRf mRdA== 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=i7vVd4Q5V6HW/R+ICEMk6aJDNyn3ol3YXdsq0hzOo+k=; b=muIis0cYwKJ+gXK0DzI3K1wgfeToZcIMPepfxql/PUEd4AxpVxqtqZCyZALSsXsDiD M/O45a3jlhReGJ7A3oqutK4WkZkBpk5md0RqhUGcpLutnSmFzioI3Krq0KoWDQ6smtWc yf0vb0DwWVKeCtdFIs+Ob5CajBnhfAlFDBaT2382QR1K3fztMW1WWrkUk2fPHmyAmcRo AOrs8ahBlb0wHg1DxIWeGqVXjAmeKxTX+iIuD9sne8G45/HVza6bYR9Uz6R4HRBRtdwx 3RKfcJXOKEUx8iZRTmRh4UpanrT2CdK9ReRU4NEfRdHX6r/Xz/NTwBAUcy5fE8kEewgM 3vIg== X-Gm-Message-State: ACrzQf20l6oNBfZc2TJacIBr+qhYODqCMsgNkItOA8eWOKOpBbRtD8JR KvAl4XKGd/izRaJLppgno3YrV/X7YGiqt9ho X-Received: by 2002:a17:90a:8b93:b0:20a:bd84:5182 with SMTP id z19-20020a17090a8b9300b0020abd845182mr1542923pjn.161.1666750577396; Tue, 25 Oct 2022 19:16:17 -0700 (PDT) Received: from stoup.hotspotlogin.services ([103.100.225.182]) by smtp.gmail.com with ESMTPSA id q18-20020a17090311d200b0018123556931sm1819732plh.204.2022.10.25.19.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 19:16:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 40/47] target/riscv: Convert to tcg_ops restore_state_to_opc Date: Wed, 26 Oct 2022 12:11:09 +1000 Message-Id: <20221026021116.1988449-41-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::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.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/riscv/cpu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index e6d9c706bb..d14e95c9dc 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -503,10 +503,14 @@ static bool riscv_cpu_has_work(CPUState *cs) #endif } -void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, - target_ulong *data) +static void riscv_restore_state_to_opc(CPUState *cs, + const TranslationBlock *tb, + const uint64_t *data) { + RISCVCPU *cpu = RISCV_CPU(cs); + CPURISCVState *env = &cpu->env; RISCVMXL xl = FIELD_EX32(tb->flags, TB_FLAGS, XL); + if (xl == MXL_RV32) { env->pc = (int32_t)data[0]; } else { @@ -1138,6 +1142,7 @@ static const struct SysemuCPUOps riscv_sysemu_ops = { static const struct TCGCPUOps riscv_tcg_ops = { .initialize = riscv_translate_init, .synchronize_from_tb = riscv_cpu_synchronize_from_tb, + .restore_state_to_opc = riscv_restore_state_to_opc, #ifndef CONFIG_USER_ONLY .tlb_fill = riscv_cpu_tlb_fill,