CpuPageTableLib: define IA32_PAGE_LEVEL enum type internally

The change doesn't change functionality behavior.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTable.h b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTable.h
index 627f84e4e2a983ba8d4b9682dfd3aca03ce40332..8d856d7c7e2cefc58e8cf5aab64b344c9376d767 100644 (file)
--- a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTable.h
+++ b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTable.h
@@ -20,6 +20,14 @@
 \r
 #define REGION_LENGTH(l)  LShiftU64 (1, (l) * 9 + 3)\r
 \r
+typedef enum {\r
+  Pte   = 1,\r
+  Pde   = 2,\r
+  Pdpte = 3,\r
+  Pml4  = 4,\r
+  Pml5  = 5\r
+} IA32_PAGE_LEVEL;\r
+\r
 typedef struct {\r
   UINT64    Present        : 1;       // 0 = Not present in memory, 1 = Present in memory\r
   UINT64    ReadWrite      : 1;       // 0 = Read-Only, 1= Read/Write\r

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
index 13af9a8cdd4530b3a30fad2005921b5475c0b224..37713ec659ea9701aab3aa3deb4767c5485aa613 100644 (file)
--- a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
@@ -245,8 +245,8 @@ PageTableLibMapInLevel (
   IN     BOOLEAN             Modify,\r
   IN     VOID                *Buffer,\r
   IN OUT INTN                *BufferSize,\r
-  IN     UINTN               Level,\r
-  IN     UINTN               MaxLeafLevel,\r
+  IN     IA32_PAGE_LEVEL     Level,\r
+  IN     IA32_PAGE_LEVEL     MaxLeafLevel,\r
   IN     UINT64              LinearAddress,\r
   IN     UINT64              Length,\r
   IN     UINT64              Offset,\r
@@ -572,8 +572,8 @@ PageTableMap (
   IA32_PAGING_ENTRY   TopPagingEntry;\r
   INTN                RequiredSize;\r
   UINT64              MaxLinearAddress;\r
-  UINTN               MaxLevel;\r
-  UINTN               MaxLeafLevel;\r
+  IA32_PAGE_LEVEL     MaxLevel;\r
+  IA32_PAGE_LEVEL     MaxLeafLevel;\r
   IA32_MAP_ATTRIBUTE  ParentAttribute;\r
 \r
   if ((PagingMode == Paging32bit) || (PagingMode == PagingPae) || (PagingMode >= PagingModeMax)) {\r
@@ -606,8 +606,8 @@ PageTableMap (
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
-  MaxLeafLevel     = (UINT8)PagingMode;\r
-  MaxLevel         = (UINT8)(PagingMode >> 8);\r
+  MaxLeafLevel     = (IA32_PAGE_LEVEL)(UINT8)PagingMode;\r
+  MaxLevel         = (IA32_PAGE_LEVEL)(UINT8)(PagingMode >> 8);\r
   MaxLinearAddress = LShiftU64 (1, 12 + MaxLevel * 9);\r
 \r
   if ((LinearAddress > MaxLinearAddress) || (Length > MaxLinearAddress - LinearAddress)) {\r