diff options
Diffstat (limited to 'ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm')
| -rw-r--r-- | ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm index 7099ced8f4..831532f4d2 100644 --- a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm +++ b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm @@ -70,17 +70,17 @@ ArmDisableAsynchronousAbort ArmEnableIrq cpsie i isb - bx LR +\s\sbx LR ArmDisableIrq cpsid i isb - bx LR +\s\sbx LR ArmEnableFiq cpsie f isb - bx LR +\s\sbx LR ArmDisableFiq cpsid f @@ -99,17 +99,17 @@ ArmDisableInterrupts ArmGetInterruptState mrs R0,CPSR - tst R0,#0x80 ;Check if IRQ is enabled. + tst R0,#0x80\s\s ;Check if IRQ is enabled. moveq R0,#1 movne R0,#0 - bx LR +\s\sbx LR ArmGetFiqState - mrs R0,CPSR - tst R0,#0x40 ;Check if FIQ is enabled. - moveq R0,#1 - movne R0,#0 - bx LR +\s\smrs R0,CPSR +\s\stst R0,#0x40\s\s ;Check if FIQ is enabled. +\s\smoveq R0,#1 +\s\smovne R0,#0 +\s\sbx LR ArmInvalidateTlb mov r0,#0 @@ -126,7 +126,7 @@ ArmSetTTBR0 ArmGetTTBR0BaseAddress mrc p15,0,r0,c2,c0,0 - ldr r1, = 0xFFFFC000 + ldr\s\s r1, = 0xFFFFC000 and r0, r0, r1 isb bx lr |