diff options
Diffstat (limited to 'apps/plugins/mpegplayer/libmpeg2')
-rw-r--r-- | apps/plugins/mpegplayer/libmpeg2/idct_arm.S | 6 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/libmpeg2/idct_armv6.S | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/apps/plugins/mpegplayer/libmpeg2/idct_arm.S b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S index 97a87a8b59..90eb5031c7 100644 --- a/apps/plugins/mpegplayer/libmpeg2/idct_arm.S +++ b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S @@ -43,8 +43,8 @@ ldrsh r7, [r0, #12] /* d2 */ ldrsh r8, [r0, #14] /* d3 */ orrs r9, r2, r3 - orreqs r9, r4, r5 - orreqs r9, r6, r7 + orrseq r9, r4, r5 + orrseq r9, r6, r7 cmpeq r8, #0 bne 2f mov r1, r1, asl #15 @@ -320,7 +320,7 @@ mpeg2_idct_copy: mpeg2_idct_add: cmp r0, #129 mov r0, r1 - ldreqsh r1, [r0, #0] + ldrsheq r1, [r0, #0] bne 1f and r1, r1, #0x70 cmp r1, #0x40 diff --git a/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S index dc53cbd7bd..a259721410 100644 --- a/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S +++ b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S @@ -19,6 +19,7 @@ * ****************************************************************************/ +#include "config.h" .global mpeg2_idct_copy .type mpeg2_idct_copy, %function @@ -228,7 +229,7 @@ mpeg2_idct_copy: mpeg2_idct_add: cmp r0, #129 mov r0, r1 - ldreqsh r1, [r0, #0] + ldrsheq r1, [r0, #0] bne 1f and r1, r1, #0x70 cmp r1, #0x40 @@ -260,7 +261,7 @@ mpeg2_idct_add: strd r4, [r1] @ r4, r5 add r1, r1, r2 cmp r0, r3 - ldrlod r8, [r1] @ r8, r9 + ldrdlo r8, [r1] @ r8, r9 blo 2b ldmfd sp!, {r4-r11, pc} @@ -291,7 +292,7 @@ mpeg2_idct_add: strd r0, [r2] @ r0, r1 add r2, r2, r3 cmp r2, r12 - ldrlod r0, [r2] @ r0, r1 + ldrdlo r0, [r2] @ r0, r1 blo 4b ldmfd sp!, {r4, pc} |