Mark deflate's init_huff as merely !? not !??

This commit is contained in:
Nigel Tao committed 2018-11-24 16:41:45 +11:00
1 parent 88236105c9
commit 312cdc8a0a
4 files changed
+74 -139

No files matched your search

+54 -125
View File
@@ -2374,9 +2374,6 @@ struct wuffs_deflate__decoder__struct {
uint32_t v_length;
uint64_t scratch;
} c_decode_uncompressed[1];
struct {
uint32_t coro_susp_point;
} c_init_fixed_huffman[1];
struct {
uint32_t coro_susp_point;
uint32_t v_bits;
@@ -5427,57 +5424,35 @@ wuffs_deflate__decoder__init_fixed_huffman(wuffs_deflate__decoder* self) {
uint32_t v_i;
uint32_t coro_susp_point =
self->private_impl.c_init_fixed_huffman[0].coro_susp_point;
if (coro_susp_point) {
v_i = 0;
} else {
v_i = 0;
while (v_i < 144) {
self->private_impl.f_code_lengths[v_i] = 8;
v_i += 1;
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
v_i = 0;
while (v_i < 144) {
self->private_impl.f_code_lengths[v_i] = 8;
v_i += 1;
}
while (v_i < 256) {
self->private_impl.f_code_lengths[v_i] = 9;
v_i += 1;
}
while (v_i < 280) {
self->private_impl.f_code_lengths[v_i] = 7;
v_i += 1;
}
while (v_i < 288) {
self->private_impl.f_code_lengths[v_i] = 8;
v_i += 1;
}
while (v_i < 320) {
self->private_impl.f_code_lengths[v_i] = 5;
v_i += 1;
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
status = wuffs_deflate__decoder__init_huff(self, 0, 0, 288, 257);
if (status) {
goto suspend;
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
status = wuffs_deflate__decoder__init_huff(self, 1, 288, 320, 0);
if (status) {
goto suspend;
}
goto ok;
ok:
self->private_impl.c_init_fixed_huffman[0].coro_susp_point = 0;
while (v_i < 256) {
self->private_impl.f_code_lengths[v_i] = 9;
v_i += 1;
}
while (v_i < 280) {
self->private_impl.f_code_lengths[v_i] = 7;
v_i += 1;
}
while (v_i < 288) {
self->private_impl.f_code_lengths[v_i] = 8;
v_i += 1;
}
while (v_i < 320) {
self->private_impl.f_code_lengths[v_i] = 5;
v_i += 1;
}
status = wuffs_deflate__decoder__init_huff(self, 0, 0, 288, 257);
if (status) {
goto exit;
}
status = wuffs_deflate__decoder__init_huff(self, 1, 288, 320, 0);
if (status) {
goto exit;
}
goto suspend;
suspend:
self->private_impl.c_init_fixed_huffman[0].coro_susp_point = coro_susp_point;
goto exit;
exit:
return status;
@@ -5594,10 +5569,9 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
self->private_impl.f_code_lengths[wuffs_deflate__code_order[v_i]] = 0;
v_i += 1;
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
status = wuffs_deflate__decoder__init_huff(self, 0, 0, 19, 4095);
if (status) {
goto suspend;
goto exit;
}
v_mask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1);
v_i = 0;
@@ -5613,7 +5587,7 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
goto label_1_break;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) {
status = wuffs_base__suspension__short_read;
goto suspend;
@@ -5661,7 +5635,7 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
}
while (v_n_bits < v_n_extra_bits) {
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) {
status = wuffs_base__suspension__short_read;
goto suspend;
@@ -5692,16 +5666,14 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
status = wuffs_deflate__error__missing_end_of_block_code;
goto exit;
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
status = wuffs_deflate__decoder__init_huff(self, 0, 0, v_n_lit, 257);
if (status) {
goto suspend;
goto exit;
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
status = wuffs_deflate__decoder__init_huff(self, 1, v_n_lit,
(v_n_lit + v_n_dist), 0);
if (status) {
goto suspend;
goto exit;
}
self->private_impl.f_bits = v_bits;
self->private_impl.f_n_bits = v_n_bits;
@@ -5746,8 +5718,6 @@ wuffs_deflate__decoder__init_huff(wuffs_deflate__decoder* self,
uint32_t a_n_codes0,
uint32_t a_n_codes1,
uint32_t a_base_symbol) {
wuffs_base__status status = NULL;
uint16_t v_counts[16];
uint32_t v_i;
uint32_t v_remaining;
@@ -5778,36 +5748,29 @@ wuffs_deflate__decoder__init_huff(wuffs_deflate__decoder* self,
v_i = a_n_codes0;
while (v_i < a_n_codes1) {
if (v_counts[self->private_impl.f_code_lengths[v_i]] >= 320) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_counts[self->private_impl.f_code_lengths[v_i]] += 1;
v_i += 1;
}
if ((((uint32_t)(v_counts[0])) + a_n_codes0) == a_n_codes1) {
status = wuffs_deflate__error__no_huffman_codes;
goto exit;
return wuffs_deflate__error__no_huffman_codes;
}
v_remaining = 1;
v_i = 1;
while (v_i <= 15) {
if (v_remaining > 1073741824) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_remaining <<= 1;
if (v_remaining < ((uint32_t)(v_counts[v_i]))) {
status = wuffs_deflate__error__bad_huffman_code_over_subscribed;
goto exit;
return wuffs_deflate__error__bad_huffman_code_over_subscribed;
}
v_remaining -= ((uint32_t)(v_counts[v_i]));
v_i += 1;
}
if (v_remaining != 0) {
status = wuffs_deflate__error__bad_huffman_code_under_subscribed;
goto exit;
return wuffs_deflate__error__bad_huffman_code_under_subscribed;
}
memset(v_offsets, 0, sizeof(v_offsets));
v_n_symbols = 0;
@@ -5816,31 +5779,23 @@ wuffs_deflate__decoder__init_huff(wuffs_deflate__decoder* self,
v_offsets[v_i] = ((uint16_t)(v_n_symbols));
v_count = ((uint32_t)(v_counts[v_i]));
if (v_n_symbols > (320 - v_count)) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_n_symbols = (v_n_symbols + v_count);
v_i += 1;
}
if (v_n_symbols > 288) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
memset(v_symbols, 0, sizeof(v_symbols));
v_i = a_n_codes0;
while (v_i < a_n_codes1) {
if (v_i < a_n_codes0) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
if (self->private_impl.f_code_lengths[v_i] != 0) {
if (v_offsets[self->private_impl.f_code_lengths[v_i]] >= 320) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_symbols[v_offsets[self->private_impl.f_code_lengths[v_i]]] =
((uint16_t)((v_i - a_n_codes0)));
@@ -5854,8 +5809,7 @@ wuffs_deflate__decoder__init_huff(wuffs_deflate__decoder* self,
goto label_0_break;
}
if (v_min_cl >= 9) {
status = wuffs_deflate__error__bad_huffman_minimum_code_length;
goto exit;
return wuffs_deflate__error__bad_huffman_minimum_code_length;
}
v_min_cl += 1;
}
@@ -5866,8 +5820,7 @@ label_0_break:;
goto label_1_break;
}
if (v_max_cl <= 1) {
status = wuffs_deflate__error__no_huffman_codes;
goto exit;
return wuffs_deflate__error__no_huffman_codes;
}
v_max_cl -= 1;
}
@@ -5880,14 +5833,10 @@ label_1_break:;
v_i = 0;
if ((v_n_symbols != ((uint32_t)(v_offsets[v_max_cl]))) ||
(v_n_symbols != ((uint32_t)(v_offsets[15])))) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
if ((a_n_codes0 + ((uint32_t)(v_symbols[0]))) >= 320) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_initial_high_bits = 512;
if (v_max_cl < 9) {
@@ -5903,18 +5852,14 @@ label_1_break:;
v_value = 0;
while (true) {
if ((a_n_codes0 + ((uint32_t)(v_symbols[v_i]))) >= 320) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_cl = ((uint32_t)(self->private_impl.f_code_lengths[(
a_n_codes0 + ((uint32_t)(v_symbols[v_i])))]));
if (v_cl > v_prev_cl) {
v_code <<= (v_cl - v_prev_cl);
if (v_code >= 32768) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
}
v_prev_cl = v_cl;
@@ -5934,26 +5879,20 @@ label_1_break:;
}
v_remaining -= ((uint32_t)(v_counts[v_j]));
if (v_remaining > 1073741824) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_remaining <<= 1;
v_j += 1;
}
label_2_break:;
if ((v_j <= 9) || (15 < v_j)) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_tmp = (v_j - 9);
v_initial_high_bits = (((uint32_t)(1)) << v_tmp);
v_top = v_next_top;
if ((v_top + (((uint32_t)(1)) << v_tmp)) > 1234) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_next_top = (v_top + (((uint32_t)(1)) << v_tmp));
v_redirect_key =
@@ -5964,9 +5903,7 @@ label_1_break:;
}
}
if ((v_key >= 512) || (v_counts[v_prev_cl] <= 0)) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_counts[v_prev_cl] -= 1;
v_reversed_key = (((uint32_t)(wuffs_deflate__reverse8[(v_key >> 1)])) |
@@ -5985,18 +5922,14 @@ label_1_break:;
v_value = (wuffs_deflate__dcode_magic_numbers[(v_symbol & 31)] | v_cl);
}
} else {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
v_high_bits = v_initial_high_bits;
v_delta = (((uint32_t)(1)) << v_cl);
while (v_high_bits >= v_delta) {
v_high_bits -= v_delta;
if ((v_top + ((v_high_bits | v_reversed_key) & 511)) >= 1234) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
self->private_impl
.f_huffs[a_which][(v_top + ((v_high_bits | v_reversed_key) & 511))] =
@@ -6008,15 +5941,11 @@ label_1_break:;
}
v_code += 1;
if (v_code >= 32768) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
return wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
}
}
label_3_break:;
goto exit;
exit:
return status;
return NULL;
}
// -------- func deflate.decoder.decode_huffman_fast