X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flzms_decompress.c;h=4dd36627b37957faae16a14f639f27bf313e9f20;hb=a9b5ef0483d60ef1d8bf6014f223dfeaa68c091e;hp=1ea0ac6da3d1e87141ba5252dd33fc14736e2aa1;hpb=32158cb5b4df58eb71a1986762e5aaf12bce9d30;p=wimlib diff --git a/src/lzms_decompress.c b/src/lzms_decompress.c index 1ea0ac6d..4dd36627 100644 --- a/src/lzms_decompress.c +++ b/src/lzms_decompress.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2013, 2014, 2015 Eric Biggers + * Copyright (C) 2013-2016 Eric Biggers * * This file is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free @@ -257,10 +257,10 @@ /* The TABLEBITS values can be changed; they only affect decoding speed. */ #define LZMS_LITERAL_TABLEBITS 10 -#define LZMS_LENGTH_TABLEBITS 10 -#define LZMS_LZ_OFFSET_TABLEBITS 10 -#define LZMS_DELTA_OFFSET_TABLEBITS 10 -#define LZMS_DELTA_POWER_TABLEBITS 8 +#define LZMS_LENGTH_TABLEBITS 9 +#define LZMS_LZ_OFFSET_TABLEBITS 11 +#define LZMS_DELTA_OFFSET_TABLEBITS 11 +#define LZMS_DELTA_POWER_TABLEBITS 7 struct lzms_range_decoder { @@ -323,37 +323,37 @@ struct lzms_decompressor { struct lzms_probabilites probs; - u16 literal_decode_table[(1 << LZMS_LITERAL_TABLEBITS) + - (2 * LZMS_NUM_LITERAL_SYMS)] - _aligned_attribute(DECODE_TABLE_ALIGNMENT); + DECODE_TABLE(literal_decode_table, LZMS_NUM_LITERAL_SYMS, + LZMS_LITERAL_TABLEBITS, LZMS_MAX_CODEWORD_LENGTH); u32 literal_freqs[LZMS_NUM_LITERAL_SYMS]; struct lzms_huffman_rebuild_info literal_rebuild_info; - u16 lz_offset_decode_table[(1 << LZMS_LZ_OFFSET_TABLEBITS) + - ( 2 * LZMS_MAX_NUM_OFFSET_SYMS)] - _aligned_attribute(DECODE_TABLE_ALIGNMENT); + DECODE_TABLE(lz_offset_decode_table, LZMS_MAX_NUM_OFFSET_SYMS, + LZMS_LZ_OFFSET_TABLEBITS, LZMS_MAX_CODEWORD_LENGTH); u32 lz_offset_freqs[LZMS_MAX_NUM_OFFSET_SYMS]; struct lzms_huffman_rebuild_info lz_offset_rebuild_info; - u16 length_decode_table[(1 << LZMS_LENGTH_TABLEBITS) + - (2 * LZMS_NUM_LENGTH_SYMS)] - _aligned_attribute(DECODE_TABLE_ALIGNMENT); + DECODE_TABLE(length_decode_table, LZMS_NUM_LENGTH_SYMS, + LZMS_LENGTH_TABLEBITS, LZMS_MAX_CODEWORD_LENGTH); u32 length_freqs[LZMS_NUM_LENGTH_SYMS]; struct lzms_huffman_rebuild_info length_rebuild_info; - u16 delta_offset_decode_table[(1 << LZMS_DELTA_OFFSET_TABLEBITS) + - (2 * LZMS_MAX_NUM_OFFSET_SYMS)] - _aligned_attribute(DECODE_TABLE_ALIGNMENT); + DECODE_TABLE(delta_offset_decode_table, LZMS_MAX_NUM_OFFSET_SYMS, + LZMS_DELTA_OFFSET_TABLEBITS, LZMS_MAX_CODEWORD_LENGTH); u32 delta_offset_freqs[LZMS_MAX_NUM_OFFSET_SYMS]; struct lzms_huffman_rebuild_info delta_offset_rebuild_info; - u16 delta_power_decode_table[(1 << LZMS_DELTA_POWER_TABLEBITS) + - (2 * LZMS_NUM_DELTA_POWER_SYMS)] - _aligned_attribute(DECODE_TABLE_ALIGNMENT); + DECODE_TABLE(delta_power_decode_table, LZMS_NUM_DELTA_POWER_SYMS, + LZMS_DELTA_POWER_TABLEBITS, LZMS_MAX_CODEWORD_LENGTH); u32 delta_power_freqs[LZMS_NUM_DELTA_POWER_SYMS]; struct lzms_huffman_rebuild_info delta_power_rebuild_info; - u32 codewords[LZMS_MAX_NUM_SYMS]; + /* Temporary space for lzms_build_huffman_code() */ + union { + u32 codewords[LZMS_MAX_NUM_SYMS]; + DECODE_TABLE_WORKING_SPACE(working_space, LZMS_MAX_NUM_SYMS, + LZMS_MAX_CODEWORD_LENGTH); + }; }; // struct @@ -376,7 +376,7 @@ lzms_input_bitstream_init(struct lzms_input_bitstream *is, /* Ensure that at least @num_bits bits are in the bitbuffer variable. * @num_bits cannot be more than 32. */ -static inline void +static forceinline void lzms_ensure_bits(struct lzms_input_bitstream *is, unsigned num_bits) { unsigned avail; @@ -408,14 +408,14 @@ lzms_ensure_bits(struct lzms_input_bitstream *is, unsigned num_bits) } /* Get @num_bits bits from the bitbuffer variable. */ -static inline bitbuf_t +static forceinline bitbuf_t lzms_peek_bits(struct lzms_input_bitstream *is, unsigned num_bits) { return (is->bitbuf >> 1) >> (BITBUF_NBITS - num_bits - 1); } /* Remove @num_bits bits from the bitbuffer variable. */ -static inline void +static forceinline void lzms_remove_bits(struct lzms_input_bitstream *is, unsigned num_bits) { is->bitbuf <<= num_bits; @@ -423,7 +423,7 @@ lzms_remove_bits(struct lzms_input_bitstream *is, unsigned num_bits) } /* Remove and return @num_bits bits from the bitbuffer variable. */ -static inline bitbuf_t +static forceinline bitbuf_t lzms_pop_bits(struct lzms_input_bitstream *is, unsigned num_bits) { bitbuf_t bits = lzms_peek_bits(is, num_bits); @@ -432,7 +432,7 @@ lzms_pop_bits(struct lzms_input_bitstream *is, unsigned num_bits) } /* Read @num_bits bits from the input bitstream. */ -static inline bitbuf_t +static forceinline bitbuf_t lzms_read_bits(struct lzms_input_bitstream *is, unsigned num_bits) { lzms_ensure_bits(is, num_bits); @@ -457,7 +457,7 @@ lzms_range_decoder_init(struct lzms_range_decoder *rd, * probability entry to use. The state and probability entry will be updated * based on the decoded bit. */ -static inline int +static forceinline int lzms_decode_bit(struct lzms_range_decoder *rd, u32 *state_p, u32 num_states, struct lzms_probability_entry *probs) { @@ -522,7 +522,8 @@ lzms_build_huffman_code(struct lzms_huffman_rebuild_info *rebuild_info) rebuild_info->num_syms, rebuild_info->table_bits, (u8 *)rebuild_info->decode_table, - LZMS_MAX_CODEWORD_LENGTH); + LZMS_MAX_CODEWORD_LENGTH, + (u16 *)rebuild_info->codewords); rebuild_info->num_syms_until_rebuild = rebuild_info->rebuild_freq; } @@ -594,46 +595,39 @@ lzms_rebuild_huffman_code(struct lzms_huffman_rebuild_info *rebuild_info) lzms_dilute_symbol_frequencies(rebuild_info->freqs, rebuild_info->num_syms); } -static inline unsigned +/* XXX: mostly copied from read_huffsym() in decompress_common.h because LZMS + * needs its own bitstream */ +static forceinline unsigned lzms_decode_huffman_symbol(struct lzms_input_bitstream *is, u16 decode_table[], unsigned table_bits, u32 freqs[], struct lzms_huffman_rebuild_info *rebuild_info) { - unsigned key_bits; unsigned entry; - unsigned sym; + unsigned symbol; + unsigned length; lzms_ensure_bits(is, LZMS_MAX_CODEWORD_LENGTH); - /* Index the decode table by the next table_bits bits of the input. */ - key_bits = lzms_peek_bits(is, table_bits); - entry = decode_table[key_bits]; - if (likely(entry < 0xC000)) { - /* Fast case: The decode table directly provided the symbol and - * codeword length. The low 11 bits are the symbol, and the - * high 5 bits are the codeword length. */ - lzms_remove_bits(is, entry >> 11); - sym = entry & 0x7FF; - } else { - /* Slow case: The codeword for the symbol is longer than - * table_bits, so the symbol does not have an entry directly in - * the first (1 << table_bits) entries of the decode table. - * Traverse the appropriate binary tree bit-by-bit in order to - * decode the symbol. */ + entry = decode_table[lzms_peek_bits(is, table_bits)]; + symbol = entry >> DECODE_TABLE_SYMBOL_SHIFT; + length = entry & DECODE_TABLE_LENGTH_MASK; + + if (entry >= (1U << (table_bits + DECODE_TABLE_SYMBOL_SHIFT))) { lzms_remove_bits(is, table_bits); - do { - key_bits = (entry & 0x3FFF) + lzms_pop_bits(is, 1); - } while ((entry = decode_table[key_bits]) >= 0xC000); - sym = entry; + entry = decode_table[symbol + lzms_peek_bits(is, length)]; + symbol = entry >> DECODE_TABLE_SYMBOL_SHIFT; + length = entry & DECODE_TABLE_LENGTH_MASK; } - freqs[sym]++; + lzms_remove_bits(is, length); + + freqs[symbol]++; if (--rebuild_info->num_syms_until_rebuild == 0) lzms_rebuild_huffman_code(rebuild_info); - return sym; + return symbol; } -static inline unsigned +static forceinline unsigned lzms_decode_literal(struct lzms_decompressor *d, struct lzms_input_bitstream *is) { @@ -644,7 +638,7 @@ lzms_decode_literal(struct lzms_decompressor *d, &d->literal_rebuild_info); } -static inline u32 +static forceinline u32 lzms_decode_lz_offset(struct lzms_decompressor *d, struct lzms_input_bitstream *is) { @@ -657,7 +651,7 @@ lzms_decode_lz_offset(struct lzms_decompressor *d, lzms_read_bits(is, lzms_extra_offset_bits[slot]); } -static inline u32 +static forceinline u32 lzms_decode_length(struct lzms_decompressor *d, struct lzms_input_bitstream *is) { @@ -674,7 +668,7 @@ lzms_decode_length(struct lzms_decompressor *d, return length; } -static inline u32 +static forceinline u32 lzms_decode_delta_offset(struct lzms_decompressor *d, struct lzms_input_bitstream *is) { @@ -687,7 +681,7 @@ lzms_decode_delta_offset(struct lzms_decompressor *d, lzms_read_bits(is, lzms_extra_offset_bits[slot]); } -static inline unsigned +static forceinline unsigned lzms_decode_delta_power(struct lzms_decompressor *d, struct lzms_input_bitstream *is) { @@ -834,12 +828,10 @@ lzms_decompress(const void * const restrict in, const size_t in_nbytes, length = lzms_decode_length(d, &is); - if (unlikely(length > out_end - out_next)) - return -1; - if (unlikely(offset > out_next - (u8 *)out)) + if (unlikely(lz_copy(length, offset, out, out_next, out_end, + LZMS_MIN_MATCH_LENGTH))) return -1; - lz_copy(out_next, length, offset, out_end, LZMS_MIN_MATCH_LENGTH); out_next += length; } else { /* Delta match */