History

Merge remote-tracking branch 'qatar/master'

* qatar/master: arm: Comment out unused labels in simple_idct_arm

Michael Niedermayer committed 13 years ago

Commit 0815b232 parents 5156d48 54ba5201 file · +8 −8Browse files

Unified · Split

libavcodec/arm/simple_idct_arm.S+8−8
@@ -83,7 +83,7 @@ __row_loop: · 82 unmodified lines
83 orrs r5, r5, r7 @ R5=R4 | R3 | R2 | R783 orrs r5, r5, r7 @ R5=R4 | R3 | R2 | R7
84 beq __almost_empty_row84 beq __almost_empty_row
85 85
86__b_evaluation:86@@ __b_evaluation:
87 @@ at this point, R0=block (temp), R1(free), R2=ROWr32[1], R3=ROWr32[2], R4=ROWr32[3],87 @@ at this point, R0=block (temp), R1(free), R2=ROWr32[1], R3=ROWr32[2], R4=ROWr32[3],
88 @@ R5=(temp), R6=ROWr16[0], R7=ROWr16[1], R8-R11 free,88 @@ R5=(temp), R6=ROWr16[0], R7=ROWr16[1], R8-R11 free,
89 @@ R12=__const_ptr_, R14=&block[n]89 @@ R12=__const_ptr_, R14=&block[n]
@@ -159,7 +159,7 @@ __end_b_evaluation: · 69 unmodified lines
159 @@ R5=b2, R6=ROWr16[0], R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),159 @@ R5=b2, R6=ROWr16[0], R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),
160 @@ R12=__const_ptr_, R14=&block[n]160 @@ R12=__const_ptr_, R14=&block[n]
161 161
162__a_evaluation:162@@ __a_evaluation:
163 @@ a0 = (W4 * row[0]) + (1 << (ROW_SHIFT - 1));163 @@ a0 = (W4 * row[0]) + (1 << (ROW_SHIFT - 1));
164 @@ a1 = a0 + W6 * row[2];164 @@ a1 = a0 + W6 * row[2];
165 @@ a2 = a0 - W6 * row[2];165 @@ a2 = a0 - W6 * row[2];
@@ -295,7 +295,7 @@ __end_row_loop: · 129 unmodified lines
295 add r14, r0, #14 @ R14=&block[7], better start from the last col, and decrease the value until col=0, i.e. R14=block.295 add r14, r0, #14 @ R14=&block[7], better start from the last col, and decrease the value until col=0, i.e. R14=block.
296__col_loop:296__col_loop:
297 297
298__b_evaluation2:298@@ __b_evaluation2:
299 @@ at this point, R0=block (temp), R1-R11 (free)299 @@ at this point, R0=block (temp), R1-R11 (free)
300 @@ R12=__const_ptr_, R14=&block[n]300 @@ R12=__const_ptr_, R14=&block[n]
301 @@ proceed with b0-b3 first, followed by a0-a3301 @@ proceed with b0-b3 first, followed by a0-a3
@@ -357,12 +357,12 @@ __b_evaluation2: · 55 unmodified lines
357 it ne357 it ne
358 mlane r1, r10, r4, r1 @ R1-=W5*ROWr16[7x8]=b1358 mlane r1, r10, r4, r1 @ R1-=W5*ROWr16[7x8]=b1
359 @@ R4 is free now359 @@ R4 is free now
360__end_b_evaluation2:360@@ __end_b_evaluation2:
361 @@ at this point, R0=b0, R1=b1, R2 (free), R3 (free), R4 (free),361 @@ at this point, R0=b0, R1=b1, R2 (free), R3 (free), R4 (free),
362 @@ R5=b2, R6 (free), R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),362 @@ R5=b2, R6 (free), R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),
363 @@ R12=__const_ptr_, R14=&block[n]363 @@ R12=__const_ptr_, R14=&block[n]
364 364
365__a_evaluation2:365@@ __a_evaluation2:
366 @@ a0 = (W4 * col[8x0]) + (1 << (COL_SHIFT - 1));366 @@ a0 = (W4 * col[8x0]) + (1 << (COL_SHIFT - 1));
367 @@ a1 = a0 + W6 * row[2];367 @@ a1 = a0 + W6 * row[2];
368 @@ a2 = a0 - W6 * row[2];368 @@ a2 = a0 - W6 * row[2];
@@ -414,7 +414,7 @@ __a_evaluation2: · 45 unmodified lines
414 itt ne414 itt ne
415 subne r2, r2, r10 @ R2-=W2*ROWr16[6] (a1)415 subne r2, r2, r10 @ R2-=W2*ROWr16[6] (a1)
416 addne r3, r3, r10 @ R3+=W2*ROWr16[6] (a2)416 addne r3, r3, r10 @ R3+=W2*ROWr16[6] (a2)
417__end_a_evaluation2:417@@ __end_a_evaluation2:
418 @@ at this point, R0=b0, R1=b1, R2=a1, R3=a2, R4=a3,418 @@ at this point, R0=b0, R1=b1, R2=a1, R3=a2, R4=a3,
419 @@ R5=b2, R6=a0, R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),419 @@ R5=b2, R6=a0, R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),
420 @@ R12=__const_ptr_, R14=&block[n]420 @@ R12=__const_ptr_, R14=&block[n]
@@ -452,7 +452,7 @@ __end_a_evaluation2: · 31 unmodified lines
452 strh r8, [r14, #96]452 strh r8, [r14, #96]
453 strh r9, [r14, #112]453 strh r9, [r14, #112]
454 454
455__end_col_loop:455@@ __end_col_loop:
456 @@ at this point, R0-R11 (free)456 @@ at this point, R0-R11 (free)
457 @@ R12=__const_ptr_, R14=&block[n]457 @@ R12=__const_ptr_, R14=&block[n]
458 ldr r0, [sp, #0] @ R0=block458 ldr r0, [sp, #0] @ R0=block
@@ -463,7 +463,7 @@ __end_col_loop: · 4 unmodified lines
463 463
464 464
465 465
466__end_simple_idct_arm:466@@ __end_simple_idct_arm:
467 @@ restore registers to previous status!467 @@ restore registers to previous status!
468 add sp, sp, #8 @@ the local variables!468 add sp, sp, #8 @@ the local variables!
469 ldmfd sp!, {r4-r11, r15} @@ update PC with LR content.469 ldmfd sp!, {r4-r11, r15} @@ update PC with LR content.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t