diff --git a/cmd/puffs-c/internal/cgen/base-impl.h b/cmd/puffs-c/internal/cgen/base-impl.h index 3d522327..e47ba9de 100644 --- a/cmd/puffs-c/internal/cgen/base-impl.h +++ b/cmd/puffs-c/internal/cgen/base-impl.h @@ -178,10 +178,13 @@ static inline uint64_t puffs_base__slice_u8__copy_from_slice( static inline uint32_t puffs_base__writer1__copy_from_history32( uint8_t** ptr_ptr, - uint8_t* start, + uint8_t* start, // May be NULL, meaning an unmarked writer1. uint8_t* end, uint32_t distance, uint32_t length) { + if (!start) { + return 0; + } uint8_t* ptr = *ptr_ptr; size_t d = ptr - start; if ((d == 0) || (d < (size_t)(distance))) { diff --git a/cmd/puffs-c/internal/cgen/data.go b/cmd/puffs-c/internal/cgen/data.go index 205ffec3..2b96dc81 100644 --- a/cmd/puffs-c/internal/cgen/data.go +++ b/cmd/puffs-c/internal/cgen/data.go @@ -30,9 +30,9 @@ const baseImpl = "" + "w 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 puffs_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 puffs_base__slice_u8__subslice" + "_ij(\n puffs_base__slice_u8 s,\n uint64_t i,\n 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,\n// length) 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 v" + - "alid, 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(\n 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 n = end - ptr;\n if ((size_t)(length) > n) {\n length = n;\n } else {\n n = length;\n }\n // TODO: is manual unrolling actually helpful?\n for (; n >= 8; n -= 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 (; n; n--) {\n *p" + - "tr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t puffs_base__writer1__copy_from_reader32(\n 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 size_t n = length;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (n > rend - rptr) {\n n = rend - rptr;\n }\n if (n > 0) {\n memmove(wptr, rptr, n);\n *ptr_wptr += n;\n *ptr_rptr += n;\n }\n return n;\n}\n\nstatic inline uint64_t puffs_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 n = src.len;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline uint32_t puffs_base__writer1__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n puffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n " + - " size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline puffs_base__empty_struct puffs_base__reader1__mark(\n puffs_base__reader1* r,\n uint8_t* m) {\n r->private_impl.mark = m;\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_struct puffs_base__writer1__mark(\n puffs_base__writer1* w,\n uint8_t* m) {\n w->private_impl.mark = m;\n return ((puffs_base__empty_struct){});\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" + + "alid, 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(\n uint8_t** ptr_ptr,\n uint8_t* start, // May be NULL, meaning an unmarked writer1.\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n if (!start) {\n return 0;\n }\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 n = end - ptr;\n if ((size_t)(length) > n) {\n length = n;\n } else {\n n = length;\n }\n // TODO: is manual unrolling actually helpful?\n for (; n >= 8; n -= 8) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *star" + + "t++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t puffs_base__writer1__copy_from_reader32(\n 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 size_t n = length;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (n > rend - rptr) {\n n = rend - rptr;\n }\n if (n > 0) {\n memmove(wptr, rptr, n);\n *ptr_wptr += n;\n *ptr_rptr += n;\n }\n return n;\n}\n\nstatic inline uint64_t puffs_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 n = src.len;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline uint32_t puffs_base__writer1__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n " + + " puffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline puffs_base__empty_struct puffs_base__reader1__mark(\n puffs_base__reader1* r,\n uint8_t* m) {\n r->private_impl.mark = m;\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_struct puffs_base__writer1__mark(\n puffs_base__writer1* w,\n uint8_t* m) {\n w->private_impl.mark = m;\n return ((puffs_base__empty_struct){});\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 588190ef..f3f6a6f7 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -170,9 +170,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } if isInDst(g.tm, n, t.KeySlice, 0) { b.printf("((puffs_base__slice_u8){ "+ - ".ptr = (%sdst.private_impl.mark ? %sdst.private_impl.mark : %swstart_dst), "+ - ".len = %swptr_dst - (%sdst.private_impl.mark ? %sdst.private_impl.mark : %swstart_dst), })", - aPrefix, aPrefix, bPrefix, bPrefix, aPrefix, aPrefix, bPrefix) + ".ptr = %sdst.private_impl.mark, "+ + ".len = %sdst.private_impl.mark ? %swptr_dst - %sdst.private_impl.mark : 0, })", + aPrefix, aPrefix, bPrefix, aPrefix) return nil } if isInDst(g.tm, n, t.KeyMark, 0) { @@ -195,9 +195,8 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare return nil } if isInDst(g.tm, n, t.KeyCopyFromHistory32, 2) { - b.printf("puffs_base__writer1__copy_from_history32(&%swptr_dst, "+ - "(%sdst.private_impl.mark ? %sdst.private_impl.mark : %swstart_dst), %swend_dst", - bPrefix, aPrefix, aPrefix, bPrefix, bPrefix) + b.printf("puffs_base__writer1__copy_from_history32(&%swptr_dst, %sdst.private_impl.mark , %swend_dst", + bPrefix, aPrefix, bPrefix) for _, o := range n.Args() { b.writeb(',') if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesOptional, depth); err != nil { @@ -250,9 +249,8 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare if typ := x.MType(); typ.Decorator() == 0 && typ.Name().Key() == t.KeyWriter1 { // TODO: don't hard-code dst. const wName = "dst" - b.printf("(uint64_t)(%swptr_%s - "+ - "(%sdst.private_impl.mark ? %sdst.private_impl.mark : %swstart_%s))", - bPrefix, wName, aPrefix, aPrefix, bPrefix, wName) + b.printf("(uint64_t)(%s%s.private_impl.mark ? (%swptr_%s - %s%s.private_impl.mark) : 0)", + aPrefix, wName, bPrefix, wName, aPrefix, wName) } else { b.writes("(uint64_t)(") if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil { diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 3b3e0f3c..79078d7d 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -505,10 +505,13 @@ static inline uint64_t puffs_base__slice_u8__copy_from_slice( static inline uint32_t puffs_base__writer1__copy_from_history32( uint8_t** ptr_ptr, - uint8_t* start, + uint8_t* start, // May be NULL, meaning an unmarked writer1. uint8_t* end, uint32_t distance, uint32_t length) { + if (!start) { + return 0; + } uint8_t* ptr = *ptr_ptr; size_t d = ptr - start; if ((d == 0) || (d < (size_t)(distance))) { @@ -896,10 +899,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode( PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); } v_written = ((puffs_base__slice_u8){ - .ptr = (a_dst.private_impl.mark ? a_dst.private_impl.mark - : b_wstart_dst), - .len = b_wptr_dst - (a_dst.private_impl.mark ? a_dst.private_impl.mark - : b_wstart_dst), + .ptr = a_dst.private_impl.mark, + .len = a_dst.private_impl.mark ? b_wptr_dst - a_dst.private_impl.mark + : 0, }); if (((uint64_t)(v_written.len)) >= 32768) { v_written = puffs_base__slice_u8_suffix(v_written, 32768); @@ -1571,15 +1573,15 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman( v_n_copied = 0; while (true) { if (((uint64_t)(v_distance)) > - ((uint64_t)(b_wptr_dst - (a_dst.private_impl.mark - ? a_dst.private_impl.mark - : b_wstart_dst)))) { + ((uint64_t)(a_dst.private_impl.mark + ? (b_wptr_dst - a_dst.private_impl.mark) + : 0))) { v_hlen = 0; v_hdist = ((uint32_t)( (((uint64_t)(v_distance)) - - ((uint64_t)(b_wptr_dst - (a_dst.private_impl.mark - ? a_dst.private_impl.mark - : b_wstart_dst)))))); + ((uint64_t)(a_dst.private_impl.mark + ? (b_wptr_dst - a_dst.private_impl.mark) + : 0))))); if (v_length > v_hdist) { v_length -= v_hdist; v_hlen = v_hdist; @@ -1640,9 +1642,8 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman( } } v_n_copied = puffs_base__writer1__copy_from_history32( - &b_wptr_dst, - (a_dst.private_impl.mark ? a_dst.private_impl.mark : b_wstart_dst), - b_wend_dst, v_distance, v_length); + &b_wptr_dst, a_dst.private_impl.mark, b_wend_dst, v_distance, + v_length); if (v_length <= v_n_copied) { v_length = 0; goto label_7_break; @@ -2475,11 +2476,10 @@ puffs_flate__status puffs_flate__zlib_decoder__decode( v_checksum = puffs_flate__adler32__update( &self->private_impl.f_adler, ((puffs_base__slice_u8){ - .ptr = (a_dst.private_impl.mark ? a_dst.private_impl.mark - : b_wstart_dst), - .len = b_wptr_dst - (a_dst.private_impl.mark - ? a_dst.private_impl.mark - : b_wstart_dst), + .ptr = a_dst.private_impl.mark, + .len = a_dst.private_impl.mark + ? b_wptr_dst - a_dst.private_impl.mark + : 0, })); if (v_z == 0) { goto label_0_break; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index de014969..a7eda5ee 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -451,10 +451,13 @@ static inline uint64_t puffs_base__slice_u8__copy_from_slice( static inline uint32_t puffs_base__writer1__copy_from_history32( uint8_t** ptr_ptr, - uint8_t* start, + uint8_t* start, // May be NULL, meaning an unmarked writer1. uint8_t* end, uint32_t distance, uint32_t length) { + if (!start) { + return 0; + } uint8_t* ptr = *ptr_ptr; size_t d = ptr - start; if ((d == 0) || (d < (size_t)(distance))) {