ref: b578f6fc6c2d7b99c42e6477e0fe8a86a0666e03
parent: f2a60067b610cdc82921bcfa4e0a6f198af7497e
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Fri Jan 24 00:42:01 EST 2025
an assortment of function attributes
--- a/3rd/brieflz/brieflz.c
+++ b/3rd/brieflz/brieflz.c
@@ -27,12 +27,10 @@
#include "brieflz.h"
-#if defined(__clang__) && defined(__has_builtin)
-# if __has_builtin(__builtin_clz)
+#if defined(__has_builtin)
+# if __has_builtin(__builtin_clzl)
# define BLZ_BUILTIN_GCC
# endif
-#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# define BLZ_BUILTIN_GCC
#endif
// Type used to store values in workmem.
@@ -211,6 +209,7 @@
};
#endif
+fl_constfn
static int
blz_log2(unsigned long n)
{@@ -233,6 +232,7 @@
#endif
}
+fl_constfn
static unsigned long
blz_gamma_cost(unsigned long n)
{@@ -241,6 +241,7 @@
return 2 * (unsigned long) blz_log2(n);
}
+fl_constfn
static unsigned long
blz_match_cost(unsigned long pos, unsigned long len)
{@@ -411,6 +412,7 @@
// This is Fibonacci hashing, also known as Knuth's multiplicative hash. The
// constant is a prime close to 2^32/phi.
//
+fl_purefn
static unsigned long
blz_hash4_bits(const unsigned char *p, int bits)
{@@ -424,6 +426,7 @@
return (val * 2654435761U) >> (32 - bits);
}
+fl_purefn
static unsigned long
blz_hash4(const unsigned char *p)
{--- a/3rd/brieflz/brieflz_hashbucket.h
+++ b/3rd/brieflz/brieflz_hashbucket.h
@@ -28,6 +28,7 @@
#ifndef BRIEFLZ_HASHBUCKET_H_INCLUDED
#define BRIEFLZ_HASHBUCKET_H_INCLUDED
+fl_constfn
static size_t
blz_hashbucket_workmem_size(size_t src_size, unsigned int bucket_size)
{--- a/3rd/dlmalloc.inc
+++ b/3rd/dlmalloc.inc
@@ -2707,6 +2707,7 @@
((char*)(A) >= S->base && (char*)(A) < S->base + S->size)
/* Return segment holding given address */
+fl_purefn
static msegmentptr segment_holding(mstate m, char* addr) {msegmentptr sp = &m->seg;
for (;;) {@@ -2718,6 +2719,7 @@
}
/* Return true if segment contains a segment link */
+fl_purefn
static int has_segment_link(mstate m, msegmentptr ss) {msegmentptr sp = &m->seg;
for (;;) {@@ -5350,14 +5352,17 @@
return result;
}
+fl_purefn
size_t dlmalloc_footprint(void) {return gm->footprint;
}
+fl_purefn
size_t dlmalloc_max_footprint(void) {return gm->max_footprint;
}
+fl_purefn
size_t dlmalloc_footprint_limit(void) {size_t maf = gm->footprint_limit;
return maf == 0 ? MAX_SIZE_T : maf;
@@ -5390,6 +5395,7 @@
return change_mparam(param_number, value);
}
+fl_purefn
size_t dlmalloc_usable_size(void* mem) { if (mem != 0) {mchunkptr p = mem2chunk(mem);
--- a/3rd/fn.h
+++ b/3rd/fn.h
@@ -61,8 +61,11 @@
} \
struct dummy
+fl_purefn
Tcheck_get(Trie *, Tbranch, twigs, t->ptr);
+fl_purefn
Tcheck_get(const char *, Tleaf, key, t->ptr);
+fl_purefn
Tcheck_get(void *, Tleaf, val, (void*)(uintptr_t)t->index);
// index word layout
--- a/3rd/mp/mp.h
+++ b/3rd/mp/mp.h
@@ -76,15 +76,15 @@
mpint* betomp(uint8_t*, uint32_t, mpint*); /* byte array, big-endian */
int mptobe(mpint*, uint8_t*, uint32_t, uint8_t**);
void mptober(mpint *b, uint8_t *p, int n);
-uint32_t mptoui(mpint*); /* unsigned int */
+uint32_t mptoui(mpint*) fl_purefn; /* unsigned int */
mpint* uitomp(uint32_t, mpint*);
-int mptoi(mpint*); /* int */
+int mptoi(mpint*) fl_purefn; /* int */
mpint* itomp(int, mpint*);
-uint64_t mptouv(mpint*); /* unsigned int64_t */
+uint64_t mptouv(mpint*) fl_purefn; /* unsigned int64_t */
mpint* uvtomp(uint64_t, mpint*);
-int64_t mptov(mpint*); /* int64_t */
+int64_t mptov(mpint*) fl_purefn; /* int64_t */
mpint* vtomp(int64_t, mpint*);
-double mptod(mpint*); /* double */
+double mptod(mpint*) fl_purefn; /* double */
mpint* dtomp(double, mpint*);
/* divide the 2 digit dividend by the one digit divisor and stick in quotient */
@@ -118,7 +118,7 @@
void mpdiv(mpint *dividend, mpint *divisor, mpint *quotient, mpint *remainder);
/* return neg, 0, pos as b1-b2 is neg, 0, pos */
-int mpcmp(mpint *b1, mpint *b2);
+int mpcmp(mpint *b1, mpint *b2) fl_purefn;
/* res = s != 0 ? b1 : b2 */
void mpsel(int s, mpint *b1, mpint *b2, mpint *res);
@@ -130,7 +130,7 @@
void mpinvert(mpint *b, mpint *m, mpint *res);
/* bit counting */
-uint32_t mpsignif(mpint*); /* number of sigificant bits in mantissa */
+uint32_t mpsignif(mpint*) fl_purefn; /* number of sigificant bits in mantissa */
uint32_t mplowbits0(mpint*); /* k, where n = 2**k * q for odd q */
/* well known constants */
@@ -158,11 +158,11 @@
void mpvectsmul(mpdigit *a, int alen, mpdigit *b, int blen, mpdigit *p);
/* sign of a - b or zero if the same */
-int mpveccmp(mpdigit *a, int alen, mpdigit *b, int blen);
-int mpvectscmp(mpdigit *a, int alen, mpdigit *b, int blen);
+int mpveccmp(mpdigit *a, int alen, mpdigit *b, int blen) fl_purefn;
+int mpvectscmp(mpdigit *a, int alen, mpdigit *b, int blen) fl_purefn;
/* playing with magnitudes */
-int mpmagcmp(mpint *b1, mpint *b2);
+int mpmagcmp(mpint *b1, mpint *b2) fl_purefn;
void mpmagadd(mpint *b1, mpint *b2, mpint *sum); /* sum = b1+b2 */
void mpmagsub(mpint *b1, mpint *b2, mpint *sum); /* sum = b1+b2 */
--- a/3rd/mp/test/fns.h
+++ b/3rd/mp/test/fns.h
@@ -1,5 +1,5 @@
ldint* ldnew(int);
-int ldcmp(ldint *, ldint *);
+int ldcmp(ldint *, ldint *) fl_purefn;
int ldmagcmp(ldint *, ldint *);
void ldadd(ldint *, ldint *, ldint *);
void ldsub(ldint *, ldint *, ldint *);
@@ -16,7 +16,7 @@
void lddiv_(ldint *, ldint *, ldint *, ldint *);
void ldfree(ldint *);
void testgen(int, ldint *);
-int ldmpeq(ldint *, mpint *);
+int ldmpeq(ldint *, mpint *) fl_purefn;
mpint* ldtomp(ldint *, mpint *);
void mptarget(mpint *);
void tests(void);
--- a/3rd/spooky.c
+++ b/3rd/spooky.c
@@ -64,6 +64,7 @@
//
// Read uint64_t in little-endian order.
//
+fl_purefn
static inline uint64_t
spooky_read_le64(const uint64_t *s)
{--- a/3rd/utf/runeistypedata
+++ b/3rd/utf/runeistypedata
@@ -1,4 +1,4 @@
-static
+static const
uint8_t _mergeddata[11769] =
{0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,
@@ -738,7 +738,7 @@
2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
};
-static
+static const
uint16_t _mergedidx2[3755] =
{0,14,30,46,61,66,81,86,97,103,119,130,146,155,170,179,
@@ -977,7 +977,7 @@
11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,
11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,11753,
};
-static
+static const
uint16_t _mergedidx1[2048] =
{0,64,128,192,256,320,383,447,511,564,579,643,707,771,771,771,
--- a/3rd/utf/utf.h
+++ b/3rd/utf/utf.h
@@ -11,9 +11,9 @@
int chartorune(Rune *rune, const char *str);
int runetochar(char *str, const Rune *rune);
-int runenlen(const Rune *r, int nrune);
-int fullrune(const char *str, int n);
-int runelen(Rune c);
+int runenlen(const Rune *r, int nrune) fl_purefn;
+int fullrune(const char *str, int n) fl_purefn;
+int runelen(Rune c) fl_constfn;
Rune tolowerrune(Rune c) fl_constfn;
Rune toupperrune(Rune c) fl_constfn;
Rune totitlerune(Rune c) fl_constfn;
--- a/3rd/wcwidth.c
+++ b/3rd/wcwidth.c
@@ -25,7 +25,7 @@
// From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
// from https://github.com/jquast/wcwidth/pull/64
// at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
-static struct width_interval ZERO_WIDTH[] = {+static const struct width_interval ZERO_WIDTH[] = { {0x00300, 0x0036f}, // Combining Grave Accent ..Combining Latin Small Le {0x00483, 0x00489}, // Combining Cyrillic Titlo..Combining Cyrillic Milli {0x00591, 0x005bd}, // Hebrew Accent Etnahta ..Hebrew Point Meteg@@ -374,7 +374,7 @@
// https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
// from https://github.com/jquast/wcwidth/pull/64
// at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
-static struct width_interval WIDE_EASTASIAN[] = {+static const struct width_interval WIDE_EASTASIAN[] = { {0x01100, 0x0115f}, // Hangul Choseong Kiyeok ..Hangul Choseong Filler {0x0231a, 0x0231b}, // Watch ..Hourglass {0x02329, 0x0232a}, // Left-pointing Angle Brac..Right-pointing Angle Bra@@ -498,8 +498,9 @@
{0x30000, 0x3fffd}, // Cjk Unified Ideograph-30..(nil)};
+fl_constfn
static bool
-intable(struct width_interval* table, int table_length, int c)
+intable(const struct width_interval* table, int table_length, int c)
{// First quick check for Latin1 etc. characters.
if(c < table[0].start)
--- a/builtins.c
+++ b/builtins.c
@@ -51,6 +51,7 @@
return first;
}
+fl_purefn
BUILTIN("assq", assq) {argcount(nargs, 2);
@@ -68,6 +69,7 @@
return FL_f;
}
+fl_purefn
BUILTIN("memq", memq) {argcount(nargs, 2);
@@ -130,6 +132,7 @@
type_error("sequence", a);}
+_Noreturn
BUILTIN("raise", raise) {argcount(nargs, 1);
@@ -136,6 +139,7 @@
fl_raise(args[0]);
}
+_Noreturn
BUILTIN("exit", exit) {if(nargs > 1)
@@ -151,6 +155,7 @@
return symbol(cvalue_data(args[0]), true);
}
+fl_purefn
BUILTIN("keyword?", keywordp) {argcount(nargs, 1);
@@ -158,6 +163,7 @@
iskeyword((symbol_t*)ptr(args[0]))) ? FL_t : FL_f;
}
+fl_purefn
BUILTIN("top-level-value", top_level_value) {argcount(nargs, 1);
@@ -201,6 +207,7 @@
return lst;
}
+fl_purefn
BUILTIN("constant?", constantp) {argcount(nargs, 1);
@@ -214,6 +221,7 @@
return FL_t;
}
+fl_purefn
BUILTIN("integer-valued?", integer_valuedp) {argcount(nargs, 1);
@@ -243,6 +251,7 @@
return FL_f;
}
+fl_purefn
BUILTIN("integer?", integerp) {argcount(nargs, 1);
@@ -252,6 +261,7 @@
FL_t : FL_f;
}
+fl_purefn
BUILTIN("bignum?", bignump) {argcount(nargs, 1);
--- a/cvalues.c
+++ b/cvalues.c
@@ -578,6 +578,7 @@
return size_wrap(n);
}
+fl_purefn
BUILTIN("typeof", typeof) {argcount(nargs, 1);
@@ -666,6 +667,7 @@
return cvalue_copy(args[0]);
}
+fl_purefn
BUILTIN("plain-old-data?", plain_old_datap) {argcount(nargs, 1);
@@ -795,6 +797,7 @@
return args[2];
}
+fl_purefn
BUILTIN("builtin", builtin) {argcount(nargs, 1);
--- a/dos/platform.h
+++ b/dos/platform.h
@@ -51,4 +51,4 @@
#include "mp.h"
#include "utf.h"
-int wcwidth(Rune c);
+int wcwidth(Rune c) fl_constfn;
--- a/flisp.c
+++ b/flisp.c
@@ -245,6 +245,7 @@
return fn_builtin_gensym(nil, 0);
}
+fl_purefn
BUILTIN("gensym?", gensymp) {argcount(nargs, 1);
@@ -1063,6 +1064,7 @@
return fv;
}
+fl_purefn
BUILTIN("function:code", function_code) {argcount(nargs, 1);
@@ -1072,6 +1074,7 @@
return fn_bcode(v);
}
+fl_purefn
BUILTIN("function:vals", function_vals) {argcount(nargs, 1);
@@ -1081,6 +1084,7 @@
return fn_vals(v);
}
+fl_purefn
BUILTIN("function:env", function_env) {argcount(nargs, 1);
--- a/iostream.c
+++ b/iostream.c
@@ -47,6 +47,7 @@
return iscvalue(v) && cv_class(ptr(v)) == FL(iostreamtype);
}
+fl_purefn
BUILTIN("iostream?", iostreamp) {argcount(nargs, 1);
@@ -53,6 +54,7 @@
return isiostream(args[0]) ? FL_t : FL_f;
}
+fl_purefn
BUILTIN("eof-object?", eof_objectp) {argcount(nargs, 1);
@@ -59,6 +61,7 @@
return args[0] == FL_eof ? FL_t : FL_f;
}
+fl_purefn
ios_t *
toiostream(value_t v)
{@@ -196,6 +199,7 @@
return FL_void;
}
+fl_purefn
BUILTIN("io-eof?", io_eofp) {argcount(nargs, 1);
--- a/maxstack.inc
+++ b/maxstack.inc
@@ -1,3 +1,4 @@
+fl_purefn
static int
compute_maxstack(uint8_t *code, size_t len)
{--- a/meson.build
+++ b/meson.build
@@ -16,12 +16,8 @@
#'-Wcast-qual',
#'-Wconversion',
#'-Wfloat-equal',
- #'-Wmissing-noreturn',
#'-Wsign-conversion',
- #'-Wsuggest-attribute=const',
#'-Wsuggest-attribute=malloc',
- #'-Wsuggest-attribute=noreturn',
- #'-Wsuggest-attribute=pure',
#'-Wsuggest-attribute=returns_nonnull',
'-Waggregate-return',
'-Werror=odr',
@@ -28,6 +24,7 @@
'-Werror=strict-aliasing',
'-Wformat=2',
'-Wint-to-pointer-cast',
+ '-Wmissing-noreturn',
'-Wmissing-prototypes',
'-Wno-format-y2k',
'-Wpointer-arith',
@@ -60,6 +57,9 @@
'-Wlogical-op',
'-Wunused-const-variable=2',
'-Werror=lto-type-mismatch',
+ '-Wsuggest-attribute=const',
+ '-Wsuggest-attribute=noreturn',
+ '-Wsuggest-attribute=pure',
language: 'c',
)
endif
--- a/operators.c
+++ b/operators.c
@@ -20,6 +20,7 @@
return mpzero;
}
+fl_purefn
double
conv_to_double(void *data, numerictype_t tag)
{@@ -68,6 +69,7 @@
// FIXME sign with mpint
#define CONV_TO_INTTYPE(name, ctype) \
+fl_purefn \
ctype \
conv_to_##name(void *data, numerictype_t tag) \
{ \@@ -94,6 +96,7 @@
// this is needed to work around an UB casting negative
// floats and doubles to uint64. you need to cast to int64
// first.
+fl_purefn
uint64_t
conv_to_uint64(void *data, numerictype_t tag)
{@@ -122,6 +125,7 @@
return 0;
}
+fl_purefn
int
cmp_same_lt(void *a, void *b, numerictype_t tag)
{@@ -141,6 +145,7 @@
return 0;
}
+fl_purefn
int
cmp_same_eq(void *a, void *b, numerictype_t tag)
{--- a/string.c
+++ b/string.c
@@ -9,6 +9,7 @@
#include "equal.h"
#include "iostream.h"
+fl_purefn
BUILTIN("string?", stringp) {argcount(nargs, 1);
@@ -243,6 +244,7 @@
return mk_rune(totitlerune(*(Rune*)cp_data(cp)));
}
+fl_purefn
BUILTIN("char-alphabetic?", char_alphabeticp) {argcount(nargs, 1);
@@ -252,6 +254,7 @@
return isalpharune(*(Rune*)cp_data(cp)) ? FL_t : FL_f;
}
+fl_purefn
BUILTIN("char-lower-case?", char_lower_casep) {argcount(nargs, 1);
@@ -261,6 +264,7 @@
return islowerrune(*(Rune*)cp_data(cp)) ? FL_t : FL_f;
}
+fl_purefn
BUILTIN("char-upper-case?", char_upper_casep) {argcount(nargs, 1);
@@ -270,6 +274,7 @@
return isupperrune(*(Rune*)cp_data(cp)) ? FL_t : FL_f;
}
+fl_purefn
BUILTIN("char-title-case?", char_title_casep) {argcount(nargs, 1);
@@ -279,6 +284,7 @@
return istitlerune(*(Rune*)cp_data(cp)) ? FL_t : FL_f;
}
+fl_purefn
BUILTIN("char-numeric?", char_numericp) {argcount(nargs, 1);
@@ -288,6 +294,7 @@
return isdigitrune(*(Rune*)cp_data(cp)) ? FL_t : FL_f;
}
+fl_purefn
BUILTIN("char-whitespace?", char_whitespacep) {argcount(nargs, 1);
@@ -392,6 +399,7 @@
return n;
}
+fl_purefn
BUILTIN("string-utf8?", string_utf8p) {argcount(nargs, 1);
--- a/table.c
+++ b/table.c
@@ -74,6 +74,7 @@
return iscvalue(v) && cv_class(ptr(v)) == FL(tabletype);
}
+fl_purefn
BUILTIN("table?", tablep) {argcount(nargs, 1);
@@ -133,6 +134,7 @@
return args[0];
}
+_Noreturn
static void
key_error(value_t key)
{@@ -140,6 +142,7 @@
}
// (get table key [default])
+fl_purefn
BUILTIN("get", get) {if(nargs != 3)
@@ -155,6 +158,7 @@
}
// (has? table key)
+fl_purefn
BUILTIN("has?", has) {argcount(nargs, 2);