From 2ac288f9199196dfc4ab05bee0a7815ca361174a Mon Sep 17 00:00:00 2001 From: andrewfish Date: Wed, 2 Feb 2011 23:19:30 +0000 Subject: Fix issue with fixing tabs. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11297 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S | 120 +++++++++++----------- ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.asm | 124 +++++++++++------------ ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S | 54 +++++----- ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.asm | 58 +++++------ 4 files changed, 178 insertions(+), 178 deletions(-) (limited to 'ArmPkg/Library/BaseMemoryLibVstm/Arm') diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S index 2e389b045f..8cfd9a9c50 100755 --- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S +++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S @@ -42,73 +42,73 @@ InternalMemCopyMem ( GCC_ASM_EXPORT(InternalMemCopyMem) ASM_PFX(InternalMemCopyMem): -\s\sstmfd\s\ssp!, {r4, r9, lr} -\s\stst\s\sr0, #3 -\s\smov\s\sr4, r0 -\s\smov\s\sr9, r0 -\s\smov\s\sip, r2 -\s\smov\s\slr, r1 -\s\smovne\s\sr0, #0 -\s\sbne\s\sL4 -\s\stst\s\sr1, #3 -\s\smovne\s\sr3, #0 -\s\smoveq\s\sr3, #1 -\s\scmp\s\sr2, #127 -\s\smovls\s\sr0, #0 -\s\sandhi\s\sr0, r3, #1 + stmfd sp!, {r4, r9, lr} + tst r0, #3 + mov r4, r0 + mov r9, r0 + mov ip, r2 + mov lr, r1 + movne r0, #0 + bne L4 + tst r1, #3 + movne r3, #0 + moveq r3, #1 + cmp r2, #127 + movls r0, #0 + andhi r0, r3, #1 L4: -\s\scmp\s\sr4, r1 -\s\sbcc\s\sL26 -\s\sbls\s\sL7 -\s\srsb\s\sr3, r1, r4 -\s\scmp\s\sip, r3 -\s\sbcc\s\sL26 -\s\scmp\s\sip, #0 -\s\sbeq\s\sL7 -\s\sadd\s\sr9, r4, ip -\s\sadd\s\slr, ip, r1 -\s\sb\s\sL16 + cmp r4, r1 + bcc L26 + bls L7 + rsb r3, r1, r4 + cmp ip, r3 + bcc L26 + cmp ip, #0 + beq L7 + add r9, r4, ip + add lr, ip, r1 + b L16 L29: -\s\ssub\s\sip, ip, #8 -\s\scmp\s\sip, #7 -\s\sldrd\s\sr2, [lr, #-8]! -\s\smovls\s\sr0, #0 -\s\scmp\s\sip, #0 -\s\sstrd\s\sr2, [r9, #-8]! -\s\sbeq\s\sL7 + sub ip, ip, #8 + cmp ip, #7 + ldrd r2, [lr, #-8]! + movls r0, #0 + cmp ip, #0 + strd r2, [r9, #-8]! + beq L7 L16: -\s\scmp\s\sr0, #0 -\s\sbne\s\sL29 -\s\ssub\s\sr3, lr, #1 -\s\ssub\s\sip, ip, #1 -\s\sldrb\s\sr3, [r3, #0]\s\s -\s\ssub\s\sr2, r9, #1 -\s\scmp\s\sip, #0 -\s\ssub\s\sr9, r9, #1 -\s\ssub\s\slr, lr, #1 -\s\sstrb\s\sr3, [r2, #0] -\s\sbne\s\sL16 -\s\sb L7 + cmp r0, #0 + bne L29 + sub r3, lr, #1 + sub ip, ip, #1 + ldrb r3, [r3, #0] + sub r2, r9, #1 + cmp ip, #0 + sub r9, r9, #1 + sub lr, lr, #1 + strb r3, [r2, #0] + bne L16 + b L7 L11: -\s\sldrb\s\sr3, [lr], #1\s\s -\s\ssub\s\sip, ip, #1 -\s\sstrb\s\sr3, [r9], #1 + ldrb r3, [lr], #1 + sub ip, ip, #1 + strb r3, [r9], #1 L26: -\s\scmp\s\sip, #0 -\s\sbeq\s\sL7 + cmp ip, #0 + beq L7 L30: -\s\scmp\s\sr0, #0 -\s\sbeq\s\sL11 -\s\ssub\s\sip, ip, #128 // 32 -\s\scmp\s\sip, #127 // 31 -\s\svldm lr!, {d0-d15} -\s\smovls\s\sr0, #0 -\s\scmp\s\sip, #0 -\s\svstm r9!, {d0-d15} -\s\sbne\s\sL30 + cmp r0, #0 + beq L11 + sub ip, ip, #128 // 32 + cmp ip, #127 // 31 + vldm lr!, {d0-d15} + movls r0, #0 + cmp ip, #0 + vstm r9!, {d0-d15} + bne L30 L7: dsb - mov\s\sr0, r4 -\s\sldmfd\s\ssp!, {r4, r9, pc} + mov r0, r4 + ldmfd sp!, {r4, r9, pc} diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.asm b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.asm index a0b7596a9f..e7cbdf1ed0 100755 --- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.asm +++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.asm @@ -37,79 +37,79 @@ InternalMemCopyMem ( IN UINTN Length ) **/ -\s\sEXPORT InternalMemCopyMem + EXPORT InternalMemCopyMem -\s\sAREA AsmMemStuff, CODE, READONLY + AREA AsmMemStuff, CODE, READONLY InternalMemCopyMem -\s\sstmfd\s\ssp!, {r4, r9, lr} -\s\stst\s\sr0, #3 -\s\smov\s\sr4, r0 -\s\smov\s\sr9, r0 -\s\smov\s\sip, r2 -\s\smov\s\slr, r1 -\s\smovne\s\sr0, #0 -\s\sbne\s\sL4 -\s\stst\s\sr1, #3 -\s\smovne\s\sr3, #0 -\s\smoveq\s\sr3, #1 -\s\scmp\s\sr2, #127 -\s\smovls\s\sr0, #0 -\s\sandhi\s\sr0, r3, #1 + stmfd sp!, {r4, r9, lr} + tst r0, #3 + mov r4, r0 + mov r9, r0 + mov ip, r2 + mov lr, r1 + movne r0, #0 + bne L4 + tst r1, #3 + movne r3, #0 + moveq r3, #1 + cmp r2, #127 + movls r0, #0 + andhi r0, r3, #1 L4 -\s\scmp\s\sr4, r1 -\s\sbcc\s\sL26 -\s\sbls\s\sL7 -\s\srsb\s\sr3, r1, r4 -\s\scmp\s\sip, r3 -\s\sbcc\s\sL26 -\s\scmp\s\sip, #0 -\s\sbeq\s\sL7 -\s\sadd\s\sr9, r4, ip -\s\sadd\s\slr, ip, r1 -\s\sb\s\sL16 + cmp r4, r1 + bcc L26 + bls L7 + rsb r3, r1, r4 + cmp ip, r3 + bcc L26 + cmp ip, #0 + beq L7 + add r9, r4, ip + add lr, ip, r1 + b L16 L29 -\s\ssub\s\sip, ip, #8 -\s\scmp\s\sip, #7 -\s\sldrd\s\sr2, [lr, #-8]! -\s\smovls\s\sr0, #0 -\s\scmp\s\sip, #0 -\s\sstrd\s\sr2, [r9, #-8]! -\s\sbeq\s\sL7 + sub ip, ip, #8 + cmp ip, #7 + ldrd r2, [lr, #-8]! + movls r0, #0 + cmp ip, #0 + strd r2, [r9, #-8]! + beq L7 L16 -\s\scmp\s\sr0, #0 -\s\sbne\s\sL29 -\s\ssub\s\sr3, lr, #1 -\s\ssub\s\sip, ip, #1 -\s\sldrb\s\sr3, [r3, #0]\s\s -\s\ssub\s\sr2, r9, #1 -\s\scmp\s\sip, #0 -\s\ssub\s\sr9, r9, #1 -\s\ssub\s\slr, lr, #1 -\s\sstrb\s\sr3, [r2, #0] -\s\sbne\s\sL16 -\s\sb L7 + cmp r0, #0 + bne L29 + sub r3, lr, #1 + sub ip, ip, #1 + ldrb r3, [r3, #0] + sub r2, r9, #1 + cmp ip, #0 + sub r9, r9, #1 + sub lr, lr, #1 + strb r3, [r2, #0] + bne L16 + b L7 L11 -\s\sldrb\s\sr3, [lr], #1\s\s -\s\ssub\s\sip, ip, #1 -\s\sstrb\s\sr3, [r9], #1 + ldrb r3, [lr], #1 + sub ip, ip, #1 + strb r3, [r9], #1 L26 -\s\scmp\s\sip, #0 -\s\sbeq\s\sL7 + cmp ip, #0 + beq L7 L30 -\s\scmp\s\sr0, #0 -\s\sbeq\s\sL11 -\s\ssub\s\sip, ip, #128 // 32 -\s\scmp\s\sip, #127 // 31 -\s\svldm lr!, {d0-d15} -\s\smovls\s\sr0, #0 -\s\scmp\s\sip, #0 -\s\svstm r9!, {d0-d15} -\s\sbne\s\sL30 + cmp r0, #0 + beq L11 + sub ip, ip, #128 // 32 + cmp ip, #127 // 31 + vldm lr!, {d0-d15} + movls r0, #0 + cmp ip, #0 + vstm r9!, {d0-d15} + bne L30 L7 dsb - mov\s\sr0, r4 -\s\sldmfd\s\ssp!, {r4, r9, pc} + mov r0, r4 + ldmfd sp!, {r4, r9, pc} END diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S index 24388ebba6..d5c50cbef4 100755 --- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S +++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S @@ -34,25 +34,25 @@ InternalMemSetMem ( IN UINT8 Value ) **/ -\s\s + .text .align 2 GCC_ASM_EXPORT(InternalMemSetMem) ASM_PFX(InternalMemSetMem): -\s\sstmfd\s\ssp!, {r4-r7, lr} -\s\stst\s\s r0, #3 -\s\smovne\s\sr3, #0 -\s\smoveq\s\sr3, #1 -\s\scmp\s\s r1, #127 -\s\smovls lr, #0 -\s\sandhi\s\slr, r3, #1 -\s\scmp\s\s lr, #0 -\s\smov\s\s r12, r0 -\s\sbne\s\s L31 + stmfd sp!, {r4-r7, lr} + tst r0, #3 + movne r3, #0 + moveq r3, #1 + cmp r1, #127 + movls lr, #0 + andhi lr, r3, #1 + cmp lr, #0 + mov r12, r0 + bne L31 L32: -\s\smov\s\s r3, #0 -\s\sb\s\s L43 + mov r3, #0 + b L43 L31: vdup.8 q0,r2 vmov q1,q0 @@ -62,19 +62,19 @@ L31: vmov q5,q0 vmov q6,q0 vmov q7,q0 -\s\sb\s\s L32 + b L32 L34: -\s\scmp\s\s lr, #0 -\s\sstreqb\s\sr2, [r12], #1 -\s\ssubeq\s\s r1, r1, #1 -\s\sbeq\s\s L43 -\s\ssub\s\s r1, r1, #128 -\s\scmp\s\s r1, #127 -\s\scmp\s\s r1, #31 -\s\smovls\s\s lr, r3 -\s\svstm r12!, {d0-d15} + cmp lr, #0 + streqb r2, [r12], #1 + subeq r1, r1, #1 + beq L43 + sub r1, r1, #128 + cmp r1, #127 + cmp r1, #31 + movls lr, r3 + vstm r12!, {d0-d15} L43: -\s\scmp\s\s r1, #0 -\s\sbne\s\s L34 -\s\sldmfd\s\s sp!, {pc} -\s\s \ No newline at end of file + cmp r1, #0 + bne L34 + ldmfd sp!, {pc} + \ No newline at end of file diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.asm b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.asm index b0d26d641c..bbab580cf1 100755 --- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.asm +++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.asm @@ -33,25 +33,25 @@ InternalMemSetMem ( IN UINT8 Value ) **/ -\s\s -\s\sEXPORT InternalMemSetMem -\s\s -\s\sAREA AsmMemStuff, CODE, READONLY + + EXPORT InternalMemSetMem + + AREA AsmMemStuff, CODE, READONLY InternalMemSetMem -\s\sstmfd\s\ssp!, {lr} -\s\stst\s\s r0, #3 -\s\smovne\s\sr3, #0 -\s\smoveq\s\sr3, #1 -\s\scmp\s\s r1, #127 -\s\smovls lr, #0 -\s\sandhi\s\slr, r3, #1 -\s\scmp\s\s lr, #0 -\s\smov\s\s r12, r0 -\s\sbne\s\s L31 + stmfd sp!, {lr} + tst r0, #3 + movne r3, #0 + moveq r3, #1 + cmp r1, #127 + movls lr, #0 + andhi lr, r3, #1 + cmp lr, #0 + mov r12, r0 + bne L31 L32 -\s\smov\s\s r3, #0 -\s\sb\s\s L43 + mov r3, #0 + b L43 L31 vdup.8 q0,r2 vmov q1,q0 @@ -61,20 +61,20 @@ L31 vmov q5,q0 vmov q6,q0 vmov q7,q0 -\s\sb\s\s L32 + b L32 L34 -\s\scmp\s\s lr, #0 -\s\sstreqb\s\sr2, [r12], #1 -\s\ssubeq\s\s r1, r1, #1 -\s\sbeq\s\s L43 -\s\ssub\s\s r1, r1, #128 -\s\scmp\s\s r1, #127 -\s\smovls\s\s lr, r3 -\s\svstm r12!, {d0-d15} + cmp lr, #0 + streqb r2, [r12], #1 + subeq r1, r1, #1 + beq L43 + sub r1, r1, #128 + cmp r1, #127 + movls lr, r3 + vstm r12!, {d0-d15} L43 -\s\scmp\s\s r1, #0 -\s\sbne\s\s L34 -\s\sldmfd\s\s sp!, {pc} -\s\s + cmp r1, #0 + bne L34 + ldmfd sp!, {pc} + END \ No newline at end of file -- cgit v1.2.3