fix names of SSE routines

diff --git a/src/libFLAC/encoder.c b/src/libFLAC/encoder.c
index 3db4332..19647ae 100644 (file)
--- a/src/libFLAC/encoder.c
+++ b/src/libFLAC/encoder.c
@@ -337,28 +337,25 @@ FLAC__EncoderState FLAC__encoder_init(FLAC__Encoder *encoder, FLAC__EncoderWrite
 #ifdef FLAC__CPU_IA32
        FLAC__ASSERT(encoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
 #ifdef FLAC__HAS_NASM
-#if 0
-       /* @@@ SSE version not working yet */
-       if(encoder->guts->cpuinfo.data.ia32.sse) {
+       if(0 && encoder->guts->cpuinfo.data.ia32.sse) { /* SSE version lacks necessary resolution, plus SSE flag doesn't check for OS support */
                if(encoder->max_lpc_order < 4)
 {//@@@
-               encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386_sse_4;
-fprintf(stderr,"@@@ got _asm_i386_sse_4 of lpc_compute_autocorrelation()\n");}
+               encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_4;
+fprintf(stderr,"@@@ got _asm_i386_sse_lag_4 of lpc_compute_autocorrelation()\n");}
                else if(encoder->max_lpc_order < 8)
 {//@@@
-               encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386_sse_8;
-fprintf(stderr,"@@@ got _asm_i386_sse_8 of lpc_compute_autocorrelation()\n");}
+               encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_8;
+fprintf(stderr,"@@@ got _asm_i386_sse_lag_8 of lpc_compute_autocorrelation()\n");}
                else if(encoder->max_lpc_order < 12)
 {//@@@
-               encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386_sse_12;
-fprintf(stderr,"@@@ got _asm_i386_sse_12 of lpc_compute_autocorrelation()\n");}
+               encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_12;
+fprintf(stderr,"@@@ got _asm_i386_sse_lag_12 of lpc_compute_autocorrelation()\n");}
                else
 {//@@@
                        encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386;
 fprintf(stderr,"@@@ got _asm_i386 of lpc_compute_autocorrelation()\n");}
        }
        else
-#endif
 {//@@@
                encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_i386;
 fprintf(stderr,"@@@ got _asm_i386 of lpc_compute_autocorrelation()\n");}

diff --git a/src/libFLAC/i386/lpc_asm.s b/src/libFLAC/i386/lpc_asm.s
index 2825520..202e2fa 100644 (file)
--- a/src/libFLAC/i386/lpc_asm.s
+++ b/src/libFLAC/i386/lpc_asm.s
@@ -21,9 +21,9 @@
        data_section
 
 cglobal FLAC__lpc_compute_autocorrelation_asm_i386
-cglobal FLAC__lpc_compute_autocorrelation_asm_i386_sse_4
-cglobal FLAC__lpc_compute_autocorrelation_asm_i386_sse_8
-cglobal FLAC__lpc_compute_autocorrelation_asm_i386_sse_12
+cglobal FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_4
+cglobal FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_8
+cglobal FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_12
 cglobal FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386
 cglobal FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386_mmx
 cglobal FLAC__lpc_restore_signal_asm_i386

diff --git a/src/libFLAC/include/private/lpc.h b/src/libFLAC/include/private/lpc.h
index 4838b32..676c2cc 100644 (file)
--- a/src/libFLAC/include/private/lpc.h
+++ b/src/libFLAC/include/private/lpc.h
@@ -41,9 +41,9 @@ void FLAC__lpc_compute_autocorrelation(const real data[], unsigned data_len, uns
 #ifdef FLAC__CPU_IA32
 #ifdef FLAC__HAS_NASM
 void FLAC__lpc_compute_autocorrelation_asm_i386(const real data[], unsigned data_len, unsigned lag, real autoc[]);
-void FLAC__lpc_compute_autocorrelation_asm_i386_sse_4(const real data[], unsigned data_len, unsigned lag, real autoc[]);
-void FLAC__lpc_compute_autocorrelation_asm_i386_sse_8(const real data[], unsigned data_len, unsigned lag, real autoc[]);
-void FLAC__lpc_compute_autocorrelation_asm_i386_sse_12(const real data[], unsigned data_len, unsigned lag, real autoc[]);
+void FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_4(const real data[], unsigned data_len, unsigned lag, real autoc[]);
+void FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_8(const real data[], unsigned data_len, unsigned lag, real autoc[]);
+void FLAC__lpc_compute_autocorrelation_asm_i386_sse_lag_12(const real data[], unsigned data_len, unsigned lag, real autoc[]);
 #endif
 #endif
 #endif