more changes

diff --git a/Robust/src/Runtime/ObjectHash.c b/Robust/src/Runtime/ObjectHash.c
index e052c02edb63e98d39a5799a8076080f8a976a71..b0e8d077613866950568467e4e7a36009effd35a 100755 (executable)
--- a/Robust/src/Runtime/ObjectHash.c
+++ b/Robust/src/Runtime/ObjectHash.c
@@ -1,9 +1,12 @@
 #include "ObjectHash.h"
 #ifdef MULTICORE
+#include "methodheaders.h"
 #include "runtime_arch.h"
+#include "multicoreruntime.h"
 #else
 #include <stdio.h>
 #endif
+
 #ifdef DMALLOC
 #include "dmalloc.h"
 #endif

diff --git a/Robust/src/Runtime/SimpleHash.c b/Robust/src/Runtime/SimpleHash.c
index f07f100f50f7ce1e659b92d81047ee2521406031..9db196750b244613dd08a968e0ca96086e68f1a5 100755 (executable)
--- a/Robust/src/Runtime/SimpleHash.c
+++ b/Robust/src/Runtime/SimpleHash.c
@@ -1,5 +1,7 @@
 #include "SimpleHash.h"
 #ifdef MULTICORE
+#include "methodheaders.h"
+#include "multicore_arch.h"
 #include "runtime_arch.h"
 #else
 #include <stdio.h>

diff --git a/Robust/src/Runtime/mem.c b/Robust/src/Runtime/mem.c
index 7490bb6f0e433443638ed9e6c4613035f4ef6962..ef3a0a6c9ccbd40dd085de3f9e3562c9ac44509b 100644 (file)
--- a/Robust/src/Runtime/mem.c
+++ b/Robust/src/Runtime/mem.c
@@ -2,13 +2,15 @@
 
 #ifdef MULTICORE
 #include "runtime.h"
-#include "runtime_arch.h"
+#include <stdio.h>
 
 #ifdef MULTICORE_GC
+#include "multicoreruntime.h"
 #include "bambooalign.h"
 #include "multicoremem.h"
 #include "multicoregarbage.h"
-
+#include "runtime_arch.h"
+#include "methodheaders.h"
 
 extern volatile bool gcflag;
 void * mycalloc_share(struct garbagelist * stackptr, int size) {
@@ -36,8 +38,9 @@ void * mycalloc_share(struct garbagelist * stackptr, int size) {
       BAMBOO_EXIT();
     }
   }
-  tprint("Loopcount hit 10000\n");
+  tprintf("Loopcount hit 10000\n");
   BAMBOO_EXIT();
+  return NULL;
 }
 
 #else

diff --git a/Robust/src/Runtime/runtime.h b/Robust/src/Runtime/runtime.h
index ca97ce02845b41d00f2cdef4c4aab64127eae5ae..0b0ed9378238a1a5aa03ef251d4d0a27b10d2253 100644 (file)
--- a/Robust/src/Runtime/runtime.h
+++ b/Robust/src/Runtime/runtime.h
@@ -110,19 +110,7 @@ void createstartupobject(int argc, char ** argv);
 void createstartupobject();
 #endif
 
-#ifdef PRECISE_GC
-#define VAR(name) ___params___->name
-#define CALL00(name) name(struct name ## _params * ___params___)
-#define CALL01(name, alt) name(struct name ## _params * ___params___)
-#define CALL02(name, alt1, alt2) name(struct name ## _params * ___params___)
-#define CALL11(name,rest, alt) name(struct name ## _params * ___params___, rest)
-#define CALL12(name,rest, alt1, alt2) name(struct name ## _params * ___params___, rest)
-#define CALL22(name, rest, rest2, alt1, alt2) name(struct name ## _params * ___params___, rest, rest2)
-#define CALL23(name, rest, rest2, alt1, alt2, alt3) name(struct name ## _params * ___params___, rest, rest2)
-#define CALL24(name, rest, rest2, alt1, alt2, alt3, alt4) name(struct name ## _params * ___params___, rest, rest2)
-#define CALL34(name, rest, rest2, rest3, alt1, alt2, alt3, alt4) name(struct name ## _params * ___params___, rest, rest2, rest3)
-#define CALL35(name, rest, rest2, rest3, alt1, alt2, alt3, alt4, alt5) name(struct name ## _params * ___params___, rest, rest2, rest3)
-#elif defined MULTICORE_GC
+#if defined(PRECISE_GC)||defined(MULTICORE_GC)
 #define VAR(name) ___params___->name
 #define CALL00(name) name(struct name ## _params * ___params___)
 #define CALL01(name, alt) name(struct name ## _params * ___params___)
@@ -150,9 +138,8 @@ void createstartupobject();
 
 #ifdef MULTICORE
 #include "SimpleHash.h"
-inline void run(int argc, char** argv);
+void run(int argc, char** argv);
 int receiveObject_I();
-void * smemalloc_I(int coren, int size, int * allocsize);
 #endif
 
 #if (defined(THREADS)||defined(MGC))