Add a flate end_of_block field.

This commit is contained in:
Nigel Tao committed 2017-11-04 14:12:38 +11:00
1 parent 4810db3994
commit ded044da41
4 files changed
+43 -16

No files matched your search

+10
View File
@@ -27,6 +27,7 @@ pub error "bad literal/length code count"
pub error "checksum mismatch"
pub error "inconsistent stored block length"
pub error "internal error: inconsistent Huffman decoder state"
pub error "internal error: inconsistent Huffman end_of_block"
pub error "internal error: inconsistent n_bits"
pub error "missing end-of-block code"
pub error "no Huffman codes"
@@ -113,6 +114,11 @@ pub struct flate_decoder?(
//
// code_lengths[in.n_codes0 + i] holds the number of bits in the i'th code.
code_lengths[320] u8[..15],
// end_of_block is whether decode_huffman_xxx saw an end-of-block code.
//
// TODO: can decode_huffman_xxx signal this in band instead of out of band?
end_of_block bool,
)
pub func flate_decoder.decode?(dst writer1, src reader1)() {
@@ -193,7 +199,11 @@ pri func flate_decoder.decode_blocks?(dst writer1, src reader1)() {
return error "bad flate block"
}
this.end_of_block = false
this.decode_huffman_slow?(dst:in.dst, src:in.src)
if not this.end_of_block {
return error "internal error: inconsistent Huffman end_of_block"
}
}
}
+2
View File
@@ -43,6 +43,7 @@ pri func flate_decoder.decode_huffman_slow?(dst writer1, src reader1)() {
// No-op; code continues past the if-else chain.
} else if (table_entry >> 29) != 0 {
// End of block.
this.end_of_block = true
break
} else if (table_entry >> 28) != 0 {
// Redirect.
@@ -72,6 +73,7 @@ pri func flate_decoder.decode_huffman_slow?(dst writer1, src reader1)() {
// No-op; code continues past the if-else chain.
} else if (table_entry >> 29) != 0 {
// End of block.
this.end_of_block = true
break
} else if (table_entry >> 28) != 0 {
return error "internal error: inconsistent Huffman decoder state"