Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-23 20:15:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve range checks

Browse source
This commit is contained in:
Justin Ethier 2017-02-16 04:01:00 -05:00
parent 9899189c60
commit 670d5a0e98
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cyclone/types.h
View file

@ -270,6 +270,9 @@ struct gc_thread_data_t {
#define is_value_type(x) ((unsigned long)(x) & (unsigned long)3)
#define is_object_type(x) (x && !is_value_type(x))
#define CYC_FIXNUM_MAX 1073741823
#define CYC_FIXNUM_MIN -1073741824
/* Function type */
typedef void (*function_type) ();

23
runtime.c
View file

@ -1814,9 +1814,9 @@ str2int_errno str2int(int *out, char *s, int base)
errno = 0;
long l = strtol(s, &end, base);
/* Both checks are needed because INT_MAX == LONG_MAX is possible. */
if (l > INT_MAX || (errno == ERANGE && l == LONG_MAX))
if (l > CYC_FIXNUM_MAX /*INT_MAX*/ || (errno == ERANGE && l == LONG_MAX))
return STR2INT_OVERFLOW;
if (l < INT_MIN || (errno == ERANGE && l == LONG_MIN))
if (l < CYC_FIXNUM_MIN /*INT_MIN*/ || (errno == ERANGE && l == LONG_MIN))
return STR2INT_UNDERFLOW;
if (*end != '\0')
return STR2INT_INCONVERTIBLE;
@ -3089,6 +3089,25 @@ bad_arg_type_error:
}
}
object Cyc_expt(void *data, object cont, object z1, object z2)
{
// TODO: if either is double, promote result to double
// if both int, do mp_expt_d and normalize back to fixnum if necessary
// c = a **b
// int mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
make_double(d, 0.0);
Cyc_check_num(data, z1);
Cyc_check_num(data, z2);
d.value = pow( unbox_number(z1), unbox_number(z2) );
return_closcall1(data, cont, &d);
}
// TODO: convert bignum back to fixnum if possible
object Cyc_bignum_normalize(void *data, object n)
{
return n;
}
/* I/O functions */
port_type Cyc_stdout()