UefiCpuPkg/MtrrLib/UnitTest: Fix 32-bit GCC build issues

When using UT_ASSERT_EQUAL() on a pointer value, it must be
cast to UINTN.  This follows the samples provided with the
UnitTestFrameworkPkg.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c
index 30ee1dc32522fdfb1d00109a48b95f331f2ad675..e84b9390601d4897eaccc714fa928444392a7bdf 100644 (file)
--- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c
+++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c
@@ -599,7 +599,7 @@ UnitTestMtrrGetFixedMtrr (
     }\r
 \r
     Result = MtrrGetFixedMtrr (&FixedSettings);\r
-    UT_ASSERT_EQUAL (Result, &FixedSettings);\r
+    UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&FixedSettings);\r
     UT_ASSERT_MEM_EQUAL (&FixedSettings, &ExpectedFixedSettings, sizeof (FixedSettings));\r
   }\r
 \r
@@ -612,7 +612,7 @@ UnitTestMtrrGetFixedMtrr (
   ZeroMem (&FixedSettings, sizeof (FixedSettings));\r
   ZeroMem (&ExpectedFixedSettings, sizeof (ExpectedFixedSettings));\r
   Result = MtrrGetFixedMtrr (&FixedSettings);\r
-  UT_ASSERT_EQUAL (Result, &FixedSettings);\r
+  UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&FixedSettings);\r
   UT_ASSERT_MEM_EQUAL (&ExpectedFixedSettings, &FixedSettings, sizeof (ExpectedFixedSettings));\r
 \r
   return UNIT_TEST_PASSED;\r
@@ -653,7 +653,7 @@ UnitTestMtrrGetAllMtrrs (
     AsmWriteMsr64 (MSR_IA32_MTRR_PHYSMASK0 + (Index << 1), VariableMtrr[Index].Mask);\r
   }\r
   Result = MtrrGetAllMtrrs (&Mtrrs);\r
-  UT_ASSERT_EQUAL (Result, &Mtrrs);\r
+  UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&Mtrrs);\r
   UT_ASSERT_MEM_EQUAL (Mtrrs.Variables.Mtrr, VariableMtrr, sizeof (MTRR_VARIABLE_SETTING) * SystemParameter.VariableMtrrCount);\r
 \r
   //\r
@@ -665,7 +665,7 @@ UnitTestMtrrGetAllMtrrs (
   SystemParameter.MtrrSupported = FALSE;\r
   InitializeMtrrRegs (&SystemParameter);\r
   Result = MtrrGetAllMtrrs (&Mtrrs);\r
-  UT_ASSERT_EQUAL (Result, &Mtrrs);\r
+  UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&Mtrrs);\r
   UT_ASSERT_MEM_EQUAL (&ExpectedMtrrs, &Mtrrs, sizeof (ExpectedMtrrs));\r
 \r
   //\r
@@ -718,7 +718,7 @@ UnitTestMtrrSetAllMtrrs (
     GenerateRandomMtrrPair (SystemParameter.PhysicalAddressBits, GenerateRandomCacheType (), &Mtrrs.Variables.Mtrr[Index], NULL);\r
   }\r
   Result = MtrrSetAllMtrrs (&Mtrrs);\r
-  UT_ASSERT_EQUAL (Result, &Mtrrs);\r
+  UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&Mtrrs);\r
 \r
   UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE), Mtrrs.MtrrDefType);\r
   for (Index = 0; Index < SystemParameter.VariableMtrrCount; Index++) {\r