clean up all of eight BaseMemoryLib instances in MdePkg with the following updates:

1.	Remove .intel_syntax directives in GCC assembly files. All these assembly files have been updated to use the preferred syntax for GAS
2.	Correct the incorrect comments for internal worker functions for SetMemXX() and ScanMemXX(). The Length parameter is actually the counter of 16-bit, 32-bit or 64-bit value. 
3.	Simplify the logic in ZeroMemoryWrapper.c for BaseMemoryLibOptPei instance to remove the conditional statement for zero length. This logic is already covered by worker function InternalMemZeroMem(). 
4.	Cleanup all the Wrapper C files in BaseMemoryLib instances. They are supposed to be shared by all these 8 BaseMemoryLib instances, but are out-of-sync after some maintenance. This patch re-syncs them and makes them exactly the same.
5.	Cleanup MemLibInternal.h so that it is shared by 6 BaseMemoryLib instance except for PeiMemoryLib and UefiMemoryLib.


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

14 files changed, 72 insertions, 91 deletions

diff --git a/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c b/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
index 3c8be6a76e..278ef3369e 100644
--- a/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
@@ -9,9 +9,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-Copyright (c) 2006 - 2008, Intel Corporation

+Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c b/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
index b7e8d7a651..5077820be0 100644
--- a/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
@@ -1,8 +1,8 @@
 /** @file

   CopyMem() implementation.

-  

-  The following BaseMemoryLib instances contain the same copy of this file:

 

+  The following BaseMemoryLib instances contain the same copy of this file:

+  

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

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

+  Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c b/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
index e5851a022c..e9e0f171ba 100644
--- a/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
@@ -1,7 +1,12 @@
 /** @file

   Architecture Independent Base Memory Library Implementation.

 

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

+  The following BaseMemoryLib instances contain the same copy of this file:

+    BaseMemoryLib

+    PeiMemoryLib

+    UefiMemoryLib

+

+  Copyright (c) 2006 - 2009, 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

@@ -10,12 +15,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

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

 

-  The following BaseMemoryLib instances contain the same copy of this file:

-

-    BaseMemoryLib

-    PeiMemoryLib

-    DxeMemoryLib

-

 **/

 

 #include "MemLibInternals.h"

@@ -24,7 +23,7 @@
   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  Length  Count of 16-bit value to fill.

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

 

   @return Buffer

@@ -48,7 +47,7 @@ InternalMemSetMem16 (
   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  Length  Count of 32-bit value to fill.

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

 

   @return Buffer

@@ -72,7 +71,7 @@ InternalMemSetMem32 (
   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  Length  Count of 64-bit value to fill.

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

 

   @return Buffer

@@ -145,7 +144,7 @@ InternalMemCompareMem (
   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  Length  Count of 8-bit value 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.

@@ -175,7 +174,7 @@ InternalMemScanMem8 (
   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  Length  Count of 16-bit value 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.

@@ -205,7 +204,7 @@ InternalMemScanMem16 (
   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  Length  Count of 32-bit value 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.

@@ -235,7 +234,7 @@ InternalMemScanMem32 (
   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  Length  Count of 64-bit value 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.

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c b/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
index b14abbc75a..b315ff5322 100644
--- a/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/UefiMemoryLib/MemLibGuid.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

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

+  Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibInternals.h b/MdePkg/Library/UefiMemoryLib/MemLibInternals.h
index a2531c7b10..77e80567c3 100644
--- a/MdePkg/Library/UefiMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/UefiMemoryLib/MemLibInternals.h
@@ -1,7 +1,7 @@
 /** @file

   Declaration of internal functions for Base Memory Library.

 

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

+  Copyright (c) 2006 - 2009, 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

@@ -10,30 +10,17 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

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

 

-  The following BaseMemoryLib instances contain the same copy of this file:

-

-    BaseMemoryLib

-    BaseMemoryLibMmx

-    BaseMemoryLibSse2

-    BaseMemoryLibRepStr

-    BaseMemoryLibOptDxe

-    BaseMemoryLibOptPei

-    PeiMemoryLib

-    DxeMemoryLib

-

 **/

 

 #ifndef __MEM_LIB_INTERNALS__

 #define __MEM_LIB_INTERNALS__

 

-

 #include <Uefi.h>

 

-

 #include <Library/BaseMemoryLib.h>

+#include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 #include <Library/UefiBootServicesTableLib.h>

-#include <Library/BaseLib.h>

 

 /**

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

@@ -79,7 +66,7 @@ InternalMemSetMem (
   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  Length  Count of 16-bit value to fill.

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

 

   @return Buffer

@@ -97,7 +84,7 @@ InternalMemSetMem16 (
   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  Length  Count of 32-bit value to fill.

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

 

   @return Buffer

@@ -115,7 +102,7 @@ InternalMemSetMem32 (
   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  Length  Count of 64-bit value to fill.

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

 

   @return Buffer

@@ -171,7 +158,7 @@ InternalMemCompareMem (
   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  Length  Count of 8-bit value 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.

@@ -190,7 +177,7 @@ InternalMemScanMem8 (
   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  Length  Count of 16-bit value 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.

@@ -209,7 +196,7 @@ InternalMemScanMem16 (
   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  Length  Count of 32-bit value 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.

@@ -228,7 +215,7 @@ InternalMemScanMem32 (
   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  Length  Count of 64-bit value 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.

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
index e7128e90d4..f8b3ab9763 100644
--- a/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

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

+  Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
index 7683910e80..d31b13f4d4 100644
--- a/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
@@ -9,9 +9,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

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

+  Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
index e3b2688681..6d7acf3f7b 100644
--- a/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

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

+  Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
index d17b3a7943..2add7849cd 100644
--- a/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

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

+  Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
index 4c357b3b3d..d74b80f053 100644
--- a/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMem16Wrapper.c
@@ -1,17 +1,7 @@
 /** @file

   SetMem16() implementation.

 

-  Copyright (c) 2006 - 2008, 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.

-

   The following BaseMemoryLib instances contain the same copy of this file:

-

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -19,7 +9,16 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

+

+  Copyright (c) 2006 - 2009, 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.

 

 **/

 

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
index 89cd42f22d..dc84d2093a 100644
--- a/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMem32Wrapper.c
@@ -1,17 +1,7 @@
 /** @file

   SetMem32() implementation.

 

-  Copyright (c) 2006 - 2008, 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.

-

   The following BaseMemoryLib instances contain the same copy of this file:

-

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -19,10 +9,18 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-**/

+  Copyright (c) 2006 - 2009, 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.

+

+**/

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
index 8235924b54..05dc453c3a 100644
--- a/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMem64Wrapper.c
@@ -1,17 +1,7 @@
 /** @file

   SetMem64() implementation.

 

-  Copyright (c) 2006 - 2008, 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.

-

   The following BaseMemoryLib instances contain the same copy of this file:

-

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -19,10 +9,18 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-**/

+  Copyright (c) 2006 - 2009, 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.

+

+**/

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
index 18fbcdc18a..b6bc1f4387 100644
--- a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

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

+  Copyright (c) 2006 - 2009, 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

diff --git a/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
index 5f8df5b619..2923356f13 100644
--- a/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/ZeroMemWrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

     

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

+  Copyright (c) 2006 - 2009 , 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