add cident macro for defining function entry points

diff --git a/src/libFLAC/i386/cpu_asm.nasm b/src/libFLAC/i386/cpu_asm.nasm
index 7a41252..b674c4d 100644 (file)
--- a/src/libFLAC/i386/cpu_asm.nasm
+++ b/src/libFLAC/i386/cpu_asm.nasm
@@ -26,7 +26,8 @@ cglobal FLAC__cpu_info_asm_i386
 
 ; **********************************************************************
 ;
-FLAC__cpu_info_asm_i386:
+       ALIGN 16
+cident FLAC__cpu_info_asm_i386:
 
        push    ebx
 

diff --git a/src/libFLAC/i386/fixed_asm.nasm b/src/libFLAC/i386/fixed_asm.nasm
index bebe6e6..9e72a8f 100644 (file)
--- a/src/libFLAC/i386/fixed_asm.nasm
+++ b/src/libFLAC/i386/fixed_asm.nasm
@@ -63,7 +63,8 @@ cglobal FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov
 ;
 ;      return order;
 ; }
-FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov:
+       ALIGN 16
+cident 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 82302bc..375152d 100644 (file)
--- a/src/libFLAC/i386/lpc_asm.nasm
+++ b/src/libFLAC/i386/lpc_asm.nasm
@@ -52,7 +52,8 @@ cglobal FLAC__lpc_restore_signal_asm_i386_mmx
 ;      }
 ; }
 ;
-FLAC__lpc_compute_autocorrelation_asm_i386:
+       ALIGN 16
+cident FLAC__lpc_compute_autocorrelation_asm_i386:
 
        ; esp + 20 == data[]
        ; esp + 24 == data_len
@@ -202,7 +203,8 @@ FLAC__lpc_compute_autocorrelation_asm_i386:
        ret
 
 ;@@@ NOTE: this SSE version is not even tested yet and only works for lag == 8
-FLAC__lpc_compute_autocorrelation_asm_i386_sse:
+       ALIGN 16
+cident FLAC__lpc_compute_autocorrelation_asm_i386_sse:
 
        ; esp + 4 == data[]
        ; esp + 8 == data_len
@@ -285,7 +287,7 @@ ret
 ;      }
 ; }
        ALIGN   16
-FLAC__lpc_restore_signal_asm_i386:
+cident FLAC__lpc_restore_signal_asm_i386:
        ;[esp + 40]     data[]
        ;[esp + 36]     lp_quantization
        ;[esp + 32]     order
@@ -486,7 +488,7 @@ FLAC__lpc_restore_signal_asm_i386:
 ; the channel must be <= 16.  Especially note that this routine cannot be used
 ; for side-channel coded 16bps channels since the effective bps is 17.
        ALIGN   16
-FLAC__lpc_restore_signal_asm_i386_mmx:
+cident FLAC__lpc_restore_signal_asm_i386_mmx:
        ;[esp + 40]     data[]
        ;[esp + 36]     lp_quantization
        ;[esp + 32]     order

diff --git a/src/libFLAC/i386/nasm.h b/src/libFLAC/i386/nasm.h
index d5fc76a..dc184cb 100644 (file)
--- a/src/libFLAC/i386/nasm.h
+++ b/src/libFLAC/i386/nasm.h
@@ -51,3 +51,11 @@
                extern %1
        %endif
 %endmacro
+
+%imacro cident 1
+       %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
+               _%1
+       %else
+               %1
+       %endif
+%endmacro