From nobody Sat Nov 8 10:13:37 2025 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550068743529951.533315290376; Wed, 13 Feb 2019 06:39:03 -0800 (PST) Received: from localhost ([127.0.0.1]:57784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtvgf-0003aZ-EB for importer@patchew.org; Wed, 13 Feb 2019 09:38:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtvbZ-0008Ic-HV for qemu-devel@nongnu.org; Wed, 13 Feb 2019 09:33:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtvbY-00028x-JQ for qemu-devel@nongnu.org; Wed, 13 Feb 2019 09:33:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41292) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtvbW-000258-AQ; Wed, 13 Feb 2019 09:33:40 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 76751C0D0863; Wed, 13 Feb 2019 14:33:33 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-173.ams2.redhat.com [10.36.116.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EF265D6AA; Wed, 13 Feb 2019 14:33:31 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 15:33:10 +0100 Message-Id: <20190213143322.31371-4-david@redhat.com> In-Reply-To: <20190213143322.31371-1-david@redhat.com> References: <20190213143322.31371-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 13 Feb 2019 14:33:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 03/15] s390x/tcg: Factor out conversion of softfloat exceptions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Janosch Frank , David Hildenbrand , Cornelia Huck , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We want to reuse that function in vector instruction context. While at it, cleanup the code, using defines for magic values and avoiding the handcrafted bit conversion. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/fpu_helper.c | 25 +++++++++++++------------ target/s390x/internal.h | 7 +++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/target/s390x/fpu_helper.c b/target/s390x/fpu_helper.c index 21236caed8..de02cf792d 100644 --- a/target/s390x/fpu_helper.c +++ b/target/s390x/fpu_helper.c @@ -36,10 +36,18 @@ =20 #define RET128(F) (env->retxl =3D F.low, F.high) =20 -#define convert_bit(mask, from, to) \ - (to < from \ - ? (mask / (from / to)) & to \ - : (mask & from) * (to / from)) +uint8_t s390_softfloat_exc_to_ieee(unsigned int exc) +{ + uint8_t s390_exc =3D 0; + + s390_exc |=3D (exc & float_flag_invalid) ? S390_IEEE_MASK_INVALID : 0; + s390_exc |=3D (exc & float_flag_divbyzero) ? S390_IEEE_MASK_DIVBYZERO = : 0; + s390_exc |=3D (exc & float_flag_overflow) ? S390_IEEE_MASK_OVERFLOW : = 0; + s390_exc |=3D (exc & float_flag_underflow) ? S390_IEEE_MASK_UNDERFLOW = : 0; + s390_exc |=3D (exc & float_flag_inexact) ? S390_IEEE_MASK_INEXACT : 0; + + return s390_exc; +} =20 /* Should be called after any operation that may raise IEEE exceptions. */ static void handle_exceptions(CPUS390XState *env, uintptr_t retaddr) @@ -53,14 +61,7 @@ static void handle_exceptions(CPUS390XState *env, uintpt= r_t retaddr) return; } env->fpu_status.float_exception_flags =3D 0; - - /* Convert softfloat exception bits to s390 exception bits. */ - s390_exc =3D 0; - s390_exc |=3D convert_bit(qemu_exc, float_flag_invalid, 0x80); - s390_exc |=3D convert_bit(qemu_exc, float_flag_divbyzero, 0x40); - s390_exc |=3D convert_bit(qemu_exc, float_flag_overflow, 0x20); - s390_exc |=3D convert_bit(qemu_exc, float_flag_underflow, 0x10); - s390_exc |=3D convert_bit(qemu_exc, float_flag_inexact, 0x08); + s390_exc =3D s390_softfloat_exc_to_ieee(qemu_exc); =20 /* Install the exceptions that we raised. */ env->fpc |=3D s390_exc << 16; diff --git a/target/s390x/internal.h b/target/s390x/internal.h index f2a771e2b4..e1c0b1bd3b 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -308,6 +308,13 @@ void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr= addr, uint32_t set_cc_nz_f32(float32 v); uint32_t set_cc_nz_f64(float64 v); uint32_t set_cc_nz_f128(float128 v); +#define S390_IEEE_MASK_INVALID 0x80 +#define S390_IEEE_MASK_DIVBYZERO 0x40 +#define S390_IEEE_MASK_OVERFLOW 0x20 +#define S390_IEEE_MASK_UNDERFLOW 0x10 +#define S390_IEEE_MASK_INEXACT 0x08 +#define S390_IEEE_MASK_QUANTUM 0x04 +uint8_t s390_softfloat_exc_to_ieee(unsigned int exc); =20 =20 /* gdbstub.c */ --=20 2.17.2