Various cleanups

[wimlib] / include / wimlib / lzx_common.h

diff --git a/include/wimlib/lzx_common.h b/include/wimlib/lzx_common.h
index b3ae85a72b88971889d4501553ef7afd5c141425..ed9d0bbeeebdabc350e06382a4bdac07f4d2ee3b 100644 (file)
--- a/include/wimlib/lzx_common.h
+++ b/include/wimlib/lzx_common.h
@@ -7,64 +7,67 @@
 #ifndef _LZX_COMMON_H
 #define _LZX_COMMON_H
 
-#include "wimlib/assert.h"
 #include "wimlib/bitops.h"
-#include "wimlib/compiler.h"
 #include "wimlib/lzx_constants.h"
-#include "wimlib/util.h"
 #include "wimlib/types.h"
 
 //#define ENABLE_LZX_DEBUG
 #ifdef ENABLE_LZX_DEBUG
-#       define LZX_ASSERT wimlib_assert
+#  include "wimlib/assert.h"
+#  define LZX_ASSERT wimlib_assert
 #else
-#      define LZX_ASSERT(...)
+#  define LZX_ASSERT(...)
 #endif
 
-extern const u32 lzx_offset_slot_base[LZX_MAX_OFFSET_SLOTS];
+extern const u32 lzx_offset_slot_base[LZX_MAX_OFFSET_SLOTS + 1];
 
 extern const u8 lzx_extra_offset_bits[LZX_MAX_OFFSET_SLOTS];
 
-/* Returns the LZX offset slot that corresponds to a given adjusted offset.
+/*
+ * Return the offset slot for the specified match offset.
+ *
+ * This returns the smallest i such that:
  *
- * Logically, this returns the smallest i such that
- * adjusted_offset >= lzx_offset_slot_base[i].
+ *     offset + LZX_OFFSET_ADJUSTMENT >= lzx_offset_slot_base[i]
  *
- * The actual implementation below takes advantage of the regularity of the
- * numbers in the lzx_offset_slot_base array to calculate the slot directly from
- * the adjusted offset without actually looking at the array.
+ * However, the actual implementation below takes advantage of the regularity of
+ * the offset slot bases to calculate the slot directly from the adjusted offset
+ * without actually looking at the array.
  */
 static inline unsigned
-lzx_get_offset_slot_raw(u32 adjusted_offset)
+lzx_get_offset_slot(u32 offset)
 {
+       u32 adjusted_offset = offset + LZX_OFFSET_ADJUSTMENT;
        if (adjusted_offset >= 196608) {
                return (adjusted_offset >> 17) + 34;
        } else {
-               LZX_ASSERT(2 <= adjusted_offset && adjusted_offset < 655360);
                unsigned mssb_idx = fls32(adjusted_offset);
                return (mssb_idx << 1) |
                        ((adjusted_offset >> (mssb_idx - 1)) & 1);
        }
 }
 
-extern unsigned lzx_get_window_order(size_t max_block_size);
-
-extern unsigned lzx_get_num_main_syms(unsigned window_order);
-
-/* Least-recently used queue for match offsets.  */
-struct lzx_lru_queue {
-       u32 R[LZX_NUM_RECENT_OFFSETS];
-} _aligned_attribute(sizeof(unsigned long));
+static inline unsigned
+lzx_main_symbol_for_literal(unsigned literal)
+{
+       return literal;
+}
 
-/* Initialize the LZX least-recently-used match offset queue at the beginning of
- * a new window for either decompression or compression.  */
-static inline void
-lzx_lru_queue_init(struct lzx_lru_queue *queue)
+static inline unsigned
+lzx_main_symbol_for_match(unsigned offset_slot, unsigned len_header)
 {
-       for (unsigned i = 0; i < LZX_NUM_RECENT_OFFSETS; i++)
-               queue->R[i] = 1;
+       return LZX_NUM_CHARS + (offset_slot * LZX_NUM_LEN_HEADERS) + len_header;
 }
 
+extern unsigned
+lzx_get_window_order(size_t max_bufsize);
+
+extern unsigned
+lzx_get_num_offset_slots(unsigned window_order);
+
+extern unsigned
+lzx_get_num_main_syms(unsigned window_order);
+
 extern void
 lzx_do_e8_preprocessing(u8 *data, u32 size);