From: bdemsky <bdemsky>
Date: Sun, 3 Jul 2011 23:43:07 +0000 (+0000)
Subject: more changes
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ac939c005a7ef07a41bda5f0986035f9b3a3b8bb;p=IRC.git

more changes
---

diff --git a/Robust/src/Runtime/ObjectHash.c b/Robust/src/Runtime/ObjectHash.c
index e052c02e..b0e8d077 100755
--- 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 f07f100f..9db19675 100755
--- 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 7490bb6f..ef3a0a6c 100644
--- 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 ca97ce02..0b0ed937 100644
--- 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))