summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJian J Wang <jian.j.wang@intel.com>2018-10-26 12:45:07 +0800
committerJian J Wang <jian.j.wang@intel.com>2018-10-26 16:04:37 +0800
commite5001ab7a9c17fe1cf9155392c943a9c985c8a96 (patch)
tree0429929df90c03dc29172215efe56cde9747d492
parent979b7d802c316722da3f3dee90799728c7aab38f (diff)
downloadedk2-e5001ab7a9c17fe1cf9155392c943a9c985c8a96.tar.gz
edk2-e5001ab7a9c17fe1cf9155392c943a9c985c8a96.tar.xz
edk2-e5001ab7a9c17fe1cf9155392c943a9c985c8a96.zip
MdeModulePkg/Core: fix an IA32 build failure
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1277 The failure is caused by data type conversion between UINTN and UINT64, which is checked in at 63ebde8ef6d4ff497d054ccc010904ecd4441198. Cc: Star Zeng <star.zeng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jian J Wang <jian.j.wang@intel.com> Reviewed-by: Star Zeng <star.zeng@intel.com>
-rw-r--r--MdeModulePkg/Core/Dxe/Mem/HeapGuard.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
index 449a022658..521e0d7b2a 100644
--- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
+++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
@@ -463,7 +463,7 @@ IsGuardPage (
IN EFI_PHYSICAL_ADDRESS Address
)
{
- UINTN BitMap;
+ UINT64 BitMap;
//
// There must be at least one guarded page before and/or after given
@@ -1368,7 +1368,7 @@ GuardAllFreedPages (
UINT64 Address;
UINT64 GuardPage;
INTN Level;
- UINTN BitIndex;
+ UINT64 BitIndex;
UINTN GuardPageNumber;
if (mGuardedMemoryMap == 0 ||
@@ -1475,12 +1475,12 @@ MergeGuardPages (
}
Bitmap = 0;
- Pages = EFI_SIZE_TO_PAGES (MaxAddress - MemoryMapEntry->PhysicalStart);
- Pages -= MemoryMapEntry->NumberOfPages;
+ Pages = EFI_SIZE_TO_PAGES ((UINTN)(MaxAddress - MemoryMapEntry->PhysicalStart));
+ Pages -= (INTN)MemoryMapEntry->NumberOfPages;
while (Pages > 0) {
if (Bitmap == 0) {
EndAddress = MemoryMapEntry->PhysicalStart +
- EFI_PAGES_TO_SIZE (MemoryMapEntry->NumberOfPages);
+ EFI_PAGES_TO_SIZE ((UINTN)MemoryMapEntry->NumberOfPages);
Bitmap = GetGuardedMemoryBits (EndAddress, GUARDED_HEAP_MAP_ENTRY_BITS);
}