Convert bytevector-append

This commit is contained in:
Justin Ethier 2021-02-24 23:01:42 -05:00
parent 5e9def9dbf
commit 1d18d70951

104
runtime.c
View file

@ -3036,7 +3036,7 @@ void dispatch_bytevector(void *data, object clo, int _argc, object *args)
make_empty_bytevector(bv);
if (argc > 0) {
buffer = alloca(sizeof(char) * argc);
for(i = 0; i < argc; i++) {
for(i = 1; i < argc; i++) {
tmp = args[i];
Cyc_check_num(data, tmp);
val = unbox_number(tmp);
@ -3074,50 +3074,70 @@ object Cyc_bytevector(void *data, object cont, int argc, object bval, ...)
_return_closcall1(data, cont, &bv);
}
#define Cyc_bytevector_append_va_list(argc) { \
int i = 0, buf_idx = 0, total_length = 0; \
va_list ap; \
object tmp; \
char *buffer; \
char **buffers = NULL; \
int *lengths = NULL; \
make_empty_bytevector(result); \
if (argc > 0) { \
buffers = alloca(sizeof(char *) * argc); \
lengths = alloca(sizeof(int) * argc); \
Cyc_check_bvec(data, bv); \
total_length = ((bytevector)bv)->len; \
lengths[0] = ((bytevector)bv)->len; \
buffers[0] = ((bytevector)bv)->data; \
va_start(ap, bv); \
for(i = 1; i < argc; i++) { \
tmp = va_arg(ap, object); \
Cyc_check_bvec(data, tmp); \
total_length += ((bytevector)tmp)->len; \
lengths[i] = ((bytevector)tmp)->len; \
buffers[i] = ((bytevector)tmp)->data; \
} \
va_end(ap); \
buffer = alloca(sizeof(char) * total_length); \
for (i = 0; i < argc; i++) { \
memcpy(&buffer[buf_idx], buffers[i], lengths[i]); \
buf_idx += lengths[i]; \
} \
result.len = total_length; \
result.data = buffer; \
} \
_return_closcall1(data, cont, &result); \
void dispatch_bytevector_91append(void *data, object clo, int _argc, object *args)
{
int argc = _argc - 1;
int i = 0, buf_idx = 0, total_length = 0;
object tmp;
char *buffer;
char **buffers = NULL;
int *lengths = NULL;
make_empty_bytevector(result);
if (argc > 0) {
buffers = alloca(sizeof(char *) * argc);
lengths = alloca(sizeof(int) * argc);
for(i = 1; i < argc; i++) {
tmp = args[i];
Cyc_check_bvec(data, tmp);
total_length += ((bytevector)tmp)->len;
lengths[i] = ((bytevector)tmp)->len;
buffers[i] = ((bytevector)tmp)->data;
}
buffer = alloca(sizeof(char) * total_length);
for (i = 0; i < argc; i++) {
memcpy(&buffer[buf_idx], buffers[i], lengths[i]);
buf_idx += lengths[i];
}
result.len = total_length;
result.data = buffer;
}
return_closcall1(data, clo, &result);
}
object dispatch_bytevector_91append(void *data, int _argc, object clo,
object cont, object bv, ...)
object Cyc_bytevector_append(void *data, object cont, int argc, object bv, ...)
{
Cyc_bytevector_append_va_list((_argc - 1));
}
object Cyc_bytevector_append(void *data, object cont, int _argc, object bv, ...)
{
Cyc_bytevector_append_va_list(_argc);
int i = 0, buf_idx = 0, total_length = 0;
va_list ap;
object tmp;
char *buffer;
char **buffers = NULL;
int *lengths = NULL;
make_empty_bytevector(result);
if (argc > 0) {
buffers = alloca(sizeof(char *) * argc);
lengths = alloca(sizeof(int) * argc);
Cyc_check_bvec(data, bv);
total_length = ((bytevector)bv)->len;
lengths[0] = ((bytevector)bv)->len;
buffers[0] = ((bytevector)bv)->data;
va_start(ap, bv);
for(i = 1; i < argc; i++) {
tmp = va_arg(ap, object);
Cyc_check_bvec(data, tmp);
total_length += ((bytevector)tmp)->len;
lengths[i] = ((bytevector)tmp)->len;
buffers[i] = ((bytevector)tmp)->data;
}
va_end(ap);
buffer = alloca(sizeof(char) * total_length);
for (i = 0; i < argc; i++) {
memcpy(&buffer[buf_idx], buffers[i], lengths[i]);
buf_idx += lengths[i];
}
result.len = total_length;
result.data = buffer;
}
_return_closcall1(data, cont, &result);
}
object Cyc_bytevector_copy(void *data, object cont, object bv, object start,