diff --git a/internal/cgen/base/io-private.h b/internal/cgen/base/io-private.h index cd42e1eb..d13e055c 100644 --- a/internal/cgen/base/io-private.h +++ b/internal/cgen/base/io-private.h @@ -35,7 +35,7 @@ wuffs_base__io__since(uint64_t mark, uint64_t index, uint8_t* ptr) { static inline uint32_t // wuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w, uint8_t* io0_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, uint32_t distance) { if (!distance) { @@ -46,7 +46,7 @@ wuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w, return 0; } uint8_t* q = p - distance; - size_t n = (size_t)(io1_w - p); + size_t n = (size_t)(io2_w - p); if ((size_t)(length) > n) { length = (uint32_t)(n); } else { @@ -79,11 +79,11 @@ wuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w, // pre-conditions. The caller needs to prove that: // - distance > 0 // - distance <= (*ptr_iop_w - io0_w) -// - length <= (io1_w - *ptr_iop_w) +// - length <= (io2_w - *ptr_iop_w) static inline uint32_t // wuffs_base__io_writer__copy_n_from_history_fast(uint8_t** ptr_iop_w, uint8_t* io0_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, uint32_t distance) { uint8_t* p = *ptr_iop_w; @@ -103,18 +103,18 @@ wuffs_base__io_writer__copy_n_from_history_fast(uint8_t** ptr_iop_w, static inline uint32_t // wuffs_base__io_writer__copy_n_from_reader(uint8_t** ptr_iop_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, uint8_t** ptr_iop_r, - uint8_t* io1_r) { + uint8_t* io2_r) { uint8_t* iop_w = *ptr_iop_w; size_t n = length; - if (n > ((size_t)(io1_w - iop_w))) { - n = (size_t)(io1_w - iop_w); + if (n > ((size_t)(io2_w - iop_w))) { + n = (size_t)(io2_w - iop_w); } uint8_t* iop_r = *ptr_iop_r; - if (n > ((size_t)(io1_r - iop_r))) { - n = (size_t)(io1_r - iop_r); + if (n > ((size_t)(io2_r - iop_r))) { + n = (size_t)(io2_r - iop_r); } if (n > 0) { memmove(iop_w, iop_r, n); @@ -126,12 +126,12 @@ wuffs_base__io_writer__copy_n_from_reader(uint8_t** ptr_iop_w, static inline uint64_t // wuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w, - uint8_t* io1_w, + uint8_t* io2_w, wuffs_base__slice_u8 src) { uint8_t* iop_w = *ptr_iop_w; size_t n = src.len; - if (n > ((size_t)(io1_w - iop_w))) { - n = (size_t)(io1_w - iop_w); + if (n > ((size_t)(io2_w - iop_w))) { + n = (size_t)(io2_w - iop_w); } if (n > 0) { memmove(iop_w, src.ptr, n); @@ -142,7 +142,7 @@ wuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w, static inline uint32_t // wuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, wuffs_base__slice_u8 src) { uint8_t* iop_w = *ptr_iop_w; @@ -150,8 +150,8 @@ wuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w, if (n > length) { n = length; } - if (n > ((size_t)(io1_w - iop_w))) { - n = (size_t)(io1_w - iop_w); + if (n > ((size_t)(io2_w - iop_w))) { + n = (size_t)(io2_w - iop_w); } if (n > 0) { memmove(iop_w, src.ptr, n); @@ -164,7 +164,7 @@ static inline wuffs_base__empty_struct // wuffs_base__io_reader__set(wuffs_base__io_buffer** o, wuffs_base__io_buffer* b, uint8_t** ptr_iop_r, - uint8_t** ptr_io1_r, + uint8_t** ptr_io2_r, wuffs_base__slice_u8 data) { b->data = data; b->meta.wi = data.len; @@ -174,7 +174,7 @@ wuffs_base__io_reader__set(wuffs_base__io_buffer** o, *o = b; *ptr_iop_r = data.ptr; - *ptr_io1_r = data.ptr + data.len; + *ptr_io2_r = data.ptr + data.len; wuffs_base__empty_struct ret; ret.private_impl = 0; @@ -182,8 +182,8 @@ wuffs_base__io_reader__set(wuffs_base__io_buffer** o, } static inline wuffs_base__slice_u8 // -wuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io1_r, uint64_t n) { - if (n <= ((size_t)(io1_r - *ptr_iop_r))) { +wuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) { + if (n <= ((size_t)(io2_r - *ptr_iop_r))) { uint8_t* p = *ptr_iop_r; *ptr_iop_r += n; return wuffs_base__make_slice_u8(p, n); @@ -195,7 +195,7 @@ static inline wuffs_base__empty_struct // wuffs_base__io_writer__set(wuffs_base__io_buffer** o, wuffs_base__io_buffer* b, uint8_t** ptr_iop_w, - uint8_t** ptr_io1_w, + uint8_t** ptr_io2_w, wuffs_base__slice_u8 data) { b->data = data; b->meta.wi = 0; @@ -205,7 +205,7 @@ wuffs_base__io_writer__set(wuffs_base__io_buffer** o, *o = b; *ptr_iop_w = data.ptr; - *ptr_io1_w = data.ptr + data.len; + *ptr_io2_w = data.ptr + data.len; wuffs_base__empty_struct ret; ret.private_impl = 0; diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index c736ef65..a2e96be5 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -106,13 +106,13 @@ func (g *gen) writeBuiltinIO(b *buffer, recv *a.Expr, method t.ID, args []*a.Nod // TODO: don't hard-code these. switch recv.Str(g.tm) { case "args.dst": - p0 = "io1_a_dst" + p0 = "io2_a_dst" p1 = "iop_a_dst" case "args.src": - p0 = "io1_a_src" + p0 = "io2_a_src" p1 = "iop_a_src" case "w": - p0 = "io1_v_w" + p0 = "io2_v_w" p1 = "iop_v_w" } if p0 == "" { @@ -181,7 +181,7 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args [] return nil case t.IDTake: - b.printf("wuffs_base__io_reader__take(&iop_a_src, io1_a_src,") + b.printf("wuffs_base__io_reader__take(&iop_a_src, io2_a_src,") return g.writeArgs(b, args, depth) } @@ -217,7 +217,7 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args [] suffix = "_fast" } b.printf("wuffs_base__io_writer__copy_n_from_history%s("+ - "&iop_a_dst, %sdst->data.ptr, io1_a_dst", + "&iop_a_dst, %sdst->data.ptr, io2_a_dst", suffix, aPrefix) for _, o := range args { b.writeb(',') @@ -229,20 +229,20 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args [] return nil case t.IDCopyNFromReader: - b.printf("wuffs_base__io_writer__copy_n_from_reader(&iop_a_dst, io1_a_dst,") + b.printf("wuffs_base__io_writer__copy_n_from_reader(&iop_a_dst, io2_a_dst,") if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { return err } // TODO: don't assume that the last argument is "args.src". - b.printf(", &iop_a_src, io1_a_src)") + b.printf(", &iop_a_src, io2_a_src)") return nil case t.IDCopyFromSlice: - b.printf("wuffs_base__io_writer__copy_from_slice(&iop_a_dst, io1_a_dst,") + b.printf("wuffs_base__io_writer__copy_from_slice(&iop_a_dst, io2_a_dst,") return g.writeArgs(b, args, depth) case t.IDCopyNFromSlice: - b.printf("wuffs_base__io_writer__copy_n_from_slice(&iop_a_dst, io1_a_dst,") + b.printf("wuffs_base__io_writer__copy_n_from_slice(&iop_a_dst, io2_a_dst,") return g.writeArgs(b, args, depth) case t.IDCountSince: @@ -561,7 +561,7 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error temp := g.currFunk.tempW g.currFunk.tempW++ - b.printf("if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) {" + + b.printf("if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {" + "status = wuffs_base__suspension__short_read; goto suspend; }") // TODO: watch for passing an array type to writeCTypeName? In C, an @@ -578,7 +578,7 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error if err := g.writeCoroSuspPoint(b, false); err != nil { return err } - b.printf("if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) {" + + b.printf("if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {" + "status = wuffs_base__suspension__short_read; goto suspend; }") b.printf("iop_a_src++;\n") return nil @@ -599,9 +599,9 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error return err } - b.printf("if (%s > ((uint64_t)(io1_a_src - iop_a_src))) {\n", scratchName) - b.printf("%s -= ((uint64_t)(io1_a_src - iop_a_src));\n", scratchName) - b.printf("iop_a_src = io1_a_src;\n") + b.printf("if (%s > ((uint64_t)(io2_a_src - iop_a_src))) {\n", scratchName) + b.printf("%s -= ((uint64_t)(io2_a_src - iop_a_src));\n", scratchName) + b.printf("iop_a_src = io2_a_src;\n") b.writes("status = wuffs_base__suspension__short_read; goto suspend; }\n") b.printf("iop_a_src += %s;\n", scratchName) @@ -625,7 +625,7 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error if err := g.writeCoroSuspPoint(b, false); err != nil { return err } - b.writes("if (iop_a_dst == io1_a_dst) {\n" + + b.writes("if (iop_a_dst == io2_a_dst) {\n" + "status = wuffs_base__suspension__short_write; goto suspend; }\n" + "*iop_a_dst++ = ") x := n.Args()[0].AsArg().Value() @@ -663,7 +663,7 @@ func (g *gen) writeReadUxxAsUyy(b *buffer, n *a.Expr, preName string, xx uint8, scratchName := fmt.Sprintf("self->private_data.%s%s[0].scratch", sPrefix, g.currFunk.astFunc.FuncName().Str(g.tm)) - b.printf("if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= %d)) {", xx/8) + b.printf("if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= %d)) {", xx/8) b.printf("%s%d =", tPrefix, temp) if xx != yy { b.printf("((uint%d_t)(", yy) @@ -681,7 +681,7 @@ func (g *gen) writeReadUxxAsUyy(b *buffer, n *a.Expr, preName string, xx uint8, } b.printf("while (true) {") - b.printf("if (WUFFS_BASE__UNLIKELY(iop_%s == io1_%s)) {"+ + b.printf("if (WUFFS_BASE__UNLIKELY(iop_%s == io2_%s)) {"+ "status = wuffs_base__suspension__short_read; goto suspend; }", preName, preName) diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index 8603faee..2b1bac18 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -68,23 +68,23 @@ const ( // reading or writing the next byte (and advancing the stream) is essentially // "etc = *iop_a_src++" or "*io_a_dst++ = etc". // -// The other two prefixes, giving names like io0_etc and io1_etc, are +// The other two prefixes, giving names like io0_etc and io2_etc, are // auxilliary pointers: lower and upper inclusive bounds. As an iop_etc pointer -// advances, it cannot advance past io1_etc. In the rarer case that an iop_etc +// advances, it cannot advance past io2_etc. In the rarer case that an iop_etc // pointer retreats, undoing a read or write, it cannot retreat past io0_etc. // // At the start of a function, these pointers are initialized from an // io_buffer's fields (ptr, ri, wi, len). For an io_reader: // - io0_etc = ptr + ri // - iop_etc = ptr + ri -// - io1_etc = ptr + wi +// - io2_etc = ptr + wi // and for an io_writer: // - io0_etc = ptr + wi // - iop_etc = ptr + wi -// - io1_etc = ptr + len +// - io2_etc = ptr + len const ( io0Prefix = "io0_" // Lower bound. - io1Prefix = "io1_" // Upper bound. + io2Prefix = "io2_" // Upper bound. iopPrefix = "iop_" // Pointer. ) diff --git a/internal/cgen/data.go b/internal/cgen/data.go index 18acc698..de95d331 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -163,12 +163,12 @@ const baseImagePublicH = "" + "" const baseIOPrivateH = "" + - "// ---------------- I/O\n\nstatic inline uint64_t //\nwuffs_base__io__count_since(uint64_t mark, uint64_t index) {\n if (index >= mark) {\n return index - mark;\n }\n return 0;\n}\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__io__since(uint64_t mark, uint64_t index, uint8_t* ptr) {\n if (index >= mark) {\n return wuffs_base__make_slice_u8(ptr + mark, index - mark);\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w,\n uint8_t* io0_w,\n uint8_t* io1_w,\n uint32_t length,\n uint32_t distance) {\n if (!distance) {\n return 0;\n }\n uint8_t* p = *ptr_iop_w;\n if ((size_t)(p - io0_w) < (size_t)(distance)) {\n return 0;\n }\n uint8_t* q = p - distance;\n size_t n = (size_t)(io1_w - p);\n if ((size_t)(length) > n) {\n length = (uint32_t)(n);\n } else {\n" + + "// ---------------- I/O\n\nstatic inline uint64_t //\nwuffs_base__io__count_since(uint64_t mark, uint64_t index) {\n if (index >= mark) {\n return index - mark;\n }\n return 0;\n}\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__io__since(uint64_t mark, uint64_t index, uint8_t* ptr) {\n if (index >= mark) {\n return wuffs_base__make_slice_u8(ptr + mark, index - mark);\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w,\n uint8_t* io0_w,\n uint8_t* io2_w,\n uint32_t length,\n uint32_t distance) {\n if (!distance) {\n return 0;\n }\n uint8_t* p = *ptr_iop_w;\n if ((size_t)(p - io0_w) < (size_t)(distance)) {\n return 0;\n }\n uint8_t* q = p - distance;\n size_t n = (size_t)(io2_w - p);\n if ((size_t)(length) > n) {\n length = (uint32_t)(n);\n } else {\n" + " n = (size_t)(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_n_from_history 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_n_from_history_fast below.\n //\n // Alternatively, or additionally, have a sloppy_copy_n_from_history method\n // that copies 8 bytes at a time, possibly writing more than length bytes?\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\n// wuffs_base__io_writer__copy_n_from_history_fast is like the\n// wuffs_base__io_writer__copy_n_from_history function above, but has stronger\n// pre-conditions. The caller needs to prove that:\n// - distance > " + - "0\n// - distance <= (*ptr_iop_w - io0_w)\n// - length <= (io1_w - *ptr_iop_w)\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_history_fast(uint8_t** ptr_iop_w,\n uint8_t* io0_w,\n uint8_t* io1_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_n_from_reader(uint8_t** ptr_iop_w,\n uint8_t* io1_w,\n uint32_t length,\n uint8_t** ptr_iop_r,\n uint8_t* io1_r) {\n uint8_t* i" + - "op_w = *ptr_iop_w;\n size_t n = length;\n if (n > ((size_t)(io1_w - iop_w))) {\n n = (size_t)(io1_w - iop_w);\n }\n uint8_t* iop_r = *ptr_iop_r;\n if (n > ((size_t)(io1_r - iop_r))) {\n n = (size_t)(io1_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* io1_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)(io1_w - iop_w))) {\n n = (size_t)(io1_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_n_from_slice(uint8_t** ptr_iop_w,\n uint8_t* io1_w,\n uint32_t length,\n w" + - "uffs_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)(io1_w - iop_w))) {\n n = (size_t)(io1_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\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set(wuffs_base__io_buffer** o,\n wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_r,\n uint8_t** ptr_io1_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 *o = b;\n *ptr_iop_r = data.ptr;\n *ptr_io1_r = data.ptr + data.len;\n\n wuffs_base__empty_struct ret;\n ret.private_impl = 0;\n return ret;\n}\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io1_r, uint64_t n) {\n if (n <= ((size_t)(io1_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__empty_struct //\nwuffs_base__io_writer__set(wuffs_base__io_buffer** o,\n wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_w,\n uint8_t** ptr_io1_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 *o = b;\n *ptr_iop_w = data.ptr;\n *ptr_io1_w = data.ptr + data.len;\n\n wuffs_base__empty_struct ret;\n ret.private_impl = 0;\n return ret;\n}\n\n" + + "0\n// - distance <= (*ptr_iop_w - io0_w)\n// - length <= (io2_w - *ptr_iop_w)\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_history_fast(uint8_t** ptr_iop_w,\n uint8_t* io0_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_n_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* i" + + "op_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_n_from_slice(uint8_t** ptr_iop_w,\n uint8_t* io2_w,\n uint32_t length,\n w" + + "uffs_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\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set(wuffs_base__io_buffer** o,\n wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_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 *o = b;\n *ptr_iop_r = data.ptr;\n *ptr_io2_r = data.ptr + data.len;\n\n wuffs_base__empty_struct ret;\n ret.private_impl = 0;\n return ret;\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__empty_struct //\nwuffs_base__io_writer__set(wuffs_base__io_buffer** o,\n wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_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 *o = b;\n *ptr_iop_w = data.ptr;\n *ptr_io2_w = data.ptr + data.len;\n\n wuffs_base__empty_struct ret;\n ret.private_impl = 0;\n return ret;\n}\n\n" + "" + "// ---------------- I/O (Utility)\n\n#define wuffs_base__utility__null_io_reader wuffs_base__null_io_reader\n#define wuffs_base__utility__null_io_writer wuffs_base__null_io_writer\n" + "" diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index 4de60d6d..420ac2a8 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -277,12 +277,12 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { b.printf("uint8_t *%s%d_%s%s%s = %s%s%s;\n", oPrefix, ioBindNum, iopPrefix, prefix, name, iopPrefix, prefix, name) b.printf("uint8_t *%s%d_%s%s%s = %s%s%s;\n", - oPrefix, ioBindNum, io1Prefix, prefix, name, io1Prefix, prefix, name) + oPrefix, ioBindNum, io2Prefix, prefix, name, io2Prefix, prefix, name) } if n.Keyword() == t.IDIOBind { - b.printf("wuffs_base__io_%s__set(&%s%s, &u_%s, &iop_%s%s, &io1_%s%s,", - cTyp, prefix, name, name, prefix, name, prefix, name) + b.printf("wuffs_base__io_%s__set(&%s%s, &%s%s, &%s%s%s, &%s%s%s,", + cTyp, prefix, name, uPrefix, name, iopPrefix, prefix, name, io2Prefix, prefix, name) if err := g.writeExpr(b, n.Arg1(), 0); err != nil { return err } @@ -318,7 +318,7 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { b.printf("%s%s%s = %s%d_%s%s%s;\n", iopPrefix, prefix, name, oPrefix, ioBindNum, iopPrefix, prefix, name) b.printf("%s%s%s = %s%d_%s%s%s;\n", - io1Prefix, prefix, name, oPrefix, ioBindNum, io1Prefix, prefix, name) + io2Prefix, prefix, name, oPrefix, ioBindNum, io2Prefix, prefix, name) } } b.writes("}\n") diff --git a/internal/cgen/var.go b/internal/cgen/var.go index 7205c224..5c6ffe19 100644 --- a/internal/cgen/var.go +++ b/internal/cgen/var.go @@ -103,7 +103,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, prefix string, name t. if header { b.printf("uint8_t* %s%s = NULL;", iopPrefix, preName) b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", io0Prefix, preName) - b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", io1Prefix, preName) + b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", io2Prefix, preName) } b.printf("if (%s) {", preName) @@ -114,11 +114,11 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, prefix string, name t. if header { b.printf("%s%s = %s%s;", io0Prefix, preName, iopPrefix, preName) b.printf("%s%s = %s->data.ptr + %s->%s;", - io1Prefix, preName, preName, preName, i1) + io2Prefix, preName, preName, preName, i1) if typ.QID()[1] == t.IDIOWriter { b.printf("if (%s->meta.closed) {", preName) - b.printf("%s%s = %s%s;", io1Prefix, preName, iopPrefix, preName) + b.printf("%s%s = %s%s;", io2Prefix, preName, iopPrefix, preName) b.printf("}\n") } } @@ -298,7 +298,7 @@ func (g *gen) writeVars(b *buffer, f *funk, inStructDecl bool) error { preName := vPrefix + name // TODO: io0_etc variables? b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", iopPrefix, preName) - b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io1Prefix, preName) + b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io2Prefix, preName) } } return nil diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 5bdbaafe..cd1275a9 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -4485,7 +4485,7 @@ wuffs_base__io__since(uint64_t mark, uint64_t index, uint8_t* ptr) { static inline uint32_t // wuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w, uint8_t* io0_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, uint32_t distance) { if (!distance) { @@ -4496,7 +4496,7 @@ wuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w, return 0; } uint8_t* q = p - distance; - size_t n = (size_t)(io1_w - p); + size_t n = (size_t)(io2_w - p); if ((size_t)(length) > n) { length = (uint32_t)(n); } else { @@ -4529,11 +4529,11 @@ wuffs_base__io_writer__copy_n_from_history(uint8_t** ptr_iop_w, // pre-conditions. The caller needs to prove that: // - distance > 0 // - distance <= (*ptr_iop_w - io0_w) -// - length <= (io1_w - *ptr_iop_w) +// - length <= (io2_w - *ptr_iop_w) static inline uint32_t // wuffs_base__io_writer__copy_n_from_history_fast(uint8_t** ptr_iop_w, uint8_t* io0_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, uint32_t distance) { uint8_t* p = *ptr_iop_w; @@ -4553,18 +4553,18 @@ wuffs_base__io_writer__copy_n_from_history_fast(uint8_t** ptr_iop_w, static inline uint32_t // wuffs_base__io_writer__copy_n_from_reader(uint8_t** ptr_iop_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, uint8_t** ptr_iop_r, - uint8_t* io1_r) { + uint8_t* io2_r) { uint8_t* iop_w = *ptr_iop_w; size_t n = length; - if (n > ((size_t)(io1_w - iop_w))) { - n = (size_t)(io1_w - iop_w); + if (n > ((size_t)(io2_w - iop_w))) { + n = (size_t)(io2_w - iop_w); } uint8_t* iop_r = *ptr_iop_r; - if (n > ((size_t)(io1_r - iop_r))) { - n = (size_t)(io1_r - iop_r); + if (n > ((size_t)(io2_r - iop_r))) { + n = (size_t)(io2_r - iop_r); } if (n > 0) { memmove(iop_w, iop_r, n); @@ -4576,12 +4576,12 @@ wuffs_base__io_writer__copy_n_from_reader(uint8_t** ptr_iop_w, static inline uint64_t // wuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w, - uint8_t* io1_w, + uint8_t* io2_w, wuffs_base__slice_u8 src) { uint8_t* iop_w = *ptr_iop_w; size_t n = src.len; - if (n > ((size_t)(io1_w - iop_w))) { - n = (size_t)(io1_w - iop_w); + if (n > ((size_t)(io2_w - iop_w))) { + n = (size_t)(io2_w - iop_w); } if (n > 0) { memmove(iop_w, src.ptr, n); @@ -4592,7 +4592,7 @@ wuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w, static inline uint32_t // wuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w, - uint8_t* io1_w, + uint8_t* io2_w, uint32_t length, wuffs_base__slice_u8 src) { uint8_t* iop_w = *ptr_iop_w; @@ -4600,8 +4600,8 @@ wuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w, if (n > length) { n = length; } - if (n > ((size_t)(io1_w - iop_w))) { - n = (size_t)(io1_w - iop_w); + if (n > ((size_t)(io2_w - iop_w))) { + n = (size_t)(io2_w - iop_w); } if (n > 0) { memmove(iop_w, src.ptr, n); @@ -4614,7 +4614,7 @@ static inline wuffs_base__empty_struct // wuffs_base__io_reader__set(wuffs_base__io_buffer** o, wuffs_base__io_buffer* b, uint8_t** ptr_iop_r, - uint8_t** ptr_io1_r, + uint8_t** ptr_io2_r, wuffs_base__slice_u8 data) { b->data = data; b->meta.wi = data.len; @@ -4624,7 +4624,7 @@ wuffs_base__io_reader__set(wuffs_base__io_buffer** o, *o = b; *ptr_iop_r = data.ptr; - *ptr_io1_r = data.ptr + data.len; + *ptr_io2_r = data.ptr + data.len; wuffs_base__empty_struct ret; ret.private_impl = 0; @@ -4632,8 +4632,8 @@ wuffs_base__io_reader__set(wuffs_base__io_buffer** o, } static inline wuffs_base__slice_u8 // -wuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io1_r, uint64_t n) { - if (n <= ((size_t)(io1_r - *ptr_iop_r))) { +wuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) { + if (n <= ((size_t)(io2_r - *ptr_iop_r))) { uint8_t* p = *ptr_iop_r; *ptr_iop_r += n; return wuffs_base__make_slice_u8(p, n); @@ -4645,7 +4645,7 @@ static inline wuffs_base__empty_struct // wuffs_base__io_writer__set(wuffs_base__io_buffer** o, wuffs_base__io_buffer* b, uint8_t** ptr_iop_w, - uint8_t** ptr_io1_w, + uint8_t** ptr_io2_w, wuffs_base__slice_u8 data) { b->data = data; b->meta.wi = 0; @@ -4655,7 +4655,7 @@ wuffs_base__io_writer__set(wuffs_base__io_buffer** o, *o = b; *ptr_iop_w = data.ptr; - *ptr_io1_w = data.ptr + data.len; + *ptr_io2_w = data.ptr + data.len; wuffs_base__empty_struct ret; ret.private_impl = 0; @@ -6397,13 +6397,13 @@ wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, uint8_t* iop_a_dst = NULL; uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_dst) { iop_a_dst = a_dst->data.ptr + a_dst->meta.wi; io0_a_dst = iop_a_dst; - io1_a_dst = a_dst->data.ptr + a_dst->data.len; + io2_a_dst = a_dst->data.ptr + a_dst->data.len; if (a_dst->meta.closed) { - io1_a_dst = iop_a_dst; + io2_a_dst = iop_a_dst; } } @@ -6514,11 +6514,11 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_blocks[0]; @@ -6533,7 +6533,7 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, while (self->private_impl.f_n_bits < 3) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -6658,22 +6658,22 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, uint8_t* iop_a_dst = NULL; uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_dst) { iop_a_dst = a_dst->data.ptr + a_dst->meta.wi; io0_a_dst = iop_a_dst; - io1_a_dst = a_dst->data.ptr + a_dst->data.len; + io2_a_dst = a_dst->data.ptr + a_dst->data.len; if (a_dst->meta.closed) { - io1_a_dst = iop_a_dst; + io2_a_dst = iop_a_dst; } } uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_uncompressed[0]; @@ -6694,14 +6694,14 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); uint32_t t_0; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { t_0 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { self->private_data.s_decode_uncompressed[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -6728,13 +6728,13 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, v_length = ((v_length)&0xFFFF); while (true) { v_n_copied = wuffs_base__io_writer__copy_n_from_reader( - &iop_a_dst, io1_a_dst, v_length, &iop_a_src, io1_a_src); + &iop_a_dst, io2_a_dst, v_length, &iop_a_src, io2_a_src); if (v_length <= v_n_copied) { status = NULL; goto ok; } v_length -= v_n_copied; - if (((uint64_t)(io1_a_dst - iop_a_dst)) == 0) { + if (((uint64_t)(io2_a_dst - iop_a_dst)) == 0) { status = wuffs_base__suspension__short_write; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); } else { @@ -6832,11 +6832,11 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_init_dynamic_huffman[0]; @@ -6862,7 +6862,7 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, while (v_n_bits < 14) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -6892,7 +6892,7 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, while (v_n_bits < 3) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -6931,7 +6931,7 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -6980,7 +6980,7 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, while (v_n_bits < v_n_extra_bits) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -7335,22 +7335,22 @@ wuffs_deflate__decoder__decode_huffman_fast(wuffs_deflate__decoder* self, uint8_t* iop_a_dst = NULL; uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_dst) { iop_a_dst = a_dst->data.ptr + a_dst->meta.wi; io0_a_dst = iop_a_dst; - io1_a_dst = a_dst->data.ptr + a_dst->data.len; + io2_a_dst = a_dst->data.ptr + a_dst->data.len; if (a_dst->meta.closed) { - io1_a_dst = iop_a_dst; + io2_a_dst = iop_a_dst; } } uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } if ((self->private_impl.f_n_bits >= 8) || @@ -7363,8 +7363,8 @@ wuffs_deflate__decoder__decode_huffman_fast(wuffs_deflate__decoder* self, v_lmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1); v_dmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[1]) - 1); label_0_continue:; - while ((((uint64_t)(io1_a_dst - iop_a_dst)) >= 258) && - (((uint64_t)(io1_a_src - iop_a_src)) >= 12)) { + while ((((uint64_t)(io2_a_dst - iop_a_dst)) >= 258) && + (((uint64_t)(io2_a_src - iop_a_src)) >= 12)) { if (v_n_bits < 15) { v_bits |= (((uint32_t)(wuffs_base__load_u8be(iop_a_src))) << v_n_bits); (iop_a_src += 1, wuffs_base__make_empty_struct()); @@ -7534,7 +7534,7 @@ label_0_continue:; v_hdist = (self->private_impl.f_history_index - v_hdist); while (true) { v_n_copied = wuffs_base__io_writer__copy_n_from_slice( - &iop_a_dst, io1_a_dst, v_hlen, + &iop_a_dst, io2_a_dst, v_hlen, wuffs_base__slice_u8__subslice_i( wuffs_base__make_slice_u8(self->private_data.f_history, 32768), @@ -7544,7 +7544,7 @@ label_0_continue:; } v_hlen -= v_n_copied; wuffs_base__io_writer__copy_n_from_slice( - &iop_a_dst, io1_a_dst, v_hlen, + &iop_a_dst, io2_a_dst, v_hlen, wuffs_base__make_slice_u8(self->private_data.f_history, 32768)); goto label_1_break; } @@ -7559,7 +7559,7 @@ label_0_continue:; } } wuffs_base__io_writer__copy_n_from_history_fast( - &iop_a_dst, a_dst->data.ptr, io1_a_dst, v_length, + &iop_a_dst, a_dst->data.ptr, io2_a_dst, v_length, (v_dist_minus_1 + 1)); goto label_2_break; } @@ -7624,22 +7624,22 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, uint8_t* iop_a_dst = NULL; uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_dst) { iop_a_dst = a_dst->data.ptr + a_dst->meta.wi; io0_a_dst = iop_a_dst; - io1_a_dst = a_dst->data.ptr + a_dst->data.len; + io2_a_dst = a_dst->data.ptr + a_dst->data.len; if (a_dst->meta.closed) { - io1_a_dst = iop_a_dst; + io2_a_dst = iop_a_dst; } } uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_huffman_slow[0]; @@ -7683,7 +7683,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -7696,7 +7696,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, label_1_break:; if ((v_table_entry >> 31) != 0) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (iop_a_dst == io1_a_dst) { + if (iop_a_dst == io2_a_dst) { status = wuffs_base__suspension__short_write; goto suspend; } @@ -7721,7 +7721,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -7734,7 +7734,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, label_2_break:; if ((v_table_entry >> 31) != 0) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - if (iop_a_dst == io1_a_dst) { + if (iop_a_dst == io2_a_dst) { status = wuffs_base__suspension__short_write; goto suspend; } @@ -7770,7 +7770,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, while (v_n_bits < v_table_entry_n_bits) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -7798,7 +7798,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -7824,7 +7824,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -7851,7 +7851,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, while (v_n_bits < v_table_entry_n_bits) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -7887,7 +7887,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, v_hdist = (self->private_impl.f_history_index - v_hdist); while (true) { v_n_copied = wuffs_base__io_writer__copy_n_from_slice( - &iop_a_dst, io1_a_dst, v_hlen, + &iop_a_dst, io2_a_dst, v_hlen, wuffs_base__slice_u8__subslice_i( wuffs_base__make_slice_u8(self->private_data.f_history, 32768), @@ -7910,7 +7910,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, if (v_hlen > 0) { while (true) { v_n_copied = wuffs_base__io_writer__copy_n_from_slice( - &iop_a_dst, io1_a_dst, v_hlen, + &iop_a_dst, io2_a_dst, v_hlen, wuffs_base__slice_u8__subslice_i( wuffs_base__make_slice_u8(self->private_data.f_history, 32768), @@ -7931,7 +7931,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, } } v_n_copied = wuffs_base__io_writer__copy_n_from_history( - &iop_a_dst, a_dst->data.ptr, io1_a_dst, v_length, + &iop_a_dst, a_dst->data.ptr, io2_a_dst, v_length, (v_dist_minus_1 + 1)); if (v_length <= v_n_copied) { v_length = 0; @@ -8225,11 +8225,11 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } v_clear_code = self->private_impl.f_clear_code; @@ -8242,11 +8242,11 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self, v_output_wi = self->private_impl.f_output_wi; while (true) { if (v_n_bits < v_width) { - if (((uint64_t)(io1_a_src - iop_a_src)) >= 4) { + if (((uint64_t)(io2_a_src - iop_a_src)) >= 4) { v_bits |= (wuffs_base__load_u32le(iop_a_src) << v_n_bits); (iop_a_src += ((31 - v_n_bits) >> 3), wuffs_base__make_empty_struct()); v_n_bits |= 24; - } else if (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { self->private_impl.f_read_from_return_value = 2; goto label_0_break; } else { @@ -8254,7 +8254,7 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self, (iop_a_src += 1, wuffs_base__make_empty_struct()); v_n_bits += 8; if (v_n_bits >= v_width) { - } else if (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { self->private_impl.f_read_from_return_value = 2; goto label_0_break; } else { @@ -8403,13 +8403,13 @@ wuffs_lzw__decoder__write_to(wuffs_lzw__decoder* self, uint8_t* iop_a_dst = NULL; uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_dst) { iop_a_dst = a_dst->data.ptr + a_dst->meta.wi; io0_a_dst = iop_a_dst; - io1_a_dst = a_dst->data.ptr + a_dst->data.len; + io2_a_dst = a_dst->data.ptr + a_dst->data.len; if (a_dst->meta.closed) { - io1_a_dst = iop_a_dst; + io2_a_dst = iop_a_dst; } } @@ -8427,7 +8427,7 @@ wuffs_lzw__decoder__write_to(wuffs_lzw__decoder* self, v_s = wuffs_base__slice_u8__subslice_ij( wuffs_base__make_slice_u8(self->private_data.f_output, 8199), self->private_impl.f_output_ri, self->private_impl.f_output_wi); - v_n = wuffs_base__io_writer__copy_from_slice(&iop_a_dst, io1_a_dst, v_s); + v_n = wuffs_base__io_writer__copy_from_slice(&iop_a_dst, io2_a_dst, v_s); if (v_n == ((uint64_t)(v_s.len))) { self->private_impl.f_output_ri = 0; self->private_impl.f_output_wi = 0; @@ -8831,11 +8831,11 @@ wuffs_gif__decoder__ack_metadata_chunk(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_ack_metadata_chunk[0]; @@ -8854,7 +8854,7 @@ wuffs_gif__decoder__ack_metadata_chunk(wuffs_gif__decoder* self, status = wuffs_base__error__bad_i_o_position; goto exit; } - while (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + while (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { status = wuffs_base__suspension__short_read; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1); } @@ -9087,11 +9087,11 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0]; @@ -9159,7 +9159,7 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self, if (self->private_impl .f_quirk_enabled_first_frame_local_palette_means_black_background && (self->private_impl.f_num_decoded_frame_configs_value == 0)) { - while (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + while (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { status = wuffs_base__suspension__short_read; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4); } @@ -9230,11 +9230,11 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_skip_frame[0]; @@ -9245,7 +9245,7 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9257,10 +9257,10 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, (((uint32_t)(3)) << (1 + (v_flags & 7))); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (self->private_data.s_skip_frame[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_skip_frame[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -9268,7 +9268,7 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9426,11 +9426,11 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_up_to_id_part1[0]; @@ -9460,7 +9460,7 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, while (true) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9544,11 +9544,11 @@ wuffs_gif__decoder__decode_header(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_header[0]; @@ -9562,7 +9562,7 @@ wuffs_gif__decoder__decode_header(wuffs_gif__decoder* self, while (v_i < 6) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9615,11 +9615,11 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_lsd[0]; @@ -9637,14 +9637,14 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); uint32_t t_0; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_0 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_data.s_decode_lsd[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9666,14 +9666,14 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); uint32_t t_1; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_1 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_data.s_decode_lsd[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9694,7 +9694,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9703,7 +9703,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9711,7 +9711,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, v_background_color_index = t_3; } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9724,14 +9724,14 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); uint32_t t_4; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 3)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) { t_4 = ((uint32_t)(wuffs_base__load_u24be(iop_a_src))); iop_a_src += 3; } else { self->private_data.s_decode_lsd[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9824,11 +9824,11 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_extension[0]; @@ -9839,7 +9839,7 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9918,11 +9918,11 @@ wuffs_gif__decoder__skip_blocks(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_skip_blocks[0]; @@ -9934,7 +9934,7 @@ wuffs_gif__decoder__skip_blocks(wuffs_gif__decoder* self, while (true) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -9948,10 +9948,10 @@ wuffs_gif__decoder__skip_blocks(wuffs_gif__decoder* self, self->private_data.s_skip_blocks[0].scratch = ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (self->private_data.s_skip_blocks[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_skip_blocks[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -9994,11 +9994,11 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_ae[0]; @@ -10015,7 +10015,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, while (true) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10030,10 +10030,10 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, self->private_data.s_decode_ae[0].scratch = ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (self->private_data.s_decode_ae[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_ae[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -10048,7 +10048,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, while (v_block_size < 11) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10074,7 +10074,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, if (v_is_animexts || v_is_netscape) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10086,10 +10086,10 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (self->private_data.s_decode_ae[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_ae[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -10098,7 +10098,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10109,10 +10109,10 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, self->private_data.s_decode_ae[0].scratch = 2; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); if (self->private_data.s_decode_ae[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_ae[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -10122,14 +10122,14 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); uint32_t t_4; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_4 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_data.s_decode_ae[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10155,7 +10155,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, } } else if (self->private_impl.f_ignore_metadata) { } else if (v_is_iccp && self->private_impl.f_report_metadata_iccp) { - while (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + while (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { status = wuffs_base__suspension__short_read; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10); } @@ -10173,7 +10173,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, status = wuffs_base__warning__metadata_reported; goto ok; } else if (v_is_xmp && self->private_impl.f_report_metadata_xmp) { - while (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + while (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { status = wuffs_base__suspension__short_read; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(11); } @@ -10243,11 +10243,11 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_gc[0]; @@ -10258,7 +10258,7 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10271,7 +10271,7 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10290,14 +10290,14 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); uint16_t t_2; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_2 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_data.s_decode_gc[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10320,7 +10320,7 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, (((uint64_t)(v_gc_duration_centiseconds)) * 7056000); { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10329,7 +10329,7 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10370,11 +10370,11 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_id_part0[0]; @@ -10386,14 +10386,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); uint32_t t_0; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_0 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10415,14 +10415,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); uint32_t t_1; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_1 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10444,14 +10444,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); uint32_t t_2; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_2 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10474,14 +10474,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); uint32_t t_3; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_3 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10550,11 +10550,11 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_id_part1[0]; @@ -10569,7 +10569,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10589,14 +10589,14 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); uint32_t t_1; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 3)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) { t_1 = ((uint32_t)(wuffs_base__load_u24be(iop_a_src))); iop_a_src += 3; } else { self->private_data.s_decode_id_part1[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10687,7 +10687,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10743,7 +10743,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, wuffs_base__io_buffer u_r WUFFS_BASE__POTENTIALLY_UNUSED = wuffs_base__null_io_buffer(); uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; uint64_t v_mark = 0; wuffs_base__status v_lzw_status = NULL; wuffs_base__status v_copy_status = NULL; @@ -10751,11 +10751,11 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_id_part2[0]; @@ -10775,7 +10775,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, v_need_block_size = false; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -10786,7 +10786,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, if (v_block_size == 0) { goto label_0_break; } - while (((uint64_t)(io1_a_src - iop_a_src)) == 0) { + while (((uint64_t)(io2_a_src - iop_a_src)) == 0) { status = wuffs_base__suspension__short_read; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); } @@ -10797,12 +10797,12 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, } while (self->private_impl.f_compressed_wi <= 3841) { v_n_compressed = wuffs_base__u64__min( - v_block_size, ((uint64_t)(io1_a_src - iop_a_src))); + v_block_size, ((uint64_t)(io2_a_src - iop_a_src))); if (v_n_compressed <= 0) { goto label_1_break; } v_compressed = - wuffs_base__io_reader__take(&iop_a_src, io1_a_src, v_n_compressed); + wuffs_base__io_reader__take(&iop_a_src, io2_a_src, v_n_compressed); wuffs_base__slice_u8__copy_from_slice( wuffs_base__slice_u8__subslice_i( wuffs_base__make_slice_u8(self->private_data.f_compressed, @@ -10815,7 +10815,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, if (v_block_size > 0) { goto label_1_break; } - if (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { v_need_block_size = true; goto label_1_break; } @@ -10838,9 +10838,9 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, { wuffs_base__io_buffer* 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; + uint8_t* o_0_io2_v_r = io2_v_r; wuffs_base__io_reader__set( - &v_r, &u_r, &iop_v_r, &io1_v_r, + &v_r, &u_r, &iop_v_r, &io2_v_r, wuffs_base__slice_u8__subslice_ij( wuffs_base__make_slice_u8(self->private_data.f_compressed, 4096), @@ -10863,7 +10863,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, : 0)); v_r = o_0_v_r; iop_v_r = o_0_iop_v_r; - io1_v_r = o_0_io1_v_r; + io2_v_r = o_0_io2_v_r; } v_uncompressed = wuffs_lzw__decoder__flush(&self->private_data.f_lzw); if (((uint64_t)(v_uncompressed.len)) > 0) { @@ -10881,10 +10881,10 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (self->private_data.s_decode_id_part2[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_id_part2[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -11231,22 +11231,22 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, uint8_t* iop_a_dst = NULL; uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_dst) { iop_a_dst = a_dst->data.ptr + a_dst->meta.wi; io0_a_dst = iop_a_dst; - io1_a_dst = a_dst->data.ptr + a_dst->data.len; + io2_a_dst = a_dst->data.ptr + a_dst->data.len; if (a_dst->meta.closed) { - io1_a_dst = iop_a_dst; + io2_a_dst = iop_a_dst; } } uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_io_writer[0]; @@ -11262,7 +11262,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11275,7 +11275,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11288,7 +11288,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11301,7 +11301,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11311,10 +11311,10 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, self->private_data.s_decode_io_writer[0].scratch = 6; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (self->private_data.s_decode_io_writer[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_io_writer[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -11323,14 +11323,14 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); uint16_t t_4; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_4 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11353,10 +11353,10 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, self->private_data.s_decode_io_writer[0].scratch = ((uint32_t)(v_xlen)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); if (self->private_data.s_decode_io_writer[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_io_writer[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -11366,7 +11366,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, while (true) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11383,7 +11383,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, while (true) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11400,10 +11400,10 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, self->private_data.s_decode_io_writer[0].scratch = 2; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); if (self->private_data.s_decode_io_writer[0].scratch > - ((uint64_t)(io1_a_src - iop_a_src))) { + ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_io_writer[0].scratch -= - ((uint64_t)(io1_a_src - iop_a_src)); - iop_a_src = io1_a_src; + ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; status = wuffs_base__suspension__short_read; goto suspend; } @@ -11455,14 +11455,14 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); uint32_t t_8; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { t_8 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11484,14 +11484,14 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); uint32_t t_9; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { t_9 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11703,22 +11703,22 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, uint8_t* iop_a_dst = NULL; uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_dst) { iop_a_dst = a_dst->data.ptr + a_dst->meta.wi; io0_a_dst = iop_a_dst; - io1_a_dst = a_dst->data.ptr + a_dst->data.len; + io2_a_dst = a_dst->data.ptr + a_dst->data.len; if (a_dst->meta.closed) { - io1_a_dst = iop_a_dst; + io2_a_dst = iop_a_dst; } } uint8_t* iop_a_src = NULL; uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; - uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; io0_a_src = iop_a_src; - io1_a_src = a_src->data.ptr + a_src->meta.wi; + io2_a_src = a_src->data.ptr + a_src->meta.wi; } uint32_t coro_susp_point = self->private_impl.p_decode_io_writer[0]; @@ -11731,14 +11731,14 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); uint16_t t_0; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) { t_0 = wuffs_base__load_u16be(iop_a_src); iop_a_src += 2; } else { self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } @@ -11810,14 +11810,14 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); uint32_t t_2; - if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { t_2 = wuffs_base__load_u32be(iop_a_src); iop_a_src += 4; } else { self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); while (true) { - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; }