public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [Patch 2/2] MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure
  2017-05-23 23:03 Michael Kinney
@ 2017-05-23 23:03 ` Michael Kinney
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Kinney @ 2017-05-23 23:03 UTC (permalink / raw)
  To: edk2-devel; +Cc: Star Zeng, Eric Dong, Andrew Fish, Michael D Kinney

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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures
@ 2017-05-23 23:10 Michael Kinney
  2017-05-23 23:10 ` [Patch 1/2] MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure Michael Kinney
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Michael Kinney @ 2017-05-23 23:10 UTC (permalink / raw)
  To: edk2-devel; +Cc: Andrew Fish, Star Zeng, Eric Dong, Michael D Kinney

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

Fix local variable type in RegularExpressionDxe and an X64
GAS(.S) file assembly instructon format in DebugSupportDxe.
Both of these are generatingf build failures with the 
XCODE5 tool chain when building MdeModulePkg.dsc.

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

Michael Kinney (2):
  MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure
  MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure

 MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S              | 4 ++--
 MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.6.3.windows.1



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Patch 1/2] MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure
  2017-05-23 23:10 [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Michael Kinney
@ 2017-05-23 23:10 ` Michael Kinney
  2017-05-23 23:10 ` [Patch 2/2] MdeModulePkg/DebugSupportDxe: " Michael Kinney
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Michael Kinney @ 2017-05-23 23:10 UTC (permalink / raw)
  To: edk2-devel; +Cc: Andrew Fish, Star Zeng, Eric Dong, Michael D Kinney

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

The ErrorMessage local variable in OnigurumaMatch() should
be type OnigUChar instead of type CHAR8.  This resolves
a build failure with the XCODE5 tool chain.

Cc: Andrew Fish <afish@apple.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
index a5ee7d5..cf325fc 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
@@ -88,7 +88,7 @@ OnigurumaMatch (
   OnigRegion      *Region;
   INT32           OnigResult;
   OnigErrorInfo   ErrorInfo;
-  CHAR8           ErrorMessage[ONIG_MAX_ERROR_MESSAGE_LEN];
+  OnigUChar       ErrorMessage[ONIG_MAX_ERROR_MESSAGE_LEN];
   UINT32          Index;
   OnigUChar       *Start;
   EFI_STATUS      Status;
-- 
2.6.3.windows.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Patch 2/2] MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure
  2017-05-23 23:10 [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Michael Kinney
  2017-05-23 23:10 ` [Patch 1/2] MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure Michael Kinney
@ 2017-05-23 23:10 ` Michael Kinney
  2017-05-24  0:58 ` [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Zeng, Star
  2017-05-24 23:42 ` Andrew Fish
  3 siblings, 0 replies; 6+ messages in thread
From: Michael Kinney @ 2017-05-23 23:10 UTC (permalink / raw)
  To: edk2-devel; +Cc: Star Zeng, Eric Dong, Andrew Fish, Michael D Kinney

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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures
  2017-05-23 23:10 [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Michael Kinney
  2017-05-23 23:10 ` [Patch 1/2] MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure Michael Kinney
  2017-05-23 23:10 ` [Patch 2/2] MdeModulePkg/DebugSupportDxe: " Michael Kinney
@ 2017-05-24  0:58 ` Zeng, Star
  2017-05-24 23:42 ` Andrew Fish
  3 siblings, 0 replies; 6+ messages in thread
From: Zeng, Star @ 2017-05-24  0:58 UTC (permalink / raw)
  To: Kinney, Michael D, edk2-devel@lists.01.org
  Cc: Kinney, Michael D, Andrew Fish, Dong, Eric, Zeng, Star

Reviewed-by: Star Zeng <star.zeng@intel.com> to this patch series.

Thanks,
Star
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Michael Kinney
Sent: Wednesday, May 24, 2017 7:10 AM
To: edk2-devel@lists.01.org
Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Andrew Fish <afish@apple.com>; Zeng, Star <star.zeng@intel.com>; Dong, Eric <eric.dong@intel.com>
Subject: [edk2] [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures

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

Fix local variable type in RegularExpressionDxe and an X64
GAS(.S) file assembly instructon format in DebugSupportDxe.
Both of these are generatingf build failures with the 
XCODE5 tool chain when building MdeModulePkg.dsc.

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

Michael Kinney (2):
  MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure
  MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure

 MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S              | 4 ++--
 MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.6.3.windows.1

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures
  2017-05-23 23:10 [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Michael Kinney
                   ` (2 preceding siblings ...)
  2017-05-24  0:58 ` [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Zeng, Star
@ 2017-05-24 23:42 ` Andrew Fish
  3 siblings, 0 replies; 6+ messages in thread
From: Andrew Fish @ 2017-05-24 23:42 UTC (permalink / raw)
  To: Mike Kinney; +Cc: edk2-devel, Star Zeng, Eric Dong

Reviewed-by: Andrew Fish <afish@apple.com <mailto:afish@apple.com>>

> On May 23, 2017, at 4:10 PM, Michael Kinney <michael.d.kinney@intel.com> wrote:
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=572
> 
> Fix local variable type in RegularExpressionDxe and an X64
> GAS(.S) file assembly instructon format in DebugSupportDxe.
> Both of these are generatingf build failures with the 
> XCODE5 tool chain when building MdeModulePkg.dsc.
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Michael Kinney (2):
>  MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure
>  MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure
> 
> MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S              | 4 ++--
> MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
> 
> -- 
> 2.6.3.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-05-24 23:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-23 23:10 [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Michael Kinney
2017-05-23 23:10 ` [Patch 1/2] MdeModulePkg/RegularExpressionDxe: Fix XCODE5 build failure Michael Kinney
2017-05-23 23:10 ` [Patch 2/2] MdeModulePkg/DebugSupportDxe: " Michael Kinney
2017-05-24  0:58 ` [Patch 0/2] MdeModulePkg: Fix XCODE5 build failures Zeng, Star
2017-05-24 23:42 ` Andrew Fish
  -- strict thread matches above, loose matches on Subject: below --
2017-05-23 23:03 Michael Kinney
2017-05-23 23:03 ` [Patch 2/2] MdeModulePkg/DebugSupportDxe: Fix XCODE5 build failure Michael Kinney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox