mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 16:47:28 +01:00
Rename errors from "?msg" to "#msg"
This commit is contained in:
1 parent
c341ac5078
commit
045f180a6c
16 files changed
+203
-203
No files matched your search
@@ -12,24 +12,24 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pub status "?bad Huffman code (over-subscribed)"
|
||||
pub status "?bad Huffman code (under-subscribed)"
|
||||
pub status "?bad Huffman code length count"
|
||||
pub status "?bad Huffman code length repetition"
|
||||
pub status "?bad Huffman code"
|
||||
pub status "?bad Huffman minimum code length"
|
||||
pub status "?bad block"
|
||||
pub status "?bad distance"
|
||||
pub status "?bad distance code count"
|
||||
pub status "?bad literal/length code count"
|
||||
pub status "?inconsistent stored block length"
|
||||
pub status "?missing end-of-block code"
|
||||
pub status "?no Huffman codes"
|
||||
pub status "#bad Huffman code (over-subscribed)"
|
||||
pub status "#bad Huffman code (under-subscribed)"
|
||||
pub status "#bad Huffman code length count"
|
||||
pub status "#bad Huffman code length repetition"
|
||||
pub status "#bad Huffman code"
|
||||
pub status "#bad Huffman minimum code length"
|
||||
pub status "#bad block"
|
||||
pub status "#bad distance"
|
||||
pub status "#bad distance code count"
|
||||
pub status "#bad literal/length code count"
|
||||
pub status "#inconsistent stored block length"
|
||||
pub status "#missing end-of-block code"
|
||||
pub status "#no Huffman codes"
|
||||
|
||||
pri status "?internal error: inconsistent Huffman decoder state"
|
||||
pri status "?internal error: inconsistent I/O"
|
||||
pri status "?internal error: inconsistent distance"
|
||||
pri status "?internal error: inconsistent n_bits"
|
||||
pri status "#internal error: inconsistent Huffman decoder state"
|
||||
pri status "#internal error: inconsistent I/O"
|
||||
pri status "#internal error: inconsistent distance"
|
||||
pri status "#internal error: inconsistent n_bits"
|
||||
|
||||
// TODO: replace the placeholder 1 value with either 0 or (32768 + 512),
|
||||
// depending on whether we'll move decoder.history into the workbuf.
|
||||
@@ -228,7 +228,7 @@ pri func decoder.decode_blocks?(dst base.io_writer, src base.io_reader) {
|
||||
} else if type == 2 {
|
||||
this.init_dynamic_huffman?(src:args.src)
|
||||
} else {
|
||||
return "?bad block"
|
||||
return "#bad block"
|
||||
}
|
||||
|
||||
this.end_of_block = false
|
||||
@@ -258,14 +258,14 @@ pri func decoder.decode_uncompressed?(dst base.io_writer, src base.io_reader) {
|
||||
//
|
||||
// Ditto for decode_huffman_slow and decode_huffman_fast.
|
||||
if (this.n_bits >= 8) or ((this.bits >> (this.n_bits & 7)) != 0) {
|
||||
return "?internal error: inconsistent n_bits"
|
||||
return "#internal error: inconsistent n_bits"
|
||||
}
|
||||
this.n_bits = 0
|
||||
this.bits = 0
|
||||
|
||||
length = args.src.read_u32le?()
|
||||
if (length.low_bits(n:16) + length.high_bits(n:16)) != 0xFFFF {
|
||||
return "?inconsistent stored block length"
|
||||
return "#inconsistent stored block length"
|
||||
}
|
||||
length = length.low_bits(n:16)
|
||||
while true {
|
||||
@@ -350,12 +350,12 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
}
|
||||
n_lit = bits.low_bits(n:5) + 257
|
||||
if n_lit > 286 {
|
||||
return "?bad literal/length code count"
|
||||
return "#bad literal/length code count"
|
||||
}
|
||||
bits >>= 5
|
||||
n_dist = bits.low_bits(n:5) + 1
|
||||
if n_dist > 30 {
|
||||
return "?bad distance code count"
|
||||
return "#bad distance code count"
|
||||
}
|
||||
bits >>= 5
|
||||
n_clen = bits.low_bits(n:4) + 4
|
||||
@@ -413,7 +413,7 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
// For H-CL, there should be no redirections and all symbols should be
|
||||
// literals.
|
||||
if (table_entry >> 24) != 0x80 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
table_entry = (table_entry >> 8) & 0xFF
|
||||
|
||||
@@ -431,7 +431,7 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
if table_entry == 16 {
|
||||
n_extra_bits = 2
|
||||
if i <= 0 {
|
||||
return "?bad Huffman code length repetition"
|
||||
return "#bad Huffman code length repetition"
|
||||
}
|
||||
rep_symbol = this.code_lengths[i - 1] & 15
|
||||
rep_count = 3
|
||||
@@ -447,7 +447,7 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
rep_count = 11
|
||||
assert rep_count <= 11
|
||||
} else {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
while n_bits < n_extra_bits,
|
||||
inv i < 320,
|
||||
@@ -466,7 +466,7 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
while rep_count > 0 {
|
||||
// TODO: hoist this check up one level?
|
||||
if i >= (n_lit + n_dist) {
|
||||
return "?bad Huffman code length count"
|
||||
return "#bad Huffman code length count"
|
||||
}
|
||||
assert i < (288 + 32) via "a < (b + c): a < (b0 + c0); b0 <= b; c0 <= c"(b0:n_lit, c0:n_dist)
|
||||
this.code_lengths[i] = rep_symbol
|
||||
@@ -476,10 +476,10 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
|
||||
}
|
||||
|
||||
if i != (n_lit + n_dist) {
|
||||
return "?bad Huffman code length count"
|
||||
return "#bad Huffman code length count"
|
||||
}
|
||||
if this.code_lengths[256] == 0 {
|
||||
return "?missing end-of-block code"
|
||||
return "#missing end-of-block code"
|
||||
}
|
||||
|
||||
status = this.init_huff!(which:0, n_codes0:0, n_codes1:n_lit, base_symbol:257)
|
||||
@@ -562,13 +562,13 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
// TODO: this if should be unnecessary. Have some way to assert that,
|
||||
// for all j, counts[j] <= i, and thus counts[j]++ will not overflow.
|
||||
if counts[this.code_lengths[i] & 15] >= 320 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
counts[this.code_lengths[i] & 15] += 1
|
||||
i += 1
|
||||
}
|
||||
if ((counts[0] as base.u32) + args.n_codes0) == args.n_codes1 {
|
||||
return "?no Huffman codes"
|
||||
return "#no Huffman codes"
|
||||
}
|
||||
|
||||
// Check that the Huffman code completely covers all possible input bits.
|
||||
@@ -576,19 +576,19 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
i = 1
|
||||
while i <= 15 {
|
||||
if remaining > (1 << 30) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
// Each iteration doubles the number of possible remaining codes.
|
||||
remaining <<= 1
|
||||
if remaining < (counts[i] as base.u32) {
|
||||
return "?bad Huffman code (over-subscribed)"
|
||||
return "#bad Huffman code (over-subscribed)"
|
||||
}
|
||||
remaining -= counts[i] as base.u32
|
||||
i += 1
|
||||
}
|
||||
if remaining != 0 {
|
||||
// TODO: when is a degenerate Huffman table valid?
|
||||
return "?bad Huffman code (under-subscribed)"
|
||||
return "#bad Huffman code (under-subscribed)"
|
||||
}
|
||||
|
||||
// Calculate offsets and n_symbols.
|
||||
@@ -608,7 +608,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
offsets[i] = n_symbols as base.u16
|
||||
count = counts[i] as base.u32
|
||||
if n_symbols > (320 - count) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
assert (n_symbols + count) <= 320 via "(a + b) <= c: a <= (c - b)"()
|
||||
// TODO: change this to n_symbols += count, once the proof engine's
|
||||
@@ -617,7 +617,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
i += 1
|
||||
}
|
||||
if n_symbols > 288 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
// Calculate symbols.
|
||||
@@ -645,11 +645,11 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
assert i < 320 via "a < b: a < c; c <= b"(c:args.n_codes1)
|
||||
// TODO: this if check should be unnecessary.
|
||||
if i < args.n_codes0 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
if this.code_lengths[i] != 0 {
|
||||
if offsets[this.code_lengths[i] & 15] >= 320 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
symbols[offsets[this.code_lengths[i] & 15]] = (i - args.n_codes0) as base.u16
|
||||
offsets[this.code_lengths[i] & 15] += 1
|
||||
@@ -670,7 +670,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
break
|
||||
}
|
||||
if min_cl >= 9 {
|
||||
return "?bad Huffman minimum code length"
|
||||
return "#bad Huffman minimum code length"
|
||||
}
|
||||
min_cl += 1
|
||||
}
|
||||
@@ -683,7 +683,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
}
|
||||
if max_cl <= 1 {
|
||||
// TODO: when is a degenerate Huffman table valid?
|
||||
return "?no Huffman codes"
|
||||
return "#no Huffman codes"
|
||||
}
|
||||
max_cl -= 1
|
||||
}
|
||||
@@ -708,10 +708,10 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
// - this.huffs[0][0b11111] = 0x80001805 (literal, symbols[9]=0x18, code_length=5)
|
||||
i = 0
|
||||
if (n_symbols != (offsets[max_cl] as base.u32)) or (n_symbols != (offsets[15] as base.u32)) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
if (args.n_codes0 + (symbols[0] as base.u32)) >= 320 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
initial_high_bits = 1 << 9
|
||||
@@ -731,13 +731,13 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
inv n_symbols <= 288,
|
||||
{
|
||||
if (args.n_codes0 + (symbols[i] as base.u32)) >= 320 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
cl = (this.code_lengths[args.n_codes0 + (symbols[i] as base.u32)] & 15) as base.u32
|
||||
if cl > prev_cl {
|
||||
code <<= cl - prev_cl
|
||||
if code >= (1 << 15) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
}
|
||||
// For the remainder of this loop body, prev_cl is the original code
|
||||
@@ -770,20 +770,20 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
}
|
||||
remaining -= counts[j] as base.u32
|
||||
if remaining > (1 << 30) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
remaining <<= 1
|
||||
j += 1
|
||||
}
|
||||
if (j <= 9) or (15 < j) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
j -= 9
|
||||
initial_high_bits = (1 as base.u32) << j
|
||||
|
||||
top = next_top
|
||||
if (top + ((1 as base.u32) << j)) > huffs_table_size {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
assert (top + ((1 as base.u32) << j)) <= 1024 via "a <= b: a <= c; c <= b"(c:huffs_table_size)
|
||||
next_top = top + ((1 as base.u32) << j)
|
||||
@@ -793,7 +793,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
}
|
||||
}
|
||||
if (key >= (1 << 9)) or (counts[prev_cl] <= 0) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
counts[prev_cl] -= 1
|
||||
|
||||
@@ -816,7 +816,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
value = dcode_magic_numbers[symbol & 31] | cl
|
||||
}
|
||||
} else {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
// The table uses log2(initial_high_bits) bits, but reversed_key only
|
||||
@@ -831,7 +831,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
{
|
||||
high_bits -= delta
|
||||
if (top + ((high_bits | reversed_key) & 511)) >= huffs_table_size {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
assert (top + ((high_bits | reversed_key) & 511)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size)
|
||||
this.huffs[args.which][top + ((high_bits | reversed_key) & 511)] = value
|
||||
@@ -844,7 +844,7 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
|
||||
assert i < 288 via "a < b: a < c; c <= b"(c:n_symbols)
|
||||
code += 1
|
||||
if code >= (1 << 15) {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
}
|
||||
return ok
|
||||
|
||||
@@ -35,7 +35,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
var hdist base.u32
|
||||
|
||||
if (this.n_bits >= 8) or ((this.bits >> (this.n_bits & 7)) != 0) {
|
||||
return "?internal error: inconsistent n_bits"
|
||||
return "#internal error: inconsistent n_bits"
|
||||
}
|
||||
|
||||
bits = this.bits
|
||||
@@ -131,7 +131,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
redir_top = (table_entry >> 8) & 0xFFFF
|
||||
redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
|
||||
if (redir_top + (bits & redir_mask)) >= huffs_table_size {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size)
|
||||
table_entry = this.huffs[0][redir_top + (bits & redir_mask)]
|
||||
@@ -150,20 +150,20 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
this.end_of_block = true
|
||||
break:loop
|
||||
} else if (table_entry >> 28) != 0 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
} else if (table_entry >> 27) != 0 {
|
||||
return "?bad Huffman code"
|
||||
return "#bad Huffman code"
|
||||
} else {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
// Once again, redundant but explicit assertions.
|
||||
assert args.src.available() >= 8
|
||||
|
||||
} else if (table_entry >> 27) != 0 {
|
||||
return "?bad Huffman code"
|
||||
return "#bad Huffman code"
|
||||
} else {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
// length = base_number_minus_3 + 3 + extra_bits.
|
||||
@@ -245,7 +245,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
redir_top = (table_entry >> 8) & 0xFFFF
|
||||
redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
|
||||
if (redir_top + (bits & redir_mask)) >= huffs_table_size {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size)
|
||||
table_entry = this.huffs[1][redir_top + (bits & redir_mask)]
|
||||
@@ -259,9 +259,9 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
// For H-D, all symbols should be base_number + extra_bits.
|
||||
if (table_entry >> 24) != 0x40 {
|
||||
if (table_entry >> 24) == 0x08 {
|
||||
return "?bad Huffman code"
|
||||
return "#bad Huffman code"
|
||||
}
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
// dist_minus_1 = base_number_minus_1 + extra_bits.
|
||||
@@ -316,7 +316,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
length = 0
|
||||
}
|
||||
if this.history_index < hdist {
|
||||
return "?bad distance"
|
||||
return "#bad distance"
|
||||
}
|
||||
// Re-purpose the hdist variable as the this.history index to
|
||||
// start copying from.
|
||||
@@ -354,7 +354,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
}
|
||||
|
||||
if ((dist_minus_1 + 1) as base.u64) > args.dst.since_mark().length() {
|
||||
return "?internal error: inconsistent distance"
|
||||
return "#internal error: inconsistent distance"
|
||||
}
|
||||
}
|
||||
// Once again, redundant but explicit assertions.
|
||||
@@ -389,7 +389,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
if args.src.can_undo_byte() {
|
||||
args.src.undo_byte!()
|
||||
} else {
|
||||
return "?internal error: inconsistent I/O"
|
||||
return "#internal error: inconsistent I/O"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -397,6 +397,6 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba
|
||||
this.n_bits = n_bits
|
||||
|
||||
if (this.n_bits >= 8) or ((this.bits >> this.n_bits) != 0) {
|
||||
return "?internal error: inconsistent n_bits"
|
||||
return "#internal error: inconsistent n_bits"
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
// correctness and performance.
|
||||
|
||||
if (this.n_bits >= 8) or ((this.bits >> (this.n_bits & 7)) != 0) {
|
||||
return "?internal error: inconsistent n_bits"
|
||||
return "#internal error: inconsistent n_bits"
|
||||
}
|
||||
|
||||
bits = this.bits
|
||||
@@ -80,7 +80,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
|
||||
while true {
|
||||
if (redir_top + (bits & redir_mask)) >= huffs_table_size {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size)
|
||||
table_entry = this.huffs[0][redir_top + (bits & redir_mask)]
|
||||
@@ -107,17 +107,17 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
this.end_of_block = true
|
||||
break:loop
|
||||
} else if (table_entry >> 28) != 0 {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
} else if (table_entry >> 27) != 0 {
|
||||
return "?bad Huffman code"
|
||||
return "#bad Huffman code"
|
||||
} else {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
} else if (table_entry >> 27) != 0 {
|
||||
return "?bad Huffman code"
|
||||
return "#bad Huffman code"
|
||||
} else {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
// length = base_number_minus_3 + 3 + extra_bits.
|
||||
@@ -162,7 +162,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1
|
||||
while true {
|
||||
if (redir_top + (bits & redir_mask)) >= huffs_table_size {
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size)
|
||||
table_entry = this.huffs[1][redir_top + (bits & redir_mask)]
|
||||
@@ -182,9 +182,9 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
// For H-D, all symbols should be base_number + extra_bits.
|
||||
if (table_entry >> 24) != 0x40 {
|
||||
if (table_entry >> 24) == 0x08 {
|
||||
return "?bad Huffman code"
|
||||
return "#bad Huffman code"
|
||||
}
|
||||
return "?internal error: inconsistent Huffman decoder state"
|
||||
return "#internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
|
||||
// dist_minus_1 = base_number_minus_1 + extra_bits.
|
||||
@@ -226,7 +226,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
length = 0
|
||||
}
|
||||
if this.history_index < hdist {
|
||||
return "?bad distance"
|
||||
return "#bad distance"
|
||||
}
|
||||
// Re-purpose the hdist variable as the this.history index to
|
||||
// start copying from.
|
||||
@@ -288,6 +288,6 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) {
|
||||
this.n_bits = n_bits
|
||||
|
||||
if (this.n_bits >= 8) or ((this.bits >> (this.n_bits & 7)) != 0) {
|
||||
return "?internal error: inconsistent n_bits"
|
||||
return "#internal error: inconsistent n_bits"
|
||||
}
|
||||
}
|
||||
+21
-21
@@ -14,13 +14,13 @@
|
||||
|
||||
use "std/lzw"
|
||||
|
||||
pub status "?bad block"
|
||||
pub status "?bad extension label"
|
||||
pub status "?bad graphic control"
|
||||
pub status "?bad header"
|
||||
pub status "?bad literal width"
|
||||
pub status "#bad block"
|
||||
pub status "#bad extension label"
|
||||
pub status "#bad graphic control"
|
||||
pub status "#bad header"
|
||||
pub status "#bad literal width"
|
||||
|
||||
pri status "?internal error: inconsistent ri/wi"
|
||||
pri status "#internal error: inconsistent ri/wi"
|
||||
|
||||
// TODO: replace the placeholder 1 value with either 0 or 0xFFFF (plus
|
||||
// lzw.decoder_workbuf_len_max_incl_worst_case), depending on whether we'll
|
||||
@@ -131,7 +131,7 @@ pub func decoder.decode_image_config?(dst nptr base.image_config, src base.io_re
|
||||
var ffio base.bool
|
||||
|
||||
if this.call_sequence >= 1 {
|
||||
return base."?bad call sequence"
|
||||
return base."#bad call sequence"
|
||||
}
|
||||
|
||||
this.decode_header?(src:args.src)
|
||||
@@ -198,7 +198,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
|
||||
|
||||
pub func decoder.restart_frame!(index base.u64, io_position base.u64) base.status {
|
||||
if this.call_sequence == 0 {
|
||||
return base."?bad call sequence"
|
||||
return base."#bad call sequence"
|
||||
}
|
||||
this.end_of_data = false
|
||||
this.restarted = true
|
||||
@@ -299,7 +299,7 @@ pri func decoder.decode_up_to_id_part1?(src base.io_reader) {
|
||||
if not this.restarted {
|
||||
this.frame_config_io_position = args.src.position()
|
||||
} else if this.frame_config_io_position != args.src.position() {
|
||||
return base."?bad restart"
|
||||
return base."#bad restart"
|
||||
} else {
|
||||
this.restarted = false
|
||||
}
|
||||
@@ -315,7 +315,7 @@ pri func decoder.decode_up_to_id_part1?(src base.io_reader) {
|
||||
this.end_of_data = true
|
||||
break
|
||||
} else {
|
||||
return "?bad block"
|
||||
return "#bad block"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -333,7 +333,7 @@ pri func decoder.decode_header?(src base.io_reader) {
|
||||
}
|
||||
if (c[0] != 0x47) or (c[1] != 0x49) or (c[2] != 0x46) or (c[3] != 0x38) or
|
||||
((c[4] != 0x37) and (c[4] != 0x39)) or (c[5] != 0x61) {
|
||||
return "?bad header"
|
||||
return "#bad header"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -502,11 +502,11 @@ pri func decoder.decode_gc?(src base.io_reader) {
|
||||
var gc_duration_centiseconds base.u16
|
||||
|
||||
if this.seen_graphic_control {
|
||||
return "?bad graphic control"
|
||||
return "#bad graphic control"
|
||||
}
|
||||
c = args.src.read_u8?()
|
||||
if c != 4 {
|
||||
return "?bad graphic control"
|
||||
return "#bad graphic control"
|
||||
}
|
||||
|
||||
flags = args.src.read_u8?()
|
||||
@@ -537,7 +537,7 @@ pri func decoder.decode_gc?(src base.io_reader) {
|
||||
|
||||
c = args.src.read_u8?()
|
||||
if c != 0 {
|
||||
return "?bad graphic control"
|
||||
return "#bad graphic control"
|
||||
}
|
||||
this.seen_graphic_control = true
|
||||
}
|
||||
@@ -663,7 +663,7 @@ pri func decoder.decode_id_part1?(dst ptr base.pixel_buffer, src base.io_reader)
|
||||
|
||||
lw = args.src.read_u8?()
|
||||
if (lw < 2) or (8 < lw) {
|
||||
return "?bad literal width"
|
||||
return "#bad literal width"
|
||||
}
|
||||
this.lzw.set_literal_width!(lw:lw as base.u32)
|
||||
|
||||
@@ -718,12 +718,12 @@ pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader,
|
||||
}
|
||||
|
||||
if decoder_workbuf_len_max_incl_worst_case > args.workbuf.length() {
|
||||
return base."?bad workbuf length"
|
||||
return base."#bad workbuf length"
|
||||
}
|
||||
|
||||
while:inner true {
|
||||
if (this.compressed_ri > this.compressed_wi) or (this.compressed_wi > 4096) {
|
||||
return "?internal error: inconsistent ri/wi"
|
||||
return "#internal error: inconsistent ri/wi"
|
||||
}
|
||||
io_bind (io:r, data:this.compressed[this.compressed_ri:this.compressed_wi]) {
|
||||
lzw_status =? this.lzw.decode_io_writer?(
|
||||
@@ -764,7 +764,7 @@ pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader,
|
||||
if (this.dst_y < this.frame_rect_y1) and
|
||||
(this.frame_rect_x0 != this.frame_rect_x1) and
|
||||
(this.frame_rect_y0 != this.frame_rect_y1) {
|
||||
return base."?not enough data"
|
||||
return base."#not enough data"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -795,7 +795,7 @@ pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base.
|
||||
src = args.src[src_ri:]
|
||||
|
||||
if this.dst_y >= this.frame_rect_y1 {
|
||||
return base."?too much data"
|
||||
return base."#too much data"
|
||||
}
|
||||
|
||||
// First, copy from src to that part of the frame rect that is inside
|
||||
@@ -833,7 +833,7 @@ pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base.
|
||||
if args.src.length() == src_ri {
|
||||
break
|
||||
} else if args.src.length() < src_ri {
|
||||
return "?internal error: inconsistent ri/wi"
|
||||
return "#internal error: inconsistent ri/wi"
|
||||
}
|
||||
|
||||
// Second, skip over src for that part of the frame rect that is
|
||||
@@ -857,7 +857,7 @@ pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base.
|
||||
}
|
||||
|
||||
if src_ri != args.src.length() {
|
||||
return "?internal error: inconsistent ri/wi"
|
||||
return "#internal error: inconsistent ri/wi"
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
@@ -15,10 +15,10 @@
|
||||
use "std/crc32"
|
||||
use "std/deflate"
|
||||
|
||||
pub status "?bad checksum"
|
||||
pub status "?bad compression method"
|
||||
pub status "?bad encoding flags"
|
||||
pub status "?bad header"
|
||||
pub status "#bad checksum"
|
||||
pub status "#bad compression method"
|
||||
pub status "#bad encoding flags"
|
||||
pub status "#bad header"
|
||||
|
||||
// TODO: reference deflate.decoder_workbuf_len_max_incl_worst_case.
|
||||
pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 1
|
||||
@@ -55,15 +55,15 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
// Read the header.
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x1F {
|
||||
return "?bad header"
|
||||
return "#bad header"
|
||||
}
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x8B {
|
||||
return "?bad header"
|
||||
return "#bad header"
|
||||
}
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x08 {
|
||||
return "?bad compression method"
|
||||
return "#bad compression method"
|
||||
}
|
||||
flags = args.src.read_u8?()
|
||||
// TODO: API for returning the header's MTIME field.
|
||||
@@ -106,7 +106,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
|
||||
// Reserved flags bits must be zero.
|
||||
if (flags & 0xE0) != 0 {
|
||||
return "?bad encoding flags"
|
||||
return "#bad encoding flags"
|
||||
}
|
||||
|
||||
// Decode and checksum the DEFLATE-encoded payload.
|
||||
@@ -126,6 +126,6 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
decoded_length_want = args.src.read_u32le?()
|
||||
if (not this.ignore_checksum) and
|
||||
((checksum_got != checksum_want) or (decoded_length_got != decoded_length_want)) {
|
||||
return "?bad checksum"
|
||||
return "#bad checksum"
|
||||
}
|
||||
}
|
||||
@@ -12,9 +12,9 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pub status "?bad code"
|
||||
pub status "#bad code"
|
||||
|
||||
pri status "?internal error: inconsistent I/O"
|
||||
pri status "#internal error: inconsistent I/O"
|
||||
|
||||
// TODO: move bulk data buffers like decoder.suffixes or decoder.output into
|
||||
// the workbuf? The first attempt at this was a performance regression for
|
||||
@@ -116,9 +116,9 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
} else if this.read_from_return_value == 2 {
|
||||
yield base."$short read"
|
||||
} else if this.read_from_return_value == 3 {
|
||||
return "?bad code"
|
||||
return "#bad code"
|
||||
} else {
|
||||
return "?internal error: inconsistent I/O"
|
||||
return "#internal error: inconsistent I/O"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -336,7 +336,7 @@ pri func decoder.write_to?(dst base.io_writer) {
|
||||
|
||||
while this.output_wi > 0 {
|
||||
if this.output_ri > this.output_wi {
|
||||
return "?internal error: inconsistent I/O"
|
||||
return "#internal error: inconsistent I/O"
|
||||
}
|
||||
s = this.output[this.output_ri:this.output_wi]
|
||||
n = args.dst.copy_from_slice!(s:s)
|
||||
|
||||
+10
-10
@@ -15,12 +15,12 @@
|
||||
use "std/adler32"
|
||||
use "std/deflate"
|
||||
|
||||
pub status "?bad checksum"
|
||||
pub status "?bad compression method"
|
||||
pub status "?bad compression window size"
|
||||
pub status "?bad parity check"
|
||||
pub status "#bad checksum"
|
||||
pub status "#bad compression method"
|
||||
pub status "#bad compression window size"
|
||||
pub status "#bad parity check"
|
||||
|
||||
pri status "?TODO: unsupported preset dictionary"
|
||||
pri status "#TODO: unsupported preset dictionary"
|
||||
|
||||
// TODO: reference deflate.decoder_workbuf_len_max_incl_worst_case.
|
||||
pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 1
|
||||
@@ -52,16 +52,16 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
|
||||
x = args.src.read_u16be?()
|
||||
if ((x >> 8) & 0x0F) != 0x08 {
|
||||
return "?bad compression method"
|
||||
return "#bad compression method"
|
||||
}
|
||||
if (x >> 12) > 0x07 {
|
||||
return "?bad compression window size"
|
||||
return "#bad compression window size"
|
||||
}
|
||||
if (x & 0x20) != 0 {
|
||||
return "?TODO: unsupported preset dictionary"
|
||||
return "#TODO: unsupported preset dictionary"
|
||||
}
|
||||
if (x % 31) != 0 {
|
||||
return "?bad parity check"
|
||||
return "#bad parity check"
|
||||
}
|
||||
|
||||
// Decode and checksum the DEFLATE-encoded payload.
|
||||
@@ -78,6 +78,6 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb
|
||||
}
|
||||
checksum_want = args.src.read_u32be?()
|
||||
if (not this.ignore_checksum) and (checksum_got != checksum_want) {
|
||||
return "?bad checksum"
|
||||
return "#bad checksum"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user