Changeset 94336 in vbox

Timestamp:

Mar 23, 2022 1:59:05 PM (3 years ago)

Author:

vboxsync

Message:

IPRT: RTStrFormatR80/64/32 corrections. bugref:9898

File:

• trunk/src/VBox/Runtime/common/string/strformatfloat.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/string/strformatfloat.cpp

@@ -69 +69 @@
     if (RTFLOAT32U_IS_ZERO(pr32Value))
         return fSign
-             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+0"))
-             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-0"));
+             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-0"))
+             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+0"));
     if (RTFLOAT32U_IS_INF(pr32Value))
         return fSign
-             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Inf"))
-             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Inf"));
+             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Inf"))
+             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Inf"));
 
     /*
@@ -151 +151 @@
     if (RTFLOAT64U_IS_ZERO(pr64Value))
         return fSign
-             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+0"))
-             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-0"));
+             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-0"))
+             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+0"));
     if (RTFLOAT64U_IS_INF(pr64Value))
         return fSign
-             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Inf"))
-             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Inf"));
+             ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Inf"))
+             : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Inf"));
 
     /*
@@ -247 +247 @@
             && !fInteger)
             return fSign
-                 ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+0"))
-                 : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-0"));
+                 ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-0"))
+                 : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+0"));
         fDenormal = true;
     }
@@ -257 +257 @@
             if (!uFraction)
                 return fSign
-                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+PseudoInf"))
-                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-PseudoInf"));
+                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-PseudoInf"))
+                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+PseudoInf"));
             if (!(fFlags & RTSTR_F_SPECIAL))
                 return fSign
-                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+PseudoNan"))
-                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-PseudoNan"));
+                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-PseudoNan"))
+                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+PseudoNan"));
             pszTmp = (char *)memcpy(pszTmp, "PseudoNan[", 10) + 10;
         }
@@ -269 +269 @@
             if (!(uFraction & (RT_BIT_64(62) - 1)))
                 return fSign
-                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Inf"))
-                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Inf"));
+                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Inf"))
+                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Inf"));
             if (!(fFlags & RTSTR_F_SPECIAL))
                 return rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("SNan"));
@@ -279 +279 @@
             if (!(uFraction & (RT_BIT_64(62) - 1)))
                 return fSign
-                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Ind"))
-                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Ind"));
+                     ? rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-Ind"))
+                     : rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+Ind"));
             if (!(fFlags & RTSTR_F_SPECIAL))
                 return rtStrFormatCopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("QNan"));
@@ -302 +302 @@
     pszTmp += RTStrFormatNumber(pszTmp, (int32_t)uExponent - RTFLOAT80U_EXP_BIAS, 10, 0, 0,
                                 RTSTR_F_ZEROPAD | RTSTR_F_32BIT | RTSTR_F_VALSIGNED);
-    if (fDenormal && (fFlags & RTSTR_F_SPECIAL))
-    {
-        if (fInteger)
-            pszTmp = (char *)memcpy(pszTmp, "[PDn]", 5) + 5;
-        else
-            pszTmp = (char *)memcpy(pszTmp, "[Den]", 5) + 5;
+    if (fFlags & RTSTR_F_SPECIAL)
+    {
+        if (fDenormal)
+        {
+            if (fInteger)
+                pszTmp = (char *)memcpy(pszTmp, "[PDn]", 5) + 5;
+            else
+                pszTmp = (char *)memcpy(pszTmp, "[Den]", 5) + 5;
+        }
+        else if (!fInteger)
+            pszTmp = (char *)memcpy(pszTmp, "[Unn]", 5) + 5;
     }
     return rtStrFormatCopyOutStr(pszBuf, cbBuf, szTmp, pszTmp - &szTmp[0]);