Refactor std/flate's decoder.decode.

This commit is contained in:
Nigel Tao committed 2017-07-28 09:04:34 +10:00
1 parent 89d4f68036
commit 9e03aeabe0
6 files changed
+102 -102

No files matched your search

+4 -4
View File
@@ -961,16 +961,16 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
}
g.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_dynamic", 2) {
g.printf("status = %s%s_decode_dynamic(self, %sdst, %ssrc);\n",
} else if isThisMethod(g.tm, n, "decode_huffman", 2) {
g.printf("status = %s%s_decode_huffman(self, %sdst, %ssrc);\n",
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
}
g.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "init_huffs", 1) {
g.printf("status = %s%s_init_huffs(self, %ssrc);\n",
} else if isThisMethod(g.tm, n, "init_dynamic_huffman", 1) {
g.printf("status = %s%s_init_dynamic_huffman(self, %ssrc);\n",
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
+84 -80
View File
@@ -168,7 +168,7 @@ typedef struct {
uint32_t v_lmask;
uint32_t v_table_entry;
uint32_t v_table_entry_n_bits;
} c_decode_dynamic[1];
} c_decode_huffman[1];
struct {
uint32_t coro_susp_point;
uint32_t v_bits;
@@ -183,7 +183,7 @@ typedef struct {
uint32_t v_n_extra_bits;
uint8_t v_rep_symbol;
uint32_t v_rep_count;
} c_init_huffs[1];
} c_init_dynamic_huffman[1];
struct {
uint32_t coro_susp_point;
uint32_t v_i;
@@ -366,12 +366,13 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_decoder_decode_dynamic(puffs_flate_decoder* self,
puffs_flate_status puffs_flate_decoder_decode_huffman(puffs_flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_decoder_init_huffs(puffs_flate_decoder* self,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_decoder_init_dynamic_huffman(
puffs_flate_decoder* self,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self,
uint32_t a_which,
@@ -458,7 +459,9 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
while (true) {
v_final = 0;
label_0_continue:;
while (v_final == 0) {
while (self->private_impl.f_n_bits < 3) {
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
@@ -500,6 +503,7 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
if (status) {
goto suspend;
}
goto label_0_continue;
} else if (v_type == 1) {
status = PUFFS_FLATE_ERROR_TODO_FIXED_HUFFMAN_BLOCKS;
goto exit;
@@ -515,7 +519,7 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
}
}
}
status = puffs_flate_decoder_decode_dynamic(self, a_dst, a_src);
status = puffs_flate_decoder_init_dynamic_huffman(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -534,8 +538,30 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
status = PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK;
goto exit;
}
if (v_final != 0) {
status = PUFFS_FLATE_STATUS_OK;
PUFFS_COROUTINE_SUSPENSION_POINT(4);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_flate_decoder_decode_huffman(self, a_dst, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
goto suspend;
}
}
@@ -719,7 +745,7 @@ short_read_src:
goto suspend;
}
puffs_flate_status puffs_flate_decoder_decode_dynamic(
puffs_flate_status puffs_flate_decoder_decode_huffman(
puffs_flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
@@ -759,44 +785,18 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic(
}
uint32_t coro_susp_point =
self->private_impl.c_decode_dynamic[0].coro_susp_point;
self->private_impl.c_decode_huffman[0].coro_susp_point;
if (coro_susp_point) {
v_bits = self->private_impl.c_decode_dynamic[0].v_bits;
v_n_bits = self->private_impl.c_decode_dynamic[0].v_n_bits;
v_lmask = self->private_impl.c_decode_dynamic[0].v_lmask;
v_table_entry = self->private_impl.c_decode_dynamic[0].v_table_entry;
v_bits = self->private_impl.c_decode_huffman[0].v_bits;
v_n_bits = self->private_impl.c_decode_huffman[0].v_n_bits;
v_lmask = self->private_impl.c_decode_huffman[0].v_lmask;
v_table_entry = self->private_impl.c_decode_huffman[0].v_table_entry;
v_table_entry_n_bits =
self->private_impl.c_decode_dynamic[0].v_table_entry_n_bits;
self->private_impl.c_decode_huffman[0].v_table_entry_n_bits;
}
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_flate_decoder_init_huffs(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
goto suspend;
}
v_bits = self->private_impl.f_bits;
v_n_bits = self->private_impl.f_n_bits;
v_lmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1);
@@ -811,7 +811,7 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic(
v_n_bits -= v_table_entry_n_bits;
goto label_1_break;
}
PUFFS_COROUTINE_SUSPENSION_POINT(2);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -825,7 +825,7 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic(
goto exit;
}
if ((v_table_entry >> 30) != 0) {
PUFFS_COROUTINE_SUSPENSION_POINT(3);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (b_wptr_dst == b_wend_dst) {
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
goto suspend;
@@ -848,18 +848,18 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic(
label_0_break:;
self->private_impl.f_bits = v_bits;
self->private_impl.f_n_bits = v_n_bits;
self->private_impl.c_decode_dynamic[0].coro_susp_point = 0;
self->private_impl.c_decode_huffman[0].coro_susp_point = 0;
goto exit;
}
goto suspend;
suspend:
self->private_impl.c_decode_dynamic[0].coro_susp_point = coro_susp_point;
self->private_impl.c_decode_dynamic[0].v_bits = v_bits;
self->private_impl.c_decode_dynamic[0].v_n_bits = v_n_bits;
self->private_impl.c_decode_dynamic[0].v_lmask = v_lmask;
self->private_impl.c_decode_dynamic[0].v_table_entry = v_table_entry;
self->private_impl.c_decode_dynamic[0].v_table_entry_n_bits =
self->private_impl.c_decode_huffman[0].coro_susp_point = coro_susp_point;
self->private_impl.c_decode_huffman[0].v_bits = v_bits;
self->private_impl.c_decode_huffman[0].v_n_bits = v_n_bits;
self->private_impl.c_decode_huffman[0].v_lmask = v_lmask;
self->private_impl.c_decode_huffman[0].v_table_entry = v_table_entry;
self->private_impl.c_decode_huffman[0].v_table_entry_n_bits =
v_table_entry_n_bits;
exit:
@@ -898,8 +898,9 @@ short_read_src:
goto suspend;
}
puffs_flate_status puffs_flate_decoder_init_huffs(puffs_flate_decoder* self,
puffs_base_reader1 a_src) {
puffs_flate_status puffs_flate_decoder_init_dynamic_huffman(
puffs_flate_decoder* self,
puffs_base_reader1 a_src) {
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
uint32_t v_bits;
@@ -929,21 +930,23 @@ puffs_flate_status puffs_flate_decoder_init_huffs(puffs_flate_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_susp_point = self->private_impl.c_init_huffs[0].coro_susp_point;
uint32_t coro_susp_point =
self->private_impl.c_init_dynamic_huffman[0].coro_susp_point;
if (coro_susp_point) {
v_bits = self->private_impl.c_init_huffs[0].v_bits;
v_n_bits = self->private_impl.c_init_huffs[0].v_n_bits;
v_n_lit = self->private_impl.c_init_huffs[0].v_n_lit;
v_n_dist = self->private_impl.c_init_huffs[0].v_n_dist;
v_n_clen = self->private_impl.c_init_huffs[0].v_n_clen;
v_i = self->private_impl.c_init_huffs[0].v_i;
v_mask = self->private_impl.c_init_huffs[0].v_mask;
v_table_entry = self->private_impl.c_init_huffs[0].v_table_entry;
v_bits = self->private_impl.c_init_dynamic_huffman[0].v_bits;
v_n_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_bits;
v_n_lit = self->private_impl.c_init_dynamic_huffman[0].v_n_lit;
v_n_dist = self->private_impl.c_init_dynamic_huffman[0].v_n_dist;
v_n_clen = self->private_impl.c_init_dynamic_huffman[0].v_n_clen;
v_i = self->private_impl.c_init_dynamic_huffman[0].v_i;
v_mask = self->private_impl.c_init_dynamic_huffman[0].v_mask;
v_table_entry = self->private_impl.c_init_dynamic_huffman[0].v_table_entry;
v_table_entry_n_bits =
self->private_impl.c_init_huffs[0].v_table_entry_n_bits;
v_n_extra_bits = self->private_impl.c_init_huffs[0].v_n_extra_bits;
v_rep_symbol = self->private_impl.c_init_huffs[0].v_rep_symbol;
v_rep_count = self->private_impl.c_init_huffs[0].v_rep_count;
self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits;
v_n_extra_bits =
self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits;
v_rep_symbol = self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol;
v_rep_count = self->private_impl.c_init_dynamic_huffman[0].v_rep_count;
}
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
@@ -1100,26 +1103,27 @@ puffs_flate_status puffs_flate_decoder_init_huffs(puffs_flate_decoder* self,
}
self->private_impl.f_bits = v_bits;
self->private_impl.f_n_bits = v_n_bits;
self->private_impl.c_init_huffs[0].coro_susp_point = 0;
self->private_impl.c_init_dynamic_huffman[0].coro_susp_point = 0;
goto exit;
}
goto suspend;
suspend:
self->private_impl.c_init_huffs[0].coro_susp_point = coro_susp_point;
self->private_impl.c_init_huffs[0].v_bits = v_bits;
self->private_impl.c_init_huffs[0].v_n_bits = v_n_bits;
self->private_impl.c_init_huffs[0].v_n_lit = v_n_lit;
self->private_impl.c_init_huffs[0].v_n_dist = v_n_dist;
self->private_impl.c_init_huffs[0].v_n_clen = v_n_clen;
self->private_impl.c_init_huffs[0].v_i = v_i;
self->private_impl.c_init_huffs[0].v_mask = v_mask;
self->private_impl.c_init_huffs[0].v_table_entry = v_table_entry;
self->private_impl.c_init_huffs[0].v_table_entry_n_bits =
self->private_impl.c_init_dynamic_huffman[0].coro_susp_point =
coro_susp_point;
self->private_impl.c_init_dynamic_huffman[0].v_bits = v_bits;
self->private_impl.c_init_dynamic_huffman[0].v_n_bits = v_n_bits;
self->private_impl.c_init_dynamic_huffman[0].v_n_lit = v_n_lit;
self->private_impl.c_init_dynamic_huffman[0].v_n_dist = v_n_dist;
self->private_impl.c_init_dynamic_huffman[0].v_n_clen = v_n_clen;
self->private_impl.c_init_dynamic_huffman[0].v_i = v_i;
self->private_impl.c_init_dynamic_huffman[0].v_mask = v_mask;
self->private_impl.c_init_dynamic_huffman[0].v_table_entry = v_table_entry;
self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits =
v_table_entry_n_bits;
self->private_impl.c_init_huffs[0].v_n_extra_bits = v_n_extra_bits;
self->private_impl.c_init_huffs[0].v_rep_symbol = v_rep_symbol;
self->private_impl.c_init_huffs[0].v_rep_count = v_rep_count;
self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits = v_n_extra_bits;
self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol = v_rep_symbol;
self->private_impl.c_init_dynamic_huffman[0].v_rep_count = v_rep_count;
exit:
if (a_src.buf) {
+2 -2
View File
@@ -168,7 +168,7 @@ typedef struct {
uint32_t v_lmask;
uint32_t v_table_entry;
uint32_t v_table_entry_n_bits;
} c_decode_dynamic[1];
} c_decode_huffman[1];
struct {
uint32_t coro_susp_point;
uint32_t v_bits;
@@ -183,7 +183,7 @@ typedef struct {
uint32_t v_n_extra_bits;
uint8_t v_rep_symbol;
uint32_t v_rep_count;
} c_init_huffs[1];
} c_init_dynamic_huffman[1];
struct {
uint32_t coro_susp_point;
uint32_t v_i;
+2 -2
View File
@@ -649,8 +649,8 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int,
isInDst(q.tm, n, t.KeyCopyFrom32, 2) ||
isThisMethod(q.tm, n, "decode_header", 1) || isThisMethod(q.tm, n, "decode_lsd", 1) ||
isThisMethod(q.tm, n, "decode_extension", 1) || isThisMethod(q.tm, n, "decode_id", 2) ||
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_dynamic", 2) ||
isThisMethod(q.tm, n, "init_huffs", 1) || isThisMethod(q.tm, n, "init_huff", 4) {
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) ||
isThisMethod(q.tm, n, "init_dynamic_huffman", 1) || isThisMethod(q.tm, n, "init_huff", 4) {
for _, o := range n.Args() {
// TODO: check that the arg range at the caller and the
+2 -2
View File
@@ -349,8 +349,8 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
isInDst(q.tm, n, t.KeyCopyFrom32, 2) ||
isThisMethod(q.tm, n, "decode_header", 1) || isThisMethod(q.tm, n, "decode_lsd", 1) ||
isThisMethod(q.tm, n, "decode_extension", 1) || isThisMethod(q.tm, n, "decode_id", 2) ||
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_dynamic", 2) ||
isThisMethod(q.tm, n, "init_huffs", 1) || isThisMethod(q.tm, n, "init_huff", 4) {
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) ||
isThisMethod(q.tm, n, "init_dynamic_huffman", 1) || isThisMethod(q.tm, n, "init_huff", 4) {
if err := q.tcheckExpr(n.LHS().Expr(), depth); err != nil {
return err
+8 -12
View File
@@ -88,31 +88,30 @@ pub struct decoder?(
)
pub func decoder.decode?(dst writer1, src reader1)() {
while true {
var final u32
while final == 0 {
while this.n_bits < 3,
post this.n_bits >= 3,
{
this.bits |= (in.src.read_u8?() as u32) << this.n_bits
this.n_bits += 8
}
var final u32 = this.bits & 0x01
final = this.bits & 0x01
var type u32 = (this.bits >> 1) & 0x03
this.bits >>= 3
this.n_bits -= 3
if type == 0 {
this.decode_uncompressed?(dst:in.dst, src:in.src)
continue
} else if type == 1 {
return error "TODO: fixed Huffman blocks"
} else if type == 2 {
this.decode_dynamic?(dst:in.dst, src:in.src)
this.init_dynamic_huffman?(src:in.src)
} else {
return error "bad flate block"
}
if final != 0 {
return
}
this.decode_huffman?(dst:in.dst, src:in.src)
}
}
@@ -129,10 +128,7 @@ pri func decoder.decode_uncompressed?(dst writer1, src reader1)() {
in.dst.copy_from32?(r:in.src, n:n.low_bits(n:16))
}
// decode_dynamic decodes dynamic Huffman codes as per the RFC section 3.2.7.
pri func decoder.decode_dynamic?(dst writer1, src reader1)() {
this.init_huffs?(src:in.src)
pri func decoder.decode_huffman?(dst writer1, src reader1)() {
var bits u32 = this.bits
var n_bits u32 = this.n_bits
@@ -178,7 +174,7 @@ pri func decoder.decode_dynamic?(dst writer1, src reader1)() {
this.n_bits = n_bits
}
pri func decoder.init_huffs?(src reader1)() {
pri func decoder.init_dynamic_huffman?(src reader1)() {
var bits u32 = this.bits
var n_bits u32 = this.n_bits
while n_bits < 14,