Skip to content

Commit 7e5df34

Browse files
authored
Convert fldmia/fstmia instructions to UAL syntax for clang7
fixes #1774
1 parent 28aa94b commit 7e5df34

40 files changed

+1105
-1105
lines changed

kernel/arm/asum_vfp.S

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5858
.macro KERNEL_F4
5959

6060
pld [ X, #X_PRE ]
61-
fldmiad X!, { d4 - d5 }
61+
vldmia.f64 X!, { d4 - d5 }
6262
vabs.f64 d4, d4
6363
vadd.f64 d0 , d0, d4
6464
vabs.f64 d5, d5
65-
fldmiad X!, { d6 - d7 }
65+
vldmia.f64 X!, { d6 - d7 }
6666
vabs.f64 d6, d6
6767
vadd.f64 d1 , d1, d5
6868
vabs.f64 d7, d7
@@ -73,7 +73,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7373

7474
.macro KERNEL_F1
7575

76-
fldmiad X!, { d4 }
76+
vldmia.f64 X!, { d4 }
7777
vabs.f64 d4, d4
7878
vadd.f64 d0 , d0, d4
7979

@@ -82,22 +82,22 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8282

8383
.macro KERNEL_S4
8484

85-
fldmiad X, { d4 }
85+
vldmia.f64 X, { d4 }
8686
vabs.f64 d4, d4
8787
vadd.f64 d0 , d0, d4
8888
add X, X, INC_X
8989

90-
fldmiad X, { d4 }
90+
vldmia.f64 X, { d4 }
9191
vabs.f64 d4, d4
9292
vadd.f64 d0 , d0, d4
9393
add X, X, INC_X
9494

95-
fldmiad X, { d4 }
95+
vldmia.f64 X, { d4 }
9696
vabs.f64 d4, d4
9797
vadd.f64 d0 , d0, d4
9898
add X, X, INC_X
9999

100-
fldmiad X, { d4 }
100+
vldmia.f64 X, { d4 }
101101
vabs.f64 d4, d4
102102
vadd.f64 d0 , d0, d4
103103
add X, X, INC_X
@@ -107,7 +107,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
107107

108108
.macro KERNEL_S1
109109

110-
fldmiad X, { d4 }
110+
vldmia.f64 X, { d4 }
111111
vabs.f64 d4, d4
112112
vadd.f64 d0 , d0, d4
113113
add X, X, INC_X
@@ -118,11 +118,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
118118

119119
.macro KERNEL_F4
120120

121-
fldmias X!, { s4 - s5 }
121+
vldmia.f32 X!, { s4 - s5 }
122122
vabs.f32 s4, s4
123123
vadd.f32 s0 , s0, s4
124124
vabs.f32 s5, s5
125-
fldmias X!, { s6 - s7 }
125+
vldmia.f32 X!, { s6 - s7 }
126126
vabs.f32 s6, s6
127127
vadd.f32 s1 , s1, s5
128128
vabs.f32 s7, s7
@@ -133,7 +133,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
133133

134134
.macro KERNEL_F1
135135

136-
fldmias X!, { s4 }
136+
vldmia.f32 X!, { s4 }
137137
vabs.f32 s4, s4
138138
vadd.f32 s0 , s0, s4
139139

@@ -142,22 +142,22 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
142142

143143
.macro KERNEL_S4
144144

145-
fldmias X, { s4 }
145+
vldmia.f32 X, { s4 }
146146
vabs.f32 s4, s4
147147
vadd.f32 s0 , s0, s4
148148
add X, X, INC_X
149149

150-
fldmias X, { s4 }
150+
vldmia.f32 X, { s4 }
151151
vabs.f32 s4, s4
152152
vadd.f32 s0 , s0, s4
153153
add X, X, INC_X
154154

155-
fldmias X, { s4 }
155+
vldmia.f32 X, { s4 }
156156
vabs.f32 s4, s4
157157
vadd.f32 s0 , s0, s4
158158
add X, X, INC_X
159159

160-
fldmias X, { s4 }
160+
vldmia.f32 X, { s4 }
161161
vabs.f32 s4, s4
162162
vadd.f32 s0 , s0, s4
163163
add X, X, INC_X
@@ -167,7 +167,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
167167

168168
.macro KERNEL_S1
169169

170-
fldmias X, { s4 }
170+
vldmia.f32 X, { s4 }
171171
vabs.f32 s4, s4
172172
vadd.f32 s0 , s0, s4
173173
add X, X, INC_X
@@ -184,23 +184,23 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
184184
.macro KERNEL_F4
185185

186186
pld [ X, #X_PRE ]
187-
fldmiad X!, { d4 - d5 }
187+
vldmia.f64 X!, { d4 - d5 }
188188
vabs.f64 d4, d4
189189
vadd.f64 d0 , d0, d4
190190
vabs.f64 d5, d5
191-
fldmiad X!, { d6 - d7 }
191+
vldmia.f64 X!, { d6 - d7 }
192192
vabs.f64 d6, d6
193193
vadd.f64 d1 , d1, d5
194194
vabs.f64 d7, d7
195195
vadd.f64 d0 , d0, d6
196196
vadd.f64 d1 , d1, d7
197197

198198
pld [ X, #X_PRE ]
199-
fldmiad X!, { d4 - d5 }
199+
vldmia.f64 X!, { d4 - d5 }
200200
vabs.f64 d4, d4
201201
vadd.f64 d0 , d0, d4
202202
vabs.f64 d5, d5
203-
fldmiad X!, { d6 - d7 }
203+
vldmia.f64 X!, { d6 - d7 }
204204
vabs.f64 d6, d6
205205
vadd.f64 d1 , d1, d5
206206
vabs.f64 d7, d7
@@ -212,11 +212,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
212212

213213
.macro KERNEL_F1
214214

215-
fldmiad X!, { d4 }
215+
vldmia.f64 X!, { d4 }
216216
vabs.f64 d4, d4
217217
vadd.f64 d0 , d0, d4
218218

219-
fldmiad X!, { d4 }
219+
vldmia.f64 X!, { d4 }
220220
vabs.f64 d4, d4
221221
vadd.f64 d0 , d0, d4
222222

@@ -226,28 +226,28 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
226226

227227
.macro KERNEL_S4
228228

229-
fldmiad X, { d4 -d5 }
229+
vldmia.f64 X, { d4 -d5 }
230230
vabs.f64 d4, d4
231231
vadd.f64 d0 , d0, d4
232232
vabs.f64 d5, d5
233233
vadd.f64 d0 , d0, d5
234234
add X, X, INC_X
235235

236-
fldmiad X, { d4 -d5 }
236+
vldmia.f64 X, { d4 -d5 }
237237
vabs.f64 d4, d4
238238
vadd.f64 d0 , d0, d4
239239
vabs.f64 d5, d5
240240
vadd.f64 d0 , d0, d5
241241
add X, X, INC_X
242242

243-
fldmiad X, { d4 -d5 }
243+
vldmia.f64 X, { d4 -d5 }
244244
vabs.f64 d4, d4
245245
vadd.f64 d0 , d0, d4
246246
vabs.f64 d5, d5
247247
vadd.f64 d0 , d0, d5
248248
add X, X, INC_X
249249

250-
fldmiad X, { d4 -d5 }
250+
vldmia.f64 X, { d4 -d5 }
251251
vabs.f64 d4, d4
252252
vadd.f64 d0 , d0, d4
253253
vabs.f64 d5, d5
@@ -259,7 +259,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
259259

260260
.macro KERNEL_S1
261261

262-
fldmiad X, { d4 -d5 }
262+
vldmia.f64 X, { d4 -d5 }
263263
vabs.f64 d4, d4
264264
vadd.f64 d0 , d0, d4
265265
vabs.f64 d5, d5
@@ -273,22 +273,22 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
273273
.macro KERNEL_F4
274274

275275
pld [ X, #X_PRE ]
276-
fldmias X!, { s4 - s5 }
276+
vldmia.f32 X!, { s4 - s5 }
277277
vabs.f32 s4, s4
278278
vadd.f32 s0 , s0, s4
279279
vabs.f32 s5, s5
280-
fldmias X!, { s6 - s7 }
280+
vldmia.f32 X!, { s6 - s7 }
281281
vabs.f32 s6, s6
282282
vadd.f32 s1 , s1, s5
283283
vabs.f32 s7, s7
284284
vadd.f32 s0 , s0, s6
285285
vadd.f32 s1 , s1, s7
286286

287-
fldmias X!, { s4 - s5 }
287+
vldmia.f32 X!, { s4 - s5 }
288288
vabs.f32 s4, s4
289289
vadd.f32 s0 , s0, s4
290290
vabs.f32 s5, s5
291-
fldmias X!, { s6 - s7 }
291+
vldmia.f32 X!, { s6 - s7 }
292292
vabs.f32 s6, s6
293293
vadd.f32 s1 , s1, s5
294294
vabs.f32 s7, s7
@@ -300,11 +300,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
300300

301301
.macro KERNEL_F1
302302

303-
fldmias X!, { s4 }
303+
vldmia.f32 X!, { s4 }
304304
vabs.f32 s4, s4
305305
vadd.f32 s0 , s0, s4
306306

307-
fldmias X!, { s4 }
307+
vldmia.f32 X!, { s4 }
308308
vabs.f32 s4, s4
309309
vadd.f32 s0 , s0, s4
310310

@@ -313,28 +313,28 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
313313

314314
.macro KERNEL_S4
315315

316-
fldmias X, { s4 -s5 }
316+
vldmia.f32 X, { s4 -s5 }
317317
vabs.f32 s4, s4
318318
vadd.f32 s0 , s0, s4
319319
vabs.f32 s5, s5
320320
vadd.f32 s0 , s0, s5
321321
add X, X, INC_X
322322

323-
fldmias X, { s4 -s5 }
323+
vldmia.f32 X, { s4 -s5 }
324324
vabs.f32 s4, s4
325325
vadd.f32 s0 , s0, s4
326326
vabs.f32 s5, s5
327327
vadd.f32 s0 , s0, s5
328328
add X, X, INC_X
329329

330-
fldmias X, { s4 -s5 }
330+
vldmia.f32 X, { s4 -s5 }
331331
vabs.f32 s4, s4
332332
vadd.f32 s0 , s0, s4
333333
vabs.f32 s5, s5
334334
vadd.f32 s0 , s0, s5
335335
add X, X, INC_X
336336

337-
fldmias X, { s4 -s5 }
337+
vldmia.f32 X, { s4 -s5 }
338338
vabs.f32 s4, s4
339339
vadd.f32 s0 , s0, s4
340340
vabs.f32 s5, s5
@@ -346,7 +346,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
346346

347347
.macro KERNEL_S1
348348

349-
fldmias X, { s4 -s5 }
349+
vldmia.f32 X, { s4 -s5 }
350350
vabs.f32 s4, s4
351351
vadd.f32 s0 , s0, s4
352352
vabs.f32 s5, s5

0 commit comments

Comments
 (0)