diff --git a/components/libc/minilibc/ctype.c b/components/libc/minilibc/ctype.c index 8e02e1a904ff32a366a98f7625a4a224be3c6938..786ff472f8c3d19e2556eb63498e7c735a362f7e 100644 --- a/components/libc/minilibc/ctype.c +++ b/components/libc/minilibc/ctype.c @@ -29,4 +29,9 @@ int isalpha(int ch) return (unsigned int)((ch | 0x20) - 'a') < 26u; } +int isdigit (int ch) +{ + return (unsigned int)(ch - '0') < 10u; +} + #endif diff --git a/components/libc/minilibc/ctype.h b/components/libc/minilibc/ctype.h index fdbf7bf003cfc2d786a61f837c07e8fb8ebf69da..9a773b69abffbeb0a547c59b5f3ee791bdb6ab00 100644 --- a/components/libc/minilibc/ctype.h +++ b/components/libc/minilibc/ctype.h @@ -16,5 +16,6 @@ int isprint(int c) __attribute__ ((__const__)); int isalpha (int c) __attribute__ ((__const__)); +int isdigit (int ch) __attribute__ ((__const__)); #endif diff --git a/components/libc/minilibc/rand.c b/components/libc/minilibc/rand.c new file mode 100644 index 0000000000000000000000000000000000000000..46a96ac5bbffd7150ff2ee95008970ee1f104634 --- /dev/null +++ b/components/libc/minilibc/rand.c @@ -0,0 +1,35 @@ +#include +#include + +static unsigned int seed=1; + +/* Knuth's TAOCP section 3.6 */ +#define M ((1U<<31) -1) +#define A 48271 +#define Q 44488 // M/A +#define R 3399 // M%A; R < Q !!! + +// FIXME: ISO C/SuS want a longer period +int rand_r(unsigned int* seed) +{ int32_t X; + + X = *seed; + X = A*(X%Q) - R * (int32_t) (X/Q); + if (X < 0) + X += M; + + *seed = X; + return X; +} + +int rand(void) { + return rand_r(&seed); +} + +void srand(unsigned int i) +{ + seed=i; +} + +int random(void) __attribute__((alias("rand"))); +void srandom(unsigned int i) __attribute__((alias("srand"))); diff --git a/components/libc/minilibc/stdlib.h b/components/libc/minilibc/stdlib.h index 89318b30d93fac10fd6986338257ca297af038a8..93c9b19b5c8bbec7d1d56b457cc6aca550d48317 100644 --- a/components/libc/minilibc/stdlib.h +++ b/components/libc/minilibc/stdlib.h @@ -24,4 +24,8 @@ int atoi(const char *nptr); #define realloc rt_realloc #define calloc rt_calloc +int rand(void); +int rand_r(unsigned int *seed); +void srand(unsigned int seed); + #endif diff --git a/components/libc/minilibc/sys/types.h b/components/libc/minilibc/sys/types.h index a9a1dafa2e205235530f4c61638d4782645e73a7..2be1f34403c6a7b063e4ac6c591e0f39316d0a8f 100644 --- a/components/libc/minilibc/sys/types.h +++ b/components/libc/minilibc/sys/types.h @@ -14,6 +14,9 @@ typedef rt_uint32_t u_long; typedef rt_uint8_t u_int8_t; typedef rt_uint16_t u_int16_t; typedef rt_uint32_t u_int32_t; +typedef rt_int8_t int8_t; +typedef rt_int16_t int16_t; +typedef rt_int32_t int32_t; typedef rt_time_t time_t;