[Patch v3 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Patch v3 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Michael D Kinney]

Use BaseLib MultuU64x64() to prevent intrinsics being added on IA32 builds.
Add acpiview to a version of the Shell that is build with ShellPkg.dsc to catch
this type of issue in ShellPkg builds.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>

Michael D Kinney (2):
  ShellPkg/AcpiView: Fix IA32 link error
  ShellPkg: Add shell with all commands integrated

 .../Parsers/Slit/SlitParser.c                 |  2 +-
 ShellPkg/ShellPkg.dsc                         | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

-- 
2.21.0.windows.1

[Patch v3 1/2] ShellPkg/AcpiView: Fix IA32 link error

[Michael D Kinney]

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

Update SLIT_ELEMENT() macro to use MultU64x64() to
perform multiplication on 64-bit operands.  This is
required to avoid use of an intrinsic on IA32 VS20xx
builds.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
index 1f9dac66ee..ca2808db52 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
@@ -30,7 +30,7 @@ STATIC CONST ACPI_PARSER SlitParser[] = {
 /**
   Macro to get the value of a System Locality
 **/
-#define SLIT_ELEMENT(Ptr, i, j) *(Ptr + (i * LocalityCount) + j)
+#define SLIT_ELEMENT(Ptr, i, j) *(Ptr + (MultU64x64 (i, LocalityCount)) + j)
 
 /**
   This function parses the ACPI SLIT table.
-- 
2.21.0.windows.1

[Patch v3 2/2] ShellPkg: Add shell with all commands integrated

[Michael D Kinney]

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

Update ShellPkg DSC file to build an extra version of
the Shell with all commands integrated.  This verifies
that the shell can build in this max configuration.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 6a139b3b91..b2065dc028 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -1,7 +1,7 @@
 ##  @file
 # Shell Package
 #
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2018, Arm Limited. All rights reserved.<BR>
 #
 #    SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -115,6 +115,26 @@ [Components]
 !endif #$(NO_SHELL_PROFILES)
   }
 
+  #
+  # Build a second version of the shell with all commands integrated
+  #
+  ShellPkg/Application/Shell/Shell.inf {
+   <Defines>
+      FILE_GUID = EA4BB293-2D7F-4456-A681-1F22F42CD0BC
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+    <LibraryClasses>
+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
+  }
+
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-- 
2.21.0.windows.1

Re: [Patch v3 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Gao, Zhichao]

Series: Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

Thanks,
Zhichao

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Saturday, August 3, 2019 9:47 AM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>; Sami Mujawar
> <sami.mujawar@arm.com>
> Subject: [Patch v3 0/2] ShellPkg: Fix IA32 build failure in acpiview
> 
> Use BaseLib MultuU64x64() to prevent intrinsics being added on IA32 builds.
> Add acpiview to a version of the Shell that is build with ShellPkg.dsc to catch
> this type of issue in ShellPkg builds.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Michael D Kinney (2):
>   ShellPkg/AcpiView: Fix IA32 link error
>   ShellPkg: Add shell with all commands integrated
> 
>  .../Parsers/Slit/SlitParser.c                 |  2 +-
>  ShellPkg/ShellPkg.dsc                         | 22 ++++++++++++++++++-
>  2 files changed, 22 insertions(+), 2 deletions(-)
> 
> --
> 2.21.0.windows.1

Re: [edk2-devel] [Patch v3 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Sami Mujawar]

For this patch series.

Tested-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D Kinney via Groups.Io
Sent: 03 August 2019 02:47 AM
To: devel@edk2.groups.io
Cc: Jaben Carsey <jaben.carsey@intel.com>; Ray Ni <ray.ni@intel.com>; Zhichao Gao <zhichao.gao@intel.com>; Sami Mujawar <Sami.Mujawar@arm.com>
Subject: [edk2-devel] [Patch v3 0/2] ShellPkg: Fix IA32 build failure in acpiview

Use BaseLib MultuU64x64() to prevent intrinsics being added on IA32 builds.
Add acpiview to a version of the Shell that is build with ShellPkg.dsc to catch this type of issue in ShellPkg builds.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>

Michael D Kinney (2):
  ShellPkg/AcpiView: Fix IA32 link error
  ShellPkg: Add shell with all commands integrated

 .../Parsers/Slit/SlitParser.c                 |  2 +-
 ShellPkg/ShellPkg.dsc                         | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

--
2.21.0.windows.1




IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Re: [edk2-devel] [Patch v3 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Carsey, Jaben]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

Thanks
-Jaben


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Sami Mujawar
> Sent: Monday, August 05, 2019 3:48 AM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>
> Subject: Re: [edk2-devel] [Patch v3 0/2] ShellPkg: Fix IA32 build failure in
> acpiview
> 
> For this patch series.
> 
> Tested-by: Sami Mujawar <sami.mujawar@arm.com>
> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> 
> Regards,
> 
> Sami Mujawar
> 
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> D Kinney via Groups.Io
> Sent: 03 August 2019 02:47 AM
> To: devel@edk2.groups.io
> Cc: Jaben Carsey <jaben.carsey@intel.com>; Ray Ni <ray.ni@intel.com>;
> Zhichao Gao <zhichao.gao@intel.com>; Sami Mujawar
> <Sami.Mujawar@arm.com>
> Subject: [edk2-devel] [Patch v3 0/2] ShellPkg: Fix IA32 build failure in
> acpiview
> 
> Use BaseLib MultuU64x64() to prevent intrinsics being added on IA32 builds.
> Add acpiview to a version of the Shell that is build with ShellPkg.dsc to catch
> this type of issue in ShellPkg builds.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Michael D Kinney (2):
>   ShellPkg/AcpiView: Fix IA32 link error
>   ShellPkg: Add shell with all commands integrated
> 
>  .../Parsers/Slit/SlitParser.c                 |  2 +-
>  ShellPkg/ShellPkg.dsc                         | 22 ++++++++++++++++++-
>  2 files changed, 22 insertions(+), 2 deletions(-)
> 
> --
> 2.21.0.windows.1
> 
> 
> 
> 
> IMPORTANT NOTICE: The contents of this email and any attachments are
> confidential and may also be privileged. If you are not the intended recipient,
> please notify the sender immediately and do not disclose the contents to any
> other person, use it for any purpose, or store or copy the information in any
> medium. Thank you.
> 
>