From patchwork Wed Oct 26 02:11:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 618788 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp116477pvb; Tue, 25 Oct 2022 19:27:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5A5j90C/Mikp1bYTEZHVWK0wNFUZ8MhNmmBFHsADKKrUdWlkBCOwZkeM+kBUG6GXLi3vTH X-Received: by 2002:ac8:5706:0:b0:39d:322:7c36 with SMTP id 6-20020ac85706000000b0039d03227c36mr29325707qtw.632.1666751238020; Tue, 25 Oct 2022 19:27:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666751238; cv=none; d=google.com; s=arc-20160816; b=in6qjW6wxGbxhGaK4rdq+3aeMjMM4ims2gOUugP/12M8ApYvk4Gzqy5TGcbQFYlur6 lgpJX8dO9brQs20syA5y1+vnReulvKEsJ1xImLTNKD7LB7XRb/Rf1N/GLL/trPneHExY vIieN8Jhruezlsigglu6XEv9NKdbtFfgXzqZGjrL9/a92GhW3RP2dP5fv5Cjt9D17EnO vrjL9DQCIpHBLuW0Bd4dS3FahvuMoatpYAPrL9xHc1YyzEEi6+AVh1mMQ9nKCiEzbCF+ dROQULoOmcvg9lqa9akYWsJTz32lSTCqYzZuucN41Bt0prw2D49GCvlwTM+RQ9i1K5PV W3VQ== 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=DL2U3M4LkCRP8SMH/i6AX3/mkeQ3l2Tn5pl+fLhM1iQ=; b=tvFAi8H2/a4GCHQ26DFTqFm1WBv1/kTSdCQ34dOmKHAku/pB0PxhfgDfeALdHViVdO e8m21nYnoVhtLPDSUAETha7YTDYZUBXm9uDxzpCdkfs/XjBTIO8RrbZ48/AoxqsNJjhd uN9JtjC+KjwNkO55zcuUO5aFN5kWnWWyXVPNwib3w4VwiDGqNoiz/zRfP/Rg2Y6v9meG OSiamYMzhcWIPDT3uCF3k+04SCoguYWL+HiqyhpK5xD8p0dTfMrqqhhibklZ0C4sCBF9 po90U0Bl9ciQZCa44V21oW8nFddDHZULxCSLoiXXQjLUAHBwI4h7LrnxWSbUyyHG9zRH mrHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oAtMjCfu; 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 x12-20020a05620a448c00b006ec5ca7032bsi2985031qkp.755.2022.10.25.19.27.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Oct 2022 19:27:18 -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=oAtMjCfu; 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 1onVui-0005MG-J4; Tue, 25 Oct 2022 22:13:04 -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 1onVuh-0005Lo-2a for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:13:03 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onVuf-0001JA-J1 for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:13:02 -0400 Received: by mail-pf1-x433.google.com with SMTP id 192so6738920pfx.5 for ; Tue, 25 Oct 2022 19:13:01 -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=DL2U3M4LkCRP8SMH/i6AX3/mkeQ3l2Tn5pl+fLhM1iQ=; b=oAtMjCfu47eoM0AGi5pfU3/Y5jIMscbeZl2YBu7u7JYgxJ7M7+6BszusbL86WCeIdb qBuL3akL4daogIVzWGbit8YT4wMrtLTe8NJFD0QXm48AEc5qpgsxRRvSNQ5SCfbG/Kn3 b/nMr36rSwTS+IbHZKbcPb3UNsxIZngor5XXOZL85G6pVhKduyCtVKn8IvCd7TBoVUV1 sgpi2it6lnP3zQqGHLl16p98ROy4hhpQnvrGDpfVtwQGQ8HxhEOWWRBxCrlV1r0iW8Xd 8tSEAhzzYc8fj4JZ70nQvHrc5ob/+hFVmGY6QHRDQt0S7YNA96Z7Kcn4QK/1xohcQ7uP duqg== 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=DL2U3M4LkCRP8SMH/i6AX3/mkeQ3l2Tn5pl+fLhM1iQ=; b=0LIrhU3VyhwZI3wsmwpdI1LYA3UNfakKD0yOzaqZIPHrEIAVndOxpfm6gWFdS6tQeJ dxC6/Q/PQu2LMgNMuSiN1Qtgq2pOEV8som4q91+VDTs6Uz4lZkmNHFH5NGNWq0qpyTNB x6q9fG/oavw5jR4exhBNVG/UNceJMPVeww2Ro/WnZcaO53WwITKgzm+biBGurvPke+Xh t8Mx2N+GnYb6tvqESYRaLsbWP/uL5NfN0DJilBqFsB4Afx3ItOmQQ8Z+7lYNq6DVWRRe ycCjj4SSkLDZTH5WiGk0bQZcCtGmxu6iycRZ7YtjkMgwSHrqYb7zK2sbS11n/mJr6QJs 7s+g== X-Gm-Message-State: ACrzQf2u1heyY2m2Pg98z5aSFUdQ5c+c7/GgyBWDn2WzwOnJpLN7Hq3A 818z3bS7TlrnHYW3LMcZeWw4lnRTfTSsJ1AB X-Received: by 2002:a65:5605:0:b0:46f:1e8d:ece9 with SMTP id l5-20020a655605000000b0046f1e8dece9mr8615476pgs.249.1666750380282; Tue, 25 Oct 2022 19:13:00 -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.12.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 19:12:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 35/47] target/microblaze: Convert to tcg_ops restore_state_to_opc Date: Wed, 26 Oct 2022 12:11:04 +1000 Message-Id: <20221026021116.1988449-36-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::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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/microblaze/cpu.c | 11 +++++++++++ target/microblaze/translate.c | 7 ------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index c10b8ac029..89e493f3ff 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -100,6 +100,16 @@ static void mb_cpu_synchronize_from_tb(CPUState *cs, cpu->env.iflags = tb->flags & IFLAGS_TB_MASK; } +static void mb_restore_state_to_opc(CPUState *cs, + const TranslationBlock *tb, + const uint64_t *data) +{ + MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); + + cpu->env.pc = data[0]; + cpu->env.iflags = data[1]; +} + static bool mb_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); @@ -373,6 +383,7 @@ static const struct SysemuCPUOps mb_sysemu_ops = { static const struct TCGCPUOps mb_tcg_ops = { .initialize = mb_tcg_init, .synchronize_from_tb = mb_cpu_synchronize_from_tb, + .restore_state_to_opc = mb_restore_state_to_opc, #ifndef CONFIG_USER_ONLY .tlb_fill = mb_cpu_tlb_fill, diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index c5546f93aa..974f21eb31 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1946,10 +1946,3 @@ void mb_tcg_init(void) cpu_res_addr = tcg_global_mem_new(cpu_env, offsetof(CPUMBState, res_addr), "res_addr"); } - -void restore_state_to_opc(CPUMBState *env, TranslationBlock *tb, - target_ulong *data) -{ - env->pc = data[0]; - env->iflags = data[1]; -}