X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FCmm.h;h=aba5c2e36ba5e49e6d4fcbdd55f92d243e21a4ed;hb=f9d15f9fccae4706fbdf8ee4ecaef7da9953cb74;hp=c0b2fe991a4ba20f73c552647ef1baa81ff05a51;hpb=9d5c9fb05b4f05d803a437cba18581d562793f43;p=ghc-hetmet.git

diff --git a/includes/Cmm.h b/includes/Cmm.h
index c0b2fe9..aba5c2e 100644
--- a/includes/Cmm.h
+++ b/includes/Cmm.h
@@ -66,7 +66,6 @@
 #define CMINUSMINUS 1
 
 #include "ghcconfig.h"
-#include "RtsConfig.h"
 
 /* -----------------------------------------------------------------------------
    Types 
@@ -88,6 +87,7 @@
 #define I16 bits16
 #define I32 bits32
 #define I64 bits64
+#define P_  gcptr
 
 #if SIZEOF_VOID_P == 4
 #define W_ bits32
@@ -143,6 +143,18 @@
 	name : bits8[] str;			\
   }						\
 
+#ifdef TABLES_NEXT_TO_CODE
+#define RET_LBL(f) f##_info
+#else
+#define RET_LBL(f) f##_ret
+#endif
+
+#ifdef TABLES_NEXT_TO_CODE
+#define ENTRY_LBL(f) f##_info
+#else
+#define ENTRY_LBL(f) f##_entry
+#endif
+
 /* -----------------------------------------------------------------------------
    Byte/word macros
 
@@ -251,13 +263,34 @@
    Indirections can contain tagged pointers, so their tag is checked.
    -------------------------------------------------------------------------- */
 
+#ifdef PROFILING
+
+// When profiling, we cannot shortcut ENTER() by checking the tag,
+// because LDV profiling relies on entering closures to mark them as
+// "used".
+
+#define LOAD_INFO \
+    info = %INFO_PTR(UNTAG(P1));
+
+#define UNTAG_R1 \
+    P1 = UNTAG(P1);
+
+#else
+
+#define LOAD_INFO                               \
+  if (GETTAG(P1) != 0) {                        \
+      jump %ENTRY_CODE(Sp(0));                  \
+  }                                             \
+  info = %INFO_PTR(P1);
+
+#define UNTAG_R1 /* nothing */
+
+#endif
+
 #define ENTER()						\
  again:							\
   W_ info;						\
-  if (GETTAG(R1) != 0) {                                \
-      jump %ENTRY_CODE(Sp(0));				\
-  }                                                     \
-  info = %INFO_PTR(R1);					\
+  LOAD_INFO                                             \
   switch [INVALID_OBJECT .. N_CLOSURE_TYPES]		\
          (TO_W_( %INFO_TYPE(%STD_INFO(info)) )) {	\
   case							\
@@ -267,7 +300,7 @@
     IND_OLDGEN_PERM,					\
     IND_STATIC:						\
    {							\
-      R1 = StgInd_indirectee(R1);			\
+      P1 = StgInd_indirectee(P1);			\
       goto again;					\
    }							\
   case							\
@@ -276,6 +309,7 @@
     FUN_0_1,						\
     FUN_2_0,						\
     FUN_1_1,						\
+    FUN_0_2,						\
     FUN_STATIC,                                         \
     BCO,						\
     PAP:						\
@@ -284,6 +318,7 @@
    }							\
   default:						\
    {							\
+      UNTAG_R1                                          \
       jump %ENTRY_CODE(info);				\
    }							\
   }
@@ -296,33 +331,28 @@
    Constants.
    -------------------------------------------------------------------------- */
 
-#include "Constants.h"
+#include "rts/Constants.h"
 #include "DerivedConstants.h"
-#include "ClosureTypes.h"
-#include "StgFun.h"
-#include "OSThreads.h"
-#include "SMPClosureOps.h"
+#include "rts/storage/ClosureTypes.h"
+#include "rts/storage/FunTypes.h"
+#include "rts/storage/SMPClosureOps.h"
+#include "rts/OSThreads.h"
 
 /*
  * Need MachRegs, because some of the RTS code is conditionally
  * compiled based on REG_R1, REG_R2, etc.
  */
 #define STOLEN_X86_REGS 4
-#include "MachRegs.h"
+#include "stg/MachRegs.h"
 
-#include "Liveness.h"
-#include "StgLdvProf.h"
+#include "rts/storage/Liveness.h"
+#include "rts/prof/LDV.h"
 
 #undef BLOCK_SIZE
 #undef MBLOCK_SIZE
-#include "Block.h"  /* For Bdescr() */
+#include "rts/storage/Block.h"  /* For Bdescr() */
 
 
-/* Can't think of a better place to put this. */
-#if SIZEOF_mp_limb_t != SIZEOF_VOID_P
-#error mp_limb_t != StgWord: assumptions in PrimOps.cmm are now false
-#endif
-
 #define MyCapability()  (BaseReg - OFFSET_Capability_r)
 
 /* -------------------------------------------------------------------------
@@ -562,7 +592,7 @@
   bdescr_free(__bd) = free + WDS(1);
 
 #define recordMutable(p, regs)                                  \
-      W_ __p;                                                   \
+      P_ __p;                                                   \
       W_ __bd;                                                  \
       W_ __gen;                                                 \
       __p = p;                                                  \