tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/Core: fix an IA32 build failure

Browse Source 
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>
This commit is contained in:
Jian J Wang 2018-10-26 12:45:07 +08:00
parent 979b7d802c
commit e5001ab7a9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
View File

@ -463,7 +463,7 @@ IsGuardPage (
IN EFI_PHYSICAL_ADDRESS Address IN EFI_PHYSICAL_ADDRESS Address
) )
{ {
UINTN BitMap; UINT64 BitMap;
// //
// There must be at least one guarded page before and/or after given // There must be at least one guarded page before and/or after given
@ -1368,7 +1368,7 @@ GuardAllFreedPages (
UINT64 Address; UINT64 Address;
UINT64 GuardPage; UINT64 GuardPage;
INTN Level; INTN Level;
UINTN BitIndex; UINT64 BitIndex;
UINTN GuardPageNumber; UINTN GuardPageNumber;
if (mGuardedMemoryMap == 0 || if (mGuardedMemoryMap == 0 ||
@ -1475,12 +1475,12 @@ MergeGuardPages (
} }
Bitmap = 0; Bitmap = 0;
Pages = EFI_SIZE_TO_PAGES (MaxAddress - MemoryMapEntry->PhysicalStart); Pages = EFI_SIZE_TO_PAGES ((UINTN)(MaxAddress - MemoryMapEntry->PhysicalStart));
Pages -= MemoryMapEntry->NumberOfPages; Pages -= (INTN)MemoryMapEntry->NumberOfPages;
while (Pages > 0) { while (Pages > 0) {
if (Bitmap == 0) { if (Bitmap == 0) {
EndAddress = MemoryMapEntry->PhysicalStart + EndAddress = MemoryMapEntry->PhysicalStart +
EFI_PAGES_TO_SIZE (MemoryMapEntry->NumberOfPages); EFI_PAGES_TO_SIZE ((UINTN)MemoryMapEntry->NumberOfPages);
Bitmap = GetGuardedMemoryBits (EndAddress, GUARDED_HEAP_MAP_ENTRY_BITS); Bitmap = GetGuardedMemoryBits (EndAddress, GUARDED_HEAP_MAP_ENTRY_BITS);
} }