From 62382925c90eb54de6413208f561b24a0b97e337 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Wed, 10 Jan 2018 23:24:28 +0800 Subject: [PATCH] MdeModulePkg: Update DebugSupportDxe to pass XCODE5 build XCODE5 doesn't support absolute addressing in the assembly code. This change uses lea instruction to get the address. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Andrew Fish Cc: Star Zeng Reviewed-by: Star Zeng --- MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm b/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm index 134842a68a..31d8b0a717 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm +++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm @@ -1,7 +1,7 @@ ;/** @file ; Low level x64 routines used by the debug support driver. ; -; Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+; Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at @@ -226,7 +226,7 @@ ASM_PFX(CommonIdtEntry): pop rax add rsp, 8 ; pop vector number mov [AppRsp], rsp ; save stack top - mov rsp, DebugStackBegin ; switch to debugger stack + lea rsp, [DebugStackBegin] ; switch to debugger stack sub rsp, 8 ; leave space for vector number ;; UINT64 Rdi, Rsi, Rbp, Rsp, Rbx, Rdx, Rcx, Rax; @@ -529,7 +529,7 @@ Chain: push rbx mov rax, cs push rax - mov rax, PhonyIretq + lea rax, [PhonyIretq] push rax iretq PhonyIretq: -- 2.39.2