From a69948b23d627786bf077f276586962c6585bc77 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 11 May 2018 14:06:20 +1000 Subject: [PATCH] Simplify the base-impl set_limit method --- cmd/wuffs-c/internal/cgen/base-impl.h | 15 ++++++--------- cmd/wuffs-c/internal/cgen/data.go | 4 ++-- cmd/wuffs-c/internal/cgen/expr.go | 5 ++--- gen/c/std/adler32.c | 15 ++++++--------- gen/c/std/crc32.c | 15 ++++++--------- gen/c/std/deflate.c | 15 ++++++--------- gen/c/std/gif.c | 21 +++++++-------------- gen/c/std/gzip.c | 15 ++++++--------- gen/c/std/zlib.c | 15 ++++++--------- 9 files changed, 47 insertions(+), 73 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 9e4e7fb2..776f5c80 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -392,15 +392,12 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32( return n; } -static inline wuffs_base__empty_struct -wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, - uint64_t limit, - size_t ri_override) { - if (o && o->private_impl.buf) { - uint8_t* p = o->private_impl.buf->ptr + ri_override; - if ((o->private_impl.bounds[1] - p) > limit) { - o->private_impl.bounds[1] = p + limit; - } +static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( + wuffs_base__io_reader* o, + uint8_t* rptr, + uint64_t limit) { + if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { + o->private_impl.bounds[1] = rptr + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 2802e97f..7b065f15 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -96,8 +96,8 @@ const baseImpl = "" + "fs_base__io_writer__is_valid(wuffs_base__io_writer o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline uint32_t wuffs_base__io_writer__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 if (!distance) {\n return 0;\n }\n uint8_t* ptr = *ptr_ptr;\n if ((size_t)(ptr - start) < (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: unrolling" + " by 3 seems best for the std/deflate benchmarks, but that\n // is mostly because 3 is the minimum length for the deflate format. This\n // function implementation shouldn't overfit to that one format. Perhaps the\n // copy_from_history32 Wuffs method should also take an unroll hint argument,\n // and the cgen can look if that argument is the constant expression '3'.\n //\n // See also wuffs_base__io_writer__copy_from_history32__bco below.\n //\n // Alternatively, or additionally, have a sloppy_copy_from_history32 method\n // that copies 8 bytes at a time, possibly writing more than length bytes?\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\n// wuffs_base__io_writer__copy_from_history32__bco is a Bounds Check Optimized\n// version of the wuffs_base__io_writer__copy_from_history32 function above.\n// The caller needs to prove that:\n// - distance > 0\n// - distance <= (*ptr_pt" + "r - start)\n// - length <= (end - *ptr_ptr)\nstatic inline uint32_t wuffs_base__io_writer__copy_from_history32__bco(\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 start = ptr - distance;\n uint32_t n = length;\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\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 wuffs_base__io_writer__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 wuffs_base__io_writer__copy_from_slice(\n uint8_t** p" + - "tr_wptr,\n uint8_t* wend,\n wuffs_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 wuffs_base__io_writer__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n wuffs_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 wuffs_base__empty_struct\nwuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,\n uint64_t limit,\n size_t ri_override) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + ri_override;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_imp" + - "l.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__mark(\n wuffs_base__io_reader* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" + + "tr_wptr,\n uint8_t* wend,\n wuffs_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 wuffs_base__io_writer__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n wuffs_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 wuffs_base__empty_struct wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint8_t* rptr,\n uint64_t limit) {\n if (o && ((o->private_impl.bounds[1] - rptr) > limit)) {\n o->private_impl.bounds[1] = rptr + limit;\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__mark(\n wuffs_base__io_reader*" + + " o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" + "" type template_args_short_read struct { diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index aa4bb515..80e22b3a 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -159,12 +159,11 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare return nil } if isInSrc(g.tm, n, t.IDSetLimit, 1) { - b.printf("wuffs_base__io_reader__set_limit_internal(&%ssrc,", aPrefix) + b.printf("wuffs_base__io_reader__set_limit(&%ssrc, %srptr_src,", aPrefix, bPrefix) if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil { return err } - // TODO: fix this set_limit_internal hack. - b.writes(", a_src.private_impl.buf ? (b_rptr_src - a_src.private_impl.buf->ptr) : 0)") + b.writes(")") // TODO: update the bPrefix variables? return nil } diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index de1f1050..6a9dd5d9 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1516,15 +1516,12 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32( return n; } -static inline wuffs_base__empty_struct -wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, - uint64_t limit, - size_t ri_override) { - if (o && o->private_impl.buf) { - uint8_t* p = o->private_impl.buf->ptr + ri_override; - if ((o->private_impl.bounds[1] - p) > limit) { - o->private_impl.bounds[1] = p + limit; - } +static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( + wuffs_base__io_reader* o, + uint8_t* rptr, + uint64_t limit) { + if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { + o->private_impl.bounds[1] = rptr + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 7ca878f3..7d45458b 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1515,15 +1515,12 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32( return n; } -static inline wuffs_base__empty_struct -wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, - uint64_t limit, - size_t ri_override) { - if (o && o->private_impl.buf) { - uint8_t* p = o->private_impl.buf->ptr + ri_override; - if ((o->private_impl.bounds[1] - p) > limit) { - o->private_impl.bounds[1] = p + limit; - } +static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( + wuffs_base__io_reader* o, + uint8_t* rptr, + uint64_t limit) { + if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { + o->private_impl.bounds[1] = rptr + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index e787294c..c348d4c8 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1607,15 +1607,12 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32( return n; } -static inline wuffs_base__empty_struct -wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, - uint64_t limit, - size_t ri_override) { - if (o && o->private_impl.buf) { - uint8_t* p = o->private_impl.buf->ptr + ri_override; - if ((o->private_impl.bounds[1] - p) > limit) { - o->private_impl.bounds[1] = p + limit; - } +static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( + wuffs_base__io_reader* o, + uint8_t* rptr, + uint64_t limit) { + if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { + o->private_impl.bounds[1] = rptr + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 1b5fbe01..74b73c31 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1624,15 +1624,12 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32( return n; } -static inline wuffs_base__empty_struct -wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, - uint64_t limit, - size_t ri_override) { - if (o && o->private_impl.buf) { - uint8_t* p = o->private_impl.buf->ptr + ri_override; - if ((o->private_impl.bounds[1] - p) > limit) { - o->private_impl.bounds[1] = p + limit; - } +static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( + wuffs_base__io_reader* o, + uint8_t* rptr, + uint64_t limit) { + if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { + o->private_impl.bounds[1] = rptr + limit; } return ((wuffs_base__empty_struct){}); } @@ -2879,11 +2876,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( { uint8_t* o_0_bounds0_src = a_src.private_impl.bounds[0]; uint8_t* o_0_bounds1_src = a_src.private_impl.bounds[1]; - wuffs_base__io_reader__set_limit_internal( - &a_src, v_block_size, - a_src.private_impl.buf - ? (b_rptr_src - a_src.private_impl.buf->ptr) - : 0); + wuffs_base__io_reader__set_limit(&a_src, b_rptr_src, v_block_size); { if (a_src.private_impl.buf) { a_src.private_impl.buf->ri = diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 3f919899..e9e713f0 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1810,15 +1810,12 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32( return n; } -static inline wuffs_base__empty_struct -wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, - uint64_t limit, - size_t ri_override) { - if (o && o->private_impl.buf) { - uint8_t* p = o->private_impl.buf->ptr + ri_override; - if ((o->private_impl.bounds[1] - p) > limit) { - o->private_impl.bounds[1] = p + limit; - } +static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( + wuffs_base__io_reader* o, + uint8_t* rptr, + uint64_t limit) { + if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { + o->private_impl.bounds[1] = rptr + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 032a1fd5..5e89563b 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1810,15 +1810,12 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32( return n; } -static inline wuffs_base__empty_struct -wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, - uint64_t limit, - size_t ri_override) { - if (o && o->private_impl.buf) { - uint8_t* p = o->private_impl.buf->ptr + ri_override; - if ((o->private_impl.bounds[1] - p) > limit) { - o->private_impl.bounds[1] = p + limit; - } +static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( + wuffs_base__io_reader* o, + uint8_t* rptr, + uint64_t limit) { + if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { + o->private_impl.bounds[1] = rptr + limit; } return ((wuffs_base__empty_struct){}); }