X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FRtsTypes.h;h=79bbf1fccf0898311f4a8f796454b76b2cab867e;hb=d1c9e5aaf9f032ad9c4b123499bdd948c2fe9e47;hp=d4970053e7a7ced4ba3000edecc91fb9bfe1c798;hpb=99df892cc9620fcc92747b79bba75dad8a1d295c;p=ghc-hetmet.git diff --git a/includes/RtsTypes.h b/includes/RtsTypes.h index d497005..79bbf1f 100644 --- a/includes/RtsTypes.h +++ b/includes/RtsTypes.h @@ -41,50 +41,4 @@ typedef enum { typedef ullong rtsTime; -#if defined(PAR) -/* types only needed in the parallel system */ -typedef struct hashtable ParHashTable; -typedef struct hashlist ParHashList; - -/* typedef double REAL_TIME; */ -/* typedef W_ TIME; */ -/* typedef GlobalTaskId Proc; */ -typedef int GlobalTaskId; -typedef GlobalTaskId PEs; -typedef unsigned int rtsWeight; -typedef int rtsPacket; -typedef int OpCode; - -/* Global addresses i.e. unique ids in a parallel setup; needed in Closures.h*/ -typedef struct { - union { - StgPtr plc; - struct { - GlobalTaskId gtid; - int slot; - } gc; - } payload; - rtsWeight weight; -} globalAddr; - -/* (GA, LA) pairs */ -typedef struct gala { - globalAddr ga; - StgPtr la; - struct gala *next; - rtsBool preferred; -} GALA; - -#elif defined(GRAN) - -/* - * GlobalTaskId is dummy in GranSim; - * we define it to have cleaner code in the RTS - */ -typedef int GlobalTaskId; -typedef lnat rtsTime; -typedef StgWord PEs; - -#endif - #endif /* RTS_TYPES_H */