History

Get rid of double spaces in macro declarations

Martin Storsjö committed 12 years ago

Commit faaf62a1 parent ac03b8b8 files · +33 −33Browse files

Showing the changes to codec/processing/src (2 of 8 files). Show all

Unified · Split

2 files
  1. codec/processing/src/arm/vaa_calc_neon.S +12 −12
  2. codec/processing/src/x86/vaa.asm +5 −5
codec/processing/src/arm/vaa_calc_neon.S+12−12
@@ -161,7 +161,7 @@ WELS_ASM_FUNC_END · 160 unmodified lines
161161
162162
163163 #ifdef __APPLE__
164−.macro SAD_SD_MAD_16BYTES
164+.macro SAD_SD_MAD_16BYTES
165165 vld1.32 {q0}, [$0], $2
166166 vld1.32 {q1}, [$1], $2
167167
@@ -173,7 +173,7 @@ WELS_ASM_FUNC_END · 5 unmodified lines
173173 vpadal.u8 $6, q0
174174 .endm
175175
176−.macro SAD_SD_MAD_8x16BYTES
176+.macro SAD_SD_MAD_8x16BYTES
177177 vld1.32 {q0}, [$0], $2
178178 vld1.32 {q1}, [$1], $2
179179
@@ -195,7 +195,7 @@ WELS_ASM_FUNC_END · 15 unmodified lines
195195 vsub.u16 $5, q2, q3
196196 .endm
197197
198−.macro SAD_SD_MAD_CALC
198+.macro SAD_SD_MAD_CALC
199199 vpmax.u8 d0, $0, $1 //8bytes
200200 vpmax.u8 d0, d0, d0 //4bytes
201201 vpmax.u8 $2, d0, d0 //2bytes
@@ -206,7 +206,7 @@ WELS_ASM_FUNC_END · 4 unmodified lines
206206 vpaddl.s32 $4, $4
207207 .endm
208208 #else
209−.macro SAD_SD_MAD_16BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6
209+.macro SAD_SD_MAD_16BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6
210210 vld1.32 {q0}, [\arg0], \arg2
211211 vld1.32 {q1}, [\arg1], \arg2
212212
@@ -218,7 +218,7 @@ WELS_ASM_FUNC_END · 5 unmodified lines
218218 vpadal.u8 \arg6, q0
219219 .endm
220220
221−.macro SAD_SD_MAD_8x16BYTES arg0, arg1, arg2, arg3, arg4, arg5
221+.macro SAD_SD_MAD_8x16BYTES arg0, arg1, arg2, arg3, arg4, arg5
222222 vld1.32 {q0}, [\arg0], \arg2
223223 vld1.32 {q1}, [\arg1], \arg2
224224
@@ -240,7 +240,7 @@ WELS_ASM_FUNC_END · 15 unmodified lines
240240 vsub.u16 \arg5, q2, q3
241241 .endm
242242
243−.macro SAD_SD_MAD_CALC arg0, arg1, arg2, arg3, arg4
243+.macro SAD_SD_MAD_CALC arg0, arg1, arg2, arg3, arg4
244244 vpmax.u8 d0, \arg0, \arg1 //8bytes
245245 vpmax.u8 d0, d0, d0 //4bytes
246246 vpmax.u8 \arg2, d0, d0 //2bytes
@@ -315,7 +315,7 @@ WELS_ASM_FUNC_END · 68 unmodified lines
315315
316316
317317 #ifdef __APPLE__
318−.macro SSD_MUL_SUM_16BYTES_RESET
318+.macro SSD_MUL_SUM_16BYTES_RESET
319319 vmull.u8 $3, $0, $0
320320 vpaddl.u16 $2, $3
321321
@@ -323,7 +323,7 @@ WELS_ASM_FUNC_END · 1 unmodified line
323323 vpadal.u16 $2, $3
324324 .endm
325325
326−.macro SSD_MUL_SUM_16BYTES
326+.macro SSD_MUL_SUM_16BYTES
327327 vmull.u8 $3, $0, $0
328328 vpadal.u16 $2, $3
329329
@@ -467,13 +467,13 @@ WELS_ASM_FUNC_END · 137 unmodified lines
467467 SAD_SSD_BGD_CALC_8x16 d27, q15, q7
468468 .endm
469469
470−.macro SSD_SAD_SD_MAD_PADDL
470+.macro SSD_SAD_SD_MAD_PADDL
471471 vpaddl.s16 $0, $0
472472 vpaddl.s32 $0, $0
473473 vadd.i32 $1, $1, $2
474474 .endm
475475 #else
476−.macro SSD_MUL_SUM_16BYTES_RESET arg0, arg1, arg2, arg3
476+.macro SSD_MUL_SUM_16BYTES_RESET arg0, arg1, arg2, arg3
477477 vmull.u8 \arg3, \arg0, \arg0
478478 vpaddl.u16 \arg2, \arg3
479479
@@ -481,7 +481,7 @@ WELS_ASM_FUNC_END · 1 unmodified line
481481 vpadal.u16 \arg2, \arg3
482482 .endm
483483
484−.macro SSD_MUL_SUM_16BYTES arg0, arg1, arg2, arg3
484+.macro SSD_MUL_SUM_16BYTES arg0, arg1, arg2, arg3
485485 vmull.u8 \arg3, \arg0, \arg0
486486 vpadal.u16 \arg2, \arg3
487487
@@ -625,7 +625,7 @@ WELS_ASM_FUNC_END · 137 unmodified lines
625625 SAD_SSD_BGD_CALC_8x16 d27, q15, q7
626626 .endm
627627
628−.macro SSD_SAD_SD_MAD_PADDL arg0, arg1, arg2
628+.macro SSD_SAD_SD_MAD_PADDL arg0, arg1, arg2
629629 vpaddl.s16 \arg0, \arg0
630630 vpaddl.s32 \arg0, \arg0
631631 vadd.i32 \arg1, \arg1, \arg2
codec/processing/src/x86/vaa.asm+5−5
@@ -85,7 +85,7 @@ · 84 unmodified lines
8585 ; end of @sum_8x2
8686 %endmacro ; END of SUM_WORD_8x2_SSE2
8787
88−%macro WELS_SAD_SUM_SQSUM_16x1_SSE2 3 ;esi:%1,edi:%2,ebx:%3
88+%macro WELS_SAD_SUM_SQSUM_16x1_SSE2 3 ;esi:%1,edi:%2,ebx:%3
8989 movdqa xmm1, [%1]
9090 movdqa xmm2, [%2]
9191 movdqa xmm3, xmm1
@@ -108,7 +108,7 @@ · 16 unmodified lines
108108 add %2, %3
109109 %endmacro
110110
111−%macro WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 3 ;esi:%1 edi:%2 ebx:%3
111+%macro WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 3 ;esi:%1 edi:%2 ebx:%3
112112 movdqa xmm1, [%1]
113113 movdqa xmm2, [%2]
114114 movdqa xmm3, xmm1
@@ -144,7 +144,7 @@ · 29 unmodified lines
144144 add %2, %3
145145 %endmacro
146146
147−%macro WELS_SAD_SD_MAD_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7
147+%macro WELS_SAD_SD_MAD_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7
148148 %define sad_reg %1
149149 %define sum_cur_reg %2
150150 %define sum_ref_reg %3
@@ -172,7 +172,7 @@ · 21 unmodified lines
172172 %endmacro
173173
174174
175−%macro WELS_MAX_REG_SSE2 1 ; xmm1, xmm2, xmm3 can be used
175+%macro WELS_MAX_REG_SSE2 1 ; xmm1, xmm2, xmm3 can be used
176176 %define max_reg %1
177177 movdqa xmm1, max_reg
178178 psrldq xmm1, 4
@@ -185,7 +185,7 @@ · 6 unmodified lines
185185 pmaxub max_reg, xmm1
186186 %endmacro
187187
188−%macro WELS_SAD_BGD_SQDIFF_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7
188+%macro WELS_SAD_BGD_SQDIFF_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7
189189 %define sad_reg %1
190190 %define sum_reg %2
191191 %define mad_reg %3

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