EDK2: Enable XCODE5 tool chain with NASM source

[edk2] [Patch 3/7] MdeModulePkg: Update DebugSupportDxe to pass XCODE5 build

Posted by Liming Gao 6 years, 11 months ago

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 <liming.gao@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Star Zeng <star.zeng@intel.com>
---
 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.<BR>
+;  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
 ;  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.11.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch 3/7] MdeModulePkg: Update DebugSupportDxe to pass XCODE5 build

Posted by Zeng, Star 6 years, 11 months ago

Reviewed-by: Star Zeng <star.zeng@intel.com>


Thanks,
Star
-----Original Message-----
From: Gao, Liming 
Sent: Wednesday, January 10, 2018 11:24 PM
To: edk2-devel@lists.01.org
Cc: Andrew Fish <afish@apple.com>; Zeng, Star <star.zeng@intel.com>
Subject: [Patch 3/7] 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 <liming.gao@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Star Zeng <star.zeng@intel.com>
---
 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.<BR>
+;  Copyright (c) 2007 - 2018, Intel Corporation. All rights 
+reserved.<BR>
 ;  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.11.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel