diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2018-08-24 13:16:57 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2018-08-31 10:40:13 +0800 |
| commit | f89c018f3dec056e28d38686ba0778597227949e (patch) | |
| tree | 213de5d6054480b9cd9ea985e503af1b13fe29d8 /EmulatorPkg | |
| parent | e3c96c391c5e76274a0b4e4d052f5062187f00d3 (diff) | |
| download | edk2-f89c018f3dec056e28d38686ba0778597227949e.tar.gz edk2-f89c018f3dec056e28d38686ba0778597227949e.tar.bz2 edk2-f89c018f3dec056e28d38686ba0778597227949e.zip | |
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>
Diffstat (limited to 'EmulatorPkg')
| -rw-r--r-- | EmulatorPkg/EmulatorPkg.dsc | 6 | ||||
| -rw-r--r-- | EmulatorPkg/Win/Host/WinBlockIo.c | 2 | ||||
| -rw-r--r-- | EmulatorPkg/Win/Host/WinHost.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index ee85c9ef64..72e8aa1788 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -22,11 +22,7 @@ PLATFORM_GUID = 05FD064D-1073-E844-936C-A0E16317107D
PLATFORM_VERSION = 0.3
DSC_SPECIFICATION = 0x00010005
-!if $(BUILD_32)
- OUTPUT_DIRECTORY = Build/Emulator32
-!else
- OUTPUT_DIRECTORY = Build/Emulator
-!endif
+ OUTPUT_DIRECTORY = Build/Emulator$(ARCH)
SUPPORTED_ARCHITECTURES = X64|IA32
BUILD_TARGETS = DEBUG|RELEASE
diff --git a/EmulatorPkg/Win/Host/WinBlockIo.c b/EmulatorPkg/Win/Host/WinBlockIo.c index d5944c4227..bae907c705 100644 --- a/EmulatorPkg/Win/Host/WinBlockIo.c +++ b/EmulatorPkg/Win/Host/WinBlockIo.c @@ -24,7 +24,7 @@ typedef struct { BOOLEAN Readonly;
HANDLE NtHandle;
- UINTN BlockSize;
+ UINT32 BlockSize;
EFI_BLOCK_IO_MEDIA *Media;
EMU_BLOCK_IO_PROTOCOL EmuBlockIo;
diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 0cf02044c2..9b98d5330f 100644 --- 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");
exit (1);
}
- SetMemN (TemporaryRam, TemporaryRamSize, PcdGet32 (PcdInitValueInTempStack));
+ SetMem32 (TemporaryRam, TemporaryRamSize, PcdGet32 (PcdInitValueInTempStack));
SecPrint (" OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n",
TemporaryRamSize / SIZE_1KB,
|