X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FRts.h;h=df8cb469009d5a521b1edb3f8004aa318d75104b;hp=7a30d9ee5284e18d6c075611da255e9a3da8cb0f;hb=c004ec62b41aa2137b5b5e298ca562609b0de92e;hpb=3f10646cfe2c3409056a49d1ef1c4507af522573

diff --git a/includes/Rts.h b/includes/Rts.h
index 7a30d9e..df8cb46 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -18,6 +18,12 @@ extern "C" {
 #endif
 #include "Stg.h"
 
+// Turn off inlining when debugging - it obfuscates things
+#ifdef DEBUG
+# undef  STATIC_INLINE
+# define STATIC_INLINE static
+#endif
+
 #include "RtsTypes.h"
 
 #if __GNUC__ >= 3
@@ -101,6 +107,29 @@ extern void _assertFail (const char *, unsigned int);
 #define FMT_Int64  "lld"
 #endif
 
+/*
+ * Macros for untagging and retagging closure pointers
+ * For more information look at the comments in Cmm.h
+ */
+
+static inline StgWord
+GET_CLOSURE_TAG(StgClosure * p)
+{
+    return (StgWord)p & TAG_MASK;
+}
+
+static inline StgClosure *
+UNTAG_CLOSURE(StgClosure * p)
+{
+    return (StgClosure*)((StgWord)p & ~TAG_MASK);
+}
+
+static inline StgClosure *
+TAG_CLOSURE(StgWord tag,StgClosure * p)
+{
+    return (StgClosure*)((StgWord)p | tag);
+}
+
 /* -----------------------------------------------------------------------------
    Include everything STG-ish
    -------------------------------------------------------------------------- */
@@ -138,21 +167,28 @@ extern void _assertFail (const char *, unsigned int);
 #include "OSThreads.h"
 #include "SMP.h"
 
-/* STG/Optimised-C related stuff */
-#include "Block.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"
-#include "Stable.h"
+
+  /* Ticky-ticky counters */
+#include "TickyCounters.h"
 
 /* Runtime-system hooks */
 #include "Hooks.h"
 #include "RtsMessages.h"
 
+/* for StablePtr/getStablePtr/deRefStablePtr */
+#include "Storage.h"
+#include "Stable.h"
+
 #include "ieee-flpt.h"
 
 #include "Signals.h"
@@ -194,6 +230,23 @@ extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__);
 /* declarations for runtime flags/values */
 #define MAX_RTS_ARGS 32
 
+#ifdef DEBUG
+#define TICK_VAR(arity) \
+  extern StgInt SLOW_CALLS_##arity; \
+  extern StgInt RIGHT_ARITY_##arity; \
+  extern StgInt TAGGED_PTR_##arity;
+
+#define TICK_VAR_INI(arity) \
+  StgInt SLOW_CALLS_##arity = 1; \
+  StgInt RIGHT_ARITY_##arity = 1; \
+  StgInt TAGGED_PTR_##arity = 0;
+
+extern StgInt TOTAL_CALLS;
+
+TICK_VAR(1)
+TICK_VAR(2)
+#endif
+
 /* -----------------------------------------------------------------------------
    Assertions and Debuggery
    -------------------------------------------------------------------------- */
@@ -205,7 +258,11 @@ extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__);
    -------------------------------------------------------------------------- */
 
 #ifdef DEBUG
+#if IN_STG_CODE
+#define IF_DEBUG(c,s)  if (RtsFlags[0].DebugFlags.c) { s; }
+#else
 #define IF_DEBUG(c,s)  if (RtsFlags.DebugFlags.c) { s; }
+#endif
 #else
 #define IF_DEBUG(c,s)  doNothing()
 #endif
@@ -250,4 +307,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 */