diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index 070bcc03..e5c5a464 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -54,23 +54,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index ddf17474..f300c3af 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -20,7 +20,8 @@ const baseHeader = "" + "#ifndef WUFFS_BASE_HEADER_H\n#define WUFFS_BASE_HEADER_H\n\n// Copyright 2017 The Wuffs Authors.\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// https://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n#include \n#include \n#include \n\n// Wuffs assumes that:\n// - converting a uint32_t to a size_t will never overflow.\n// - converting a size_t to a uint64_t will never overflow.\n#if (__WORDSIZE != 32) && (__WORDSIZE != 64)\n#error \"Wuffs requires a word size of either 32 or 64 bits\"\n#endif\n\n// WUFFS_VERSION is the major.minor version number " + "as a uint32_t. The major\n// number is the high 16 bits. The minor number is the low 16 bits.\n//\n// The intention is to bump the version number at least on every API / ABI\n// backwards incompatible change.\n//\n// For now, the API and ABI are simply unstable and can change at any time.\n//\n// TODO: don't hard code this in base-header.h.\n#define WUFFS_VERSION ((uint32_t)0x00001)\n\n" + "" + - "// ---------------- Fundamentals\n\n// Flicks are a unit of time. One flick (frame-tick) is 1 / 705_600_000 of a\n// second. See https://github.com/OculusVR/Flicks\ntypedef uint64_t wuffs_base__flicks;\n\n#define WUFFS_BASE__FLICKS_PER_SECOND ((uint64_t)705600000)\n#define WUFFS_BASE__FLICKS_PER_MILLISECOND ((uint64_t)705600)\n\n// wuffs_base__empty_struct is used when a Wuffs function returns an empty\n// struct. In C, if a function f returns void, you can't say \"x = f()\", but in\n// Wuffs, if a function g returns empty, you can say \"y = g()\".\ntypedef struct {\n} wuffs_base__empty_struct;\n\n// wuffs_base__slice_u8 is a 1-dimensional buffer.\n//\n// A value with all fields NULL or zero is a valid, empty slice.\ntypedef struct {\n uint8_t* ptr;\n size_t len;\n} wuffs_base__slice_u8;\n\n// wuffs_base__table_u8 is a 2-dimensional buffer.\n//\n// A value with all fields NULL or zero is a valid, empty table.\ntypedef struct {\n uint8_t* ptr;\n size_t width;\n size_t height;\n size_t stride;\n} wuffs_base__table_u8;\n\n" + + "// ---------------- Fundamentals\n\n// Flicks are a unit of time. One flick (frame-tick) is 1 / 705_600_000 of a\n// second. See https://github.com/OculusVR/Flicks\ntypedef uint64_t wuffs_base__flicks;\n\n#define WUFFS_BASE__FLICKS_PER_SECOND ((uint64_t)705600000)\n#define WUFFS_BASE__FLICKS_PER_MILLISECOND ((uint64_t)705600)\n\n// wuffs_base__empty_struct is used when a Wuffs function returns an empty\n// struct. In C, if a function f returns void, you can't say \"x = f()\", but in\n// Wuffs, if a function g returns empty, you can say \"y = g()\".\ntypedef struct {\n} wuffs_base__empty_struct;\n\n// WUFFS_BASE__SLICE is a 1-dimensional buffer.\n//\n// A value with all fields NULL or zero is a valid, empty slice.\n#define WUFFS_BASE__SLICE(T) \\\n struct { \\\n T* ptr; \\\n size_t len; \\\n }\n\n// WUFFS_BASE__TABLE is a 2-dimensional buffer.\n//\n// A value with all fields NULL or zero is a valid, empty table.\n#define WUFFS_BASE__TABLE(T) \\\n struct { \\\n T* ptr; " + + " \\\n size_t width; \\\n size_t height; \\\n size_t stride; \\\n }\n\ntypedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8;\ntypedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16;\ntypedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32;\ntypedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64;\n\ntypedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8;\ntypedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16;\ntypedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32;\ntypedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64;\n\n" + "" + "// --------\n\nstatic inline uint8_t wuffs_base__u8__min(uint8_t x, uint8_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint8_t wuffs_base__u8__max(uint8_t x, uint8_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint16_t wuffs_base__u16__min(uint16_t x, uint16_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint16_t wuffs_base__u16__max(uint16_t x, uint16_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint32_t wuffs_base__u32__min(uint32_t x, uint32_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint32_t wuffs_base__u32__max(uint32_t x, uint32_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint64_t wuffs_base__u64__min(uint64_t x, uint64_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint64_t wuffs_base__u64__max(uint64_t x, uint64_t y) {\n return x > y ? x : y;\n}\n\n" + "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 88fa18c0..f19edbdb 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index fdf249f2..7a41ba51 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 91cc594f..bc0402a0 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 7ca9317b..f3b08b91 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 48f9ed92..b83c3224 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 9328df1e..078576db 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index ba6081ae..76242b38 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index d942323e..3206b67f 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index 0e3aa659..e3052795 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index addbe533..2ec1f2a4 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index ffbb2a85..c36254e0 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // -------- diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index ab32bc24..4d7827c1 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -57,23 +57,35 @@ typedef uint64_t wuffs_base__flicks; typedef struct { } wuffs_base__empty_struct; -// wuffs_base__slice_u8 is a 1-dimensional buffer. +// WUFFS_BASE__SLICE is a 1-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty slice. -typedef struct { - uint8_t* ptr; - size_t len; -} wuffs_base__slice_u8; +#define WUFFS_BASE__SLICE(T) \ + struct { \ + T* ptr; \ + size_t len; \ + } -// wuffs_base__table_u8 is a 2-dimensional buffer. +// WUFFS_BASE__TABLE is a 2-dimensional buffer. // // A value with all fields NULL or zero is a valid, empty table. -typedef struct { - uint8_t* ptr; - size_t width; - size_t height; - size_t stride; -} wuffs_base__table_u8; +#define WUFFS_BASE__TABLE(T) \ + struct { \ + T* ptr; \ + size_t width; \ + size_t height; \ + size_t stride; \ + } + +typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8; +typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16; +typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32; +typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64; + +typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8; +typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16; +typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32; +typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // --------