diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index ba6ec687..9c0400bf 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -443,7 +443,7 @@ func (g *gen) writeStruct(n *a.Struct) error { const maxDepth = 1 g.writes("struct {\n") g.writes("uint32_t coro_state;\n") - if err := g.writeVars(o.Body(), 0); err != nil { + if err := g.writeVars(o.Body()); err != nil { return err } g.printf("} %s%s[%d];\n", cPrefix, o.Name().String(g.tm), maxDepth) @@ -634,16 +634,22 @@ func (g *gen) writeFuncImpl(n *a.Func) error { g.writes("\n") // Generate the local variables. - if err := g.writeVars(n.Body(), 0); err != nil { + if err := g.writeVars(n.Body()); err != nil { return err } g.writes("\n") - // Generate a coroutine switch similiar to the technique in - // https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html if g.perFunc.suspendible { + g.printf("if (self->private_impl.%s%s[0].coro_state) {\n", cPrefix, n.Name().String(g.tm)) + if err := g.writeResumeSuspend(n.Body(), false); err != nil { + return err + } + g.writes("}\n") + // Generate a coroutine switch similiar to the technique in + // https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html + // // TODO: don't hard-code [0], and allow recursive coroutines. - g.printf("switch (self->private_impl.%s%s[0].coro_state) {\ncase 0:\n", + g.printf("switch (self->private_impl.%s%s[0].coro_state) {\ncase 0:\n\n", cPrefix, n.Name().String(g.tm)) } @@ -655,11 +661,21 @@ func (g *gen) writeFuncImpl(n *a.Func) error { } if g.perFunc.suspendible { - g.writes("}\n\n") // Close the coroutine switch. - if g.perFunc.public { - g.writes("cleanup0: self->private_impl.status = status;\n") + g.writes("}\n") // Close the coroutine switch. + g.writes("goto cleanup0;\n\n") + // Avoid the "unused label" warning. + // + // TODO: delete this. + g.writes("goto suspend;\n") + g.writes("suspend:\n") + if err := g.writeResumeSuspend(n.Body(), true); err != nil { + return err } - g.writes("return status;\n") + g.writes("\ncleanup0:") + if g.perFunc.public { + g.writes("self->private_impl.status = status;\n") + } + g.writes("return status;\n\n") } g.writes("}\n\n") @@ -737,7 +753,7 @@ func (g *gen) writeFuncImplArgChecks(n *a.Func) error { return nil } -func (g *gen) writeVars(block []*a.Node, depth uint32) error { +func (g *gen) visitVars(block []*a.Node, depth uint32, f func(*gen, *a.Var) error) error { if depth > a.MaxBodyDepth { return fmt.Errorf("body recursion depth too large") } @@ -747,27 +763,21 @@ func (g *gen) writeVars(block []*a.Node, depth uint32) error { switch o.Kind() { case a.KIf: for o := o.If(); o != nil; o = o.ElseIf() { - if err := g.writeVars(o.BodyIfTrue(), depth); err != nil { + if err := g.visitVars(o.BodyIfTrue(), depth, f); err != nil { return err } - if err := g.writeVars(o.BodyIfFalse(), depth); err != nil { + if err := g.visitVars(o.BodyIfFalse(), depth, f); err != nil { return err } } case a.KVar: - o := o.Var() - if v := o.Value(); v != nil && v.ID0().Key() == t.KeyLimit { - g.printf("uint64_t %s%v;\n", lPrefix, o.Name().String(g.tm)) - } - if err := g.writeCTypeName(o.XType(), vPrefix, o.Name().String(g.tm)); err != nil { + if err := f(g, o.Var()); err != nil { return err } - g.writes(";\n") - continue case a.KWhile: - if err := g.writeVars(o.While().Body(), depth); err != nil { + if err := g.visitVars(o.While().Body(), depth, f); err != nil { return err } } @@ -775,6 +785,55 @@ func (g *gen) writeVars(block []*a.Node, depth uint32) error { return nil } +func (g *gen) writeResumeSuspend1(n *a.Var, prefix string, suspend bool) error { + lhs := fmt.Sprintf("%s%s", prefix, n.Name().String(g.tm)) + // TODO: don't hard-code [0], and allow recursive coroutines. + rhs := fmt.Sprintf("self->private_impl.%s%s[0].%s", cPrefix, g.perFunc.funk.Name().String(g.tm), lhs) + if suspend { + lhs, rhs = rhs, lhs + } + typ := n.XType() + switch typ.Decorator().Key() { + case 0: + g.printf("%s = %s;\n", lhs, rhs) + return nil + case t.KeyOpenBracket: + if inner := typ.Inner(); inner.Decorator() != 0 || inner.Name().Key() != t.KeyU8 { + break + } + cv := typ.ArrayLength().ConstValue() + // TODO: check that cv is within size_t's range. + g.printf("memcpy(%s, %s, %v);\n", lhs, rhs, cv) + return nil + } + return fmt.Errorf("cannot resume or suspend a local variable %q of type %q", + n.Name().String(g.tm), n.XType().String(g.tm)) +} + +func (g *gen) writeResumeSuspend(block []*a.Node, suspend bool) error { + return g.visitVars(block, 0, func(g *gen, n *a.Var) error { + if v := n.Value(); v != nil && v.ID0().Key() == t.KeyLimit { + if err := g.writeResumeSuspend1(n, lPrefix, suspend); err != nil { + return err + } + } + return g.writeResumeSuspend1(n, vPrefix, suspend) + }) +} + +func (g *gen) writeVars(block []*a.Node) error { + return g.visitVars(block, 0, func(g *gen, n *a.Var) error { + if v := n.Value(); v != nil && v.ID0().Key() == t.KeyLimit { + g.printf("uint64_t %s%v;\n", lPrefix, n.Name().String(g.tm)) + } + if err := g.writeCTypeName(n.XType(), vPrefix, n.Name().String(g.tm)); err != nil { + return err + } + g.writes(";\n") + return nil + }) +} + func (g *gen) writeStatement(n *a.Node, depth uint32) error { if depth > a.MaxBodyDepth { return fmt.Errorf("body recursion depth too large") diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index ac96c673..0aedd266 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -380,8 +380,12 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, uint8_t v_c; + if (self->private_impl.c_decode[0].coro_state) { + v_c = self->private_impl.c_decode[0].v_c; + } switch (self->private_impl.c_decode[0].coro_state) { case 0: + status = puffs_gif_decoder_decode_header(self, a_src); if (status) { goto cleanup0; @@ -422,6 +426,11 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, } } } + goto cleanup0; + + goto suspend; +suspend: + self->private_impl.c_decode[0].v_c = v_c; cleanup0: self->private_impl.status = status; @@ -435,8 +444,13 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, uint8_t v_c[6]; uint32_t v_i; + if (self->private_impl.c_decode_header[0].coro_state) { + memcpy(v_c, self->private_impl.c_decode_header[0].v_c, 6); + v_i = self->private_impl.c_decode_header[0].v_i; + } switch (self->private_impl.c_decode_header[0].coro_state) { case 0: + for (size_t i = 0; i < 6; i++) { v_c[i] = 0; }; @@ -462,7 +476,14 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, return puffs_gif_error_bad_gif_header; } } + goto cleanup0; + goto suspend; +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; + +cleanup0: return status; } @@ -474,8 +495,14 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, uint32_t v_i; uint32_t v_gct_size; + if (self->private_impl.c_decode_lsd[0].coro_state) { + memcpy(v_c, self->private_impl.c_decode_lsd[0].v_c, 7); + v_i = self->private_impl.c_decode_lsd[0].v_i; + v_gct_size = self->private_impl.c_decode_lsd[0].v_gct_size; + } switch (self->private_impl.c_decode_lsd[0].coro_state) { case 0: + for (size_t i = 0; i < 7; i++) { v_c[i] = 0; }; @@ -544,7 +571,15 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, } } } + goto cleanup0; + goto suspend; +suspend: + memcpy(self->private_impl.c_decode_lsd[0].v_c, v_c, 7); + self->private_impl.c_decode_lsd[0].v_i = v_i; + self->private_impl.c_decode_lsd[0].v_gct_size = v_gct_size; + +cleanup0: return status; } @@ -555,8 +590,13 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, uint8_t v_label; uint8_t v_block_size; + if (self->private_impl.c_decode_extension[0].coro_state) { + v_label = self->private_impl.c_decode_extension[0].v_label; + v_block_size = self->private_impl.c_decode_extension[0].v_block_size; + } switch (self->private_impl.c_decode_extension[0].coro_state) { case 0: + if ((a_src.buf->ri >= a_src.buf->wi) || (a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) { status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) @@ -604,7 +644,14 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, } label_0_break:; } + goto cleanup0; + goto suspend; +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; + +cleanup0: return status; } @@ -621,8 +668,18 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, uint64_t l_lzw_src; puffs_base_reader1 v_lzw_src; + if (self->private_impl.c_decode_id[0].coro_state) { + memcpy(v_c, self->private_impl.c_decode_id[0].v_c, 9); + v_i = self->private_impl.c_decode_id[0].v_i; + v_interlace = self->private_impl.c_decode_id[0].v_interlace; + v_lw = self->private_impl.c_decode_id[0].v_lw; + v_block_size = self->private_impl.c_decode_id[0].v_block_size; + l_lzw_src = self->private_impl.c_decode_id[0].l_lzw_src; + v_lzw_src = self->private_impl.c_decode_id[0].v_lzw_src; + } switch (self->private_impl.c_decode_id[0].coro_state) { case 0: + for (size_t i = 0; i < 9; i++) { v_c[i] = 0; }; @@ -695,7 +752,19 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, } label_0_break:; } + goto cleanup0; + goto suspend; +suspend: + memcpy(self->private_impl.c_decode_id[0].v_c, v_c, 9); + self->private_impl.c_decode_id[0].v_i = v_i; + self->private_impl.c_decode_id[0].v_interlace = v_interlace; + self->private_impl.c_decode_id[0].v_lw = v_lw; + self->private_impl.c_decode_id[0].v_block_size = v_block_size; + 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; + +cleanup0: return status; } @@ -746,8 +815,22 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, uint32_t v_s; uint32_t v_c; + if (self->private_impl.c_decode[0].coro_state) { + v_clear_code = self->private_impl.c_decode[0].v_clear_code; + v_end_code = self->private_impl.c_decode[0].v_end_code; + v_use_save_code = self->private_impl.c_decode[0].v_use_save_code; + v_save_code = self->private_impl.c_decode[0].v_save_code; + v_prev_code = self->private_impl.c_decode[0].v_prev_code; + v_width = self->private_impl.c_decode[0].v_width; + v_bits = self->private_impl.c_decode[0].v_bits; + v_n_bits = self->private_impl.c_decode[0].v_n_bits; + v_code = self->private_impl.c_decode[0].v_code; + v_s = self->private_impl.c_decode[0].v_s; + v_c = self->private_impl.c_decode[0].v_c; + } switch (self->private_impl.c_decode[0].coro_state) { case 0: + v_clear_code = (((uint32_t)(1)) << self->private_impl.f_literal_width); v_end_code = (v_clear_code + 1); v_use_save_code = 0; @@ -849,6 +932,21 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, v_prev_code = v_code; } } + goto cleanup0; + + goto suspend; +suspend: + self->private_impl.c_decode[0].v_clear_code = v_clear_code; + self->private_impl.c_decode[0].v_end_code = v_end_code; + self->private_impl.c_decode[0].v_use_save_code = v_use_save_code; + self->private_impl.c_decode[0].v_save_code = v_save_code; + self->private_impl.c_decode[0].v_prev_code = v_prev_code; + self->private_impl.c_decode[0].v_width = v_width; + self->private_impl.c_decode[0].v_bits = v_bits; + self->private_impl.c_decode[0].v_n_bits = v_n_bits; + self->private_impl.c_decode[0].v_code = v_code; + self->private_impl.c_decode[0].v_s = v_s; + self->private_impl.c_decode[0].v_c = v_c; cleanup0: self->private_impl.status = status;