Changeset 85755 in vbox for trunk/src/VBox

Timestamp:

Aug 14, 2020 8:34:17 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139904

Message:

Devices/EFI/FirmwarNew/VBoxPkg: Fix compilation on MSVC, bugref:4643

File:

• trunk/src/VBox/Devices/EFI/FirmwareNew/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c

@@ -60 +60 @@
     switch (cbType)
     {
+/*
+ * We have to cast the result to UINTN before indexing into the array
+ * or cl.exe insists on generating a call to __allmul for unoptimized 32bit builds,
+ * see: https://patchew.org/EDK2/[email protected]/
+ */
+#define VAL_NIBBLE_EXTRACT(a_uValue, a_iNibbleStart) (s_szHex[(UINTN)(RShiftU64((a_uValue), (a_iNibbleStart)) & 0xf)])
         case 8:
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 60) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 56) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 52) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 48) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 44) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 40) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 36) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 32) & 0xf]);
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 60));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 56));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 52));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 48));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 44));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 40));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 36));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 32));
         case 4:
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 28) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 24) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 20) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 16) & 0xf]);
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 28));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 24));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 20));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 16));
         case 2:
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue, 12) & 0xf]);
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue,  8) & 0xf]);
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue, 12));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue,  8));
         case 1:
-            vboxPrintHexChar(s_szHex[RShiftU64(uValue,  4) & 0xf]);
-            vboxPrintHexChar(s_szHex[         (uValue    ) & 0xf]);
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue,  4));
+            vboxPrintHexChar(VAL_NIBBLE_EXTRACT(uValue,  0));
             break;
+#undef VAL_NIBBLE_EXTRACT
     }
-    return cbType * 2;
+
+#if 0 /* There is no MultU32x32 for 32bit and cl insists on emitting __allmul otherwise so we just hardcode everything here... */
+    return cbType * 2; 
+#else
+    static size_t s_acbPrinted[9] = { 0, 2, 4, 0, 8, 0, 0, 0, 16};
+    if (cbType < RT_ELEMENTS(s_acbPrinted))
+        return s_acbPrinted[cbType];
+    return 0;
+#endif
 }
-