From 1fef058f4b8fefc455bb171e4908c3e835b1b492 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Tue, 11 Aug 2009 15:32:16 +0000 Subject: 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 --- MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c | 6 +++--- MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c | 4 ++-- MdePkg/Library/BaseMemoryLib/MemLibGeneric.c | 21 +++++++++------------ MdePkg/Library/BaseMemoryLib/MemLibGuid.c | 4 ++-- MdePkg/Library/BaseMemoryLib/MemLibInternals.h | 21 +++++++++------------ MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c | 4 ++-- MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c | 4 ++-- MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c | 4 ++-- MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c | 4 ++-- MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c | 7 ++----- MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c | 7 ++----- MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c | 7 ++----- MdePkg/Library/BaseMemoryLib/SetMemWrapper.c | 6 +++--- MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c | 4 ++-- 14 files changed, 44 insertions(+), 59 deletions(-) (limited to 'MdePkg/Library/BaseMemoryLib') diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c index 8eff3c050d..278ef3369e 100644 --- a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c +++ b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c @@ -1,6 +1,6 @@ /** @file CompareMem() implementation. - + The following BaseMemoryLib instances contain the same copy of this file: BaseMemoryLib BaseMemoryLibMmx @@ -9,9 +9,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib -Copyright (c) 2006 - 2008, Intel Corporation +Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c index 831e491b50..5077820be0 100644 --- a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c +++ b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c @@ -10,9 +10,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/MemLibGeneric.c b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c index 84ca4d9a8b..e9e0f171ba 100644 --- a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c +++ b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c @@ -4,9 +4,9 @@ The following BaseMemoryLib instances contain the same copy of this file: BaseMemoryLib PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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 @@ -17,16 +17,13 @@ **/ - - - #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 Length Count of 16-bit value to fill. @param Value Value with which to fill Length bytes of Buffer. @return Buffer @@ -50,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 @@ -74,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 @@ -147,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. @@ -177,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. @@ -207,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. @@ -237,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/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c index b14abbc75a..b315ff5322 100644 --- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c +++ b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c @@ -10,9 +10,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/MemLibInternals.h b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h index 61024bef69..f40299b9ca 100644 --- a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h +++ b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h @@ -8,10 +8,8 @@ BaseMemoryLibRepStr BaseMemoryLibOptDxe BaseMemoryLibOptPei - PeiMemoryLib - DxeMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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 @@ -30,7 +28,6 @@ #include #include - /** Copy Length bytes from Source to Destination. @@ -62,7 +59,7 @@ InternalMemCopyMem ( VOID * EFIAPI InternalMemSetMem ( - IN VOID *Buffer, + OUT VOID *Buffer, IN UINTN Length, IN UINT8 Value ); @@ -71,7 +68,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 @@ -89,7 +86,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 @@ -107,7 +104,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 @@ -163,7 +160,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. @@ -182,7 +179,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. @@ -201,7 +198,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. @@ -220,7 +217,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/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c index e7128e90d4..f8b3ab9763 100644 --- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c @@ -10,9 +10,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c index 7683910e80..d31b13f4d4 100644 --- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c @@ -9,9 +9,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c index e3b2688681..6d7acf3f7b 100644 --- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c @@ -10,9 +10,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c index d17b3a7943..2add7849cd 100644 --- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c @@ -10,9 +10,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c index 4e0bb8d0ea..d74b80f053 100644 --- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c @@ -9,9 +9,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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 @@ -22,9 +22,6 @@ **/ - - - #include "MemLibInternals.h" /** diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c index db03525f3b..dc84d2093a 100644 --- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c @@ -9,9 +9,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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 @@ -22,9 +22,6 @@ **/ - - - #include "MemLibInternals.h" /** diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c index 5010df671c..05dc453c3a 100644 --- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c @@ -9,9 +9,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008, Intel Corporation
+ Copyright (c) 2006 - 2009, Intel Corporation
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 @@ -22,9 +22,6 @@ **/ - - - #include "MemLibInternals.h" /** diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c index 5197d077d8..b6bc1f4387 100644 --- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c +++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c @@ -2,7 +2,7 @@ SetMem() implementation. 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
+ Copyright (c) 2006 - 2009, Intel Corporation
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/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c index 5f8df5b619..2923356f13 100644 --- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c +++ b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c @@ -10,9 +10,9 @@ BaseMemoryLibOptDxe BaseMemoryLibOptPei PeiMemoryLib - DxeMemoryLib + UefiMemoryLib - Copyright (c) 2006 - 2008 , Intel Corporation
+ Copyright (c) 2006 - 2009 , Intel Corporation
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 -- cgit v1.2.3