From nobody Mon Feb 9 05:40:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569226734; cv=none; d=zoho.com; s=zohoarc; b=Aj/EXa40OZdcK0nB02xP9FOoRpLUe40O63Zw/hm25Opg1M2mznp4S/eTM6Jk57lO0frz/fuuOzOh3cXXOd8Vb98ZuPZ79cTUMng3ecLZtxQyHU3PYJ4KC2mviCc0QDGnj6GDeQWJI3lM+ufjc6CAOiznZ132Cyy5S322d7cskvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569226734; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=QYDWtBeDEcq080AUvz+Fe9NHCB4RgHKthwMLQO93XW0=; b=X091NTxl5DjwH1T1jQObLGJ86nU+N9/jnqzDq0sRGPh6nmW19c5fqbxJhO6Nv1EA6Swiq6pCmP3qU0xn/7fEw64IMuiPMXiA17w5ppnZst6MNmLnRnbVBCZJJ/Lncx6o9eqWpS4HfYWwnb63q3WeBToVbvDqqwx7T1T9m2oRVoo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569226734279150.49881447723772; Mon, 23 Sep 2019 01:18:54 -0700 (PDT) Received: from localhost ([::1]:53474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCJYX-000347-Ps for importer@patchew.org; Mon, 23 Sep 2019 04:18:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42803) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCJNp-0001yK-ST for qemu-devel@nongnu.org; Mon, 23 Sep 2019 04:07:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCJNo-00045m-Oc for qemu-devel@nongnu.org; Mon, 23 Sep 2019 04:07:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCJNo-00045M-IS; Mon, 23 Sep 2019 04:07:44 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7704309BDF2; Mon, 23 Sep 2019 08:07:43 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-207.ams2.redhat.com [10.36.116.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE26819C78; Mon, 23 Sep 2019 08:07:41 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 11/30] s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-bit mode Date: Mon, 23 Sep 2019 10:06:53 +0200 Message-Id: <20190923080712.23951-12-david@redhat.com> In-Reply-To: <20190923080712.23951-1-david@redhat.com> References: <20190923080712.23951-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 23 Sep 2019 08:07:43 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , David Hildenbrand , Cornelia Huck , Richard Henderson , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Triggered by a review comment from Richard, also MVCOS has a 32-bit length in 24/31-bit addressing mode. Add a new helper. Rename wrap_length() to wrap_length31(). Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/mem_helper.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 20e1ac0ea9..320e9ee65c 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -528,7 +528,15 @@ static inline void set_address(CPUS390XState *env, int= reg, uint64_t address) } } =20 -static inline uint64_t wrap_length(CPUS390XState *env, uint64_t length) +static inline uint64_t wrap_length32(CPUS390XState *env, uint64_t length) +{ + if (!(env->psw.mask & PSW_MASK_64)) { + return (uint32_t)length; + } + return length; +} + +static inline uint64_t wrap_length31(CPUS390XState *env, uint64_t length) { if (!(env->psw.mask & PSW_MASK_64)) { /* 24-Bit and 31-Bit mode */ @@ -539,7 +547,7 @@ static inline uint64_t wrap_length(CPUS390XState *env, = uint64_t length) =20 static inline uint64_t get_length(CPUS390XState *env, int reg) { - return wrap_length(env, env->regs[reg]); + return wrap_length31(env, env->regs[reg]); } =20 static inline void set_length(CPUS390XState *env, int reg, uint64_t length) @@ -2378,7 +2386,7 @@ uint32_t HELPER(mvcos)(CPUS390XState *env, uint64_t d= est, uint64_t src, s390_program_interrupt(env, PGM_PRIVILEGED, 6, ra); } =20 - len =3D wrap_length(env, len); + len =3D wrap_length32(env, len); if (len > 4096) { cc =3D 3; len =3D 4096; --=20 2.21.0