| 1 | |
| 2 | |
| 3 | @@ -30,8 +30,8 @@
|
| 4 | stmfd sp!, {r4-r11, lr} @ R14 is also called LR
|
| 5 | and r4, r1, #3
|
| 6 | adr r5, MC_put_o_16_arm_align_jt
|
| 7 | - add r5, r5, r4, lsl #2
|
| 8 | - ldr pc, [r5]
|
| 9 | + ldr r5, [r5, r4, lsl #2]
|
| 10 | + add pc, pc, r5
|
| 11 |
|
| 12 | MC_put_o_16_arm_align0:
|
| 13 | ldmia r1, {r4-r7}
|
| 14 | @@ -76,10 +76,10 @@
|
| 15 | bne 1b
|
| 16 | ldmfd sp!, {r4-r11, pc} @@ update PC with LR content.
|
| 17 | MC_put_o_16_arm_align_jt:
|
| 18 | - .word MC_put_o_16_arm_align0
|
| 19 | - .word MC_put_o_16_arm_align1
|
| 20 | - .word MC_put_o_16_arm_align2
|
| 21 | - .word MC_put_o_16_arm_align3
|
| 22 | + .word MC_put_o_16_arm_align0-MC_put_o_16_arm_align0-8
|
| 23 | + .word MC_put_o_16_arm_align1-MC_put_o_16_arm_align0-8
|
| 24 | + .word MC_put_o_16_arm_align2-MC_put_o_16_arm_align0-8
|
| 25 | + .word MC_put_o_16_arm_align3-MC_put_o_16_arm_align0-8
|
| 26 |
|
| 27 | @ ----------------------------------------------------------------
|
| 28 | .align
|
| 29 | @@ -90,8 +90,8 @@
|
| 30 | stmfd sp!, {r4-r10, lr} @ R14 is also called LR
|
| 31 | and r4, r1, #3
|
| 32 | adr r5, MC_put_o_8_arm_align_jt
|
| 33 | - add r5, r5, r4, lsl #2
|
| 34 | - ldr pc, [r5]
|
| 35 | + ldr r5, [r5, r4, lsl #2]
|
| 36 | + add pc, pc, r5
|
| 37 | MC_put_o_8_arm_align0:
|
| 38 | ldmia r1, {r4-r5}
|
| 39 | add r1, r1, r2
|
| 40 | @@ -134,10 +134,10 @@
|
| 41 | ldmfd sp!, {r4-r10, pc} @@ update PC with LR content.
|
| 42 |
|
| 43 | MC_put_o_8_arm_align_jt:
|
| 44 | - .word MC_put_o_8_arm_align0
|
| 45 | - .word MC_put_o_8_arm_align1
|
| 46 | - .word MC_put_o_8_arm_align2
|
| 47 | - .word MC_put_o_8_arm_align3
|
| 48 | + .word MC_put_o_8_arm_align0-MC_put_o_8_arm_align0-8
|
| 49 | + .word MC_put_o_8_arm_align1-MC_put_o_8_arm_align0-8
|
| 50 | + .word MC_put_o_8_arm_align2-MC_put_o_8_arm_align0-8
|
| 51 | + .word MC_put_o_8_arm_align3-MC_put_o_8_arm_align0-8
|
| 52 |
|
| 53 | @ ----------------------------------------------------------------
|
| 54 | .macro AVG_PW rW1, rW2
|
| 55 | @@ -162,7 +162,8 @@
|
| 56 | ldr r11, [r5]
|
| 57 | mvn r12, r11
|
| 58 | add r5, r5, r4, lsl #2
|
| 59 | - ldr pc, [r5, #4]
|
| 60 | + ldr r5, [r5, #4]
|
| 61 | + add pc, pc, r5
|
| 62 |
|
| 63 | .macro ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4
|
| 64 | mov \R0, \R0, lsr #(\shift)
|
| 65 | @@ -237,10 +238,10 @@
|
| 66 | ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
|
| 67 | MC_put_x_16_arm_align_jt:
|
| 68 | .word 0x01010101
|
| 69 | - .word MC_put_x_16_arm_align0
|
| 70 | - .word MC_put_x_16_arm_align1
|
| 71 | - .word MC_put_x_16_arm_align2
|
| 72 | - .word MC_put_x_16_arm_align3
|
| 73 | + .word MC_put_x_16_arm_align0-MC_put_x_16_arm_align0-8
|
| 74 | + .word MC_put_x_16_arm_align1-MC_put_x_16_arm_align0-8
|
| 75 | + .word MC_put_x_16_arm_align2-MC_put_x_16_arm_align0-8
|
| 76 | + .word MC_put_x_16_arm_align3-MC_put_x_16_arm_align0-8
|
| 77 |
|
| 78 | @ ----------------------------------------------------------------
|
| 79 | .align
|
| 80 | @@ -254,7 +255,8 @@
|
| 81 | ldr r11, [r5]
|
| 82 | mvn r12, r11
|
| 83 | add r5, r5, r4, lsl #2
|
| 84 | - ldr pc, [r5, #4]
|
| 85 | + ldr r5, [r5, #4]
|
| 86 | + add pc, pc, r5
|
| 87 |
|
| 88 | .macro ADJ_ALIGN_DW shift, R0, R1, R2
|
| 89 | mov \R0, \R0, lsr #(\shift)
|
| 90 | @@ -317,7 +319,7 @@
|
| 91 | ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
|
| 92 | MC_put_x_8_arm_align_jt:
|
| 93 | .word 0x01010101
|
| 94 | - .word MC_put_x_8_arm_align0
|
| 95 | - .word MC_put_x_8_arm_align1
|
| 96 | - .word MC_put_x_8_arm_align2
|
| 97 | - .word MC_put_x_8_arm_align3
|
| 98 | + .word MC_put_x_8_arm_align0-MC_put_x_8_arm_align0-8
|
| 99 | + .word MC_put_x_8_arm_align1-MC_put_x_8_arm_align0-8
|
| 100 | + .word MC_put_x_8_arm_align2-MC_put_x_8_arm_align0-8
|
| 101 | + .word MC_put_x_8_arm_align3-MC_put_x_8_arm_align0-8
|