diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index d78feb33..98931012 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -2108,25 +2108,29 @@ label_0_continue:; PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; goto exit; } - if (v_n_bits < 15) { - { - uint8_t t_4 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_4)) << v_n_bits); - } - v_n_bits += 8; - { - uint8_t t_5 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_5)) << v_n_bits); - } - v_n_bits += 8; - } else { - } v_length = ((v_table_entry >> 8) & 32767); v_table_entry_n_bits = ((v_table_entry >> 4) & 15); - v_length = - ((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & 32767); - v_bits >>= v_table_entry_n_bits; - v_n_bits -= v_table_entry_n_bits; + if (v_table_entry_n_bits > 0) { + if (v_n_bits < 15) { + { + uint8_t t_4 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_4)) << v_n_bits); + } + v_n_bits += 8; + { + uint8_t t_5 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_5)) << v_n_bits); + } + v_n_bits += 8; + } else { + } + v_length = + ((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & + 32767); + v_bits >>= v_table_entry_n_bits; + v_n_bits -= v_table_entry_n_bits; + } else { + } if (v_n_bits < 15) { { uint8_t t_6 = *b_rptr_src++; @@ -2181,25 +2185,27 @@ label_0_continue:; PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; goto exit; } - if (v_n_bits < 15) { - { - uint8_t t_10 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_10)) << v_n_bits); - } - v_n_bits += 8; - { - uint8_t t_11 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_11)) << v_n_bits); - } - v_n_bits += 8; - } v_distance = ((v_table_entry >> 8) & 32767); v_table_entry_n_bits = ((v_table_entry >> 4) & 15); - v_distance = - ((v_distance + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & - 32767); - v_bits >>= v_table_entry_n_bits; - v_n_bits -= v_table_entry_n_bits; + if (v_table_entry_n_bits > 0) { + if (v_n_bits < 15) { + { + uint8_t t_10 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_10)) << v_n_bits); + } + v_n_bits += 8; + { + uint8_t t_11 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_11)) << v_n_bits); + } + v_n_bits += 8; + } + v_distance = + ((v_distance + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & + 32767); + v_bits >>= v_table_entry_n_bits; + v_n_bits -= v_table_entry_n_bits; + } v_n_copied = 0; while (true) { if (((uint64_t)(v_distance)) > @@ -2492,22 +2498,24 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_slow( } v_length = ((v_table_entry >> 8) & 32767); v_table_entry_n_bits = ((v_table_entry >> 4) & 15); - while (v_n_bits < v_table_entry_n_bits) { - { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { - goto short_read_src; + if (v_table_entry_n_bits > 0) { + while (v_n_bits < v_table_entry_n_bits) { + { + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { + goto short_read_src; + } + uint8_t t_2 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_2)) << v_n_bits); } - uint8_t t_2 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_2)) << v_n_bits); + v_n_bits += 8; } - v_n_bits += 8; + v_length = + ((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & + 32767); + v_bits >>= v_table_entry_n_bits; + v_n_bits -= v_table_entry_n_bits; } - v_length = - ((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & - 32767); - v_bits >>= v_table_entry_n_bits; - v_n_bits -= v_table_entry_n_bits; while (true) { v_table_entry = self->private_impl.f_huffs[1][v_bits & v_dmask]; v_table_entry_n_bits = (v_table_entry & 15); @@ -2568,22 +2576,24 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_slow( } v_distance = ((v_table_entry >> 8) & 32767); v_table_entry_n_bits = ((v_table_entry >> 4) & 15); - while (v_n_bits < v_table_entry_n_bits) { - { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); - if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { - goto short_read_src; + if (v_table_entry_n_bits > 0) { + while (v_n_bits < v_table_entry_n_bits) { + { + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); + if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { + goto short_read_src; + } + uint8_t t_5 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_5)) << v_n_bits); } - uint8_t t_5 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_5)) << v_n_bits); + v_n_bits += 8; } - v_n_bits += 8; + v_distance = + ((v_distance + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & + 32767); + v_bits >>= v_table_entry_n_bits; + v_n_bits -= v_table_entry_n_bits; } - v_distance = - ((v_distance + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & - 32767); - v_bits >>= v_table_entry_n_bits; - v_n_bits -= v_table_entry_n_bits; v_n_copied = 0; while (true) { if (((uint64_t)(v_distance)) > diff --git a/std/flate/decode_huffman_fast.puffs b/std/flate/decode_huffman_fast.puffs index f9b7c019..c0153aed 100644 --- a/std/flate/decode_huffman_fast.puffs +++ b/std/flate/decode_huffman_fast.puffs @@ -149,27 +149,32 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { return error "internal error: inconsistent Huffman decoder state" } - // Ensure that we have at least 15 bits of input. - if n_bits < 15 { - assert n_bits >= 0 // TODO: this shouldn't be necessary. - bits |= (in.src.read_u8?() as u32) << n_bits - n_bits += 8 - bits |= (in.src.read_u8?() as u32) << n_bits - n_bits += 8 - assert n_bits >= 15 - } else { - assert in.src.available() >= 6 - } - // Once again, redundant but explicit assertions. - assert in.src.available() >= 6 - assert n_bits >= 15 - // length = base number + extra bits. var length u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF table_entry_n_bits = (table_entry >> 4) & 0x0F - length = (length + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF - bits >>= table_entry_n_bits - n_bits -= table_entry_n_bits + if table_entry_n_bits > 0 { + // Ensure that we have at least 15 bits of input. + if n_bits < 15 { + assert n_bits >= 0 // TODO: this shouldn't be necessary. + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + assert n_bits >= 15 + } else { + assert in.src.available() >= 6 + } + // Once again, redundant but explicit assertions. + assert in.src.available() >= 6 + assert n_bits >= 15 + + length = (length + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF + bits >>= table_entry_n_bits + n_bits -= table_entry_n_bits + + } else { + assert in.src.available() >= 6 + } // Ensure that we have at least 15 bits of input. if n_bits < 15 { @@ -230,24 +235,26 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { return error "internal error: inconsistent Huffman decoder state" } - // Ensure that we have at least 15 bits of input. - if n_bits < 15 { - assert n_bits >= 0 // TODO: this shouldn't be necessary. - bits |= (in.src.read_u8?() as u32) << n_bits - n_bits += 8 - bits |= (in.src.read_u8?() as u32) << n_bits - n_bits += 8 - assert n_bits >= 15 - } - // Once again, redundant but explicit assertions. - assert n_bits >= 15 - // distance = base number + extra bits. var distance u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF table_entry_n_bits = (table_entry >> 4) & 0x0F - distance = (distance + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF - bits >>= table_entry_n_bits - n_bits -= table_entry_n_bits + if table_entry_n_bits > 0 { + // Ensure that we have at least 15 bits of input. + if n_bits < 15 { + assert n_bits >= 0 // TODO: this shouldn't be necessary. + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + assert n_bits >= 15 + } + // Once again, redundant but explicit assertions. + assert n_bits >= 15 + + distance = (distance + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF + bits >>= table_entry_n_bits + n_bits -= table_entry_n_bits + } var n_copied u32 // The "while true { etc; break }" is a redundant version of "etc", but diff --git a/std/flate/decode_huffman_slow.puffs b/std/flate/decode_huffman_slow.puffs index 22acbf60..1cf2d52d 100644 --- a/std/flate/decode_huffman_slow.puffs +++ b/std/flate/decode_huffman_slow.puffs @@ -102,16 +102,18 @@ pri func flate_decoder.decode_huffman_slow?(dst writer1, src reader1)() { // length = base number + extra bits. var length u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF table_entry_n_bits = (table_entry >> 4) & 0x0F - while n_bits < table_entry_n_bits, - post n_bits >= table_entry_n_bits, - { - assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits) - bits |= (in.src.read_u8?() as u32) << n_bits - n_bits += 8 + if table_entry_n_bits > 0 { + while n_bits < table_entry_n_bits, + post n_bits >= table_entry_n_bits, + { + assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits) + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + } + length = (length + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF + bits >>= table_entry_n_bits + n_bits -= table_entry_n_bits } - length = (length + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF - bits >>= table_entry_n_bits - n_bits -= table_entry_n_bits // Decode a dcode symbol from H-D. while true { @@ -158,16 +160,18 @@ pri func flate_decoder.decode_huffman_slow?(dst writer1, src reader1)() { // distance = base number + extra bits. var distance u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF table_entry_n_bits = (table_entry >> 4) & 0x0F - while n_bits < table_entry_n_bits, - post n_bits >= table_entry_n_bits, - { - assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits) - bits |= (in.src.read_u8?() as u32) << n_bits - n_bits += 8 + if table_entry_n_bits > 0 { + while n_bits < table_entry_n_bits, + post n_bits >= table_entry_n_bits, + { + assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits) + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + } + distance = (distance + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF + bits >>= table_entry_n_bits + n_bits -= table_entry_n_bits } - distance = (distance + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF - bits >>= table_entry_n_bits - n_bits -= table_entry_n_bits var n_copied u32 while true {