From 46c6b956affbbbe9514a37e901fad17fab84a63f Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Mon, 27 Nov 2017 09:38:08 +0800 Subject: OvmfPkg/Sec: Fix 64bit SEC build failure Original code breaks a single assembly code to multiple lines. But, when VS CL.exe preprocesses the FixedPcdGet32() macro invocation to the replacement text, it loses '\', and causes NASM to fail. Changing the multiple lines to one line to resolve the build failure. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Reviewed-by: Laszlo Ersek --- OvmfPkg/Sec/X64/SecEntry.nasm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'OvmfPkg/Sec') diff --git a/OvmfPkg/Sec/X64/SecEntry.nasm b/OvmfPkg/Sec/X64/SecEntry.nasm index 7c55032..d76adcf 100644 --- a/OvmfPkg/Sec/X64/SecEntry.nasm +++ b/OvmfPkg/Sec/X64/SecEntry.nasm @@ -45,10 +45,8 @@ ASM_PFX(_ModuleEntryPoint): ; Fill the temporary RAM with the initial stack value. ; The loop below will seed the heap as well, but that's harmless. ; - mov rax, (FixedPcdGet32 ( \ - PcdInitValueInTempStack \ - ) << 32) | \ - FixedPcdGet32 (PcdInitValueInTempStack) ; qword to store + mov rax, (FixedPcdGet32 (PcdInitValueInTempStack) << 32) | FixedPcdGet32 (PcdInitValueInTempStack) + ; qword to store mov rdi, FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) ; base address, ; relative to ; ES -- cgit v1.1