From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 595E8C433DF for ; Thu, 6 Aug 2020 11:59:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0FF8622D00 for ; Thu, 6 Aug 2020 11:59:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="lgW18Pkq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FF8622D00 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3ZMx-0001JZ-Rz for qemu-devel@archiver.kernel.org; Thu, 06 Aug 2020 02:27:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3ZMF-0000l6-VY for qemu-devel@nongnu.org; Thu, 06 Aug 2020 02:26:31 -0400 Received: from mail-il1-x142.google.com ([2607:f8b0:4864:20::142]:38669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3ZMD-0002UZ-1G for qemu-devel@nongnu.org; Thu, 06 Aug 2020 02:26:31 -0400 Received: by mail-il1-x142.google.com with SMTP id 77so11043134ilc.5 for ; Wed, 05 Aug 2020 23:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mt6nafcYDXBHqhoxqxzppUqN1Mbd141VYL6QYeICKZE=; b=lgW18PkqshsXmcn9dVQ8KGxY42/Do4vmTx3Pl53MMI7078XnDaf1Xa1HJP2/tMv+wC h/GYtD7pEyQcIyBwYTe6ZP9yTeUMYXEXj5WCfROF/GOdGsW5wcPsd1HG7huHPob1nS86 sU4rD4Zt5CJ1iv1d50G6785Xmo629rDnYO/S+YoNhNIJUDRKGFNfnhhFJphj/q45dv/O qQf6CnRoIcKlOk4NK0LENWQ5GSmEnGOiNLOTaCKjlTPFZQtmF1vQydEQmDO0xg5aReCL IYYpX8TS8D9Clwrapn4NvgNA0Xs/Xxrm7waqHyb1GKJ6ji6AJV+DlxXFp2pv3FFLDiqX 1uIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mt6nafcYDXBHqhoxqxzppUqN1Mbd141VYL6QYeICKZE=; b=RnOT3bpIbHI+2dZzVPQ4Th51X9DZ5chGM8CYALhoLfGQmbE2eZqD+uga1/AUYP8SLa 8Lv8kPuJOJ7/GPH+swZTWt5n8d+Q3fY8ccwww+22oBTfwrZuwVTejBzittKmu1sI0ewu 0DUe9EnGWvPOpeVo5nm3Ra4YJNRTKT3GGNv9PxNdWXscClyH4UFvpVWqIsMZk7MkSBKJ npweQBLZB67V/5+24+yaunq9lcOvomww0SUTrDBzLaHjpfsjQyC2HX2oJL3/Lv7Jqrhy IEo+NHvdN8cMCnAdKSGUgKCIsiY0us4slebuKpx+ti4IKPhEqf1xsFx/5iR8apLkXxCh jPJQ== X-Gm-Message-State: AOAM5313t2W8aiH8pweQn3bXuMPXAuxOba/ECs9TBPv0IKOFNuSg2/kQ FM8Z2L3HD8kzODRo86eoqYJju+6+3rcFweTTRjHKzQ== X-Google-Smtp-Source: ABdhPJwleaJLxsgrzPqKgoaNRjk67FSfc3Zntjpz4nJgMSlilBe1/NCICLlynpt+COWGu9wjxSIJ/VGCN/4+fGOaEJM= X-Received: by 2002:a05:6e02:1213:: with SMTP id a19mr8520911ilq.129.1596695187804; Wed, 05 Aug 2020 23:26:27 -0700 (PDT) MIME-Version: 1.0 References: <20200724002807.441147-1-richard.henderson@linaro.org> <20200724002807.441147-5-richard.henderson@linaro.org> In-Reply-To: <20200724002807.441147-5-richard.henderson@linaro.org> From: Chih-Min Chao Date: Thu, 6 Aug 2020 14:26:17 +0800 Message-ID: Subject: Re: [PATCH v2 4/7] target/riscv: Check nanboxed inputs to fp helpers To: Richard Henderson Content-Type: multipart/alternative; boundary="0000000000007beffe05ac2f91b6" Received-SPF: pass client-ip=2607:f8b0:4864:20::142; envelope-from=chihmin.chao@sifive.com; helo=mail-il1-x142.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Frank Chang , Alistair Francis , "open list:RISC-V" , "qemu-devel@nongnu.org Developers" , liuzhiwei Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000007beffe05ac2f91b6 Content-Type: text/plain; charset="UTF-8" On Fri, Jul 24, 2020 at 8:29 AM Richard Henderson < richard.henderson@linaro.org> wrote: > If a 32-bit input is not properly nanboxed, then the input is > replaced with the default qnan. > > Signed-off-by: Richard Henderson > --- > target/riscv/internals.h | 11 +++++++ > target/riscv/fpu_helper.c | 64 ++++++++++++++++++++++++++++----------- > 2 files changed, 57 insertions(+), 18 deletions(-) > > diff --git a/target/riscv/internals.h b/target/riscv/internals.h > index 9f4ba7d617..f1a546dba6 100644 > --- a/target/riscv/internals.h > +++ b/target/riscv/internals.h > @@ -43,4 +43,15 @@ static inline uint64_t nanbox_s(float32 f) > return f | MAKE_64BIT_MASK(32, 32); > } > > +static inline float32 check_nanbox_s(uint64_t f) > +{ > + uint64_t mask = MAKE_64BIT_MASK(32, 32); > + > + if (likely((f & mask) == mask)) { > + return (uint32_t)f; > + } else { > + return 0x7fc00000u; /* default qnan */ > + } > +} > + > #endif > diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c > index 72541958a7..bb346a8249 100644 > --- a/target/riscv/fpu_helper.c > +++ b/target/riscv/fpu_helper.c > @@ -81,9 +81,12 @@ void helper_set_rounding_mode(CPURISCVState *env, > uint32_t rm) > set_float_rounding_mode(softrm, &env->fp_status); > } > > -static uint64_t do_fmadd_s(CPURISCVState *env, uint64_t frs1, uint64_t > frs2, > - uint64_t frs3, int flags) > +static uint64_t do_fmadd_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2, > + uint64_t rs3, int flags) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > + float32 frs3 = check_nanbox_s(rs3); > return nanbox_s(float32_muladd(frs1, frs2, frs3, flags, > &env->fp_status)); > } > > @@ -139,74 +142,97 @@ uint64_t helper_fnmadd_d(CPURISCVState *env, > uint64_t frs1, uint64_t frs2, > float_muladd_negate_product, &env->fp_status); > } > > -uint64_t helper_fadd_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > +uint64_t helper_fadd_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return nanbox_s(float32_add(frs1, frs2, &env->fp_status)); > } > > -uint64_t helper_fsub_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > +uint64_t helper_fsub_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return nanbox_s(float32_sub(frs1, frs2, &env->fp_status)); > } > > -uint64_t helper_fmul_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > +uint64_t helper_fmul_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return nanbox_s(float32_mul(frs1, frs2, &env->fp_status)); > } > > -uint64_t helper_fdiv_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > +uint64_t helper_fdiv_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return nanbox_s(float32_div(frs1, frs2, &env->fp_status)); > } > > -uint64_t helper_fmin_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > +uint64_t helper_fmin_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return nanbox_s(float32_minnum(frs1, frs2, &env->fp_status)); > } > > -uint64_t helper_fmax_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > +uint64_t helper_fmax_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return nanbox_s(float32_maxnum(frs1, frs2, &env->fp_status)); > } > > -uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t frs1) > +uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t rs1) > { > + float32 frs1 = check_nanbox_s(rs1); > return nanbox_s(float32_sqrt(frs1, &env->fp_status)); > } > > -target_ulong helper_fle_s(CPURISCVState *env, uint64_t frs1, uint64_t > frs2) > +target_ulong helper_fle_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return float32_le(frs1, frs2, &env->fp_status); > } > > -target_ulong helper_flt_s(CPURISCVState *env, uint64_t frs1, uint64_t > frs2) > +target_ulong helper_flt_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return float32_lt(frs1, frs2, &env->fp_status); > } > > -target_ulong helper_feq_s(CPURISCVState *env, uint64_t frs1, uint64_t > frs2) > +target_ulong helper_feq_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > + float32 frs1 = check_nanbox_s(rs1); > + float32 frs2 = check_nanbox_s(rs2); > return float32_eq_quiet(frs1, frs2, &env->fp_status); > } > > -target_ulong helper_fcvt_w_s(CPURISCVState *env, uint64_t frs1) > +target_ulong helper_fcvt_w_s(CPURISCVState *env, uint64_t rs1) > { > + float32 frs1 = check_nanbox_s(rs1); > return float32_to_int32(frs1, &env->fp_status); > } > > -target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t frs1) > +target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1) > { > + float32 frs1 = check_nanbox_s(rs1); > return (int32_t)float32_to_uint32(frs1, &env->fp_status); > } > > #if defined(TARGET_RISCV64) > -uint64_t helper_fcvt_l_s(CPURISCVState *env, uint64_t frs1) > +uint64_t helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1) > { > + float32 frs1 = check_nanbox_s(rs1); > return float32_to_int64(frs1, &env->fp_status); > } > > -uint64_t helper_fcvt_lu_s(CPURISCVState *env, uint64_t frs1) > +uint64_t helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1) > { > + float32 frs1 = check_nanbox_s(rs1); > return float32_to_uint64(frs1, &env->fp_status); > } > #endif > @@ -233,8 +259,9 @@ uint64_t helper_fcvt_s_lu(CPURISCVState *env, uint64_t > rs1) > } > #endif > > -target_ulong helper_fclass_s(uint64_t frs1) > +target_ulong helper_fclass_s(uint64_t rs1) > { > + float32 frs1 = check_nanbox_s(rs1); > return fclass_s(frs1); > } > > @@ -275,7 +302,8 @@ uint64_t helper_fcvt_s_d(CPURISCVState *env, uint64_t > rs1) > > uint64_t helper_fcvt_d_s(CPURISCVState *env, uint64_t rs1) > { > - return float32_to_float64(rs1, &env->fp_status); > + float32 frs1 = check_nanbox_s(rs1); > + return float32_to_float64(frs1, &env->fp_status); > } > > uint64_t helper_fsqrt_d(CPURISCVState *env, uint64_t frs1) > -- > 2.25.1 > > > Reviewed-by: Chih-Min Chao Chih-Min Chao --0000000000007beffe05ac2f91b6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, Jul 24, = 2020 at 8:29 AM Richard Henderson <richard.henderson@linaro.org> wrote:
If a 32-bit input is not properly nanboxed, then the input is replaced with the default qnan.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
=C2=A0target/riscv/internals.h=C2=A0 | 11 +++++++
=C2=A0target/riscv/fpu_helper.c | 64 ++++++++++++++++++++++++++++----------= -
=C2=A02 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/target/riscv/internals.h b/target/riscv/internals.h
index 9f4ba7d617..f1a546dba6 100644
--- a/target/riscv/internals.h
+++ b/target/riscv/internals.h
@@ -43,4 +43,15 @@ static inline uint64_t nanbox_s(float32 f)
=C2=A0 =C2=A0 =C2=A0return f | MAKE_64BIT_MASK(32, 32);
=C2=A0}

+static inline float32 check_nanbox_s(uint64_t f)
+{
+=C2=A0 =C2=A0 uint64_t mask =3D MAKE_64BIT_MASK(32, 32);
+
+=C2=A0 =C2=A0 if (likely((f & mask) =3D=3D mask)) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return (uint32_t)f;
+=C2=A0 =C2=A0 } else {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return 0x7fc00000u; /* default qnan */
+=C2=A0 =C2=A0 }
+}
+
=C2=A0#endif
diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c
index 72541958a7..bb346a8249 100644
--- a/target/riscv/fpu_helper.c
+++ b/target/riscv/fpu_helper.c
@@ -81,9 +81,12 @@ void helper_set_rounding_mode(CPURISCVState *env, uint32= _t rm)
=C2=A0 =C2=A0 =C2=A0set_float_rounding_mode(softrm, &env->fp_status)= ;
=C2=A0}

-static uint64_t do_fmadd_s(CPURISCVState *env, uint64_t frs1, uint64_t frs= 2,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0uint64_t frs3, int flags)
+static uint64_t do_fmadd_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2,=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0uint64_t rs3, int flags)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
+=C2=A0 =C2=A0 float32 frs3 =3D check_nanbox_s(rs3);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_muladd(frs1, frs2, frs3, flags,= &env->fp_status));
=C2=A0}

@@ -139,74 +142,97 @@ uint64_t helper_fnmadd_d(CPURISCVState *env, uint64_t= frs1, uint64_t frs2,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0float_muladd_negate_product, &env->fp_status= );
=C2=A0}

-uint64_t helper_fadd_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) +uint64_t helper_fadd_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_add(frs1, frs2, &env->fp= _status));
=C2=A0}

-uint64_t helper_fsub_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) +uint64_t helper_fsub_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_sub(frs1, frs2, &env->fp= _status));
=C2=A0}

-uint64_t helper_fmul_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) +uint64_t helper_fmul_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_mul(frs1, frs2, &env->fp= _status));
=C2=A0}

-uint64_t helper_fdiv_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) +uint64_t helper_fdiv_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_div(frs1, frs2, &env->fp= _status));
=C2=A0}

-uint64_t helper_fmin_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) +uint64_t helper_fmin_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_minnum(frs1, frs2, &env->= ;fp_status));
=C2=A0}

-uint64_t helper_fmax_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2) +uint64_t helper_fmax_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_maxnum(frs1, frs2, &env->= ;fp_status));
=C2=A0}

-uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t frs1)
+uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t rs1)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
=C2=A0 =C2=A0 =C2=A0return nanbox_s(float32_sqrt(frs1, &env->fp_stat= us));
=C2=A0}

-target_ulong helper_fle_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2= )
+target_ulong helper_fle_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)<= br> =C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return float32_le(frs1, frs2, &env->fp_status);<= br> =C2=A0}

-target_ulong helper_flt_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2= )
+target_ulong helper_flt_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)<= br> =C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return float32_lt(frs1, frs2, &env->fp_status);<= br> =C2=A0}

-target_ulong helper_feq_s(CPURISCVState *env, uint64_t frs1, uint64_t frs2= )
+target_ulong helper_feq_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2)<= br> =C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 float32 frs2 =3D check_nanbox_s(rs2);
=C2=A0 =C2=A0 =C2=A0return float32_eq_quiet(frs1, frs2, &env->fp_sta= tus);
=C2=A0}

-target_ulong helper_fcvt_w_s(CPURISCVState *env, uint64_t frs1)
+target_ulong helper_fcvt_w_s(CPURISCVState *env, uint64_t rs1)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
=C2=A0 =C2=A0 =C2=A0return float32_to_int32(frs1, &env->fp_status);<= br> =C2=A0}

-target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t frs1)
+target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
=C2=A0 =C2=A0 =C2=A0return (int32_t)float32_to_uint32(frs1, &env->fp= _status);
=C2=A0}

=C2=A0#if defined(TARGET_RISCV64)
-uint64_t helper_fcvt_l_s(CPURISCVState *env, uint64_t frs1)
+uint64_t helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
=C2=A0 =C2=A0 =C2=A0return float32_to_int64(frs1, &env->fp_status);<= br> =C2=A0}

-uint64_t helper_fcvt_lu_s(CPURISCVState *env, uint64_t frs1)
+uint64_t helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
=C2=A0 =C2=A0 =C2=A0return float32_to_uint64(frs1, &env->fp_status);=
=C2=A0}
=C2=A0#endif
@@ -233,8 +259,9 @@ uint64_t helper_fcvt_s_lu(CPURISCVState *env, uint64_t = rs1)
=C2=A0}
=C2=A0#endif

-target_ulong helper_fclass_s(uint64_t frs1)
+target_ulong helper_fclass_s(uint64_t rs1)
=C2=A0{
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
=C2=A0 =C2=A0 =C2=A0return fclass_s(frs1);
=C2=A0}

@@ -275,7 +302,8 @@ uint64_t helper_fcvt_s_d(CPURISCVState *env, uint64_t r= s1)

=C2=A0uint64_t helper_fcvt_d_s(CPURISCVState *env, uint64_t rs1)
=C2=A0{
-=C2=A0 =C2=A0 return float32_to_float64(rs1, &env->fp_status);
+=C2=A0 =C2=A0 float32 frs1 =3D check_nanbox_s(rs1);
+=C2=A0 =C2=A0 return float32_to_float64(frs1, &env->fp_status);
=C2=A0}

=C2=A0uint64_t helper_fsqrt_d(CPURISCVState *env, uint64_t frs1)
--
2.25.1



Reviewed-by: Chih-Min Chao <chihmin.chao@sifive.com>

Chih-Min Chao
=C2=A0
--0000000000007beffe05ac2f91b6--