X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FabsCSyn%2FCosts.lhs;h=17ea6d57f49163e0df8f535b33dc2c80896e97d1;hb=553e90d9a32ee1b1809430f260c401cc4169c6c7;hp=6ea04852966104afe8d1b369b4fa427554913362;hpb=79abe0acae28895eeb8a762dcf5867b84982a27c;p=ghc-hetmet.git

diff --git a/ghc/compiler/absCSyn/Costs.lhs b/ghc/compiler/absCSyn/Costs.lhs
index 6ea0485..17ea6d5 100644
--- a/ghc/compiler/absCSyn/Costs.lhs
+++ b/ghc/compiler/absCSyn/Costs.lhs
@@ -1,7 +1,7 @@
 %
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-% $Id: Costs.lhs,v 1.30 2001/11/23 11:58:00 simonmar Exp $
+% $Id: Costs.lhs,v 1.33 2003/07/28 16:05:30 simonmar Exp $
 %
 % Only needed in a GranSim setup -- HWL
 % ---------------------------------------------------------------------------
@@ -221,9 +221,9 @@ costs absC =
 
    CSRT _ _                  -> nullCosts
 
-   CBitmap _ _               -> nullCosts
+   CBitmap _                 -> nullCosts
 
-   CClosureInfoAndCode _ _ _ _ -> nullCosts
+   CClosureInfoAndCode _ _   -> nullCosts
 
    CRetVector _ _ _ _        -> nullCosts
 
@@ -301,7 +301,6 @@ exprMacroCosts side macro mode_list =
     ENTRY_CODE -> nullCosts -- nothing 
     ARG_TAG -> nullCosts -- nothing
     GET_TAG -> Cost (0, 0, 1, 0, 0)  -- indirect load
-    UPD_FRAME_UPDATEE -> Cost (0, 0, 1, 0, 0)  -- indirect load
 
 -- ---------------------------------------------------------------------------
 
@@ -309,15 +308,10 @@ stmtMacroCosts :: CStmtMacro -> [CAddrMode] -> CostRes
 
 stmtMacroCosts macro modes =
   case macro of
-    ARGS_CHK_LOAD_NODE  ->  Cost (2, 1, 0, 0, 0)	 {- StgMacros.lh  -}
-		-- p=probability of PAP (instead of AP): + p*(3,1,0,0,0)
-    ARGS_CHK		  ->  Cost (2, 1, 0, 0, 0)	 {- StgMacros.lh  -}
     UPD_CAF		  ->  Cost (7, 0, 1, 3, 0)	 {- SMupdate.lh	 -}
     UPD_BH_UPDATABLE	  ->  Cost (3, 0, 0, 1, 0)	 {- SMupdate.lh	 -}
     UPD_BH_SINGLE_ENTRY	  ->  Cost (3, 0, 0, 1, 0)	 {- SMupdate.lh	 -}
     PUSH_UPD_FRAME	  ->  Cost (3, 0, 0, 4, 0)	 {- Updates.h	 -}
-    PUSH_SEQ_FRAME	  ->  Cost (2, 0, 0, 3, 0)	 {- StgMacros.h	 !-}
-    UPDATE_SU_FROM_UPD_FRAME -> Cost (1, 0, 1, 0, 0)     {- StgMacros.h	 !-}
     SET_TAG		  ->  nullCosts		    {- COptRegs.lh -}
     GRAN_FETCH			->  nullCosts	  {- GrAnSim bookkeeping -}
     GRAN_RESCHEDULE		->  nullCosts	  {- GrAnSim bookkeeping -}