make_huffman_decode_table(): Add SSE2 entry filling (with aliasing handled correctly)

[wimlib] / include / wimlib / decompress.h

diff --git a/include/wimlib/decompress.h b/include/wimlib/decompress.h
index a1963811d75b95c1d046e008f6d3debb22b1b0cd..059e182056aa274f73a01e2e2d48b462f9fdc1ae 100644 (file)
--- a/include/wimlib/decompress.h
+++ b/include/wimlib/decompress.h
@@ -76,7 +76,7 @@ bitstream_ensure_bits(struct input_bitstream *istream, unsigned num_bits)
                        unsigned shift = sizeof(input_bitbuf_t) * 8 - 16 -
                                         istream->bitsleft;
                        istream->bitbuf |= (input_bitbuf_t)le16_to_cpu(
                        unsigned shift = sizeof(input_bitbuf_t) * 8 - 16 -
                                         istream->bitsleft;
                        istream->bitbuf |= (input_bitbuf_t)le16_to_cpu(

-                                               *(u16*)istream->data) << shift;
+                                               *(le16*)istream->data) << shift;

                        istream->data += 2;
                        istream->bitsleft += 16;
                        istream->data_bytes_left -= 2;
                        istream->data += 2;
                        istream->bitsleft += 16;
                        istream->data_bytes_left -= 2;


@@ -242,4 +242,6 @@ make_huffman_decode_table(u16 decode_table[], unsigned num_syms,
                          unsigned num_bits, const u8 lengths[],
                          unsigned max_codeword_len);
 
                          unsigned num_bits, const u8 lengths[],
                          unsigned max_codeword_len);
 

+#define DECODE_TABLE_ALIGNMENT 16
+

 #endif /* _WIMLIB_DECOMPRESS_H */
 #endif /* _WIMLIB_DECOMPRESS_H */