From e0636e3255273283838e252022aa510424c01c83 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 12 Oct 2023 21:26:53 +1100 Subject: [PATCH] base: add bitvec256 type --- doc/changelog.md | 1 + internal/cgen/base/fundamental-private.h | 3 +++ internal/cgen/base/fundamental-public.h | 21 +++++++++++++++++++++ lang/builtin/builtin.go | 3 +++ lang/check/resolve.go | 4 ++++ lang/token/list.go | 6 ++++++ release/c/wuffs-unsupported-snapshot.c | 24 ++++++++++++++++++++++++ 7 files changed, 62 insertions(+) diff --git a/doc/changelog.md b/doc/changelog.md index e97348e7..b30c8ef6 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -6,6 +6,7 @@ The LICENSE has changed from a single license (Apache 2) to a dual license (Apache 2 or MIT, at your option). +- Added `base.bitvec256`. - Added `compact_retaining` and `history_retain_length`. - Added `example/toy-aux-image`. - Added `get_quirk(key: u32) u64`. diff --git a/internal/cgen/base/fundamental-private.h b/internal/cgen/base/fundamental-private.h index f1aad9ed..315d11cf 100644 --- a/internal/cgen/base/fundamental-private.h +++ b/internal/cgen/base/fundamental-private.h @@ -191,6 +191,9 @@ wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { #define wuffs_base__utility__sign_extend_rshift_u64(a, n) \ ((uint64_t)(((int64_t)(a)) >> (n))) +#define wuffs_base__utility__make_bitvec256(e00, e01, e02, e03) \ + wuffs_base__make_bitvec256(e00, e01, e02, e03) + // ---------------- Slices and Tables // wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s. diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h index 576ddbcd..367385a0 100644 --- a/internal/cgen/base/fundamental-public.h +++ b/internal/cgen/base/fundamental-public.h @@ -820,6 +820,27 @@ wuffs_base__multiply_u64(uint64_t x, uint64_t y) { // -------- +typedef struct wuffs_base__bitvec256__struct { + // elements_u64[0] holds the LSBs (least significant bits) and + // elements_u64[3] holds the MSBs (most significant bits). + uint64_t elements_u64[4]; +} wuffs_base__bitvec256; + +static inline wuffs_base__bitvec256 // +wuffs_base__make_bitvec256(uint64_t e00, + uint64_t e01, + uint64_t e02, + uint64_t e03) { + wuffs_base__bitvec256 res; + res.elements_u64[0] = e00; + res.elements_u64[1] = e01; + res.elements_u64[2] = e02; + res.elements_u64[3] = e03; + return res; +} + +// -------- + // The "defined(__clang__)" isn't redundant. While vanilla clang defines // __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not. #if (defined(__GNUC__) || defined(__clang__)) && (__SIZEOF_LONG__ == 8) diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 5ffb64ad..41d2ae10 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -284,6 +284,8 @@ var Types = []string{ "u32", "u64", + "bitvec256", + "empty_struct", "bool", "utility", @@ -374,6 +376,7 @@ var funcsOther = [...]string{ "utility.empty_rect_ii_u32() rect_ii_u32", "utility.empty_rect_ie_u32() rect_ie_u32", "utility.empty_slice_u8() slice u8", + "utility.make_bitvec256(e00: u64, e01: u64, e02: u64, e03: u64) bitvec256", "utility.make_pixel_format(repr: u32) pixel_format", "utility.make_range_ii_u32(min_incl: u32, max_incl: u32) range_ii_u32", "utility.make_range_ie_u32(min_incl: u32, max_excl: u32) range_ie_u32", diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 1bfa17f9..8fc14249 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -42,6 +42,8 @@ var ( typeExprU32 = a.NewTypeExpr(0, t.IDBase, t.IDU32, nil, nil, nil) typeExprU64 = a.NewTypeExpr(0, t.IDBase, t.IDU64, nil, nil, nil) + typeExprBitvec256 = a.NewTypeExpr(0, t.IDBase, t.IDBitvec256, nil, nil, nil) + typeExprEmptyStruct = a.NewTypeExpr(0, t.IDBase, t.IDEmptyStruct, nil, nil, nil) typeExprBool = a.NewTypeExpr(0, t.IDBase, t.IDBool, nil, nil, nil) typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil) @@ -111,6 +113,8 @@ var builtInTypeMap = typeMap{ t.IDU32: typeExprU32, t.IDU64: typeExprU64, + t.IDBitvec256: typeExprBitvec256, + t.IDEmptyStruct: typeExprEmptyStruct, t.IDBool: typeExprBool, t.IDUtility: typeExprUtility, diff --git a/lang/token/list.go b/lang/token/list.go index 7278d600..3994ccd0 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -467,6 +467,9 @@ const ( IDU32 = ID(0x116) IDU64 = ID(0x117) + IDBitvec128 = ID(0x118) + IDBitvec256 = ID(0x119) + IDBase = ID(0x120) IDBool = ID(0x121) IDEmptyIOReader = ID(0x122) @@ -910,6 +913,9 @@ var builtInsByID = [nBuiltInIDs]string{ IDU32: "u32", IDU64: "u64", + IDBitvec128: "bitvec128", + IDBitvec256: "bitvec256", + IDBase: "base", IDBool: "bool", IDEmptyIOReader: "empty_io_reader", diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 9bc86eb3..da3852c9 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -1091,6 +1091,27 @@ wuffs_base__multiply_u64(uint64_t x, uint64_t y) { // -------- +typedef struct wuffs_base__bitvec256__struct { + // elements_u64[0] holds the LSBs (least significant bits) and + // elements_u64[3] holds the MSBs (most significant bits). + uint64_t elements_u64[4]; +} wuffs_base__bitvec256; + +static inline wuffs_base__bitvec256 // +wuffs_base__make_bitvec256(uint64_t e00, + uint64_t e01, + uint64_t e02, + uint64_t e03) { + wuffs_base__bitvec256 res; + res.elements_u64[0] = e00; + res.elements_u64[1] = e01; + res.elements_u64[2] = e02; + res.elements_u64[3] = e03; + return res; +} + +// -------- + // The "defined(__clang__)" isn't redundant. While vanilla clang defines // __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not. #if (defined(__GNUC__) || defined(__clang__)) && (__SIZEOF_LONG__ == 8) @@ -13758,6 +13779,9 @@ wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { #define wuffs_base__utility__sign_extend_rshift_u64(a, n) \ ((uint64_t)(((int64_t)(a)) >> (n))) +#define wuffs_base__utility__make_bitvec256(e00, e01, e02, e03) \ + wuffs_base__make_bitvec256(e00, e01, e02, e03) + // ---------------- Slices and Tables // wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.