DynamicTablesPkg: Fix IA32 compilation errors

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>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
This commit is contained in:
Abdul Lateef Attar 2024-01-03 15:22:39 +05:30 committed by mergify[bot]
parent ea658e35a9
commit 16c8cfc810
4 changed files with 8 additions and 5 deletions

View File

@ -27,7 +27,7 @@
# #
DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
[Components.X64] [Components.IA32, Components.X64]
# #
# Dynamic Table Factory Dxe # Dynamic Table Factory Dxe
# #

View File

@ -15,7 +15,7 @@
PLATFORM_VERSION = 0.1 PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001a DSC_SPECIFICATION = 0x0001001a
OUTPUT_DIRECTORY = Build/DynamicTables OUTPUT_DIRECTORY = Build/DynamicTables
SUPPORTED_ARCHITECTURES = ARM|AARCH64|X64 SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64
BUILD_TARGETS = DEBUG|RELEASE|NOOPT BUILD_TARGETS = DEBUG|RELEASE|NOOPT
SKUID_IDENTIFIER = DEFAULT SKUID_IDENTIFIER = DEFAULT

View File

@ -1130,7 +1130,7 @@ ParseCmObjDesc (
&RemainingSize, &RemainingSize,
1 1
); );
if ((RemainingSize > CmObjDesc->Size) || if ((RemainingSize > (INTN)CmObjDesc->Size) ||
(RemainingSize < 0)) (RemainingSize < 0))
{ {
ASSERT (0); ASSERT (0);

View File

@ -170,7 +170,10 @@ AddAcpiHeader (
CfgMfrInfo->OemId[2], CfgMfrInfo->OemId[2],
CfgMfrInfo->OemId[3] CfgMfrInfo->OemId[3]
) | ) |
((UINT64)Generator->AcpiTableSignature << 32); LShiftU64 (
(UINT64)Generator->AcpiTableSignature,
32
);
} }
// UINT32 OemRevision // UINT32 OemRevision
@ -257,7 +260,7 @@ AddSsdtAcpiHeader (
CfgMfrInfo->OemId[2], CfgMfrInfo->OemId[2],
CfgMfrInfo->OemId[3] CfgMfrInfo->OemId[3]
) | ) |
((UINT64)Generator->AcpiTableSignature << 32); LShiftU64 ((UINT64)Generator->AcpiTableSignature, 32);
} }
if (AcpiTableInfo->OemRevision != 0) { if (AcpiTableInfo->OemRevision != 0) {