From patchwork Wed Aug 3 12:22:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12935427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8C3F7C19F28 for ; Wed, 3 Aug 2022 12:27:08 +0000 (UTC) Received: from localhost ([::1]:59988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJDSt-0002JF-4C for qemu-devel@archiver.kernel.org; Wed, 03 Aug 2022 08:27:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJDOh-0007nS-P0; Wed, 03 Aug 2022 08:22:47 -0400 Received: from [200.168.210.66] (port=61218 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJDOf-000706-8C; Wed, 03 Aug 2022 08:22:47 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 3 Aug 2022 09:22:35 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 59B928003B3; Wed, 3 Aug 2022 09:22:35 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-ppc@nongnu.org Cc: richard.henderson@linaro.org, danielhb413@gmail.com, "Lucas Mateus Castro (alqotel)" , Aurelien Jarno , Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , David Gibson , Greg Kurz , qemu-devel@nongnu.org (open list:All patches CC here) Subject: [RFC PATCH 1/3] target/ppc: Bugfix fadd/fsub result with OE/UE set Date: Wed, 3 Aug 2022 09:22:15 -0300 Message-Id: <20220803122217.20847-2-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220803122217.20847-1-lucas.araujo@eldorado.org.br> References: <20220803122217.20847-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 03 Aug 2022 12:22:35.0668 (UTC) FILETIME=[B6A22540:01D8A733] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Lucas Mateus Castro (alqotel)" As mentioned in the functions float_overflow_excp and float_underflow_excp, the result should be adjusted as mentioned in the ISA (subtracted 192/1536 from the exponent of the intermediate result if an overflow occurs with OE set and added 192/1536 to the exponent of the intermediate result if an underflow occurs with UE set), but at those functions the result has already been rounded so it is not possible to add/subtract from the intermediate result anymore. This patch creates a new function that receives the value that should be subtracted/added from the exponent if an overflow/underflow happens, to not leave some arbitrary numbers from the PowerISA in the middle of the FPU code. If these numbers are 0 the new functions just call the old ones. I used 2 values here for overflow and underflow, maybe it'd be better to just use the same ones, any thoughts? Signed-off-by: Lucas Mateus Castro (alqotel) --- An alternative I've thought was to always return the value adjusted if a overflow or underflow occurs and in float_underflow_excp and float_overflow_excp adjust it to inf/den/0 if OE/UE is 0, but I didn't saw many advantages to that approach. --- fpu/softfloat.c | 75 +++++++++++++++++++++++++++++++++++++++++ include/fpu/softfloat.h | 2 ++ target/ppc/fpu_helper.c | 10 ++++-- 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 4a871ef2a1..a407129dcb 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -268,6 +268,8 @@ typedef bool (*f64_check_fn)(union_float64 a, union_float64 b); typedef float32 (*soft_f32_op2_fn)(float32 a, float32 b, float_status *s); typedef float64 (*soft_f64_op2_fn)(float64 a, float64 b, float_status *s); +typedef float64 (*soft_f64_op2_int2_fn)(float64 a, float64 b, int c, int d, + float_status *s); typedef float (*hard_f32_op2_fn)(float a, float b); typedef double (*hard_f64_op2_fn)(double a, double b); @@ -401,6 +403,19 @@ float64_gen2(float64 xa, float64 xb, float_status *s, return soft(ua.s, ub.s, s); } +static inline float64 +float64_gen2_excp(float64 xa, float64 xb, int xc, int xd, float_status *s, + hard_f64_op2_fn hard, soft_f64_op2_fn soft, + soft_f64_op2_int2_fn soft_excp, f64_check_fn pre, + f64_check_fn post) +{ + if (xc || xd) { + return soft_excp(xa, xb, xc, xd, s); + } else { + return float64_gen2(xa, xb, s, hard, soft, pre, post); + } +} + /* * Classify a floating point number. Everything above float_class_qnan * is a NaN so cls >= float_class_qnan is any NaN. @@ -1929,6 +1944,39 @@ static double hard_f64_sub(double a, double b) return a - b; } +static float64 QEMU_SOFTFLOAT_ATTR +soft_f64_addsub_excp_en(float64 a, float64 b, int oe_sub, int ue_sum, + float_status *status, bool subtract) +{ + FloatParts64 pa, pb, *pr; + + float64_unpack_canonical(&pa, a, status); + float64_unpack_canonical(&pb, b, status); + pr = parts_addsub(&pa, &pb, status, subtract); + + if (unlikely(oe_sub && (pr->exp > 1023))) { + pr->exp -= oe_sub; + float_raise(float_flag_overflow, status); + } else if (unlikely(ue_sum && (pr->exp < -1022))) { + pr->exp += ue_sum; + float_raise(float_flag_underflow, status); + } + + return float64_round_pack_canonical(pr, status); +} + +static float64 soft_f64_add_excp_en(float64 a, float64 b, int oe_sub, + int ue_sum, float_status *status) +{ + return soft_f64_addsub_excp_en(a, b, oe_sub, ue_sum, status, false); +} + +static float64 soft_f64_sub_excp_en(float64 a, float64 b, int oe_sub, + int ue_sum, float_status *status) +{ + return soft_f64_addsub_excp_en(a, b, oe_sub, ue_sum, status, true); +} + static bool f32_addsubmul_post(union_float32 a, union_float32 b) { if (QEMU_HARDFLOAT_2F32_USE_FP) { @@ -1960,6 +2008,15 @@ static float64 float64_addsub(float64 a, float64 b, float_status *s, f64_is_zon2, f64_addsubmul_post); } +static float64 float64_addsub_excp_en(float64 a, float64 b, int oe_sum, + int ue_sub, float_status *s, + hard_f64_op2_fn hard, soft_f64_op2_fn soft, + soft_f64_op2_int2_fn soft_excp) +{ + return float64_gen2_excp(a, b, oe_sum, ue_sub, s, hard, soft, soft_excp, + f64_is_zon2, f64_addsubmul_post); +} + float32 QEMU_FLATTEN float32_add(float32 a, float32 b, float_status *s) { @@ -1984,6 +2041,24 @@ float64_sub(float64 a, float64 b, float_status *s) return float64_addsub(a, b, s, hard_f64_sub, soft_f64_sub); } +float64 QEMU_FLATTEN +float64_add_excp_en(float64 a, float64 b, int oe_sub, int ue_sum, + float_status *s) +{ + return float64_addsub_excp_en(a, b, oe_sub, ue_sum, s, + hard_f64_add, soft_f64_add, + soft_f64_add_excp_en); +} + +float64 QEMU_FLATTEN +float64_sub_excp_en(float64 a, float64 b, int oe_sub, int ue_sum, + float_status *s) +{ + return float64_addsub_excp_en(a, b, oe_sub, ue_sum, s, + hard_f64_sub, soft_f64_sub, + soft_f64_sub_excp_en); +} + static float64 float64r32_addsub(float64 a, float64 b, float_status *status, bool subtract) { diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 3dcf20e3a2..76bf628a29 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -772,7 +772,9 @@ float128 float64_to_float128(float64, float_status *status); *----------------------------------------------------------------------------*/ float64 float64_round_to_int(float64, float_status *status); float64 float64_add(float64, float64, float_status *status); +float64 float64_add_excp_en(float64, float64, int, int, float_status *status); float64 float64_sub(float64, float64, float_status *status); +float64 float64_sub_excp_en(float64, float64, int, int, float_status *status); float64 float64_mul(float64, float64, float_status *status); float64 float64_div(float64, float64, float_status *status); float64 float64_rem(float64, float64, float_status *status); diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 7ab6beadad..cb82c91340 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -529,7 +529,10 @@ static void float_invalid_op_addsub(CPUPPCState *env, int flags, /* fadd - fadd. */ float64 helper_fadd(CPUPPCState *env, float64 arg1, float64 arg2) { - float64 ret = float64_add(arg1, arg2, &env->fp_status); + int oe_sub = (FP_OE & env->fpscr) ? 1536 : 0; + int ue_add = (FP_UE & env->fpscr) ? 1536 : 0; + float64 ret = float64_add_excp_en(arg1, arg2, oe_sub, ue_add, + &env->fp_status); int flags = get_float_exception_flags(&env->fp_status); if (unlikely(flags & float_flag_invalid)) { @@ -554,7 +557,10 @@ float64 helper_fadds(CPUPPCState *env, float64 arg1, float64 arg2) /* fsub - fsub. */ float64 helper_fsub(CPUPPCState *env, float64 arg1, float64 arg2) { - float64 ret = float64_sub(arg1, arg2, &env->fp_status); + int oe_sub = (FP_OE & env->fpscr) ? 1536 : 0; + int ue_add = (FP_UE & env->fpscr) ? 1536 : 0; + float64 ret = float64_sub_excp_en(arg1, arg2, oe_sub, ue_add, + &env->fp_status); int flags = get_float_exception_flags(&env->fp_status); if (unlikely(flags & float_flag_invalid)) { From patchwork Wed Aug 3 12:22:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12935432 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9D5BDC19F28 for ; Wed, 3 Aug 2022 12:34:35 +0000 (UTC) Received: from localhost ([::1]:42556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJDa1-00024S-SW for qemu-devel@archiver.kernel.org; Wed, 03 Aug 2022 08:34:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJDOk-0007pq-Mf; Wed, 03 Aug 2022 08:22:50 -0400 Received: from [200.168.210.66] (port=61218 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJDOi-000706-R0; Wed, 03 Aug 2022 08:22:50 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 3 Aug 2022 09:22:35 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 87C778001D1; Wed, 3 Aug 2022 09:22:35 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-ppc@nongnu.org Cc: richard.henderson@linaro.org, danielhb413@gmail.com, "Lucas Mateus Castro (alqotel)" , Aurelien Jarno , Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , David Gibson , Greg Kurz , qemu-devel@nongnu.org (open list:All patches CC here) Subject: [RFC PATCH 2/3] target/ppc: Bugfix fmul result with OE/UE set Date: Wed, 3 Aug 2022 09:22:16 -0300 Message-Id: <20220803122217.20847-3-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220803122217.20847-1-lucas.araujo@eldorado.org.br> References: <20220803122217.20847-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 03 Aug 2022 12:22:35.0793 (UTC) FILETIME=[B6B53810:01D8A733] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Lucas Mateus Castro (alqotel)" Change fmul in the same way of fadd/fsub to handle overflow/underflow if OE/UE is set (i.e. function that receives a value to add/subtract from the exponent if an overflow/underflow occurs). Signed-off-by: Lucas Mateus Castro (alqotel) --- fpu/softfloat.c | 30 ++++++++++++++++++++++++++++++ include/fpu/softfloat.h | 1 + target/ppc/fpu_helper.c | 5 ++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index a407129dcb..e2b4ad4b63 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -2212,6 +2212,36 @@ float64_mul(float64 a, float64 b, float_status *s) f64_is_zon2, f64_addsubmul_post); } +static float64 QEMU_SOFTFLOAT_ATTR +soft_f64_mul_excp_en(float64 a, float64 b, int oe_sub, int ue_sum, + float_status *s) +{ + FloatParts64 pa, pb, *pr; + + float64_unpack_canonical(&pa, a, s); + float64_unpack_canonical(&pb, b, s); + pr = parts_mul(&pa, &pb, s); + + if (unlikely(oe_sub && (pr->exp > 1023))) { + pr->exp -= oe_sub; + float_raise(float_flag_overflow, s); + } else if (unlikely(ue_sum && (pr->exp < -1022))) { + pr->exp += ue_sum; + float_raise(float_flag_underflow, s); + } + + return float64_round_pack_canonical(pr, s); +} + +float64 QEMU_FLATTEN +float64_mul_excp_en(float64 a, float64 b, int oe_sub, int ue_sum, + float_status *status) +{ + return float64_gen2_excp(a, b, oe_sub, ue_sum, status, + hard_f64_mul, soft_f64_mul, soft_f64_mul_excp_en, + f64_is_zon2, f64_addsubmul_post); +} + float64 float64r32_mul(float64 a, float64 b, float_status *status) { FloatParts64 pa, pb, *pr; diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 76bf628a29..4ff56b0e10 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -776,6 +776,7 @@ float64 float64_add_excp_en(float64, float64, int, int, float_status *status); float64 float64_sub(float64, float64, float_status *status); float64 float64_sub_excp_en(float64, float64, int, int, float_status *status); float64 float64_mul(float64, float64, float_status *status); +float64 float64_mul_excp_en(float64, float64, int, int, float_status *status); float64 float64_div(float64, float64, float_status *status); float64 float64_rem(float64, float64, float_status *status); float64 float64_muladd(float64, float64, float64, int, float_status *status); diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index cb82c91340..18cf720743 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -595,7 +595,10 @@ static void float_invalid_op_mul(CPUPPCState *env, int flags, /* fmul - fmul. */ float64 helper_fmul(CPUPPCState *env, float64 arg1, float64 arg2) { - float64 ret = float64_mul(arg1, arg2, &env->fp_status); + int oe_sub = (FP_OE & env->fpscr) ? 1536 : 0; + int ue_sum = (FP_UE & env->fpscr) ? 1536 : 0; + float64 ret = float64_mul_excp_en(arg1, arg2, oe_sub, ue_sum, + &env->fp_status); int flags = get_float_exception_flags(&env->fp_status); if (unlikely(flags & float_flag_invalid)) { From patchwork Wed Aug 3 12:22:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12935440 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 86CB9C19F28 for ; Wed, 3 Aug 2022 12:41:15 +0000 (UTC) Received: from localhost ([::1]:52744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJDgW-0001G8-KV for qemu-devel@archiver.kernel.org; Wed, 03 Aug 2022 08:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJDOn-0007ss-Dv; Wed, 03 Aug 2022 08:22:53 -0400 Received: from [200.168.210.66] (port=61218 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJDOl-000706-RS; Wed, 03 Aug 2022 08:22:53 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 3 Aug 2022 09:22:35 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id B8EEE8003B3; Wed, 3 Aug 2022 09:22:35 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-ppc@nongnu.org Cc: richard.henderson@linaro.org, danielhb413@gmail.com, "Lucas Mateus Castro (alqotel)" , Aurelien Jarno , Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , David Gibson , Greg Kurz , qemu-devel@nongnu.org (open list:All patches CC here) Subject: [RFC PATCH 3/3] target/ppc: Bugfix fdiv result with OE/UE set Date: Wed, 3 Aug 2022 09:22:17 -0300 Message-Id: <20220803122217.20847-4-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220803122217.20847-1-lucas.araujo@eldorado.org.br> References: <20220803122217.20847-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 03 Aug 2022 12:22:35.0996 (UTC) FILETIME=[B6D431C0:01D8A733] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Lucas Mateus Castro (alqotel)" Change fdiv in the same way of fadd/fsub to handle overflow/underflow if OE/UE is set (i.e. function that receives a value to add/subtract from the exponent if an overflow/underflow occurs). Signed-off-by: Lucas Mateus Castro (alqotel) --- fpu/softfloat.c | 30 ++++++++++++++++++++++++++++++ include/fpu/softfloat.h | 1 + target/ppc/fpu_helper.c | 5 ++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index e2b4ad4b63..0e9d2d2678 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -2558,6 +2558,27 @@ soft_f64_div(float64 a, float64 b, float_status *status) return float64_round_pack_canonical(pr, status); } +static float64 QEMU_SOFTFLOAT_ATTR +soft_f64_div_excp_en(float64 a, float64 b, int oe_sub, int ue_sum, + float_status *status) +{ + FloatParts64 pa, pb, *pr; + + float64_unpack_canonical(&pa, a, status); + float64_unpack_canonical(&pb, b, status); + pr = parts_div(&pa, &pb, status); + + if (unlikely(oe_sub && (pr->exp > 1023))) { + pr->exp -= oe_sub; + float_raise(float_flag_overflow, status); + } else if (unlikely(ue_sum && (pr->exp < -1022))) { + pr->exp += ue_sum; + float_raise(float_flag_underflow, status); + } + + return float64_round_pack_canonical(pr, status); +} + static float hard_f32_div(float a, float b) { return a / b; @@ -2616,6 +2637,15 @@ float64_div(float64 a, float64 b, float_status *s) f64_div_pre, f64_div_post); } +float64 QEMU_FLATTEN +float64_div_excp_en(float64 a, float64 b, int oe_sub, int ue_sum, + float_status *s) +{ + return float64_gen2_excp(a, b, oe_sub, ue_sum, s, hard_f64_div, + soft_f64_div, soft_f64_div_excp_en, f64_div_pre, + f64_div_post); +} + float64 float64r32_div(float64 a, float64 b, float_status *status) { FloatParts64 pa, pb, *pr; diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 4ff56b0e10..a6c7885fcd 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -778,6 +778,7 @@ float64 float64_sub_excp_en(float64, float64, int, int, float_status *status); float64 float64_mul(float64, float64, float_status *status); float64 float64_mul_excp_en(float64, float64, int, int, float_status *status); float64 float64_div(float64, float64, float_status *status); +float64 float64_div_excp_en(float64, float64, int, int, float_status *status); float64 float64_rem(float64, float64, float_status *status); float64 float64_muladd(float64, float64, float64, int, float_status *status); float64 float64_sqrt(float64, float_status *status); diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 18cf720743..1a6869a920 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -635,7 +635,10 @@ static void float_invalid_op_div(CPUPPCState *env, int flags, /* fdiv - fdiv. */ float64 helper_fdiv(CPUPPCState *env, float64 arg1, float64 arg2) { - float64 ret = float64_div(arg1, arg2, &env->fp_status); + int oe_sub = (FP_OE & env->fpscr) ? 1536 : 0; + int ue_sum = (FP_UE & env->fpscr) ? 1536 : 0; + float64 ret = float64_div_excp_en(arg1, arg2, oe_sub, ue_sum, + &env->fp_status); int flags = get_float_exception_flags(&env->fp_status); if (unlikely(flags & float_flag_invalid)) {