X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flzx_common.c;h=f5c8f89a7a0471202c752efd384a6f8c811eadb9;hb=18f09fc4fa05185897b2c3789f90cc8e3fd872c8;hp=0993f60756d869dccad03a17ed54714f77a32056;hpb=3e8aa757aaa63297f0d54007adf46411778fb6a8;p=wimlib diff --git a/src/lzx_common.c b/src/lzx_common.c index 0993f607..f5c8f89a 100644 --- a/src/lzx_common.c +++ b/src/lzx_common.c @@ -25,12 +25,6 @@ #include -#include "wimlib/bitops.h" -#include "wimlib/endianness.h" -#include "wimlib/lzx_common.h" -#include "wimlib/unaligned.h" -#include "wimlib/util.h" - #ifdef __SSE2__ # include #endif @@ -39,6 +33,12 @@ # include #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] = { @@ -57,7 +57,7 @@ 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 , @@ -68,7 +68,6 @@ const u8 lzx_extra_offset_bits[LZX_MAX_OFFSET_SLOTS + 1] = { 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 @@ -90,8 +89,10 @@ lzx_get_window_order(size_t max_bufsize) 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 @@ -99,17 +100,13 @@ lzx_get_num_offset_slots(unsigned window_order) * 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 @@ -117,7 +114,7 @@ do_translate_target(void *target, s32 input_pos) { s32 abs_offset, rel_offset; - rel_offset = get_unaligned_u32_le(target); + rel_offset = get_unaligned_le32(target); if (rel_offset >= -input_pos && rel_offset < LZX_WIM_MAGIC_FILESIZE) { if (rel_offset < LZX_WIM_MAGIC_FILESIZE - input_pos) { /* "good translation" */ @@ -126,7 +123,7 @@ do_translate_target(void *target, s32 input_pos) /* "compensating translation" */ abs_offset = rel_offset - LZX_WIM_MAGIC_FILESIZE; } - put_unaligned_u32_le(abs_offset, target); + put_unaligned_le32(abs_offset, target); } } @@ -135,18 +132,18 @@ undo_translate_target(void *target, s32 input_pos) { s32 abs_offset, rel_offset; - abs_offset = get_unaligned_u32_le(target); + abs_offset = get_unaligned_le32(target); if (abs_offset >= 0) { if (abs_offset < LZX_WIM_MAGIC_FILESIZE) { /* "good translation" */ rel_offset = abs_offset - input_pos; - put_unaligned_u32_le(rel_offset, target); + put_unaligned_le32(rel_offset, target); } } else { if (abs_offset >= -input_pos) { /* "compensating translation" */ rel_offset = abs_offset + LZX_WIM_MAGIC_FILESIZE; - put_unaligned_u32_le(rel_offset, target); + put_unaligned_le32(rel_offset, target); } } } @@ -326,13 +323,13 @@ lzx_e8_filter(u8 *data, u32 size, void (*process_target)(void *, s32)) } 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); }