From: Michael Kinney <michael.d.kinney@intel.com>
Date: Tue, 23 May 2017 19:22:37 +0000 (-0700)
Subject: MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure
X-Git-Tag: edk2-stable201903~3991
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=0fff7d6740419417b65361529612a49a6a2b96b2;hp=c8206f22fd2fb6e72c291304d38d8d1ddee732ce

MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure

https://bugzilla.tianocore.org/show_bug.cgi?id=572

Update X64 AsmFuncs.S to resolve a build failure using the
XCODE5 tool chain.  This change updates AsmFuncs.S to match
AsmFuncs.asm and AsmFuncs.nasm.

The error generated in XCODE5 build is:

error: invalid instruction mnemonic 'movzxw'
    movzxw 8(%rax), %rax
    ^~~~~~

The correct instruction is

    movzwq 8(%rax), %rax

Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Andrew Fish <afish@apple.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Andrew Fish <afish@apple.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
---

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S b/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
index 7f0919ee1b..fcc6838827 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
+++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
@@ -1,7 +1,7 @@
 ///**@file
 // Low leve x64 specific debug support functions.
 //
-// Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 // Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
@@ -275,7 +275,7 @@ ExtraPushDone:
                 pushq   %rax
                 # CS from application is one entry back in application stack
                 movq    ASM_PFX(AppRsp)(%rip), %rax
-                movzxw  8(%rax), %rax
+                movzwq  8(%rax), %rax
                 pushq   %rax
 
                 mov     %ds, %rax