on master help sign in
Merge branch 'master' of github.com:idris-lang/Idris-dev
commit6d6c81b072b2413817f1d78be90582bdd74d6ba5 authorEdwin Brady <ecb10@st-andrews.ac.uk> dateFri 20 Feb 2015, 12:08 (12 years ago) parent53cf15030fe374
2 files changed+13−13
jsrts/Runtime-common.js+11−13 rts/idris_rts.c+2
jsrts/Runtime-common.js+11−13
@@ -68,20 +68,18 @@ var i$ffiWrap = function(fid,oldbase,myoldbase) {
6868 var res = fid;
6969
7070 for(var i = 0; i < (arguments.length ? arguments.length : 1); ++i) {
71− while (res instanceof i$CON) {
72− i$valstack_top += 1;
73− i$valstack[i$valstack_top] = res;
74− i$valstack[i$valstack_top + 1] = arguments[i];
75− i$SLIDE(2);
76− i$valstack_top = i$valstack_base + 2;
77− i$CALL(_idris__123_APPLY0_125_,[oldbase])
78− while (i$callstack.length) {
79− var func = i$callstack.pop();
80− var args = i$callstack.pop();
81− func.apply(this,args);
82− }
83− res = i$ret;
71+ i$valstack_top += 1;
72+ i$valstack[i$valstack_top] = res;
73+ i$valstack[i$valstack_top + 1] = arguments[i];
74+ i$SLIDE(2);
75+ i$valstack_top = i$valstack_base + 2;
76+ i$CALL(_idris__123_APPLY0_125_,[oldbase])
77+ while (i$callstack.length) {
78+ var func = i$callstack.pop();
79+ var args = i$callstack.pop();
80+ func.apply(this,args);
8481 }
82+ res = i$ret;
8583 }
8684
8785 i$callstack = i$vm.callstack;
rts/idris_rts.c+2
@@ -64,7 +64,9 @@ VM* init_vm(int stack_size, size_t heap_size,
6464}
6565
6666void init_threadkeys() {
67+#ifdef HAS_PTHREAD
6768 pthread_key_create(&vm_key, (void*)free_key);
69+#endif
6870}
6971
7072void init_threaddata(VM *vm) {