diff options
Diffstat (limited to 'ArmPkg/Library/ArmLib/Common')
| -rw-r--r-- | ArmPkg/Library/ArmLib/Common/ArmLibSupport.S | 52 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm | 52 |
2 files changed, 52 insertions, 52 deletions
diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S index 9b144c82c5..94b11a5d77 100644 --- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S +++ b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S @@ -42,48 +42,48 @@ ASM_PFX(Cp15CacheInfo): bx LR ASM_PFX(ArmEnableInterrupts): - mrs R0,CPSR - bic R0,R0,#0x80 @Enable IRQ interrupts - msr CPSR_c,R0 - bx LR +\s\smrs R0,CPSR +\s\sbic R0,R0,#0x80\s\s\s\s@Enable IRQ interrupts +\s\smsr CPSR_c,R0 +\s\sbx LR ASM_PFX(ArmDisableInterrupts): - mrs R0,CPSR - orr R1,R0,#0x80 @Disable IRQ interrupts - msr CPSR_c,R1 +\s\smrs R0,CPSR +\s\sorr R1,R0,#0x80\s\s\s\s@Disable IRQ interrupts +\s\smsr CPSR_c,R1 tst R0,#0x80 moveq R0,#1 movne R0,#0 - bx LR +\s\sbx LR ASM_PFX(ArmGetInterruptState): - mrs R0,CPSR - tst R0,#0x80 @Check if IRQ is enabled. - moveq R0,#1 - movne R0,#0 - bx LR +\s\smrs R0,CPSR +\s\stst R0,#0x80\s\s @Check if IRQ is enabled. +\s\smoveq R0,#1 +\s\smovne R0,#0 +\s\sbx LR ASM_PFX(ArmEnableFiq): - mrs R0,CPSR - bic R0,R0,#0x40 @Enable FIQ interrupts - msr CPSR_c,R0 - bx LR +\s\smrs R0,CPSR +\s\sbic R0,R0,#0x40\s\s\s\s@Enable FIQ interrupts +\s\smsr CPSR_c,R0 +\s\sbx LR ASM_PFX(ArmDisableFiq): - mrs R0,CPSR - orr R1,R0,#0x40 @Disable FIQ interrupts - msr CPSR_c,R1 +\s\smrs R0,CPSR +\s\sorr R1,R0,#0x40\s\s\s\s@Disable FIQ interrupts +\s\smsr CPSR_c,R1 tst R0,#0x80 moveq R0,#1 movne R0,#0 - bx LR +\s\sbx LR ASM_PFX(ArmGetFiqState): - mrs R0,CPSR - tst R0,#0x80 @Check if FIQ is enabled. - moveq R0,#1 - movne R0,#0 - bx LR +\s\smrs R0,CPSR +\s\stst R0,#0x80\s\s @Check if FIQ is enabled. +\s\smoveq R0,#1 +\s\smovne R0,#0 +\s\sbx LR ASM_PFX(ArmInvalidateTlb): mov r0,#0 diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm index cf7605f45a..0b023fed42 100644 --- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm +++ b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm @@ -48,48 +48,48 @@ ArmIsMPCore bx LR ArmEnableInterrupts - mrs R0,CPSR - bic R0,R0,#0x80 ;Enable IRQ interrupts - msr CPSR_c,R0 - bx LR +\s\smrs R0,CPSR +\s\sbic R0,R0,#0x80\s\s\s\s;Enable IRQ interrupts +\s\smsr CPSR_c,R0 +\s\sbx LR ArmDisableInterrupts - mrs R0,CPSR - orr R1,R0,#0x80 ;Disable IRQ interrupts - msr CPSR_c,R1 +\s\smrs R0,CPSR +\s\sorr R1,R0,#0x80\s\s\s\s;Disable IRQ interrupts +\s\smsr CPSR_c,R1 tst R0,#0x80 moveq R0,#1 movne R0,#0 - bx LR +\s\sbx LR ArmGetInterruptState - mrs R0,CPSR - tst R0,#0x80 ;Check if IRQ is enabled. - moveq R0,#1 - movne R0,#0 - bx LR +\s\smrs R0,CPSR +\s\stst R0,#0x80\s\s ;Check if IRQ is enabled. +\s\smoveq R0,#1 +\s\smovne R0,#0 +\s\sbx LR ArmEnableFiq - mrs R0,CPSR - bic R0,R0,#0x40 ;Enable IRQ interrupts - msr CPSR_c,R0 - bx LR +\s\smrs R0,CPSR +\s\sbic R0,R0,#0x40\s\s\s\s;Enable IRQ interrupts +\s\smsr CPSR_c,R0 +\s\sbx LR ArmDisableFiq - mrs R0,CPSR - orr R1,R0,#0x40 ;Disable IRQ interrupts - msr CPSR_c,R1 +\s\smrs R0,CPSR +\s\sorr R1,R0,#0x40\s\s\s\s;Disable IRQ interrupts +\s\smsr CPSR_c,R1 tst R0,#0x40 moveq R0,#1 movne R0,#0 - bx LR +\s\sbx LR ArmGetFiqState - mrs R0,CPSR - tst R0,#0x40 ;Check if IRQ is enabled. - moveq R0,#1 - movne R0,#0 - bx LR +\s\smrs R0,CPSR +\s\stst R0,#0x40\s\s ;Check if IRQ is enabled. +\s\smoveq R0,#1 +\s\smovne R0,#0 +\s\sbx LR ArmInvalidateTlb mov r0,#0 |