UefiCpuPkg/CpuPageTableLib: Add LastMapEntry pointer

Add LastMapEntry pointer to replace MapEntrys->Maps[MapsIndex]
in SingleMapEntryTest () of RandomTest.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
index 52eb9daa109840fcc96e87fcd62fe58bb8778545..612fddcee0c5fd04b0fbd54c67d56d17d37bf638 100644 (file)
--- a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
@@ -621,10 +621,12 @@ SingleMapEntryTest (
   UINTN             Level;\r
   UINT64            Value;\r
   UNIT_TEST_STATUS  TestStatus;\r
+  MAP_ENTRY         *LastMapEntry;\r
 \r
   MapsIndex = MapEntrys->Count;\r
 \r
   GenerateSingleRandomMapEntry (MaxAddress, MapEntrys);\r
+  LastMapEntry = &MapEntrys->Maps[MapsIndex];\r
 \r
   PageTableBufferSize = 0;\r
   Status              = PageTableMap (\r
@@ -632,10 +634,10 @@ SingleMapEntryTest (
                           PagingMode,\r
                           NULL,\r
                           &PageTableBufferSize,\r
-                          MapEntrys->Maps[MapsIndex].LinearAddress,\r
-                          MapEntrys->Maps[MapsIndex].Length,\r
-                          &MapEntrys->Maps[MapsIndex].Attribute,\r
-                          &MapEntrys->Maps[MapsIndex].Mask\r
+                          LastMapEntry->LinearAddress,\r
+                          LastMapEntry->Length,\r
+                          &LastMapEntry->Attribute,\r
+                          &LastMapEntry->Mask\r
                           );\r
   if (PageTableBufferSize != 0) {\r
     UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
@@ -651,10 +653,10 @@ SingleMapEntryTest (
                PagingMode,\r
                Buffer,\r
                &PageTableBufferSize,\r
-               MapEntrys->Maps[MapsIndex].LinearAddress,\r
-               MapEntrys->Maps[MapsIndex].Length,\r
-               &MapEntrys->Maps[MapsIndex].Attribute,\r
-               &MapEntrys->Maps[MapsIndex].Mask\r
+               LastMapEntry->LinearAddress,\r
+               LastMapEntry->Length,\r
+               &LastMapEntry->Attribute,\r
+               &LastMapEntry->Mask\r
                );\r
   }\r
 \r