[Patch 1/4] BaseTools: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Patch 1/4] BaseTools: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Yonghong Zhu]

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

Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <afish@apple.com>
---
 BaseTools/Source/C/Common/Decompress.c           | 4 ++--
 BaseTools/Source/C/TianoCompress/TianoCompress.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/C/Common/Decompress.c b/BaseTools/Source/C/Common/Decompress.c
index 4b83e88..b2049bd 100644
--- a/BaseTools/Source/C/Common/Decompress.c
+++ b/BaseTools/Source/C/Common/Decompress.c
@@ -87,15 +87,15 @@ Arguments:
 
 Returns: (VOID)
 
 --*/
 {
-  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
+  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
 
   while (NumOfBits > Sd->mBitCount) {
 
-    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
+    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
 
     if (Sd->mCompSize > 0) {
       //
       // Get 1 byte into SubBitBuf
       //
diff --git a/BaseTools/Source/C/TianoCompress/TianoCompress.c b/BaseTools/Source/C/TianoCompress/TianoCompress.c
index f810511..046fb36 100644
--- a/BaseTools/Source/C/TianoCompress/TianoCompress.c
+++ b/BaseTools/Source/C/TianoCompress/TianoCompress.c
@@ -2064,15 +2064,15 @@ Arguments:
 
 Returns: (VOID)
 
 --*/
 {
-  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
+  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
 
   while (NumOfBits > Sd->mBitCount) {
 
-    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
+    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
 
     if (Sd->mCompSize > 0) {
       //
       // Get 1 byte into SubBitBuf
       //
-- 
2.6.1.windows.1

[Patch 2/4] DuetPkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Yonghong Zhu]

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

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <afish@apple.com>
---
 DuetPkg/EfiLdr/TianoDecompress.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DuetPkg/EfiLdr/TianoDecompress.c b/DuetPkg/EfiLdr/TianoDecompress.c
index b504e8e..86d82fc 100644
--- a/DuetPkg/EfiLdr/TianoDecompress.c
+++ b/DuetPkg/EfiLdr/TianoDecompress.c
@@ -91,15 +91,15 @@ Arguments:
 
 Returns: (VOID)
 
 --*/
 {
-  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
+  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
 
   while (NumOfBits > Sd->mBitCount) {
 
-    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
+    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
 
     if (Sd->mCompSize > 0) {
       //
       // Get 1 byte into SubBitBuf
       //
-- 
2.6.1.windows.1

[Patch 3/4] IntelFrameworkModulePkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Yonghong Zhu]

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

Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jeff Fan <jeff.fan@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <afish@apple.com>
---
 .../BaseUefiTianoCustomDecompressLib.c                                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
index e0ba053..4a4340b 100644
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
@@ -28,18 +28,18 @@ FillBuf (
   )
 {
   //
   // Left shift NumOfBits of bits in advance
   //
-  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
+  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
 
   //
   // Copy data needed in bytes into mSbuBitBuf
   //
   while (NumOfBits > Sd->mBitCount) {
 
-    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
+    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
 
     if (Sd->mCompSize > 0) {
       //
       // Get 1 byte into SubBitBuf
       //
-- 
2.6.1.windows.1

[Patch 4/4] MdePkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Yonghong Zhu]

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

Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <afish@apple.com>
---
 MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
index e3b2846..ce1fe0a 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
@@ -38,18 +38,18 @@ FillBuf (
   )
 {
   //
   // Left shift NumOfBits of bits in advance
   //
-  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
+  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
 
   //
   // Copy data needed in bytes into mSbuBitBuf
   //
   while (NumOfBits > Sd->mBitCount) {
 
-    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
+    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
 
     if (Sd->mCompSize > 0) {
       //
       // Get 1 byte into SubBitBuf
       //
-- 
2.6.1.windows.1

Re: [Patch 0/4] Fix Xcode 9 Beta treating 32-bit left shift as undefined behavior

[Zhu, Yonghong]

After apply those patches, build MdeModulePkg by VS2015 toolchain failed.

BaseUefiDecompressLib.lib(BaseUefiDecompressLib.obj) : error LNK2001: unresolved
 external symbol __allshl
d:\git\edk2_bak\Build\MdeModule\DEBUG_VS2015x86\IA32\MdeModulePkg\Core\Dxe\DxeMa
in\DEBUG\DxeCore.dll : fatal error LNK1120: 1 unresolved externals
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0
\Vc\bin\link.exe"' : return code '0x460'
Stop.

Best Regards,
Zhu Yonghong

-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
Sent: Wednesday, August 02, 2017 5:28 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [Patch 0/4] Fix Xcode 9 Beta treating 32-bit left shift as undefined behavior

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

Yonghong Zhu (4):
  BaseTools: Fix Xcode 9 Beta treating 32-bit left shift as undefined
  DuetPkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined
  IntelFrameworkModulePkg: Fix Xcode 9 Beta treating 32-bit left shift
    as undefined
  MdePkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

 BaseTools/Source/C/Common/Decompress.c                                | 4 ++--
 BaseTools/Source/C/TianoCompress/TianoCompress.c                      | 4 ++--
 DuetPkg/EfiLdr/TianoDecompress.c                                      | 4 ++--
 .../BaseUefiTianoCustomDecompressLib.c                                | 4 ++--
 MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

-- 
2.6.1.windows.1

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

Re: [Patch 4/4] MdePkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Marvin H?user]

Hello Yonghong and Andrew,

This patch may cause issues when compiling MSVC x IA32 as the optimizer might replace the shift with an intrinsic.
I suggest you to use LShiftU64() rather than the << operator.

Regards,
Marvin.

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Yonghong Zhu
> Sent: Wednesday, August 2, 2017 11:28 AM
> To: edk2-devel@lists.01.org
> Cc: Michael D Kinney <michael.d.kinney@intel.com>; Andrew Fish
> <afish@apple.com>; Liming Gao <liming.gao@intel.com>
> Subject: [edk2] [Patch 4/4] MdePkg: Fix Xcode 9 Beta treating 32-bit left shift
> as undefined
> 
> Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=635
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Andrew Fish <afish@apple.com>
> ---
>  MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
> b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
> index e3b2846..ce1fe0a 100644
> --- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
> +++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
> @@ -38,18 +38,18 @@ FillBuf (
>    )
>  {
>    //
>    // Left shift NumOfBits of bits in advance
>    //
> -  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
> +  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
> 
>    //
>    // Copy data needed in bytes into mSbuBitBuf
>    //
>    while (NumOfBits > Sd->mBitCount) {
> 
> -    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16)
> (NumOfBits - Sd->mBitCount)));
> +    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits =
> (UINT16) (NumOfBits - Sd->mBitCount)));
> 
>      if (Sd->mCompSize > 0) {
>        //
>        // Get 1 byte into SubBitBuf
>        //
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [Patch 2/4] DuetPkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Ni, Ruiyu]

I am surprised DuetPkg is still being used.

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Regards,
Ray

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
>Sent: Wednesday, August 2, 2017 5:28 PM
>To: edk2-devel@lists.01.org
>Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Andrew Fish <afish@apple.com>
>Subject: [edk2] [Patch 2/4] DuetPkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined
>
>Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=635
>
>Cc: Ruiyu Ni <ruiyu.ni@intel.com>
>Cc: Hao Wu <hao.a.wu@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Andrew Fish <afish@apple.com>
>---
> DuetPkg/EfiLdr/TianoDecompress.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/DuetPkg/EfiLdr/TianoDecompress.c b/DuetPkg/EfiLdr/TianoDecompress.c
>index b504e8e..86d82fc 100644
>--- a/DuetPkg/EfiLdr/TianoDecompress.c
>+++ b/DuetPkg/EfiLdr/TianoDecompress.c
>@@ -91,15 +91,15 @@ Arguments:
>
> Returns: (VOID)
>
> --*/
> {
>-  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
>+  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
>
>   while (NumOfBits > Sd->mBitCount) {
>
>-    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
>+    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
>
>     if (Sd->mCompSize > 0) {
>       //
>       // Get 1 byte into SubBitBuf
>       //
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel

Re: [Patch 2/4] DuetPkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

[Richardson, Brian]

I thought we considered this an obsolete package.
https://github.com/tianocore/tianocore.github.io/wiki/DuetPkg 

If this package is obsolete, the readme needs to be updated to reflect this information.
https://github.com/tianocore/edk2/tree/master/DuetPkg 

Thanks ... br
---
Brian Richardson, Senior Technical Marketing Engineer, Intel Software
brian.richardson@intel.com -- @intel_brian (Twitter & WeChat)
https://software.intel.com/en-us/meet-the-developers/evangelists/team/brian-richardson 

-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ni, Ruiyu
Sent: Wednesday, August 2, 2017 9:42 PM
To: Zhu, Yonghong <yonghong.zhu@intel.com>; edk2-devel@lists.01.org
Cc: Wu, Hao A <hao.a.wu@intel.com>; Andrew Fish <afish@apple.com>
Subject: Re: [edk2] [Patch 2/4] DuetPkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined

I am surprised DuetPkg is still being used.

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Regards,
Ray

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
>Sent: Wednesday, August 2, 2017 5:28 PM
>To: edk2-devel@lists.01.org
>Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Andrew Fish <afish@apple.com>
>Subject: [edk2] [Patch 2/4] DuetPkg: Fix Xcode 9 Beta treating 32-bit left shift as undefined
>
>Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=635
>
>Cc: Ruiyu Ni <ruiyu.ni@intel.com>
>Cc: Hao Wu <hao.a.wu@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Andrew Fish <afish@apple.com>
>---
> DuetPkg/EfiLdr/TianoDecompress.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/DuetPkg/EfiLdr/TianoDecompress.c b/DuetPkg/EfiLdr/TianoDecompress.c
>index b504e8e..86d82fc 100644
>--- a/DuetPkg/EfiLdr/TianoDecompress.c
>+++ b/DuetPkg/EfiLdr/TianoDecompress.c
>@@ -91,15 +91,15 @@ Arguments:
>
> Returns: (VOID)
>
> --*/
> {
>-  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
>+  Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
>
>   while (NumOfBits > Sd->mBitCount) {
>
>-    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
>+    Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
>
>     if (Sd->mCompSize > 0) {
>       //
>       // Get 1 byte into SubBitBuf
>       //
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel