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
8080 ;----------------------------------------------------------------------------------
8181 %macro FLAC_DECORRELATE_16 3-4
8282 cglobal flac_decorrelate_%1_16, 2, 4, 4, out, in0, in1, len
83−%if ARCH_X86_32 || WIN64
84− movd m3, r4m
8583 %if ARCH_X86_32
8684 mov lend, lenm
8785 %endif
88−%else ; UNIX64
89− movd m3, r4d
90−%endif
86+ movd m3, r4m
9187 shl lend, 2
9288 mov in1q, [in0q + gprsize]
9389 mov in0q, [in0q]
@@ -129,14 +125,10 @@ FLAC_DECORRELATE_16 ms, 2, 0, add · 35 unmodified lines
129125 ;----------------------------------------------------------------------------------
130126 %macro FLAC_DECORRELATE_32 5
131127 cglobal flac_decorrelate_%1_32, 2, 4, 4, out, in0, in1, len
132−%if ARCH_X86_32 || WIN64
133− movd m3, r4m
134128 %if ARCH_X86_32
135129 mov lend, lenm
136130 %endif
137−%else ; UNIX64
138− movd m3, r4d
139−%endif
131+ movd m3, r4m
140132 mov in1q, [in0q + gprsize]
141133 mov in0q, [in0q]
142134 mov outq, [outq]
@@ -183,18 +175,14 @@ FLAC_DECORRELATE_32 ms, 2, 0, 1, add · 40 unmodified lines
183175 %define REPCOUNT %2/(32/%1) ; 16bits = channels / 2; 32bits = channels
184176 cglobal flac_decorrelate_indep%2_%1, 2, %2+2, %3+1, out, in0, in1, len, in2, in3, in4, in5, in6, in7
185177 %if ARCH_X86_32
186− movd m%3, r4m
187178 %if %2 == 6
188179 DEFINE_ARGS out, in0, in1, in2, in3, in4, in5
189180 %define lend dword r3m
190181 %else
191182 mov lend, lenm
192183 %endif
193−%elif WIN64
194− movd m%3, r4m
195−%else ; UNIX64
196− movd m%3, r4d
197184 %endif
185+ movd m%3, r4m
198186
199187 %assign %%i 1
200188 %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