Changeset 60657 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-StrFormatV.c

Timestamp:

Apr 22, 2016 3:57:22 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: updates

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-StrFormatV.c (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-StrFormatV.c

@@ -436 +436 @@
             }
             State.fFlags |= STR_F_WIDTH;
+            ch = *pszFormat++;
         }
 
@@ -442 +443 @@
          */
         State.cchPrecision = 0;
-        if (RT_C_IS_DIGIT(ch))
-        {
-            do
-            {
-                State.cchPrecision *= 10;
-                State.cchPrecision  = ch - '0';
+        if (ch == '.')
+        {
+            ch = *pszFormat++;
+            if (RT_C_IS_DIGIT(ch))
+            {
+                do
+                {
+                    State.cchPrecision *= 10;
+                    State.cchPrecision  = ch - '0';
+                    ch = *pszFormat++;
+                } while (RT_C_IS_DIGIT(ch));
+                State.fFlags |= STR_F_PRECISION;
+            }
+            else if (ch == '*')
+            {
+                State.cchPrecision = va_arg(va, int);
+                if (State.cchPrecision < 0)
+                    State.cchPrecision = 0;
+                State.fFlags |= STR_F_PRECISION;
                 ch = *pszFormat++;
-            } while (RT_C_IS_DIGIT(ch));
-            State.fFlags |= STR_F_PRECISION;
-        }
-        else if (ch == '*')
-        {
-            State.cchPrecision = va_arg(va, int);
-            if (State.cchPrecision < 0)
-                State.cchPrecision = 0;
-            State.fFlags |= STR_F_PRECISION;
+            }
         }
 
@@ -651 +657 @@
                         State.fFlags &= ~(STR_F_PLUS | STR_F_BLANK);
                         State.uBase   = 16;
+                        break;
+                    case 'h':
+                        ch = *pszFormat++;
+                        if (ch == 'x')
+                        {
+                            /* Hex dumping. */
+                            uint8_t const BS3_FAR *pbHex = va_arg(va, uint8_t const BS3_FAR *);
+                            if (State.cchPrecision < 0)
+                                State.cchPrecision = 16;
+                            ch = *pszFormat++;
+                            if (ch == 's' || ch == 'd')
+                            {
+                                /* %Rhxd is currently implemented as %Rhxs. */
+                                while (State.cchPrecision-- > 0)
+                                {
+                                    uint8_t b = *pbHex++;
+                                    State.pfnOutput(g_achBs3HexDigits[b >> 4], State.pvUser);
+                                    State.pfnOutput(g_achBs3HexDigits[b & 0x0f], State.pvUser);
+                                    if (State.cchPrecision)
+                                        State.pfnOutput(' ', State.pvUser);
+                                }
+                            }
+                        }
+                        State.uBase   = 0;
                         break;
                     default: