git.iko.soy/Idris-dev
on master help sign in
Untabify, clean up indentation
7ad70c8Jorge Acereda
rts/idris_rts.c+43−35
compare with master
unifiedsplit
@@ -225,7 +225,7 @@ void* iallocate(VM * vm, size_t isize, int outerlock) {
225 vm->heap.next += size;
225 vm->heap.next += size;
226 assert(vm->heap.next <= vm->heap.end);
226 assert(vm->heap.next <= vm->heap.end);
227 memset(ptr, 0, size);
227 memset(ptr, 0, size);
228− ((Hdr*)ptr)->sz = isize;
228+ ((Hdr*)ptr)->sz = isize;
229
229
230#ifdef HAS_PTHREAD
230#ifdef HAS_PTHREAD
231 if (lock) { // not message passing
231 if (lock) { // not message passing
@@ -419,29 +419,37 @@ void dumpVal(VAL v) {
419 return;
419 return;
420 }
420 }
421 switch(GETTY(v)) {
421 switch(GETTY(v)) {
422− case CT_CON: {
422+ case CT_CON:
423+ {
423− Con * cl = (Con*)v;
424+ Con * cl = (Con*)v;
424− printf("%d[", (int)TAG(cl));
425+ printf("%d[", (int)TAG(cl));
425− for(i = 0; i < CARITY(cl); ++i) {
426+ for(i = 0; i < CARITY(cl); ++i) {
426− dumpVal(cl->args[i]);
427+ dumpVal(cl->args[i]);
427− }
428+ }
428− printf("] ");
429+ printf("] ");
430+ }
429− } break;
431+ break;
430− case CT_STRING: {
432+ case CT_STRING:
433+ {
431− String * cl = (String*)v;
434+ String * cl = (String*)v;
432− printf("STR[%s]", cl->str);
435+ printf("STR[%s]", cl->str);
436+ }
433− } break;
437+ break;
434− case CT_STROFFSET: {
438+ case CT_STROFFSET:
439+ {
435− StrOffset * cl = (StrOffset*)v;
440+ StrOffset * cl = (StrOffset*)v;
436− printf("OFFSET[");
441+ printf("OFFSET[");
437− dumpVal((VAL)cl->base);
442+ dumpVal((VAL)cl->base);
438− printf("]");
443+ printf("]");
444+ }
439− } break;
445+ break;
440− case CT_FWD: {
446+ case CT_FWD:
447+ {
441− Fwd * cl = (Fwd*)v;
448+ Fwd * cl = (Fwd*)v;
442− printf("CT_FWD ");
449+ printf("CT_FWD ");
443− dumpVal((VAL)cl->fwd);
450+ dumpVal((VAL)cl->fwd);
451+ }
444− } break;
452+ break;
445 default:
453 default:
446 printf("val");
454 printf("val");
447 }
455 }
@@ -641,7 +649,7 @@ VAL idris_strShift(VM* vm, VAL str, int num) {
641
649
642 while(root!=NULL && !ISSTR(root)) { // find the root, carry on.
650 while(root!=NULL && !ISSTR(root)) { // find the root, carry on.
643 // In theory, at most one step here!
651 // In theory, at most one step here!
644− offset += root->offset;
652+ offset += root->offset;
645 root = (StrOffset*)root->base;
653 root = (StrOffset*)root->base;
646 }
654 }
647
655
@@ -670,7 +678,7 @@ VAL idris_strCons(VM* vm, VAL x, VAL xs) {
670 memcpy(cl->str+1, xstr, xlen);
678 memcpy(cl->str+1, xstr, xlen);
671 } else {
679 } else {
672 char *init = idris_utf8_fromChar(xval);
680 char *init = idris_utf8_fromChar(xval);
673− size_t ilen = strlen(init);
681+ size_t ilen = strlen(init);
674 int newlen = ilen + xlen;
682 int newlen = ilen + xlen;
675 cl = allocStr(vm, newlen, 0);
683 cl = allocStr(vm, newlen, 0);
676 memcpy(cl->str, init, ilen);
684 memcpy(cl->str, init, ilen);
@@ -741,7 +749,7 @@ VAL idris_newArray(VM* vm, int size, VAL def) {
741 int i;
749 int i;
742 cl = allocArrayF(vm, size, 0);
750 cl = allocArrayF(vm, size, 0);
743 for(i=0; i<size; ++i) {
751 for(i=0; i<size; ++i) {
744− cl->array[i] = def;
752+ cl->array[i] = def;
745 }
753 }
746 return (VAL)cl;
754 return (VAL)cl;
747}
755}
@@ -854,25 +862,25 @@ static VAL doCopyTo(VM* vm, VAL x) {
854 switch(GETTY(x)) {
862 switch(GETTY(x)) {
855 case CT_CDATA:
863 case CT_CDATA:
856 cl = MKCDATAc(vm, GETCDATA(x));
864 cl = MKCDATAc(vm, GETCDATA(x));
857− break;
865+ break;
858 case CT_BIGINT:
866 case CT_BIGINT:
859 cl = MKBIGMc(vm, GETMPZ(x));
867 cl = MKBIGMc(vm, GETMPZ(x));
860− break;
868+ break;
861 case CT_CON:
869 case CT_CON:
862 ar = CARITY(x);
870 ar = CARITY(x);
863 if (ar == 0 && CTAG(x) < 256) { // globally allocated
871 if (ar == 0 && CTAG(x) < 256) { // globally allocated
864 cl = x;
872 cl = x;
865 } else {
873 } else {
866− Con * c = allocConF(vm, CTAG(x), ar, 1);
874+ Con * c = allocConF(vm, CTAG(x), ar, 1);
867− copyArray(vm, c->args, ((Con*)x)->args, ar);
875+ copyArray(vm, c->args, ((Con*)x)->args, ar);
868− cl = (VAL)c;
876+ cl = (VAL)c;
869 }
877 }
870 break;
878 break;
871 case CT_ARRAY: {
879 case CT_ARRAY: {
872 size_t len = CELEM(x);
880 size_t len = CELEM(x);
873 Array * a = allocArrayF(vm, len, 1);
881 Array * a = allocArrayF(vm, len, 1);
874− copyArray(vm, a->array, ((Array*)x)->array, len);
882+ copyArray(vm, a->array, ((Array*)x)->array, len);
875− cl = (VAL)a;
883+ cl = (VAL)a;
876 } break;
884 } break;
877 case CT_STRING:
885 case CT_STRING:
878 case CT_FLOAT:
886 case CT_FLOAT:
@@ -1115,7 +1123,7 @@ void init_nullaries(void) {
1115 int i;
1123 int i;
1116 for(i = 0; i < 256; ++i) {
1124 for(i = 0; i < 256; ++i) {
1117 Con * cl = nullary_cons + i;
1125 Con * cl = nullary_cons + i;
1118− cl->hdr.sz = sizeof(*cl);
1126+ cl->hdr.sz = sizeof(*cl);
1119 SETTY(cl, CT_CON);
1127 SETTY(cl, CT_CON);
1120 cl->tag = i;
1128 cl->tag = i;
1121 }
1129 }