Skip to content

Commit

Permalink
x86inc: Drop SECTION_TEXT macro
Browse files Browse the repository at this point in the history
The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.

Signed-off-by: Anton Khirnov <[email protected]>
  • Loading branch information
Gramner authored and elenril committed Aug 11, 2015
1 parent 1c6bb81 commit ab43bee
Show file tree
Hide file tree
Showing 19 changed files with 18 additions and 30 deletions.
2 changes: 1 addition & 1 deletion libavcodec/x86/apedsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

%include "libavutil/x86/x86util.asm"

SECTION_TEXT
SECTION .text

%macro SCALARPRODUCT 0
; int ff_scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3,
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/audiodsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

%include "libavutil/x86/x86util.asm"

SECTION_TEXT
SECTION .text

%macro SCALARPRODUCT 0
; int ff_scalarproduct_int16(int16_t *v1, int16_t *v2, int order)
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/bswapdsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
SECTION_RODATA
pb_bswap32: db 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12

SECTION_TEXT
SECTION .text

; %1 = aligned/unaligned
%macro BSWAP_LOOPS 1
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/dcadsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
SECTION_RODATA
pf_inv16: times 4 dd 0x3D800000 ; 1/16

SECTION_TEXT
SECTION .text

; void decode_hf(float dst[DCA_SUBBANDS][8], const int32_t vq_num[DCA_SUBBANDS],
; const int8_t hf_vq[1024][32], intptr_t vq_offset,
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/dct32.asm
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ ps_p1p1m1m1: dd 0, 0, 0x80000000, 0x80000000, 0, 0, 0x80000000, 0x80000000
%endmacro

INIT_YMM avx
SECTION_TEXT
SECTION .text
; void ff_dct32_float_avx(FFTSample *out, const FFTSample *in)
cglobal dct32_float, 2,3,8, out, in, tmp
; pass 1
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/fft.asm
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ cextern cos_ %+ i
%1
%endmacro

SECTION_TEXT
SECTION .text

%macro T2_3DNOW 4 ; z0, z1, mem0, mem1
mova %1, %3
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/fmtconvert.asm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

%include "libavutil/x86/x86util.asm"

SECTION_TEXT
SECTION .text

;------------------------------------------------------------------------------
; void ff_int32_to_float_fmul_scalar(float *dst, const int32_t *src, float mul,
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/h263_loopfilter.asm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SECTION_RODATA
cextern pb_FC
cextern h263_loop_filter_strength

SECTION_TEXT
SECTION .text

%macro H263_LOOP_FILTER 5
pxor m7, m7
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/hpeldsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
SECTION_RODATA
cextern pb_1

SECTION_TEXT
SECTION .text

; void ff_put_pixels8_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
%macro PUT_PIXELS8_X2 0
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/huffyuvdsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pb_7: times 8 db 7
pb_zzzz3333zzzzbbbb: db -1,-1,-1,-1,3,3,3,3,-1,-1,-1,-1,11,11,11,11
pb_zz11zz55zz99zzdd: db -1,-1,1,1,-1,-1,5,5,-1,-1,9,9,-1,-1,13,13

SECTION_TEXT
SECTION .text

; void ff_add_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *top,
; const uint8_t *diff, int w,
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/imdct36.asm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ costabs: times 4 dd 0.98480773
times 4 dd 5.73685646

%define SBLIMIT 32
SECTION_TEXT
SECTION .text

%macro PSHUFD 3
%if cpuflag(sse2) && notcpuflag(avx)
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/pngdsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SECTION_RODATA

cextern pw_255

SECTION_TEXT
SECTION .text

; %1 = nr. of xmm registers used
%macro ADD_BYTES_FN 1
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/qpeldsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ cextern pw_16
cextern pw_20


SECTION_TEXT
SECTION .text

; void ff_put_no_rnd_pixels8_l2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
%macro PUT_NO_RND_PIXELS8_L2 0
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/x86/sbrdsp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ps_mask times 2 dd 1<<31, 0
ps_mask2 times 2 dd 0, 1<<31
ps_neg times 4 dd 1<<31

SECTION_TEXT
SECTION .text

INIT_XMM sse
cglobal sbr_sum_square, 2, 3, 6
Expand Down
2 changes: 1 addition & 1 deletion libavfilter/x86/af_volume.asm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pw_1: times 8 dw 1
pw_128: times 8 dw 128
pq_128: times 2 dq 128

SECTION_TEXT
SECTION .text

;------------------------------------------------------------------------------
; void ff_scale_samples_s16(uint8_t *dst, const uint8_t *src, int len,
Expand Down
2 changes: 1 addition & 1 deletion libavresample/x86/audio_convert.asm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pb_interleave_words: SHUFFLE_MASK_W 0, 4, 1, 5, 2, 6, 3, 7
pb_deinterleave_words: SHUFFLE_MASK_W 0, 2, 4, 6, 1, 3, 5, 7
pw_zero_even: times 4 dw 0x0000, 0xffff

SECTION_TEXT
SECTION .text

;------------------------------------------------------------------------------
; void ff_conv_s16_to_s32(int32_t *dst, const int16_t *src, int len);
Expand Down
2 changes: 1 addition & 1 deletion libavresample/x86/audio_mix.asm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
%include "libavutil/x86/x86util.asm"
%include "util.asm"

SECTION_TEXT
SECTION .text

;-----------------------------------------------------------------------------
; void ff_mix_2_to_1_fltp_flt(float **src, float **matrix, int len,
Expand Down
2 changes: 1 addition & 1 deletion libavresample/x86/dither.asm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pf_dither_scale: times 8 dd 2.32830643762e-10

pf_s16_scale: times 4 dd 32753.0

SECTION_TEXT
SECTION .text

;------------------------------------------------------------------------------
; void ff_quantize(int16_t *dst, float *src, float *dither, int len);
Expand Down
12 changes: 0 additions & 12 deletions libavutil/x86/x86inc.asm
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,6 @@
%endif
%endmacro

%macro SECTION_TEXT 0-1 16
%ifidn __OUTPUT_FORMAT__,aout
SECTION .text
%else
SECTION .text align=%1
%endif
%endmacro

%if WIN64
%define PIC
%elif ARCH_X86_64 == 0
Expand Down Expand Up @@ -743,10 +735,6 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
[section .note.GNU-stack noalloc noexec nowrite progbits]
%endif

; Overrides the default .text section.
; Silences warnings when defining structures.
%define __SECT__

; cpuflags

%assign cpuflags_mmx (1<<0)
Expand Down

0 comments on commit ab43bee

Please sign in to comment.