Updater decimal_fast128_t / and % handling

Author: mborland

include/boost/decimal/decimal_fast128_t.hpp

@@ -1198,68 +1198,86 @@ constexpr auto d128f_div_impl(const decimal_fast128_t& lhs, const decimal_fast12
     const auto lhs_fp {fpclassify(lhs)};
     const auto rhs_fp {fpclassify(rhs)};
 
-    // NAN has to come first
-    if (lhs_fp == FP_NAN || rhs_fp == FP_NAN)
+    if (lhs_fp != FP_NORMAL || rhs_fp != FP_NORMAL)
     {
-        // Operations on an SNAN return a QNAN with the same payload
-        decimal_fast128_t return_nan {};
-        if (lhs_fp == FP_NAN)
+        // NAN has to come first
+        if (lhs_fp == FP_NAN || rhs_fp == FP_NAN)
         {
-            return_nan = issignaling(lhs) ? nan_conversion(lhs) : lhs;
-        }
-        else
-        {
-            return_nan = issignaling(rhs) ? nan_conversion(rhs) : rhs;
-        }
-
-        q = return_nan;
-        r = return_nan;
-
-        return;
-    }
-
-    switch (lhs_fp)
-    {
-        case FP_INFINITE:
-            if (rhs_fp == FP_INFINITE)
+            // Operations on an SNAN return a QNAN with the same payload
+            decimal_fast128_t return_nan {};
+            if (lhs_fp == rhs_fp)
             {
-                q = nan;
-                r = nan;
+                // They are both NANs
+                const bool lhs_signaling {issignaling(lhs)};
+                const bool rhs_signaling {issignaling(rhs)};
+
+                if (!lhs_signaling && rhs_signaling)
+                {
+                    return_nan = nan_conversion(rhs);
+                }
+                else
+                {
+                    return_nan = lhs_signaling ? nan_conversion(lhs) : lhs;
+                }
             }
-            else
-            {
-                q = sign ? -inf : inf;
-                r = zero;
-            }
-            return;
-        case FP_ZERO:
-            if (rhs_fp == FP_ZERO)
+            else if (lhs_fp == FP_NAN)
             {
-                q = nan;
-                r = nan;
+                return_nan = issignaling(lhs) ? nan_conversion(lhs) : lhs;
             }
             else
             {
-                q = sign ? -zero : zero;
-                r = sign ? -zero : zero;
+                return_nan = issignaling(rhs) ? nan_conversion(rhs) : rhs;
             }
-            return;
-        default:
-            static_cast<void>(lhs);
-    }
 
-    switch (rhs_fp)
-    {
-        case FP_ZERO:
-            q = inf;
-            r = zero;
-            return;
-        case FP_INFINITE:
-            q = sign ? -zero : zero;
-            r = lhs;
+            q = return_nan;
+            r = return_nan;
+
             return;
-        default:
-            static_cast<void>(rhs);
+        }
+
+        switch (lhs_fp)
+        {
+            case FP_INFINITE:
+                if (rhs_fp == FP_INFINITE)
+                {
+                    q = nan;
+                    r = nan;
+                }
+                else
+                {
+                    q = sign ? -inf : inf;
+                    r = zero;
+                }
+                return;
+            case FP_ZERO:
+                if (rhs_fp == FP_ZERO)
+                {
+                    q = nan;
+                    r = nan;
+                }
+                else
+                {
+                    q = sign ? -zero : zero;
+                    r = sign ? -zero : zero;
+                }
+                return;
+            default:
+                static_cast<void>(lhs);
+        }
+
+        switch (rhs_fp)
+        {
+            case FP_ZERO:
+                q = inf;
+                r = zero;
+                return;
+            case FP_INFINITE:
+                q = sign ? -zero : zero;
+                r = lhs;
+                return;
+            default:
+                static_cast<void>(rhs);
+        }
     }
     #else
     static_cast<void>(r);
@@ -1380,7 +1398,11 @@ constexpr auto operator%(const decimal_fast128_t& lhs, const decimal_fast128_t&
     decimal_fast128_t q {};
     decimal_fast128_t r {};
     d128f_div_impl(lhs, rhs, q, r);
-    d128f_mod_impl(lhs, rhs, q, r);
+
+    if (BOOST_DECIMAL_LIKELY(!isnan(q)))
+    {
+        d128f_mod_impl(lhs, rhs, q, r);
+    }
 
     return r;
 };