From patchwork Thu Oct 27 18:36:29 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: 619221 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp514004pvb; Thu, 27 Oct 2022 12:25:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6t6U8Fvx9faVpgOjd/nW2rt+JyL0SbBozCn6YS5YMWbUGY9L7bdUnbmb09jvAvenc/iLvp X-Received: by 2002:a05:620a:1a9c:b0:6ee:8edc:ab47 with SMTP id bl28-20020a05620a1a9c00b006ee8edcab47mr35877351qkb.575.1666898728130; Thu, 27 Oct 2022 12:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898728; cv=none; d=google.com; s=arc-20160816; b=K/9udf4wXPgnkN1ViMPNL2Dss1YNm4UXUMx6Ane/l7/pN1kuUBhnwUit49zMuCIdjT fTYM6y/2t7j8EXV6Hyq5nn/rT+pQxGn/gKYwp8Uz+kQY0iZ0vHyRxF6R23lXJO17/Fgu bhBV6+yXUGJ9DV5Wytwnv1J3MCkod18C6Bq/iSBmdKxGzP+hLYlDP0Am0r5hD940ok47 WGftdiYDGcd29rscpQb8jRGgbfWnxLdrJlNEiwqT6Cl0/eBI2ncDgdMHCYVoYpSMGnF+ XCz/UutMB9ABgFiSr3D0Z1g3WEhYWXgKfScX0rCvpLuSt0pxNsX5mjbE+cE1XXG8/GbN DYNg== 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=XBKvcXH7eko7TPHV3oI1LuhtL6vJkLmpUuV3hPcT42o=; b=I48suNbQikYuH9s7TValK9nQ2am/zXtj+ooNNaowJ8+ZLvEo1zFCSiB04nQjUlq2gQ WeCJK73zT6J9SRarqWWgkMZU9zu68NHgwucyQqj0y03/ZX7y0pTHvMcaq+15xMfI8zUF HnhOIBUY9p9WOaTUGCOUjNQqYJxwv8PfDzo+h8sjqDijScc2//2/K1DchpFmtxjgkRrL f2JJOhvT6GIHHM+gjUcc2rMx7MRASQjxDvoquYfghu27cPO+7AY3KDEiCnKZqF7LBok6 elgvxnMuhplCgFA4NqZX1GkJ/OWtMb4PT+Hfh7zvGiz1DF1OW8P2wlTzCO+BFNx/Xi6K kS3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CkoQF7g6; 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 l19-20020a05622a175300b0039b0a041ab3si1629912qtk.342.2022.10.27.12.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:25:28 -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=CkoQF7g6; 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 1oo7t7-0005is-LP; Thu, 27 Oct 2022 14:45:57 -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 1oo7sI-0005UM-8R for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:07 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7sD-0004lY-SL for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:05 -0400 Received: by mail-wr1-x432.google.com with SMTP id w14so3703936wru.8 for ; Thu, 27 Oct 2022 11:45:00 -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=XBKvcXH7eko7TPHV3oI1LuhtL6vJkLmpUuV3hPcT42o=; b=CkoQF7g6quPYh38UuSk7pk9dXlQLtVIMLdHILdg6ZG8gnFWLBtJRBkp0lNmcLtnedS C/+sslcZ20FgXLhwo2bd2npNjD1Oep9pERAueHmh5OpFqokvg3rz4eYH4ZxjefEaro/s +OaqraK6+7QmHu84z5SIViSnVc5PQ8usNO/AwC3vys0V/JJSS2ewuxH+X46BgeU6a5mW kXcvvpTtmL4Tv64TNa/FbSfcFjqw6zbE2M8i12w32C1RVQLV67zd7Bgin5yyROQd3vEo TNkrZCGEufIm/aDSuj+BETad0vMIZvu2iaU2PMmcemPpvkfMOQ9TSoROb+xhDgvYAz6S QuRQ== 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=XBKvcXH7eko7TPHV3oI1LuhtL6vJkLmpUuV3hPcT42o=; b=dCh+h/sN+mMAECOzmJgwgqsjA/45DXP4/k1VNzErMoVMa/y3I4Ifhx3N3WTzjqkODT ebqpMF3WgaP50ozoudpCVX4hZJ9AQvJbHQmVmXaFkT6cW19xIZGYr7lvNm/ldwCINSRj Oj19NpqB0T8ktPOkLF1tR9qKog2fhAqKnEgm9eRtOjQoiMch0QEJtzzz4tNt4d9CxWrk B6OIrFvJJ+R5lvGEuQWhz7LLoTLIfUqbajmruRLAUqWOKgnKnuWYhOUFCvI7VbBmDByv t2PvzhB+n5zfnsJVlqm8yIXQTs6TSPEbTfLDa+PL2yri+O/JVJ/or6H/vfu+1fRLOLNN Xk5g== X-Gm-Message-State: ACrzQf1uMg1cVfpQFfhBMJXlviA7xsFeKwBXuyeq+N4zxjkKMPUv/lgd SZmgON7kS47UIKaGGY4gKdA+/Q== X-Received: by 2002:a05:6000:2ae:b0:231:86ac:979a with SMTP id l14-20020a05600002ae00b0023186ac979amr32750342wry.611.1666896299626; Thu, 27 Oct 2022 11:44:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f15-20020a05600c154f00b003b4a68645e9sm6132496wmg.34.2022.10.27.11.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 796C21FFCD; Thu, 27 Oct 2022 19:36:39 +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?= , David Hildenbrand , Richard Henderson , Ilya Leoshkevich , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v4 23/30] target/s390x: don't use ld_code2 to probe next pc Date: Thu, 27 Oct 2022 19:36:29 +0100 Message-Id: <20221027183637.2772968-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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 This isn't an translator picking up an instruction so we shouldn't use the translator_lduw function which has side effects for plugins. Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Acked-by: Ilya Leoshkevich Signed-off-by: Alex Bennée --- 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 5798928473..9df7f9e693 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); }