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

Get rid of remaining sources of bignum leaks

Browse source
This commit is contained in:
Justin Ethier 2017-02-17 14:46:10 +00:00
parent 6d02427d1b
commit 80290db8d5
3 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gc.c
View file

@ -606,6 +606,12 @@ void *gc_alloc_bignum(gc_thread_data *data)
return bn;
}
void *gc_alloc_from_bignum(gc_thread_data *data, bignum_type *src)
{
int heap_grown;
return gc_alloc(((gc_thread_data *)data)->heap, sizeof(bignum_type), (char *)(src), (gc_thread_data *)data, &heap_grown);
}
void *gc_alloc(gc_heap_root * hrt, size_t size, char *obj, gc_thread_data * thd,
int *heap_grown)
{

1
include/cyclone/types.h
View file

@ -693,6 +693,7 @@ void *gc_try_alloc(gc_heap * h, int heap_type, size_t size, char *obj,
void *gc_alloc(gc_heap_root * h, size_t size, char *obj, gc_thread_data * thd,
int *heap_grown);
void *gc_alloc_bignum(gc_thread_data *data);
void *gc_alloc_from_bignum(gc_thread_data *data, bignum_type *src);
size_t gc_allocated_bytes(object obj, gc_free_list * q, gc_free_list * r);
gc_heap *gc_heap_last(gc_heap * h);
size_t gc_heap_total_size(gc_heap * h);

46
runtime.c
View file

@ -1208,7 +1208,7 @@ double mp_get_double(mp_int *a)
return d;
}
// TODO: convert bignum back to fixnum if possible
// Convert a bignum back to fixnum if possible
object Cyc_bignum_normalize(void *data, object n)
{
mp_int bn;
@ -1229,7 +1229,6 @@ object Cyc_bignum_normalize(void *data, object n)
}
result = obj_int2obj(i);
}
mp_clear(&bn);
return result;
}
@ -1271,13 +1270,7 @@ int Cyc_bignum_cmp(bn_cmp_type type, object x, int tx, object y, int ty)
((type == CYC_BN_GTE && cmp > MP_LT) ||
(type == CYC_BN_LTE && cmp < MP_GT));
}
{
//make_string(s, "Bad argument type");
//make_pair(c1, y, NULL);
//make_pair(c0, &s, &c1);
//Cyc_rt_raise(data, &c0);
return 0;
}
return 0;
}
#define declare_num_cmp(FUNC, FUNC_OP, FUNC_FAST_OP, FUNC_APPLY, OP, BN_CMP) \
@ -2621,17 +2614,17 @@ object FUNC_OP(void *data, common_type *x, object y) { \
} else if (tx == bignum_tag && ty == -1) { \
mp_init(&bn_tmp2); \
Cyc_int2bignum(obj_obj2int(y), &bn_tmp2); \
mp_init_copy(&bn_tmp, &(x->bignum_t.bn)); \
BN_OP(&bn_tmp, &bn_tmp2, &(x->bignum_t.bn)); \
BN_OP(&(x->bignum_t.bn), &bn_tmp2, &(x->bignum_t.bn)); \
mp_clear(&bn_tmp2); \
} else if (tx == bignum_tag && ty == double_tag) { \
double d = mp_get_double(&(x->bignum_t.bn)); \
mp_clear(&(x->bignum_t.bn)); \
x->double_t.hdr.mark = gc_color_red; \
x->double_t.hdr.grayed = 0; \
x->double_t.tag = double_tag; \
x->double_t.value = mp_get_double(&(x->bignum_t.bn)) OP ((double_type *)y)->value; \
x->double_t.value = d OP ((double_type *)y)->value; \
} else if (tx == bignum_tag && ty == bignum_tag) { \
mp_init_copy(&bn_tmp, &(x->bignum_t.bn)); \
BN_OP(&bn_tmp, &bignum_value(y), &(x->bignum_t.bn)); \
BN_OP(&(x->bignum_t.bn), &bignum_value(y), &(x->bignum_t.bn)); \
} else { \
goto bad_arg_type_error; \
} \
@ -2957,7 +2950,7 @@ divbyzero:
object Cyc_div_op(void *data, common_type * x, object y)
{
mp_int bn_tmp, bn_tmp2;
mp_int bn_tmp2;
int tx = type_of(x), ty;
if (obj_is_int(y)) {
ty = -1;
@ -2996,21 +2989,23 @@ object Cyc_div_op(void *data, common_type * x, object y)
x->bignum_t.tag = bignum_tag;
mp_init(&(x->bignum_t.bn));
mp_div(&bn_tmp2, &bignum_value(y), &(x->bignum_t.bn), NULL);
mp_clear(&bn_tmp2);
} else if (tx == double_tag && ty == bignum_tag) {
x->double_t.value = x->double_t.value / mp_get_double(&bignum_value(y));
} else if (tx == bignum_tag && ty == -1) {
mp_init(&bn_tmp2);
Cyc_int2bignum(obj_obj2int(y), &bn_tmp2);
mp_init_copy(&bn_tmp, &(x->bignum_t.bn));
mp_div(&bn_tmp, &bn_tmp2, &(x->bignum_t.bn), NULL);
mp_div(&(x->bignum_t.bn), &bn_tmp2, &(x->bignum_t.bn), NULL);
mp_clear(&bn_tmp2);
} else if (tx == bignum_tag && ty == double_tag) {
double d = mp_get_double(&(x->bignum_t.bn));
mp_clear(&(x->bignum_t.bn));
x->double_t.hdr.mark = gc_color_red;
x->double_t.hdr.grayed = 0;
x->double_t.tag = double_tag;
x->double_t.value = mp_get_double(&(x->bignum_t.bn)) / ((double_type *)y)->value;
x->double_t.value = d / ((double_type *)y)->value;
} else if (tx == bignum_tag && ty == bignum_tag) {
mp_init_copy(&bn_tmp, &(x->bignum_t.bn));
mp_div(&bn_tmp, &bignum_value(y), &(x->bignum_t.bn), NULL);
mp_div(&(x->bignum_t.bn), &bignum_value(y), &(x->bignum_t.bn), NULL);
} else {
goto bad_arg_type_error;
}
@ -3090,8 +3085,6 @@ object Cyc_num_op_va_list(void *data, int argc,
buf->bignum_t.hdr.mark = gc_color_red;
buf->bignum_t.hdr.grayed = 0;
buf->bignum_t.tag = bignum_tag;
// TODO: allocate a new one here?
//buf->bignum_t.bn = ((bignum_type *) n)->bn;
mp_init_copy(&(buf->bignum_t.bn), &bignum_value(n));
} else {
goto bad_arg_type_error;
@ -3113,9 +3106,10 @@ object Cyc_num_op_va_list(void *data, int argc,
buf->double_t.value = double_value(&tmp);
} else {
buf->bignum_t.tag = bignum_tag;
//buf->bignum_t.bn = bignum_value(&tmp);
// TODO: free previous mp_init above?? or free tmp bn?
mp_init_copy(&(buf->bignum_t.bn), &(bignum_value(&tmp)));
buf->bignum_t.bn.used = tmp.bignum_t.bn.used;
buf->bignum_t.bn.alloc = tmp.bignum_t.bn.alloc;
buf->bignum_t.bn.sign = tmp.bignum_t.bn.sign;
buf->bignum_t.bn.dp = tmp.bignum_t.bn.dp;
}
} else {
for (i = 1; i < argc; i++) {
@ -3126,6 +3120,8 @@ object Cyc_num_op_va_list(void *data, int argc,
// Convert to immediate int
if (type_of(buf) == integer_tag) {
return obj_int2obj(buf->integer_t.value);
} else if (type_of(buf) == bignum_tag) {
buf = gc_alloc_from_bignum(data, &(buf->bignum_t));
}
return buf;