From bacd2e3b6155a4809fafca16f2ab1a8795ab1b4d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 23 Jun 2017 14:47:34 +1000 Subject: [PATCH] Add a PUFFS_COROUTINE_STATE macro. --- cmd/puffs-gen-c/base-impl.h | 10 + cmd/puffs-gen-c/data.go | 2 +- cmd/puffs-gen-c/main.go | 4 +- gen/c/std/gif.c | 692 ++++++++++++++++++------------------ 4 files changed, 363 insertions(+), 345 deletions(-) diff --git a/cmd/puffs-gen-c/base-impl.h b/cmd/puffs-gen-c/base-impl.h index dee0b8c3..c5f8c3b3 100644 --- a/cmd/puffs-gen-c/base-impl.h +++ b/cmd/puffs-gen-c/base-impl.h @@ -3,6 +3,16 @@ #ifndef PUFFS_BASE_IMPL_H #define PUFFS_BASE_IMPL_H +// Use of this source code is governed by a BSD-style license that can be found +// in the LICENSE file. + +// Use switch cases for coroutine state, similar to the technique in +// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html +// +// We use a trivial macro instead of an explicit case statement so that +// clang-format doesn't get confused by the unusual "case"s. +#define PUFFS_COROUTINE_STATE(n) case n: + #define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1)) #endif // PUFFS_BASE_IMPL_H diff --git a/cmd/puffs-gen-c/data.go b/cmd/puffs-gen-c/data.go index 1d268861..85d07309 100644 --- a/cmd/puffs-gen-c/data.go +++ b/cmd/puffs-gen-c/data.go @@ -12,5 +12,5 @@ const baseHeader = "" + "" const baseImpl = "" + - "#ifndef PUFFS_BASE_IMPL_H\n#define PUFFS_BASE_IMPL_H\n\n#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))\n\n#endif // PUFFS_BASE_IMPL_H\n" + + "#ifndef PUFFS_BASE_IMPL_H\n#define PUFFS_BASE_IMPL_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n// Use switch cases for coroutine state, similar to the technique in\n// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use a trivial macro instead of an explicit case statement so that\n// clang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_STATE(n) case n:\n\n#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))\n\n#endif // PUFFS_BASE_IMPL_H\n" + "" diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index ca08e9ea..3ebfa02a 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -650,7 +650,7 @@ func (g *gen) writeFuncImpl(n *a.Func) error { // 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\n", + g.printf("switch (self->private_impl.%s%s[0].coro_state) {\nPUFFS_COROUTINE_STATE(0);\n\n", cPrefix, n.Name().String(g.tm)) } @@ -1048,7 +1048,7 @@ func (g *gen) writeSuspend() error { return fmt.Errorf("too many coroutine states required") } - g.printf("case %d:;\n", g.perFunc.coroState) + g.printf("PUFFS_COROUTINE_STATE(%d);\n", g.perFunc.coroState) return nil } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 9076b67e..fd7fb637 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -237,6 +237,16 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, #ifndef PUFFS_BASE_IMPL_H #define PUFFS_BASE_IMPL_H +// Use of this source code is governed by a BSD-style license that can be found +// in the LICENSE file. + +// Use switch cases for coroutine state, similar to the technique in +// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html +// +// We use a trivial macro instead of an explicit case statement so that +// clang-format doesn't get confused by the unusual "case"s. +#define PUFFS_COROUTINE_STATE(n) case n: + #define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1)) #endif // PUFFS_BASE_IMPL_H @@ -384,53 +394,53 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, v_c = self->private_impl.c_decode[0].v_c; } switch (self->private_impl.c_decode[0].coro_state) { - case 0: + PUFFS_COROUTINE_STATE(0); - case 1:; - status = puffs_gif_decoder_decode_header(self, a_src); - if (status) { + PUFFS_COROUTINE_STATE(1); + status = puffs_gif_decoder_decode_header(self, a_src); + if (status) { + goto suspend; + } + PUFFS_COROUTINE_STATE(2); + status = puffs_gif_decoder_decode_lsd(self, a_src); + if (status) { + goto suspend; + } + while (true) { + PUFFS_COROUTINE_STATE(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 suspend; } - case 2:; - status = puffs_gif_decoder_decode_lsd(self, 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) { + PUFFS_COROUTINE_STATE(4); + status = puffs_gif_decoder_decode_extension(self, a_src); + if (status) { + goto suspend; + } + } else if (v_c == 44) { + PUFFS_COROUTINE_STATE(5); + status = puffs_gif_decoder_decode_id(self, a_dst, a_src); + if (status) { + goto suspend; + } + } else if (v_c == 59) { + status = puffs_gif_status_ok; + goto suspend; + } else { + status = puffs_gif_error_bad_gif_block; goto suspend; } - while (true) { - 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 suspend; - } - 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 suspend; - } - } else if (v_c == 44) { - case 5:; - status = puffs_gif_decoder_decode_id(self, a_dst, a_src); - if (status) { - goto suspend; - } - } else if (v_c == 59) { - status = puffs_gif_status_ok; - goto suspend; - } else { - status = puffs_gif_error_bad_gif_block; - goto suspend; - } - } - case 6:; + } + PUFFS_COROUTINE_STATE(6); } goto suspend; @@ -455,34 +465,33 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, v_i = self->private_impl.c_decode_header[0].v_i; } switch (self->private_impl.c_decode_header[0].coro_state) { - case 0: + PUFFS_COROUTINE_STATE(0); - for (size_t i = 0; i < 6; i++) { - v_c[i] = 0; - }; - v_i = 0; - while (v_i < 6) { - 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; + for (size_t i = 0; i < 6; i++) { + v_c[i] = 0; + }; + v_i = 0; + while (v_i < 6) { + PUFFS_COROUTINE_STATE(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; } - 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; + 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)--; } - case 2:; + 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; + } + PUFFS_COROUTINE_STATE(2); } goto suspend; @@ -509,80 +518,80 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, 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: + PUFFS_COROUTINE_STATE(0); - for (size_t i = 0; i < 7; i++) { - v_c[i] = 0; - }; + for (size_t i = 0; i < 7; i++) { + v_c[i] = 0; + }; + v_i = 0; + while (v_i < 7) { + PUFFS_COROUTINE_STATE(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)); + self->private_impl.f_height = + (((uint32_t)(v_c[2])) | (((uint32_t)(v_c[3])) << 8)); + self->private_impl.f_background_color_index = v_c[5]; + if ((v_c[4] & 128) != 0) { + v_gct_size = (((uint32_t)(1)) << (1 + (v_c[4] & 7))); v_i = 0; - while (v_i < 7) { - 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)); - self->private_impl.f_height = - (((uint32_t)(v_c[2])) | (((uint32_t)(v_c[3])) << 8)); - self->private_impl.f_background_color_index = v_c[5]; - if ((v_c[4] & 128) != 0) { - v_gct_size = (((uint32_t)(1)) << (1 + (v_c[4] & 7))); - v_i = 0; - while (v_i < v_gct_size) { - 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; + while (v_i < v_gct_size) { + PUFFS_COROUTINE_STATE(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; + PUFFS_COROUTINE_STATE(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; + PUFFS_COROUTINE_STATE(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:; + } + PUFFS_COROUTINE_STATE(5); } goto suspend; @@ -608,9 +617,30 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, 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: + PUFFS_COROUTINE_STATE(0); - case 1:; + PUFFS_COROUTINE_STATE(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_label = t_0; + if (v_label == 1) { + } else if (v_label == 249) { + } else if (v_label == 254) { + } else if (v_label == 255) { + } else { + return puffs_gif_error_bad_gif_extension_label; + } + while (true) { + PUFFS_COROUTINE_STATE(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)) @@ -618,48 +648,27 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, : puffs_gif_status_short_read; return status; } - uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++]; + 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_label = t_0; - if (v_label == 1) { - } else if (v_label == 249) { - } else if (v_label == 254) { - } else if (v_label == 255) { - } else { - return puffs_gif_error_bad_gif_extension_label; + v_block_size = t_1; + if (v_block_size == 0) { + goto label_0_break; } - while (true) { - 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; + PUFFS_COROUTINE_STATE(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; } - label_0_break:; - case 4:; + a_src.buf->ri += t_2; + } + label_0_break:; + PUFFS_COROUTINE_STATE(4); } goto suspend; @@ -695,35 +704,14 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, 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: + PUFFS_COROUTINE_STATE(0); - for (size_t i = 0; i < 9; i++) { - v_c[i] = 0; - }; - v_i = 0; - while (v_i < 9) { - 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) { - } - if ((v_c[8] & 128) != 0) { - return puffs_gif_error_todo_unsupported_local_color_table; - } - case 2:; + for (size_t i = 0; i < 9; i++) { + v_c[i] = 0; + }; + v_i = 0; + while (v_i < 9) { + PUFFS_COROUTINE_STATE(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)) @@ -731,48 +719,69 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, : puffs_gif_status_short_read; return status; } - uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++]; + 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_lw = t_1; - if ((v_lw < 2) || (8 < v_lw)) { - return puffs_gif_error_bad_lzw_literal_width; + v_c[v_i] = t_0; + v_i += 1; + } + v_interlace = ((v_c[8] & 64) != 0); + if (v_interlace) { + } + if ((v_c[8] & 128) != 0) { + return puffs_gif_error_todo_unsupported_local_color_table; + } + PUFFS_COROUTINE_STATE(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_lw = t_1; + if ((v_lw < 2) || (8 < v_lw)) { + return puffs_gif_error_bad_lzw_literal_width; + } + puffs_gif_lzw_decoder_set_literal_width(&self->private_impl.f_lzw, + ((uint32_t)(v_lw))); + while (true) { + PUFFS_COROUTINE_STATE(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; } - puffs_gif_lzw_decoder_set_literal_width(&self->private_impl.f_lzw, - ((uint32_t)(v_lw))); - while (true) { - 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; - } + 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)--; } - label_0_break:; - case 5:; + 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, + }}; + PUFFS_COROUTINE_STATE(4); + status = puffs_gif_lzw_decoder_decode(&self->private_impl.f_lzw, a_dst, + v_lzw_src); + if (status) { + return status; + } + } + label_0_break:; + PUFFS_COROUTINE_STATE(5); } goto suspend; @@ -851,112 +860,111 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, v_c = self->private_impl.c_decode[0].v_c; } switch (self->private_impl.c_decode[0].coro_state) { - case 0: + PUFFS_COROUTINE_STATE(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; - v_save_code = v_end_code; - v_prev_code = 0; - v_width = (self->private_impl.f_literal_width + 1); - v_bits = 0; - v_n_bits = 0; - label_0_continue:; - while (true) { - while (v_n_bits < v_width) { - 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 suspend; - } - 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) { - case 2:; - if (a_dst.buf->wi >= a_dst.buf->len) { - status = puffs_gif_status_short_write; - goto suspend; - } - 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; - v_prev_code = 0; - v_width = (self->private_impl.f_literal_width + 1); - goto label_0_continue; - } else if (v_code == v_end_code) { - status = puffs_gif_status_ok; - goto suspend; - } else if (v_code <= v_save_code) { - v_s = 4095; - v_c = v_code; - if ((v_code == v_save_code) && v_use_save_code) { - v_s -= 1; - v_c = v_prev_code; - } - while (v_c >= v_clear_code) { - self->private_impl.f_stack[v_s] = - self->private_impl.f_suffixes[v_c]; - if (v_s == 0) { - status = puffs_gif_error_lzw_prefix_chain_is_cyclical; - goto suspend; - } - v_s -= 1; - v_c = ((uint32_t)(self->private_impl.f_prefixes[v_c])); - } - self->private_impl.f_stack[v_s] = ((uint8_t)(v_c)); - if ((v_code == v_save_code) && v_use_save_code) { - self->private_impl.f_stack[4095] = ((uint8_t)(v_c)); - } - case 3:; - if (a_dst.buf->closed) { - status = puffs_gif_error_closed_for_writes; - goto suspend; - } - if ((a_dst.buf->len - a_dst.buf->wi) < - (sizeof(self->private_impl.f_stack) - v_s)) { - status = puffs_gif_status_short_write; - goto suspend; - } - 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; + v_clear_code = (((uint32_t)(1)) << self->private_impl.f_literal_width); + v_end_code = (v_clear_code + 1); + v_use_save_code = 0; + v_save_code = v_end_code; + v_prev_code = 0; + v_width = (self->private_impl.f_literal_width + 1); + v_bits = 0; + v_n_bits = 0; + label_0_continue:; + while (true) { + while (v_n_bits < v_width) { + PUFFS_COROUTINE_STATE(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 suspend; } - v_use_save_code = (v_save_code < 4095); - if (v_use_save_code) { - v_save_code += 1; - if ((v_save_code == (((uint32_t)(1)) << v_width)) && (v_width < 12)) { - v_width += 1; - } + 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_prev_code = v_code; + v_bits |= (((uint32_t)(t_0)) << v_n_bits); + v_n_bits += 8; } - case 4:; + v_code = PUFFS_LOW_BITS(v_bits, v_width); + v_bits >>= v_width; + v_n_bits -= v_width; + if (v_code < v_clear_code) { + PUFFS_COROUTINE_STATE(2); + if (a_dst.buf->wi >= a_dst.buf->len) { + status = puffs_gif_status_short_write; + goto suspend; + } + 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; + v_prev_code = 0; + v_width = (self->private_impl.f_literal_width + 1); + goto label_0_continue; + } else if (v_code == v_end_code) { + status = puffs_gif_status_ok; + goto suspend; + } else if (v_code <= v_save_code) { + v_s = 4095; + v_c = v_code; + if ((v_code == v_save_code) && v_use_save_code) { + v_s -= 1; + v_c = v_prev_code; + } + while (v_c >= v_clear_code) { + self->private_impl.f_stack[v_s] = self->private_impl.f_suffixes[v_c]; + if (v_s == 0) { + status = puffs_gif_error_lzw_prefix_chain_is_cyclical; + goto suspend; + } + v_s -= 1; + v_c = ((uint32_t)(self->private_impl.f_prefixes[v_c])); + } + self->private_impl.f_stack[v_s] = ((uint8_t)(v_c)); + if ((v_code == v_save_code) && v_use_save_code) { + self->private_impl.f_stack[4095] = ((uint8_t)(v_c)); + } + PUFFS_COROUTINE_STATE(3); + if (a_dst.buf->closed) { + status = puffs_gif_error_closed_for_writes; + goto suspend; + } + if ((a_dst.buf->len - a_dst.buf->wi) < + (sizeof(self->private_impl.f_stack) - v_s)) { + status = puffs_gif_status_short_write; + goto suspend; + } + 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 suspend; + } + v_use_save_code = (v_save_code < 4095); + if (v_use_save_code) { + v_save_code += 1; + if ((v_save_code == (((uint32_t)(1)) << v_width)) && (v_width < 12)) { + v_width += 1; + } + } + v_prev_code = v_code; + } + PUFFS_COROUTINE_STATE(4); } goto suspend;