tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-30 00:54:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

ArmPkg: use unified asm syntax for CLANG

Browse Source 
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
This commit is contained in:
Ard Biesheuvel 2015-12-15 15:01:42 +00:00 committed by abiesheuvel
parent 660aaec311
commit 1a0db79125
9 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArmPkg/Drivers/CpuDxe/Arm/ExceptionSupport.S
View File

@ -60,6 +60,7 @@ GCC_ASM_EXPORT(AsmCommonExceptionEntry)
GCC_ASM_EXPORT(CommonCExceptionHandler) GCC_ASM_EXPORT(CommonCExceptionHandler)
.text .text
.syntax unified
#if !defined(__APPLE__) #if !defined(__APPLE__)
.fpu neon @ makes vpush/vpop assemble .fpu neon @ makes vpush/vpop assemble
#endif #endif
@ -223,9 +224,9 @@ ASM_PFX(AsmCommonExceptionEntry):
and R3, R1, #0x1f @ Check CPSR to see if User or System Mode and R3, R1, #0x1f @ Check CPSR to see if User or System Mode
cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f)) cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R3, #0x10 @ cmpne R3, #0x10 @
stmeqed R2, {lr}^ @ save unbanked lr stmdaeq R2, {lr}^ @ save unbanked lr
@ else @ else
stmneed R2, {lr} @ save SVC lr stmdane R2, {lr} @ save SVC lr
ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd
@ -290,9 +291,9 @@ CommonCExceptionHandler (
and R1, R1, #0x1f @ Check to see if User or System Mode and R1, R1, #0x1f @ Check to see if User or System Mode
cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f)) cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R1, #0x10 @ cmpne R1, #0x10 @
ldmeqed R2, {lr}^ @ restore unbanked lr ldmibeq R2, {lr}^ @ restore unbanked lr
@ else @ 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 ldmfd SP!,{R0-R12} @ Restore general purpose registers
@ Exception handler can not change SP @ Exception handler can not change SP

3
ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
View File

@ -36,6 +36,7 @@ InternalMemSetMem (
**/ **/
.text .text
.syntax unified
.align 2 .align 2
GCC_ASM_EXPORT(InternalMemSetMem) GCC_ASM_EXPORT(InternalMemSetMem)
@ -67,7 +68,7 @@ L31:
b L32 b L32
L34: L34:
cmp lr, #0 cmp lr, #0
streqb r2, [r12], #1 strbeq r2, [r12], #1
subeq r1, r1, #1 subeq r1, r1, #1
beq L43 beq L43
sub r1, r1, #32 sub r1, r1, #32

5
ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
View File

@ -14,6 +14,7 @@
# #
.text .text
.syntax unified
.p2align 2 .p2align 2
GCC_ASM_EXPORT(__switch16) GCC_ASM_EXPORT(__switch16)
@ -22,9 +23,9 @@ ASM_PFX(__switch16):
ldrh ip, [lr, #-1] ldrh ip, [lr, #-1]
cmp r0, ip cmp r0, ip
add r0, lr, r0, lsl #1 add r0, lr, r0, lsl #1
ldrccsh r0, [r0, #1] ldrshcc r0, [r0, #1]
add ip, lr, ip, lsl #1 add ip, lr, ip, lsl #1
ldrcssh r0, [ip, #1] ldrshcs r0, [ip, #1]
add ip, lr, r0, lsl #1 add ip, lr, r0, lsl #1
bx ip bx ip

1
ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
View File

@ -14,6 +14,7 @@
# #
.text .text
.syntax unified
.p2align 2 .p2align 2
GCC_ASM_EXPORT(__switch32) GCC_ASM_EXPORT(__switch32)

5
ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
View File

@ -14,6 +14,7 @@
# #
.text .text
.syntax unified
.p2align 2 .p2align 2
GCC_ASM_EXPORT(__switch8) GCC_ASM_EXPORT(__switch8)
@ -21,8 +22,8 @@ GCC_ASM_EXPORT(__switch8)
ASM_PFX(__switch8): ASM_PFX(__switch8):
ldrb ip, [lr, #-1] ldrb ip, [lr, #-1]
cmp r0, ip cmp r0, ip
ldrccsb r0, [lr, r0] ldrsbcc r0, [lr, r0]
ldrcssb r0, [lr, ip] ldrsbcs r0, [lr, ip]
add ip, lr, r0, lsl #1 add ip, lr, r0, lsl #1
bx ip bx ip

5
ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
View File

@ -14,6 +14,7 @@
# #
.text .text
.syntax unified
.p2align 2 .p2align 2
GCC_ASM_EXPORT(__switchu8) GCC_ASM_EXPORT(__switchu8)
@ -22,8 +23,8 @@ GCC_ASM_EXPORT(__switchu8)
ASM_PFX(__switchu8): ASM_PFX(__switchu8):
ldrb ip,[lr,#-1] ldrb ip,[lr,#-1]
cmp r0,ip cmp r0,ip
ldrccb r0,[lr,r0] ldrbcc r0,[lr,r0]
ldrcsb r0,[lr,ip] ldrbcs r0,[lr,ip]
add ip,lr,r0,LSL #1 add ip,lr,r0,LSL #1
bx ip bx ip

11
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
View File

@ -13,6 +13,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text .text
.syntax unified
.align 2 .align 2
GCC_ASM_EXPORT(__udivmoddi4) GCC_ASM_EXPORT(__udivmoddi4)
@ -44,7 +45,7 @@ L8:
L6: L6:
cmp r6, #0 cmp r6, #0
movne r1, #0 movne r1, #0
stmneia r6, {r0-r1} stmiane r6, {r0-r1}
b L2 b L2
L4: L4:
ldr r1, [sp, #0] ldr r1, [sp, #0]
@ -88,7 +89,7 @@ L18:
cmp r6, #0 cmp r6, #0
movne r4, r0 movne r4, r0
andne r5, ip, r3 andne r5, ip, r3
stmneia r6, {r4-r5} stmiane r6, {r4-r5}
L24: L24:
rsb r3, r2, #0 rsb r3, r2, #0
and r3, r2, r3 and r3, r2, r3
@ -123,7 +124,7 @@ L12:
andne r3, r3, r0 andne r3, r3, r0
movne r2, r3 movne r2, r3
movne r3, #0 movne r3, #0
stmneia r6, {r2-r3} stmiane r6, {r2-r3}
L34: L34:
cmp r1, #1 cmp r1, #1
beq L10 beq L10
@ -175,7 +176,7 @@ L30:
bls L37 bls L37
L48: L48:
cmp r6, #0 cmp r6, #0
stmneia r6, {r10-r11} stmiane r6, {r10-r11}
b L2 b L2
L37: L37:
rsb r1, r3, #31 rsb r1, r3, #31
@ -229,7 +230,7 @@ L40:
cmp r6, #0 cmp r6, #0
orr r10, r0, ip orr r10, r0, ip
mov r11, r1 mov r11, r1
stmneia r6, {r4-r5} stmiane r6, {r4-r5}
b L10 b L10
L2: L2:
mov r10, #0 mov r10, #0

3
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
View File

@ -13,6 +13,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text .text
.syntax unified
.align 2 .align 2
GCC_ASM_EXPORT(__udivsi3) GCC_ASM_EXPORT(__udivsi3)
@ -27,7 +28,7 @@ ASM_PFX(__udivsi3):
rsb r3, r3, r2 rsb r3, r3, r2
cmp r3, #31 cmp r3, #31
bhi L2 bhi L2
ldmeqfd sp!, {r4, r5, r7, pc} ldmfdeq sp!, {r4, r5, r7, pc}
add r5, r3, #1 add r5, r3, #1
rsb r3, r3, #31 rsb r3, r3, #31
mov lr, #0 mov lr, #0

9
ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
View File

@ -54,6 +54,7 @@ GCC_ASM_EXPORT(DebugAgentVectorTable)
GCC_ASM_IMPORT(DefaultExceptionHandler) GCC_ASM_IMPORT(DefaultExceptionHandler)
.text .text
.syntax unified
#if !defined(__APPLE__) #if !defined(__APPLE__)
.fpu neon @ makes vpush/vpop assemble .fpu neon @ makes vpush/vpop assemble
#endif #endif
@ -202,9 +203,9 @@ ASM_PFX(AsmCommonExceptionEntry):
and R3, R1, #0x1f @ Check CPSR to see if User or System Mode and R3, R1, #0x1f @ Check CPSR to see if User or System Mode
cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1df)) cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1df))
cmpne R3, #0x10 @ cmpne R3, #0x10 @
stmeqed R2, {lr}^ @ save unbanked lr stmdaeq R2, {lr}^ @ save unbanked lr
@ else @ else
stmneed R2, {lr} @ save SVC lr stmdane R2, {lr} @ save SVC lr
ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd 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 and R1, R1, #0x1f @ Check to see if User or System Mode
cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f)) cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R1, #0x10 @ cmpne R1, #0x10 @
ldmeqed R2, {lr}^ @ restore unbanked lr ldmibeq R2, {lr}^ @ restore unbanked lr
@ else @ 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 ldmfd SP!,{R0-R12} @ Restore general purpose registers
@ Exception handler can not change SP @ Exception handler can not change SP