summaryrefslogtreecommitdiff
path: root/ArmPkg/Library/BaseMemoryLibStm
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-02-02 23:19:30 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-02-02 23:19:30 +0000
commit2ac288f9199196dfc4ab05bee0a7815ca361174a (patch)
tree66ba7102ed0f7e8b6deab5416f868aa43c82ad50 /ArmPkg/Library/BaseMemoryLibStm
parent5d23922674950ec2d2654b4c606692696681b544 (diff)
downloadedk2-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/BaseMemoryLibStm')
-rwxr-xr-xArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S120
-rwxr-xr-xArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm126
-rwxr-xr-xArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S68
-rwxr-xr-xArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm74
4 files changed, 194 insertions, 194 deletions
diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
index fcd7199d4b..1298f94e8d 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
@@ -42,71 +42,71 @@ InternalMemCopyMem (
GCC_ASM_EXPORT(InternalMemCopyMem)
ASM_PFX(InternalMemCopyMem):
-\s\sstmfd\s\ssp!, {r4-r11, lr}
-\s\stst\s\sr0, #3
-\s\smov\s\sr11, r0
-\s\smov\s\sr10, 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, #31
-\s\smovls\s\sr0, #0
-\s\sandhi\s\sr0, r3, #1
+ stmfd sp!, {r4-r11, lr}
+ tst r0, #3
+ mov r11, r0
+ mov r10, r0
+ mov ip, r2
+ mov lr, r1
+ movne r0, #0
+ bne L4
+ tst r1, #3
+ movne r3, #0
+ moveq r3, #1
+ cmp r2, #31
+ movls r0, #0
+ andhi r0, r3, #1
L4:
-\s\scmp\s\sr11, r1
-\s\sbcc\s\sL26
-\s\sbls\s\sL7
-\s\srsb\s\sr3, r1, r11
-\s\scmp\s\sip, r3
-\s\sbcc\s\sL26
-\s\scmp\s\sip, #0
-\s\sbeq\s\sL7
-\s\sadd\s\sr10, r11, ip
-\s\sadd\s\slr, ip, r1
-\s\sb\s\sL16
+ cmp r11, r1
+ bcc L26
+ bls L7
+ rsb r3, r1, r11
+ cmp ip, r3
+ bcc L26
+ cmp ip, #0
+ beq L7
+ add r10, r11, 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, [r10, #-8]!
-\s\sbeq\s\sL7
+ sub ip, ip, #8
+ cmp ip, #7
+ ldrd r2, [lr, #-8]!
+ movls r0, #0
+ cmp ip, #0
+ strd r2, [r10, #-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, r10, #1
-\s\scmp\s\sip, #0
-\s\ssub\s\sr10, r10, #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, r10, #1
+ cmp ip, #0
+ sub r10, r10, #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, [r10], #1
+ ldrb r3, [lr], #1
+ sub ip, ip, #1
+ strb r3, [r10], #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, #32
-\s\scmp\s\sip, #31
-\s\sldmia\s\slr!, {r2-r9}
-\s\smovls\s\sr0, #0
-\s\scmp\s\sip, #0
-\s\sstmia\s\sr10!, {r2-r9}
-\s\sbne\s\sL30
+ cmp r0, #0
+ beq L11
+ sub ip, ip, #32
+ cmp ip, #31
+ ldmia lr!, {r2-r9}
+ movls r0, #0
+ cmp ip, #0
+ stmia r10!, {r2-r9}
+ bne L30
L7:
- mov\s\sr0, r11
-\s\sldmfd\s\ssp!, {r4-r11, pc}
+ mov r0, r11
+ ldmfd sp!, {r4-r11, pc}
diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
index afb74072a0..1a5e18e120 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
@@ -37,78 +37,78 @@ InternalMemCopyMem (
IN UINTN Length
)
**/
-\s\sEXPORT InternalMemCopyMem
+ EXPORT InternalMemCopyMem
-\s\sAREA AsmMemStuff, CODE, READONLY
+ AREA AsmMemStuff, CODE, READONLY
InternalMemCopyMem
-\s\sstmfd\s\ssp!, {r4-r11, lr}
-\s\stst\s\sr0, #3
-\s\smov\s\sr11, r0
-\s\smov\s\sr10, 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, #31
-\s\smovls\s\sr0, #0
-\s\sandhi\s\sr0, r3, #1
+ stmfd sp!, {r4-r11, lr}
+ tst r0, #3
+ mov r11, r0
+ mov r10, r0
+ mov ip, r2
+ mov lr, r1
+ movne r0, #0
+ bne L4
+ tst r1, #3
+ movne r3, #0
+ moveq r3, #1
+ cmp r2, #31
+ movls r0, #0
+ andhi r0, r3, #1
L4
-\s\scmp\s\sr11, r1
-\s\sbcc\s\sL26
-\s\sbls\s\sL7
-\s\srsb\s\sr3, r1, r11
-\s\scmp\s\sip, r3
-\s\sbcc\s\sL26
-\s\scmp\s\sip, #0
-\s\sbeq\s\sL7
-\s\sadd\s\sr10, r11, ip
-\s\sadd\s\slr, ip, r1
-\s\sb\s\sL16
+ cmp r11, r1
+ bcc L26
+ bls L7
+ rsb r3, r1, r11
+ cmp ip, r3
+ bcc L26
+ cmp ip, #0
+ beq L7
+ add r10, r11, 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, [r10, #-8]!
-\s\sbeq\s\sL7
+ sub ip, ip, #8
+ cmp ip, #7
+ ldrd r2, [lr, #-8]!
+ movls r0, #0
+ cmp ip, #0
+ strd r2, [r10, #-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, r10, #1
-\s\scmp\s\sip, #0
-\s\ssub\s\sr10, r10, #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, r10, #1
+ cmp ip, #0
+ sub r10, r10, #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, [r10], #1
+ ldrb r3, [lr], #1
+ sub ip, ip, #1
+ strb r3, [r10], #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, #32
-\s\scmp\s\sip, #31
-\s\sldmia\s\slr!, {r2-r9}
-\s\smovls\s\sr0, #0
-\s\scmp\s\sip, #0
-\s\sstmia\s\sr10!, {r2-r9}
-\s\sbne\s\sL30
+ cmp r0, #0
+ beq L11
+ sub ip, ip, #32
+ cmp ip, #31
+ ldmia lr!, {r2-r9}
+ movls r0, #0
+ cmp ip, #0
+ stmia r10!, {r2-r9}
+ bne L30
L7
- mov\s\sr0, r11
-\s\sldmfd\s\ssp!, {r4-r11, pc}
-\s\s
+ mov r0, r11
+ ldmfd sp!, {r4-r11, pc}
+
END
diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
index db37cb47d4..8a61a6b44e 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
@@ -34,49 +34,49 @@ InternalMemSetMem (
IN UINT8 Value
)
**/
-\s\s
+
.text
.align 2
GCC_ASM_EXPORT(InternalMemSetMem)
ASM_PFX(InternalMemSetMem):
-\s\sstmfd\s\ssp!, {r4-r11, lr}
-\s\stst\s\s r0, #3
-\s\smovne\s\sr3, #0
-\s\smoveq\s\sr3, #1
-\s\scmp\s\s r1, #31
-\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-r11, lr}
+ tst r0, #3
+ movne r3, #0
+ moveq r3, #1
+ cmp r1, #31
+ 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:
and r4, r2, #0xff
orr r4, r4, r4, LSL #8
orr r4, r4, r4, LSL #16
-\s\smov r5, r4
-\s\smov r5, r4
-\s\smov r6, r4
-\s\smov r7, r4
-\s\smov r8, r4
-\s\smov r9, r4
-\s\smov r10, r4
-\s\smov r11, r4
-\s\sb\s\s L32
+ mov r5, r4
+ mov r5, r4
+ mov r6, r4
+ mov r7, r4
+ mov r8, r4
+ mov r9, r4
+ mov r10, r4
+ mov r11, r4
+ 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, #32
-\s\scmp\s\s r1, #31
-\s\smovls\s\s lr, r3
-\s\sstmia\s\s r12!, {r4-r11}
+ cmp lr, #0
+ streqb r2, [r12], #1
+ subeq r1, r1, #1
+ beq L43
+ sub r1, r1, #32
+ cmp r1, #31
+ movls lr, r3
+ stmia r12!, {r4-r11}
L43:
-\s\scmp\s\s r1, #0
-\s\sbne\s\s L34
-\s\sldmfd\s\s sp!, {r4-r11, pc}
-\s\s \ No newline at end of file
+ cmp r1, #0
+ bne L34
+ ldmfd sp!, {r4-r11, pc}
+ \ No newline at end of file
diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
index 4a4d2380b0..7222cf9b7f 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
@@ -33,51 +33,51 @@ 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!, {r4-r11, lr}
-\s\stst\s\s r0, #3
-\s\smovne\s\sr3, #0
-\s\smoveq\s\sr3, #1
-\s\scmp\s\s r1, #31
-\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-r11, lr}
+ tst r0, #3
+ movne r3, #0
+ moveq r3, #1
+ cmp r1, #31
+ 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
and r4, r2, #0xff
orr r4, r4, r4, LSL #8
orr r4, r4, r4, LSL #16
-\s\smov r5, r4
-\s\smov r5, r4
-\s\smov r6, r4
-\s\smov r7, r4
-\s\smov r8, r4
-\s\smov r9, r4
-\s\smov r10, r4
-\s\smov r11, r4
-\s\sb\s\s L32
+ mov r5, r4
+ mov r5, r4
+ mov r6, r4
+ mov r7, r4
+ mov r8, r4
+ mov r9, r4
+ mov r10, r4
+ mov r11, r4
+ 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, #32
-\s\scmp\s\s r1, #31
-\s\smovls\s\s lr, r3
-\s\sstmia\s\s r12!, {r4-r11}
+ cmp lr, #0
+ streqb r2, [r12], #1
+ subeq r1, r1, #1
+ beq L43
+ sub r1, r1, #32
+ cmp r1, #31
+ movls lr, r3
+ stmia r12!, {r4-r11}
L43
-\s\scmp\s\s r1, #0
-\s\sbne\s\s L34
-\s\sldmfd\s\s sp!, {r4-r11, pc}
-\s\s
+ cmp r1, #0
+ bne L34
+ ldmfd sp!, {r4-r11, pc}
+
END
\ No newline at end of file