ilyakooo0/Idris-dev
1
0
Fork 0
mirror of https://github.com/ilyakooo0/Idris-dev.git synced 2024-09-11 08:55:23 +03:00
Code Issues Projects Releases Wiki Activity

Undo previous commit mess which contained unrelated code from another branch

Browse Source
This commit is contained in:
Jorge Acereda 2018-04-27 23:56:49 +02:00
parent e9a31f4c0f
commit 699090ee72
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rts/idris_gc.c
View File

@ -4,7 +4,7 @@
#include "idris_bitstring.h"
#include <assert.h>
static inline VAL plain(VM* vm, VAL x, size_t sz) {
static inline VAL copy_plain(VM* vm, VAL x, size_t sz) {
VAL cl = iallocate(vm, sz, 1);
memcpy(cl, x, sz);
return cl;
@ -18,13 +18,13 @@ VAL copy(VM* vm, VAL x) {
}
switch(GETTY(x)) {
case CT_INT: return x;
case CT_BITS32: return plain(vm, x, sizeof(Bits32));
case CT_BITS64: return plain(vm, x, sizeof(Bits64));
case CT_FLOAT: return plain(vm, x, sizeof(Float));
case CT_BITS32: return copy_plain(vm, x, sizeof(Bits32));
case CT_BITS64: return copy_plain(vm, x, sizeof(Bits64));
case CT_FLOAT: return copy_plain(vm, x, sizeof(Float));
case CT_FWD:
return GETPTR(x);
case CT_CDATA:
cl = plain(vm, x, sizeof(CDataC));
cl = copy_plain(vm, x, sizeof(CDataC));
c_heap_mark_item(GETCDATA(x));
break;
case CT_BIGINT:
@ -43,7 +43,7 @@ VAL copy(VM* vm, VAL x) {
case CT_PTR:
case CT_MANAGEDPTR:
case CT_RAWDATA:
cl = plain(vm, x, x->hdr.sz);
cl = copy_plain(vm, x, x->hdr.sz);
break;
default:
cl = NULL;

66
rts/idris_rts.c
View File

@ -49,8 +49,9 @@ VM* init_vm(int stack_size, size_t heap_size,
vm->ret = NULL;
vm->reg1 = NULL;
#ifdef HAS_PTHREAD
vm->inbox = malloc(1024*sizeof(VAL));
memset(vm->inbox, 0, 1024*sizeof(VAL));
vm->inbox = malloc(1024*sizeof(vm->inbox[0]));
assert(vm->inbox);
memset(vm->inbox, 0, 1024*sizeof(vm->inbox[0]));
vm->inbox_end = vm->inbox + 1024;
vm->inbox_write = vm->inbox;
vm->inbox_nextid = 1;
@ -276,7 +277,8 @@ static VAL mkstrlen(VM* vm, const char * str, size_t len, int outer) {
String * cl = allocStr(vm, len, outer);
// hdr.u8 used to mark a null string
cl->hdr.u8 = str == NULL;
memcpy(cl->str, str, len);
if (!cl->hdr.u8)
memcpy(cl->str, str, len);
return (VAL)cl;
}
@ -411,7 +413,7 @@ void dumpVal(VAL v) {
int i;
switch(GETTY(v)) {
case CT_INT:
printf("%d ", (int)(GETINT(v)));
printf("%" PRIdPTR " ", GETINT(v));
break;
case CT_CON:
{
@ -511,7 +513,7 @@ VAL idris_castBitsStr(VM* vm, VAL i) {
case CT_INT: // 8/16 bits
// max length 16 bit unsigned int str 5 chars (65,535)
cl = allocStr(vm, 6, 0);
cl->slen = sprintf(cl->str, "%ld", GETBITS16(i));
cl->slen = sprintf(cl->str, "%" PRIu16, (uint16_t)GETBITS16(i));
break;
case CT_BITS32:
// max length 32 bit unsigned int str 10 chars (4,294,967,295)
@ -965,7 +967,7 @@ Msg* idris_checkInitMessages(VM* vm) {
Msg* msg;
for (msg = vm->inbox; msg < vm->inbox_end && msg->msg != NULL; ++msg) {
if (msg->channel_id && 1 == 1) { // init bit set
if ((msg->channel_id & 1) == 1) { // init bit set
return msg;
}
}
@ -1028,7 +1030,7 @@ Msg* idris_recvMessage(VM* vm) {
Msg* idris_recvMessageFrom(VM* vm, int channel_id, VM* sender) {
Msg* msg;
Msg* ret;
Msg* ret = malloc(sizeof(Msg));
struct timespec timeout;
int status;
@ -1051,35 +1053,33 @@ Msg* idris_recvMessageFrom(VM* vm, int channel_id, VM* sender) {
}
pthread_mutex_unlock(&vm->inbox_block);
if (msg == NULL) {
if (msg != NULL) {
ret->msg = msg->msg;
ret->sender = msg->sender;
pthread_mutex_lock(&(vm->inbox_lock));
// Slide everything down after the message in the inbox,
// Move the inbox_write pointer down, and clear the value at the
// end - O(n) but it's easier since the message from a specific
// sender could be anywhere in the inbox
for(;msg < vm->inbox_write; ++msg) {
if (msg+1 != vm->inbox_end) {
msg->sender = (msg + 1)->sender;
msg->msg = (msg + 1)->msg;
}
}
vm->inbox_write->msg = NULL;
vm->inbox_write->sender = NULL;
vm->inbox_write--;
pthread_mutex_unlock(&(vm->inbox_lock));
} else {
fprintf(stderr, "No messages waiting");
exit(-1);
}
ret = malloc(sizeof(Msg));
ret->msg = msg->msg;
ret->sender = msg->sender;
pthread_mutex_lock(&(vm->inbox_lock));
// Slide everything down after the message in the inbox,
// Move the inbox_write pointer down, and clear the value at the
// end - O(n) but it's easier since the message from a specific
// sender could be anywhere in the inbox
for(;msg < vm->inbox_write; ++msg) {
if (msg+1 != vm->inbox_end) {
msg->sender = (msg + 1)->sender;
msg->msg = (msg + 1)->msg;
}
}
vm->inbox_write->msg = NULL;
vm->inbox_write->sender = NULL;
vm->inbox_write--;
pthread_mutex_unlock(&(vm->inbox_lock));
return ret;
}
#endif