On 14 December 2015 at 17:40, Leif Lindholm <leif.lindh...@linaro.org> wrote:
> On Mon, Dec 14, 2015 at 05:25:02PM +0100, Ard Biesheuvel wrote:
>> 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.biesheu...@linaro.org>
>> ---
>> ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S | 9
>> +++++----
>
> Since we've killed pre-ARMv7 support, should we not now also kill
> ArmPkg/Drivers/CpuDxe/ArmV4/ and rename ArmPkg/Drivers/CpuDxe/ArmV6/
> Arm?
>
Good point, let me cook up a patch
> Apart from that:
> Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org>
>
Thanks
>> ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S | 3 ++-
>> ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S | 5 +++--
>> ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S | 1 +
>> ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S | 5 +++--
>> ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S | 5 +++--
>> ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S | 11
>> ++++++-----
>> ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S | 3 ++-
>> ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S | 9
>> +++++----
>> 9 files changed, 30 insertions(+), 21 deletions(-)
>>
>> diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S
>> b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S
>> index 3433b99cd4d4..673b93129736 100644
>> --- a/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S
>> +++ b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S
>> @@ -60,6 +60,7 @@ GCC_ASM_EXPORT(AsmCommonExceptionEntry)
>> GCC_ASM_EXPORT(CommonCExceptionHandler)
>>
>> .text
>> +.syntax unified
>> #if !defined(__APPLE__)
>> .fpu neon @ makes vpush/vpop assemble
>> #endif
>> @@ -223,9 +224,9 @@ ASM_PFX(AsmCommonExceptionEntry):
>> 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 @@ CommonCExceptionHandler (
>> 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
>> diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
>> b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
>> index c5b4cfe15f2f..970d030ca368 100755
>> --- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
>> +++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
>> @@ -36,6 +36,7 @@ InternalMemSetMem (
>> **/
>>
>> .text
>> +.syntax unified
>> .align 2
>> GCC_ASM_EXPORT(InternalMemSetMem)
>>
>> @@ -67,7 +68,7 @@ L31:
>> b L32
>> L34:
>> cmp lr, #0
>> - streqb r2, [r12], #1
>> + strbeq r2, [r12], #1
>> subeq r1, r1, #1
>> beq L43
>> sub r1, r1, #32
>> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
>> b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
>> index 7f41353e0177..09c9004ddfff 100644
>> --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
>> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
>> @@ -14,6 +14,7 @@
>> #
>>
>> .text
>> +.syntax unified
>> .p2align 2
>>
>> GCC_ASM_EXPORT(__switch16)
>> @@ -22,9 +23,9 @@ ASM_PFX(__switch16):
>> 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
>>
>> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
>> b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
>> index 8675a4aeb747..5b8fd34733cd 100644
>> --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
>> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
>> @@ -14,6 +14,7 @@
>> #
>>
>> .text
>> +.syntax unified
>> .p2align 2
>>
>> GCC_ASM_EXPORT(__switch32)
>> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
>> b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
>> index 27edccbf77d0..871c7c05f7a4 100644
>> --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
>> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
>> @@ -14,6 +14,7 @@
>> #
>>
>> .text
>> +.syntax unified
>> .p2align 2
>>
>> GCC_ASM_EXPORT(__switch8)
>> @@ -21,8 +22,8 @@ GCC_ASM_EXPORT(__switch8)
>> 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
>>
>> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
>> b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
>> index 39c4a7fdffeb..5849998eaf32 100644
>> --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
>> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
>> @@ -14,6 +14,7 @@
>> #
>>
>> .text
>> +.syntax unified
>> .p2align 2
>>
>> GCC_ASM_EXPORT(__switchu8)
>> @@ -22,8 +23,8 @@ GCC_ASM_EXPORT(__switchu8)
>> 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
>>
>> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
>> b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
>> index 4c0ef5a5984d..42f4ba404730 100644
>> --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
>> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
>> @@ -13,6 +13,7 @@
>>
>> #------------------------------------------------------------------------------
>>
>> .text
>> + .syntax unified
>> .align 2
>> GCC_ASM_EXPORT(__udivmoddi4)
>>
>> @@ -44,7 +45,7 @@ L8:
>> 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 @@ L18:
>> 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 @@ L12:
>> 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 @@ L30:
>> 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 @@ L40:
>> cmp r6, #0
>> orr r10, r0, ip
>> mov r11, r1
>> - stmneia r6, {r4-r5}
>> + stmiane r6, {r4-r5}
>> b L10
>> L2:
>> mov r10, #0
>> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
>> b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
>> index 5e2d31cc1160..080aa51c3c54 100644
>> --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
>> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
>> @@ -13,6 +13,7 @@
>>
>> #------------------------------------------------------------------------------
>>
>> .text
>> + .syntax unified
>> .align 2
>> GCC_ASM_EXPORT(__udivsi3)
>>
>> @@ -27,7 +28,7 @@ ASM_PFX(__udivsi3):
>> 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
>> diff --git
>> a/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
>> b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
>> index 0566a89e2c90..0f2e4b1ac8af 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
>> --
>> 2.5.0
>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
