X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flzms-decompress.c;h=b61b0e0fb7f25df131b519631efd13e445744105;hb=91ba045392c18b7e12add95158cd2ab67c1505ae;hp=83629008cea3aea19287bde073a7227f5ea629f5;hpb=62e209e9aeaa36ba9e3c2a174428805b7264e0e7;p=wimlib

diff --git a/src/lzms-decompress.c b/src/lzms-decompress.c
index 83629008..b61b0e0f 100644
--- a/src/lzms-decompress.c
+++ b/src/lzms-decompress.c
@@ -194,7 +194,6 @@
 #include "wimlib/compress_common.h"
 #include "wimlib/decompressor_ops.h"
 #include "wimlib/decompress_common.h"
-#include "wimlib/error.h"
 #include "wimlib/lzms.h"
 #include "wimlib/util.h"
 
@@ -284,6 +283,8 @@ struct lzms_huffman_decoder {
 	 * read using this decoder.  */
 	const u32 *slot_base_tab;
 
+	const u8 *extra_bits_tab;
+
 	/* Number of symbols that have been read using this code far.  Reset to
 	 * 0 whenever the code is rebuilt.  */
 	u32 num_syms_read;
@@ -346,8 +347,8 @@ struct lzms_decompressor {
 	struct lzms_huffman_decoder delta_power_decoder;
 	struct lzms_huffman_decoder delta_offset_decoder;
 
-        /* LRU (least-recently-used) queues for match information.  */
-        struct lzms_lru_queues lru;
+	/* LRU (least-recently-used) queues for match information.  */
+	struct lzms_lru_queues lru;
 
 	/* Used for postprocessing.  */
 	s32 last_target_usages[65536];
@@ -628,19 +629,19 @@ lzms_decode_value(struct lzms_huffman_decoder *dec)
 	unsigned num_extra_bits;
 	u32 extra_bits;
 
+	LZMS_ASSERT(dec->slot_base_tab != NULL);
+	LZMS_ASSERT(dec->extra_bits_tab != NULL);
+
 	/* Read the slot (position slot, length slot, etc.), which is encoded as
 	 * a Huffman symbol.  */
 	slot = lzms_huffman_decode_symbol(dec);
 
-	LZMS_ASSERT(dec->slot_base_tab != NULL);
-
 	/* Get the number of extra bits needed to represent the range of values
 	 * that share the slot.  */
-	num_extra_bits = bsr32(dec->slot_base_tab[slot + 1] -
-			       dec->slot_base_tab[slot]);
+	num_extra_bits = dec->extra_bits_tab[slot];
 
-	/* Read the number of extra bits and add them to the slot to form the
-	 * final decoded value.  */
+	/* Read the number of extra bits and add them to the slot base to form
+	 * the final decoded value.  */
 	extra_bits = lzms_input_bitstream_read_bits(dec->is, num_extra_bits);
 	return dec->slot_base_tab[slot] + extra_bits;
 }
@@ -832,7 +833,7 @@ lzms_decode_item(struct lzms_decompressor *ctx)
 	if (ret)
 		return ret;
 
-        lzms_update_lru_queues(&ctx->lru);
+	lzms_update_lru_queues(&ctx->lru);
 	return 0;
 }
 
@@ -852,11 +853,14 @@ lzms_init_range_decoder(struct lzms_range_decoder *dec,
 static void
 lzms_init_huffman_decoder(struct lzms_huffman_decoder *dec,
 			  struct lzms_input_bitstream *is,
-			  const u32 *slot_base_tab, unsigned num_syms,
+			  const u32 *slot_base_tab,
+			  const u8 *extra_bits_tab,
+			  unsigned num_syms,
 			  unsigned rebuild_freq)
 {
 	dec->is = is;
 	dec->slot_base_tab = slot_base_tab;
+	dec->extra_bits_tab = extra_bits_tab;
 	dec->num_syms = num_syms;
 	dec->num_syms_read = rebuild_freq;
 	dec->rebuild_freq = rebuild_freq;
@@ -895,23 +899,29 @@ lzms_init_decompressor(struct lzms_decompressor *ctx,
 	/* Initialize Huffman decoders for each alphabet used in the compressed
 	 * representation.  */
 	lzms_init_huffman_decoder(&ctx->literal_decoder, &ctx->is,
-				  NULL, LZMS_NUM_LITERAL_SYMS,
+				  NULL, NULL, LZMS_NUM_LITERAL_SYMS,
 				  LZMS_LITERAL_CODE_REBUILD_FREQ);
 
 	lzms_init_huffman_decoder(&ctx->lz_offset_decoder, &ctx->is,
-				  lzms_position_slot_base, num_position_slots,
+				  lzms_position_slot_base,
+				  lzms_extra_position_bits,
+				  num_position_slots,
 				  LZMS_LZ_OFFSET_CODE_REBUILD_FREQ);
 
 	lzms_init_huffman_decoder(&ctx->length_decoder, &ctx->is,
-				  lzms_length_slot_base, LZMS_NUM_LEN_SYMS,
+				  lzms_length_slot_base,
+				  lzms_extra_length_bits,
+				  LZMS_NUM_LEN_SYMS,
 				  LZMS_LENGTH_CODE_REBUILD_FREQ);
 
 	lzms_init_huffman_decoder(&ctx->delta_offset_decoder, &ctx->is,
-				  lzms_position_slot_base, num_position_slots,
+				  lzms_position_slot_base,
+				  lzms_extra_position_bits,
+				  num_position_slots,
 				  LZMS_DELTA_OFFSET_CODE_REBUILD_FREQ);
 
 	lzms_init_huffman_decoder(&ctx->delta_power_decoder, &ctx->is,
-				  NULL, LZMS_NUM_DELTA_POWER_SYMS,
+				  NULL, NULL, LZMS_NUM_DELTA_POWER_SYMS,
 				  LZMS_DELTA_POWER_CODE_REBUILD_FREQ);
 
 
@@ -938,7 +948,7 @@ lzms_init_decompressor(struct lzms_decompressor *ctx,
 					&ctx->rd, LZMS_NUM_DELTA_REPEAT_MATCH_STATES);
 
 	/* Initialize LRU match information.  */
-        lzms_init_lru_queues(&ctx->lru);
+	lzms_init_lru_queues(&ctx->lru);
 
 	LZMS_DEBUG("Decompressor successfully initialized");
 }
@@ -1031,8 +1041,8 @@ lzms_create_decompressor(size_t max_block_size,
 	if (ctx == NULL)
 		return WIMLIB_ERR_NOMEM;
 
-	/* Initialize position and length slot bases if not done already.  */
-	lzms_init_slot_bases();
+	/* Initialize position and length slot data if not done already.  */
+	lzms_init_slots();
 
 	*ctx_ret = ctx;
 	return 0;