RTS tidyup sweep, first phase

[ghc-hetmet.git] / rts / Updates.cmm

diff --git a/rts/Updates.cmm b/rts/Updates.cmm
index a9f25b7..fadf63b 100644 (file)
--- a/rts/Updates.cmm
+++ b/rts/Updates.cmm
@@ -12,8 +12,9 @@
 
 
 #include "Cmm.h"
+#include "rts/prof/LDV.h"
+
 #include "Updates.h"
-#include "StgLdvProf.h"
 
 /* on entry to the update code
    (1) R1 points to the closure being returned
@@ -45,11 +46,9 @@
        }
 
 #if defined(PROFILING)
-#define UPD_FRAME_BITMAP 3
-#define UPD_FRAME_WORDS  3
+#define UPD_FRAME_PARAMS W_ unused1, W_ unused2, P_ unused3
 #else
-#define UPD_FRAME_BITMAP 0
-#define UPD_FRAME_WORDS  1
+#define UPD_FRAME_PARAMS P_ unused1
 #endif
 
 /* this bitmap indicates that the first word of an update frame is a
@@ -57,11 +56,9 @@
  * there's a cost-centre-stack in there too).
  */
 
-INFO_TABLE_RET( stg_upd_frame, 
-           UPD_FRAME_WORDS, UPD_FRAME_BITMAP, UPDATE_FRAME)
+INFO_TABLE_RET( stg_upd_frame, UPDATE_FRAME, UPD_FRAME_PARAMS)
 UPD_FRAME_ENTRY_TEMPLATE
 
 
-INFO_TABLE_RET( stg_marked_upd_frame, 
-           UPD_FRAME_WORDS, UPD_FRAME_BITMAP, UPDATE_FRAME)
+INFO_TABLE_RET( stg_marked_upd_frame, UPDATE_FRAME, UPD_FRAME_PARAMS)
 UPD_FRAME_ENTRY_TEMPLATE