From patchwork Thu Oct 20 11:52:06 2022 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: 616785 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp326593pvb; Thu, 20 Oct 2022 08:06:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7VlaD6616CKthSFKYAFp1rQFe+546RdAzyrHknhqTCUZ8/jJ+KGgyvyf3boxKD0vYiFax8 X-Received: by 2002:a05:6000:1a45:b0:230:6ab2:ac9f with SMTP id t5-20020a0560001a4500b002306ab2ac9fmr8898881wry.278.1666278392656; Thu, 20 Oct 2022 08:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666278392; cv=none; d=google.com; s=arc-20160816; b=BKpEl0X80lySpeo4x62eaUBhrPR0UE4Z7evKnNoaqBSOTGhg4VXE+vXkV3Bwg22JmF gRGvCdLDCnyPdvOZY4CZ/p3CbpsNxioDRBKxNp9R5IJemxwViy+HAH3K8Yk+JRIz4oSC cyNt/32Mazib9pBfjFLa989BUTGxI5hUeMI01Ke+5H5bgHyBkdFjqrXPzLX10pa8b9NM mopva3gChUepBQEYOw9SPSlkedn/oqsQBg9uruEcUXyIcttfr2xJHXF87QwRfvTaFxrq hSNgNwK04eqtak9pbLtUBSvvCME+lSQFTqY1QMfJQ0Do5PlN8hCLZzYAlWOnJ5LZ7TMm RBxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=KbOoYrird1nsW/pAmizRbF6VSzex5qKXgg6ypuV+afo=; b=Lx8SCWNqJUjtAcTNr26zLZlVpQLbiTgOnI0tck3gfu2qNCq2GElMDCr/BySAXzqcV7 0iY4fhOBcNieQq8M6LF71IuT9LrBYlbPzN4Fw2H24k34J9jFzPId816HiaBwm/KZTVg5 iQjywk7Ko4hbkNG5NRUiyvPUFdm3IpUZqmEJjkYhYViYGXA+a31/wa3FjXFXkTbp+Gqn qiu4bsnSDo1wnvy1FV3zXd6S/tiYbwOl/5aGDNXw1HYC7CQc9D9lQ3HDAuuzYgj/3uam P3xNRscmkJ9y/t0apYncNaF8iNxKwXN+bIF/F+E+3+suAmay6FgS+GarAUAvaSntggq/ f2YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YPp4HJP/"; 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 o7-20020a05600c4fc700b003c6d21a194fsi2445692wmq.83.2022.10.20.08.06.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 08:06:32 -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="YPp4HJP/"; 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]:52026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olX7t-0004Pe-Ge for patch@linaro.org; Thu, 20 Oct 2022 11:06:30 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olX3q-0007tl-Oa for patch@linaro.org; Thu, 20 Oct 2022 11:02:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDc-0000en-AN for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDP-00051e-8J for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:06 -0400 Received: by mail-wm1-x334.google.com with SMTP id v11so4746022wmd.1 for ; Thu, 20 Oct 2022 04:59:58 -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=KbOoYrird1nsW/pAmizRbF6VSzex5qKXgg6ypuV+afo=; b=YPp4HJP/I/GfcRzoVGIlfVG5vyddKmNdirxW1UnYMrzpvCtWDGXIZweKLSR4uomCCH eiZwvaNUbLTz/EOe1Jt8ZLTvxQaFb00AbCAwjjVGQnLOVAr41TGn5mKD1HWuHQVQ6qtV Qo03NAF0QJ8THzjXS7qIkSg/AcEG9yyX1w8NuKUvqnRqVBWnBmB5L4iOepsjzeiaNSWq RSuKHan83Y4phTPR9otKVWkm1px7wb43+5QRBGYos8YqrIWLBolUogpOH8wpuJuzcWMG KaLfezoxN/6nGWLmYITs6pA2/xOtXxQt0byxsYWnbuy54Ho7mQDPNLOdbrAr3xfzdk1R YwTA== 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=KbOoYrird1nsW/pAmizRbF6VSzex5qKXgg6ypuV+afo=; b=KNRv+4frn4j9COfnTrv1q3nxtrZLKea6DlZkQ9I+6GuEXTzDkx6kgKBsxGR0ZVnYvn uVfwkx42ZQdgbczmHPVd0RN9yZ+BpRN7nvlmiYzzifm0RS2yMxBLTAlTQrExi8CNJa40 lzveZcUGMVYbb74AH1ysoDKy5dLXmt6tDxloOpXMMo+gN14g2Ag2rzb9pfnvDz2LOqRe rFS9BPl9hDhPWiiw3iUQ+VK1ZkqGNeqSx/hVBkZ6VeGfQYzQt7Wj2pUYSzIpQmiTtUGn RRDcT+cMHbAuXGbOZKwe82U9DXaK1DmMShHn2a9kl0axF4MwaQMqdKIoLRDNunhFJbAP J3eg== X-Gm-Message-State: ACrzQf1E0MHg/32fS6yb9QHcnVcVbhHR4Z6v6j5hFvGI3Gjmv0FE21lg 0O/0CHLX6vNhqvCwd6EvrBw7Eg== X-Received: by 2002:a05:600c:474a:b0:3c6:ff33:9a38 with SMTP id w10-20020a05600c474a00b003c6ff339a38mr8427419wmo.92.1666267197753; Thu, 20 Oct 2022 04:59:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p9-20020adfba89000000b0022a3a887ceasm16133788wrg.49.2022.10.20.04.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F4171FFCD; Thu, 20 Oct 2022 12:52:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , David Hildenbrand , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v3 23/26] target/s390x: don't use ld_code2 to probe next pc Date: Thu, 20 Oct 2022 12:52:06 +0100 Message-Id: <20221020115209.1761864-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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=unavailable 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This isn't an translator picking up an instruction so we shouldn't use the translator_lduw function which has side effects for plugins. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Acked-by: Ilya Leoshkevich --- target/s390x/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 1d2dddab1c..f4de8efe3a 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6612,7 +6612,7 @@ static void s390x_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) static target_ulong get_next_pc(CPUS390XState *env, DisasContext *s, uint64_t pc) { - uint64_t insn = ld_code2(env, s, pc); + uint64_t insn = cpu_lduw_code(env, pc); return pc + get_ilen((insn >> 8) & 0xff); }