diff --git a/cmd/puffs-c/internal/cgen/base-impl.h b/cmd/puffs-c/internal/cgen/base-impl.h index 324d1b55..5a7da23a 100644 --- a/cmd/puffs-c/internal/cgen/base-impl.h +++ b/cmd/puffs-c/internal/cgen/base-impl.h @@ -118,40 +118,40 @@ puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) { return ((puffs_base_slice_u8){}); } -// puffs_base_slice_u8_prefix returns up to the first n bytes of s. +// puffs_base_slice_u8_prefix returns up to the first up_to bytes of s. static inline puffs_base_slice_u8 puffs_base_slice_u8_prefix( puffs_base_slice_u8 s, - uint64_t n) { - if ((uint64_t)(s.len) > n) { - s.len = n; + uint64_t up_to) { + if ((uint64_t)(s.len) > up_to) { + s.len = up_to; } return s; } -// puffs_base_slice_u8_suffix returns up to the last n bytes of s. +// puffs_base_slice_u8_suffix returns up to the last up_to bytes of s. static inline puffs_base_slice_u8 puffs_base_slice_u8_suffix( puffs_base_slice_u8 s, - uint64_t n) { - if ((uint64_t)(s.len) > n) { - s.ptr += (uint64_t)(s.len) - n; - s.len = n; + uint64_t up_to) { + if ((uint64_t)(s.len) > up_to) { + s.ptr += (uint64_t)(s.len) - up_to; + s.len = up_to; } return s; } -// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, n) where -// n is the minimum of dst.len and src.len. +// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, length) +// where length is the minimum of dst.len and src.len. // // Passing a puffs_base_slice_u8 with all fields NULL or zero (a valid, empty // slice) is valid and results in a no-op. static inline uint64_t puffs_base_slice_u8_copy_from_slice( puffs_base_slice_u8 dst, puffs_base_slice_u8 src) { - size_t n = dst.len < src.len ? dst.len : src.len; - if (n > 0) { - memmove(dst.ptr, src.ptr, n); + size_t length = dst.len < src.len ? dst.len : src.len; + if (length > 0) { + memmove(dst.ptr, src.ptr, length); } - return n; + return length; } static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, @@ -195,11 +195,11 @@ static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, uint8_t* rend, uint32_t length) { uint8_t* wptr = *ptr_wptr; - if (length > (wend - wptr)) { + if (length > wend - wptr) { length = wend - wptr; } uint8_t* rptr = *ptr_rptr; - if (length > (rend - rptr)) { + if (length > rend - rptr) { length = rend - rptr; } if (length > 0) { @@ -210,4 +210,20 @@ static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, return length; } +static inline uint64_t puffs_base_writer1_copy_from_slice( + uint8_t** ptr_wptr, + uint8_t* wend, + puffs_base_slice_u8 src) { + uint8_t* wptr = *ptr_wptr; + size_t length = src.len; + if (length > wend - wptr) { + length = wend - wptr; + } + if (length > 0) { + memmove(wptr, src.ptr, length); + *ptr_wptr += length; + } + return length; +} + #endif // PUFFS_BASE_IMPL_H diff --git a/cmd/puffs-c/internal/cgen/data.go b/cmd/puffs-c/internal/cgen/data.go index befa51b7..238d2815 100644 --- a/cmd/puffs-c/internal/cgen/data.go +++ b/cmd/puffs-c/internal/cgen/data.go @@ -28,9 +28,10 @@ const baseImpl = "" + "ROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n case n:;\n\n#define PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(n) \\\n if (status < 0) { \\\n goto exit; \\\n } else if (status == 0) { \\\n goto ok; \\\n } \\\n coro_susp_point = n; \\\n goto suspend; \\\n case n:;\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// Declare the printf prototype. The generated code shouldn't need this at all,\n// but it's useful for manual printf debugging.\nextern int printf(const char* __restrict __format, ...);\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#define PUFFS_UNLIKELY(expr) (expr)\n#endif\n" + "\n// ---------------- Static Inline Functions\n//\n// The helpers below are functions, instead of macros, because their arguments\n// can be an expression that we shouldn't evaluate more than once.\n//\n// They are in base-impl.h and hence copy/pasted into every generated C file,\n// instead of being in some \"base.c\" file, since a design goal is that users of\n// the generated C code can often just #include a single .c file, such as\n// \"gif.c\", without having to additionally include or otherwise build and link\n// a \"base.c\" file.\n//\n// They are static, so that linking multiple puffs .o files won't complain about\n// duplicate function definitions.\n//\n// They are explicitly marked inline, even if modern compilers don't use the\n// inline attribute to guide optimizations such as inlining, to avoid the\n// -Wunused-function warning, and we like to compile with -Wall -Werror.\n\nstatic inline uint16_t puffs_base_load_u16be(uint8_t* p) {\n return ((uint16_t)(p[0]) << 8) | ((uint16_t)(p[1]) << 0);\n}\n\nstatic inline uint16_t puff" + "s_base_load_u16le(uint8_t* p) {\n return ((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8);\n}\n\nstatic inline uint32_t puffs_base_load_u32be(uint8_t* p) {\n return ((uint32_t)(p[0]) << 24) | ((uint32_t)(p[1]) << 16) |\n ((uint32_t)(p[2]) << 8) | ((uint32_t)(p[3]) << 0);\n}\n\nstatic inline uint32_t puffs_base_load_u32le(uint8_t* p) {\n return ((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) |\n ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);\n}\n\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_i(\n puffs_base_slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((puffs_base_slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((puffs_base_slice_u8){});\n}\n\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_j(\n puffs_base_slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base_slice_u8){.ptr = s.ptr, .len = j});\n }\n return ((puffs_base_slice_u8){});\n}\n\nstatic inline " + - "puffs_base_slice_u8\npuffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base_slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((puffs_base_slice_u8){});\n}\n\n// puffs_base_slice_u8_prefix returns up to the first n bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_prefix(\n puffs_base_slice_u8 s,\n uint64_t n) {\n if ((uint64_t)(s.len) > n) {\n s.len = n;\n }\n return s;\n}\n\n// puffs_base_slice_u8_suffix returns up to the last n bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_suffix(\n puffs_base_slice_u8 s,\n uint64_t n) {\n if ((uint64_t)(s.len) > n) {\n s.ptr += (uint64_t)(s.len) - n;\n s.len = n;\n }\n return s;\n}\n\n// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, n) where\n// n is the minimum of dst.len and src.len.\n//\n// Passing a puffs_base_slice_u8 with all fields NULL or zero (a valid, empty\n// slice) is val" + - "id and results in a no-op.\nstatic inline uint64_t puffs_base_slice_u8_copy_from_slice(\n puffs_base_slice_u8 dst,\n puffs_base_slice_u8 src) {\n size_t n = dst.len < src.len ? dst.len : src.len;\n if (n > 0) {\n memmove(dst.ptr, src.ptr, n);\n }\n return n;\n}\n\nstatic inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n uint8_t* ptr = *ptr_ptr;\n size_t d = ptr - start;\n if ((d == 0) || (d < (size_t)(distance))) {\n return 0;\n }\n start = ptr - distance;\n size_t l = end - ptr;\n if ((size_t)(length) > l) {\n length = l;\n } else {\n l = length;\n }\n // TODO: is manual unrolling actually helpful?\n for (; l >= 8; l -= 8) {\n *ptr++ = *start++;\n *ptr++ = *sta" + - "rt++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; l; l--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr,\n uint8_t* wend,\n uint8_t** ptr_rptr,\n uint8_t* rend,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n if (length > (wend - wptr)) {\n length = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (length > (rend - rptr)) {\n length = rend - rptr;\n }\n if (length > 0) {\n memmove(wptr, rptr, length);\n *ptr_wptr += length;\n *ptr_rptr += length;\n }\n return length;\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" + + "puffs_base_slice_u8\npuffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base_slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((puffs_base_slice_u8){});\n}\n\n// puffs_base_slice_u8_prefix returns up to the first up_to bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_prefix(\n puffs_base_slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.len = up_to;\n }\n return s;\n}\n\n// puffs_base_slice_u8_suffix returns up to the last up_to bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_suffix(\n puffs_base_slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.ptr += (uint64_t)(s.len) - up_to;\n s.len = up_to;\n }\n return s;\n}\n\n// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, length)\n// where length is the minimum of dst.len and src.len.\n//\n// Passing a puffs_base_slice_u8 with all fields" + + " NULL or zero (a valid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t puffs_base_slice_u8_copy_from_slice(\n puffs_base_slice_u8 dst,\n puffs_base_slice_u8 src) {\n size_t length = dst.len < src.len ? dst.len : src.len;\n if (length > 0) {\n memmove(dst.ptr, src.ptr, length);\n }\n return length;\n}\n\nstatic inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n uint8_t* ptr = *ptr_ptr;\n size_t d = ptr - start;\n if ((d == 0) || (d < (size_t)(distance))) {\n return 0;\n }\n start = ptr - distance;\n size_t l = end - ptr;\n if ((size_t)(length) > l) {\n length = l;\n } else {\n l = length;\n }\n // TODO: is manual unrolling actually helpful?\n " + + " for (; l >= 8; l -= 8) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; l; l--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr,\n uint8_t* wend,\n uint8_t** ptr_rptr,\n uint8_t* rend,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n if (length > wend - wptr) {\n length = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (length > rend - rptr) {\n length = rend - rptr;\n }\n if (length > 0) {\n memmove(wptr, rptr, length);\n *ptr_wptr += length;\n *ptr_rptr += length;\n }\n return length;\n}\n\nstatic inline uint64_t puff" + + "s_base_writer1_copy_from_slice(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n puffs_base_slice_u8 src) {\n uint8_t* wptr = *ptr_wptr;\n size_t length = src.len;\n if (length > wend - wptr) {\n length = wend - wptr;\n }\n if (length > 0) {\n memmove(wptr, src.ptr, length);\n *ptr_wptr += length;\n }\n return length;\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" + "" type template_args_short_read struct { diff --git a/cmd/puffs-c/internal/cgen/expr.go b/cmd/puffs-c/internal/cgen/expr.go index c5b97aa5..bce142af 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -159,6 +159,11 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")") return nil } + if isInDst(g.tm, n, t.KeySlice, 0) { + b.printf("((puffs_base_slice_u8){ .ptr = %swstart_dst, .len = %swptr_dst - %swstart_dst, })", + bPrefix, bPrefix, bPrefix) + return nil + } if isInDst(g.tm, n, t.KeyCopyFromReader32, 2) { b.printf("puffs_base_writer1_copy_from_reader32(&%swptr_dst, %swend_dst", bPrefix, bPrefix) // TODO: don't assume that the first argument is "in.src". @@ -182,20 +187,24 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writeb(')') return nil } - if isInDst(g.tm, n, t.KeySlice, 0) { - b.printf("((puffs_base_slice_u8){ .ptr = %swstart_dst, .len = %swptr_dst - %swstart_dst, })", - bPrefix, bPrefix, bPrefix) + if isInDst(g.tm, n, t.KeyCopyFromSlice, 1) { + b.printf("puffs_base_writer1_copy_from_slice(&%swptr_dst, %swend_dst,", bPrefix, bPrefix) + a := n.Args()[0].Arg().Value() + if err := g.writeExpr(b, a, rp, parenthesesOptional, depth); err != nil { + return err + } + b.writeb(')') return nil } if isThatMethod(g.tm, n, t.KeyCopyFromSlice, 1) { b.writes("puffs_base_slice_u8_copy_from_slice(") receiver := n.LHS().Expr().LHS().Expr() - if err := g.writeExpr(b, receiver, rp, parenthesesMandatory, depth); err != nil { + if err := g.writeExpr(b, receiver, rp, parenthesesOptional, depth); err != nil { return err } b.writeb(',') a := n.Args()[0].Arg().Value() - if err := g.writeExpr(b, a, rp, parenthesesMandatory, depth); err != nil { + if err := g.writeExpr(b, a, rp, parenthesesOptional, depth); err != nil { return err } b.writes(")\n") diff --git a/cmd/puffs-c/internal/cgen/statement.go b/cmd/puffs-c/internal/cgen/statement.go index 215efff2..2b1c7611 100644 --- a/cmd/puffs-c/internal/cgen/statement.go +++ b/cmd/puffs-c/internal/cgen/statement.go @@ -368,22 +368,6 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { g.currFunk.shortReads = append(g.currFunk.shortReads, "src") b.printf("%srptr_src += %s;\n", bPrefix, scratchName) - } else if isInDst(g.tm, n, t.KeyCopyFromSlice, 1) { - // TODO: don't assume that the argument is "this.stack[s:]". - b.printf("if (%sdst.buf && %sdst.buf->closed) { status = %sERROR_CLOSED_FOR_WRITES;", - aPrefix, aPrefix, g.PKGPREFIX) - b.writes("goto exit;") - b.writes("}\n") - b.printf("if ((%swend_dst - %swptr_dst) < (sizeof(self->private_impl.f_stack) - v_s)) {", - bPrefix, bPrefix) - b.printf("status = %sSUSPENSION_SHORT_WRITE;", g.PKGPREFIX) - b.writes("goto suspend;") - b.writes("}\n") - b.printf("memmove(b_wptr_dst," + - "self->private_impl.f_stack + v_s," + - "sizeof(self->private_impl.f_stack) - v_s);\n") - b.printf("b_wptr_dst += sizeof(self->private_impl.f_stack) - v_s;\n") - } else if isInDst(g.tm, n, t.KeyWriteU8, 1) { b.printf("if (%swptr_dst == %swend_dst) { status = %sSUSPENSION_SHORT_WRITE;", bPrefix, bPrefix, g.PKGPREFIX) @@ -620,6 +604,7 @@ func isInSrc(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { func isInDst(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { callSuspendible := methodName != t.KeyCopyFromReader32 && methodName != t.KeyCopyFromHistory32 && + methodName != t.KeyCopyFromSlice && methodName != t.KeySlice // TODO: check that n.Args() is "(x:bar)". if n.ID0().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 7defca91..756c02e2 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -413,40 +413,40 @@ puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) { return ((puffs_base_slice_u8){}); } -// puffs_base_slice_u8_prefix returns up to the first n bytes of s. +// puffs_base_slice_u8_prefix returns up to the first up_to bytes of s. static inline puffs_base_slice_u8 puffs_base_slice_u8_prefix( puffs_base_slice_u8 s, - uint64_t n) { - if ((uint64_t)(s.len) > n) { - s.len = n; + uint64_t up_to) { + if ((uint64_t)(s.len) > up_to) { + s.len = up_to; } return s; } -// puffs_base_slice_u8_suffix returns up to the last n bytes of s. +// puffs_base_slice_u8_suffix returns up to the last up_to bytes of s. static inline puffs_base_slice_u8 puffs_base_slice_u8_suffix( puffs_base_slice_u8 s, - uint64_t n) { - if ((uint64_t)(s.len) > n) { - s.ptr += (uint64_t)(s.len) - n; - s.len = n; + uint64_t up_to) { + if ((uint64_t)(s.len) > up_to) { + s.ptr += (uint64_t)(s.len) - up_to; + s.len = up_to; } return s; } -// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, n) where -// n is the minimum of dst.len and src.len. +// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, length) +// where length is the minimum of dst.len and src.len. // // Passing a puffs_base_slice_u8 with all fields NULL or zero (a valid, empty // slice) is valid and results in a no-op. static inline uint64_t puffs_base_slice_u8_copy_from_slice( puffs_base_slice_u8 dst, puffs_base_slice_u8 src) { - size_t n = dst.len < src.len ? dst.len : src.len; - if (n > 0) { - memmove(dst.ptr, src.ptr, n); + size_t length = dst.len < src.len ? dst.len : src.len; + if (length > 0) { + memmove(dst.ptr, src.ptr, length); } - return n; + return length; } static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, @@ -490,11 +490,11 @@ static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, uint8_t* rend, uint32_t length) { uint8_t* wptr = *ptr_wptr; - if (length > (wend - wptr)) { + if (length > wend - wptr) { length = wend - wptr; } uint8_t* rptr = *ptr_rptr; - if (length > (rend - rptr)) { + if (length > rend - rptr) { length = rend - rptr; } if (length > 0) { @@ -505,6 +505,22 @@ static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, return length; } +static inline uint64_t puffs_base_writer1_copy_from_slice( + uint8_t** ptr_wptr, + uint8_t* wend, + puffs_base_slice_u8 src) { + uint8_t* wptr = *ptr_wptr; + size_t length = src.len; + if (length > wend - wptr) { + length = wend - wptr; + } + if (length > 0) { + memmove(wptr, src.ptr, length); + *ptr_wptr += length; + } + return length; +} + #endif // PUFFS_BASE_IMPL_H // ---------------- Status Codes Implementations diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index dade8d9e..957eb1e3 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -165,6 +165,7 @@ typedef struct { uint32_t v_code; uint32_t v_s; uint32_t v_c; + uint64_t v_n; } c_decode[1]; } private_impl; } puffs_gif_lzw_decoder; @@ -380,40 +381,40 @@ puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) { return ((puffs_base_slice_u8){}); } -// puffs_base_slice_u8_prefix returns up to the first n bytes of s. +// puffs_base_slice_u8_prefix returns up to the first up_to bytes of s. static inline puffs_base_slice_u8 puffs_base_slice_u8_prefix( puffs_base_slice_u8 s, - uint64_t n) { - if ((uint64_t)(s.len) > n) { - s.len = n; + uint64_t up_to) { + if ((uint64_t)(s.len) > up_to) { + s.len = up_to; } return s; } -// puffs_base_slice_u8_suffix returns up to the last n bytes of s. +// puffs_base_slice_u8_suffix returns up to the last up_to bytes of s. static inline puffs_base_slice_u8 puffs_base_slice_u8_suffix( puffs_base_slice_u8 s, - uint64_t n) { - if ((uint64_t)(s.len) > n) { - s.ptr += (uint64_t)(s.len) - n; - s.len = n; + uint64_t up_to) { + if ((uint64_t)(s.len) > up_to) { + s.ptr += (uint64_t)(s.len) - up_to; + s.len = up_to; } return s; } -// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, n) where -// n is the minimum of dst.len and src.len. +// puffs_base_slice_u8_copy_from_slice calls memmove(dst.ptr, src.ptr, length) +// where length is the minimum of dst.len and src.len. // // Passing a puffs_base_slice_u8 with all fields NULL or zero (a valid, empty // slice) is valid and results in a no-op. static inline uint64_t puffs_base_slice_u8_copy_from_slice( puffs_base_slice_u8 dst, puffs_base_slice_u8 src) { - size_t n = dst.len < src.len ? dst.len : src.len; - if (n > 0) { - memmove(dst.ptr, src.ptr, n); + size_t length = dst.len < src.len ? dst.len : src.len; + if (length > 0) { + memmove(dst.ptr, src.ptr, length); } - return n; + return length; } static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, @@ -457,11 +458,11 @@ static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, uint8_t* rend, uint32_t length) { uint8_t* wptr = *ptr_wptr; - if (length > (wend - wptr)) { + if (length > wend - wptr) { length = wend - wptr; } uint8_t* rptr = *ptr_rptr; - if (length > (rend - rptr)) { + if (length > rend - rptr) { length = rend - rptr; } if (length > 0) { @@ -472,6 +473,22 @@ static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, return length; } +static inline uint64_t puffs_base_writer1_copy_from_slice( + uint8_t** ptr_wptr, + uint8_t* wend, + puffs_base_slice_u8 src) { + uint8_t* wptr = *ptr_wptr; + size_t length = src.len; + if (length > wend - wptr) { + length = wend - wptr; + } + if (length > 0) { + memmove(wptr, src.ptr, length); + *ptr_wptr += length; + } + return length; +} + #endif // PUFFS_BASE_IMPL_H // ---------------- Status Codes Implementations @@ -1300,6 +1317,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, uint32_t v_s; uint32_t v_c; puffs_base_slice_u8 v_expansion; + uint64_t v_n; uint8_t* b_wptr_dst = NULL; uint8_t* b_wstart_dst = NULL; @@ -1345,6 +1363,7 @@ 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; v_expansion = ((puffs_base_slice_u8){}); + v_n = self->private_impl.c_decode[0].v_n; } switch (coro_susp_point) { PUFFS_COROUTINE_SUSPENSION_POINT(0); @@ -1415,22 +1434,14 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, ((puffs_base_slice_u8){.ptr = self->private_impl.f_stack, .len = 4096}), v_s); - PUFFS_COROUTINE_SUSPENSION_POINT(3); - if (a_dst.buf && a_dst.buf->closed) { - status = PUFFS_GIF_ERROR_CLOSED_FOR_WRITES; - goto exit; + v_n = puffs_base_writer1_copy_from_slice(&b_wptr_dst, b_wend_dst, + v_expansion); + if (v_n == ((uint64_t)(v_expansion.len))) { + goto label_1_break; } - if ((b_wend_dst - b_wptr_dst) < - (sizeof(self->private_impl.f_stack) - v_s)) { - status = PUFFS_GIF_SUSPENSION_SHORT_WRITE; - goto suspend; - } - memmove(b_wptr_dst, self->private_impl.f_stack + v_s, - sizeof(self->private_impl.f_stack) - v_s); - b_wptr_dst += sizeof(self->private_impl.f_stack) - v_s; - if (((uint64_t)(v_expansion.len)) == 0) { - } - goto label_1_break; + v_s = ((v_s + ((uint32_t)((v_n & 4095)))) & 4095); + status = PUFFS_GIF_SUSPENSION_SHORT_WRITE; + PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); } label_1_break:; if (v_save_code <= 4095) { @@ -1470,6 +1481,7 @@ suspend: self->private_impl.c_decode[0].v_code = v_code; self->private_impl.c_decode[0].v_s = v_s; self->private_impl.c_decode[0].v_c = v_c; + self->private_impl.c_decode[0].v_n = v_n; exit: if (a_dst.buf) { diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 27529ace..cba4bdaa 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -165,6 +165,7 @@ typedef struct { uint32_t v_code; uint32_t v_s; uint32_t v_c; + uint64_t v_n; } c_decode[1]; } private_impl; } puffs_gif_lzw_decoder; diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 705be683..00321959 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -41,9 +41,9 @@ var StatusList = [...]Status{ {t.IDError, "bad receiver"}, {t.IDError, "bad argument"}, {t.IDError, "initializer not called"}, - {t.IDError, "closed for writes"}, - {t.IDError, "unexpected EOF"}, // Used if reading when closed == true. - {t.IDSuspension, "short read"}, // Used if reading when closed == false. + {t.IDError, "closed for writes"}, // TODO: is this unused? Should callee or caller check closed-ness? + {t.IDError, "unexpected EOF"}, // Used if reading when closed == true. + {t.IDSuspension, "short read"}, // Used if reading when closed == false. {t.IDSuspension, "short write"}, } diff --git a/lang/check/type.go b/lang/check/type.go index aef6362f..80be9f09 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -399,6 +399,8 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { n.SetMType(typeExprPlaceholder16) // HACK. } else if isInDst(q.tm, n, t.KeySlice, 0) { n.SetMType(typeExprSliceU8) // HACK. + } else if isInDst(q.tm, n, t.KeyCopyFromSlice, 1) { + n.SetMType(typeExprU64) // HACK. } else if isInDst(q.tm, n, t.KeyCopyFromReader32, 2) || isInDst(q.tm, n, t.KeyCopyFromHistory32, 2) { n.SetMType(typeExprU32) // HACK. } else { @@ -617,6 +619,7 @@ func isInSrc(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { func isInDst(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { callSuspendible := methodName != t.KeyCopyFromReader32 && methodName != t.KeyCopyFromHistory32 && + methodName != t.KeyCopyFromSlice && methodName != t.KeySlice // TODO: check that n.Args() is "(x:bar)". if n.ID0().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { diff --git a/std/gif/decode_lzw.puffs b/std/gif/decode_lzw.puffs index 1ab64014..b0fe7978 100644 --- a/std/gif/decode_lzw.puffs +++ b/std/gif/decode_lzw.puffs @@ -110,11 +110,13 @@ pub func lzw_decoder.decode?(dst writer1, src reader1)() { inv c < 256, { var expansion[] u8 = this.stack[s:] - // TODO: copy_from_slice should return n_copied. - in.dst.copy_from_slice?(x:expansion) - if expansion.length() == 0 { // Avoid "unused variable" C compiler warning. + var n u64 = in.dst.copy_from_slice(x:expansion) + if n == expansion.length() { + break } - break + s = (s + ((n & 4095) as u32)) & 4095 + // TODO: "closed for writes" instead? + return suspension "short write" } if save_code <= 4095 {