Changeset 81010 in vbox

Timestamp:

Sep 25, 2019 5:22:00 PM (6 years ago)

Author:

vboxsync

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

133608

Message:

EFI/Firmware/PeCoffExtraActionLibDebug: Merge code from VBoxPeCoffExtraActionLib into here so we get the load addresses in VBox.log and support for the UDK debugger at the same time

Location:

trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug

Files:

• PeCoffExtraActionLib.c (modified) (4 diffs)
• PeCoffExtraActionLibDebug.inf (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLib.c

@@ -9 +9 @@
 #include <PeCoffExtraActionLib.h>
 
+#ifdef VBOX
+#include "VBoxPkg.h"
+#include "../../../../DevEFI.h"
+
+
+
+static void vboxImageEvtU64(uint32_t uCmd, uint64_t uValue)
+{
+    RTUINT64U u; /* 64-bit shift builtins. */
+    u.u = uValue;
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_MAKE(uCmd, u.au16[3]));
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_MAKE(uCmd, u.au16[2]));
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_MAKE(uCmd, u.au16[1]));
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_MAKE(uCmd, u.au16[0]));
+}
+
+static void vboxImageEvtString(uint32_t uCmd, const char *pszName)
+{
+    unsigned char uch;
+    while ((uch = *pszName++) != '\0')
+        ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_MAKE(uCmd, uch));
+}
+
+static void vboxImageEvtEmitOne(PE_COFF_LOADER_IMAGE_CONTEXT const *pImageCtx, uint32_t uEvt)
+{
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, uEvt);
+    if (pImageCtx->DestinationAddress)
+        vboxImageEvtU64(EFI_IMAGE_EVT_CMD_ADDR0, pImageCtx->DestinationAddress);
+    else
+        vboxImageEvtU64(EFI_IMAGE_EVT_CMD_ADDR0, pImageCtx->ImageAddress);
+    vboxImageEvtU64(EFI_IMAGE_EVT_CMD_SIZE0, pImageCtx->ImageSize);
+    if (pImageCtx->PdbPointer)
+        vboxImageEvtString(EFI_IMAGE_EVT_CMD_NAME, pImageCtx->PdbPointer);
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_CMD_COMPLETE);
+}
+#endif
+
+
+#ifdef VBOX_SOURCE_DEBUG_ENABLE
 /**
   Check if the hardware breakpoint in Drx is enabled by checking the Lx and Gx bit in Dr7.
@@ -190 +229 @@
   SetInterruptState (InterruptState);
 }
+#endif
 
 /**
@@ -204 +244 @@
   )
 {
+#ifdef VBOX_SOURCE_DEBUG_ENABLE
   PeCoffLoaderExtraActionCommon (ImageContext, IMAGE_LOAD_SIGNATURE);
+#endif
+
+#ifdef VBOX
+# if ARCH_BITS == 32
+  vboxImageEvtEmitOne(ImageContext, EFI_IMAGE_EVT_CMD_START_LOAD32);
+# else
+  vboxImageEvtEmitOne(ImageContext, EFI_IMAGE_EVT_CMD_START_LOAD64);
+# endif
+#endif
 }
 
@@ -221 +271 @@
   )
 {
+#ifdef VBOX_SOURCE_DEBUG_ENABLE
   PeCoffLoaderExtraActionCommon (ImageContext, IMAGE_UNLOAD_SIGNATURE);
-}
+#endif
+
+#ifdef VBOX
+# if ARCH_BITS == 32
+  vboxImageEvtEmitOne(ImageContext, EFI_IMAGE_EVT_CMD_START_UNLOAD32);
+# else
+  vboxImageEvtEmitOne(ImageContext, EFI_IMAGE_EVT_CMD_START_UNLOAD64);
+# endif
+#endif
+}
+
+#ifdef VBOX
+VOID
+EFIAPI
+VBoxPeCoffLoaderMoveImageExtraAction(
+  IN PHYSICAL_ADDRESS OldBase,
+  IN PHYSICAL_ADDRESS NewBase
+  )
+{
+#if ARCH_BITS == 32
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_CMD_START_RELOC32);
+#else
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_CMD_START_RELOC64);
+#endif
+    vboxImageEvtU64(EFI_IMAGE_EVT_CMD_ADDR0, NewBase);
+    vboxImageEvtU64(EFI_IMAGE_EVT_CMD_ADDR1, OldBase);
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_CMD_COMPLETE);
+}
+#endif

trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf

@@ -39 +39 @@
   MdePkg/MdePkg.dec
   SourceLevelDebugPkg/SourceLevelDebugPkg.dec
+  VBoxPkg/VBoxPkg.dec
 
 [LibraryClasses]