From nobody Mon Feb 9 02:14:30 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768223965; cv=none; d=zohomail.com; s=zohoarc; b=lh/koRCkix7CZVHSVf+XLF2GcK7eZC+obqiNx2I0r9bIzoz1fSHLjq0AI4GD9ucKxm1HvxHrvy9jZ7nKxuYNyEf1vfNDNJl0mViQk625o/mfo7+fYQV4lNTFqdtp45+3ayqofghYoeCKfYW6OuCYOu6Kmg/QP9BDj1Q01ysmHZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768223965; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rN50g8yKxgmlRGKcD2wI0yamanQvPuWmPF6MPdjdOmI=; b=g26MbLAGBPFB9Uhdxf8NsppFraHD/yroC4ZHODGt85pF47CYp1UAWGOYhNQehfdVR+y9VzaWdKELc/kWeNpzuFJQ+myovnkww2J9d5+87p439L1/UkMgXKaLvx1c9facCDu5fP+hfeoJeAcBa0OhBAo9rFDSZVLahEad3HWNuDU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768223965435748.7010670117659; Mon, 12 Jan 2026 05:19:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfHoh-0003R0-Et; Mon, 12 Jan 2026 08:18:51 -0500 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 1vfHlX-0001Xr-44 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 08:15:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfHlV-0002Zw-DC for qemu-devel@nongnu.org; Mon, 12 Jan 2026 08:15:26 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-416-DOHOXD6hONS-o2ObhH718Q-1; Mon, 12 Jan 2026 08:15:23 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 77AE419560B9; Mon, 12 Jan 2026 13:15:22 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.179]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD32630001A2; Mon, 12 Jan 2026 13:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768223724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rN50g8yKxgmlRGKcD2wI0yamanQvPuWmPF6MPdjdOmI=; b=MK/xeBlX6CX3bxVv+eASHKf50XEdGR55xjUWxdjB3sx21vtWeXZeICI7F+HFXnuSlrfNxG x4Jn04tdiRqYtRdCJ2ArRuf0hqO+cVDnLWsL4iHRFtd94/EjXinAjnY+z0XM9pmdKzvQ19 CfNxqW8ZmKWUGzSoQgqAuJNS5O90Vp4= X-MC-Unique: DOHOXD6hONS-o2ObhH718Q-1 X-Mimecast-MFC-AGG-ID: DOHOXD6hONS-o2ObhH718Q_1768223722 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 09/15] target/s390x: Use vaddr for $pc in get_next_pc() Date: Mon, 12 Jan 2026 14:14:51 +0100 Message-ID: <20260112131457.67128-10-thuth@redhat.com> In-Reply-To: <20260112131457.67128-1-thuth@redhat.com> References: <20260112131457.67128-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768223967910158500 From: Philippe Mathieu-Daud=C3=A9 DisasContextBase::pc_next is of vaddr type. Since translator_lduw_end() returns a uint16_t, also use that type for clarity. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20260107130807.69870-4-philmd@linaro.org> Signed-off-by: Thomas Huth --- target/s390x/tcg/translate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index e38607ee18c..540c5a569c0 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6405,10 +6405,9 @@ static void s390x_tr_insn_start(DisasContextBase *dc= base, CPUState *cs) tcg_gen_insn_start(dc->base.pc_next, dc->cc_op, 0); } =20 -static target_ulong get_next_pc(CPUS390XState *env, DisasContext *s, - uint64_t pc) +static vaddr get_next_pc(CPUS390XState *env, DisasContext *s, vaddr pc) { - uint64_t insn =3D translator_lduw_end(env, &s->base, pc, MO_BE); + uint16_t insn =3D translator_lduw_end(env, &s->base, pc, MO_BE); =20 return pc + get_ilen((insn >> 8) & 0xff); } --=20 2.52.0