ArmPkg/ArmCpuLib: 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>
This commit is contained in:
Ard Biesheuvel 2016-08-10 14:33:09 +02:00
parent 5e32710023
commit 136df8b8b2
2 changed files with 3 additions and 15 deletions

View File

@ -14,16 +14,11 @@
#include <AsmMacroIoLibV8.h> #include <AsmMacroIoLibV8.h>
.text ASM_FUNC(ArmReadCpuExCr)
.align 3
GCC_ASM_EXPORT (ArmReadCpuExCr)
GCC_ASM_EXPORT (ArmWriteCpuExCr)
ASM_PFX(ArmReadCpuExCr):
mrs x0, S3_1_c15_c2_1 mrs x0, S3_1_c15_c2_1
ret ret
ASM_PFX(ArmWriteCpuExCr): ASM_FUNC(ArmWriteCpuExCr)
msr S3_1_c15_c2_1, x0 msr S3_1_c15_c2_1, x0
dsb sy dsb sy
isb isb

View File

@ -12,17 +12,10 @@
// //
#include <AsmMacroIoLib.h> #include <AsmMacroIoLib.h>
#include <Library/ArmCpuLib.h>
#include <Chipset/ArmCortexA9.h>
.text
.align 3
GCC_ASM_EXPORT(ArmGetScuBaseAddress)
// IN None // IN None
// OUT r0 = SCU Base Address // OUT r0 = SCU Base Address
ASM_PFX(ArmGetScuBaseAddress): ASM_FUNC(ArmGetScuBaseAddress)
// Read Configuration Base Address Register. ArmCBar cannot be called to get // Read Configuration Base Address Register. ArmCBar cannot be called to get
// the Configuration BAR as a stack is not necessary setup. The SCU is at the // the Configuration BAR as a stack is not necessary setup. The SCU is at the
// offset 0x0000 from the Private Memory Region. // offset 0x0000 from the Private Memory Region.