1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
Index: MPlayer-1.0rc2/libmpeg2/motion_comp_arm_s.S
===================================================================
--- MPlayer-1.0rc2.orig/libmpeg2/motion_comp_arm_s.S 2007-11-02 14:16:50.000000000 +0000
+++ MPlayer-1.0rc2/libmpeg2/motion_comp_arm_s.S 2007-11-02 14:23:53.000000000 +0000
@@ -18,6 +18,14 @@
@ along with this program; if not, write to the Free Software
@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#if defined(__ARM_ARCH_5__) || \
+ defined(__ARM_ARCH_5T__) || \
+ defined(__ARM_ARCH_5TE__)
+#define PLD(code...) code
+#else
+#define PLD(code...)
+#endif
+
.text
@ ----------------------------------------------------------------
@@ -25,7 +33,7 @@
.global MC_put_o_16_arm
MC_put_o_16_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
+ PLD ( pld [r1] )
stmfd sp!, {r4-r11, lr} @ R14 is also called LR
and r4, r1, #3
adr r5, MC_put_o_16_arm_align_jt
@@ -35,7 +43,7 @@
MC_put_o_16_arm_align0:
ldmia r1, {r4-r7}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
stmia r0, {r4-r7}
subs r3, r3, #1
add r0, r0, r2
@@ -46,7 +54,7 @@
ldmia r1, {r4-r8}
add r1, r1, r2
mov r9, r4, lsr #(\shift)
- pld [r1]
+ PLD ( pld [r1] )
mov r10, r5, lsr #(\shift)
orr r9, r9, r5, lsl #(32-\shift)
mov r11, r6, lsr #(\shift)
@@ -85,7 +93,7 @@
.global MC_put_o_8_arm
MC_put_o_8_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
+ PLD ( pld [r1] )
stmfd sp!, {r4-r10, lr} @ R14 is also called LR
and r4, r1, #3
adr r5, MC_put_o_8_arm_align_jt
@@ -94,7 +102,7 @@
MC_put_o_8_arm_align0:
ldmia r1, {r4-r5}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
stmia r0, {r4-r5}
add r0, r0, r2
subs r3, r3, #1
@@ -105,7 +113,7 @@
ldmia r1, {r4-r6}
add r1, r1, r2
mov r9, r4, lsr #(\shift)
- pld [r1]
+ PLD ( pld [r1] )
mov r10, r5, lsr #(\shift)
orr r9, r9, r5, lsl #(32-\shift)
orr r10, r10, r6, lsl #(32-\shift)
@@ -154,7 +162,7 @@
.global MC_put_x_16_arm
MC_put_x_16_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
+ PLD ( pld [r1] )
stmfd sp!, {r4-r11,lr} @ R14 is also called LR
and r4, r1, #3
adr r5, MC_put_x_16_arm_align_jt
@@ -179,7 +187,7 @@
MC_put_x_16_arm_align0:
ldmia r1, {r4-r8}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
AVG_PW r7, r8
AVG_PW r6, r7
AVG_PW r5, r6
@@ -193,7 +201,7 @@
and r1, r1, #0xFFFFFFFC
1: ldmia r1, {r4-r8}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
ADJ_ALIGN_QW 8, r4, r5, r6, r7, r8
AVG_PW r7, r8
AVG_PW r6, r7
@@ -208,7 +216,7 @@
and r1, r1, #0xFFFFFFFC
1: ldmia r1, {r4-r8}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
ADJ_ALIGN_QW 16, r4, r5, r6, r7, r8
AVG_PW r7, r8
AVG_PW r6, r7
@@ -223,7 +231,7 @@
and r1, r1, #0xFFFFFFFC
1: ldmia r1, {r4-r8}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
ADJ_ALIGN_QW 24, r4, r5, r6, r7, r8
AVG_PW r7, r8
AVG_PW r6, r7
@@ -246,7 +254,7 @@
.global MC_put_x_8_arm
MC_put_x_8_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
- pld [r1]
+ PLD ( pld [r1] )
stmfd sp!, {r4-r11,lr} @ R14 is also called LR
and r4, r1, #3
adr r5, MC_put_x_8_arm_align_jt
@@ -267,7 +275,7 @@
MC_put_x_8_arm_align0:
ldmia r1, {r4-r6}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
AVG_PW r5, r6
AVG_PW r4, r5
stmia r0, {r5-r6}
@@ -279,7 +287,7 @@
and r1, r1, #0xFFFFFFFC
1: ldmia r1, {r4-r6}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
ADJ_ALIGN_DW 8, r4, r5, r6
AVG_PW r5, r6
AVG_PW r4, r5
@@ -292,7 +300,7 @@
and r1, r1, #0xFFFFFFFC
1: ldmia r1, {r4-r6}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
ADJ_ALIGN_DW 16, r4, r5, r6
AVG_PW r5, r6
AVG_PW r4, r5
@@ -305,7 +313,7 @@
and r1, r1, #0xFFFFFFFC
1: ldmia r1, {r4-r6}
add r1, r1, r2
- pld [r1]
+ PLD ( pld [r1] )
ADJ_ALIGN_DW 24, r4, r5, r6
AVG_PW r5, r6
AVG_PW r4, r5
|
