code towards PMC compiling

[IRC.git] / Robust / src / Runtime / runtime.h

diff --git a/Robust/src/Runtime/runtime.h b/Robust/src/Runtime/runtime.h
index bbde3a1df0c0124dbd05a4b251ef5b1b0e3bc80c..de90cadd2efdb9451f303198aa6b1094d9e29afa 100644 (file)
--- a/Robust/src/Runtime/runtime.h
+++ b/Robust/src/Runtime/runtime.h
@@ -83,7 +83,7 @@ __attribute__((malloc)) struct ArrayObject * allocate_newarray(void *, int type,
 __attribute__((malloc)) StringPtr NewString(void *, const char *str,int length);
 __attribute__((malloc)) StringPtr NewStringShort(void *, const short *str,int length);
 __attribute__((malloc)) struct ___TagDescriptor___ * allocate_tag(void *ptr, int index);
-#elif defined MULTICORE_GC
+#elif defined(MULTICORE_GC)||defined(PMC_GC)
 __attribute__((malloc)) void * allocate_new(void *, int type);
 __attribute__((malloc)) struct ArrayObject * allocate_newarray(void *, int type, int length);
 __attribute__((malloc)) StringPtr NewString(void *, const char *str,int length);
@@ -100,7 +100,7 @@ __attribute__((malloc)) struct ___TagDescriptor___ * allocate_tag(int index);
 
 
 void initializeexithandler();
-void failedboundschk(int num);
+void failedboundschk(int num, int index, struct ArrayObject * ao);
 void failednullptr(void * stackptr);
 void abort_task();
 void injectinstructionfailure();
@@ -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)||defined(PMC_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))