X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FCostCentre.lh;h=404d286554dcb2534c9d6b2aef8296afcc809187;hb=9dd6e1c216993624a2cd74b62ca0f0569c02c26b;hp=a63390751d74a26e172958259974c708b1e1a31a;hpb=5eb1c77c795f92ed0f4c8023847e9d4be1a4fd0d;p=ghc-hetmet.git

diff --git a/ghc/includes/CostCentre.lh b/ghc/includes/CostCentre.lh
index a633907..404d286 100644
--- a/ghc/includes/CostCentre.lh
+++ b/ghc/includes/CostCentre.lh
@@ -156,7 +156,7 @@ CC_EXTERN(CC_DONTZuCARE);  	/* placeholder only */
 CC_EXTERN(CC_CAFs);		/* prelude cost centre (CAFs  only) */
 CC_EXTERN(CC_DICTs);		/* prelude cost centre (DICTs only) */
 
-# define IS_CAF_OR_DICT_OD_SUB_CC(cc) \
+# define IS_CAF_OR_DICT_OR_SUB_CC(cc) \
     ((cc)->is_subsumed & ' ') 	/* tests for lower case character */
 
 \end{code}
@@ -394,6 +394,15 @@ extern F_ *register_stack;
 	} while(0);							\
 	FUNEND; }
 
+#else	/* PROFILING */
+
+/* When things are working these shouldn't be emitted when not profiling,
+   but it was convenient at one point to have them expand to nothing 
+    when not profiling.  SLPJ Dec 96 */
+
+#define START_REGISTER_CCS(reg_mod_name)
+#define END_REGISTER_CCS()
+
 #endif  /* PROFILING */
 \end{code}
 
@@ -406,7 +415,7 @@ We don't want to attribute costs to an unregistered cost-centre:
 	do {	/* beware of cc name-capture */					\
 	CostCentre c_c = (CostCentre) (cc);					\
 	if (c_c->registered == NOT_REGISTERED) { 				\
-	    fprintf(stderr,"Entering unregistered CC: %s\n",c_c->label);	\
+	    fprintf(stderr,"Entering unregistered CC: %s %s\n",c_c->module, c_c->label);	\
 	    /* unsafe c-call, BTW */						\
 	}									\
 	if ( (chk_not_overhead) && c_c == STATIC_CC_REF(CC_OVERHEAD) ) {	\