History

x86/flacdsp: remove unneeded ifdeffery

x86inc can translate r*m into a register or stack on its own

James Almer committed 11 years ago

Commit 08810a81 parent d02d4d01 file · +3 −15Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/x86/flacdsp.asm+3−15
@@ -80,14 +80,10 @@ LPC_32 sse4 · 79 unmodified lines
80;----------------------------------------------------------------------------------80;----------------------------------------------------------------------------------
81%macro FLAC_DECORRELATE_16 3-481%macro FLAC_DECORRELATE_16 3-4
82cglobal flac_decorrelate_%1_16, 2, 4, 4, out, in0, in1, len82cglobal flac_decorrelate_%1_16, 2, 4, 4, out, in0, in1, len
83%if ARCH_X86_32 || WIN64
84 movd m3, r4m
85%if ARCH_X86_3283%if ARCH_X86_32
86 mov lend, lenm84 mov lend, lenm
87%endif85%endif
88%else ; UNIX6486 movd m3, r4m
89 movd m3, r4d
90%endif
91 shl lend, 287 shl lend, 2
92 mov in1q, [in0q + gprsize]88 mov in1q, [in0q + gprsize]
93 mov in0q, [in0q]89 mov in0q, [in0q]
@@ -129,14 +125,10 @@ FLAC_DECORRELATE_16 ms, 2, 0, add · 35 unmodified lines
129;----------------------------------------------------------------------------------125;----------------------------------------------------------------------------------
130%macro FLAC_DECORRELATE_32 5126%macro FLAC_DECORRELATE_32 5
131cglobal flac_decorrelate_%1_32, 2, 4, 4, out, in0, in1, len127cglobal flac_decorrelate_%1_32, 2, 4, 4, out, in0, in1, len
132%if ARCH_X86_32 || WIN64
133 movd m3, r4m
134%if ARCH_X86_32128%if ARCH_X86_32
135 mov lend, lenm129 mov lend, lenm
136%endif130%endif
137%else ; UNIX64131 movd m3, r4m
138 movd m3, r4d
139%endif
140 mov in1q, [in0q + gprsize]132 mov in1q, [in0q + gprsize]
141 mov in0q, [in0q]133 mov in0q, [in0q]
142 mov outq, [outq]134 mov outq, [outq]
@@ -183,18 +175,14 @@ FLAC_DECORRELATE_32 ms, 2, 0, 1, add · 40 unmodified lines
183%define REPCOUNT %2/(32/%1) ; 16bits = channels / 2; 32bits = channels175%define REPCOUNT %2/(32/%1) ; 16bits = channels / 2; 32bits = channels
184cglobal flac_decorrelate_indep%2_%1, 2, %2+2, %3+1, out, in0, in1, len, in2, in3, in4, in5, in6, in7176cglobal flac_decorrelate_indep%2_%1, 2, %2+2, %3+1, out, in0, in1, len, in2, in3, in4, in5, in6, in7
185%if ARCH_X86_32177%if ARCH_X86_32
186 movd m%3, r4m
187%if %2 == 6178%if %2 == 6
188 DEFINE_ARGS out, in0, in1, in2, in3, in4, in5179 DEFINE_ARGS out, in0, in1, in2, in3, in4, in5
189 %define lend dword r3m180 %define lend dword r3m
190%else181%else
191 mov lend, lenm182 mov lend, lenm
192%endif183%endif
193%elif WIN64
194 movd m%3, r4m
195%else ; UNIX64
196 movd m%3, r4d
197%endif184%endif
185 movd m%3, r4m
198 186
199%assign %%i 1187%assign %%i 1
200%rep %2-1188%rep %2-1

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