summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-08-10 14:37:10 +0200
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2016-08-11 12:29:31 +0200
commit8ca934aab50be35099039db69c206acb5bdb006c (patch)
treed8670b8c1c453b1b96f041bd3f1a7474bd95ce38
parent86a4d91bda59be0a8880983e159795b16f577292 (diff)
downloadedk2-platforms-8ca934aab50be35099039db69c206acb5bdb006c.tar.xz
ArmPkg/BaseMemoryLibSm: switch to ASM_FUNC() asm macro
Annotate functions with ASM_FUNC() so that they are emitted into separate sections. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
-rw-r--r--ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S8
-rw-r--r--ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S7
2 files changed, 6 insertions, 9 deletions
diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
index 7985b59279..f90589c225 100644
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
@@ -17,6 +17,8 @@
#
#------------------------------------------------------------------------------
+#include <AsmMacroIoLib.h>
+
/**
Copy Length bytes from Source to Destination. Overlap is OK.
@@ -37,11 +39,7 @@ InternalMemCopyMem (
IN UINTN Length
)
**/
-.text
-.align 2
-GCC_ASM_EXPORT(InternalMemCopyMem)
-
-ASM_PFX(InternalMemCopyMem):
+ASM_FUNC(InternalMemCopyMem)
stmfd sp!, {r4-r11, lr}
// Save the input parameters in extra registers (r11 = destination, r14 = source, r12 = length)
mov r11, r0
diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
index 970d030ca3..242de95f74 100644
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
@@ -17,6 +17,8 @@
#
#------------------------------------------------------------------------------
+#include <AsmMacroIoLib.h>
+
/**
Set Buffer to Value for Size bytes.
@@ -35,12 +37,9 @@ InternalMemSetMem (
)
**/
-.text
.syntax unified
-.align 2
-GCC_ASM_EXPORT(InternalMemSetMem)
-ASM_PFX(InternalMemSetMem):
+ASM_FUNC(InternalMemSetMem)
stmfd sp!, {r4-r11, lr}
tst r0, #3
movne r3, #0