#include <string.h>
-#include "wimlib/bitops.h"
-#include "wimlib/endianness.h"
-#include "wimlib/lzx_common.h"
-#include "wimlib/unaligned.h"
-#include "wimlib/util.h"
-
#ifdef __SSE2__
# include <emmintrin.h>
#endif
# include <immintrin.h>
#endif
+#include "wimlib/bitops.h"
+#include "wimlib/endianness.h"
+#include "wimlib/lzx_common.h"
+#include "wimlib/unaligned.h"
+#include "wimlib/util.h"
+
/* Mapping: offset slot => first match offset that uses that offset slot.
*/
const u32 lzx_offset_slot_base[LZX_MAX_OFFSET_SLOTS + 1] = {
/* Mapping: offset slot => how many extra bits must be read and added to the
* corresponding offset slot base to decode the match offset. */
-const u8 lzx_extra_offset_bits[LZX_MAX_OFFSET_SLOTS + 1] = {
+const u8 lzx_extra_offset_bits[LZX_MAX_OFFSET_SLOTS] = {
0 , 0 , 0 , 0 , 1 ,
1 , 2 , 2 , 3 , 3 ,
4 , 4 , 5 , 5 , 6 ,
16, 17, 17, 17, 17,
17, 17, 17, 17, 17,
17, 17, 17, 17, 17,
- 17
};
/* Round the specified buffer size up to the next valid LZX window size, and
return max(order, LZX_MIN_WINDOW_ORDER);
}
+/* Given a valid LZX window order, return the number of symbols that will exist
+ * in the main Huffman code. */
unsigned
-lzx_get_num_offset_slots(unsigned window_order)
+lzx_get_num_main_syms(unsigned window_order)
{
/* Note: one would expect that the maximum match offset would be
* 'window_size - LZX_MIN_MATCH_LEN', which would occur if the first two
* disallows this case. This reduces the number of needed offset slots
* by 1. */
u32 window_size = (u32)1 << window_order;
- u32 max_offset = window_size - LZX_MIN_MATCH_LEN - 1;
- return 1 + lzx_get_offset_slot(max_offset);
-}
+ u32 max_adjusted_offset = (window_size - LZX_MIN_MATCH_LEN - 1) +
+ LZX_OFFSET_ADJUSTMENT;
+ unsigned num_offset_slots = 30;
+ while (max_adjusted_offset >= lzx_offset_slot_base[num_offset_slots])
+ num_offset_slots++;
-/* Given a valid LZX window order, return the number of symbols that will exist
- * in the main Huffman code. */
-unsigned
-lzx_get_num_main_syms(unsigned window_order)
-{
- return LZX_NUM_CHARS + (lzx_get_num_offset_slots(window_order) *
- LZX_NUM_LEN_HEADERS);
+ return LZX_NUM_CHARS + (num_offset_slots * LZX_NUM_LEN_HEADERS);
}
static void
}
void
-lzx_do_e8_preprocessing(u8 *data, u32 size)
+lzx_preprocess(u8 *data, u32 size)
{
lzx_e8_filter(data, size, do_translate_target);
}
void
-lzx_undo_e8_preprocessing(u8 *data, u32 size)
+lzx_postprocess(u8 *data, u32 size)
{
lzx_e8_filter(data, size, undo_translate_target);
}