diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index e45b2322..ac5f732a 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -583,7 +583,7 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error b.printf(" = *iop_a_src++;\n") return nil - case t.IDSkip32: + case t.IDSkip, t.IDSkip32: x := n.Args()[0].AsArg().Value() if cv := x.ConstValue(); cv != nil && cv.Cmp(one) == 0 { if err := g.writeCoroSuspPoint(b, false); err != nil { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index b6d9b81c..890ef10e 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -235,6 +235,7 @@ var Funcs = []string{ "io_reader.since(mark: u64) slice u8", "io_reader.take!(n: u64) slice u8", + "io_reader.skip?(n: u64)", "io_reader.skip32?(n: u32)", // TODO: this should have explicit pre-conditions "actual <= worst_case" diff --git a/lang/token/list.go b/lang/token/list.go index 6fef5c33..fa4d7974 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -492,9 +492,10 @@ const ( IDMark = ID(0x163) IDPosition = ID(0x164) IDSince = ID(0x165) - IDSkip32 = ID(0x166) - IDSkip32Fast = ID(0x167) - IDTake = ID(0x168) + IDSkip = ID(0x166) + IDSkip32 = ID(0x167) + IDSkip32Fast = ID(0x168) + IDTake = ID(0x169) IDCopyFromSlice = ID(0x170) IDCopyN32FromHistory = ID(0x171) @@ -834,6 +835,7 @@ var builtInsByID = [nBuiltInIDs]string{ IDMark: "mark", IDPosition: "position", IDSince: "since", + IDSkip: "skip", IDSkip32: "skip32", IDSkip32Fast: "skip32_fast", IDTake: "take", diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index e735950f..b2575859 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -13533,8 +13533,7 @@ wuffs_wbmp__decoder__skip_frame(wuffs_wbmp__decoder* self, v_bytes_per_row = ((((uint64_t)(self->private_impl.f_width)) + 7) / 8); v_total_bytes = (v_bytes_per_row * ((uint64_t)(self->private_impl.f_height))); - self->private_data.s_skip_frame[0].scratch = - ((uint32_t)((v_total_bytes & 4294967295))); + self->private_data.s_skip_frame[0].scratch = v_total_bytes; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); if (self->private_data.s_skip_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) { diff --git a/std/wbmp/decode_wbmp.wuffs b/std/wbmp/decode_wbmp.wuffs index 8c957bba..df993257 100644 --- a/std/wbmp/decode_wbmp.wuffs +++ b/std/wbmp/decode_wbmp.wuffs @@ -207,8 +207,7 @@ pri func decoder.skip_frame?(src: base.io_reader) { bytes_per_row = ((this.width as base.u64) + 7) / 8 total_bytes = bytes_per_row * (this.height as base.u64) - // TODO: total_bytes may be larger than UINT32_MAX. - args.src.skip32?(n: (total_bytes & 0xFFFFFFFF) as base.u32) + args.src.skip?(n: total_bytes) this.seen_frame = true this.call_sequence = 2