Attachment #131458: textrel fix for flac for bug #193222

/* this is by far the most heavily used reader call.  it ain't pretty but it's fast */

/* this is by far the most heavily used reader call.  it ain't pretty but it's fast */

/* a lot of the logic is copied, then adapted, from FLAC__bitreader_read_unary_unsigned() and FLAC__bitreader_read_raw_uint32() */

/* a lot of the logic is copied, then adapted, from FLAC__bitreader_read_unary_unsigned() and FLAC__bitreader_read_raw_uint32() */

/* OPT: possibly faster version for use with MSVC */

/* OPT: possibly faster version for use with MSVC */

#ifdef _MSC_VER

#ifdef _MSC_VER

{

{

	data_section

	data_section

cextern bitreader_read_from_client_	; FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br);

cextern bitreader_read_from_client_	; FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br);

cglobal FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap

cglobal FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap

; **********************************************************************

; **********************************************************************

;

;

;

;

; Some details like assertions and other checking is performed by the caller.

; Some details like assertions and other checking is performed by the caller.

	ALIGN 16

	ALIGN 16

	; the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it

	; the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it

	;; peppered throughout the code at major checkpoints are keys like this as to where things are at that point in time

	;; peppered throughout the code at major checkpoints are keys like this as to where things are at that point in time

	;; [esp + 16]	unsigned parameter

	;; [esp + 16]	unsigned parameter

	;; [esp + 12]	unsigned nvals

	;; [esp + 12]	unsigned nvals

	;; [esp + 8]	int vals[]

	;; [esp + 8]	int vals[]

	bswap	edx			;		edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier

	bswap	edx			;		edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier

	mov	ecx, [ebp + 28]		;		ecx <- br->crc16_align

	mov	ecx, [ebp + 28]		;		ecx <- br->crc16_align

	mov	eax, [ebp + 24]		;		ax <- br->read_crc (a.k.a. crc)

	mov	eax, [ebp + 24]		;		ax <- br->read_crc (a.k.a. crc)

	;; eax (ax)	crc a.k.a. br->read_crc

	;; eax (ax)	crc a.k.a. br->read_crc

	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]

	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]

	;; ecx		br->crc16_align

	;; ecx		br->crc16_align

	bswap	edx			;		edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier

	bswap	edx			;		edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier

	mov	ecx, [ebp + 28]		;		ecx <- br->crc16_align

	mov	ecx, [ebp + 28]		;		ecx <- br->crc16_align

	mov	eax, [ebp + 24]		;		ax <- br->read_crc (a.k.a. crc)

	mov	eax, [ebp + 24]		;		ax <- br->read_crc (a.k.a. crc)

	;; eax (ax)	crc a.k.a. br->read_crc

	;; eax (ax)	crc a.k.a. br->read_crc

	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]

	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]

	;; ecx		br->crc16_align

	;; ecx		br->crc16_align

%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE

%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE

	call	_bitreader_read_from_client_

	call	_bitreader_read_from_client_

%else

%else

	call	bitreader_read_from_client_

	call	bitreader_read_from_client_

%endif

%endif

	pop	edx			;     /* discard, unused */

	pop	edx			;     /* discard, unused */

	pop	ecx			;     /* restore */

	pop	ecx			;     /* restore */

	mov	esi, [ebp + 16]		;     cwords = br->consumed_words;

	mov	esi, [ebp + 16]		;     cwords = br->consumed_words;

%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE

%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE

	call	_bitreader_read_from_client_

	call	_bitreader_read_from_client_

%else

%else

	call	bitreader_read_from_client_

	call	bitreader_read_from_client_

%endif

%endif

	pop	edx			;       /* discard, unused */

	pop	edx			;       /* discard, unused */

	pop	ecx			;       /* restore */

	pop	ecx			;       /* restore */

	mov	esi, [ebp + 16]		;       cwords = br->consumed_words;

	mov	esi, [ebp + 16]		;       cwords = br->consumed_words;

	bswap	edx			;		edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier

	bswap	edx			;		edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier

	mov	ecx, [ebp + 28]		;		ecx <- br->crc16_align

	mov	ecx, [ebp + 28]		;		ecx <- br->crc16_align

	mov	eax, [ebp + 24]		;		ax <- br->read_crc (a.k.a. crc)

	mov	eax, [ebp + 24]		;		ax <- br->read_crc (a.k.a. crc)

	;; eax (ax)	crc a.k.a. br->read_crc

	;; eax (ax)	crc a.k.a. br->read_crc

	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]

	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]

	;; ecx		br->crc16_align

	;; ecx		br->crc16_align

; **********************************************************************

; **********************************************************************

;

;

; void precompute_partition_info_sums_32bit_(

; void precompute_partition_info_sums_32bit_(

; 	const FLAC__int32 residual[],

; 	const FLAC__int32 residual[],

; 	FLAC__uint64 abs_residual_partition_sums[],

; 	FLAC__uint64 abs_residual_partition_sums[],

FLAC__bool FLAC__bitreader_read_byte_block_aligned_no_crc(FLAC__BitReader *br, FLAC__byte *val, unsigned nvals); /* WATCHOUT: does not CRC the read data! */

FLAC__bool FLAC__bitreader_read_byte_block_aligned_no_crc(FLAC__BitReader *br, FLAC__byte *val, unsigned nvals); /* WATCHOUT: does not CRC the read data! */

FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *val);

FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *val);

FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter);

FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter);

#ifndef FLAC__NO_ASM

#ifndef FLAC__NO_ASM

#  ifdef FLAC__CPU_IA32

#  ifdef FLAC__CPU_IA32

#    ifdef FLAC__HAS_NASM

#    ifdef FLAC__HAS_NASM

#    endif

#    endif

#  endif

#  endif

#endif

#endif

	void (*local_lpc_restore_signal_16bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);

	void (*local_lpc_restore_signal_16bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);

	/* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit), AND order <= 8: */

	/* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit), AND order <= 8: */

	void (*local_lpc_restore_signal_16bit_order8)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);

	void (*local_lpc_restore_signal_16bit_order8)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);

	void *client_data;

	void *client_data;

	FILE *file; /* only used if FLAC__stream_decoder_init_file()/FLAC__stream_decoder_init_file() called, else NULL */

	FILE *file; /* only used if FLAC__stream_decoder_init_file()/FLAC__stream_decoder_init_file() called, else NULL */

	FLAC__BitReader *input;

	FLAC__BitReader *input;

		if(rice_parameter < pesc) {

		if(rice_parameter < pesc) {

			partitioned_rice_contents->raw_bits[partition] = 0;

			partitioned_rice_contents->raw_bits[partition] = 0;

			u = (partition_order == 0 || partition > 0)? partition_samples : partition_samples - predictor_order;

			u = (partition_order == 0 || partition > 0)? partition_samples : partition_samples - predictor_order;

				return false; /* read_callback_ sets the state for us */

				return false; /* read_callback_ sets the state for us */

			sample += u;

			sample += u;

		}

		}