[edk2-devel] [PATCH v2 2/2] DynamicTablesPkg: Fix IA32 compilation errors

["Abdul Lateef Attar via groups.io" <AbdulLateef.Attar=amd.com@groups.io>]

From: Abdul Lateef Attar <AbdulLateef.Attar@amd.com>

Add the support for X64 compilation to the CI.
- Fix the signed and unsigned variable comparision.
  warning C4018: '>': signed/unsigned mismatch
- Fix the NOOPT build error for IA32 by replacing
  64bit shift operator with LShiftU64.

Cc: Pierre Gondois <pierre.gondois@arm.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Abdul Lateef Attar <AbdulLateef.Attar@amd.com>
---
 DynamicTablesPkg/DynamicTablesPkg.dsc                         | 2 +-
 .../Common/TableHelperLib/ConfigurationManagerObjectParser.c  | 2 +-
 DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/DynamicTablesPkg.dsc
index a2db14efaf..2f35ac82f2 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dsc
+++ b/DynamicTablesPkg/DynamicTablesPkg.dsc
@@ -15,7 +15,7 @@
   PLATFORM_VERSION               = 0.1
   DSC_SPECIFICATION              = 0x0001001a
   OUTPUT_DIRECTORY               = Build/DynamicTables
-  SUPPORTED_ARCHITECTURES        = ARM|AARCH64|X64
+  SUPPORTED_ARCHITECTURES        = ARM|AARCH64|IA32|X64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
index ce494816ed..c1a7528419 100644
--- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
+++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
@@ -1130,7 +1130,7 @@ ParseCmObjDesc (
         &RemainingSize,
         1
         );
-      if ((RemainingSize > CmObjDesc->Size) ||
+      if ((RemainingSize > (INTN)CmObjDesc->Size) ||
           (RemainingSize < 0))
       {
         ASSERT (0);
diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c
index e33d6e656b..12c67b9811 100644
--- a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c
+++ b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c
@@ -170,7 +170,7 @@ AddAcpiHeader (
                                CfgMfrInfo->OemId[2],
                                CfgMfrInfo->OemId[3]
                                ) |
-                             ((UINT64)Generator->AcpiTableSignature << 32);
+                             LShiftU64 ((UINT64)Generator->AcpiTableSignature, 32);
   }
 
   // UINT32  OemRevision
@@ -257,7 +257,7 @@ AddSsdtAcpiHeader (
                    CfgMfrInfo->OemId[2],
                    CfgMfrInfo->OemId[3]
                    ) |
-                 ((UINT64)Generator->AcpiTableSignature << 32);
+                 LShiftU64 ((UINT64)Generator->AcpiTableSignature, 32);
   }
 
   if (AcpiTableInfo->OemRevision != 0) {
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113064): https://edk2.groups.io/g/devel/message/113064
Mute This Topic: https://groups.io/mt/103499170/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-