ARM Packages: Removed trailing spaces

Trailing spaces create issue/warning when generating/applying patches.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15833 6f19259b-4bc3-4df7-8a09-765794883524

14 files changed, 92 insertions, 92 deletions

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
index 4e0122bdec..7985b59279 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
@@ -1,10 +1,10 @@
-#------------------------------------------------------------------------------ 

+#------------------------------------------------------------------------------

 #

 # CopyMem() worker for ARM

 #

 # This file started out as C code that did 64 bit moves if the buffer was

 # 32-bit aligned, else it does a byte copy. It also does a byte copy for

-# any trailing bytes. It was updated to do 32-byte copies using stm/ldm. 

+# any trailing bytes. It was updated to do 32-byte copies using stm/ldm.

 #

 # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>

 # This program and the accompanying materials

@@ -20,7 +20,7 @@
 /**

   Copy Length bytes from Source to Destination. Overlap is OK.

 

-  This implementation 

+  This implementation

 

   @param  Destination Target of copy

   @param  Source      Place to copy from

@@ -48,7 +48,7 @@ ASM_PFX(InternalMemCopyMem):
   mov  r10, r0

   mov  r12, r2

   mov  r14, r1

-  

+

 memcopy_check_overlapped:

   cmp  r11, r1

   // If (dest < source)

@@ -61,10 +61,10 @@ memcopy_check_overlapped:
   cmp  r12, r3

   bcc  memcopy_check_optim_default

 

-  // If (length == 0)  

+  // If (length == 0)

   cmp  r12, #0

   beq  memcopy_end

-  

+

   b     memcopy_check_optim_overlap

 

 memcopy_check_optim_default:

@@ -79,7 +79,7 @@ memcopy_check_optim_default:
   movls  r0, #0

   andhi  r0, r3, #1

   b     memcopy_default

-    

+

 memcopy_check_optim_overlap:

   // r10 = dest_end, r14 = source_end

   add  r10, r11, r12

@@ -94,12 +94,12 @@ memcopy_check_optim_overlap:
   tst  r14, #0xF

   movne  r0, #0

   b  memcopy_overlapped

-  

+

 memcopy_overlapped_non_optim:

   // We read 1 byte from the end of the source buffer

   sub  r3, r14, #1

   sub  r12, r12, #1

-  ldrb  r3, [r3, #0]  

+  ldrb  r3, [r3, #0]

   sub  r2, r10, #1

   cmp  r12, #0

   // We write 1 byte at the end of the dest buffer

@@ -114,58 +114,58 @@ memcopy_overlapped:
   // Are we in the optimized case ?

   cmp  r0, #0

   beq  memcopy_overlapped_non_optim

-  

+

   // Optimized Overlapped - Read 32 bytes

   sub  r14, r14, #32

   sub  r12, r12, #32

   cmp  r12, #31

   ldmia  r14, {r2-r9}

-  

+

   // If length is less than 32 then disable optim

   movls  r0, #0

-  

+

   cmp  r12, #0

-  

-  // Optimized Overlapped - Write 32 bytes  

+

+  // Optimized Overlapped - Write 32 bytes

   sub  r10, r10, #32

   stmia  r10, {r2-r9}

-  

+

   // while (length != 0)

   bne  memcopy_overlapped

   b   memcopy_end

-  

+

 memcopy_default_non_optim:

   // Byte copy

-  ldrb  r3, [r14], #1  

+  ldrb  r3, [r14], #1

   sub  r12, r12, #1

   strb  r3, [r10], #1

-  

+

 memcopy_default:

   cmp  r12, #0

   beq  memcopy_end

-  

+

 // r10 = dest, r14 = source

 memcopy_default_loop:

   cmp  r0, #0

   beq  memcopy_default_non_optim

-  

+

   // Optimized memcopy - Read 32 Bytes

   sub  r12, r12, #32

   cmp  r12, #31

   ldmia  r14!, {r2-r9}

-  

+

   // If length is less than 32 then disable optim

   movls  r0, #0

-  

+

   cmp  r12, #0

-  

+

   // Optimized memcopy - Write 32 Bytes

   stmia  r10!, {r2-r9}

 

   // while (length != 0)

   bne  memcopy_default_loop

-  

+

 memcopy_end:

   mov  r0, r11

   ldmfd  sp!, {r4-r11, pc}

-  

+

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
index d0faa00d1e..0d22d7577d 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
@@ -1,4 +1,4 @@
-;------------------------------------------------------------------------------ 

+;------------------------------------------------------------------------------

 ;

 ; CopyMem() worker for ARM

 ;

@@ -20,7 +20,7 @@
 /**

   Copy Length bytes from Source to Destination. Overlap is OK.

 

-  This implementation 

+  This implementation

 

   @param  Destination Target of copy

   @param  Source      Place to copy from

@@ -48,7 +48,7 @@ InternalMemCopyMem
   mov  r10, r0

   mov  r12, r2

   mov  r14, r1

-  

+

 memcopy_check_overlapped

   cmp  r11, r1

   // If (dest < source)

@@ -61,10 +61,10 @@ memcopy_check_overlapped
   cmp  r12, r3

   bcc  memcopy_check_optim_default

 

-  // If (length == 0)  

+  // If (length == 0)

   cmp  r12, #0

   beq  memcopy_end

-  

+

   b     memcopy_check_optim_overlap

 

 memcopy_check_optim_default

@@ -79,7 +79,7 @@ memcopy_check_optim_default
   movls  r0, #0

   andhi  r0, r3, #1

   b     memcopy_default

-    

+

 memcopy_check_optim_overlap

   // r10 = dest_end, r14 = source_end

   add  r10, r11, r12

@@ -94,12 +94,12 @@ memcopy_check_optim_overlap
   tst  r14, #0xF

   movne  r0, #0

   b  memcopy_overlapped

-  

+

 memcopy_overlapped_non_optim

   // We read 1 byte from the end of the source buffer

   sub  r3, r14, #1

   sub  r12, r12, #1

-  ldrb  r3, [r3, #0]  

+  ldrb  r3, [r3, #0]

   sub  r2, r10, #1

   cmp  r12, #0

   // We write 1 byte at the end of the dest buffer

@@ -114,60 +114,60 @@ memcopy_overlapped
   // Are we in the optimized case ?

   cmp  r0, #0

   beq  memcopy_overlapped_non_optim

-  

+

   // Optimized Overlapped - Read 32 bytes

   sub  r14, r14, #32

   sub  r12, r12, #32

   cmp  r12, #31

   ldmia  r14, {r2-r9}

-  

+

   // If length is less than 32 then disable optim

   movls  r0, #0

-  

+

   cmp  r12, #0

-  

-  // Optimized Overlapped - Write 32 bytes  

+

+  // Optimized Overlapped - Write 32 bytes

   sub  r10, r10, #32

   stmia  r10, {r2-r9}

-  

+

   // while (length != 0)

   bne  memcopy_overlapped

   b   memcopy_end

-  

+

 memcopy_default_non_optim

   // Byte copy

-  ldrb  r3, [r14], #1  

+  ldrb  r3, [r14], #1

   sub  r12, r12, #1

   strb  r3, [r10], #1

-  

+

 memcopy_default

   cmp  r12, #0

   beq  memcopy_end

-  

+

 // r10 = dest, r14 = source

 memcopy_default_loop

   cmp  r0, #0

   beq  memcopy_default_non_optim

-  

+

   // Optimized memcopy - Read 32 Bytes

   sub  r12, r12, #32

   cmp  r12, #31

   ldmia  r14!, {r2-r9}

-  

+

   // If length is less than 32 then disable optim

   movls  r0, #0

-  

+

   cmp  r12, #0

-  

+

   // Optimized memcopy - Write 32 Bytes

   stmia  r10!, {r2-r9}

 

   // while (length != 0)

   bne  memcopy_default_loop

-  

+

 memcopy_end

   mov  r0, r11

   ldmfd  sp!, {r4-r11, pc}

-  

+

   END

-  

+

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
index 49ebf3c2f5..c5b4cfe15f 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
@@ -1,10 +1,10 @@
-#------------------------------------------------------------------------------ 

+#------------------------------------------------------------------------------

 #

 # SemMem() worker for ARM

 #

 # This file started out as C code that did 64 bit moves if the buffer was

 # 32-bit aligned, else it does a byte copy. It also does a byte copy for

-# any trailing bytes. It was updated to do 32-byte at a time. 

+# any trailing bytes. It was updated to do 32-byte at a time.

 #

 # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>

 # This program and the accompanying materials

@@ -34,7 +34,7 @@ InternalMemSetMem (
   IN      UINT8                     Value

   )

 **/

-  

+

 .text

 .align 2

 GCC_ASM_EXPORT(InternalMemSetMem)

@@ -56,14 +56,14 @@ L32:
 L31:

   and   r4, r2, #0xff

   orr   r4, r4, r4, LSL #8

-  orr   r4, r4, r4, LSL #16  

+  orr   r4, r4, r4, LSL #16

   mov   r5, r4

   mov   r6, r4

-  mov   r7, r4 

-  mov   r8, r4 

-  mov   r9, r4 

-  mov   r10, r4 

-  mov   r11, r4 

+  mov   r7, r4

+  mov   r8, r4

+  mov   r9, r4

+  mov   r10, r4

+  mov   r11, r4

   b      L32

 L34:

   cmp      lr, #0

@@ -78,4 +78,4 @@ L43:
   cmp      r1, #0

   bne      L34

   ldmfd    sp!, {r4-r11, pc}

-  

+

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
index 3cc753ccc6..a9f29e2306 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
@@ -1,4 +1,4 @@
-;------------------------------------------------------------------------------ 

+;------------------------------------------------------------------------------

 ;

 ; SetMem() worker for ARM

 ;

@@ -33,9 +33,9 @@ InternalMemSetMem (
   IN      UINT8                     Value

   )

 **/

-  

+

   EXPORT InternalMemSetMem

-  

+

   AREA AsmMemStuff, CODE, READONLY

 

 InternalMemSetMem

@@ -55,14 +55,14 @@ L32
 L31

   and   r4, r2, #0xff

   orr   r4, r4, r4, LSL #8

-  orr   r4, r4, r4, LSL #16  

+  orr   r4, r4, r4, LSL #16

   mov   r5, r4

   mov   r6, r4

-  mov   r7, r4 

-  mov   r8, r4 

-  mov   r9, r4 

-  mov   r10, r4 

-  mov   r11, r4 

+  mov   r7, r4

+  mov   r8, r4

+  mov   r9, r4

+  mov   r10, r4

+  mov   r11, r4

   b      L32

 L34

   cmp      lr, #0

@@ -77,5 +77,5 @@ L43
   cmp      r1, #0

   bne      L34

   ldmfd    sp!, {r4-r11, pc}

-  

+

   END

diff --git a/ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf b/ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
index a4d28036b6..c2f3e2f0b6 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
+++ b/ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
@@ -1,8 +1,8 @@
 ## @file

 #  Instance of Base Memory Library with some ARM ldm/stm assembly.

 #

-#  This is a copy of the MdePkg BaseMemoryLib with the CopyMem and 

-#  SetMem worker functions replaced with assembler that uses 

+#  This is a copy of the MdePkg BaseMemoryLib with the CopyMem and

+#  SetMem worker functions replaced with assembler that uses

 #  ldm/stm.

 #

 #  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

@@ -25,7 +25,7 @@
   FILE_GUID                      = 4D466AF3-2380-448D-A337-E4033F29F3F7

   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = BaseMemoryLib 

+  LIBRARY_CLASS                  = BaseMemoryLib

 

 

 #

@@ -46,7 +46,7 @@
   SetMemWrapper.c

   CopyMemWrapper.c

   MemLibGeneric.c

-  MemLibGuid.c  

+  MemLibGuid.c

   MemLibInternals.h

 

 [Sources.ARM]

diff --git a/ArmPkg/Library/BaseMemoryLibStm/CompareMemWrapper.c b/ArmPkg/Library/BaseMemoryLibStm/CompareMemWrapper.c
index 9695c5b51b..c83988f59e 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/CompareMemWrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/CompareMemWrapper.c
@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   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, then ASSERT().

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

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

@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @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

diff --git a/ArmPkg/Library/BaseMemoryLibStm/CopyMemWrapper.c b/ArmPkg/Library/BaseMemoryLibStm/CopyMemWrapper.c
index 5fca133643..2adfb31149 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/CopyMemWrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/CopyMemWrapper.c
@@ -2,7 +2,7 @@
   CopyMem() implementation.

 

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

-  

+

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -31,7 +31,7 @@
   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().

 

diff --git a/ArmPkg/Library/BaseMemoryLibStm/MemLibGuid.c b/ArmPkg/Library/BaseMemoryLibStm/MemLibGuid.c
index 1d90a8bca2..2b4ed57755 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/MemLibGuid.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/MemLibGuid.c
@@ -2,7 +2,7 @@
   Implementation of GUID functions.

 

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

-  

+

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -30,7 +30,7 @@
 

   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().

 

@@ -63,7 +63,7 @@ CopyGuid (
 

   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().

 

@@ -93,7 +93,7 @@ CompareGuid (
   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().

diff --git a/ArmPkg/Library/BaseMemoryLibStm/ScanMem16Wrapper.c b/ArmPkg/Library/BaseMemoryLibStm/ScanMem16Wrapper.c
index 3dc2d291c1..1c727b3e80 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/ScanMem16Wrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/ScanMem16Wrapper.c
@@ -33,7 +33,7 @@
   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().

diff --git a/ArmPkg/Library/BaseMemoryLibStm/ScanMem32Wrapper.c b/ArmPkg/Library/BaseMemoryLibStm/ScanMem32Wrapper.c
index 1c47131b59..79ab60ced8 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/ScanMem32Wrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/ScanMem32Wrapper.c
@@ -32,7 +32,7 @@
   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().

diff --git a/ArmPkg/Library/BaseMemoryLibStm/ScanMem64Wrapper.c b/ArmPkg/Library/BaseMemoryLibStm/ScanMem64Wrapper.c
index 5161b29cad..d11e50b9d5 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/ScanMem64Wrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/ScanMem64Wrapper.c
@@ -33,7 +33,7 @@
   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().

diff --git a/ArmPkg/Library/BaseMemoryLibStm/ScanMem8Wrapper.c b/ArmPkg/Library/BaseMemoryLibStm/ScanMem8Wrapper.c
index c547cb46e1..c6c6d5f39b 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/ScanMem8Wrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/ScanMem8Wrapper.c
@@ -33,7 +33,7 @@
   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().

 

@@ -57,19 +57,19 @@ ScanMem8 (
   }

   ASSERT (Buffer != NULL);

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

- 

+

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

 }

 

 /**

-  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 

+  Scans a target buffer for a UINTN sized value, and returns a pointer to the matching

   UINTN sized value in the target buffer.

 

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

   address to the highest address for a UINTN sized 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 UINTN boundary, then ASSERT().

   If Length is not aligned on a UINTN boundary, then ASSERT().

diff --git a/ArmPkg/Library/BaseMemoryLibStm/SetMemWrapper.c b/ArmPkg/Library/BaseMemoryLibStm/SetMemWrapper.c
index 6d6ec38ae2..9240c89e8b 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/SetMemWrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/SetMemWrapper.c
@@ -29,7 +29,7 @@
   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.

diff --git a/ArmPkg/Library/BaseMemoryLibStm/ZeroMemWrapper.c b/ArmPkg/Library/BaseMemoryLibStm/ZeroMemWrapper.c
index 89520348ba..d6c6279f68 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/ZeroMemWrapper.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/ZeroMemWrapper.c
@@ -11,7 +11,7 @@
     BaseMemoryLibOptPei

     PeiMemoryLib

     UefiMemoryLib

-    

+

   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

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

@@ -29,7 +29,7 @@
   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().