From e1fa0e8a346ad5a6874325bfcb9d5c9c75d87762 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 16 Jul 2017 15:04:03 +1000 Subject: [PATCH] Don't save local vars if we're not suspending. --- cmd/puffs-gen-c/func.go | 6 +++--- gen/c/std/flate.c | 12 ++++++------ gen/c/std/gif.c | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd/puffs-gen-c/func.go b/cmd/puffs-gen-c/func.go index 98c57d88..3ce615be 100644 --- a/cmd/puffs-gen-c/func.go +++ b/cmd/puffs-gen-c/func.go @@ -156,8 +156,9 @@ func (g *gen) writeFuncImpl(n *a.Func) error { // We've reached the end of the function body. Reset the coroutine // suspension point so that the next call to this function starts at // the top. - g.writes("coro_susp_point = 0;\n") - g.writes("}\n\n") // Close the coroutine switch. + g.printf("self->private_impl.%s%s[0].coro_susp_point = 0;\n", + cPrefix, n.Name().String(g.tm)) + g.writes("goto exit; }\n\n") // Close the coroutine switch. g.writes("goto suspend;\n") // Avoid the "unused label" warning. g.writes("suspend:\n") @@ -169,7 +170,6 @@ func (g *gen) writeFuncImpl(n *a.Func) error { } g.writes("\n") - g.writes("goto exit;\n") // Avoid the "unused label" warning. g.writes("exit:") for _, o := range n.In().Fields() { diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 91afec43..c1a3f318 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -442,7 +442,8 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, goto suspend; } } - coro_susp_point = 0; + self->private_impl.c_decode[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -451,7 +452,6 @@ suspend: self->private_impl.c_decode[0].v_final = v_final; self->private_impl.c_decode[0].v_type = v_type; - goto exit; exit: if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -584,7 +584,8 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( goto suspend; } } - coro_susp_point = 0; + self->private_impl.c_decode_uncompressed[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -592,7 +593,6 @@ suspend: self->private_impl.c_decode_uncompressed[0].coro_susp_point = coro_susp_point; self->private_impl.c_decode_uncompressed[0].v_n = v_n; - goto exit; exit: if (a_dst.buf) { size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi); @@ -730,7 +730,8 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic( self->private_impl.f_wip1 = v_hdist; self->private_impl.f_bits = v_bits; self->private_impl.f_n_bits = v_n_bits; - coro_susp_point = 0; + self->private_impl.c_decode_dynamic[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -743,7 +744,6 @@ suspend: self->private_impl.c_decode_dynamic[0].v_hclen = v_hclen; self->private_impl.c_decode_dynamic[0].v_i = v_i; - goto exit; exit: if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index d513ca9c..228a325a 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -568,7 +568,8 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, goto exit; } } - coro_susp_point = 0; + self->private_impl.c_decode[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -576,7 +577,6 @@ suspend: self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; self->private_impl.c_decode[0].v_c = v_c; - goto exit; exit: if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -653,7 +653,8 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, status = PUFFS_GIF_ERROR_BAD_GIF_HEADER; goto exit; } - coro_susp_point = 0; + self->private_impl.c_decode_header[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -662,7 +663,6 @@ suspend: memcpy(self->private_impl.c_decode_header[0].v_c, v_c, 6); self->private_impl.c_decode_header[0].v_i = v_i; - goto exit; exit: if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -764,7 +764,8 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, v_i += 1; } } - coro_susp_point = 0; + self->private_impl.c_decode_lsd[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -774,7 +775,6 @@ suspend: self->private_impl.c_decode_lsd[0].v_i = v_i; self->private_impl.c_decode_lsd[0].v_gct_size = v_gct_size; - goto exit; exit: if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -868,7 +868,8 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, b_rptr_src += t_2; } label_0_break:; - coro_susp_point = 0; + self->private_impl.c_decode_extension[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -877,7 +878,6 @@ suspend: self->private_impl.c_decode_extension[0].v_label = v_label; self->private_impl.c_decode_extension[0].v_block_size = v_block_size; - goto exit; exit: if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -1022,7 +1022,8 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, } } label_0_break:; - coro_susp_point = 0; + self->private_impl.c_decode_id[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -1036,7 +1037,6 @@ suspend: self->private_impl.c_decode_id[0].l_lzw_src = l_lzw_src; self->private_impl.c_decode_id[0].v_lzw_src = v_lzw_src; - goto exit; exit: if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -1239,7 +1239,8 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, } v_prev_code = v_code; } - coro_susp_point = 0; + self->private_impl.c_decode[0].coro_susp_point = 0; + goto exit; } goto suspend; @@ -1256,7 +1257,6 @@ suspend: self->private_impl.c_decode[0].v_s = v_s; self->private_impl.c_decode[0].v_c = v_c; - goto exit; exit: if (a_dst.buf) { size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);