X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FRtsExternal.h;h=2272b2a4291282033c61d82f70e3f0c54395ee42;hp=61a920b0ab3681db9fc867a2cfab8fe3731f519a;hb=5d379cbe65e406d5c3a848fe7fcd090cafbfeb78;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/includes/RtsExternal.h b/includes/RtsExternal.h
index 61a920b..2272b2a 100644
--- a/includes/RtsExternal.h
+++ b/includes/RtsExternal.h
@@ -15,6 +15,10 @@
 /* The standard FFI interface */
 #include "HsFFI.h"
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 /* -----------------------------------------------------------------------------
    Functions exported by the RTS for use in Stg code
    -------------------------------------------------------------------------- */
@@ -26,8 +30,8 @@ extern void newCAF(StgClosure*);
 #endif
 
 /* ToDo: remove? */
-extern I_ genSymZh(void);
-extern I_ resetGenSymZh(void);
+extern HsInt genSymZh(void);
+extern HsInt resetGenSymZh(void);
 
 /* Alternate to raise(3) for threaded rts, for OpenBSD */
 extern int genericRaise(int sig);
@@ -36,14 +40,20 @@ extern int genericRaise(int sig);
 extern int cmp_thread(StgPtr tso1, StgPtr tso2);
 extern int rts_getThreadId(StgPtr tso);
 extern int forkOS_createThread ( HsStablePtr entry );
-extern StgInt forkProcess(HsStablePtr *entry);
-extern StgBool rtsSupportsBoundThreads(void);
+extern pid_t forkProcess(HsStablePtr *entry);
+extern HsBool rtsSupportsBoundThreads(void);
+extern StgInt newSpark (StgRegTable *reg, StgClosure *p);
+extern void stopTimer(void);
+extern unsigned int n_capabilities;
 
 /* grimy low-level support functions defined in StgPrimFloat.c */
 extern StgDouble __encodeDouble (I_ size, StgByteArray arr, I_ e);
+extern StgDouble __2Int_encodeDouble (I_ j_high, I_ j_low, I_ e);
 extern StgDouble __int_encodeDouble (I_ j, I_ e);
+extern StgDouble __word_encodeDouble (W_ j, I_ e);
 extern StgFloat  __encodeFloat (I_ size, StgByteArray arr, I_ e);
 extern StgFloat  __int_encodeFloat (I_ j, I_ e);
+extern StgFloat  __word_encodeFloat (W_ j, I_ e);
 extern StgInt    isDoubleNaN(StgDouble d);
 extern StgInt    isDoubleInfinite(StgDouble d);
 extern StgInt    isDoubleDenormalized(StgDouble d);
@@ -65,32 +75,55 @@ extern void*  createAdjustor(int cconv, StgStablePtr hptr, StgFunPtr wptr,
                              char *typeString);
 extern void   freeHaskellFunctionPtr(void* ptr);
 
+/* Hpc stuff */
+extern int hs_hpc_module(char *modName, StgWord32 modCount, StgWord32 modHashNo,StgWord64 *tixArr);
+// Simple linked list of modules
+typedef struct _HpcModuleInfo {
+  char *modName;		// name of module
+  StgWord32 tickCount;		// number of ticks
+  StgWord32 tickOffset;		// offset into a single large .tix Array
+  StgWord32 hashNo;		// Hash number for this module's mix info
+  StgWord64 *tixArr;		// tix Array; local for this module
+  struct _HpcModuleInfo *next;
+} HpcModuleInfo;
+
+extern HpcModuleInfo *hs_hpc_rootModule(void);
+
+
 #if defined(mingw32_HOST_OS)
 extern int  rts_InstallConsoleEvent ( int action, StgStablePtr *handler );
 extern void rts_ConsoleHandlerDone  ( int ev );
 #else
-extern int stg_sig_install (int, int, StgStablePtr *, void *);
+extern int stg_sig_install (int, int, void *);
 #endif
 
-#if !defined(mingw32_HOST_OS)
+#if defined(mingw32_HOST_OS)
+extern StgInt console_handler;
+#else
 extern StgInt *signal_handlers;
 #endif
+
+#if defined(mingw32_HOST_OS)
+void *getIOManagerEvent (void);
+HsWord32 readIOManagerEvent (void);
+void sendIOManagerEvent (HsWord32 event);
+#else
 extern void setIOManagerPipe (int fd);
+#endif
+
+extern void* allocateExec(unsigned int len, void **exec_addr);
 
-extern void* stgMallocBytesRWX(int len);
+// Breakpoint stuff
 
 /* -----------------------------------------------------------------------------
    Storage manager stuff exported
    -------------------------------------------------------------------------- */
 
-/* Prototype for an evacuate-like function */
-typedef void (*evac_fn)(StgClosure **);
-
 extern void performGC(void);
 extern void performMajorGC(void);
-extern void performGCWithRoots(void (*get_roots)(evac_fn));
 extern HsInt64 getAllocations( void );
 extern void revertCAFs( void );
 extern void dirty_MUT_VAR(StgRegTable *reg, StgClosure *p);
+extern void dirty_MVAR(StgRegTable *reg, StgClosure *p);
 
 #endif /*  RTSEXTERNAL_H */