diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 13f65f52..8877bd1c 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -198,6 +198,19 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- +static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( + wuffs_base__table_u8 t) { + if (t.width == t.stride) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr, + .len = t.width * t.height, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// -------- + static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); } diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index a1ff87dc..cf34d468 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -323,6 +323,15 @@ func (g *gen) writeBuiltinTable(b *buffer, recv *a.Expr, method t.ID, args []*a. field = "stride" case t.IDWidth: field = "width" + + case t.IDLinearize: + // TODO: don't assume that the table is a table of base.u8. + b.writes("wuffs_base__table_u8__linearize(") + if err := g.writeExpr(b, recv, rp, depth); err != nil { + return err + } + b.writeb(')') + return nil } if field != "" { diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 2560a035..3459fe23 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -92,6 +92,8 @@ const baseImpl = "" + "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i(\n wuffs_base__slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_j(\n wuffs_base__slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){.ptr = s.ptr, .len = j});\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_ij(\n wuffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__pr" + "efix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.ptr += (uint64_t)(s.len) - up_to;\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr,\n// length) where length is the minimum of dst.len and src.len.\n//\n// Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t wuffs_base__slice_u8__copy_from_slice(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t length = dst.len < src.len ? dst.len : src.len;\n if (length > 0) {\n memmove(dst.ptr, src.ptr, length);\n }\n return length;\n}\n\n" + "" + + "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize(\n wuffs_base__table_u8 t) {\n if (t.width == t.stride) {\n return ((wuffs_base__slice_u8){\n .ptr = t.ptr,\n .len = t.width * t.height,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n" + + "" + "// --------\n\nstatic inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) {\n *x = wuffs_base__u32__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) {\n *x = wuffs_base__u32__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_sub(*x, y);\n}\n\n" + "" + "// ---------------- I/O\n\nstatic inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) {\n return (buf.ptr || (buf.len == 0)) && (buf.len >= buf.wi) &&\n (buf.wi >= buf.ri);\n}\n\nstatic inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]);\n}\n\nstatic inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline bool wuf" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index e3790583..e7565673 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1374,6 +1374,19 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- +static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( + wuffs_base__table_u8 t) { + if (t.width == t.stride) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr, + .len = t.width * t.height, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// -------- + static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); } diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index c7f43709..adb6df05 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1373,6 +1373,19 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- +static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( + wuffs_base__table_u8 t) { + if (t.width == t.stride) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr, + .len = t.width * t.height, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// -------- + static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 450aef2c..7fcbc1f0 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1465,6 +1465,19 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- +static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( + wuffs_base__table_u8 t) { + if (t.width == t.stride) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr, + .len = t.width * t.height, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// -------- + static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 3c2401c6..3d5f5c02 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1489,6 +1489,19 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- +static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( + wuffs_base__table_u8 t) { + if (t.width == t.stride) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr, + .len = t.width * t.height, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// -------- + static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); } @@ -2757,6 +2770,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( wuffs_base__slice_u8 v_pass_through; uint64_t v_n_copied; wuffs_base__table_u8 v_tab; + wuffs_base__slice_u8 v_pixel_data; uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; @@ -2804,10 +2818,12 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( v_pass_through = ((wuffs_base__slice_u8){}); v_n_copied = self->private_impl.c_decode_id[0].v_n_copied; v_tab = ((wuffs_base__table_u8){}); + v_pixel_data = ((wuffs_base__slice_u8){}); } else { v_w = ((wuffs_base__io_writer){}); v_pass_through = ((wuffs_base__slice_u8){}); v_tab = ((wuffs_base__table_u8){}); + v_pixel_data = ((wuffs_base__slice_u8){}); } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -3069,6 +3085,9 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( label_2_break:; v_tab = wuffs_base__image_buffer__plane(a_ib, 0); if (((uint64_t)(v_tab.width)) == ((uint64_t)(v_tab.stride))) { + v_pixel_data = wuffs_base__table_u8__linearize(v_tab); + if (((uint64_t)(v_pixel_data.len)) == 0) { + } } if (v_z == WUFFS_GIF__SUSPENSION_SHORT_WRITE) { goto label_1_continue; diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 0a1ceec1..86435f5b 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1668,6 +1668,19 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- +static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( + wuffs_base__table_u8 t) { + if (t.width == t.stride) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr, + .len = t.width * t.height, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// -------- + static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 7e74bbfd..5938e750 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1668,6 +1668,19 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- +static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( + wuffs_base__table_u8 t) { + if (t.width == t.stride) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr, + .len = t.width * t.height, + }); + } + return ((wuffs_base__slice_u8){}); +} + +// -------- + static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); } diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 0f1de180..8612585b 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -180,4 +180,6 @@ var TableFuncs = []string{ "T2.height()(ret u64)", "T2.stride()(ret u64)", "T2.width()(ret u64)", + + "T2.linearize()(ret T1)", } diff --git a/lang/check/type.go b/lang/check/type.go index 7155a472..93b2a596 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -532,8 +532,11 @@ func (q *checker) tcheckExprCall(n *a.Expr, depth uint32) error { case t.QID{t.IDBase, t.IDDagger1}: genericType1 = lhs.MType().Receiver() case t.QID{t.IDBase, t.IDDagger2}: - genericType1 = lhs.MType().Receiver() // TODO: convert table T to slice T. genericType2 = lhs.MType().Receiver() + if genericType2.Decorator() != t.IDTable { + return fmt.Errorf("check: internal error: %q is not a generic table", genericType2.Str(q.tm)) + } + genericType1 = a.NewTypeExpr(t.IDSlice, 0, 0, nil, nil, genericType2.Inner()) } // Check that the func's in type matches the arguments. diff --git a/lang/token/list.go b/lang/token/list.go index 345245a4..e550f42f 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -478,6 +478,7 @@ const ( IDHeight = ID(0x216) IDStride = ID(0x217) IDWidth = ID(0x218) + IDLinearize = ID(0x219) ) var builtInsByID = [nBuiltInIDs]string{ @@ -684,6 +685,7 @@ var builtInsByID = [nBuiltInIDs]string{ IDHeight: "height", IDStride: "stride", IDWidth: "width", + IDLinearize: "linearize", } var builtInsByName = map[string]ID{} diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index f2d48c1b..e9ce723e 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -376,7 +376,10 @@ pri func decoder.decode_id?(ib ptr base.image_buffer, dst base.io_writer, src ba // TODO: don't assume a packed pixel format. var tab table base.u8 = in.ib.plane(p:0) if tab.width() == tab.stride() { - // TODO. + var pixel_data slice base.u8 = tab.linearize() + if pixel_data.length() == 0 { + // TODO. + } } else { // TODO. }