From b2dd7d952c5f0237da7f9847cd8c7c6d7dc86859 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 22 Feb 2020 22:58:48 +1100 Subject: [PATCH] Have io_reader.match7 check io_reader.is_closed --- internal/cgen/base/io-private.h | 7 +++++-- internal/cgen/builtin.go | 3 ++- internal/cgen/data.go | 4 ++-- release/c/wuffs-unsupported-snapshot.c | 17 ++++++++++------- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/internal/cgen/base/io-private.h b/internal/cgen/base/io-private.h index a3081b90..b4e43c9a 100644 --- a/internal/cgen/base/io-private.h +++ b/internal/cgen/base/io-private.h @@ -176,7 +176,10 @@ wuffs_base__io_writer__copy_n32_from_slice(uint8_t** ptr_iop_w, // - 1 means inconclusive, equivalent to "$short read". // - 2 means failure. static inline uint32_t // -wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) { +wuffs_base__io_reader__match7(uint8_t* iop_r, + uint8_t* io2_r, + wuffs_base__io_buffer* r, + uint64_t a) { uint32_t n = a & 7; a >>= 8; if ((io2_r - iop_r) >= 8) { @@ -186,7 +189,7 @@ wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) { } for (; n > 0; n--) { if (iop_r >= io2_r) { - return 1; + return (r && r->meta.closed) ? 2 : 1; } else if (*iop_r != ((uint8_t)(a))) { return 2; } diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 19b38933..33ba1320 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -169,7 +169,8 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args [] return nil case t.IDMatch7: - b.printf("wuffs_base__io_reader__match7(%s%s, %s%s,", iopPrefix, name, io2Prefix, name) + b.printf("wuffs_base__io_reader__match7(%s%s, %s%s, %s,", + iopPrefix, name, io2Prefix, name, name) if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { return err } diff --git a/internal/cgen/data.go b/internal/cgen/data.go index de8089e5..27164c19 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -212,8 +212,8 @@ const baseIOPrivateH = "" + " that:\n// - distance > 0\n// - distance <= (*ptr_iop_w - io1_w)\n// - length <= (io2_w - *ptr_iop_w)\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n32_from_history_fast(uint8_t** ptr_iop_w,\n uint8_t* io1_w,\n uint8_t* io2_w,\n uint32_t length,\n uint32_t distance) {\n uint8_t* p = *ptr_iop_w;\n uint8_t* q = p - distance;\n uint32_t n = length;\n for (; n >= 3; n -= 3) {\n *p++ = *q++;\n *p++ = *q++;\n *p++ = *q++;\n }\n for (; n; n--) {\n *p++ = *q++;\n }\n *ptr_iop_w = p;\n return length;\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n32_from_reader(uint8_t** ptr_iop_w,\n uint8_t* io2_w,\n uint32_t length,\n uint8_t** ptr_iop_r,\n " + " uint8_t* io2_r) {\n uint8_t* iop_w = *ptr_iop_w;\n size_t n = length;\n if (n > ((size_t)(io2_w - iop_w))) {\n n = (size_t)(io2_w - iop_w);\n }\n uint8_t* iop_r = *ptr_iop_r;\n if (n > ((size_t)(io2_r - iop_r))) {\n n = (size_t)(io2_r - iop_r);\n }\n if (n > 0) {\n memmove(iop_w, iop_r, n);\n *ptr_iop_w += n;\n *ptr_iop_r += n;\n }\n return (uint32_t)(n);\n}\n\nstatic inline uint64_t //\nwuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w,\n uint8_t* io2_w,\n wuffs_base__slice_u8 src) {\n uint8_t* iop_w = *ptr_iop_w;\n size_t n = src.len;\n if (n > ((size_t)(io2_w - iop_w))) {\n n = (size_t)(io2_w - iop_w);\n }\n if (n > 0) {\n memmove(iop_w, src.ptr, n);\n *ptr_iop_w += n;\n }\n return (uint64_t)(n);\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n32_from_slice(uint8_t** ptr_iop_w,\n uint8_t* io2_w,\n uint32_t" + " length,\n wuffs_base__slice_u8 src) {\n uint8_t* iop_w = *ptr_iop_w;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > ((size_t)(io2_w - iop_w))) {\n n = (size_t)(io2_w - iop_w);\n }\n if (n > 0) {\n memmove(iop_w, src.ptr, n);\n *ptr_iop_w += n;\n }\n return (uint32_t)(n);\n}\n\n// wuffs_base__io_reader__match7 returns whether the io_reader's upcoming bytes\n// start with the given prefix (up to 7 bytes long). It is peek-like, not\n// read-like, in that there are no side-effects.\n//\n// The low 3 bits of a hold the prefix length, n.\n//\n// The high 56 bits of a hold the prefix itself, in little-endian order. The\n// first prefix byte is in bits 8..=15, the second prefix byte is in bits\n// 16..=23, etc. The high (8 * (7 - n)) bits are ignored.\n//\n// There are three possible return values:\n// - 0 means success.\n// - 1 means inconclusive, equivalent to \"$short read\".\n// - 2 means failure.\nstatic inline uint32_t //\nwuffs_base__io_reader__match7(ui" + - "nt8_t* iop_r, uint8_t* io2_r, uint64_t a) {\n uint32_t n = a & 7;\n a >>= 8;\n if ((io2_r - iop_r) >= 8) {\n uint64_t x = wuffs_base__load_u64le(iop_r);\n uint32_t shift = 8 * (8 - n);\n return ((a << shift) == (x << shift)) ? 0 : 2;\n }\n for (; n > 0; n--) {\n if (iop_r >= io2_r) {\n return 1;\n } else if (*iop_r != ((uint8_t)(a))) {\n return 2;\n }\n iop_r++;\n a >>= 8;\n }\n return 0;\n}\n\nstatic inline wuffs_base__io_buffer* //\nwuffs_base__io_reader__set(wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_r,\n uint8_t** ptr_io0_r,\n uint8_t** ptr_io1_r,\n uint8_t** ptr_io2_r,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = data.len;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *ptr_iop_r = data.ptr;\n *ptr_io0_r = data.ptr;\n *ptr_io1_r = data.ptr;\n *ptr_io2_r = data.ptr + data.len;\n\n return b;\n}\n\nstatic inline wuffs_base__sli" + - "ce_u8 //\nwuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) {\n if (n <= ((size_t)(io2_r - *ptr_iop_r))) {\n uint8_t* p = *ptr_iop_r;\n *ptr_iop_r += n;\n return wuffs_base__make_slice_u8(p, n);\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__io_buffer* //\nwuffs_base__io_writer__set(wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_w,\n uint8_t** ptr_io0_w,\n uint8_t** ptr_io1_w,\n uint8_t** ptr_io2_w,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = 0;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *ptr_iop_w = data.ptr;\n *ptr_io0_w = data.ptr;\n *ptr_io1_w = data.ptr;\n *ptr_io2_w = data.ptr + data.len;\n\n return b;\n}\n\n" + + "nt8_t* iop_r,\n uint8_t* io2_r,\n wuffs_base__io_buffer* r,\n uint64_t a) {\n uint32_t n = a & 7;\n a >>= 8;\n if ((io2_r - iop_r) >= 8) {\n uint64_t x = wuffs_base__load_u64le(iop_r);\n uint32_t shift = 8 * (8 - n);\n return ((a << shift) == (x << shift)) ? 0 : 2;\n }\n for (; n > 0; n--) {\n if (iop_r >= io2_r) {\n return (r && r->meta.closed) ? 2 : 1;\n } else if (*iop_r != ((uint8_t)(a))) {\n return 2;\n }\n iop_r++;\n a >>= 8;\n }\n return 0;\n}\n\nstatic inline wuffs_base__io_buffer* //\nwuffs_base__io_reader__set(wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_r,\n uint8_t** ptr_io0_r,\n uint8_t** ptr_io1_r,\n uint8_t** ptr_io2_r,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = data.len;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *ptr_iop_r" + + " = data.ptr;\n *ptr_io0_r = data.ptr;\n *ptr_io1_r = data.ptr;\n *ptr_io2_r = data.ptr + data.len;\n\n return b;\n}\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) {\n if (n <= ((size_t)(io2_r - *ptr_iop_r))) {\n uint8_t* p = *ptr_iop_r;\n *ptr_iop_r += n;\n return wuffs_base__make_slice_u8(p, n);\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__io_buffer* //\nwuffs_base__io_writer__set(wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_w,\n uint8_t** ptr_io0_w,\n uint8_t** ptr_io1_w,\n uint8_t** ptr_io2_w,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = 0;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *ptr_iop_w = data.ptr;\n *ptr_io0_w = data.ptr;\n *ptr_io1_w = data.ptr;\n *ptr_io2_w = data.ptr + data.len;\n\n return b;\n}\n\n" + "" + "// ---------------- I/O (Utility)\n\n#define wuffs_base__utility__empty_io_reader wuffs_base__empty_io_reader\n#define wuffs_base__utility__empty_io_writer wuffs_base__empty_io_writer\n" + "" diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 6aa8ce2b..98aad308 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6347,7 +6347,10 @@ wuffs_base__io_writer__copy_n32_from_slice(uint8_t** ptr_iop_w, // - 1 means inconclusive, equivalent to "$short read". // - 2 means failure. static inline uint32_t // -wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) { +wuffs_base__io_reader__match7(uint8_t* iop_r, + uint8_t* io2_r, + wuffs_base__io_buffer* r, + uint64_t a) { uint32_t n = a & 7; a >>= 8; if ((io2_r - iop_r) >= 8) { @@ -6357,7 +6360,7 @@ wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) { } for (; n > 0; n--) { if (iop_r >= io2_r) { - return 1; + return (r && r->meta.closed) ? 2 : 1; } else if (*iop_r != ((uint8_t)(a))) { return 2; } @@ -19056,7 +19059,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, } goto label_0_continue; } else if (v_class == 9) { - v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, + v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src, 111546413966853); if (v_match == 0) { *iop_a_dst++ = wuffs_base__make_token( @@ -19076,8 +19079,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, goto label_0_continue; } } else if (v_class == 10) { - v_match = - wuffs_base__io_reader__match7(iop_a_src, io2_a_src, 435762131972); + v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src, + 435762131972); if (v_match == 0) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194433)) << WUFFS_BASE__TOKEN__VALUE__SHIFT) | @@ -19096,8 +19099,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, goto label_0_continue; } } else if (v_class == 11) { - v_match = - wuffs_base__io_reader__match7(iop_a_src, io2_a_src, 465676103172); + v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src, + 465676103172); if (v_match == 0) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE__SHIFT) |