Revision: 19280
http://sourceforge.net/p/edk2/code/19280
Author: abiesheuvel
Date: 2015-12-15 15:01:42 +0000 (Tue, 15 Dec 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Leif Lindholm <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPkg/Drivers/CpuDxe/Arm/ExceptionSupport.S
trunk/edk2/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
Modified: trunk/edk2/ArmPkg/Drivers/CpuDxe/Arm/ExceptionSupport.S
===================================================================
--- trunk/edk2/ArmPkg/Drivers/CpuDxe/Arm/ExceptionSupport.S 2015-12-15
13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Drivers/CpuDxe/Arm/ExceptionSupport.S 2015-12-15
15:01:42 UTC (rev 19280)
@@ -60,6 +60,7 @@
GCC_ASM_EXPORT(CommonCExceptionHandler)
.text
+.syntax unified
#if !defined(__APPLE__)
.fpu neon @ makes vpush/vpop assemble
#endif
@@ -223,9 +224,9 @@
and R3, R1, #0x1f @ Check CPSR to see if User or System Mode
cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
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
@@ -290,9 +291,9 @@
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
Modified: trunk/edk2/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
===================================================================
--- trunk/edk2/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S 2015-12-15
13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S 2015-12-15
15:01:42 UTC (rev 19280)
@@ -36,6 +36,7 @@
**/
.text
+.syntax unified
.align 2
GCC_ASM_EXPORT(InternalMemSetMem)
@@ -67,7 +68,7 @@
b L32
L34:
cmp lr, #0
- streqb r2, [r12], #1
+ strbeq r2, [r12], #1
subeq r1, r1, #1
beq L43
sub r1, r1, #32
Modified: trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
===================================================================
--- trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
2015-12-15 13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
2015-12-15 15:01:42 UTC (rev 19280)
@@ -14,6 +14,7 @@
#
.text
+.syntax unified
.p2align 2
GCC_ASM_EXPORT(__switch16)
@@ -22,9 +23,9 @@
ldrh ip, [lr, #-1]
cmp r0, ip
add r0, lr, r0, lsl #1
- ldrccsh r0, [r0, #1]
+ ldrshcc r0, [r0, #1]
add ip, lr, ip, lsl #1
- ldrcssh r0, [ip, #1]
+ ldrshcs r0, [ip, #1]
add ip, lr, r0, lsl #1
bx ip
Modified: trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
===================================================================
--- trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
2015-12-15 13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
2015-12-15 15:01:42 UTC (rev 19280)
@@ -14,6 +14,7 @@
#
.text
+.syntax unified
.p2align 2
GCC_ASM_EXPORT(__switch32)
Modified: trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
===================================================================
--- trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
2015-12-15 13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
2015-12-15 15:01:42 UTC (rev 19280)
@@ -14,6 +14,7 @@
#
.text
+.syntax unified
.p2align 2
GCC_ASM_EXPORT(__switch8)
@@ -21,8 +22,8 @@
ASM_PFX(__switch8):
ldrb ip, [lr, #-1]
cmp r0, ip
- ldrccsb r0, [lr, r0]
- ldrcssb r0, [lr, ip]
+ ldrsbcc r0, [lr, r0]
+ ldrsbcs r0, [lr, ip]
add ip, lr, r0, lsl #1
bx ip
Modified: trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
===================================================================
--- trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
2015-12-15 13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
2015-12-15 15:01:42 UTC (rev 19280)
@@ -14,6 +14,7 @@
#
.text
+.syntax unified
.p2align 2
GCC_ASM_EXPORT(__switchu8)
@@ -22,8 +23,8 @@
ASM_PFX(__switchu8):
ldrb ip,[lr,#-1]
cmp r0,ip
- ldrccb r0,[lr,r0]
- ldrcsb r0,[lr,ip]
+ ldrbcc r0,[lr,r0]
+ ldrbcs r0,[lr,ip]
add ip,lr,r0,LSL #1
bx ip
Modified: trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
===================================================================
--- trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
2015-12-15 13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
2015-12-15 15:01:42 UTC (rev 19280)
@@ -13,6 +13,7 @@
#------------------------------------------------------------------------------
.text
+ .syntax unified
.align 2
GCC_ASM_EXPORT(__udivmoddi4)
@@ -44,7 +45,7 @@
L6:
cmp r6, #0
movne r1, #0
- stmneia r6, {r0-r1}
+ stmiane r6, {r0-r1}
b L2
L4:
ldr r1, [sp, #0]
@@ -88,7 +89,7 @@
cmp r6, #0
movne r4, r0
andne r5, ip, r3
- stmneia r6, {r4-r5}
+ stmiane r6, {r4-r5}
L24:
rsb r3, r2, #0
and r3, r2, r3
@@ -123,7 +124,7 @@
andne r3, r3, r0
movne r2, r3
movne r3, #0
- stmneia r6, {r2-r3}
+ stmiane r6, {r2-r3}
L34:
cmp r1, #1
beq L10
@@ -175,7 +176,7 @@
bls L37
L48:
cmp r6, #0
- stmneia r6, {r10-r11}
+ stmiane r6, {r10-r11}
b L2
L37:
rsb r1, r3, #31
@@ -229,7 +230,7 @@
cmp r6, #0
orr r10, r0, ip
mov r11, r1
- stmneia r6, {r4-r5}
+ stmiane r6, {r4-r5}
b L10
L2:
mov r10, #0
Modified: trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
===================================================================
--- trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
2015-12-15 13:33:46 UTC (rev 19279)
+++ trunk/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
2015-12-15 15:01:42 UTC (rev 19280)
@@ -13,6 +13,7 @@
#------------------------------------------------------------------------------
.text
+ .syntax unified
.align 2
GCC_ASM_EXPORT(__udivsi3)
@@ -27,7 +28,7 @@
rsb r3, r3, r2
cmp r3, #31
bhi L2
- ldmeqfd sp!, {r4, r5, r7, pc}
+ ldmfdeq sp!, {r4, r5, r7, pc}
add r5, r3, #1
rsb r3, r3, #31
mov lr, #0
Modified:
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
===================================================================
---
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
2015-12-15 13:33:46 UTC (rev 19279)
+++
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
2015-12-15 15:01:42 UTC (rev 19280)
@@ -54,6 +54,7 @@
GCC_ASM_IMPORT(DefaultExceptionHandler)
.text
+.syntax unified
#if !defined(__APPLE__)
.fpu neon @ makes vpush/vpop assemble
#endif
@@ -202,9 +203,9 @@
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 @@
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
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
