Moved the MdePkg to OldMdePkg so that new code in MdePkg does not break existing builds. Also updated the SPD and FPD files UiNames

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2616 6f19259b-4bc3-4df7-8a09-765794883524

17 files changed, 0 insertions, 1492 deletions

diff --git a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
deleted file mode 100644
index 52fe3bbfba..0000000000
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

-  <MsaHeader>

-    <ModuleName>BaseMemoryLib</ModuleName>

-    <ModuleType>BASE</ModuleType>

-    <GuidValue>fd44e603-002a-4b29-9f5f-529e815b6165</GuidValue>

-    <Version>1.0</Version>

-    <Abstract>Component description file for Base Memory Library</Abstract>

-    <Description>Base Memory Library implementation – no ASM.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

-    <License>All rights reserved. This program and the accompanying materials

-      are licensed and made available under the terms and conditions of the BSD License

-      which accompanies this distribution.  The full text of the license may be found at

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

-  </MsaHeader>

-  <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

-    <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>BaseMemoryLib</OutputFileBasename>

-  </ModuleDefinitions>

-  <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_PRODUCED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-  </LibraryClassDefinitions>

-  <SourceFiles>

-    <Filename>MemLibInternals.h</Filename>

-    <Filename>CopyMem.c</Filename>

-    <Filename>MemLibGuid.c</Filename>

-    <Filename>MemLibGeneric.c</Filename>

-    <Filename>CopyMemWrapper.c</Filename>

-    <Filename>SetMemWrapper.c</Filename>

-    <Filename>SetMem16Wrapper.c</Filename>

-    <Filename>SetMem32Wrapper.c</Filename>

-    <Filename>SetMem64Wrapper.c</Filename>

-    <Filename>CompareMemWrapper.c</Filename>

-    <Filename>ZeroMemWrapper.c</Filename>

-    <Filename>ScanMem8Wrapper.c</Filename>

-    <Filename>ScanMem16Wrapper.c</Filename>

-    <Filename>ScanMem32Wrapper.c</Filename>

-    <Filename>ScanMem64Wrapper.c</Filename>

-    <Filename>SetMem.c</Filename>

-  </SourceFiles>

-  <PackageDependencies>

-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-  </PackageDependencies>

-  <Externs>

-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

-  </Externs>

-</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
deleted file mode 100644
index 4c0d3eaadb..0000000000
--- a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/** @file

-  CompareMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  CompareMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Compares the contents of two buffers.

-

-  This function compares Length bytes of SourceBuffer to Length bytes of DestinationBuffer.

-  If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the

-  value returned is the first mismatched byte in SourceBuffer subtracted from the first

-  mismatched byte in DestinationBuffer.

-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().

-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().

-  If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). 

-  If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). 

-

-

-  @param  DestinationBuffer Pointer to the destination buffer to compare.

-  @param  SourceBuffer      Pointer to the source buffer to compare.

-  @param  Length            Number of bytes to compare.

-

-  @return 0                 All Length bytes of the two buffers are identical.

-  @retval Non-zero          The first mismatched byte in SourceBuffer subtracted from the first

-                            mismatched byte in DestinationBuffer.

-

-**/

-INTN

-EFIAPI

-CompareMem (

-  IN CONST VOID  *DestinationBuffer,

-  IN CONST VOID  *SourceBuffer,

-  IN UINTN       Length

-  )

-{

-  if (Length == 0) {

-    return 0;

-  }

-  ASSERT (DestinationBuffer != NULL);

-  ASSERT (SourceBuffer != NULL);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)SourceBuffer));

-

-  return InternalMemCompareMem (DestinationBuffer, SourceBuffer, Length);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/CopyMem.c b/MdePkg/Library/BaseMemoryLib/CopyMem.c
deleted file mode 100644
index 632061a668..0000000000
--- a/MdePkg/Library/BaseMemoryLib/CopyMem.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/** @file

-  Implementation of the EfiCopyMem routine. This function is broken

-  out into its own source file so that it can be excluded from a

-  build for a particular platform easily if an optimized version

-  is desired.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  EfiCopyMem.c

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Copy Length bytes from Source to Destination.

-

-  @param  Destination Target of copy

-  @param  Source Place to copy from

-  @param  Length Number of bytes to copy

-

-  @return Destination

-

-**/

-VOID *

-EFIAPI

-InternalMemCopyMem (

-  OUT     VOID                      *Destination,

-  IN      CONST VOID                *Source,

-  IN      UINTN                     Length

-  )

-{

-  //

-  // Declare the local variables that actually move the data elements as

-  // volatile to prevent the optimizer from replacing this function with

-  // the intrinsic memcpy()

-  //

-  volatile UINT8                    *Destination8;

-  CONST UINT8                       *Source8;

-

-  if (Source > Destination) {

-    Destination8 = (UINT8*)Destination;

-    Source8 = (CONST UINT8*)Source;

-    while (Length-- != 0) {

-      *(Destination8++) = *(Source8++);

-    }

-  } else if (Source < Destination) {

-    Destination8 = (UINT8*)Destination + Length;

-    Source8 = (CONST UINT8*)Source + Length;

-    while (Length-- != 0) {

-      *(--Destination8) = *(--Source8);

-    }

-  }

-  return Destination;

-}

diff --git a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
deleted file mode 100644
index 9e620e2200..0000000000
--- a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/** @file

-  CopyMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  CopyMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Copies a source buffer to a destination buffer, and returns the destination buffer.

-

-  This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns

-  DestinationBuffer.  The implementation must be reentrant, and it must handle the case

-  where SourceBuffer overlaps DestinationBuffer.

-  If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). 

-  If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). 

-

-  @param  DestinationBuffer   Pointer to the destination buffer of the memory copy.

-  @param  SourceBuffer        Pointer to the source buffer of the memory copy.

-  @param  Length              Number of bytes to copy from SourceBuffer to DestinationBuffer.

-

-  @return DestinationBuffer.

-

-**/

-VOID *

-EFIAPI

-CopyMem (

-  OUT VOID       *DestinationBuffer,

-  IN CONST VOID  *SourceBuffer,

-  IN UINTN       Length

-  )

-{

-  if (Length == 0) {

-    return DestinationBuffer;

-  }

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)SourceBuffer));

-

-  if (DestinationBuffer == SourceBuffer) {

-    return DestinationBuffer;

-  }

-  return InternalMemCopyMem (DestinationBuffer, SourceBuffer, Length);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
deleted file mode 100644
index 759377483c..0000000000
--- a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/** @file

-  Architecture Independent Base Memory Library Implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  MemLibGeneric.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 16-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem16 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  )

-{

-  do {

-    ((UINT16*)Buffer)[--Length] = Value;

-  } while (Length != 0);

-  return Buffer;

-}

-

-/**

-  Fills a target buffer with a 32-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem32 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  )

-{

-  do {

-    ((UINT32*)Buffer)[--Length] = Value;

-  } while (Length != 0);

-  return Buffer;

-}

-

-/**

-  Fills a target buffer with a 64-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem64 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  )

-{

-  do {

-    ((UINT64*)Buffer)[--Length] = Value;

-  } while (Length != 0);

-  return Buffer;

-}

-

-/**

-  Set Buffer to 0 for Size bytes.

-

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemZeroMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length

-  )

-{

-  return InternalMemSetMem (Buffer, Length, 0);

-}

-

-/**

-  Compares two memory buffers of a given length.

-

-  @param  DestinationBuffer First memory buffer

-  @param  SourceBuffer      Second memory buffer

-  @param  Length            Length of DestinationBuffer and SourceBuffer memory

-                            regions to compare. Must be non-zero.

-

-  @retval 0     if MemOne == MemTwo

-

-**/

-INTN

-EFIAPI

-InternalMemCompareMem (

-  IN      CONST VOID                *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

-  )

-{

-  while ((--Length != 0) &&

-         (*(INT8*)DestinationBuffer == *(INT8*)SourceBuffer)) {

-    DestinationBuffer = (INT8*)DestinationBuffer + 1;

-    SourceBuffer = (INT8*)SourceBuffer + 1;

-  }

-  return (INTN)*(UINT8*)DestinationBuffer - (INTN)*(UINT8*)SourceBuffer;

-}

-

-/**

-  Scans a target buffer for an 8-bit value, and returns a pointer to the

-  matching 8-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem8 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

-  )

-{

-  CONST UINT8                       *Pointer;

-

-  Pointer = (CONST UINT8*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

-

-/**

-  Scans a target buffer for a 16-bit value, and returns a pointer to the

-  matching 16-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem16 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  )

-{

-  CONST UINT16                      *Pointer;

-

-  Pointer = (CONST UINT16*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

-

-/**

-  Scans a target buffer for a 32-bit value, and returns a pointer to the

-  matching 32-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem32 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  )

-{

-  CONST UINT32                      *Pointer;

-

-  Pointer = (CONST UINT32*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

-

-/**

-  Scans a target buffer for a 64-bit value, and returns a pointer to the

-  matching 64-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem64 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  )

-{

-  CONST UINT64                      *Pointer;

-

-  Pointer = (CONST UINT64*)Buffer;

-  do {

-    if (*(Pointer++) == Value) {

-      return Pointer;

-    }

-  } while (--Length != 0);

-  return NULL;

-}

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
deleted file mode 100644
index 36da5b7424..0000000000
--- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/** @file

-  Implementation of GUID functions.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  MemLibGuid.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-/**

-  Copies a source GUID to a destination GUID.

-

-  This function copies the contents of the 128-bit GUID specified by SourceGuid to

-  DestinationGuid, and returns DestinationGuid.

-  If DestinationGuid is NULL, then ASSERT().

-  If SourceGuid is NULL, then ASSERT().

-

-  @param  DestinationGuid   Pointer to the destination GUID.

-  @param  SourceGuid        Pointer to the source GUID.

-

-  @return DestinationGuid.

-

-**/

-GUID *

-EFIAPI

-CopyGuid (

-  OUT GUID       *DestinationGuid,

-  IN CONST GUID  *SourceGuid

-  )

-{

-  WriteUnaligned64 (

-    (UINT64*)DestinationGuid,

-    ReadUnaligned64 ((CONST UINT64*)SourceGuid)

-    );

-  WriteUnaligned64 (

-    (UINT64*)DestinationGuid + 1,

-    ReadUnaligned64 ((CONST UINT64*)SourceGuid + 1)

-    );

-  return DestinationGuid;

-}

-

-/**

-  Compares two GUIDs.

-

-  This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.

-  If there are any bit differences in the two GUIDs, then FALSE is returned.

-  If Guid1 is NULL, then ASSERT().

-  If Guid2 is NULL, then ASSERT().

-

-  @param  Guid1       A pointer to a 128 bit GUID.

-  @param  Guid2       A pointer to a 128 bit GUID.

-

-  @retval TRUE        Guid1 and Guid2 are identical.

-  @retval FALSE       Guid1 and Guid2 are not identical.

-

-**/

-BOOLEAN

-EFIAPI

-CompareGuid (

-  IN CONST GUID  *Guid1,

-  IN CONST GUID  *Guid2

-  )

-{

-  UINT64  LowPartOfGuid1;

-  UINT64  LowPartOfGuid2;

-  UINT64  HighPartOfGuid1;

-  UINT64  HighPartOfGuid2;

-

-  LowPartOfGuid1  = ReadUnaligned64 ((CONST UINT64*) Guid1);

-  LowPartOfGuid2  = ReadUnaligned64 ((CONST UINT64*) Guid2);

-  HighPartOfGuid1 = ReadUnaligned64 ((CONST UINT64*) Guid1 + 1);

-  HighPartOfGuid2 = ReadUnaligned64 ((CONST UINT64*) Guid2 + 1);

-

-  return (BOOLEAN) (LowPartOfGuid1 == LowPartOfGuid2 && HighPartOfGuid1 == HighPartOfGuid2);

-}

-

-/**

-  Scans a target buffer for a GUID, and returns a pointer to the matching GUID

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from

-  the lowest address to the highest address at 128-bit increments for the 128-bit

-  GUID value that matches Guid.  If a match is found, then a pointer to the matching

-  GUID in the target buffer is returned.  If no match is found, then NULL is returned.

-  If Length is 0, then NULL is returned.

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Buffer is not aligned on a 32-bit boundary, then ASSERT().

-  If Length is not aligned on a 128-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan.

-  @param  Guid    Value to search for in the target buffer.

-

-  @return A pointer to the matching Guid in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanGuid (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN CONST GUID  *Guid

-  )

-{

-  CONST GUID                        *GuidPtr;

-

-  ASSERT (((UINTN)Buffer & (sizeof (Guid->Data1) - 1)) == 0);

-  ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));

-  ASSERT ((Length & (sizeof (*GuidPtr) - 1)) == 0);

-

-  GuidPtr = (GUID*)Buffer;

-  Buffer  = GuidPtr + Length / sizeof (*GuidPtr);

-  while (GuidPtr < (CONST GUID*)Buffer) {

-    if (CompareGuid (GuidPtr, Guid)) {

-      return (VOID*)GuidPtr;

-    }

-    GuidPtr++;

-  }

-  return NULL;

-}

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
deleted file mode 100644
index 8646b24e79..0000000000
--- a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/** @file

-  Declaration of internal functions for Base Memory Library.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  MemLibInternals.h

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#ifndef __MEM_LIB_INTERNALS__

-#define __MEM_LIB_INTERNALS__

-

-/**

-  Copy Length bytes from Source to Destination.

-

-  @param  Destination Target of copy

-  @param  Source Place to copy from

-  @param  Length Number of bytes to copy

-

-  @return Destination

-

-**/

-VOID *

-EFIAPI

-InternalMemCopyMem (

-  OUT     VOID                      *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

-  );

-

-/**

-  Set Buffer to Value for Size bytes.

-

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-  @param  Value Value of the set operation.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

-  );

-

-/**

-  Fills a target buffer with a 16-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem16 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  );

-

-/**

-  Fills a target buffer with a 32-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem32 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  );

-

-/**

-  Fills a target buffer with a 64-bit value, and returns the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem64 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  );

-

-/**

-  Set Buffer to 0 for Size bytes.

-

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemZeroMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length

-  );

-

-/**

-  Compares two memory buffers of a given length.

-

-  @param  DestinationBuffer First memory buffer

-  @param  SourceBuffer      Second memory buffer

-  @param  Length            Length of DestinationBuffer and SourceBuffer memory

-                            regions to compare. Must be non-zero.

-

-  @retval 0     if MemOne == MemTwo

-

-**/

-INTN

-EFIAPI

-InternalMemCompareMem (

-  IN      CONST VOID                *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

-  );

-

-/**

-  Scans a target buffer for an 8-bit value, and returns a pointer to the

-  matching 8-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem8 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

-  );

-

-/**

-  Scans a target buffer for a 16-bit value, and returns a pointer to the

-  matching 16-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem16 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

-  );

-

-/**

-  Scans a target buffer for a 32-bit value, and returns a pointer to the

-  matching 32-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem32 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

-  );

-

-/**

-  Scans a target buffer for a 64-bit value, and returns a pointer to the

-  matching 64-bit value in the target buffer.

-

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

-  @param  Value   Value to search for in the target buffer.

-

-  @return Pointer to the first occurrence or NULL if not found.

-

-**/

-CONST VOID *

-EFIAPI

-InternalMemScanMem64 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

-  );

-

-#endif

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
deleted file mode 100644
index 95f134bbda..0000000000
--- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/** @file

-  ScanMem16() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  ScanMem16Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for a 16-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte in the target buffer is returned.  If no match is found,

-  then NULL is returned.  If Length is 0, then NULL is returned.

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Buffer is not aligned on a 16-bit boundary, then ASSERT().

-  If Length is not aligned on a 16-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

-

-  @param  Buffer      Pointer to the target buffer to scan.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem16 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT16      Value

-  )

-{

-  if (Length == 0) {

-    return NULL;

-  }

-

-  ASSERT (Buffer != NULL);

-  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

-  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

-

-  return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
deleted file mode 100644
index 6a3dcd7ad2..0000000000
--- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/** @file

-  ScanMem32() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  ScanMem32Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for a 32-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte in the target buffer is returned.  If no match is found,

-  then NULL is returned.  If Length is 0, then NULL is returned.

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Buffer is not aligned on a 32-bit boundary, then ASSERT().

-  If Length is not aligned on a 32-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

-

-  @param  Buffer      Pointer to the target buffer to scan.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem32 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT32      Value

-  )

-{

-  if (Length == 0) {

-    return NULL;

-  }

-

-  ASSERT (Buffer != NULL);

-  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

-  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

-

-  return (VOID*)InternalMemScanMem32 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
deleted file mode 100644
index b355fe647c..0000000000
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/** @file

-  ScanMem64() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  ScanMem64Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for a 64-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte in the target buffer is returned.  If no match is found,

-  then NULL is returned.  If Length is 0, then NULL is returned.

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Buffer is not aligned on a 64-bit boundary, then ASSERT().

-  If Length is not aligned on a 64-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

-

-  @param  Buffer      Pointer to the target buffer to scan.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem64 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT64      Value

-  )

-{

-  if (Length == 0) {

-    return NULL;

-  }

-

-  ASSERT (Buffer != NULL);

-  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

-  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

-

-  return (VOID*)InternalMemScanMem64 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
deleted file mode 100644
index 2b21b22166..0000000000
--- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/** @file

-  ScanMem8() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  ScanMem8Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value

-  in the target buffer.

-

-  This function searches target the buffer specified by Buffer and Length from the lowest

-  address to the highest address for an 8-bit value that matches Value.  If a match is found,

-  then a pointer to the matching byte in the target buffer is returned.  If no match is found,

-  then NULL is returned.  If Length is 0, then NULL is returned.

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

-

-  @param  Buffer      Pointer to the target buffer to scan.

-  @param  Length      Number of bytes in Buffer to scan.

-  @param  Value       Value to search for in the target buffer.

-

-  @return A pointer to the matching byte in the target buffer or NULL otherwise.

-

-**/

-VOID *

-EFIAPI

-ScanMem8 (

-  IN CONST VOID  *Buffer,

-  IN UINTN       Length,

-  IN UINT8       Value

-  )

-{

-  if (Length == 0) {

-    return NULL;

-  }

-  ASSERT (Buffer != NULL);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

- 

-  return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem.c b/MdePkg/Library/BaseMemoryLib/SetMem.c
deleted file mode 100644
index d051f2d63b..0000000000
--- a/MdePkg/Library/BaseMemoryLib/SetMem.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/** @file

-  Implementation of the EfiSetMem routine. This function is broken

-  out into its own source file so that it can be excluded from a

-  build for a particular platform easily if an optimized version

-  is desired.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  SetMem.c

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Set Buffer to Value for Size bytes.

-

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-  @param  Value Value of the set operation.

-

-  @return Buffer

-

-**/

-VOID *

-EFIAPI

-InternalMemSetMem (

-  IN      VOID                      *Buffer,

-  IN      UINTN                     Size,

-  IN      UINT8                     Value

-  )

-{

-  //

-  // Declare the local variables that actually move the data elements as

-  // volatile to prevent the optimizer from replacing this function with

-  // the intrinsic memset()

-  //

-  volatile UINT8                    *Pointer;

-

-  Pointer = (UINT8*)Buffer;

-  while (Size-- != 0) {

-    *(Pointer++) = Value;

-  }

-  return Buffer;

-}

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
deleted file mode 100644
index 889339c953..0000000000
--- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file

-  SetMem16() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  SetMem16Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 16-bit value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with the 16-bit value specified by

-  Value, and returns Buffer. Value is repeated every 16-bits in for Length

-  bytes of Buffer.

-

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

-  If Buffer is not aligned on a 16-bit boundary, then ASSERT().

-  If Length is not aligned on a 16-bit boundary, then ASSERT().

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem16 (

-  OUT VOID   *Buffer,

-  IN UINTN   Length,

-  IN UINT16  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

-  ASSERT (Buffer != NULL);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

-  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);

-  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

-

-  return InternalMemSetMem16 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
deleted file mode 100644
index 15f8205ebc..0000000000
--- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file

-  SetMem32() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  SetMem32Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 32-bit value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with the 32-bit value specified by

-  Value, and returns Buffer. Value is repeated every 32-bits in for Length

-  bytes of Buffer.

-

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

-  If Buffer is not aligned on a 32-bit boundary, then ASSERT().

-  If Length is not aligned on a 32-bit boundary, then ASSERT().

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem32 (

-  OUT VOID   *Buffer,

-  IN UINTN   Length,

-  IN UINT32  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

-  ASSERT (Buffer != NULL);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

-  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);

-  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

-

-  return InternalMemSetMem32 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
deleted file mode 100644
index 981a7d4731..0000000000
--- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file

-  SetMem64() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  SetMem64Wrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a 64-bit value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with the 64-bit value specified by

-  Value, and returns Buffer. Value is repeated every 64-bits in for Length

-  bytes of Buffer.

-

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

-  If Buffer is not aligned on a 64-bit boundary, then ASSERT().

-  If Length is not aligned on a 64-bit boundary, then ASSERT().

-

-  @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

-  @param  Value   Value with which to fill Length bytes of Buffer.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem64 (

-  OUT VOID   *Buffer,

-  IN UINTN   Length,

-  IN UINT64  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

-  ASSERT (Buffer != NULL);

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

-  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);

-  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

-

-  return InternalMemSetMem64 (Buffer, Length / sizeof (Value), Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
deleted file mode 100644
index e74ce8d65b..0000000000
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/** @file

-  SetMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  SetMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with a byte value, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with Value, and returns Buffer.

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

-

-  @param  Buffer    Memory to set.

-  @param  Length    Number of bytes to set.

-  @param  Value     Value of the set operation.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-SetMem (

-  OUT VOID  *Buffer,

-  IN UINTN  Length,

-  IN UINT8  Value

-  )

-{

-  if (Length == 0) {

-    return Buffer;

-  }

-

-  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

-

-  return InternalMemSetMem (Buffer, Length, Value);

-}

diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
deleted file mode 100644
index 90e607c0ce..0000000000
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/** @file

-  ZeroMem() implementation.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  ZeroMemWrapper.c

-

-  The following BaseMemoryLib instances share the same version of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    PeiMemoryLib

-    DxeMemoryLib

-

-**/

-

-#include "MemLibInternals.h"

-

-/**

-  Fills a target buffer with zeros, and returns the target buffer.

-

-  This function fills Length bytes of Buffer with zeros, and returns Buffer.

-  If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().

-

-  @param  Buffer      Pointer to the target buffer to fill with zeros.

-  @param  Length      Number of bytes in Buffer to fill with zeros.

-

-  @return Buffer.

-

-**/

-VOID *

-EFIAPI

-ZeroMem (

-  OUT VOID  *Buffer,

-  IN UINTN  Length

-  )

-{

-  ASSERT (!(Buffer == NULL && Length > 0));

-  ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));

-  return InternalMemZeroMem (Buffer, Length);

-}