Changeset 72500 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Jun 11, 2018 11:05:32 AM (7 years ago)

Author:

vboxsync

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

122985

Message:

EFI: Log EFI module relocations, such as when an OS switches to its own virtual memory map. Needed to know where run-time EFI modules end up.

Location:

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

Files:

• VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.c (modified) (1 diff)
• VBoxPeCoffLib/BasePeCoff.c (modified) (2 diffs)

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

@@ -101 +101 @@
 }
 
+VOID
+EFIAPI
+VBoxPeCoffLoaderMoveImageExtraAction(
+  IN PHYSICAL_ADDRESS OldBase,
+  IN PHYSICAL_ADDRESS NewBase
+  )
+{
+    ASSERT(ImageContext != NULL);
+#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);
+}

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c

@@ -1332 +1332 @@
 }
 
+extern VOID EFIAPI VBoxPeCoffLoaderMoveImageExtraAction(IN PHYSICAL_ADDRESS OldBase, IN PHYSICAL_ADDRESS NewBase);
 
 /**
@@ -1388 +1389 @@
   EFI_FAT_IMAGE_HEADER                *Fat;
 
+  VBoxPeCoffLoaderMoveImageExtraAction(ImageBase, VirtImageBase);
+
   OldBase = (CHAR8 *)((UINTN)ImageBase);
   NewBase = (CHAR8 *)((UINTN)VirtImageBase);