X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flzx.h;h=8a3968920f78d93c52c62c679ef4dca60a84bad5;hb=406df77b8a9c2bb3318cf7737702eac27041e41e;hp=42ae5ce5c51b1198e8af3fa4d0366972b50079ca;hpb=fea0ee9f10fbcb85ff56ca06510e96186a7611ae;p=wimlib

diff --git a/src/lzx.h b/src/lzx.h
index 42ae5ce5..8a396892 100644
--- a/src/lzx.h
+++ b/src/lzx.h
@@ -49,10 +49,10 @@
 
 #define LZX_MAINTREE_NUM_SYMBOLS	 (LZX_NUM_CHARS + \
 					(LZX_NUM_POSITION_SLOTS << 3))
-#define LZX_MAINTREE_TABLEBITS		12
+#define LZX_MAINTREE_TABLEBITS		11
 
 #define LZX_LENTREE_NUM_SYMBOLS		249
-#define LZX_LENTREE_TABLEBITS		12
+#define LZX_LENTREE_TABLEBITS		10
 
 #define LZX_PRETREE_NUM_SYMBOLS		20
 #define LZX_PRETREE_TABLEBITS		6
@@ -70,16 +70,35 @@
  * though the blocks themselves are not this size, and the size of the actual
  * file resource in the WIM file is very likely to be something entirely
  * different as well.  */
-#define LZX_MAGIC_FILESIZE           12000000
+#define LZX_WIM_MAGIC_FILESIZE		12000000
 
+#define USE_LZX_EXTRA_BITS_ARRAY
+
+#ifdef USE_LZX_EXTRA_BITS_ARRAY
 extern const u8 lzx_extra_bits[LZX_NUM_POSITION_SLOTS];
+#endif
+
+/* Given the number of a LZX position slot, return the number of extra bits that
+ * are needed to encode the match offset. */
+static inline unsigned lzx_get_num_extra_bits(unsigned position_slot)
+{
+#ifdef USE_LZX_EXTRA_BITS_ARRAY
+	/* Use a table */
+	return lzx_extra_bits[position_slot];
+#else
+	/* Calculate directly using a shift and subtraction. */
+	wimlib_assert(position_slot >= 2 && position_slot <= 37);
+	return (position_slot >> 1) - 1;
+#endif
+}
+
 extern const u32 lzx_position_base[LZX_NUM_POSITION_SLOTS];
 
 /* Least-recently used queue for match offsets. */
 struct lru_queue {
-	int R0;
-	int R1;
-	int R2;
+	u32 R0;
+	u32 R1;
+	u32 R2;
 };
 
 extern int lzx_decompress(const void *compressed_data, unsigned compressed_len,