Use "coroutine suspension point" consistently.

This commit is contained in:
Nigel Tao committed 2017-07-13 10:46:05 +10:00
1 parent d83cf7f3d5
commit e7873b5ca4
8 files changed
+136 -130

No files matched your search

+4 -4
View File
@@ -6,13 +6,13 @@
// 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
// Use switch cases for coroutine suspension points, similar to the technique
// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
//
// We use a trivial macro instead of an explicit assignment and case statement
// so that clang-format doesn't get confused by the unusual "case"s.
#define PUFFS_COROUTINE_STATE(n) \
coro_state = n; \
#define PUFFS_COROUTINE_SUSPENSION_POINT(n) \
coro_susp_point = n; \
case n:
#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))
+1 -1
View File
@@ -12,5 +12,5 @@ const baseHeader = "" +
""
const baseImpl = "" +
"#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 assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_STATE(n) \\\n coro_state = n; \\\n case n:\n\n#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define PUFFS_UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#define PUFFS_UNLIKELY(expr) (expr)\n#endif\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 suspension points, similar to the technique\n// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use a trivial macro instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n case n:\n\n#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define PUFFS_UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#define PUFFS_UNLIKELY(expr) (expr)\n#endif\n\n#endif // PUFFS_BASE_IMPL_H\n" +
""
+27 -24
View File
@@ -13,16 +13,16 @@ import (
)
type perFunc struct {
funk *a.Func
derivedVars map[t.ID]struct{}
jumpTargets map[*a.While]uint32
coroState uint32
tempW uint32
tempR uint32
public bool
suspendible bool
limitVarName string
shortReads []string
funk *a.Func
derivedVars map[t.ID]struct{}
jumpTargets map[*a.While]uint32
coroSuspPoint uint32
tempW uint32
tempR uint32
public bool
suspendible bool
limitVarName string
shortReads []string
}
func (g *gen) writeFuncSignature(n *a.Func) error {
@@ -129,8 +129,9 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
g.writes("\n")
// TODO: don't hard-code [0], and allow recursive coroutines.
g.printf("uint32_t coro_state = self->private_impl.%s%s[0].coro_state;\n", cPrefix, n.Name().String(g.tm))
g.printf("if (coro_state) {\n")
g.printf("uint32_t coro_susp_point = self->private_impl.%s%s[0].coro_susp_point;\n",
cPrefix, n.Name().String(g.tm))
g.printf("if (coro_susp_point) {\n")
if err := g.writeResumeSuspend(n.Body(), false); err != nil {
return err
}
@@ -139,7 +140,7 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
//
// The matching } is written below. See "Close the coroutine switch".
g.writes("switch (coro_state) {\nPUFFS_COROUTINE_STATE(0);\n\n")
g.writes("switch (coro_susp_point) {\nPUFFS_COROUTINE_SUSPENSION_POINT(0);\n\n")
}
// Generate the function body.
@@ -151,13 +152,15 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
if g.perFunc.suspendible {
// We've reached the end of the function body. Reset the coroutine
// state so that the next call to this function starts at the top.
g.writes("coro_state = 0;\n")
// 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.writes("goto suspend;\n") // Avoid the "unused label" warning.
g.writes("suspend:\n")
g.printf("self->private_impl.%s%s[0].coro_state = coro_state;\n", cPrefix, n.Name().String(g.tm))
g.printf("self->private_impl.%s%s[0].coro_susp_point = coro_susp_point;\n",
cPrefix, n.Name().String(g.tm))
if err := g.writeResumeSuspend(n.Body(), true); err != nil {
return err
}
@@ -726,14 +729,14 @@ 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")
func (g *gen) writeCoroSuspPoint() error {
const maxCoroSuspPoint = 0xFFFFFFFF
g.perFunc.coroSuspPoint++
if g.perFunc.coroSuspPoint == maxCoroSuspPoint {
return fmt.Errorf("too many coroutine suspension points required")
}
g.printf("PUFFS_COROUTINE_STATE(%d);\n", g.perFunc.coroState)
g.printf("PUFFS_COROUTINE_SUSPENSION_POINT(%d);\n", g.perFunc.coroSuspPoint)
return nil
}
@@ -741,7 +744,7 @@ func (g *gen) writeSuspendibles(n *a.Expr, depth uint32) error {
if !n.Suspendible() {
return nil
}
if err := g.writeSuspend(); err != nil {
if err := g.writeCoroSuspPoint(); err != nil {
return err
}
return g.writeCallSuspendibles(n, depth)
@@ -884,7 +887,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
}
g.writes(";\n")
if err := g.writeSuspend(); err != nil {
if err := g.writeCoroSuspPoint(); err != nil {
return err
}
g.printf("size_t %s%d = self->private_impl.scratch;\n", tPrefix, temp)
+1 -1
View File
@@ -468,7 +468,7 @@ func (g *gen) writeStruct(n *a.Struct) error {
// TODO: allow max depth > 1 for recursive coroutines.
const maxDepth = 1
g.writes("struct {\n")
g.writes("uint32_t coro_state;\n")
g.writes("uint32_t coro_susp_point;\n")
if err := g.writeVars(o.Body()); err != nil {
return err
}
+27 -26
View File
@@ -131,12 +131,12 @@ typedef struct {
uint32_t f_n_bits;
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint32_t v_final;
uint32_t v_type;
} c_decode[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_n0;
uint8_t v_n1;
uint8_t v_complement;
@@ -182,13 +182,13 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
// 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
// Use switch cases for coroutine suspension points, similar to the technique
// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
//
// We use a trivial macro instead of an explicit assignment and case statement
// so that clang-format doesn't get confused by the unusual "case"s.
#define PUFFS_COROUTINE_STATE(n) \
coro_state = n; \
#define PUFFS_COROUTINE_SUSPENSION_POINT(n) \
coro_susp_point = n; \
case n:
#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))
@@ -322,17 +322,17 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point;
if (coro_susp_point) {
v_final = self->private_impl.c_decode[0].v_final;
v_type = self->private_impl.c_decode[0].v_type;
}
switch (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
while (true) {
while (self->private_impl.f_n_bits < 3) {
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -346,7 +346,7 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
self->private_impl.f_bits >>= 3;
self->private_impl.f_n_bits -= 3;
if (v_type == 0) {
PUFFS_COROUTINE_STATE(2);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
@@ -387,12 +387,12 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
goto suspend;
}
}
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode[0].coro_state = coro_state;
self->private_impl.c_decode[0].coro_susp_point = coro_susp_point;
self->private_impl.c_decode[0].v_final = v_final;
self->private_impl.c_decode[0].v_type = v_type;
@@ -465,34 +465,35 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_uncompressed[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point =
self->private_impl.c_decode_uncompressed[0].coro_susp_point;
if (coro_susp_point) {
v_n0 = self->private_impl.c_decode_uncompressed[0].v_n0;
v_n1 = self->private_impl.c_decode_uncompressed[0].v_n1;
v_complement = self->private_impl.c_decode_uncompressed[0].v_complement;
}
switch (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
if (self->private_impl.f_n_bits >= 8) {
status = PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS;
goto suspend;
}
self->private_impl.f_n_bits = 0;
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_0 = *b_rptr_src++;
v_n0 = t_0;
PUFFS_COROUTINE_STATE(2);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_1 = *b_rptr_src++;
v_n1 = t_1;
v_complement = 0;
PUFFS_COROUTINE_STATE(3);
PUFFS_COROUTINE_SUSPENSION_POINT(3);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -502,7 +503,7 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
status = PUFFS_FLATE_ERROR_INCONSISTENT_STORED_BLOCK_LENGTH;
goto suspend;
}
PUFFS_COROUTINE_STATE(4);
PUFFS_COROUTINE_SUSPENSION_POINT(4);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -512,11 +513,11 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
status = PUFFS_FLATE_ERROR_INCONSISTENT_STORED_BLOCK_LENGTH;
goto suspend;
}
PUFFS_COROUTINE_STATE(5);
PUFFS_COROUTINE_SUSPENSION_POINT(5);
{
self->private_impl.scratch =
((((uint32_t)(v_n1)) << 8) | ((uint32_t)(v_n0)));
PUFFS_COROUTINE_STATE(6);
PUFFS_COROUTINE_SUSPENSION_POINT(6);
size_t t_4 = self->private_impl.scratch;
if (t_4 > b_wend_dst - b_wptr_dst) {
t_4 = b_wend_dst - b_wptr_dst;
@@ -534,12 +535,12 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
goto suspend;
}
}
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode_uncompressed[0].coro_state = coro_state;
self->private_impl.c_decode_uncompressed[0].coro_susp_point = coro_susp_point;
self->private_impl.c_decode_uncompressed[0].v_n0 = v_n0;
self->private_impl.c_decode_uncompressed[0].v_n1 = v_n1;
self->private_impl.c_decode_uncompressed[0].v_complement = v_complement;
+68 -66
View File
@@ -134,7 +134,7 @@ typedef struct {
uint16_t f_prefixes[4096];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint32_t v_clear_code;
uint32_t v_end_code;
uint32_t v_save_code;
@@ -169,27 +169,27 @@ typedef struct {
puffs_gif_lzw_decoder f_lzw;
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c;
} c_decode[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c[6];
uint32_t v_i;
} c_decode_header[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c[7];
uint32_t v_i;
uint32_t v_gct_size;
} c_decode_lsd[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_label;
uint8_t v_block_size;
} c_decode_extension[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c[9];
uint32_t v_i;
bool v_interlace;
@@ -252,13 +252,13 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
// 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
// Use switch cases for coroutine suspension points, similar to the technique
// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
//
// We use a trivial macro instead of an explicit assignment and case statement
// so that clang-format doesn't get confused by the unusual "case"s.
#define PUFFS_COROUTINE_STATE(n) \
coro_state = n; \
#define PUFFS_COROUTINE_SUSPENSION_POINT(n) \
coro_susp_point = n; \
case n:
#define PUFFS_LOW_BITS(x, n) ((x) & ((1 << (n)) - 1))
@@ -432,14 +432,14 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point;
if (coro_susp_point) {
v_c = self->private_impl.c_decode[0].v_c;
}
switch (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
@@ -465,7 +465,7 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
if (status) {
goto suspend;
}
PUFFS_COROUTINE_STATE(2);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
@@ -492,14 +492,14 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
goto suspend;
}
while (true) {
PUFFS_COROUTINE_STATE(3);
PUFFS_COROUTINE_SUSPENSION_POINT(3);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_0 = *b_rptr_src++;
v_c = t_0;
if (v_c == 33) {
PUFFS_COROUTINE_STATE(4);
PUFFS_COROUTINE_SUSPENSION_POINT(4);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
@@ -526,7 +526,7 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
goto suspend;
}
} else if (v_c == 44) {
PUFFS_COROUTINE_STATE(5);
PUFFS_COROUTINE_SUSPENSION_POINT(5);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
@@ -560,12 +560,12 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
goto suspend;
}
}
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode[0].coro_state = coro_state;
self->private_impl.c_decode[0].coro_susp_point = coro_susp_point;
self->private_impl.c_decode[0].v_c = v_c;
if (a_src.buf) {
@@ -612,13 +612,14 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_header[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point =
self->private_impl.c_decode_header[0].coro_susp_point;
if (coro_susp_point) {
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 (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
{
size_t i;
@@ -628,7 +629,7 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 6) {
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -640,12 +641,12 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
((v_c[4] != 55) && (v_c[4] != 57)) || (v_c[5] != 97)) {
return PUFFS_GIF_ERROR_BAD_GIF_HEADER;
}
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode_header[0].coro_state = coro_state;
self->private_impl.c_decode_header[0].coro_susp_point = coro_susp_point;
memcpy(self->private_impl.c_decode_header[0].v_c, v_c, 6);
self->private_impl.c_decode_header[0].v_i = v_i;
@@ -693,14 +694,14 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_lsd[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point = self->private_impl.c_decode_lsd[0].coro_susp_point;
if (coro_susp_point) {
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 (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
{
size_t i;
@@ -710,7 +711,7 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 7) {
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -727,19 +728,19 @@ 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) {
PUFFS_COROUTINE_STATE(2);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_1 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 0] = t_1;
PUFFS_COROUTINE_STATE(3);
PUFFS_COROUTINE_SUSPENSION_POINT(3);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_2 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 1] = t_2;
PUFFS_COROUTINE_STATE(4);
PUFFS_COROUTINE_SUSPENSION_POINT(4);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -748,12 +749,12 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
v_i += 1;
}
}
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode_lsd[0].coro_state = coro_state;
self->private_impl.c_decode_lsd[0].coro_susp_point = coro_susp_point;
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;
@@ -801,15 +802,16 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_extension[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point =
self->private_impl.c_decode_extension[0].coro_susp_point;
if (coro_susp_point) {
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 (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -823,7 +825,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
return PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL;
}
while (true) {
PUFFS_COROUTINE_STATE(2);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -832,7 +834,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
if (v_block_size == 0) {
goto label_0_break;
}
PUFFS_COROUTINE_STATE(3);
PUFFS_COROUTINE_SUSPENSION_POINT(3);
size_t t_2 = ((uint32_t)(v_block_size));
if (t_2 > b_rend_src - b_rptr_src) {
t_2 -= b_rend_src - b_rptr_src;
@@ -844,12 +846,12 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
b_rptr_src += t_2;
}
label_0_break:;
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode_extension[0].coro_state = coro_state;
self->private_impl.c_decode_extension[0].coro_susp_point = coro_susp_point;
self->private_impl.c_decode_extension[0].v_label = v_label;
self->private_impl.c_decode_extension[0].v_block_size = v_block_size;
@@ -902,8 +904,8 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_id[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point = self->private_impl.c_decode_id[0].coro_susp_point;
if (coro_susp_point) {
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;
@@ -912,8 +914,8 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
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 (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
{
size_t i;
@@ -923,7 +925,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 9) {
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -937,7 +939,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;
}
PUFFS_COROUTINE_STATE(2);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -949,7 +951,7 @@ 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) {
PUFFS_COROUTINE_STATE(3);
PUFFS_COROUTINE_SUSPENSION_POINT(3);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -964,7 +966,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
.ptr_to_len = &l_lzw_src,
.next = &a_src.limit,
}};
PUFFS_COROUTINE_STATE(4);
PUFFS_COROUTINE_SUSPENSION_POINT(4);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
@@ -993,12 +995,12 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
}
}
label_0_break:;
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode_id[0].coro_state = coro_state;
self->private_impl.c_decode_id[0].coro_susp_point = coro_susp_point;
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;
@@ -1100,8 +1102,8 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode[0].coro_state;
if (coro_state) {
uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point;
if (coro_susp_point) {
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_save_code = self->private_impl.c_decode[0].v_save_code;
@@ -1113,8 +1115,8 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
v_s = self->private_impl.c_decode[0].v_s;
v_c = self->private_impl.c_decode[0].v_c;
}
switch (coro_state) {
PUFFS_COROUTINE_STATE(0);
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
v_clear_code = (((uint32_t)(1)) << self->private_impl.f_literal_width);
v_end_code = (v_clear_code + 1);
@@ -1126,7 +1128,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
label_0_continue:;
while (true) {
while (v_n_bits < v_width) {
PUFFS_COROUTINE_STATE(1);
PUFFS_COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -1138,7 +1140,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
v_bits >>= v_width;
v_n_bits -= v_width;
if (v_code < v_clear_code) {
PUFFS_COROUTINE_STATE(2);
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (b_wptr_dst == b_wend_dst) {
status = PUFFS_GIF_SUSPENSION_SHORT_WRITE;
goto suspend;
@@ -1177,7 +1179,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
if (v_code == v_save_code) {
self->private_impl.f_stack[4095] = ((uint8_t)(v_c));
}
PUFFS_COROUTINE_STATE(3);
PUFFS_COROUTINE_SUSPENSION_POINT(3);
if (a_dst.buf->closed) {
status = PUFFS_GIF_ERROR_CLOSED_FOR_WRITES;
goto suspend;
@@ -1207,12 +1209,12 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
}
v_prev_code = v_code;
}
coro_state = 0;
coro_susp_point = 0;
}
goto suspend;
suspend:
self->private_impl.c_decode[0].coro_state = coro_state;
self->private_impl.c_decode[0].coro_susp_point = coro_susp_point;
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_save_code = v_save_code;
+2 -2
View File
@@ -131,12 +131,12 @@ typedef struct {
uint32_t f_n_bits;
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint32_t v_final;
uint32_t v_type;
} c_decode[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_n0;
uint8_t v_n1;
uint8_t v_complement;
+6 -6
View File
@@ -134,7 +134,7 @@ typedef struct {
uint16_t f_prefixes[4096];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint32_t v_clear_code;
uint32_t v_end_code;
uint32_t v_save_code;
@@ -169,27 +169,27 @@ typedef struct {
puffs_gif_lzw_decoder f_lzw;
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c;
} c_decode[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c[6];
uint32_t v_i;
} c_decode_header[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c[7];
uint32_t v_i;
uint32_t v_gct_size;
} c_decode_lsd[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_label;
uint8_t v_block_size;
} c_decode_extension[1];
struct {
uint32_t coro_state;
uint32_t coro_susp_point;
uint8_t v_c[9];
uint32_t v_i;
bool v_interlace;