[Patch V5 11/22] UefiCpuPkg/CpuPageTableLib: Add LastMapEntry pointer


duntan
 

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

Signed-off-by: Dun Tan <dun.tan@...>
Cc: Eric Dong <eric.dong@...>
Cc: Ray Ni <ray.ni@...>
Cc: Rahul Kumar <rahul1.kumar@...>
Cc: Gerd Hoffmann <kraxel@...>
---
UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
index 52eb9daa10..612fddcee0 100644
--- a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
@@ -621,10 +621,12 @@ SingleMapEntryTest (
UINTN Level;
UINT64 Value;
UNIT_TEST_STATUS TestStatus;
+ MAP_ENTRY *LastMapEntry;

MapsIndex = MapEntrys->Count;

GenerateSingleRandomMapEntry (MaxAddress, MapEntrys);
+ LastMapEntry = &MapEntrys->Maps[MapsIndex];

PageTableBufferSize = 0;
Status = PageTableMap (
@@ -632,10 +634,10 @@ SingleMapEntryTest (
PagingMode,
NULL,
&PageTableBufferSize,
- MapEntrys->Maps[MapsIndex].LinearAddress,
- MapEntrys->Maps[MapsIndex].Length,
- &MapEntrys->Maps[MapsIndex].Attribute,
- &MapEntrys->Maps[MapsIndex].Mask
+ LastMapEntry->LinearAddress,
+ LastMapEntry->Length,
+ &LastMapEntry->Attribute,
+ &LastMapEntry->Mask
);
if (PageTableBufferSize != 0) {
UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);
@@ -651,10 +653,10 @@ SingleMapEntryTest (
PagingMode,
Buffer,
&PageTableBufferSize,
- MapEntrys->Maps[MapsIndex].LinearAddress,
- MapEntrys->Maps[MapsIndex].Length,
- &MapEntrys->Maps[MapsIndex].Attribute,
- &MapEntrys->Maps[MapsIndex].Mask
+ LastMapEntry->LinearAddress,
+ LastMapEntry->Length,
+ &LastMapEntry->Attribute,
+ &LastMapEntry->Mask
);
}

--
2.31.1.windows.1


Ni, Ray
 

Reviewed-by: Ray Ni <ray.ni@...>

-----Original Message-----
From: Tan, Dun <dun.tan@...>
Sent: Friday, March 24, 2023 2:00 PM
To: devel@edk2.groups.io
Cc: Dong, Eric <eric.dong@...>; Ni, Ray <ray.ni@...>; Kumar,
Rahul R <rahul.r.kumar@...>; Gerd Hoffmann <kraxel@...>
Subject: [Patch V5 11/22] UefiCpuPkg/CpuPageTableLib: Add LastMapEntry
pointer

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

Signed-off-by: Dun Tan <dun.tan@...>
Cc: Eric Dong <eric.dong@...>
Cc: Ray Ni <ray.ni@...>
Cc: Rahul Kumar <rahul1.kumar@...>
Cc: Gerd Hoffmann <kraxel@...>
---
UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c | 18
++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
index 52eb9daa10..612fddcee0 100644
--- a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
@@ -621,10 +621,12 @@ SingleMapEntryTest (
UINTN Level;
UINT64 Value;
UNIT_TEST_STATUS TestStatus;
+ MAP_ENTRY *LastMapEntry;

MapsIndex = MapEntrys->Count;

GenerateSingleRandomMapEntry (MaxAddress, MapEntrys);
+ LastMapEntry = &MapEntrys->Maps[MapsIndex];

PageTableBufferSize = 0;
Status = PageTableMap (
@@ -632,10 +634,10 @@ SingleMapEntryTest (
PagingMode,
NULL,
&PageTableBufferSize,
- MapEntrys->Maps[MapsIndex].LinearAddress,
- MapEntrys->Maps[MapsIndex].Length,
- &MapEntrys->Maps[MapsIndex].Attribute,
- &MapEntrys->Maps[MapsIndex].Mask
+ LastMapEntry->LinearAddress,
+ LastMapEntry->Length,
+ &LastMapEntry->Attribute,
+ &LastMapEntry->Mask
);
if (PageTableBufferSize != 0) {
UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);
@@ -651,10 +653,10 @@ SingleMapEntryTest (
PagingMode,
Buffer,
&PageTableBufferSize,
- MapEntrys->Maps[MapsIndex].LinearAddress,
- MapEntrys->Maps[MapsIndex].Length,
- &MapEntrys->Maps[MapsIndex].Attribute,
- &MapEntrys->Maps[MapsIndex].Mask
+ LastMapEntry->LinearAddress,
+ LastMapEntry->Length,
+ &LastMapEntry->Attribute,
+ &LastMapEntry->Mask
);
}

--
2.31.1.windows.1