[project @ 1998-01-08 18:03:08 by simonm]

[ghc-hetmet.git] / ghc / includes / CostCentre.lh

diff --git a/ghc/includes/CostCentre.lh b/ghc/includes/CostCentre.lh
index a633907..404d286 100644 (file)
--- 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) ) {        \