# include "config.h"
#endif
-#include "wimlib/assert.h"
#include "wimlib/decompress_common.h"
#include <string.h>
* binary tree.
*
* @decode_table:
- * The array in which to create the decoding table.
- * This must be 16-byte aligned and must have a length of at least
- * ((2**table_bits) + 2 * num_syms) entries.
+ * The array in which to create the decoding table. This must be
+ * 16-byte aligned and must have a length of at least
+ * ((2**table_bits) + 2 * num_syms) entries. This is permitted to
+ * alias @lens, since all information from @lens is consumed before
+* anything is written to @decode_table.
*
* @num_syms:
* The number of symbols in the alphabet; also, the length of the
* An array of length @num_syms, indexable by symbol, that gives the
* length of the codeword, in bits, for that symbol. The length can
* be 0, which means that the symbol does not have a codeword
- * assigned.
+ * assigned. This is permitted to alias @decode_table, since all
+ * information from @lens is consumed before anything is written to
+ * @decode_table.
*
* @max_codeword_len:
* The longest codeword length allowed in the compression format.
* code.
*/
int
-make_huffman_decode_table(u16 decode_table[const restrict],
+make_huffman_decode_table(u16 decode_table[const],
const unsigned num_syms,
const unsigned table_bits,
- const u8 lens[const restrict],
+ const u8 lens[const],
const unsigned max_codeword_len)
{
const unsigned table_num_entries = 1 << table_bits;
const unsigned entries_per_xmm = sizeof(__m128i) / sizeof(decode_table[0]);
#endif
- /* Check parameters if assertions are enabled. */
- wimlib_assert2((uintptr_t)decode_table % DECODE_TABLE_ALIGNMENT == 0);
- wimlib_assert2(num_syms <= DECODE_TABLE_MAX_SYMBOLS);
- wimlib_assert2(table_bits <= DECODE_TABLE_MAX_TABLE_BITS);
- wimlib_assert2(max_codeword_len <= DECODE_TABLE_MAX_CODEWORD_LEN);
- for (unsigned sym = 0; sym < num_syms; sym++)
- wimlib_assert2(lens[sym] <= max_codeword_len);
-
/* Count how many symbols have each possible codeword length.
* Note that a length of 0 indicates the corresponding symbol is not
* used in the code and therefore does not have a codeword. */
aliased_word_t *p;
unsigned n;
- BUILD_BUG_ON(WORDSIZE != 4 && WORDSIZE != 8);
+ STATIC_ASSERT(WORDSIZE == 4 || WORDSIZE == 8);
v = MAKE_DIRECT_ENTRY(sorted_syms[sym_idx], codeword_len);
v |= v << 16;
* of as simply the root of the tree. The
* representation of these internal nodes is
* simply the index of the left child combined
- * with the special bits 0xC000 to distingush
+ * with the special bits 0xC000 to distinguish
* the entry from direct mapping and leaf node
* entries. */
do {