diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-12-15 15:01:42 +0000 |
|---|---|---|
| committer | abiesheuvel <abiesheuvel@Edk2> | 2015-12-15 15:01:42 +0000 |
| commit | 1a0db79125bad94aaaa97e1146100594a1471382 (patch) | |
| tree | 40a7a97a140fee5d734c8b13593f3f45a03c6204 /ArmPkg/Library/DebugAgentSymbolsBaseLib | |
| parent | 660aaec3118b0763ee4fcd83b936bf15ffcf23a9 (diff) | |
| download | edk2-1a0db79125bad94aaaa97e1146100594a1471382.zip edk2-1a0db79125bad94aaaa97e1146100594a1471382.tar.gz edk2-1a0db79125bad94aaaa97e1146100594a1471382.tar.bz2 | |
ArmPkg: use unified asm syntax for CLANG
The CLANG assembler does not support the legacy, non-unified assembler syntax,
i.e., it does not support the reordering of the condition suffixes with the
increment/decrement before/after or byte/word suffixes, and it does not
recognize the 'empty descending' (ED) suffix at all. So move to the unified
syntax, and replace 'empty descending' with 'decrement after' or 'increment
before' as appropriate.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19280 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPkg/Library/DebugAgentSymbolsBaseLib')
| -rw-r--r-- | ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S index 0566a89..0f2e4b1 100644 --- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S +++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S @@ -54,6 +54,7 @@ GCC_ASM_EXPORT(DebugAgentVectorTable) GCC_ASM_IMPORT(DefaultExceptionHandler)
.text
+.syntax unified
#if !defined(__APPLE__)
.fpu neon @ makes vpush/vpop assemble
#endif
@@ -202,9 +203,9 @@ ASM_PFX(AsmCommonExceptionEntry): and R3, R1, #0x1f @ Check CPSR to see if User or System Mode
cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1df))
cmpne R3, #0x10 @
- stmeqed R2, {lr}^ @ save unbanked lr
+ stmdaeq R2, {lr}^ @ save unbanked lr
@ else
- stmneed R2, {lr} @ save SVC lr
+ stmdane R2, {lr} @ save SVC lr
ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd
@@ -263,9 +264,9 @@ DefaultExceptionHandler ( and R1, R1, #0x1f @ Check to see if User or System Mode
cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R1, #0x10 @
- ldmeqed R2, {lr}^ @ restore unbanked lr
+ ldmibeq R2, {lr}^ @ restore unbanked lr
@ else
- ldmneed R3, {lr} @ restore SVC lr, via ldmfd SP!, {LR}
+ ldmibne R3, {lr} @ restore SVC lr, via ldmfd SP!, {LR}
ldmfd SP!,{R0-R12} @ Restore general purpose registers
@ Exception handler can not change SP
|