make the asm routine names more descriptive

diff --git a/src/libFLAC/i386/fixed_asm.nasm b/src/libFLAC/i386/fixed_asm.nasm
index fdb43185bb522abb30e56452f6ea170c370b5f5a..bebe6e691bc6612dc69bebc486aeb888773ac84a 100644 (file)
--- a/src/libFLAC/i386/fixed_asm.nasm
+++ b/src/libFLAC/i386/fixed_asm.nasm
@@ -20,7 +20,7 @@
 
        data_section
 
-cglobal FLAC__fixed_compute_best_predictor_asm
+cglobal FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov
 
        code_section
 
@@ -63,7 +63,7 @@ cglobal FLAC__fixed_compute_best_predictor_asm
 ;
 ;      return order;
 ; }
-FLAC__fixed_compute_best_predictor_asm:
+FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov:
 
        ; esp + 36 == data[]
        ; esp + 40 == data_len

diff --git a/src/libFLAC/i386/lpc_asm.nasm b/src/libFLAC/i386/lpc_asm.nasm
index 6fda42618e1afeb0abc409d39f2aa3ca6e45bed6..b81afb3c04f13b1a2fa5e69d6a23b710ab34aac9 100644 (file)
--- a/src/libFLAC/i386/lpc_asm.nasm
+++ b/src/libFLAC/i386/lpc_asm.nasm
@@ -20,8 +20,9 @@
 
        data_section
 
-cglobal FLAC__lpc_compute_autocorrelation_asm
-cglobal FLAC__lpc_restore_signal_asm
+cglobal FLAC__lpc_compute_autocorrelation_asm_i386
+cglobal FLAC__lpc_compute_autocorrelation_asm_i386_sse
+cglobal FLAC__lpc_restore_signal_asm_i386
 
        code_section
 
@@ -50,7 +51,7 @@ cglobal FLAC__lpc_restore_signal_asm
 ;      }
 ; }
 ;
-FLAC__lpc_compute_autocorrelation_asm:
+FLAC__lpc_compute_autocorrelation_asm_i386:
 
        ; esp + 20 == data[]
        ; esp + 24 == data_len
@@ -200,7 +201,7 @@ FLAC__lpc_compute_autocorrelation_asm:
        ret
 
 ;@@@ NOTE: this SSE version is not even tested yet and only works for lag == 8
-FLAC__lpc_compute_autocorrelation_sse:
+FLAC__lpc_compute_autocorrelation_asm_i386_sse:
 
        ; esp + 4 == data[]
        ; esp + 8 == data_len
@@ -209,6 +210,8 @@ FLAC__lpc_compute_autocorrelation_sse:
 
        ;       for(coeff = 0; coeff < lag; coeff++)
        ;               autoc[coeff] = 0.0;
+stmxcsr [esp+12]
+ret
        xorps   xmm6, xmm6
        xorps   xmm7, xmm7
 
@@ -280,7 +283,7 @@ FLAC__lpc_compute_autocorrelation_sse:
 ;              data[i] = residual[i] + (sum >> lp_quantization);
 ;      }
 ; }
-FLAC__lpc_restore_signal_asm:
+FLAC__lpc_restore_signal_asm_i386:
        ; [esp + 20] == residual[]
        ; [esp + 24] == data_len
        ; [esp + 28] == qlp_coeff[]