From patchwork Wed Oct 26 02:11:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 618790 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp116674pvb; Tue, 25 Oct 2022 19:27:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6JCtxs2nn1mg11MooRTlsWoGjh7Nxm2D303/cy/fC++wp4m836hiSfNpNmefNWntu7plnd X-Received: by 2002:a05:622a:20c:b0:39c:f0a6:f424 with SMTP id b12-20020a05622a020c00b0039cf0a6f424mr33671796qtx.258.1666751275629; Tue, 25 Oct 2022 19:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666751275; cv=none; d=google.com; s=arc-20160816; b=urxx6cErWCs8ea0U2rNdhowbBRUWf+0xTX+UwEqQFTLJClrgDWO66Dyw+y5u9/lacY NOIQWygZsnp5mCOGkZJJMyqhc33joJDrtGQtxPv3QaQkMociYUxWqT1v8zJPY1ExuiJX ndljW/CXq8/aKlcd66ApW5vcS6HksYwwzvIhuu3BaswWK7IuvHxt/gAl9QXCGHtsZCbR kow9hMlPmX82MYLDKKSsobgoRi4Z9Sv382FngEQYqmxTReh+WbUvTXKfnNpWwoSYTTbW NUF3kO55viN5HY/B3HPPuRjph3aNxm3rppxNMxVzmTpyuueKX3Vs3o/OT2QnJrWgZD7k spdw== 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=zh4R/Fn+WhRA1To1jEk6vn5EnlhA+Z2cxPabIrA7c+g=; b=lHsCN4WgkheFns0GKtLUDCweJ2+p99tfRjohHBZoF4F9z+oFy8X0Ks3ZltCygo0A7Z 6HuJZJytG9dgNj583uAT90sdsjFxDb2GpC9GK4M67LCho8OykmzZp5YbZKI9Wo2zfgoK jeZpLEhnkf/TQBTdXbcnmMqFCv811y83EW1HgbGyraQIxWKM7Ad1YLcXAfq72rVgHtzE 8cEeh5AMnhEKnlJjIIwyXJLh5SPDRZhzpTkSMBge2QhvXrjufvSYOrw9WT5vUP8041Fd gklJG7knydzHalpMA2YV05tITTfeuBFLg5WM/Z3FBCplMmF6ymR9wIspCRQB86TDhk9A vwGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vIOkZ1Fu; 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 bz17-20020a05622a1e9100b0039b0e149030si2966388qtb.570.2022.10.25.19.27.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Oct 2022 19:27:55 -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=vIOkZ1Fu; 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 1onVys-0008A0-19; Tue, 25 Oct 2022 22:17: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 1onVy6-0007pn-Qj for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:16:39 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onVy4-0001tF-4A for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:16:34 -0400 Received: by mail-pf1-x42c.google.com with SMTP id f140so13931769pfa.1 for ; Tue, 25 Oct 2022 19:16:31 -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=zh4R/Fn+WhRA1To1jEk6vn5EnlhA+Z2cxPabIrA7c+g=; b=vIOkZ1Fu6dPAOuwgsAdLKSQBWTFJUlkaRwEEd5Wml3YXl44KOA0HWPaeaaa33ZUvLn bY7pZnOMDvo4hJvaCswpchgZGU6zrFc4Fc02N9nheASZmx2Q8Xjr2FMKpu5AuiMf+JZz XAVfAhC2FjZuxOC1sWWub8xW1UYydp9/6a6lGz43Q+lyHeM5lMcrrMCga0HhkNdwJqO0 +KRVwsP4uopKi+ZuzhUPMUXA7q/7BYeam+x1oZCUj0J+Cx63c/GHzCNuwqd07D+Zneca /zmpy2X36qm9uolLKn2plCdJacMFm2zRrmNTvAjXs7aJAzkjCh9lk8G3MhR/b7yiqtLE 0KQw== 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=zh4R/Fn+WhRA1To1jEk6vn5EnlhA+Z2cxPabIrA7c+g=; b=LetTOeJuPpd6Um3Q6LwhN/Ww4rfDCI5Kf3eCekGvX6CLdMqh1KEpMHAa0rK5ypQ//G wZSSBu2YPsPvMYZdYUMGLWph/8P+sHyurHiHMYUx7jk9v49z20hfI2CxXy64nApVQ82G mzW4iNxQZcRUWQKMq75gYpdFQKrasLFxbMt3jKGSIhXgRpV6Igq/VU+7pyRXp6UZ1IRp OFpOnQS8DId8q6jjFcpKPfmHKb4GC2m2khKmJXqvaopWa/NVwC5XHtk0IKR39hTfPVPy aM7AyPiTiviSn78+Q/qAS2rzPnog5nqzgZZD/nAJJ+4vq2u5f9RxUDM+XjIcO40wL/iU SZCQ== X-Gm-Message-State: ACrzQf0TPYyem7v/pzeX1yARNQ/XmS1XZuh+18nm61GYSu1QkWqOHVvv LmKgGRWDzx9A6YsfLJPfwIc2Ob0kfX4HA/gN X-Received: by 2002:aa7:83cd:0:b0:563:5f54:d78c with SMTP id j13-20020aa783cd000000b005635f54d78cmr43006834pfn.66.1666750590772; Tue, 25 Oct 2022 19:16:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 19:16:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 45/47] target/tricore: Convert to tcg_ops restore_state_to_opc Date: Wed, 26 Oct 2022 12:11:14 +1000 Message-Id: <20221026021116.1988449-46-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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/tricore/cpu.c | 11 +++++++++++ target/tricore/translate.c | 6 ------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index ab7a1e3a6d..2c54a2825f 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -58,6 +58,16 @@ static void tricore_cpu_synchronize_from_tb(CPUState *cs, env->PC = tb_pc(tb); } +static void tricore_restore_state_to_opc(CPUState *cs, + const TranslationBlock *tb, + const uint64_t *data) +{ + TriCoreCPU *cpu = TRICORE_CPU(cs); + CPUTriCoreState *env = &cpu->env; + + env->PC = data[0]; +} + static void tricore_cpu_reset(DeviceState *dev) { CPUState *s = CPU(dev); @@ -161,6 +171,7 @@ static const struct SysemuCPUOps tricore_sysemu_ops = { static const struct TCGCPUOps tricore_tcg_ops = { .initialize = tricore_tcg_init, .synchronize_from_tb = tricore_cpu_synchronize_from_tb, + .restore_state_to_opc = tricore_restore_state_to_opc, .tlb_fill = tricore_cpu_tlb_fill, }; diff --git a/target/tricore/translate.c b/target/tricore/translate.c index a0558ead71..c5b7bfbf20 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -8886,12 +8886,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns, &tricore_tr_ops, &ctx.base); } -void -restore_state_to_opc(CPUTriCoreState *env, TranslationBlock *tb, - target_ulong *data) -{ - env->PC = data[0]; -} /* * * Initialization