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

Issue #81 - Fixes for bytevector-copy

Browse source
This commit is contained in:
Justin Ethier 2018-01-02 18:59:02 -05:00
parent 8f602e55c3
commit 741fcc6a0a
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -4,7 +4,7 @@
Bug Fixes Bug Fixes
- Fixed `utf8->string`, `string->utf8`, `list->vector`, and `list->string` to use the heap to allocate objects that exceed the maximum size for objects on the stack. - Fixed `utf8->string`, `string->utf8`, `bytevector-copy`, `list->vector`, and `list->string` to use the heap to allocate objects that exceed the maximum size for objects on the stack.
## 0.7.1 - December 21, 2017 ## 0.7.1 - December 21, 2017

26
runtime.c
View file

@ -2610,7 +2610,6 @@ object Cyc_bytevector_copy(void *data, object cont, object bv, object start,
{ {
int s, e; int s, e;
int len; int len;
make_empty_bytevector(result);
Cyc_check_bvec(data, bv); Cyc_check_bvec(data, bv);
Cyc_check_num(data, start); Cyc_check_num(data, start);
@ -2628,10 +2627,27 @@ object Cyc_bytevector_copy(void *data, object cont, object bv, object start,
Cyc_rt_raise2(data, "bytevector-copy - invalid end", end); Cyc_rt_raise2(data, "bytevector-copy - invalid end", end);
} }
result.len = len; if (len >= MAX_STACK_OBJ) {
result.data = alloca(sizeof(char) * len); int heap_grown;
memcpy(&result.data[0], &(((bytevector) bv)->data)[s], len); object result = gc_alloc(((gc_thread_data *)data)->heap,
_return_closcall1(data, cont, &result); sizeof(bytevector_type) + len,
boolean_f, // OK to populate manually over here
(gc_thread_data *)data,
&heap_grown);
((bytevector) result)->hdr.mark = ((gc_thread_data *)data)->gc_alloc_color;
((bytevector) result)->hdr.grayed = 0;
((bytevector) result)->tag = bytevector_tag;
((bytevector) result)->len = len;
((bytevector) result)->data = (char *)(((char *)result) + sizeof(bytevector_type));
memcpy(&(((bytevector) result)->data[0]), &(((bytevector) bv)->data)[s], len);
_return_closcall1(data, cont, result);
} else {
make_empty_bytevector(result);
result.len = len;
result.data = alloca(sizeof(char) * len);
memcpy(&result.data[0], &(((bytevector) bv)->data)[s], len);
_return_closcall1(data, cont, &result);
}
} }
object Cyc_utf82string(void *data, object cont, object bv, object start, object Cyc_utf82string(void *data, object cont, object bv, object start,