diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index daf0322d..078a80bb 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -428,7 +428,7 @@ func insertInterfaceDefinitions(buf *buffer) error { return err } - buf.writes("\nwuffs_base__vtable* v = &self->private_impl.first_vtable;\n") + buf.writes("\nconst wuffs_base__vtable* v = &self->private_impl.first_vtable;\n") buf.writes("int i;\n") buf.printf("for (i = 0; i < %d; i++) {\n", a.MaxImplements) buf.printf("if (v->vtable_name == wuffs_base__%s__vtable_name) {\n", n) diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index ba77a462..ccad8ca2 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -362,6 +362,7 @@ var InterfaceFuncs = []string{ // ---- io_transformer "io_transformer.transform_io?(dst: io_writer, src: io_reader, workbuf: slice u8)", + "io_transformer.workbuf_len() range_ii_u64", } // The "T1" and "T2" types here are placeholders for generic "slice T" or diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f05ef1ba..ed4c560a 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2611,6 +2611,7 @@ typedef struct { wuffs_base__io_buffer* a_dst, wuffs_base__io_buffer* a_src, wuffs_base__slice_u8 a_workbuf); + wuffs_base__range_ii_u64 (*workbuf_len)(const void* self); } wuffs_base__io_transformer__func_ptrs; typedef struct wuffs_base__io_transformer__struct wuffs_base__io_transformer; @@ -2621,6 +2622,9 @@ wuffs_base__io_transformer__transform_io(wuffs_base__io_transformer* self, wuffs_base__io_buffer* a_src, wuffs_base__slice_u8 a_workbuf); +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_base__io_transformer__workbuf_len(const wuffs_base__io_transformer* self); + #if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) struct wuffs_base__io_transformer__struct { @@ -2640,6 +2644,11 @@ struct wuffs_base__io_transformer__struct { a_workbuf); } + inline wuffs_base__range_ii_u64 // + workbuf_len() const { + return wuffs_base__io_transformer__workbuf_len(this); + } + #endif // __cplusplus }; // struct wuffs_base__io_transformer__struct @@ -4814,7 +4823,7 @@ wuffs_base__hasher_u32__update_u32(wuffs_base__hasher_u32* self, return 0; } - wuffs_base__vtable* v = &self->private_impl.first_vtable; + const wuffs_base__vtable* v = &self->private_impl.first_vtable; int i; for (i = 0; i < 63; i++) { if (v->vtable_name == wuffs_base__hasher_u32__vtable_name) { @@ -4850,7 +4859,7 @@ wuffs_base__io_transformer__transform_io(wuffs_base__io_transformer* self, : wuffs_base__error__initialize_not_called); } - wuffs_base__vtable* v = &self->private_impl.first_vtable; + const wuffs_base__vtable* v = &self->private_impl.first_vtable; int i; for (i = 0; i < 63; i++) { if (v->vtable_name == wuffs_base__io_transformer__vtable_name) { @@ -4866,6 +4875,33 @@ wuffs_base__io_transformer__transform_io(wuffs_base__io_transformer* self, return wuffs_base__make_status(wuffs_base__error__bad_vtable); } +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_base__io_transformer__workbuf_len( + const wuffs_base__io_transformer* self) { + if (!self) { + return wuffs_base__utility__make_range_ii_u64(0, 0); + } + if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && + (self->private_impl.magic != WUFFS_BASE__DISABLED)) { + return wuffs_base__utility__make_range_ii_u64(0, 0); + } + + const wuffs_base__vtable* v = &self->private_impl.first_vtable; + int i; + for (i = 0; i < 63; i++) { + if (v->vtable_name == wuffs_base__io_transformer__vtable_name) { + const wuffs_base__io_transformer__func_ptrs* func_ptrs = + (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers); + return (*func_ptrs->workbuf_len)(self); + } else if (v->vtable_name == NULL) { + break; + } + v++; + } + + return wuffs_base__utility__make_range_ii_u64(0, 0); +} + // ---------------- Images const uint32_t wuffs_base__pixel_format__bits_per_channel[16] = { @@ -6446,6 +6482,8 @@ const wuffs_base__io_transformer__func_ptrs wuffs_base__io_buffer*, wuffs_base__slice_u8))( &wuffs_deflate__decoder__transform_io), + (wuffs_base__range_ii_u64(*)(const void*))( + &wuffs_deflate__decoder__workbuf_len), }; // ---------------- Initializer Implementations @@ -8278,6 +8316,8 @@ const wuffs_base__io_transformer__func_ptrs wuffs_base__io_buffer*, wuffs_base__slice_u8))( &wuffs_lzw__decoder__transform_io), + (wuffs_base__range_ii_u64(*)(const void*))( + &wuffs_lzw__decoder__workbuf_len), }; // ---------------- Initializer Implementations @@ -11496,6 +11536,8 @@ const wuffs_base__io_transformer__func_ptrs wuffs_base__io_buffer*, wuffs_base__slice_u8))( &wuffs_gzip__decoder__transform_io), + (wuffs_base__range_ii_u64(*)(const void*))( + &wuffs_gzip__decoder__workbuf_len), }; // ---------------- Initializer Implementations @@ -12000,6 +12042,8 @@ const wuffs_base__io_transformer__func_ptrs wuffs_base__io_buffer*, wuffs_base__slice_u8))( &wuffs_zlib__decoder__transform_io), + (wuffs_base__range_ii_u64(*)(const void*))( + &wuffs_zlib__decoder__workbuf_len), }; // ---------------- Initializer Implementations diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index e98fe291..a2ac1e9b 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -766,6 +766,15 @@ const char* do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* t, if (want_wi > BUFFER_SIZE) { return "want_wi is too large"; } + wuffs_base__range_ii_u64 workbuf_len = + wuffs_base__io_transformer__workbuf_len(t); + if (workbuf_len.min_incl > workbuf_len.max_incl) { + return "inconsistent workbuf_len"; + } + if (workbuf_len.max_incl > BUFFER_SIZE) { + return "workbuf_len is too large"; + } + wuffs_base__io_buffer got = ((wuffs_base__io_buffer){ .data = global_got_slice, });