X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flzx.h;h=8a3968920f78d93c52c62c679ef4dca60a84bad5;hb=8d2bd90a2c9a151edc1619bf35be46b2fdda3e36;hp=027186976b675842650c0f810067fa719e8973e9;hpb=d0e7f039e4ab206b9fd973c983e3fb841fcd2bf2;p=wimlib

diff --git a/src/lzx.h b/src/lzx.h
index 02718697..8a396892 100644
--- a/src/lzx.h
+++ b/src/lzx.h
@@ -10,8 +10,7 @@
 #	define LZX_DEBUG(format, ...)
 #endif
 
-
-/* Constants, some defined by the LZX specification: */
+/* Constants, most of which are defined by the LZX specification: */
 
 /* The smallest and largest allowed match lengths. */
 #define LZX_MIN_MATCH                2
@@ -20,16 +19,17 @@
 /* Number of values an uncompressed literal byte can represent. */
 #define LZX_NUM_CHARS                256
 
-/* Each LZX block begins with 3 bits that determines the block type: */
+/* Each LZX block begins with 3 bits that determines the block type.  Below are
+ * the valid block types.  Values 0, and 4 through 7, are invalid. */
 #define LZX_BLOCKTYPE_VERBATIM       1
 #define LZX_BLOCKTYPE_ALIGNED        2
 #define LZX_BLOCKTYPE_UNCOMPRESSED   3
-/* values 0, and 4 through 7, are invalid. */
-
 
 #define LZX_NUM_PRIMARY_LENS         7	/* this one missing from spec! */
 
-/* Only valid for 32768 block size! */
+/* NOTE: There are really 51 position slots in the LZX format as a whole, but
+ * only 30 are needed to allow for the window to be up to 32768 bytes long,
+ * which is the maximum in the WIM format. */
 #define LZX_NUM_POSITION_SLOTS       30
 
 /* Read the LZX specification for information about the Huffman trees used in
@@ -49,16 +49,15 @@
 
 #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
 #define LZX_PRETREE_ELEMENT_SIZE	4
 
-
 #define LZX_ALIGNEDTREE_NUM_SYMBOLS	8
 #define LZX_ALIGNEDTREE_TABLEBITS	7
 #define LZX_ALIGNEDTREE_ELEMENT_SIZE 	3
@@ -71,22 +70,41 @@
  * 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 u8 lzx_extra_bits[51];
-extern const u32 lzx_position_base[51];
+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, uint compressed_len,
-			  void *uncompressed_data, uint uncompressed_len);
+extern int lzx_decompress(const void *compressed_data, unsigned compressed_len,
+			  void *uncompressed_data, unsigned uncompressed_len);
 
-extern int lzx_compress(const void *uncompressed_data, uint uncompressed_len,
-			void *compressed_data, uint *compressed_len_ret);
+extern int lzx_compress(const void *uncompressed_data, unsigned uncompressed_len,
+			void *compressed_data, unsigned *compressed_len_ret);
 
 #endif /* _WIMLIB_LZX_H */