儲存庫 vbox 的更動 67350

時間撮記:

2017-6-12 下午05:42:14 (7 年 以前)

作者:

vboxsync

訊息:

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

位置:

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

檔案:

• VBoxDebugLib.c (修改) (9 筆差異)
• VBoxPrintChar.c (修改) (1 筆差異)
• VBoxPrintHex.c (修改) (1 筆差異)
• VBoxPrintHexDump.c (修改) (2 筆差異)
• VBoxPrintString.c (修改) (1 筆差異)

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);
 }
 

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

@@ -30 +30 @@
 #include "VBoxDebugLib.h"
 #include "DevEFI.h"
+#include "iprt/asm.h"
 
 

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

@@ -32 +32 @@
 #include "VBoxDebugLib.h"
 #include "DevEFI.h"
+#include "iprt/asm.h"
 
 

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

@@ -30 +30 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#include <ctype.h>
 #include "VBoxDebugLib.h"
 #include "DevEFI.h"
-#include <iprt/ctype.h>
+#include "iprt/asm.h"
 
 
@@ -80 +81 @@
         cchPrinted += VBoxPrintString("  ");
         for (i = 0; i < 16 && i < cb; i++)
-            cchPrinted += vboxPrintHexDumpChar(pb[i] == ' '
-                                               ? ' '
-                                               : RT_C_IS_GRAPH(pb[i])
+            cchPrinted += vboxPrintHexDumpChar(isprint(pb[i])
                                                ? pb[i]
                                                : '.');

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

@@ -31 +31 @@
 #include "VBoxDebugLib.h"
 #include "DevEFI.h"
+#include "iprt/asm.h"