diff --git a/cmd/puffs-gen-c/func.go b/cmd/puffs-gen-c/func.go index a05c6347..1a011a4c 100644 --- a/cmd/puffs-gen-c/func.go +++ b/cmd/puffs-gen-c/func.go @@ -886,18 +886,22 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { const wName = "dst" g.printf("if (%s%d > %swend_%s - %swptr_%s) {\n", tPrefix, temp, bPrefix, wName, bPrefix, wName) - // TODO: suspend; return SHORT_WRITE. + g.printf("%s%d = %swend_%s - %swptr_%s;\n", tPrefix, temp, bPrefix, wName, bPrefix, wName) + g.printf("status = PUFFS_%s_SUSPENSION_SHORT_WRITE;\n", g.PKGNAME) g.writes("}\n") // TODO: don't assume that the first argument is "in.src". const rName = "src" g.printf("if (%s%d > %srend_%s - %srptr_%s) {\n", tPrefix, temp, bPrefix, rName, bPrefix, rName) - // TODO: suspend; return SHORT_READ. + g.printf("%s%d = %srend_%s - %srptr_%s;\n", tPrefix, temp, bPrefix, rName, bPrefix, rName) + g.printf("status = PUFFS_%s_SUSPENSION_SHORT_READ;\n", g.PKGNAME) g.writes("}\n") g.printf("memmove(%swptr_%s, %srptr_%s, %s%d);\n", bPrefix, wName, bPrefix, rName, tPrefix, temp) g.printf("%swptr_%s += %s%d;\n", bPrefix, wName, tPrefix, temp) g.printf("%srptr_%s += %s%d;\n", bPrefix, rName, tPrefix, temp) + // TODO: when suspending, save how many bytes remain to be copied. + g.writes("if (status) { goto suspend; }\n") g.writes("}\n") diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 4390d19c..b44b1c86 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -514,12 +514,19 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( { size_t t_4 = ((((uint32_t)(v_n1)) << 8) | ((uint32_t)(v_n0))); if (t_4 > b_wend_dst - b_wptr_dst) { + t_4 = b_wend_dst - b_wptr_dst; + status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE; } if (t_4 > b_rend_src - b_rptr_src) { + t_4 = b_rend_src - b_rptr_src; + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; } memmove(b_wptr_dst, b_rptr_src, t_4); b_wptr_dst += t_4; b_rptr_src += t_4; + if (status) { + goto suspend; + } } coro_state = 0; }