[project @ 2000-03-08 17:48:24 by simonmar]

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

diff --git a/ghc/includes/StgProf.h b/ghc/includes/StgProf.h
index 76fcdc3..8eeaa5c 100644 (file)
--- a/ghc/includes/StgProf.h
+++ b/ghc/includes/StgProf.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgProf.h,v 1.5 1999/04/08 15:43:44 simonm Exp $
+ * $Id: StgProf.h,v 1.8 2000/03/08 17:48:26 simonmar Exp $
  *
  * (c) The GHC Team, 1998
  *
@@ -34,34 +34,9 @@
 
  -------------------------------------------------------------------------- */
 
-extern F_ *register_stack;
-
 extern CostCentre *CC_LIST;               /* registered CC list */
 extern CostCentreStack *CCS_LIST;         /* registered CCS list */
 
-# define PUSH_REGISTER_STACK(reg_function)                             \
-       *(register_stack++) = (F_)reg_function
-
-# define POP_REGISTER_STACK()                                          \
-       *(--register_stack)
-
-# define START_REGISTER_CCS(reg_mod_name)                              \
-       static int _module_registered = 0;                              \
-       FN_(reg_mod_name) {                                             \
-           FB_;                                                        \
-           if (! _module_registered) {                                 \
-               _module_registered = 1
-
-# define REGISTER_IMPORT(reg_mod_name)                                 \
-       do { EF_(reg_mod_name);                                         \
-         PUSH_REGISTER_STACK(reg_mod_name) ;                           \
-       } while (0)
-       
-# define END_REGISTER_CCS()                                            \
-        };                                                             \
-       JMP_(POP_REGISTER_STACK());                                     \
-       FE_ }
-
 #define REGISTER_CC(cc)                                        \
        do {                                            \
        extern CostCentre cc[];                         \
@@ -84,13 +59,14 @@ extern CostCentreStack *CCS_LIST;         /* registered CCS list */
  * Declaring Cost Centres & Cost Centre Stacks.
  * -------------------------------------------------------------------------- */
 
-# define CC_DECLARE(cc_ident,name,module,group,subsumed,is_local)      \
-     is_local CostCentre cc_ident[1]                                   \
-       = {{ 0,                                                         \
-            name,                                                      \
-            module,                                                    \
-            group,                                                     \
-            subsumed,                                                  \
+# define CC_DECLARE(cc_ident,name,module,subsumed,is_local)    \
+     is_local CostCentre cc_ident[1]                           \
+       = {{ 0,                                                 \
+            name,                                              \
+            module,                                            \
+             0,                                                        \
+            0,                                                 \
+            subsumed,                                          \
             0 }};
 
 # define CCS_DECLARE(ccs_ident,cc_ident,subsumed,is_local)     \
@@ -104,7 +80,8 @@ extern CostCentreStack *CCS_LIST;         /* registered CCS list */
            sub_cafcc_count     : 0,                            \
            time_ticks          : 0,                            \
            mem_alloc           : 0,                            \
-           is_subsumed         : subsumed,                     \
+           mem_resid           : 0,                            \
+           root                : 0,                            \
        }};
 
 # define CC_EXTERN(cc_ident) \
@@ -215,10 +192,10 @@ extern CostCentreStack *CCS_LIST;         /* registered CCS list */
  * On entering a closure we only count the enter to thunks ...
  * ------------------------------------------------------------------------- */
 
-#define ENTER_CCS_T(ccs)                                    \
-        do {                                                \
-        CCCS = (CostCentreStack *)(ccs);                    \
-        CCCS_DETAIL_COUNT(CCCS->thunk_count);               \
+#define ENTER_CCS_T(ccs)                               \
+        do {                                           \
+        CCCS = (CostCentreStack *)(ccs);               \
+        CCCS_DETAIL_COUNT(CCCS->thunk_count);          \
         } while(0)      
  
 #define ENTER_CCS_TCL(closure)  ENTER_CCS_T(CCS_HDR(closure))
@@ -231,35 +208,31 @@ extern CostCentreStack *CCS_LIST;         /* registered CCS list */
  *  (b) The CCS is CAF-ish.
  * -------------------------------------------------------------------------- */
 
-#define ENTER_CCS_F(stack)                                     \
-        do {                                                   \
-        CostCentreStack *ccs = (CostCentreStack *) (stack);    \
-        if ( ! IS_CAF_OR_SUB_CCS(ccs) ) {                      \
-           CCCS = ccs;                                         \
-        } else {                                               \
-          CCCS = AppendCCS(CCCS,ccs);                          \
-          CCCS_DETAIL_COUNT(ccs->caffun_subsumed);             \
-          CCCS_DETAIL_COUNT(CCCS->subsumed_caf_count);         \
-        }                                                      \
-        CCCS_DETAIL_COUNT(CCCS->function_count);               \
+#define ENTER_CCS_F(stack)                                             \
+        do {                                                           \
+        CostCentreStack *ccs = (CostCentreStack *) (stack);            \
+        CCCS_DETAIL_COUNT(CCCS->function_count);                       \
+        CCCS = EnterFunCCS(CCCS,ccs);                                  \
         } while(0)
  
 #define ENTER_CCS_FCL(closure)  ENTER_CCS_F(CCS_HDR(closure))
 
 /* Entering a top-level function: costs are subsumed by the caller 
  */
-#define ENTER_CCS_FSUB()                                    \
-        do {                                                \
-        CCCS_DETAIL_COUNT(CCCS->subsumed_fun_count);        \
-        CCCS_DETAIL_COUNT(CCCS->function_count);            \
+#define ENTER_CCS_FSUB()                               \
+        do {                                           \
+        CCCS_DETAIL_COUNT(CCCS->subsumed_fun_count);   \
+        CCCS_DETAIL_COUNT(CCCS->function_count);       \
+       entering_PAP = 0;                               \
         } while(0)
  
-#define ENTER_CCS_FCAF(stack)                               \
-        do {                                                \
-        CostCentreStack *ccs = (CostCentreStack *) (stack); \
-        CCCS_DETAIL_COUNT(ccs->caffun_subsumed);            \
-        CCCS_DETAIL_COUNT(CCCS->subsumed_caf_count);        \
-        CCCS_DETAIL_COUNT(CCCS->function_count);            \
+#define ENTER_CCS_FCAF(stack)                                  \
+        do {                                                   \
+        CostCentreStack *ccs = (CostCentreStack *) (stack);    \
+        CCCS_DETAIL_COUNT(ccs->caffun_subsumed);               \
+        CCCS_DETAIL_COUNT(CCCS->subsumed_caf_count);           \
+        CCCS_DETAIL_COUNT(CCCS->function_count);               \
+       entering_PAP = 0;                                       \
         } while(0)
  
 #define ENTER_CCS_FLOAD(ccs)                                \
@@ -270,20 +243,11 @@ extern CostCentreStack *CCS_LIST;         /* registered CCS list */
  
 /* These ENTER_CC_PAP things are only used in the RTS */
  
-#define ENTER_CCS_PAP(stack) /* nothing */
-#if 0 /* old version */
-        do {                                                   \
-        CostCentreStack *ccs = (CostCentreStack *) (stack);    \
-        if ( ! IS_CAF_OR_SUB_CCS(ccs) ) {                      \
-            CCCS = ccs;                                                \
-        } else {                                               \
-          CCCS = AppendCCS(CCCS,ccs);                          \
-          CCCS_DETAIL_COUNT(ccs->caffun_subsumed);             \
-          CCCS_DETAIL_COUNT(CCCS->subsumed_caf_count);         \
-        }                                                      \
-        CCCS_DETAIL_COUNT(CCCS->pap_count);                    \
-        } while(0)                      
-#endif
+#define ENTER_CCS_PAP(stack)                   \
+        do {                                   \
+       ENTER_CCS_F(stack);                     \
+       entering_PAP = rtsTrue;                 \
+       } while(0)
 
 #define ENTER_CCS_PAP_CL(closure)  \
         ENTER_CCS_PAP((closure)->header.prof.ccs)