[project @ 2002-11-18 10:45:45 by simonmar]

[ghc-hetmet.git] / ghc / compiler / codeGen / CgCon.lhs

diff --git a/ghc/compiler/codeGen/CgCon.lhs b/ghc/compiler/codeGen/CgCon.lhs
index 3b91214..ce9e675 100644 (file)
--- a/ghc/compiler/codeGen/CgCon.lhs
+++ b/ghc/compiler/codeGen/CgCon.lhs
@@ -45,7 +45,7 @@ import ClosureInfo    ( mkConLFInfo, mkLFArgument, closureLFInfo,
 import CostCentre      ( currentOrSubsumedCCS, dontCareCCS, CostCentreStack,
                          currentCCS )
 import DataCon         ( DataCon, dataConName, dataConTag, 
-                         isUnboxedTupleCon, isNullaryDataCon, dataConId, 
+                         isUnboxedTupleCon, isNullaryDataCon, dataConWorkId, 
                          dataConWrapId, dataConRepArity
                        )
 import Id              ( Id, idName, idPrimRep )
@@ -257,7 +257,7 @@ bindUnboxedTupleComponents args
 
     bindArgsToRegs reg_args arg_regs           `thenC`
     mapCs bindNewToStack stk_offsets           `thenC`
-    returnFC (arg_regs,tags, not (null stk_offsets))
+    returnFC (arg_regs,tags, notNull stk_offsets)
 \end{code}
 
 %************************************************************************
@@ -316,7 +316,7 @@ cgReturnDataCon con amodes
                temp = CTemp uniq PtrRep 
           in
 
-          profCtrC SLIT("TICK_UPD_CON_IN_PLACE") 
+          profCtrC FSLIT("TICK_UPD_CON_IN_PLACE") 
                        [mkIntCLit (length amodes)] `thenC`
 
           getSpRelOffset args_sp                       `thenFC` \ sp_rel ->
@@ -352,7 +352,7 @@ cgReturnDataCon con amodes
                  let (ret_regs, leftovers) = 
                         assignRegs [] (map getAmodeRep amodes)
                  in
-                 profCtrC SLIT("TICK_RET_UNBOXED_TUP") 
+                 profCtrC FSLIT("TICK_RET_UNBOXED_TUP") 
                                [mkIntCLit (length amodes)] `thenC`
 
                  doTailCall amodes ret_regs 
@@ -379,12 +379,12 @@ cgReturnDataCon con amodes
                -- temporary variable, if the closure is a CHARLIKE.
                -- funnily enough, this makes the unique always come
                -- out as '54' :-)
-         buildDynCon (dataConId con) currentCCS con amodes     `thenFC` \ idinfo ->
+         buildDynCon (dataConWorkId con) currentCCS con amodes `thenFC` \ idinfo ->
          idInfoToAmode PtrRep idinfo                           `thenFC` \ amode ->
 
 
                -- RETURN
-         profCtrC SLIT("TICK_RET_NEW") [mkIntCLit (length amodes)] `thenC`
+         profCtrC FSLIT("TICK_RET_NEW") [mkIntCLit (length amodes)] `thenC`
          -- could use doTailCall here.
          performReturn (move_to_reg amode node) return
 \end{code}