X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPkg%2FLibrary%2FArmLib%2FCommon%2FArmLibSupport.asm;fp=ArmPkg%2FLibrary%2FArmLib%2FCommon%2FArmLibSupport.asm;h=4d6c253cd211b72f9b10770ac137ca3460e3d0df;hp=0b023fed42826ea824ee545014dbe02beb5e4da4;hb=2ac288f9199196dfc4ab05bee0a7815ca361174a;hpb=5d23922674950ec2d2654b4c606692696681b544 diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm index 0b023fed42..4d6c253cd2 100644 --- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm +++ b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm @@ -48,48 +48,48 @@ ArmIsMPCore bx LR ArmEnableInterrupts -\s\smrs R0,CPSR -\s\sbic R0,R0,#0x80\s\s\s\s;Enable IRQ interrupts -\s\smsr CPSR_c,R0 -\s\sbx LR + mrs R0,CPSR + bic R0,R0,#0x80 ;Enable IRQ interrupts + msr CPSR_c,R0 + bx LR ArmDisableInterrupts -\s\smrs R0,CPSR -\s\sorr R1,R0,#0x80\s\s\s\s;Disable IRQ interrupts -\s\smsr CPSR_c,R1 + mrs R0,CPSR + orr R1,R0,#0x80 ;Disable IRQ interrupts + msr CPSR_c,R1 tst R0,#0x80 moveq R0,#1 movne R0,#0 -\s\sbx LR + bx LR ArmGetInterruptState -\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 + mrs R0,CPSR + tst R0,#0x80 ;Check if IRQ is enabled. + moveq R0,#1 + movne R0,#0 + bx LR ArmEnableFiq -\s\smrs R0,CPSR -\s\sbic R0,R0,#0x40\s\s\s\s;Enable IRQ interrupts -\s\smsr CPSR_c,R0 -\s\sbx LR + mrs R0,CPSR + bic R0,R0,#0x40 ;Enable IRQ interrupts + msr CPSR_c,R0 + bx LR ArmDisableFiq -\s\smrs R0,CPSR -\s\sorr R1,R0,#0x40\s\s\s\s;Disable IRQ interrupts -\s\smsr CPSR_c,R1 + mrs R0,CPSR + orr R1,R0,#0x40 ;Disable IRQ interrupts + msr CPSR_c,R1 tst R0,#0x40 moveq R0,#1 movne R0,#0 -\s\sbx LR + bx LR ArmGetFiqState -\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 + mrs R0,CPSR + tst R0,#0x40 ;Check if IRQ is enabled. + moveq R0,#1 + movne R0,#0 + bx LR ArmInvalidateTlb mov r0,#0