Re: [PATCH 16/26] MdeModulePkg Core/Dxe: Remove redundant functions

["Ni, Ruiyu" <ruiyu.ni@intel.com>]

Copying Wang Jian.

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Thanks/Ray

> -----Original Message-----
> From: edk2-devel <edk2-devel-bounces@lists.01.org> On Behalf Of shenglei
> Sent: Wednesday, August 8, 2018 4:47 PM
> To: edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [edk2] [PATCH 16/26] MdeModulePkg Core/Dxe: Remove
> redundant functions
> 
> The functions that are never called have been removed.
> They are ClearGuardMapBit,SetGuardMapBit,IsHeadGuard,
> IsTailGuard and CoreEfiNotAvailableYetArg0.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1062
> 
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: shenglei <shenglei.zhang@intel.com>
> ---
>  MdeModulePkg/Core/Dxe/DxeMain.h         | 13 -----
>  MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 22 -------
>  MdeModulePkg/Core/Dxe/Mem/HeapGuard.c   | 78 -------------------------
>  3 files changed, 113 deletions(-)
> 
> diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h
> b/MdeModulePkg/Core/Dxe/DxeMain.h index 7ec82388a3..8f0b28d095
> 100644
> --- a/MdeModulePkg/Core/Dxe/DxeMain.h
> +++ b/MdeModulePkg/Core/Dxe/DxeMain.h
> @@ -2178,19 +2178,6 @@ CoreDisplayDiscoveredNotDispatched (
>    );
> 
> 
> -/**
> -  Place holder function until all the Boot Services and Runtime Services are
> -  available.
> -
> -  @return EFI_NOT_AVAILABLE_YET
> -
> -**/
> -EFI_STATUS
> -EFIAPI
> -CoreEfiNotAvailableYetArg0 (
> -  VOID
> -  );
> -
> 
>  /**
>    Place holder function until all the Boot Services and Runtime Services are
> diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> index fc46022c3c..bbb048a127 100644
> --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> @@ -560,28 +560,6 @@ DxeMain (
> 
> 
> 
> -/**
> -  Place holder function until all the Boot Services and Runtime Services are
> -  available.
> -
> -  @return EFI_NOT_AVAILABLE_YET
> -
> -**/
> -EFI_STATUS
> -EFIAPI
> -CoreEfiNotAvailableYetArg0 (
> -  VOID
> -  )
> -{
> -  //
> -  // This function should never be executed.  If it does, then the architectural
> protocols
> -  // have not been designed correctly.  The CpuBreakpoint () is commented
> out for now until the
> -  // DXE Core and all the Architectural Protocols are complete.
> -  //
> -
> -  return EFI_NOT_AVAILABLE_YET;
> -}
> -
> 
>  /**
>    Place holder function until all the Boot Services and Runtime Services are
> diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
> b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
> index 447c56bb11..663f969c0d 100644
> --- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
> +++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
> @@ -443,51 +443,6 @@ GetGuardMapBit (
>    return 0;
>  }
> 
> -/**
> -  Set the bit in bitmap table for the given address.
> -
> -  @param[in]  Address     The address to set for.
> -
> -  @return VOID.
> -**/
> -VOID
> -EFIAPI
> -SetGuardMapBit (
> -  IN EFI_PHYSICAL_ADDRESS    Address
> -  )
> -{
> -  UINT64        *GuardMap;
> -  UINT64        BitMask;
> -
> -  FindGuardedMemoryMap (Address, TRUE, &GuardMap);
> -  if (GuardMap != NULL) {
> -    BitMask = LShiftU64 (1, GUARDED_HEAP_MAP_ENTRY_BIT_INDEX
> (Address));
> -    *GuardMap |= BitMask;
> -  }
> -}
> -
> -/**
> -  Clear the bit in bitmap table for the given address.
> -
> -  @param[in]  Address     The address to clear for.
> -
> -  @return VOID.
> -**/
> -VOID
> -EFIAPI
> -ClearGuardMapBit (
> -  IN EFI_PHYSICAL_ADDRESS    Address
> -  )
> -{
> -  UINT64        *GuardMap;
> -  UINT64        BitMask;
> -
> -  FindGuardedMemoryMap (Address, TRUE, &GuardMap);
> -  if (GuardMap != NULL) {
> -    BitMask = LShiftU64 (1, GUARDED_HEAP_MAP_ENTRY_BIT_INDEX
> (Address));
> -    *GuardMap &= ~BitMask;
> -  }
> -}
> 
>  /**
>    Check to see if the page at the given address is a Guard page or not.
> @@ -514,39 +469,6 @@ IsGuardPage (
>    return ((BitMap == BIT0) || (BitMap == BIT2) || (BitMap == (BIT2 | BIT0)));  }
> 
> -/**
> -  Check to see if the page at the given address is a head Guard page or not.
> -
> -  @param[in]  Address     The address to check for
> -
> -  @return TRUE  The page at Address is a head Guard page
> -  @return FALSE The page at Address is not a head Guard page -**/ -
> BOOLEAN -EFIAPI -IsHeadGuard (
> -  IN EFI_PHYSICAL_ADDRESS    Address
> -  )
> -{
> -  return (GetGuardedMemoryBits (Address, 2) == BIT1); -}
> -
> -/**
> -  Check to see if the page at the given address is a tail Guard page or not.
> -
> -  @param[in]  Address     The address to check for.
> -
> -  @return TRUE  The page at Address is a tail Guard page.
> -  @return FALSE The page at Address is not a tail Guard page.
> -**/
> -BOOLEAN
> -EFIAPI
> -IsTailGuard (
> -  IN EFI_PHYSICAL_ADDRESS    Address
> -  )
> -{
> -  return (GetGuardedMemoryBits (Address - EFI_PAGE_SIZE, 2) == BIT0); -}
> 
>  /**
>    Check to see if the page at the given address is guarded or not.
> --
> 2.18.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel