From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mimir.eigenstate.org ([206.124.132.107]) by ewsd; Fri May 1 14:34:05 EDT 2020 Received: from abbatoir.fios-router.home (pool-162-83-132-245.nycmny.fios.verizon.net [162.83.132.245]) by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id e9f3a87f (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO) for <9front@9front.org>; Fri, 1 May 2020 11:33:50 -0700 (PDT) Message-ID: <2007E53ACF0CFFB958260F8DDE287EB3@eigenstate.org> To: 9front@9front.org Subject: apes and disgusting integers. Date: Fri, 1 May 2020 11:33:43 -0700 From: ori@eigenstate.org MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: element template-based event Turns out that C99 requires us to implement the int_{fast,least}NN_t types if we implement the intNN_t types. This implements them and makes them all the same. Ran into this when compiling zic, the zoneinfo compiler, though I believe duktape also had this problem in the code-gen'ed files. (IIRC, it got hacked around there). diff -r 8006152d13d2 sys/include/ape/stdint.h --- a/sys/include/ape/stdint.h Tue Apr 28 20:51:19 2020 -0700 +++ b/sys/include/ape/stdint.h Thu Apr 30 17:31:24 2020 -0700 @@ -21,6 +21,26 @@ typedef unsigned long long uint64_t; typedef unsigned long long uintmax_t; +typedef int8_t int_fast8_t; +typedef int16_t int_fast16_t; +typedef int32_t int_fast32_t; +typedef int64_t int_fast64_t; +; +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +typedef int64_t int_least64_t; + +typedef uint8_t uint_fast8_t; +typedef uint16_t uint_fast16_t; +typedef uint32_t uint_fast32_t; +typedef uint64_t uint_fast64_t; + +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +typedef uint64_t uint_least64_t; + typedef _intptr_t intptr_t; typedef _uintptr_t uintptr_t; @@ -28,16 +48,38 @@ #define INT16_MIN 0x8000 #define INT32_MIN 0x80000000 #define INT64_MIN 0x8000000000000000LL +#define INTMAX_MIN INT64_MIN #define UINT8_MIN 0 #define UINT16_MIN 0 #define UINT32_MIN 0 #define UINT64_MIN 0 +#define UINTMAX_MIN UINT64_MIN + +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST16_MIN INT16_MIN +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST64_MIN INT64_MIN + +#define UINT_FAST8_MIN UINT8_MIN +#define UINT_FAST16_MIN UINT16_MIN +#define UINT_FAST32_MIN UINT32_MIN +#define UINT_FAST64_MIN UINT64_MIN + +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST64_MIN INT64_MIN + +#define UINT_LEAST8_MIN UINT8_MIN +#define UINT_LEAST16_MIN UINT16_MIN +#define UINT_LEAST32_MIN UINT32_MIN +#define UINT_LEAST64_MIN UINT64_MIN #define INT8_MAX 0x7f #define INT16_MAX 0x7fff #define INT32_MAX 0x7fffffff -#define INT64_MAX 0x7fffffffffffffffULL +#define INT64_MAX 0x7fffffffffffffffLL #define INTMAX_MAX INT64_MAX #define UINT8_MAX 0xff @@ -46,6 +88,26 @@ #define UINT64_MAX 0xffffffffffffffffULL #define UINTMAX_MAX UINT64_MAX +#define INT_FAST8_MAX INT8_MAX +#define INT_FAST16_MAX INT16_MAX +#define INT_FAST32_MAX INT32_MAX +#define INT_FAST64_MAX INT64_MAX + +#define UINT_FAST8_MAX UINT8_MAX +#define UINT_FAST16_MAX UINT16_MAX +#define UINT_FAST32_MAX UINT32_MAX +#define UINT_FAST64_MAX UINT64_MAX + +#define INT_LEAST8_MAX INT8_MAX +#define INT_LEAST16_MAX INT16_MAX +#define INT_LEAST32_MAX INT32_MAX +#define INT_LEAST64_MAX INT64_MAX + +#define UINT_LEAST8_MAX UINT8_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#define UINT_LEAST64_MAX UINT64_MAX + /* * Right now, all of our size_t types are 32 bit, even on * 64 bit architectures. diff -r 8006152d13d2 sys/include/ape/stdlib.h --- a/sys/include/ape/stdlib.h Tue Apr 28 20:51:19 2020 -0700 +++ b/sys/include/ape/stdlib.h Thu Apr 30 17:31:24 2020 -0700 @@ -24,6 +24,7 @@ extern long int strtol(const char *, char **, int); extern unsigned long int strtoul(const char *, char **, int); extern long long int strtoll(const char *, char **, int); +extern long long int strtoimax(const char *, char **, int); extern unsigned long long int strtoull(const char *, char **, int); extern int rand(void); extern void srand(unsigned int seed); diff -r 8006152d13d2 sys/include/ape/unistd.h --- a/sys/include/ape/unistd.h Tue Apr 28 20:51:19 2020 -0700 +++ b/sys/include/ape/unistd.h Thu Apr 30 17:31:24 2020 -0700 @@ -1,7 +1,7 @@ #ifndef __UNISTD_H #define __UNISTD_H #ifndef _POSIX_SOURCE - This header file is not defined in pure ANSI +#error This header file is not defined in pure ANSI #endif #pragma lib "/$M/lib/ape/libap.a" diff -r 8006152d13d2 sys/src/ape/lib/ap/gen/strtoll.c --- a/sys/src/ape/lib/ap/gen/strtoll.c Tue Apr 28 20:51:19 2020 -0700 +++ b/sys/src/ape/lib/ap/gen/strtoll.c Thu Apr 30 17:31:24 2020 -0700 @@ -101,3 +101,9 @@ return -n; return n; } + +long long +strtoimax(char *nptr, char **endptr, int base) +{ + return strtoll(nptr, endptr, base); +}