From 018d8d18934abdbdb33268cef7a68eebd481aa66 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 26 Aug 2017 17:27:01 +1000 Subject: [PATCH] Don't have suspend state if we don't suspend. --- cmd/puffs-c/internal/cgen/cgen.go | 3 + cmd/puffs-c/internal/cgen/func.go | 16 ++++- gen/c/std/flate.c | 98 +------------------------------ gen/h/std/flate.h | 28 --------- 4 files changed, 18 insertions(+), 127 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/cgen.go b/cmd/puffs-c/internal/cgen/cgen.go index 37d9cbf8..43336567 100644 --- a/cmd/puffs-c/internal/cgen/cgen.go +++ b/cmd/puffs-c/internal/cgen/cgen.go @@ -558,6 +558,9 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error { if o.Receiver() != n.Name() || !o.Suspendible() { continue } + if k := g.funks[o.QID()]; k.coroSuspPoint == 0 { + continue + } // TODO: allow max depth > 1 for recursive coroutines. const maxDepth = 1 b.writes("struct {\n") diff --git a/cmd/puffs-c/internal/cgen/func.go b/cmd/puffs-c/internal/cgen/func.go index 10285ef4..69e965ba 100644 --- a/cmd/puffs-c/internal/cgen/func.go +++ b/cmd/puffs-c/internal/cgen/func.go @@ -97,9 +97,21 @@ func (g *gen) writeFuncImpl(b *buffer, n *a.Func) error { } b.writes("{\n") b.writex(k.bHeader) - b.writex(k.bBodyResume) + if k.suspendible { + if k.coroSuspPoint > 0 { + b.writex(k.bBodyResume) + } else { + b.writes("{\n") + } + } b.writex(k.bBody) - b.writex(k.bBodySuspend) + if k.suspendible { + if k.coroSuspPoint > 0 { + b.writex(k.bBodySuspend) + } else { + b.writes("}\n") + } + } b.writex(k.bFooter) b.writes("}\n\n") return nil diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 0aa1f1e0..13e7c3f5 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -201,34 +201,6 @@ typedef struct { uint8_t v_rep_symbol; uint32_t v_rep_count; } c_init_dynamic_huffman[1]; - struct { - uint32_t coro_susp_point; - uint16_t v_counts[16]; - uint32_t v_i; - uint32_t v_remaining; - uint16_t v_offsets[16]; - uint32_t v_n_symbols; - uint32_t v_count; - uint16_t v_symbols[320]; - uint32_t v_min_cl; - uint32_t v_max_cl; - uint32_t v_initial_high_bits; - uint32_t v_prev_cl; - uint32_t v_prev_redirect_key; - uint32_t v_top; - uint32_t v_next_top; - uint32_t v_code; - uint32_t v_key; - uint32_t v_value; - uint32_t v_cl; - uint32_t v_tmp; - uint32_t v_redirect_key; - uint32_t v_j; - uint32_t v_reversed_key; - uint32_t v_symbol; - uint32_t v_high_bits; - uint32_t v_delta; - } c_init_huff[1]; } private_impl; } puffs_flate_decoder; @@ -1532,40 +1504,7 @@ puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self, uint32_t v_high_bits; uint32_t v_delta; - uint32_t coro_susp_point = self->private_impl.c_init_huff[0].coro_susp_point; - if (coro_susp_point) { - memcpy(v_counts, self->private_impl.c_init_huff[0].v_counts, - sizeof(v_counts)); - v_i = self->private_impl.c_init_huff[0].v_i; - v_remaining = self->private_impl.c_init_huff[0].v_remaining; - memcpy(v_offsets, self->private_impl.c_init_huff[0].v_offsets, - sizeof(v_offsets)); - v_n_symbols = self->private_impl.c_init_huff[0].v_n_symbols; - v_count = self->private_impl.c_init_huff[0].v_count; - memcpy(v_symbols, self->private_impl.c_init_huff[0].v_symbols, - sizeof(v_symbols)); - v_min_cl = self->private_impl.c_init_huff[0].v_min_cl; - v_max_cl = self->private_impl.c_init_huff[0].v_max_cl; - v_initial_high_bits = self->private_impl.c_init_huff[0].v_initial_high_bits; - v_prev_cl = self->private_impl.c_init_huff[0].v_prev_cl; - v_prev_redirect_key = self->private_impl.c_init_huff[0].v_prev_redirect_key; - v_top = self->private_impl.c_init_huff[0].v_top; - v_next_top = self->private_impl.c_init_huff[0].v_next_top; - v_code = self->private_impl.c_init_huff[0].v_code; - v_key = self->private_impl.c_init_huff[0].v_key; - v_value = self->private_impl.c_init_huff[0].v_value; - v_cl = self->private_impl.c_init_huff[0].v_cl; - v_tmp = self->private_impl.c_init_huff[0].v_tmp; - v_redirect_key = self->private_impl.c_init_huff[0].v_redirect_key; - v_j = self->private_impl.c_init_huff[0].v_j; - v_reversed_key = self->private_impl.c_init_huff[0].v_reversed_key; - v_symbol = self->private_impl.c_init_huff[0].v_symbol; - v_high_bits = self->private_impl.c_init_huff[0].v_high_bits; - v_delta = self->private_impl.c_init_huff[0].v_delta; - } - switch (coro_susp_point) { - PUFFS_COROUTINE_SUSPENSION_POINT(0); - + { memset(v_counts, 0, sizeof(v_counts)); v_i = a_n_codes0; while (v_i < a_n_codes1) { @@ -1808,42 +1747,7 @@ puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self, } } label_3_break:; - self->private_impl.c_init_huff[0].coro_susp_point = 0; - goto exit; } - - goto suspend; -suspend: - self->private_impl.c_init_huff[0].coro_susp_point = coro_susp_point; - memcpy(self->private_impl.c_init_huff[0].v_counts, v_counts, - sizeof(v_counts)); - self->private_impl.c_init_huff[0].v_i = v_i; - self->private_impl.c_init_huff[0].v_remaining = v_remaining; - memcpy(self->private_impl.c_init_huff[0].v_offsets, v_offsets, - sizeof(v_offsets)); - self->private_impl.c_init_huff[0].v_n_symbols = v_n_symbols; - self->private_impl.c_init_huff[0].v_count = v_count; - memcpy(self->private_impl.c_init_huff[0].v_symbols, v_symbols, - sizeof(v_symbols)); - self->private_impl.c_init_huff[0].v_min_cl = v_min_cl; - self->private_impl.c_init_huff[0].v_max_cl = v_max_cl; - self->private_impl.c_init_huff[0].v_initial_high_bits = v_initial_high_bits; - self->private_impl.c_init_huff[0].v_prev_cl = v_prev_cl; - self->private_impl.c_init_huff[0].v_prev_redirect_key = v_prev_redirect_key; - self->private_impl.c_init_huff[0].v_top = v_top; - self->private_impl.c_init_huff[0].v_next_top = v_next_top; - self->private_impl.c_init_huff[0].v_code = v_code; - self->private_impl.c_init_huff[0].v_key = v_key; - self->private_impl.c_init_huff[0].v_value = v_value; - self->private_impl.c_init_huff[0].v_cl = v_cl; - self->private_impl.c_init_huff[0].v_tmp = v_tmp; - self->private_impl.c_init_huff[0].v_redirect_key = v_redirect_key; - self->private_impl.c_init_huff[0].v_j = v_j; - self->private_impl.c_init_huff[0].v_reversed_key = v_reversed_key; - self->private_impl.c_init_huff[0].v_symbol = v_symbol; - self->private_impl.c_init_huff[0].v_high_bits = v_high_bits; - self->private_impl.c_init_huff[0].v_delta = v_delta; - exit: return status; } diff --git a/gen/h/std/flate.h b/gen/h/std/flate.h index 91be1fa7..ca9452d9 100644 --- a/gen/h/std/flate.h +++ b/gen/h/std/flate.h @@ -201,34 +201,6 @@ typedef struct { uint8_t v_rep_symbol; uint32_t v_rep_count; } c_init_dynamic_huffman[1]; - struct { - uint32_t coro_susp_point; - uint16_t v_counts[16]; - uint32_t v_i; - uint32_t v_remaining; - uint16_t v_offsets[16]; - uint32_t v_n_symbols; - uint32_t v_count; - uint16_t v_symbols[320]; - uint32_t v_min_cl; - uint32_t v_max_cl; - uint32_t v_initial_high_bits; - uint32_t v_prev_cl; - uint32_t v_prev_redirect_key; - uint32_t v_top; - uint32_t v_next_top; - uint32_t v_code; - uint32_t v_key; - uint32_t v_value; - uint32_t v_cl; - uint32_t v_tmp; - uint32_t v_redirect_key; - uint32_t v_j; - uint32_t v_reversed_key; - uint32_t v_symbol; - uint32_t v_high_bits; - uint32_t v_delta; - } c_init_huff[1]; } private_impl; } puffs_flate_decoder;