From: Ruiyu Ni <ruiyu.ni@intel.com>
To: edk2-devel@lists.01.org
Cc: Hao Wu <hao.a.wu@intel.com>, Andrew Fish <afish@apple.com>
Subject: [PATCH v2 5/9] EmulatorPkg/Win: Enable 64bit (SEC, PEI, DXE all run at 64bit)
Date: Thu, 30 Aug 2018 10:02:09 +0800 [thread overview]
Message-ID: <20180830020213.148968-6-ruiyu.ni@intel.com> (raw)
In-Reply-To: <20180830020213.148968-1-ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Andrew Fish <afish@apple.com>
---
EmulatorPkg/EmulatorPkg.dsc | 6 +-----
EmulatorPkg/Win/Host/WinBlockIo.c | 2 +-
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 @@ [Defines]
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,
--
2.16.1.windows.1
next prev parent reply other threads:[~2018-08-30 2:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-30 2:02 [PATCH v2 0/9] Quality improvement for EmulatorPkg Win Host Ruiyu Ni
2018-08-30 2:02 ` [PATCH v2 1/9] EmulatorPkg/EmuGopDxe: Fix TxtInEx.SetState SCT conformance failure Ruiyu Ni
2018-08-30 2:02 ` [PATCH v2 2/9] EmulatorPkg/EmuGopDxe: Clear screen to black in GOP.SetMode Ruiyu Ni
2018-08-30 2:02 ` [PATCH v2 3/9] EmulatorPkg/Win: Use FrameBufferBltLib for BLT operation Ruiyu Ni
2018-08-30 2:02 ` [PATCH v2 4/9] EmulatorPkg/Win: ReadKeyStrokeEx() always returns correct KeyState Ruiyu Ni
2018-08-30 2:02 ` Ruiyu Ni [this message]
2018-08-30 2:02 ` [PATCH v2 6/9] EmulatorPkg/AutoScanPei: Report the correct CPU address size Ruiyu Ni
2018-08-30 2:02 ` [PATCH v2 7/9] EmulatorPkg/Win: Add VS2017 project file Ruiyu Ni
2018-08-30 2:02 ` [PATCH v2 8/9] EmulatorPkg: Use MdeModulePkg/Bds module Ruiyu Ni
2018-08-30 2:02 ` [PATCH v2 9/9] EmulatorPkg: IoThunk->Close() is called too early, may causing hang Ruiyu Ni
2018-08-30 5:22 ` [PATCH v2 0/9] Quality improvement for EmulatorPkg Win Host Wu, Hao A
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180830020213.148968-6-ruiyu.ni@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox