allow build settings to be overriden by adding mk/validate.mk

[ghc-hetmet.git] / includes / Rts.h

diff --git a/includes/Rts.h b/includes/Rts.h
index c2b25a8..d009618 100644 (file)
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -145,12 +145,18 @@ extern void _assertFail (const char *, unsigned int);
 #include "SMP.h"
 
 /* GNU mp library */
+#if defined(HAVE_FRAMEWORK_GMP)
+#include <GMP/gmp.h>
+#else
 #include "gmp.h"
+#endif
 
 /* Macros for STG/C code */
 #include "Block.h"
 #include "ClosureMacros.h"
-#include "StgTicky.h"
+
+  /* Ticky-ticky counters */
+#include "TickyCounters.h"
 
 /* Runtime-system hooks */
 #include "Hooks.h"
@@ -257,4 +263,29 @@ extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__);
 }
 #endif
 
+
+/* krc: I put this here because I don't think
+   it needs to be visible externally.
+   It used to be in StgTicky.h, but I got rid
+   of that. */
+
+/* -----------------------------------------------------------------------------
+   The StgEntCounter type - needed regardless of TICKY_TICKY
+   -------------------------------------------------------------------------- */
+
+typedef struct _StgEntCounter {
+  /* Using StgWord for everything, becuase both the C and asm code
+     generators make trouble if you try to pack things tighter */
+    StgWord    registeredp;    /* 0 == no, 1 == yes */
+    StgInt     arity;          /* arity (static info) */
+    StgInt     stk_args;       /* # of args off stack */
+                               /* (rest of args are in registers) */
+    char       *str;           /* name of the thing */
+    char       *arg_kinds;     /* info about the args types */
+    StgInt     entry_count;    /* Trips to fast entry code */
+    StgInt      allocs;         /* number of allocations by this fun */
+    struct _StgEntCounter *link;/* link to chain them all together */
+} StgEntCounter;
+
+
 #endif /* RTS_H */