EmulatorPkg/Win: Enable 64bit (SEC,PEI,DXE all run at 64bit)

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Cc: Andrew Fish <afish@apple.com>

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index ee85c9ef64cdc438fdba9fda9188c6e213493714..72e8aa1788c3bced81c6bf313d0fb71e81afe9a1 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -22,11 +22,7 @@
   PLATFORM_GUID                  = 05FD064D-1073-E844-936C-A0E16317107D\r
   PLATFORM_VERSION               = 0.3\r
   DSC_SPECIFICATION              = 0x00010005\r
-!if $(BUILD_32)\r
-  OUTPUT_DIRECTORY               = Build/Emulator32\r
-!else\r
-  OUTPUT_DIRECTORY               = Build/Emulator\r
-!endif\r
+  OUTPUT_DIRECTORY               = Build/Emulator$(ARCH)\r
 \r
   SUPPORTED_ARCHITECTURES        = X64|IA32\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r

diff --git a/EmulatorPkg/Win/Host/WinBlockIo.c b/EmulatorPkg/Win/Host/WinBlockIo.c
index d5944c42275c1268b50bdbe794c32d759a2d39d9..bae907c7052170b5e768f6107469a74172ef29a6 100644 (file)
--- a/EmulatorPkg/Win/Host/WinBlockIo.c
+++ b/EmulatorPkg/Win/Host/WinBlockIo.c
@@ -24,7 +24,7 @@ typedef struct {
   BOOLEAN                     Readonly;\r
 \r
   HANDLE                      NtHandle;\r
-  UINTN                       BlockSize;\r
+  UINT32                      BlockSize;\r
 \r
   EFI_BLOCK_IO_MEDIA          *Media;\r
   EMU_BLOCK_IO_PROTOCOL       EmuBlockIo;\r

diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c
index 0cf02044c26d9bf8aa50b1040988e67c1bfb56b1..9b98d5330f65a017bc122303da8194fee110ae5c 100644 (file)
--- a/EmulatorPkg/Win/Host/WinHost.c
+++ b/EmulatorPkg/Win/Host/WinHost.c
@@ -466,7 +466,7 @@ Returns:
     SecPrint ("ERROR : Can not allocate enough space for SecStack\n");\r
     exit (1);\r
   }\r
-  SetMemN (TemporaryRam, TemporaryRamSize, PcdGet32 (PcdInitValueInTempStack));\r
+  SetMem32 (TemporaryRam, TemporaryRamSize, PcdGet32 (PcdInitValueInTempStack));\r
 \r
   SecPrint ("  OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n",\r
     TemporaryRamSize / SIZE_1KB,\r