diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-02-02 23:19:30 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-02-02 23:19:30 +0000 |
| commit | 2ac288f9199196dfc4ab05bee0a7815ca361174a (patch) | |
| tree | 66ba7102ed0f7e8b6deab5416f868aa43c82ad50 /ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm | |
| parent | 5d23922674950ec2d2654b4c606692696681b544 (diff) | |
| download | edk2-platforms-2ac288f9199196dfc4ab05bee0a7815ca361174a.tar.xz | |
Fix issue with fixing tabs.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11297 6f19259b-4bc3-4df7-8a09-765794883524
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 831532f4d2..19f489f3c0 100644 --- a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm +++ b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm @@ -70,17 +70,17 @@ ArmDisableAsynchronousAbort ArmEnableIrq cpsie i isb -\s\sbx LR + bx LR ArmDisableIrq cpsid i isb -\s\sbx LR + bx LR ArmEnableFiq cpsie f isb -\s\sbx LR + bx LR ArmDisableFiq cpsid f @@ -99,17 +99,17 @@ ArmDisableInterrupts ArmGetInterruptState mrs R0,CPSR - tst R0,#0x80\s\s ;Check if IRQ is enabled. + tst R0,#0x80 ;Check if IRQ is enabled. moveq R0,#1 movne R0,#0 -\s\sbx LR + bx LR ArmGetFiqState -\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 + mrs R0,CPSR + tst R0,#0x40 ;Check if FIQ is enabled. + moveq R0,#1 + movne R0,#0 + bx LR ArmInvalidateTlb mov r0,#0 @@ -126,7 +126,7 @@ ArmSetTTBR0 ArmGetTTBR0BaseAddress mrc p15,0,r0,c2,c0,0 - ldr\s\s r1, = 0xFFFFC000 + ldr r1, = 0xFFFFC000 and r0, r0, r1 isb bx lr |