From patchwork Mon Oct 31 13:10:03 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: 620244 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2821065pvb; Mon, 31 Oct 2022 06:24:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6D1fV4mXqnFrkuqGt0fWs5IPX92WdwM9RL2cb+5pAotJlxUoSRHg2ZLZZ8oPc5IDf1wg8J X-Received: by 2002:a05:622a:14ce:b0:39e:55d0:3adb with SMTP id u14-20020a05622a14ce00b0039e55d03adbmr10474013qtx.173.1667222657715; Mon, 31 Oct 2022 06:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222657; cv=none; d=google.com; s=arc-20160816; b=mQfh4ewTz7lmgfpnqad+aJenFGQ4VXhC4Lp5fiY6JKQcNIyB+n30rvityxJW8+2DAj XI9LqMq1PKzRWGl4bSMnJn3nmBLfvkORVdBfrbbq1IXT0/KX5jq9EzSgYHkeWoLfhqgL gOTFKvWsUNS8fQh9Ad4jDKjvZZt4TaxYBgkBaGtjFN3366bscYOLlii7NY4UEp4D587e P4720V4N70nXTsEgKexzH0W9QqLY53GKCVbJcabe2kvl3dCIVS5EZF9pVGOPu9+QO5NO 2CATyw1FqDIdvEUk4bSWGr2sVtv6mIQZXw/3OERmm73dl7F/Wz7jOND8PWz0BdPdWCVb mojQ== 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=VU5VTL8pBDhAlFZZ+ljlcQ9WYows6GqqoHE20CLByr8=; b=kDd4hYWkUolM0dyFi74b3K686sPYFBPKaj7U6rWIJUof1I3VDPSEKT0DBYabMnBjZc ogbYqpPOYWQ2E4KFQK4GKHBE7dGc+AAKeUcXp9WZ2JV4jFM+3/q81QqaMrIArmZ8KO8r 4BizVI+76uwrTTm4rvb4H67MIWsQ35cV/TtuP4pLJJ+5QaB9/03ti2HwfE66gPtViZWs JZsExNZmkD24W2tQEpBDyiqfSqUePRcGE21fD3jZogfE7IGYV0pOyD5KVRJMOYcB2BGK z+8Q5mwkG1SNrxJiHWlMcDGDRYHvBHqG/2vAeAO93jNrMtHybUFSDemTTPxKzo6+D8IN 7CZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HWuCWI5m; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 f6-20020a05622a114600b003a530e21296si287025qty.620.2022.10.31.06.24.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:24:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=HWuCWI5m; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 1opUiI-0004nb-Pd; Mon, 31 Oct 2022 09:20:26 -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 1opUhx-00034L-QX for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhn-0005Pv-Ml for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:03 -0400 Received: by mail-wr1-x429.google.com with SMTP id l14so15972092wrw.2 for ; Mon, 31 Oct 2022 06:19:54 -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=VU5VTL8pBDhAlFZZ+ljlcQ9WYows6GqqoHE20CLByr8=; b=HWuCWI5mXe76Fyu4Rr0X24j8lszhBcR7qc7r6PRr8nEYpRTHqKORvXiTALV7Z7mttB eTuo/i/jRA2jrE+2Jkb4vxPH7FXY5zQlC/zTdWqNXUVKcMXFyVCWqDHVz/21FMghFpCx EFSJQmnipOz+9dX56TzsivKD725GLBCcdTN1Ba4t/sRxKBEYBXSivZsBWBhh9CiZCLXO +2ZWIroiYRxAFe/lHkohzaU+KLiScAjNjNeOiJjQ2p9wGp1tG57+A9ewVwTcPB4PZCQ4 QjOsM5dfelETNczB6xExKcsinRRlb4i3DOEJDcxKPaf36yx9V4mwgVJ+ueDvxYOBMFr5 62Zw== 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=VU5VTL8pBDhAlFZZ+ljlcQ9WYows6GqqoHE20CLByr8=; b=6xLb6Ve/lJE46eA8+uhB1s5ypALlrP0YsKQDtxKMxjBoJVZUAmR7PrKKd2ZF1Rf1Jp RgHsAjHZpAEYeG0FTrE+WEYw1BdMhJi9qkQgcshGhzJzX11gonPTMRKT60nlRFTH093y QGUH6Wxq/rlURluFzPwxqAQJy71EqTwDPWMPjrLBPcQwtepMypybIjAWmIw1vm+RYCCy x8UZrWv3YCmhPxzlQW0zUT3y335HiK74BbMdwG7sBbMy5sPPcR8+4XEVESKS6tUzlH23 Zi8HmEGQmhGS5Rm3K/cr5N5AWiR9+2IWOH7Epirfsr8VblHHCduJktDILFDlVNWZKlPg wBLQ== X-Gm-Message-State: ACrzQf2vV9g08DmY0mHL33APITN2iioTu1tuEd9dYnb7Xhxme1Ia72c7 RJ7M06gi5MjbJ2/II3BY3hIzPA== X-Received: by 2002:a05:6000:1b0e:b0:236:5c9e:7110 with SMTP id f14-20020a0560001b0e00b002365c9e7110mr8326452wrz.650.1667222393497; Mon, 31 Oct 2022 06:19:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bd26-20020a05600c1f1a00b003c6b70a4d69sm7247840wmb.42.2022.10.31.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 31FC11FFCE; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@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: [PULL 24/31] target/s390x: don't use ld_code2 to probe next pc Date: Mon, 31 Oct 2022 13:10:03 +0000 Message-Id: <20221031131010.682984-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+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 Message-Id: <20221027183637.2772968-24-alex.bennee@linaro.org> 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); }