From d83cf7f3d55855a1adeb2a6ed19940dcdc9ebabf Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 13 Jul 2017 10:30:39 +1000 Subject: [PATCH] Track copy_from32 bytes remaining after suspend. --- cmd/puffs-gen-c/func.go | 10 +++++++--- cmd/puffs-gen-c/main.go | 4 +++- gen/c/std/flate.c | 8 +++++++- gen/c/std/gif.c | 4 ++++ gen/h/std/flate.h | 2 ++ gen/h/std/gif.h | 4 ++++ 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/cmd/puffs-gen-c/func.go b/cmd/puffs-gen-c/func.go index 1a011a4c..f7bda167 100644 --- a/cmd/puffs-gen-c/func.go +++ b/cmd/puffs-gen-c/func.go @@ -877,13 +877,18 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.writes("{\n") - g.printf("size_t %s%d = ", tPrefix, temp) + g.writes("self->private_impl.scratch = ") x := n.Args()[1].Arg().Value() if err := g.writeExpr(x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil { return err } g.writes(";\n") + if err := g.writeSuspend(); err != nil { + return err + } + g.printf("size_t %s%d = self->private_impl.scratch;\n", tPrefix, temp) + const wName = "dst" g.printf("if (%s%d > %swend_%s - %swptr_%s) {\n", tPrefix, temp, bPrefix, wName, bPrefix, wName) g.printf("%s%d = %swend_%s - %swptr_%s;\n", tPrefix, temp, bPrefix, wName, bPrefix, wName) @@ -900,8 +905,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { 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.printf("if (status) { self->private_impl.scratch = %s%d; goto suspend; }\n", tPrefix, temp) g.writes("}\n") diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index 1028787b..27a42565 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -441,7 +441,9 @@ func (g *gen) writeStruct(n *a.Struct) error { g.writes("struct {\n") if n.Suspendible() { g.printf("puffs_%s_status status;\n", g.pkgName) - g.printf("uint32_t magic;\n") + g.writes("uint32_t magic;\n") + g.writes("uint64_t scratch;\n") + g.writes("\n") } for _, o := range n.Fields() { diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index b44b1c86..32889e26 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -125,6 +125,8 @@ typedef struct { struct { puffs_flate_status status; uint32_t magic; + uint64_t scratch; + uint32_t f_bits; uint32_t f_n_bits; @@ -512,7 +514,10 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( } PUFFS_COROUTINE_STATE(5); { - size_t t_4 = ((((uint32_t)(v_n1)) << 8) | ((uint32_t)(v_n0))); + self->private_impl.scratch = + ((((uint32_t)(v_n1)) << 8) | ((uint32_t)(v_n0))); + PUFFS_COROUTINE_STATE(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; status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE; @@ -525,6 +530,7 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( b_wptr_dst += t_4; b_rptr_src += t_4; if (status) { + self->private_impl.scratch = t_4; goto suspend; } } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index d2da4e76..7b5dc0a5 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -126,6 +126,8 @@ typedef struct { struct { puffs_gif_status status; uint32_t magic; + uint64_t scratch; + uint32_t f_literal_width; uint8_t f_stack[4096]; uint8_t f_suffixes[4096]; @@ -158,6 +160,8 @@ typedef struct { struct { puffs_gif_status status; uint32_t magic; + uint64_t scratch; + uint32_t f_width; uint32_t f_height; uint8_t f_background_color_index; diff --git a/gen/h/std/flate.h b/gen/h/std/flate.h index d30d1109..3c67070f 100644 --- a/gen/h/std/flate.h +++ b/gen/h/std/flate.h @@ -125,6 +125,8 @@ typedef struct { struct { puffs_flate_status status; uint32_t magic; + uint64_t scratch; + uint32_t f_bits; uint32_t f_n_bits; diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 66043f06..7b9e1d74 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -126,6 +126,8 @@ typedef struct { struct { puffs_gif_status status; uint32_t magic; + uint64_t scratch; + uint32_t f_literal_width; uint8_t f_stack[4096]; uint8_t f_suffixes[4096]; @@ -158,6 +160,8 @@ typedef struct { struct { puffs_gif_status status; uint32_t magic; + uint64_t scratch; + uint32_t f_width; uint32_t f_height; uint8_t f_background_color_index;