sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/Core: Fix build error with old Visual Studio

Browse Source 
The build error is introduced by following check in:
  2930ef9809976ce693d1d377851344c3b06bd926
  235a4490c8ce8b6dbac49e6ae3559cb73d6bf620

The Visual Studio older than 2015 doesn't support constant integer
in binary format (0bxxx). This patch changes them to BIT macro to
fix it. This patch also cleans up coding style about unmatched
comment for return value.

Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Bi Dandan <dandan.bi@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 2017-11-20 10:59:41 +08:00 committed by Star Zeng
parent 94edadf502
commit f9ebb0b131
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,7 +373,7 @@ ClearGuardedMemoryBits (
@param[in] Address Memory address to retrieve from.
@param[in] NumberOfPages Number of pages to retrieve.
@return VOID.
@return An integer containing the guarded memory bitmap.
**/
UINTN
GetGuardedMemoryBits (
@ -501,8 +501,13 @@ IsGuardPage (
{
UINTN BitMap;
//
// There must be at least one guarded page before and/or after given
// address if it's a Guard page. The bitmap pattern should be one of
// 001, 100 and 101
//
BitMap = GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 3);
return ((BitMap == 0b001) || (BitMap == 0b100) || (BitMap == 0b101));
return ((BitMap == BIT0) || (BitMap == BIT2) || (BitMap == (BIT2 | BIT0)));
}
/**
@ -519,7 +524,7 @@ IsHeadGuard (
IN EFI_PHYSICAL_ADDRESS Address
)
{
return (GetGuardedMemoryBits (Address, 2) == 0b10);
return (GetGuardedMemoryBits (Address, 2) == BIT1);
}
/**
@ -536,7 +541,7 @@ IsTailGuard (
IN EFI_PHYSICAL_ADDRESS Address
)
{
return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) == 0b01);
return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) == BIT0);
}
/**

13
MdeModulePkg/Core/PiSmmCore/HeapGuard.c
View File

@ -385,7 +385,7 @@ ClearGuardedMemoryBits (
@param[in] Address Memory address to retrieve from.
@param[in] NumberOfPages Number of pages to retrieve.
@return VOID
@return An integer containing the guarded memory bitmap.
**/
UINTN
GetGuardedMemoryBits (
@ -513,8 +513,13 @@ IsGuardPage (
{
UINTN BitMap;
//
// There must be at least one guarded page before and/or after given
// address if it's a Guard page. The bitmap pattern should be one of
// 001, 100 and 101
//
BitMap = GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 3);
return ((BitMap == 0b001) || (BitMap == 0b100) || (BitMap == 0b101));
return ((BitMap == BIT0) || (BitMap == BIT2) || (BitMap == (BIT2 | BIT0)));
}
/**
@ -531,7 +536,7 @@ IsHeadGuard (
IN EFI_PHYSICAL_ADDRESS Address
)
{
return (GetGuardedMemoryBits (Address, 2) == 0b10);
return (GetGuardedMemoryBits (Address, 2) == BIT1);
}
/**
@ -548,7 +553,7 @@ IsTailGuard (
IN EFI_PHYSICAL_ADDRESS Address
)
{
return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) == 0b01);
return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) == BIT0);
}
/**