From 4985876c5a2c34b787903ebc655a60be57fc5d3d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 15 Sep 2018 09:44:13 +1000 Subject: [PATCH] wuffs gen -version=0.2.0-alpha.18 --- release/c/wuffs-v0.2.h | 620 +++++++++++++++++++++++++++-------------- 1 file changed, 407 insertions(+), 213 deletions(-) diff --git a/release/c/wuffs-v0.2.h b/release/c/wuffs-v0.2.h index a1f706c0..5a2a5ac6 100644 --- a/release/c/wuffs-v0.2.h +++ b/release/c/wuffs-v0.2.h @@ -65,14 +65,14 @@ extern "C" { // work-in-progress version, not a release version, and has no backwards or // forwards compatibility guarantees. // -// WUFFS_VERSION was overridden by "wuffs gen -version" on 2018-09-08 UTC, -// based on revision ead965c61fc81478be59d13033b62f3c4d45ea04. +// WUFFS_VERSION was overridden by "wuffs gen -version" on 2018-09-14 UTC, +// based on revision a12c45bb7f62bfcd4ccc568caba2c8154b7d813a. #define WUFFS_VERSION ((uint64_t)0x0000000000020000) #define WUFFS_VERSION_MAJOR ((uint64_t)0x00000000) #define WUFFS_VERSION_MINOR ((uint64_t)0x0002) #define WUFFS_VERSION_PATCH ((uint64_t)0x0000) -#define WUFFS_VERSION_EXTENSION "alpha.17" -#define WUFFS_VERSION_STRING "0.2.0-alpha.17" +#define WUFFS_VERSION_EXTENSION "alpha.18" +#define WUFFS_VERSION_STRING "0.2.0-alpha.18" // Define WUFFS_CONFIG__STATIC_FUNCTIONS to make all of Wuffs' functions have // static storage. The motivation is discussed in the "ALLOW STATIC @@ -131,6 +131,17 @@ typedef struct { // // Status strings are statically allocated and should never be free'd. They can // be compared by the == operator and not just by strcmp. +// +// Statuses come in four categories: +// - OK: the request was completed, successfully. +// - Warnings: the request was completed, unsuccessfully. +// - Suspensions: the request was not completed, but can be re-tried. +// - Errors: the request was not completed, permanently. +// +// When a function returns an incomplete status, a suspension means that that +// function should be called again within a new context, such as after flushing +// or re-filling an I/O buffer. An error means that an irrecoverable failure +// state was reached. typedef const char* wuffs_base__status; extern const char* wuffs_base__warning__end_of_data; @@ -149,6 +160,11 @@ extern const char* wuffs_base__error__check_wuffs_version_not_applicable; extern const char* wuffs_base__error__check_wuffs_version_missing; extern const char* wuffs_base__error__disabled_by_previous_error; +static inline bool // +wuffs_base__status__is_complete(wuffs_base__status z) { + return (z == NULL) || ((*z != '$') && (*z != '?')); +} + static inline bool // wuffs_base__status__is_error(wuffs_base__status z) { return z && (*z == '?'); @@ -325,6 +341,8 @@ wuffs_base__u64__byte_swapped(uint64_t x) { // WUFFS_BASE__SLICE is a 1-dimensional buffer. // +// len measures a number of elements, not necessarily a size in bytes. +// // A value with all fields NULL or zero is a valid, empty slice. #define WUFFS_BASE__SLICE(T) \ struct { \ @@ -334,6 +352,9 @@ wuffs_base__u64__byte_swapped(uint64_t x) { // WUFFS_BASE__TABLE is a 2-dimensional buffer. // +// width height, and stride measure a number of elements, not necessarily a +// size in bytes. +// // A value with all fields NULL or zero is a valid, empty table. #define WUFFS_BASE__TABLE(T) \ struct { \ @@ -353,6 +374,50 @@ typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; +// wuffs_base__slice_u8__subslice_i returns s[i:]. +// +// It returns an empty slice if i is out of bounds. +static inline wuffs_base__slice_u8 // +wuffs_base__slice_u8__subslice_i(wuffs_base__slice_u8 s, uint64_t i) { + if ((i <= SIZE_MAX) && (i <= s.len)) { + return ((wuffs_base__slice_u8){ + .ptr = s.ptr + i, + .len = s.len - i, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// wuffs_base__slice_u8__subslice_j returns s[:j]. +// +// It returns an empty slice if j is out of bounds. +static inline wuffs_base__slice_u8 // +wuffs_base__slice_u8__subslice_j(wuffs_base__slice_u8 s, uint64_t j) { + if ((j <= SIZE_MAX) && (j <= s.len)) { + return ((wuffs_base__slice_u8){ + .ptr = s.ptr, + .len = j, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// wuffs_base__slice_u8__subslice_ij returns s[i:j]. +// +// It returns an empty slice if i or j is out of bounds. +static inline wuffs_base__slice_u8 // +wuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s, + uint64_t i, + uint64_t j) { + if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) { + return ((wuffs_base__slice_u8){ + .ptr = s.ptr + i, + .len = j - i, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the @@ -1033,25 +1098,29 @@ typedef struct { } private_impl; } wuffs_base__io_writer; -// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length), plus -// additional indexes into that buffer, plus a buffer position and an opened / -// closed flag. -// -// A value with all fields NULL or zero is a valid, empty buffer. -typedef struct wuffs_base__io_buffer__struct { - uint8_t* ptr; // Pointer. - size_t len; // Length. +// wuffs_base__io_buffer_meta is the metadata for a wuffs_base__io_buffer's +// data. +typedef struct { size_t wi; // Write index. Invariant: wi <= len. size_t ri; // Read index. Invariant: ri <= wi. uint64_t pos; // Position of the buffer start relative to the stream start. bool closed; // No further writes are expected. +} wuffs_base__io_buffer_meta; + +// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length) plus +// additional metadata. +// +// A value with all fields zero is a valid, empty buffer. +typedef struct wuffs_base__io_buffer__struct { + wuffs_base__slice_u8 data; + wuffs_base__io_buffer_meta meta; #ifdef __cplusplus inline void compact(); - inline uint64_t io_position_reader(); - inline uint64_t io_position_writer(); inline wuffs_base__io_reader reader(); inline wuffs_base__io_writer writer(); + inline uint64_t reader_io_position(); + inline uint64_t writer_io_position(); #endif // __cplusplus } wuffs_base__io_buffer; @@ -1060,26 +1129,16 @@ typedef struct wuffs_base__io_buffer__struct { // start of the buffer. static inline void // wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) { - if (!buf || (buf->ri == 0)) { + if (!buf || (buf->meta.ri == 0)) { return; } - buf->pos = wuffs_base__u64__sat_add(buf->pos, buf->ri); - size_t n = buf->wi - buf->ri; + buf->meta.pos = wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri); + size_t n = buf->meta.wi - buf->meta.ri; if (n != 0) { - memmove(buf->ptr, buf->ptr + buf->ri, n); + memmove(buf->data.ptr, buf->data.ptr + buf->meta.ri, n); } - buf->wi = n; - buf->ri = 0; -} - -static inline uint64_t // -wuffs_base__io_buffer__io_position_reader(wuffs_base__io_buffer* buf) { - return buf ? wuffs_base__u64__sat_add(buf->pos, buf->ri) : 0; -} - -static inline uint64_t // -wuffs_base__io_buffer__io_position_writer(wuffs_base__io_buffer* buf) { - return buf ? wuffs_base__u64__sat_add(buf->pos, buf->wi) : 0; + buf->meta.wi = n; + buf->meta.ri = 0; } static inline wuffs_base__io_reader // @@ -1096,6 +1155,16 @@ wuffs_base__io_buffer__writer(wuffs_base__io_buffer* buf) { return ret; } +static inline uint64_t // +wuffs_base__io_buffer__reader_io_position(wuffs_base__io_buffer* buf) { + return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0; +} + +static inline uint64_t // +wuffs_base__io_buffer__writer_io_position(wuffs_base__io_buffer* buf) { + return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0; +} + #ifdef __cplusplus inline void // @@ -1103,16 +1172,6 @@ wuffs_base__io_buffer__struct::compact() { wuffs_base__io_buffer__compact(this); } -inline uint64_t // -wuffs_base__io_buffer__struct::io_position_reader() { - return wuffs_base__io_buffer__io_position_reader(this); -} - -inline uint64_t // -wuffs_base__io_buffer__struct::io_position_writer() { - return wuffs_base__io_buffer__io_position_writer(this); -} - inline wuffs_base__io_reader // wuffs_base__io_buffer__struct::reader() { return wuffs_base__io_buffer__reader(this); @@ -1123,8 +1182,89 @@ wuffs_base__io_buffer__struct::writer() { return wuffs_base__io_buffer__writer(this); } +inline uint64_t // +wuffs_base__io_buffer__struct::reader_io_position() { + return wuffs_base__io_buffer__reader_io_position(this); +} + +inline uint64_t // +wuffs_base__io_buffer__struct::writer_io_position() { + return wuffs_base__io_buffer__writer_io_position(this); +} + #endif // __cplusplus +// ---------------- Memory Allocation + +// The memory allocation related functions in this section aren't used by Wuffs +// per se, but they may be helpful to the code that uses Wuffs. + +// wuffs_base__malloc_slice_uxx wraps calling a malloc-like function, except +// that it takes a uint64_t number of elements instead of a size_t size in +// bytes, and it returns a slice (a pointer and a length) instead of just a +// pointer. +// +// You can pass the C stdlib's malloc as the malloc_func. +// +// It returns an empty slice (containing a NULL ptr field) if (num_uxx * +// sizeof(uintxx_t)) would overflow SIZE_MAX. + +static inline wuffs_base__slice_u8 // +wuffs_base__malloc_slice_u8(void* (*malloc_func)(size_t), uint64_t num_u8) { + if (malloc_func && (num_u8 <= (SIZE_MAX / sizeof(uint8_t)))) { + void* p = (*malloc_func)(num_u8 * sizeof(uint8_t)); + if (p) { + return ((wuffs_base__slice_u8){ + .ptr = (uint8_t*)(p), + .len = num_u8, + }); + } + } + return ((wuffs_base__slice_u8){}); +} + +static inline wuffs_base__slice_u16 // +wuffs_base__malloc_slice_u16(void* (*malloc_func)(size_t), uint64_t num_u16) { + if (malloc_func && (num_u16 <= (SIZE_MAX / sizeof(uint16_t)))) { + void* p = (*malloc_func)(num_u16 * sizeof(uint16_t)); + if (p) { + return ((wuffs_base__slice_u16){ + .ptr = (uint16_t*)(p), + .len = num_u16, + }); + } + } + return ((wuffs_base__slice_u16){}); +} + +static inline wuffs_base__slice_u32 // +wuffs_base__malloc_slice_u32(void* (*malloc_func)(size_t), uint64_t num_u32) { + if (malloc_func && (num_u32 <= (SIZE_MAX / sizeof(uint32_t)))) { + void* p = (*malloc_func)(num_u32 * sizeof(uint32_t)); + if (p) { + return ((wuffs_base__slice_u32){ + .ptr = (uint32_t*)(p), + .len = num_u32, + }); + } + } + return ((wuffs_base__slice_u32){}); +} + +static inline wuffs_base__slice_u64 // +wuffs_base__malloc_slice_u64(void* (*malloc_func)(size_t), uint64_t num_u64) { + if (malloc_func && (num_u64 <= (SIZE_MAX / sizeof(uint64_t)))) { + void* p = (*malloc_func)(num_u64 * sizeof(uint64_t)); + if (p) { + return ((wuffs_base__slice_u64){ + .ptr = (uint64_t*)(p), + .len = num_u64, + }); + } + } + return ((wuffs_base__slice_u64){}); +} + #ifdef __cplusplus } // extern "C" #endif @@ -1951,8 +2091,8 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, if (wuffs_base__pixel_format__is_indexed(pixcfg->private_impl.pixfmt)) { // Split a 1024 byte chunk (256 palette entries × 4 bytes per entry) from // the start of pixbuf_memory. We split from the start, not the end, so - // that the remaining ptr has the same alignment as the original ptr, up to - // an alignment of 1024. + // that the both chunks' pointers have the same alignment as the original + // pointer, up to an alignment of 1024. if (len < 1024) { return wuffs_base__error__bad_argument_length_too_short; } @@ -3333,38 +3473,6 @@ wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { // ---------------- Slices and Tables -static inline wuffs_base__slice_u8 // -wuffs_base__slice_u8__subslice_i(wuffs_base__slice_u8 s, uint64_t i) { - if ((i <= SIZE_MAX) && (i <= s.len)) { - return ((wuffs_base__slice_u8){ - .ptr = s.ptr + i, - .len = s.len - i, - }); - } - return ((wuffs_base__slice_u8){}); -} - -static inline wuffs_base__slice_u8 // -wuffs_base__slice_u8__subslice_j(wuffs_base__slice_u8 s, uint64_t j) { - if ((j <= SIZE_MAX) && (j <= s.len)) { - return ((wuffs_base__slice_u8){.ptr = s.ptr, .len = j}); - } - return ((wuffs_base__slice_u8){}); -} - -static inline wuffs_base__slice_u8 // -wuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s, - uint64_t i, - uint64_t j) { - if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) { - return ((wuffs_base__slice_u8){ - .ptr = s.ptr + i, - .len = j - i, - }); - } - return ((wuffs_base__slice_u8){}); -} - // wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s. static inline wuffs_base__slice_u8 // wuffs_base__slice_u8__prefix(wuffs_base__slice_u8 s, uint64_t up_to) { @@ -3486,8 +3594,8 @@ wuffs_base__utility__make_rect_ie_u32(wuffs_base__utility* ignored, static inline bool // wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { - return (buf.ptr || (buf.len == 0)) && (buf.len >= buf.wi) && - (buf.wi >= buf.ri); + return (buf.data.ptr || (buf.data.len == 0)) && + (buf.data.len >= buf.meta.wi) && (buf.meta.wi >= buf.meta.ri); } // TODO: wuffs_base__io_reader__is_eof is no longer used by Wuffs per se, but @@ -3500,7 +3608,8 @@ wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { static inline bool // wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; - return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.limit); + return buf && buf->meta.closed && + (buf->data.ptr + buf->meta.wi == o.private_impl.limit); } static inline bool // @@ -3508,9 +3617,9 @@ wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it // also needs to allow NULL (i.e. implicit, callee-calculated) mark/limit. - return buf ? ((buf->ptr <= o.private_impl.mark) && + return buf ? ((buf->data.ptr <= o.private_impl.mark) && (o.private_impl.mark <= o.private_impl.limit) && - (o.private_impl.limit <= buf->ptr + buf->len)) + (o.private_impl.limit <= buf->data.ptr + buf->data.len)) : ((o.private_impl.mark == NULL) && (o.private_impl.limit == NULL)); } @@ -3520,9 +3629,9 @@ wuffs_base__io_writer__is_valid(wuffs_base__io_writer o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it // also needs to allow NULL (i.e. implicit, callee-calculated) mark/limit. - return buf ? ((buf->ptr <= o.private_impl.mark) && + return buf ? ((buf->data.ptr <= o.private_impl.mark) && (o.private_impl.mark <= o.private_impl.limit) && - (o.private_impl.limit <= buf->ptr + buf->len)) + (o.private_impl.limit <= buf->data.ptr + buf->data.len)) : ((o.private_impl.mark == NULL) && (o.private_impl.limit == NULL)); } @@ -3677,11 +3786,13 @@ wuffs_base__io_writer__set(wuffs_base__io_writer* o, uint8_t** ioptr1_ptr, uint8_t** ioptr2_ptr, wuffs_base__slice_u8 s) { - b->ptr = s.ptr; - b->len = s.len; - b->wi = 0; - b->ri = 0; - b->closed = false; + b->data.ptr = s.ptr; + b->data.len = s.len; + b->meta.wi = 0; + b->meta.ri = 0; + b->meta.pos = 0; + b->meta.closed = false; + o->private_impl.buf = b; o->private_impl.mark = s.ptr; o->private_impl.limit = s.ptr + s.len; @@ -3702,7 +3813,7 @@ wuffs_base__io_writer__set_mark(wuffs_base__io_writer* o, uint8_t* mark) { #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) -const char* wuffs_base__warning__end_of_data = "!base: end of data"; +const char* wuffs_base__warning__end_of_data = "~base: end of data"; const char* wuffs_base__suspension__short_read = "$base: short read"; const char* wuffs_base__suspension__short_write = "$base: short write"; const char* wuffs_base__error__bad_argument_length_too_short = @@ -4562,13 +4673,14 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; if (!a_dst.private_impl.mark) { a_dst.private_impl.mark = iop_a_dst; a_dst.private_impl.limit = - a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; } - if (a_dst.private_impl.buf->closed) { + if (a_dst.private_impl.buf->meta.closed) { a_dst.private_impl.limit = iop_a_dst; } io0_a_dst = a_dst.private_impl.mark; @@ -4591,12 +4703,14 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, wuffs_base__io_writer__set_mark(&a_dst, iop_a_dst); { if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } wuffs_base__status t_0 = wuffs_deflate__decoder__decode_blocks(self, a_dst, a_src); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = a_dst.private_impl.buf->data.ptr + + a_dst.private_impl.buf->meta.wi; } v_z = t_0; } @@ -4672,7 +4786,8 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (wuffs_base__status__is_error(status)) { @@ -4698,11 +4813,12 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -4741,12 +4857,14 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, if (v_type == 0) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_deflate__decoder__decode_uncompressed(self, a_dst, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = a_src.private_impl.buf->data.ptr + + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -4761,11 +4879,13 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, } else if (v_type == 2) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_deflate__decoder__init_dynamic_huffman(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = a_src.private_impl.buf->data.ptr + + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -4777,11 +4897,13 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, self->private_impl.f_end_of_block = false; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_deflate__decoder__decode_huffman_fast(self, a_dst, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -4791,11 +4913,13 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_deflate__decoder__decode_huffman_slow(self, a_dst, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -4823,7 +4947,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -4846,13 +4971,14 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; if (!a_dst.private_impl.mark) { a_dst.private_impl.mark = iop_a_dst; a_dst.private_impl.limit = - a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; } - if (a_dst.private_impl.buf->closed) { + if (a_dst.private_impl.buf->meta.closed) { a_dst.private_impl.limit = iop_a_dst; } io0_a_dst = a_dst.private_impl.mark; @@ -4864,11 +4990,12 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -4959,10 +5086,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -5059,11 +5188,12 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -5283,7 +5413,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -5598,13 +5729,14 @@ wuffs_deflate__decoder__decode_huffman_fast(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; if (!a_dst.private_impl.mark) { a_dst.private_impl.mark = iop_a_dst; a_dst.private_impl.limit = - a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; } - if (a_dst.private_impl.buf->closed) { + if (a_dst.private_impl.buf->meta.closed) { a_dst.private_impl.limit = iop_a_dst; } io0_a_dst = a_dst.private_impl.mark; @@ -5616,11 +5748,12 @@ wuffs_deflate__decoder__decode_huffman_fast(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -5897,10 +6030,12 @@ label_0_break:; goto exit; exit: if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -5934,13 +6069,14 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; if (!a_dst.private_impl.mark) { a_dst.private_impl.mark = iop_a_dst; a_dst.private_impl.limit = - a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; } - if (a_dst.private_impl.buf->closed) { + if (a_dst.private_impl.buf->meta.closed) { a_dst.private_impl.limit = iop_a_dst; } io0_a_dst = a_dst.private_impl.mark; @@ -5952,11 +6088,12 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -6321,10 +6458,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -6730,11 +6869,12 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -6783,11 +6923,13 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_gif__decoder__skip_blocks(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -6811,7 +6953,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -6913,11 +7056,12 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -6934,15 +7078,16 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, if (!self->private_impl.f_restarted) { self->private_impl.f_frame_config_io_position = - (a_src.private_impl.buf ? wuffs_base__u64__sat_add( - a_src.private_impl.buf->pos, - iop_a_src - a_src.private_impl.buf->ptr) - : 0); + (a_src.private_impl.buf + ? wuffs_base__u64__sat_add( + a_src.private_impl.buf->meta.pos, + iop_a_src - a_src.private_impl.buf->data.ptr) + : 0); } else if (self->private_impl.f_frame_config_io_position != (a_src.private_impl.buf ? wuffs_base__u64__sat_add( - a_src.private_impl.buf->pos, - iop_a_src - a_src.private_impl.buf->ptr) + a_src.private_impl.buf->meta.pos, + iop_a_src - a_src.private_impl.buf->data.ptr) : 0)) { status = wuffs_base__error__bad_restart; goto exit; @@ -6962,11 +7107,13 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, if (v_block_type == 33) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_gif__decoder__decode_extension(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = a_src.private_impl.buf->data.ptr + + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -6974,11 +7121,13 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, } else if (v_block_type == 44) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_gif__decoder__decode_id_part0(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = a_src.private_impl.buf->data.ptr + + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -7009,7 +7158,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -7031,11 +7181,12 @@ wuffs_gif__decoder__decode_header(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -7086,7 +7237,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -7110,11 +7262,12 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -7280,7 +7433,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -7301,11 +7455,12 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -7332,11 +7487,13 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, if (v_label == 249) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_gif__decoder__decode_gc(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -7346,11 +7503,13 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, } else if (v_label == 255) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_gif__decoder__decode_ae(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -7360,11 +7519,13 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_gif__decoder__skip_blocks(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -7384,7 +7545,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -7405,11 +7567,12 @@ wuffs_gif__decoder__skip_blocks(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -7465,7 +7628,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -7489,11 +7653,12 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -7648,11 +7813,13 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, label_0_break:; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } status = wuffs_gif__decoder__skip_blocks(self, a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { goto suspend; @@ -7675,7 +7842,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -7697,11 +7865,12 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -7819,7 +7988,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -7838,11 +8008,12 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -7996,7 +8167,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -8031,11 +8203,12 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -8216,17 +8389,17 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, wuffs_base__io_reader__set_limit(&a_src, iop_a_src, v_block_size); wuffs_base__io_reader__set_mark(&a_src, iop_a_src); { - u_w.wi = iop_v_w - u_w.ptr; + u_w.meta.wi = iop_v_w - u_w.data.ptr; if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = - iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } wuffs_base__status t_5 = wuffs_lzw__decoder__decode( &self->private_impl.f_lzw, v_w, a_src); - iop_v_w = u_w.ptr + u_w.wi; + iop_v_w = u_w.data.ptr + u_w.meta.wi; if (a_src.private_impl.buf) { - iop_a_src = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = a_src.private_impl.buf->data.ptr + + a_src.private_impl.buf->meta.ri; } v_z = t_5; } @@ -8299,7 +8472,8 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } return status; @@ -8524,13 +8698,14 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; if (!a_dst.private_impl.mark) { a_dst.private_impl.mark = iop_a_dst; a_dst.private_impl.limit = - a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; } - if (a_dst.private_impl.buf->closed) { + if (a_dst.private_impl.buf->meta.closed) { a_dst.private_impl.limit = iop_a_dst; } io0_a_dst = a_dst.private_impl.mark; @@ -8542,11 +8717,12 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -8726,18 +8902,22 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, wuffs_base__io_writer__set_mark(&a_dst, iop_a_dst); { if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } wuffs_base__status t_8 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = a_dst.private_impl.buf->data.ptr + + a_dst.private_impl.buf->meta.wi; } if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = a_src.private_impl.buf->data.ptr + + a_src.private_impl.buf->meta.ri; } v_z = t_8; } @@ -8850,10 +9030,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } if (wuffs_base__status__is_error(status)) { @@ -8958,13 +9140,14 @@ wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; if (!a_dst.private_impl.mark) { a_dst.private_impl.mark = iop_a_dst; a_dst.private_impl.limit = - a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; } - if (a_dst.private_impl.buf->closed) { + if (a_dst.private_impl.buf->meta.closed) { a_dst.private_impl.limit = iop_a_dst; } io0_a_dst = a_dst.private_impl.mark; @@ -8976,11 +9159,12 @@ wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -9137,10 +9321,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } if (wuffs_base__status__is_error(status)) { @@ -9252,13 +9438,14 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; if (!a_dst.private_impl.mark) { a_dst.private_impl.mark = iop_a_dst; a_dst.private_impl.limit = - a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; } - if (a_dst.private_impl.buf->closed) { + if (a_dst.private_impl.buf->meta.closed) { a_dst.private_impl.limit = iop_a_dst; } io0_a_dst = a_dst.private_impl.mark; @@ -9270,11 +9457,12 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; if (!a_src.private_impl.mark) { a_src.private_impl.mark = iop_a_src; a_src.private_impl.limit = - a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; } io0_a_src = a_src.private_impl.mark; io1_a_src = a_src.private_impl.limit; @@ -9341,18 +9529,22 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, wuffs_base__io_writer__set_mark(&a_dst, iop_a_dst); { if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } wuffs_base__status t_2 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); if (a_dst.private_impl.buf) { - iop_a_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; + iop_a_dst = a_dst.private_impl.buf->data.ptr + + a_dst.private_impl.buf->meta.wi; } if (a_src.private_impl.buf) { - iop_a_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + iop_a_src = a_src.private_impl.buf->data.ptr + + a_src.private_impl.buf->meta.ri; } v_z = t_2; } @@ -9423,10 +9615,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->wi = iop_a_dst - a_dst.private_impl.buf->ptr; + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; } if (a_src.private_impl.buf) { - a_src.private_impl.buf->ri = iop_a_src - a_src.private_impl.buf->ptr; + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; } if (wuffs_base__status__is_error(status)) {