diff --git a/cmd/wuffs-c/internal/cgen/base/io-private.h b/cmd/wuffs-c/internal/cgen/base/io-private.h index d712343a..36e0d2b0 100644 --- a/cmd/wuffs-c/internal/cgen/base/io-private.h +++ b/cmd/wuffs-c/internal/cgen/base/io-private.h @@ -262,3 +262,15 @@ wuffs_base__io_writer__set_mark(wuffs_base__io_writer* o, uint8_t* mark) { o->private_impl.mark = mark; return ((wuffs_base__empty_struct){}); } + +// ---------------- I/O (Utility) + +static inline wuffs_base__io_reader // +wuffs_base__utility__null_io_reader(const wuffs_base__utility* ignored) { + return ((wuffs_base__io_reader){}); +} + +static inline wuffs_base__io_writer // +wuffs_base__utility__null_io_writer(const wuffs_base__utility* ignored) { + return ((wuffs_base__io_writer){}); +} diff --git a/cmd/wuffs-c/internal/cgen/base/range-private.h b/cmd/wuffs-c/internal/cgen/base/range-private.h index be89f521..e37a3ae4 100644 --- a/cmd/wuffs-c/internal/cgen/base/range-private.h +++ b/cmd/wuffs-c/internal/cgen/base/range-private.h @@ -56,7 +56,7 @@ wuffs_base__range_ie_u64__get_max_excl(const wuffs_base__range_ie_u64* r) { return r->max_excl; } -// ---------------- Utility +// ---------------- Ranges and Rects (Utility) static inline wuffs_base__range_ii_u32 // wuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored, diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 5ab1bd67..3f598fa1 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -154,7 +154,9 @@ const baseIOPrivateH = "" + "int8_t* iobounds1_w,\n wuffs_base__slice_u8 src) {\n uint8_t* ioptr_w = *ptr_ioptr_w;\n size_t n = src.len;\n if (n > ((size_t)(iobounds1_w - ioptr_w))) {\n n = iobounds1_w - ioptr_w;\n }\n if (n > 0) {\n memmove(ioptr_w, src.ptr, n);\n *ptr_ioptr_w += n;\n }\n return n;\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_ioptr_w,\n uint8_t* iobounds1_w,\n uint32_t length,\n wuffs_base__slice_u8 src) {\n uint8_t* ioptr_w = *ptr_ioptr_w;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > ((size_t)(iobounds1_w - ioptr_w))) {\n n = iobounds1_w - ioptr_w;\n }\n if (n > 0) {\n memmove(ioptr_w, src.ptr, n);\n *ptr_ioptr_w += n;\n }\n return n;\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set(wuffs_base__io_reader* o,\n wuffs_base__io_buffer* b,\n " + " uint8_t** ptr_iop,\n uint8_t** ptr_io1,\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 o->private_impl.buf = b;\n o->private_impl.mark = data.ptr;\n o->private_impl.limit = data.ptr + data.len;\n *ptr_iop = data.ptr;\n *ptr_io1 = data.ptr + data.len;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set_limit(wuffs_base__io_reader* o,\n uint8_t* ioptr_r,\n uint64_t limit) {\n if (o && (((size_t)(o->private_impl.limit - ioptr_r)) > limit)) {\n o->private_impl.limit = ioptr_r + limit;\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set_mark(wuffs_base__io_reader* o, uint8_t* mark) {\n o->private_impl.mark = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic " + "inline wuffs_base__slice_u8 //\nwuffs_base__io_reader__take(uint8_t** ptr_iop, uint8_t* io1, uint64_t n) {\n if (n <= ((size_t)(io1 - *ptr_iop))) {\n uint8_t* p = *ptr_iop;\n *ptr_iop += n;\n return ((wuffs_base__slice_u8){\n .ptr = p,\n .len = n,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_writer__set(wuffs_base__io_writer* o,\n wuffs_base__io_buffer* b,\n uint8_t** ioptr1_ptr,\n uint8_t** ioptr2_ptr,\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 o->private_impl.buf = b;\n o->private_impl.mark = data.ptr;\n o->private_impl.limit = data.ptr + data.len;\n *ioptr1_ptr = data.ptr;\n *ioptr2_ptr = data.ptr + data.len;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_writer__set_mark(wuffs_base__" + - "io_writer* o, uint8_t* mark) {\n o->private_impl.mark = mark;\n return ((wuffs_base__empty_struct){});\n}\n" + + "io_writer* o, uint8_t* mark) {\n o->private_impl.mark = mark;\n return ((wuffs_base__empty_struct){});\n}\n\n" + + "" + + "// ---------------- I/O (Utility)\n\nstatic inline wuffs_base__io_reader //\nwuffs_base__utility__null_io_reader(const wuffs_base__utility* ignored) {\n return ((wuffs_base__io_reader){});\n}\n\nstatic inline wuffs_base__io_writer //\nwuffs_base__utility__null_io_writer(const wuffs_base__utility* ignored) {\n return ((wuffs_base__io_writer){});\n}\n" + "" const baseIOPublicH = "" + @@ -168,9 +170,9 @@ const baseRangePrivateH = "" + "// ---------------- Ranges and Rects\n\nstatic inline uint32_t //\nwuffs_base__range_ii_u32__get_min_incl(const wuffs_base__range_ii_u32* r) {\n return r->min_incl;\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ii_u32__get_max_incl(const wuffs_base__range_ii_u32* r) {\n return r->max_incl;\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ie_u32__get_min_incl(const wuffs_base__range_ie_u32* r) {\n return r->min_incl;\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ie_u32__get_max_excl(const wuffs_base__range_ie_u32* r) {\n return r->max_excl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ii_u64__get_min_incl(const wuffs_base__range_ii_u64* r) {\n return r->min_incl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ii_u64__get_max_incl(const wuffs_base__range_ii_u64* r) {\n return r->max_incl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ie_u64__get_min_incl(const wuffs_base__range_ie_u64* r) {\n return r->min_incl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ie_u64__get_max_excl(const wuffs_base__range_" + "ie_u64* r) {\n return r->max_excl;\n}\n\n" + "" + - "// ---------------- Utility\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_incl) {\n return ((wuffs_base__range_ii_u32){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u32 //\nwuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_excl) {\n return ((wuffs_base__range_ie_u32){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_incl) {\n return ((wuffs_base__range_ii_u64){\n .min_incl = min_incl,\n .max_incl" + - " = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u64 //\nwuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_excl) {\n return ((wuffs_base__range_ie_u64){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_incl_x,\n uint32_t max_incl_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_incl_x = max_incl_x,\n .max_incl_y = max_incl_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored,\n " + - " uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_excl_x,\n uint32_t max_excl_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_excl_x = max_excl_x,\n .max_excl_y = max_excl_y,\n });\n}\n" + + "// ---------------- Ranges and Rects (Utility)\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_incl) {\n return ((wuffs_base__range_ii_u32){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u32 //\nwuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_excl) {\n return ((wuffs_base__range_ie_u32){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_incl) {\n return ((wuffs_base__range_ii_u64){\n .min_incl = min_in" + + "cl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u64 //\nwuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_excl) {\n return ((wuffs_base__range_ie_u64){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_incl_x,\n uint32_t max_incl_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_incl_x = max_incl_x,\n .max_incl_y = max_incl_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored,\n" + + " uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_excl_x,\n uint32_t max_excl_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_excl_x = max_excl_x,\n .max_excl_y = max_excl_y,\n });\n}\n" + "" const baseRangePublicH = "" + diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 2c217822..8e6ca526 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -105,6 +105,8 @@ var Funcs = []string{ "utility.make_range_ie_u64(min_incl u64, max_excl u64) range_ie_u64", "utility.make_rect_ii_u32(min_incl_x u32, min_incl_y u32, max_incl_x u32, max_incl_y u32) rect_ii_u32", "utility.make_rect_ie_u32(min_incl_x u32, min_incl_y u32, max_excl_x u32, max_excl_y u32) rect_ie_u32", + "utility.null_io_reader() io_reader", + "utility.null_io_writer() io_writer", // ---- ranges diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index cd05da55..c3f41712 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -3575,7 +3575,7 @@ wuffs_base__range_ie_u64__get_max_excl(const wuffs_base__range_ie_u64* r) { return r->max_excl; } -// ---------------- Utility +// ---------------- Ranges and Rects (Utility) static inline wuffs_base__range_ii_u32 // wuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored, @@ -3894,6 +3894,18 @@ wuffs_base__io_writer__set_mark(wuffs_base__io_writer* o, uint8_t* mark) { return ((wuffs_base__empty_struct){}); } +// ---------------- I/O (Utility) + +static inline wuffs_base__io_reader // +wuffs_base__utility__null_io_reader(const wuffs_base__utility* ignored) { + return ((wuffs_base__io_reader){}); +} + +static inline wuffs_base__io_writer // +wuffs_base__utility__null_io_writer(const wuffs_base__utility* ignored) { + return ((wuffs_base__io_writer){}); +} + // ---------------- Memory Allocation // ---------------- Images @@ -9240,13 +9252,6 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, uint64_t v_block_size; uint64_t v_n_compressed; wuffs_base__slice_u8 v_compressed; - wuffs_base__io_writer v_w; - wuffs_base__io_buffer u_w; - uint8_t* iop_v_w = NULL; - uint8_t* io1_v_w = NULL; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(u_w); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iop_v_w); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_v_w); wuffs_base__io_reader v_r; wuffs_base__io_buffer u_r; uint8_t* iop_v_r = NULL; @@ -9287,14 +9292,12 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size; v_n_compressed = 0; v_compressed = ((wuffs_base__slice_u8){}); - v_w = ((wuffs_base__io_writer){}); v_r = ((wuffs_base__io_reader){}); v_z = self->private_impl.c_decode_id_part1[0].v_z; v_uncompressed = ((wuffs_base__slice_u8){}); } else { v_dst_palette = ((wuffs_base__slice_u8){}); v_compressed = ((wuffs_base__slice_u8){}); - v_w = ((wuffs_base__io_writer){}); v_r = ((wuffs_base__io_reader){}); v_uncompressed = ((wuffs_base__slice_u8){}); } @@ -9499,7 +9502,6 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, } label_2_continue:; while (true) { - v_w = ((wuffs_base__io_writer){}); v_r = ((wuffs_base__io_reader){}); if ((self->private_impl.f_compressed_ri > self->private_impl.f_compressed_wi) || @@ -9508,49 +9510,33 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, goto exit; } { - wuffs_base__io_writer o_0_v_w = v_w; - uint8_t* o_0_iop_v_w = iop_v_w; - uint8_t* o_0_io1_v_w = io1_v_w; - wuffs_base__io_writer__set( - &v_w, &u_w, &iop_v_w, &io1_v_w, - wuffs_base__slice_u8__subslice_j( + wuffs_base__io_reader o_0_v_r = v_r; + uint8_t* o_0_iop_v_r = iop_v_r; + uint8_t* o_0_io1_v_r = io1_v_r; + wuffs_base__io_reader__set( + &v_r, &u_r, &iop_v_r, &io1_v_r, + wuffs_base__slice_u8__subslice_ij( ((wuffs_base__slice_u8){ .ptr = self->private_impl.f_compressed, .len = 4096, }), - 0)); + self->private_impl.f_compressed_ri, + self->private_impl.f_compressed_wi)); { - wuffs_base__io_reader o_1_v_r = v_r; - uint8_t* o_1_iop_v_r = iop_v_r; - uint8_t* o_1_io1_v_r = io1_v_r; - wuffs_base__io_reader__set( - &v_r, &u_r, &iop_v_r, &io1_v_r, - wuffs_base__slice_u8__subslice_ij( - ((wuffs_base__slice_u8){ - .ptr = self->private_impl.f_compressed, - .len = 4096, - }), - self->private_impl.f_compressed_ri, - self->private_impl.f_compressed_wi)); - { - u_w.meta.wi = iop_v_w - u_w.data.ptr; - u_r.meta.ri = iop_v_r - u_r.data.ptr; - wuffs_base__status t_5 = wuffs_lzw__decoder__decode( - &self->private_impl.f_lzw, v_w, v_r); - iop_v_w = u_w.data.ptr + u_w.meta.wi; - iop_v_r = u_r.data.ptr + u_r.meta.ri; - v_z = t_5; - } - wuffs_base__u64__sat_add_indirect( - &self->private_impl.f_compressed_ri, - ((uint64_t)(iop_v_r - v_r.private_impl.mark))); - v_r = o_1_v_r; - iop_v_r = o_1_iop_v_r; - io1_v_r = o_1_io1_v_r; + u_r.meta.ri = iop_v_r - u_r.data.ptr; + wuffs_base__status t_5 = wuffs_lzw__decoder__decode( + &self->private_impl.f_lzw, + wuffs_base__utility__null_io_writer(&self->private_impl.f_util), + v_r); + iop_v_r = u_r.data.ptr + u_r.meta.ri; + v_z = t_5; } - v_w = o_0_v_w; - iop_v_w = o_0_iop_v_w; - io1_v_w = o_0_io1_v_w; + wuffs_base__u64__sat_add_indirect( + &self->private_impl.f_compressed_ri, + ((uint64_t)(iop_v_r - v_r.private_impl.mark))); + v_r = o_0_v_r; + iop_v_r = o_0_iop_v_r; + io1_v_r = o_0_io1_v_r; } if (wuffs_lzw__decoder__available(&self->private_impl.f_lzw) > 0) { v_uncompressed = diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 27308248..242e4d79 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -652,16 +652,13 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade } while:inner true { - var w base.io_writer var r base.io_reader if (this.compressed_ri > this.compressed_wi) or (this.compressed_wi > 4096) { return "?internal error: inconsistent ri/wi" } - io_bind (io:w, data:this.compressed[:0]) { // TODO: delete. - io_bind (io:r, data:this.compressed[this.compressed_ri:this.compressed_wi]) { - var z base.status =? this.lzw.decode!??(dst:w, src:r) - this.compressed_ri ~sat+= r.since_mark().length() - } + io_bind (io:r, data:this.compressed[this.compressed_ri:this.compressed_wi]) { + var z base.status =? this.lzw.decode!??(dst:this.util.null_io_writer(), src:r) + this.compressed_ri ~sat+= r.since_mark().length() } if this.lzw.available() > 0 {