Relocate some for-test-only set_limit methods

This commit is contained in:
Nigel Tao committed 2018-05-11 13:42:06 +10:00
1 parent 81decad445
commit bf4aa38a84
9 files changed
+36 -241

No files matched your search

-34
View File
@@ -392,23 +392,6 @@ 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(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct
wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,
uint64_t limit,
@@ -429,23 +412,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__mark(
wuffs_base__io_writer* o,
uint8_t* mark) {
+2 -3
View File
@@ -96,9 +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 wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;\n uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n if (!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_im" +
"pl.bounds[1] = q;\n }\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\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_impl.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__set_limit(\n wuffs_base__io_writer* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->pr" +
"ivate_impl.buf->ptr + o->private_impl.buf->wi;\n uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;\n if (!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_impl.bounds[1] = q;\n }\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\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\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" +
""
type template_args_short_read struct {
-34
View File
@@ -1516,23 +1516,6 @@ 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(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct
wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,
uint64_t limit,
@@ -1553,23 +1536,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__mark(
wuffs_base__io_writer* o,
uint8_t* mark) {
-34
View File
@@ -1515,23 +1515,6 @@ 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(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct
wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,
uint64_t limit,
@@ -1552,23 +1535,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__mark(
wuffs_base__io_writer* o,
uint8_t* mark) {
-34
View File
@@ -1607,23 +1607,6 @@ 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(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct
wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,
uint64_t limit,
@@ -1644,23 +1627,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__mark(
wuffs_base__io_writer* o,
uint8_t* mark) {
-34
View File
@@ -1624,23 +1624,6 @@ 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(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct
wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,
uint64_t limit,
@@ -1661,23 +1644,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__mark(
wuffs_base__io_writer* o,
uint8_t* mark) {
-34
View File
@@ -1810,23 +1810,6 @@ 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(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct
wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,
uint64_t limit,
@@ -1847,23 +1830,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__mark(
wuffs_base__io_writer* o,
uint8_t* mark) {
-34
View File
@@ -1810,23 +1810,6 @@ 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(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct
wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,
uint64_t limit,
@@ -1847,23 +1830,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__mark(
wuffs_base__io_writer* o,
uint8_t* mark) {
+34
View File
@@ -290,6 +290,40 @@ int test_main(int argc, char** argv, proc* tests, proc* benches) {
// WUFFS_BASE_HEADER_H is where wuffs_base__io_buffer is defined.
#ifdef WUFFS_BASE_HEADER_H
static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit(
wuffs_base__io_reader* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(
wuffs_base__io_writer* o,
uint64_t limit) {
if (o && o->private_impl.buf) {
uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;
uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;
if (!o->private_impl.bounds[0]) {
o->private_impl.bounds[0] = p;
o->private_impl.bounds[1] = q;
}
if ((o->private_impl.bounds[1] - p) > limit) {
o->private_impl.bounds[1] = p + limit;
}
}
return ((wuffs_base__empty_struct){});
}
bool read_file(wuffs_base__io_buffer* dst, const char* path) {
if (!dst || !path) {
FAIL("read_file: NULL argument");