Changeset 77669 in vbox

Timestamp:

Mar 12, 2019 4:34:13 PM (6 years ago)

Author:

vboxsync

Message:

EFI: Switched yasm to nasm, misc build fixes; work in progress.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (3 diffs)
• MdeModulePkg/Core/Dxe/Misc/Stall.c (modified) (1 diff)
• MdeModulePkg/Logo/LogoDxe.inf (modified) (1 diff)
• MdeModulePkg/Universal/Disk/PartitionDxe/Apple.c (modified) (2 diffs)
• MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c (modified) (1 diff)
• OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c (modified) (1 diff)
• OvmfPkg/PlatformPei/MemDetect.c (modified) (2 diffs)
• OvmfPkg/PlatformPei/Platform.c (modified) (2 diffs)
• ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf (modified) (1 diff)
• VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c (modified) (1 diff)
• VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c (modified) (1 diff)
• vbox-tools_def.txt (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/Config.kmk

@@ -45 +45 @@
 # VBox Yasm command
 VBOX_YASMCMD   ?= $(firstword $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/yasm$(HOSTSUFF_EXE)) yasm$(HOSTSUFF_EXE))
+
+# VBox nasm command
+include $(KBUILD_PATH)/tools/NASM.kmk
+TOOL_VBoxNasm = Our version of the NASM tool
+ifndef TOOL_VBoxNasm_PATH
+ TOOL_VBoxNasm_PATH   := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/nasm/v*.*)))
+ if "$(TOOL_VBoxNasm_PATH)" == "" && "$(KBUILD_DEVTOOLS_HST_ALT)" != ""
+  TOOL_VBoxNasm_PATH  := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/nasm/v*.*)))
+ endif
+endif
+ifneq ($(TOOL_VBoxNasm_PATH),)
+ VBOX_NASMCMD     ?= $(TOOL_VBoxNasm_PATH)/nasm$(HOSTSUFF_EXE)
+else
+ VBOX_NASMCMD     ?= nasm$(HOSTSUFF_EXE)
+endif
 
 # EFI requires python v2.x, so provide a way to select that while using 3.x for the rest of VBox.

trunk/src/VBox/Devices/EFI/FirmwareNew/Makefile.kmk

@@ -213 +213 @@
         -E 'PYTHONDONTWRITEBYTECODE=1' \
         -E 'IASL_BIN=$(VBOX_IASLCMD)' \
-        -E 'NASM_BIN=$(VBOX_YASMCMD)' \
+        -E 'NASM_BIN=$(VBOX_NASMCMD)' \
         -E 'CONF_PATH=$(abspath $(@D)/../../Conf)' \
         -E 'WORKSPACE=$(VBOX_PATH_EFI_FIRMWARE)' \
@@ -258 +258 @@
                 -e 's,@VBOX_IASLCMD@,$(VBOX_IASLCMD),' \
                 -e 's,@VBOX_YASMCMD@,$(VBOX_YASMCMD),' \
+                -e 's,@VBOX_NASMCMD@,$(VBOX_NASMCMD),' \
                 -e 's,@KMK@,$(MAKE),' \
                \
@@ -280 +281 @@
                 -e 's,@VBOX_IASLCMD@,$(VBOX_IASLCMD),' \
                 -e 's,@VBOX_YASMCMD@,$(VBOX_YASMCMD),' \
+                -e 's,@VBOX_NASMCMD@,$(VBOX_NASMCMD),' \
                 -e 's,@KMK@,$(MAKE),' \
                \

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Core/Dxe/Misc/Stall.c

@@ -69 +69 @@
   //
   if ((UINT64) Microseconds > 0x1999999999999999ULL) {
-#else
-  if (0) {
-#endif
     //
     // Microseconds is too large to multiple by 10 first.  Perform the divide

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Logo/LogoDxe.inf

@@ -26 +26 @@
 #  This flag specifies whether HII resource section is generated into PE image.
 #
-  UEFI_HII_RESOURCE_SECTION      = TRUE
+# VBOX -- 'true' requires a resource compiler (@todo).
+#  UEFI_HII_RESOURCE_SECTION      = TRUE
 
 #

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/Disk/PartitionDxe/Apple.c

@@ -106 +106 @@
   UINT32                    SubBlockSize;
   UINT32                    BlkPerSec;
+  EFI_PARTITION_INFO_PROTOCOL  PartitionInfo;
 
   VBoxLogFlowFuncMarkDP(DevicePath);
@@ -213 +214 @@
               DevicePath,
               (EFI_DEVICE_PATH_PROTOCOL *) &CdDev,
+              &PartitionInfo,
               CdDev.PartitionStart,
               CdDev.PartitionStart + CdDev.PartitionSize - 1,
-              SubBlockSize,
-              FALSE);
+              SubBlockSize);
 
           if (!EFI_ERROR (Status)) {

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c

@@ -232 +232 @@
       ZeroMem (&PartitionInfo, sizeof (EFI_PARTITION_INFO_PROTOCOL));
       PartitionInfo.Revision = EFI_PARTITION_INFO_PROTOCOL_REVISION;
-      PartitionInfo.Type     = PARTITION_TYPE_MBR;
-      if (Mbr->Partition[Index].OSIndicator == EFI_PARTITION) {
-        PartitionInfo.System = 1;
-      }
-      CopyMem (&PartitionInfo.Info.Mbr, &Mbr->Partition[Index], sizeof (MBR_PARTITION_RECORD));
+      PartitionInfo.Type     = PARTITION_TYPE_OTHER;
 
       Status = PartitionInstallChildHandle (

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c

@@ -26 +26 @@
 #define ACPI_TIMER_COUNT_SIZE  BIT24
 
-#ifdef VBOX
-UINT32 mPmba = 0x4000;
-
-#define PCI_BAR_IO             0x1
-#endif
-
-/**
-  The constructor function enables ACPI IO space.
-
-  If ACPI I/O space not enabled, this function will enable it.
-  It will always return RETURN_SUCCESS.
-
-  @retval EFI_SUCCESS   The constructor always returns RETURN_SUCCESS.
-
-**/
-#ifndef VBOX
-RETURN_STATUS
-EFIAPI
-AcpiTimerLibConstructor (
-  VOID
-  )
-{
-  //
-  // Check to see if the Power Management Base Address is already enabled
-  //
-  if ((PciRead8 (PMREGMISC) & PMIOSE) == 0) {
-    //
-    // If the Power Management Base Address is not programmed,
-    // then program the Power Management Base Address from a PCD.
-    //
-    PciAndThenOr32 (PMBA, (UINT32)(~0x0000FFC0), PcdGet16 (PcdAcpiPmBaseAddress));
-
-    //
-    // Enable PMBA I/O port decodes in PMREGMISC
-    //
-    PciOr8 (PMREGMISC, PMIOSE);
-  }
-
-  return RETURN_SUCCESS;
-}
-#else
-RETURN_STATUS
-EFIAPI
-AcpiTimerLibConstructor (
-  VOID
-  )
-{
-  UINT8     u8Device = 7;
-  UINT16    u16VendorID = 0;
-  UINT16    u16DeviceID = 0;
-  u16VendorID = PciRead16(PCI_LIB_ADDRESS(0, u8Device, 0, 0));
-  u16DeviceID = PciRead16(PCI_LIB_ADDRESS(0, u8Device, 0, 2));
-  if (   u16VendorID != 0x8086
-      || u16DeviceID != 0x7113)
-    return RETURN_ABORTED;
-
-  if (PciRead8 (PCI_LIB_ADDRESS (0,u8Device,0,0x80)) & 1) {
-    mPmba = PciRead32 (PCI_LIB_ADDRESS (0, u8Device, 0, 0x40));
-    ASSERT (mPmba & PCI_BAR_IO);
-    DEBUG((DEBUG_INFO, "%a:%d mPmba:%x\n", __FUNCTION__, __LINE__, mPmba));
-    mPmba &= ~PCI_BAR_IO;
-    DEBUG((DEBUG_INFO, "%a:%d mPmba:%x\n", __FUNCTION__, __LINE__, mPmba));
-  } else {
-    PciAndThenOr32 (PCI_LIB_ADDRESS (0,u8Device,0,0x40),
-                    (UINT32) ~0xfc0, mPmba);
-    PciOr8         (PCI_LIB_ADDRESS (0,u8Device,0,0x04), 0x01);
-    DEBUG((DEBUG_INFO, "%a:%d mPmba:%x\n", __FUNCTION__, __LINE__, mPmba));
-  }
-
-  //
-  // ACPI Timer enable is in Bus 0, Device ?, Function 3
-  //
-  PciOr8         (PCI_LIB_ADDRESS (0,u8Device,0,0x80), 0x01);
-  return RETURN_SUCCESS;
-}
-#endif
-
-/**
-  Internal function to read the current tick counter of ACPI.
-
-  Internal function to read the current tick counter of ACPI.
-
-  @return The tick counter read.
-
-**/
-UINT32
-InternalAcpiGetTimerTick (
-  VOID
-  )
-{
-  //
-  //   Read PMBA to read and return the current ACPI timer value.
-  //
-#ifndef VBOX
-  return IoRead32 ((PciRead32 (PMBA) & ~PMBA_RTE) + ACPI_TIMER_OFFSET);
-#else
-  return IoRead32 (mPmba + ACPI_TIMER_OFFSET);
-#endif
-}
-
-/**
-  Stalls the CPU for at least the given number of ticks.
+/**
   Stalls the CPU for at least the given number of ticks.
 

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/PlatformPei/MemDetect.c

@@ -725 +725 @@
 
   if (mBootMode == BOOT_ON_S3_RESUME) {
-    MemoryBase = PcdGet32 (PcdS3AcpiReservedMemoryBase);
-    MemorySize = PcdGet32 (PcdS3AcpiReservedMemorySize);
+    //
+    // Create the following memory HOB as an exception on the S3 boot path.
+    //
+    // Normally we'd create memory HOBs only on the normal boot path. However,
+    // CpuMpPei specifically needs such a low-memory HOB on the S3 path as
+    // well, for "borrowing" a subset of it temporarily, for the AP startup
+    // vector.
+    //
+    // CpuMpPei saves the original contents of the borrowed area in permanent
+    // PEI RAM, in a backup buffer allocated with the normal PEI services.
+    // CpuMpPei restores the original contents ("returns" the borrowed area) at
+    // End-of-PEI. End-of-PEI in turn is emitted by S3Resume2Pei before
+    // transferring control to the OS's wakeup vector in the FACS.
+    //
+    // We expect any other PEIMs that "borrow" memory similarly to CpuMpPei to
+    // restore the original contents. Furthermore, we expect all such PEIMs
+    // (CpuMpPei included) to claim the borrowed areas by producing memory
+    // allocation HOBs, and to honor preexistent memory allocation HOBs when
+    // looking for an area to borrow.
+    //
+    AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);
+    MemoryBase = 0;
+    MemorySize = BASE_512KB + BASE_128KB;
   } else {
     LowerMemorySize = GetSystemMemorySizeBelow4gb ();
@@ -752 +773 @@
 
   if (UpperMemorySize != 0) {
-    AddUntestedMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);
+    AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);
 
     MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/PlatformPei/Platform.c

@@ -232 +232 @@
   RETURN_STATUS PcdStatus;
 
-  PciIoBase = 0xC000;
-  PciIoSize = 0x4000;
-
 #ifdef VBOX
   EFI_PHYSICAL_ADDRESS RsdPtr;
@@ -241 +238 @@
   UINT64 McfgSize = 0;
 #endif
+  PciIoBase = 0xC000;
+  PciIoSize = 0x4000;
+
   //
   // Create Memory Type Information HOB

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

@@ -26 +26 @@
 #  This flag specifies whether HII resource section is generated into PE image.
 #
-  UEFI_HII_RESOURCE_SECTION      = TRUE
+# VBOX -- 'true' requires a resource compiler (@todo).
+#  UEFI_HII_RESOURCE_SECTION      = TRUE
 
 [Sources.common]

trunk/src/VBox/Devices/EFI/FirmwareNew/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c

@@ -501 +501 @@
     );
 
-  PcdSet32(PcdVideoHorizontalResolution, Private->ModeData[Private->GraphicsOutput.Mode->Mode].HorizontalResolution);
-  PcdSet32(PcdVideoVerticalResolution, Private->ModeData[Private->GraphicsOutput.Mode->Mode].VerticalResolution);
+  PcdSet32S(PcdVideoHorizontalResolution, Private->ModeData[Private->GraphicsOutput.Mode->Mode].HorizontalResolution);
+  PcdSet32S(PcdVideoVerticalResolution, Private->ModeData[Private->GraphicsOutput.Mode->Mode].VerticalResolution);
 
   return EFI_SUCCESS;

trunk/src/VBox/Devices/EFI/FirmwareNew/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c

@@ -400 +400 @@
     );
 
-  PcdSet32(PcdVideoHorizontalResolution, HorizontalResolution);
-  PcdSet32(PcdVideoVerticalResolution, VerticalResolution);
+  PcdSet32S(PcdVideoHorizontalResolution, HorizontalResolution);
+  PcdSet32S(PcdVideoVerticalResolution, VerticalResolution);
 
   return EFI_SUCCESS;

trunk/src/VBox/Devices/EFI/FirmwareNew/vbox-tools_def.txt

@@ -27 +27 @@
 DEFINE IASL_OUTFLAGS           = -p
 
-DEFINE NASM_BIN                = @VBOX_YASMCMD@
+DEFINE NASM_BIN                = @VBOX_NASMCMD@
 
 DEFINE MSFT_ASLPP_FLAGS        = /nologo /E /C /FIAutoGen.h
@@ -156 +156 @@
 NOOPT_VS2010_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
 
-# yasm does not like plain -g option, needs format type
-  DEBUG_VS2010_IA32_NASM_FLAGS    = -Ox -f win32 -g cv8
+  DEBUG_VS2010_IA32_NASM_FLAGS    = -Ox -f win32 -g
 RELEASE_VS2010_IA32_NASM_FLAGS    = -Ox -f win32
-NOOPT_VS2010_IA32_NASM_FLAGS      = -O0 -f win32 -g cv8
+NOOPT_VS2010_IA32_NASM_FLAGS      = -O0 -f win32 -g
 
   DEBUG_VS2010_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
@@ -190 +189 @@
 NOOPT_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
 
-# yasm does not like plain -g option, needs format type
-  DEBUG_VS2010_X64_NASM_FLAGS   = -Ox -f win64 -g cv8
+  DEBUG_VS2010_X64_NASM_FLAGS   = -Ox -f win64 -g
 RELEASE_VS2010_X64_NASM_FLAGS   = -Ox -f win64
-NOOPT_VS2010_X64_NASM_FLAGS     = -O0 -f win64 -g cv8
+NOOPT_VS2010_X64_NASM_FLAGS     = -O0 -f win64 -g
 
   DEBUG_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
@@ -366 +364 @@
 *_*_*_NASM_PATH                = DEF(NASM_BIN)
 # NASMB uses NASM produce a .bin from a .nasmb NASM source file
-*_*_*_NASMB_FLAGS              = -f bin -D__YASM__ -DASM_FORMAT_BIN -DVBOX
+#*_*_*_NASMB_FLAGS              = -f bin -D__YASM__ -DASM_FORMAT_BIN -DVBOX
+*_*_*_NASMB_FLAGS              = -f bin -DASM_FORMAT_BIN -DVBOX
 
 #################