From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BE900210FCF7D for ; Mon, 27 Aug 2018 00:52:52 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Aug 2018 00:52:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,294,1531810800"; d="scan'208";a="86641650" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.8]) by orsmga002.jf.intel.com with ESMTP; 27 Aug 2018 00:52:51 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Hao Wu , Andrew Fish Date: Mon, 27 Aug 2018 15:53:26 +0800 Message-Id: <20180827075330.269224-7-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180827075330.269224-1-ruiyu.ni@intel.com> References: <20180827075330.269224-1-ruiyu.ni@intel.com> Subject: [PATCH 06/10] EmulatorPkg/Win: Enable 64bit (SEC, PEI, DXE all run at 64bit) X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 07:52:52 -0000 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Hao Wu Cc: Andrew Fish --- 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 7df7d42c7c..33c1ce21b0 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