comparison arm/dsputil_arm_s.S @ 8682:5698999894ec libavcodec

ARM: remove some unused macro arguments
author mru
date Tue, 27 Jan 2009 16:34:10 +0000
parents 624ef0eb38f1
children 47245bb9e85f
comparison
equal deleted inserted replaced
8681:624ef0eb38f1 8682:5698999894ec
88 and \Rd1, \Rd1, \Rmask 88 and \Rd1, \Rd1, \Rmask
89 add \Rd0, \Rn0, \Rd0, lsr #1 89 add \Rd0, \Rn0, \Rd0, lsr #1
90 add \Rd1, \Rn1, \Rd1, lsr #1 90 add \Rd1, \Rn1, \Rd1, lsr #1
91 .endm 91 .endm
92 92
93 .macro JMP_ALIGN tmp, reg, label1, label2, label3 93 .macro JMP_ALIGN tmp, reg
94 ands \tmp, \reg, #3 94 ands \tmp, \reg, #3
95 bic \reg, \reg, #3 95 bic \reg, \reg, #3
96 beq 1f 96 beq 1f
97 subs \tmp, \tmp, #1 97 subs \tmp, \tmp, #1
98 beq 2f 98 beq 2f
106 function put_pixels16_arm, export=1 106 function put_pixels16_arm, export=1
107 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) 107 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
108 @ block = word aligned, pixles = unaligned 108 @ block = word aligned, pixles = unaligned
109 pld [r1] 109 pld [r1]
110 stmfd sp!, {r4-r11, lr} @ R14 is also called LR 110 stmfd sp!, {r4-r11, lr} @ R14 is also called LR
111 JMP_ALIGN r5, r1, 2f, 3f, 4f 111 JMP_ALIGN r5, r1
112 1: 112 1:
113 ldmia r1, {r4-r7} 113 ldmia r1, {r4-r7}
114 add r1, r1, r2 114 add r1, r1, r2
115 stmia r0, {r4-r7} 115 stmia r0, {r4-r7}
116 pld [r1] 116 pld [r1]
158 function put_pixels8_arm, export=1 158 function put_pixels8_arm, export=1
159 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) 159 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
160 @ block = word aligned, pixles = unaligned 160 @ block = word aligned, pixles = unaligned
161 pld [r1] 161 pld [r1]
162 stmfd sp!, {r4-r5,lr} @ R14 is also called LR 162 stmfd sp!, {r4-r5,lr} @ R14 is also called LR
163 JMP_ALIGN r5, r1, 2f, 3f, 4f 163 JMP_ALIGN r5, r1
164 1: 164 1:
165 ldmia r1, {r4-r5} 165 ldmia r1, {r4-r5}
166 add r1, r1, r2 166 add r1, r1, r2
167 subs r3, r3, #1 167 subs r3, r3, #1
168 pld [r1] 168 pld [r1]
211 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) 211 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
212 @ block = word aligned, pixles = unaligned 212 @ block = word aligned, pixles = unaligned
213 pld [r1] 213 pld [r1]
214 stmfd sp!, {r4-r10,lr} @ R14 is also called LR 214 stmfd sp!, {r4-r10,lr} @ R14 is also called LR
215 ldr r12, =0xfefefefe 215 ldr r12, =0xfefefefe
216 JMP_ALIGN r5, r1, 2f, 3f, 4f 216 JMP_ALIGN r5, r1
217 1: 217 1:
218 ldmia r1, {r4-r5, r10} 218 ldmia r1, {r4-r5, r10}
219 add r1, r1, r2 219 add r1, r1, r2
220 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 220 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10
221 pld [r1] 221 pld [r1]
270 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) 270 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
271 @ block = word aligned, pixles = unaligned 271 @ block = word aligned, pixles = unaligned
272 pld [r1] 272 pld [r1]
273 stmfd sp!, {r4-r10,lr} @ R14 is also called LR 273 stmfd sp!, {r4-r10,lr} @ R14 is also called LR
274 ldr r12, =0xfefefefe 274 ldr r12, =0xfefefefe
275 JMP_ALIGN r5, r1, 2f, 3f, 4f 275 JMP_ALIGN r5, r1
276 1: 276 1:
277 ldmia r1, {r4-r5, r10} 277 ldmia r1, {r4-r5, r10}
278 add r1, r1, r2 278 add r1, r1, r2
279 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 279 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10
280 pld [r1] 280 pld [r1]
332 @ block = word aligned, pixles = unaligned 332 @ block = word aligned, pixles = unaligned
333 pld [r1] 333 pld [r1]
334 stmfd sp!, {r4-r11,lr} @ R14 is also called LR 334 stmfd sp!, {r4-r11,lr} @ R14 is also called LR
335 mov r3, r3, lsr #1 335 mov r3, r3, lsr #1
336 ldr r12, =0xfefefefe 336 ldr r12, =0xfefefefe
337 JMP_ALIGN r5, r1, 2f, 3f, 4f 337 JMP_ALIGN r5, r1
338 1: 338 1:
339 ldmia r1, {r4-r5} 339 ldmia r1, {r4-r5}
340 add r1, r1, r2 340 add r1, r1, r2
341 6: ldmia r1, {r6-r7} 341 6: ldmia r1, {r6-r7}
342 add r1, r1, r2 342 add r1, r1, r2
430 @ block = word aligned, pixles = unaligned 430 @ block = word aligned, pixles = unaligned
431 pld [r1] 431 pld [r1]
432 stmfd sp!, {r4-r11,lr} @ R14 is also called LR 432 stmfd sp!, {r4-r11,lr} @ R14 is also called LR
433 mov r3, r3, lsr #1 433 mov r3, r3, lsr #1
434 ldr r12, =0xfefefefe 434 ldr r12, =0xfefefefe
435 JMP_ALIGN r5, r1, 2f, 3f, 4f 435 JMP_ALIGN r5, r1
436 1: 436 1:
437 ldmia r1, {r4-r5} 437 ldmia r1, {r4-r5}
438 add r1, r1, r2 438 add r1, r1, r2
439 6: ldmia r1, {r6-r7} 439 6: ldmia r1, {r6-r7}
440 add r1, r1, r2 440 add r1, r1, r2
593 function put_pixels8_xy2_arm, export=1 593 function put_pixels8_xy2_arm, export=1
594 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) 594 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
595 @ block = word aligned, pixles = unaligned 595 @ block = word aligned, pixles = unaligned
596 pld [r1] 596 pld [r1]
597 stmfd sp!, {r4-r11,lr} @ R14 is also called LR 597 stmfd sp!, {r4-r11,lr} @ R14 is also called LR
598 JMP_ALIGN r5, r1, 2f, 3f, 4f 598 JMP_ALIGN r5, r1
599 1: 599 1:
600 RND_XY2_EXPAND 0, lsl 600 RND_XY2_EXPAND 0, lsl
601 601
602 .align 5 602 .align 5
603 2: 603 2:
616 function put_no_rnd_pixels8_xy2_arm, export=1 616 function put_no_rnd_pixels8_xy2_arm, export=1
617 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) 617 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
618 @ block = word aligned, pixles = unaligned 618 @ block = word aligned, pixles = unaligned
619 pld [r1] 619 pld [r1]
620 stmfd sp!, {r4-r11,lr} @ R14 is also called LR 620 stmfd sp!, {r4-r11,lr} @ R14 is also called LR
621 JMP_ALIGN r5, r1, 2f, 3f, 4f 621 JMP_ALIGN r5, r1
622 1: 622 1:
623 RND_XY2_EXPAND 0, lsr 623 RND_XY2_EXPAND 0, lsr
624 624
625 .align 5 625 .align 5
626 2: 626 2: