Changeset 67350 in vbox for trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c

Timestamp:

Jun 12, 2017 5:42:14 PM (8 years ago)

Author:

vboxsync

Message:

EFI/Firmware: fix compiler confusion caused by using ASMIntDisableFlags which resulted in truncated EFI debug output, plus some minor cleanup

File:

• trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c (modified) (9 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c

@@ -29 +29 @@
 *******************************************************************************/
 #include <Base.h>
+#include <Library/BaseLib.h>
 #include <Library/PrintLib.h>
 #include <Library/DebugLib.h>
@@ -38 +39 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include "DevEFI.h"
+#include "iprt/asm.h"
 
 #if 0
@@ -50 +52 @@
     VA_LIST     va;
     UINTN       cch;
-    RTCCUINTREG SavedFlags;
+    BOOLEAN     InterruptState;
 
     /* No pool noise, please. */
@@ -67 +69 @@
     szBuf[cch] = '\0';
 
+    InterruptState = SaveAndDisableInterrupts();
+
     /* Output the log string. */
-    SavedFlags = ASMIntDisableFlags();
-
     VBoxPrintString("dbg/");
     VBoxPrintHex(ErrorLevel, sizeof(ErrorLevel));
@@ -76 +78 @@
     VBoxPrintChar('\n');
 
-    ASMSetFlags(SavedFlags);
+    SetInterruptState(InterruptState);
 }
 
@@ -91 +93 @@
     CHAR8       szBuf[384];
     VA_LIST     va;
-    RTCCUINTREG SavedFlags;
+    BOOLEAN     InterruptState;
 
     /* Format it. */
@@ -99 +101 @@
     szBuf[sizeof(szBuf) - 1] = '\0';
 
+    InterruptState = SaveAndDisableInterrupts();
+
     /* Output the log string. */
-    SavedFlags = ASMIntDisableFlags();
-
     VBoxPrintString(szBuf);
     VBoxPrintChar('\n');
 
-    ASMSetFlags(SavedFlags);
+    SetInterruptState(InterruptState);
 }
 
@@ -157 +159 @@
 DebugAssert(IN CONST CHAR8 *FileName, IN UINTN LineNumber, IN CONST CHAR8 *Description)
 {
-    RTCCUINTREG SavedFlags = ASMIntDisableFlags();
+    BOOLEAN InterruptState = SaveAndDisableInterrupts();
 
     ASMOutU8(EFI_PANIC_PORT, EFI_PANIC_CMD_START_MSG);
@@ -169 +171 @@
     ASMOutU8(EFI_PANIC_PORT, EFI_PANIC_CMD_END_MSG);
 
-    ASMSetFlags(SavedFlags);
+    SetInterruptState(InterruptState);
 }