BeagleBoardPkg: remove dependency on ArmPkg/BaseMemoryLibStm

[mirror_edk2.git] / ArmPkg / Library / BaseMemoryLibStm / Arm / CopyMem.asm

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
old mode 100755 (executable)
new mode 100644 (file)
index d0faa00..686253e
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
@@ -1,4 +1,4 @@
-;------------------------------------------------------------------------------ \r
+;------------------------------------------------------------------------------\r
 ;\r
 ; CopyMem() worker for ARM\r
 ;\r
@@ -20,7 +20,7 @@
 /**\r
   Copy Length bytes from Source to Destination. Overlap is OK.\r
 \r
-  This implementation \r
+  This implementation\r
 \r
   @param  Destination Target of copy\r
   @param  Source      Place to copy from\r
@@ -37,18 +37,17 @@ InternalMemCopyMem (
   IN      UINTN                     Length\r
   )\r
 **/\r
-  EXPORT InternalMemCopyMem\r
 \r
-  AREA AsmMemStuff, CODE, READONLY\r
+    INCLUDE AsmMacroExport.inc\r
 \r
-InternalMemCopyMem\r
+ RVCT_ASM_EXPORT InternalMemCopyMem\r
   stmfd  sp!, {r4-r11, lr}\r
   // Save the input parameters in extra registers (r11 = destination, r14 = source, r12 = length)\r
   mov  r11, r0\r
   mov  r10, r0\r
   mov  r12, r2\r
   mov  r14, r1\r
-  \r
+\r
 memcopy_check_overlapped\r
   cmp  r11, r1\r
   // If (dest < source)\r
@@ -61,10 +60,10 @@ memcopy_check_overlapped
   cmp  r12, r3\r
   bcc  memcopy_check_optim_default\r
 \r
-  // If (length == 0)  \r
+  // If (length == 0)\r
   cmp  r12, #0\r
   beq  memcopy_end\r
-  \r
+\r
   b     memcopy_check_optim_overlap\r
 \r
 memcopy_check_optim_default\r
@@ -79,7 +78,7 @@ memcopy_check_optim_default
   movls  r0, #0\r
   andhi  r0, r3, #1\r
   b     memcopy_default\r
-    \r
+\r
 memcopy_check_optim_overlap\r
   // r10 = dest_end, r14 = source_end\r
   add  r10, r11, r12\r
@@ -94,12 +93,12 @@ memcopy_check_optim_overlap
   tst  r14, #0xF\r
   movne  r0, #0\r
   b  memcopy_overlapped\r
-  \r
+\r
 memcopy_overlapped_non_optim\r
   // We read 1 byte from the end of the source buffer\r
   sub  r3, r14, #1\r
   sub  r12, r12, #1\r
-  ldrb  r3, [r3, #0]  \r
+  ldrb  r3, [r3, #0]\r
   sub  r2, r10, #1\r
   cmp  r12, #0\r
   // We write 1 byte at the end of the dest buffer\r
@@ -114,60 +113,60 @@ memcopy_overlapped
   // Are we in the optimized case ?\r
   cmp  r0, #0\r
   beq  memcopy_overlapped_non_optim\r
-  \r
+\r
   // Optimized Overlapped - Read 32 bytes\r
   sub  r14, r14, #32\r
   sub  r12, r12, #32\r
   cmp  r12, #31\r
   ldmia  r14, {r2-r9}\r
-  \r
+\r
   // If length is less than 32 then disable optim\r
   movls  r0, #0\r
-  \r
+\r
   cmp  r12, #0\r
-  \r
-  // Optimized Overlapped - Write 32 bytes  \r
+\r
+  // Optimized Overlapped - Write 32 bytes\r
   sub  r10, r10, #32\r
   stmia  r10, {r2-r9}\r
-  \r
+\r
   // while (length != 0)\r
   bne  memcopy_overlapped\r
   b   memcopy_end\r
-  \r
+\r
 memcopy_default_non_optim\r
   // Byte copy\r
-  ldrb  r3, [r14], #1  \r
+  ldrb  r3, [r14], #1\r
   sub  r12, r12, #1\r
   strb  r3, [r10], #1\r
-  \r
+\r
 memcopy_default\r
   cmp  r12, #0\r
   beq  memcopy_end\r
-  \r
+\r
 // r10 = dest, r14 = source\r
 memcopy_default_loop\r
   cmp  r0, #0\r
   beq  memcopy_default_non_optim\r
-  \r
+\r
   // Optimized memcopy - Read 32 Bytes\r
   sub  r12, r12, #32\r
   cmp  r12, #31\r
   ldmia  r14!, {r2-r9}\r
-  \r
+\r
   // If length is less than 32 then disable optim\r
   movls  r0, #0\r
-  \r
+\r
   cmp  r12, #0\r
-  \r
+\r
   // Optimized memcopy - Write 32 Bytes\r
   stmia  r10!, {r2-r9}\r
 \r
   // while (length != 0)\r
   bne  memcopy_default_loop\r
-  \r
+\r
 memcopy_end\r
   mov  r0, r11\r
   ldmfd  sp!, {r4-r11, pc}\r
-  \r
+\r
   END\r
-  \r
+\r