From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <michael.d.kinney@intel.com>
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
 (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 235FF219FFEDA
 for <edk2-devel@lists.01.org>; Tue, 23 May 2017 16:10:31 -0700 (PDT)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
 by orsmga105.jf.intel.com with ESMTP; 23 May 2017 16:10:31 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.38,383,1491289200"; d="scan'208";a="90972986"
Received: from mdkinney-mobl.amr.corp.intel.com ([10.241.98.52])
 by orsmga002.jf.intel.com with ESMTP; 23 May 2017 16:10:30 -0700
From: Michael Kinney <michael.d.kinney@intel.com>
To: edk2-devel@lists.01.org
Cc: Star Zeng <star.zeng@intel.com>, Eric Dong <eric.dong@intel.com>,
 Andrew Fish <afish@apple.com>,
 Michael D Kinney <michael.d.kinney@intel.com>
Date: Tue, 23 May 2017 16:10:27 -0700
Message-Id: <1495581027-18592-3-git-send-email-michael.d.kinney@intel.com>
X-Mailer: git-send-email 2.6.3.windows.1
In-Reply-To: <1495581027-18592-1-git-send-email-michael.d.kinney@intel.com>
References: <1495581027-18592-1-git-send-email-michael.d.kinney@intel.com>
Subject: [Patch 2/2] MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Tue, 23 May 2017 23:10:31 -0000

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>
---
 MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S b/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
index 7f0919e..fcc6838 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
-- 
2.6.3.windows.1