mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Add a set_limit method
This commit is contained in:
1 parent
6e22d68442
commit
04776e9dcf
14 files changed
+191
-11
No files matched your search
@@ -383,6 +383,7 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32(
|
||||
return n;
|
||||
}
|
||||
|
||||
// TODO: delete.
|
||||
static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
wuffs_base__io_reader* o,
|
||||
uint64_t* ptr_to_len) {
|
||||
@@ -392,6 +393,18 @@ static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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;
|
||||
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__mark(
|
||||
wuffs_base__io_reader* o,
|
||||
uint8_t* mark) {
|
||||
@@ -399,7 +412,17 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
|
||||
return ((wuffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()
|
||||
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;
|
||||
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,
|
||||
|
||||
@@ -94,7 +94,8 @@ const baseImpl = "" +
|
||||
" (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_history3" +
|
||||
"2 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_ptr - 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 wuff" +
|
||||
"s_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** ptr_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 - wp" +
|
||||
"tr) {\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__io_reader wuffs_base__io_reader__limit(\n wuffs_base__io_reader* o,\n uint64_t* ptr_to_len) {\n wuffs_base__io_reader ret = *o;\n ret.private_impl.limit.ptr_to_len = ptr_to_len;\n ret.private_impl.limit.next = &o->private_impl.limit;\n return ret;\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\n// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()\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) {\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\n// TODO: delete.\nstatic inline wuffs_base__io_reader wuffs_base__io_reader__limit(\n wuffs_base__io_reader* o,\n uint64_t* ptr_to_len) {\n wuffs_base__io_reader ret = *o;\n ret.private_impl.limit.ptr_to_len = ptr_to_len;\n ret.private_impl.limit.next = &o->private_impl.limit;\n return ret;\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 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_s" +
|
||||
"truct 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->private_impl.buf->ptr + o->private_impl.buf->wi;\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" +
|
||||
""
|
||||
|
||||
type template_args_short_read struct {
|
||||
|
||||
@@ -161,6 +161,15 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
|
||||
if isInSrc(g.tm, n, t.IDLimit, 1) {
|
||||
return fmt.Errorf(`TODO: cgen an "in.src.limit" expression`)
|
||||
}
|
||||
if isInSrc(g.tm, n, t.IDSetLimit, 1) {
|
||||
b.printf("wuffs_base__io_reader__set_limit(&%ssrc,", aPrefix)
|
||||
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(")")
|
||||
// TODO: update the bPrefix variables?
|
||||
return nil
|
||||
}
|
||||
if isInSrc(g.tm, n, t.IDMark, 0) {
|
||||
b.printf("wuffs_base__io_reader__mark(&%ssrc, %srptr_src)", aPrefix, bPrefix)
|
||||
return nil
|
||||
|
||||
@@ -852,6 +852,7 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
|
||||
func isInSrc(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool {
|
||||
callSuspendible := methodName != t.IDSinceMark &&
|
||||
methodName != t.IDMark &&
|
||||
methodName != t.IDSetLimit &&
|
||||
methodName != t.IDLimit
|
||||
if n.Operator() != t.IDOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs {
|
||||
return false
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
- Renamed `buf1`, `reader1`, etc to `io_buffer`, `io_reader`, etc.
|
||||
- Renamed `u32`, `io_reader`, etc to `base.u32`, `base.io_reader`, etc.
|
||||
- Added a `base.image_config` type.
|
||||
- Tweaked how marks and limits work.
|
||||
- Supported animated (not just single frame) GIFs.
|
||||
- Marked the `std/gif` LZW decoder as private.
|
||||
- Marked some internal status codes as private.
|
||||
|
||||
+24
-1
@@ -1475,6 +1475,7 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32(
|
||||
return n;
|
||||
}
|
||||
|
||||
// TODO: delete.
|
||||
static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
wuffs_base__io_reader* o,
|
||||
uint64_t* ptr_to_len) {
|
||||
@@ -1484,6 +1485,18 @@ static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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;
|
||||
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__mark(
|
||||
wuffs_base__io_reader* o,
|
||||
uint8_t* mark) {
|
||||
@@ -1491,7 +1504,17 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
|
||||
return ((wuffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()
|
||||
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;
|
||||
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,
|
||||
|
||||
+24
-1
@@ -1474,6 +1474,7 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32(
|
||||
return n;
|
||||
}
|
||||
|
||||
// TODO: delete.
|
||||
static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
wuffs_base__io_reader* o,
|
||||
uint64_t* ptr_to_len) {
|
||||
@@ -1483,6 +1484,18 @@ static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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;
|
||||
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__mark(
|
||||
wuffs_base__io_reader* o,
|
||||
uint8_t* mark) {
|
||||
@@ -1490,7 +1503,17 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
|
||||
return ((wuffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()
|
||||
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;
|
||||
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,
|
||||
|
||||
+24
-1
@@ -1566,6 +1566,7 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32(
|
||||
return n;
|
||||
}
|
||||
|
||||
// TODO: delete.
|
||||
static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
wuffs_base__io_reader* o,
|
||||
uint64_t* ptr_to_len) {
|
||||
@@ -1575,6 +1576,18 @@ static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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;
|
||||
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__mark(
|
||||
wuffs_base__io_reader* o,
|
||||
uint8_t* mark) {
|
||||
@@ -1582,7 +1595,17 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
|
||||
return ((wuffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()
|
||||
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;
|
||||
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,
|
||||
|
||||
+25
-1
@@ -1582,6 +1582,7 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32(
|
||||
return n;
|
||||
}
|
||||
|
||||
// TODO: delete.
|
||||
static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
wuffs_base__io_reader* o,
|
||||
uint64_t* ptr_to_len) {
|
||||
@@ -1591,6 +1592,18 @@ static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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;
|
||||
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__mark(
|
||||
wuffs_base__io_reader* o,
|
||||
uint8_t* mark) {
|
||||
@@ -1598,7 +1611,17 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
|
||||
return ((wuffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()
|
||||
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;
|
||||
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,
|
||||
@@ -2950,6 +2973,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(&a_src, v_block_size);
|
||||
v_r = a_src;
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
|
||||
|
||||
+24
-1
@@ -1770,6 +1770,7 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32(
|
||||
return n;
|
||||
}
|
||||
|
||||
// TODO: delete.
|
||||
static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
wuffs_base__io_reader* o,
|
||||
uint64_t* ptr_to_len) {
|
||||
@@ -1779,6 +1780,18 @@ static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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;
|
||||
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__mark(
|
||||
wuffs_base__io_reader* o,
|
||||
uint8_t* mark) {
|
||||
@@ -1786,7 +1799,17 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
|
||||
return ((wuffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()
|
||||
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;
|
||||
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,
|
||||
|
||||
+24
-1
@@ -1770,6 +1770,7 @@ static inline uint32_t wuffs_base__io_writer__copy_from_slice32(
|
||||
return n;
|
||||
}
|
||||
|
||||
// TODO: delete.
|
||||
static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
wuffs_base__io_reader* o,
|
||||
uint64_t* ptr_to_len) {
|
||||
@@ -1779,6 +1780,18 @@ static inline wuffs_base__io_reader wuffs_base__io_reader__limit(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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;
|
||||
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__mark(
|
||||
wuffs_base__io_reader* o,
|
||||
uint8_t* mark) {
|
||||
@@ -1786,7 +1799,17 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__mark(
|
||||
return ((wuffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
// TODO: static inline wuffs_base__io_writer wuffs_base__io_writer__limit()
|
||||
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;
|
||||
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,
|
||||
|
||||
@@ -79,7 +79,8 @@ var Types = []string{
|
||||
}
|
||||
|
||||
var Funcs = []string{
|
||||
// TODO: some methods like "mark" should probably have a trailing "!".
|
||||
// TODO: some methods like "mark" and "set_limit" should probably have a
|
||||
// trailing "!".
|
||||
|
||||
// TODO: refine n's type from u32 to u32[..8], u32[..16], etc.
|
||||
"u8.high_bits(n u32)(ret u8)",
|
||||
@@ -105,6 +106,7 @@ var Funcs = []string{
|
||||
|
||||
"io_reader.available()(ret u64)",
|
||||
"io_reader.limit(l u64)(ret io_reader)",
|
||||
"io_reader.set_limit(l u64)()",
|
||||
"io_reader.mark()()",
|
||||
"io_reader.since_mark()(ret slice u8)",
|
||||
"io_reader.skip32?(n u32)()",
|
||||
@@ -125,6 +127,7 @@ var Funcs = []string{
|
||||
"io_writer.copy_from_slice(s slice u8)(ret u64)",
|
||||
"io_writer.copy_from_slice32(s slice u8, length u32)(ret u32)",
|
||||
"io_writer.limit(l u64)(ret io_writer)",
|
||||
"io_writer.set_limit(l u64)()",
|
||||
"io_writer.mark()()",
|
||||
"io_writer.since_mark()(ret slice u8)",
|
||||
|
||||
|
||||
@@ -413,6 +413,7 @@ const (
|
||||
IDLowBits = ID(0xCE)
|
||||
IDHighBits = ID(0xCF)
|
||||
IDUnreadU8 = ID(0xD0)
|
||||
IDSetLimit = ID(0xD1)
|
||||
)
|
||||
|
||||
var builtInsByID = [nBuiltInIDs]string{
|
||||
@@ -586,6 +587,7 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
IDLowBits: "low_bits",
|
||||
IDHighBits: "high_bits",
|
||||
IDUnreadU8: "unread_u8",
|
||||
IDSetLimit: "set_limit",
|
||||
}
|
||||
|
||||
var builtInsByName = map[string]ID{}
|
||||
|
||||
@@ -310,10 +310,11 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
|
||||
break
|
||||
}
|
||||
while true {
|
||||
// TODO: should "mark" be "set_mark"? Unlike "limit", "mark" does
|
||||
// not return a different io_reader.
|
||||
// TODO: should "mark" be "set_mark" or "set_mark_here"? Unlike
|
||||
// "limit", "mark" does not return a different io_reader.
|
||||
in.src.mark()
|
||||
io_bind (in.src) {
|
||||
in.src.set_limit(l:block_size)
|
||||
var r base.io_reader = in.src
|
||||
// TODO: remove the dummy param. It's needed for now so that
|
||||
// writeSaveExprDerivedVars updates e.g. the b_rptr_src derived
|
||||
|
||||
Reference in new issue
Block a user