diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index 9c0400bf..5f46033d 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -129,6 +129,7 @@ type status struct { type perFunc struct { funk *a.Func jumpTargets map[*a.While]uint32 + coroState uint32 tempW uint32 tempR uint32 public bool @@ -661,6 +662,9 @@ func (g *gen) writeFuncImpl(n *a.Func) error { } if g.perFunc.suspendible { + if err := g.writeSuspend(); err != nil { + return err + } g.writes("}\n") // Close the coroutine switch. g.writes("goto cleanup0;\n\n") // Avoid the "unused label" warning. @@ -1037,10 +1041,24 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error { return fmt.Errorf("unrecognized ast.Kind (%s) for writeStatement", n.Kind()) } +func (g *gen) writeSuspend() error { + const maxCoroState = 0xFFFFFFFF + g.perFunc.coroState++ + if g.perFunc.coroState == maxCoroState { + return fmt.Errorf("too many coroutine states required") + } + + g.printf("case %d:;\n", g.perFunc.coroState) + return nil +} + func (g *gen) writeSuspendibles(n *a.Expr, depth uint32) error { if !n.Suspendible() { return nil } + if err := g.writeSuspend(); err != nil { + return err + } return g.writeCallSuspendibles(n, depth) } @@ -1080,8 +1098,6 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { temp := g.perFunc.tempW g.perFunc.tempW++ - // TODO: suspend coroutine state. - // // TODO: loop over all limits, not just the first one. g.printf("if ((%ssrc.buf->ri >= %ssrc.buf->wi) || "+ "(%ssrc.limit.ptr_to_len && (*%ssrc.limit.ptr_to_len == 0))) {", @@ -1136,8 +1152,6 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.printf("%ssrc.buf->ri += %s%d;\n", aPrefix, tPrefix, temp) } else if isInDst(g.tm, n, t.KeyWrite, 1) { - // TODO: suspend coroutine state. - // // TODO: don't assume that the argument is "this.stack[s:]". g.printf("if (%sdst.buf->closed) { status = puffs_%s_error_closed_for_writes;", aPrefix, g.pkgName) if g.perFunc.public && g.perFunc.suspendible { @@ -1162,7 +1176,6 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.printf("a_dst.buf->wi += sizeof(self->private_impl.f_stack) - v_s;\n") } else if isInDst(g.tm, n, t.KeyWriteU8, 1) { - // TODO: suspend coroutine state. g.printf("if (%sdst.buf->wi >= %sdst.buf->len) { status = puffs_%s_status_short_write;", aPrefix, aPrefix, g.pkgName) if g.perFunc.public && g.perFunc.suspendible { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 0aedd266..ebc71c81 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -386,45 +386,51 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, switch (self->private_impl.c_decode[0].coro_state) { case 0: + case 1:; status = puffs_gif_decoder_decode_header(self, a_src); if (status) { goto cleanup0; } + case 2:; status = puffs_gif_decoder_decode_lsd(self, a_src); if (status) { goto cleanup0; } while (true) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - goto cleanup0; - } - uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - v_c = t_0; - if (v_c == 33) { - status = puffs_gif_decoder_decode_extension(self, a_src); - if (status) { + case 3:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; goto cleanup0; } - } else if (v_c == 44) { - status = puffs_gif_decoder_decode_id(self, a_dst, a_src); - if (status) { + uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + v_c = t_0; + if (v_c == 33) { + case 4:; + status = puffs_gif_decoder_decode_extension(self, a_src); + if (status) { + goto cleanup0; + } + } else if (v_c == 44) { + case 5:; + status = puffs_gif_decoder_decode_id(self, a_dst, a_src); + if (status) { + goto cleanup0; + } + } else if (v_c == 59) { + status = puffs_gif_status_ok; + goto cleanup0; + } else { + status = puffs_gif_error_bad_gif_block; goto cleanup0; } - } else if (v_c == 59) { - status = puffs_gif_status_ok; - goto cleanup0; - } else { - status = puffs_gif_error_bad_gif_block; - goto cleanup0; - } } + case 6:; } goto cleanup0; @@ -456,25 +462,27 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, }; v_i = 0; while (v_i < 6) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - v_c[v_i] = t_0; - v_i += 1; + case 1:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + v_c[v_i] = t_0; + v_i += 1; } if ((v_c[0] != 71) || (v_c[1] != 73) || (v_c[2] != 70) || (v_c[3] != 56) || ((v_c[4] != 55) && (v_c[4] != 57)) || (v_c[5] != 97)) { return puffs_gif_error_bad_gif_header; } + case 2:; } goto cleanup0; @@ -508,19 +516,20 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, }; v_i = 0; while (v_i < 7) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - v_c[v_i] = t_0; - v_i += 1; + case 1:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + v_c[v_i] = t_0; + v_i += 1; } self->private_impl.f_width = (((uint32_t)(v_c[0])) | (((uint32_t)(v_c[1])) << 8)); @@ -531,45 +540,49 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, v_gct_size = (((uint32_t)(1)) << (1 + (v_c[4] & 7))); v_i = 0; while (v_i < v_gct_size) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - self->private_impl.f_gct[(3 * v_i) + 0] = t_1; - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - self->private_impl.f_gct[(3 * v_i) + 1] = t_2; - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_3 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - self->private_impl.f_gct[(3 * v_i) + 2] = t_3; - v_i += 1; + case 2:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + self->private_impl.f_gct[(3 * v_i) + 0] = t_1; + case 3:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + self->private_impl.f_gct[(3 * v_i) + 1] = t_2; + case 4:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_3 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + self->private_impl.f_gct[(3 * v_i) + 2] = t_3; + v_i += 1; } } + case 5:; } goto cleanup0; @@ -597,6 +610,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, switch (self->private_impl.c_decode_extension[0].coro_state) { case 0: + case 1:; 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)) @@ -617,32 +631,35 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, return puffs_gif_error_bad_gif_extension_label; } while (true) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - v_block_size = t_1; - if (v_block_size == 0) { - goto label_0_break; - } - size_t t_2 = ((uint32_t)(v_block_size)); - if (t_2 > a_src.buf->wi - a_src.buf->ri) { - t_2 -= a_src.buf->wi - a_src.buf->ri; - a_src.buf->ri = a_src.buf->wi; - status = a_src.buf->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - a_src.buf->ri += t_2; + case 2:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + v_block_size = t_1; + if (v_block_size == 0) { + goto label_0_break; + } + case 3:; + size_t t_2 = ((uint32_t)(v_block_size)); + if (t_2 > a_src.buf->wi - a_src.buf->ri) { + t_2 -= a_src.buf->wi - a_src.buf->ri; + a_src.buf->ri = a_src.buf->wi; + status = a_src.buf->closed ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + a_src.buf->ri += t_2; } label_0_break:; + case 4:; } goto cleanup0; @@ -685,19 +702,20 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, }; v_i = 0; while (v_i < 9) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - v_c[v_i] = t_0; - v_i += 1; + case 1:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + v_c[v_i] = t_0; + v_i += 1; } v_interlace = ((v_c[8] & 64) != 0); if (v_interlace) { @@ -705,6 +723,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, if ((v_c[8] & 128) != 0) { return puffs_gif_error_todo_unsupported_local_color_table; } + case 2:; 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)) @@ -723,34 +742,37 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, puffs_gif_lzw_decoder_set_literal_width(&self->private_impl.f_lzw, ((uint32_t)(v_lw))); while (true) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - v_block_size = t_2; - if (v_block_size == 0) { - goto label_0_break; - } - l_lzw_src = ((uint64_t)(v_block_size)); - v_lzw_src = (puffs_base_reader1){ - .buf = a_src.buf, - .limit = (puffs_base_limit1){ - .ptr_to_len = &l_lzw_src, .next = &a_src.limit, - }}; - status = puffs_gif_lzw_decoder_decode(&self->private_impl.f_lzw, a_dst, - v_lzw_src); - if (status) { - return status; - } + case 3:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + v_block_size = t_2; + if (v_block_size == 0) { + goto label_0_break; + } + l_lzw_src = ((uint64_t)(v_block_size)); + v_lzw_src = (puffs_base_reader1){ + .buf = a_src.buf, + .limit = (puffs_base_limit1){ + .ptr_to_len = &l_lzw_src, .next = &a_src.limit, + }}; + case 4:; + status = puffs_gif_lzw_decoder_decode(&self->private_impl.f_lzw, + a_dst, v_lzw_src); + if (status) { + return status; + } } label_0_break:; + case 5:; } goto cleanup0; @@ -842,34 +864,36 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, label_0_continue:; while (true) { while (v_n_bits < v_width) { - 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)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - goto cleanup0; - } - uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; - if (a_src.limit.ptr_to_len) { - (*a_src.limit.ptr_to_len)--; - } - v_bits |= (((uint32_t)(t_0)) << v_n_bits); - v_n_bits += 8; + case 1:; + 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)) + ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + goto cleanup0; + } + uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; + if (a_src.limit.ptr_to_len) { + (*a_src.limit.ptr_to_len)--; + } + v_bits |= (((uint32_t)(t_0)) << v_n_bits); + v_n_bits += 8; } v_code = PUFFS_LOW_BITS(v_bits, v_width); v_bits >>= v_width; v_n_bits -= v_width; if (v_code < v_clear_code) { - if (a_dst.buf->wi >= a_dst.buf->len) { - status = puffs_gif_status_short_write; - goto cleanup0; - } - a_dst.buf->ptr[a_dst.buf->wi++] = ((uint8_t)(v_code)); - if (v_use_save_code) { - self->private_impl.f_suffixes[v_save_code] = ((uint8_t)(v_code)); - self->private_impl.f_prefixes[v_save_code] = - ((uint16_t)(v_prev_code)); - } + case 2:; + if (a_dst.buf->wi >= a_dst.buf->len) { + status = puffs_gif_status_short_write; + goto cleanup0; + } + a_dst.buf->ptr[a_dst.buf->wi++] = ((uint8_t)(v_code)); + if (v_use_save_code) { + self->private_impl.f_suffixes[v_save_code] = ((uint8_t)(v_code)); + self->private_impl.f_prefixes[v_save_code] = + ((uint16_t)(v_prev_code)); + } } else if (v_code == v_clear_code) { v_use_save_code = false; v_save_code = v_end_code; @@ -900,24 +924,25 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, if ((v_code == v_save_code) && v_use_save_code) { self->private_impl.f_stack[4095] = ((uint8_t)(v_c)); } - if (a_dst.buf->closed) { - status = puffs_gif_error_closed_for_writes; - goto cleanup0; - } - if ((a_dst.buf->len - a_dst.buf->wi) < - (sizeof(self->private_impl.f_stack) - v_s)) { - status = puffs_gif_status_short_write; - goto cleanup0; - } - memmove(a_dst.buf->ptr + a_dst.buf->wi, - self->private_impl.f_stack + v_s, - sizeof(self->private_impl.f_stack) - v_s); - a_dst.buf->wi += sizeof(self->private_impl.f_stack) - v_s; - if (v_use_save_code) { - self->private_impl.f_suffixes[v_save_code] = ((uint8_t)(v_c)); - self->private_impl.f_prefixes[v_save_code] = - ((uint16_t)(v_prev_code)); - } + case 3:; + if (a_dst.buf->closed) { + status = puffs_gif_error_closed_for_writes; + goto cleanup0; + } + if ((a_dst.buf->len - a_dst.buf->wi) < + (sizeof(self->private_impl.f_stack) - v_s)) { + status = puffs_gif_status_short_write; + goto cleanup0; + } + memmove(a_dst.buf->ptr + a_dst.buf->wi, + self->private_impl.f_stack + v_s, + sizeof(self->private_impl.f_stack) - v_s); + a_dst.buf->wi += sizeof(self->private_impl.f_stack) - v_s; + if (v_use_save_code) { + self->private_impl.f_suffixes[v_save_code] = ((uint8_t)(v_c)); + self->private_impl.f_prefixes[v_save_code] = + ((uint16_t)(v_prev_code)); + } } else { status = puffs_gif_error_lzw_code_is_out_of_range; goto cleanup0; @@ -931,6 +956,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, } v_prev_code = v_code; } + case 4:; } goto cleanup0;