Commit 034d38e7 authored by Josh Coalson's avatar Josh Coalson
Browse files

gate i386 code with FLAC__HAS_NASM

parent 2d071a6b
...@@ -329,6 +329,7 @@ FLAC__EncoderState FLAC__encoder_init(FLAC__Encoder *encoder, FLAC__EncoderWrite ...@@ -329,6 +329,7 @@ FLAC__EncoderState FLAC__encoder_init(FLAC__Encoder *encoder, FLAC__EncoderWrite
if(encoder->guts->cpuinfo.use_asm) { if(encoder->guts->cpuinfo.use_asm) {
#ifdef FLAC__CPU_IA32 #ifdef FLAC__CPU_IA32
assert(encoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32); assert(encoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
#ifdef FLAC__HAS_NASM
#if 0 #if 0
/* @@@ SSE version not working yet */ /* @@@ SSE version not working yet */
if(encoder->guts->cpuinfo.data.ia32.sse) if(encoder->guts->cpuinfo.data.ia32.sse)
...@@ -341,6 +342,7 @@ fprintf(stderr,"@@@ got _asm_i386 of lpc_compute_autocorrelation()\n"); ...@@ -341,6 +342,7 @@ fprintf(stderr,"@@@ got _asm_i386 of lpc_compute_autocorrelation()\n");
{ {
encoder->guts->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov; encoder->guts->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov;
fprintf(stderr,"@@@ got _asm_i386_mmx_cmov of fixed_compute_best_predictor()\n");} fprintf(stderr,"@@@ got _asm_i386_mmx_cmov of fixed_compute_best_predictor()\n");}
#endif
#endif #endif
} }
......
...@@ -170,6 +170,7 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init( ...@@ -170,6 +170,7 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init(
if(decoder->guts->cpuinfo.use_asm) { if(decoder->guts->cpuinfo.use_asm) {
#ifdef FLAC__CPU_IA32 #ifdef FLAC__CPU_IA32
assert(decoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32); assert(decoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
#ifdef FLAC__HAS_NASM
#if 0 #if 0
/* @@@ MMX version needs bps check */ /* @@@ MMX version needs bps check */
if(decoder->guts->cpuinfo.data.ia32.mmx && @@@bps check here@@@) if(decoder->guts->cpuinfo.data.ia32.mmx && @@@bps check here@@@)
...@@ -178,6 +179,7 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init( ...@@ -178,6 +179,7 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init(
#endif #endif
fprintf(stderr,"@@@ got _asm_i386 of lpc_restore_signal()\n"); fprintf(stderr,"@@@ got _asm_i386 of lpc_restore_signal()\n");
decoder->guts->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_i386; decoder->guts->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_i386;
#endif
#endif #endif
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment