From patchwork Wed Apr 24 23:31:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 791611 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp1107581wrq; Wed, 24 Apr 2024 16:36:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+G2T8x7E3cCvd+zScXF3x8t85JFzqi59OFHmObBPF13YNNbhJjT4FTr7brNkamEKU0aLTOYp7Mjbuo7bz4TiP X-Google-Smtp-Source: AGHT+IF5M50hUGpXZhSNVIJ6L/+xHrt7zsJmiHhSCGnl183/qHCUtyUSKZ6hlC6b9JKK1uwVG42e X-Received: by 2002:ad4:55e4:0:b0:699:45f8:dbf1 with SMTP id bu4-20020ad455e4000000b0069945f8dbf1mr3630360qvb.22.1714001802784; Wed, 24 Apr 2024 16:36:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714001802; cv=none; d=google.com; s=arc-20160816; b=WxMoPw1QxrKLc+WZylWpknNrqdk3A0LXUi+2lr9HVyDx1M5lX4l2vFLD+eAUNiAAnS 5Si/HyuoPplOyYU8WMGrT8evgLmoOwCGU2nyOofjO9RacIQGxCGM1OrqrIP2QhA+GmXd Q5J3xGgFReG+ALSAY8QHcoOlMZ5jhsTYjUsu3PZMw5t2v9/1HrCuSXFSBFSapE3hh5Vk k5e+dUjR5r1ipjg0dAep7foiPNn2iiFm3jmE4WNAWLUzDC7XjTgpiSgfxtaY+vLEWxp1 zbvXZKYsF8orNLLE44t9BOT3lkxnOiFsJxOKahf9uzPD8up1hxu0NQiQbvthNCl/+wtv oDDg== 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:to:from :dkim-signature; bh=cGd76eq3aObei5VuQZhwLC7u3w/qktBLjof4YnAY7+U=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=uZ/uAmZ/37KXkyYKN3NncbZRfdlE1hx+rIgZjagrUsLP38jTuRUseUgsLihxPC5Cjv KLecIYo5MMzY+hvmqk30qfWQGdUqWapUmPkoHCtiKYMUGifGZTmGXDbXR2ntEQHS/jxp RZkLLTELCmBrSrtSNJwnVMSsGf63TYfMxsOADImFvhU7udo0chglMUaAgYx/kKOG9CuA hDJV83QsVOsvYs1eut3gDzFR7oQOyRvY2gTQCj0tDem9BTm+UCdhhyP3ijkHJQQuzIx+ goNwpYzcKHtiG6Wj+YvnhEdGdNGcHrK/CBQ6Ccv2IYV50OI7Xn/0yFw7J/74E/d7loaX hdpQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HbyG0QN6; 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 i7-20020ad45c67000000b0069b5583fcb2si16719339qvh.225.2024.04.24.16.36.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 16:36:42 -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=HbyG0QN6; 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 1rzm66-0006He-Hn; Wed, 24 Apr 2024 19:32:18 -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 1rzm5r-00061O-Tp for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:32:04 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzm5q-0003zL-AQ for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:32:03 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2ab1ddfded1so439436a91.1 for ; Wed, 24 Apr 2024 16:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714001521; x=1714606321; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cGd76eq3aObei5VuQZhwLC7u3w/qktBLjof4YnAY7+U=; b=HbyG0QN6WaJLgW4m7I398TQIHNKsFFsOzpyQhQAsEIY7ovn3AOiz2xay29SlKFWpFM 8KWS7nyHEN36Iac7MrotYlsMZougPtYBj4T85JU2Pr5dyfKqn3vrg6OJKl0nSlaIpRCr wr1YnIFeapD/dRG0hkARYYPsJZWQjD7bGAh5aGUPNzXROqux0Y7bMq9+RBUFCS9uGJyo A/bTK96owvpBoCn8+t1U9zFcs2zPx79v0J+T2QN40c0tnVMRXQ6cAloUehtcGDK3+7Bl ShqQD+bWdlBPFXhjmGzRq0bJPVMT8AEFpQY9wHovDK3UxKNfaTiER07+X5YvhgT/GXOA lECw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714001521; x=1714606321; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cGd76eq3aObei5VuQZhwLC7u3w/qktBLjof4YnAY7+U=; b=kIayh7BRt0ab02czwSuOKAx3O4mUdiOtIslifCM0934iv3lVd04CfUjPAsI5Dnexv4 h7/J+AOUJwMOcUA0lvBNgPPb1iZrWP/OYwtdihlD7fIEOyhzp2piUNQTq93yfIERnbnH ItBZw35F9iCc8J8N8dCJFjP6uFBn54Ofqh/Rnd6R0RU82JG554JU4a8TzDc0UdTv2jr8 eSH9t0hW6NUn+94UidmNd9vyXVG9xWotaSxKiHu+Uh1pxBWWSrh25QPuNgGQXWHQgx8p e3fqcKzpNEO0JwXeX0SvpXiYo2djVA7LvHGzzV++cep1ogAQRpC5l14mZkkl+OTd1hM8 bUgA== X-Gm-Message-State: AOJu0YzPyfhCYPoufu6lcxOEmmXa1hAQSy0bzMI+mnvwTrU+N621/0CB udLBDvbosmsrBv48yOVxr9DqM994hqqmAH/77Qpog3nIB8x1hMs+y/TtHEwfSjMXVjkBGJ9tAWt 4 X-Received: by 2002:a17:90a:4746:b0:2a4:892f:39b2 with SMTP id y6-20020a17090a474600b002a4892f39b2mr4285123pjg.11.1714001521044; Wed, 24 Apr 2024 16:32:01 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id z24-20020a17090abd9800b002a56b3931dfsm11737859pjr.49.2024.04.24.16.32.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:32:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 32/33] target/s390x: Use translator_lduw in get_next_pc Date: Wed, 24 Apr 2024 16:31:30 -0700 Message-Id: <20240424233131.988727-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424233131.988727-1-richard.henderson@linaro.org> References: <20240424233131.988727-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/s390x/tcg/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index bac033c63c..ebd96abe6c 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -36,7 +36,6 @@ #include "tcg/tcg-op-gvec.h" #include "qemu/log.h" #include "qemu/host-utils.h" -#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" @@ -6471,7 +6470,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 = cpu_lduw_code(env, pc); + uint64_t insn = translator_lduw(env, &s->base, pc); return pc + get_ilen((insn >> 8) & 0xff); }