[project @ 2002-10-24 16:54:19 by simonpj]

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

diff --git a/ghc/compiler/codeGen/CgCon.lhs b/ghc/compiler/codeGen/CgCon.lhs
index aa2aec3..ce9e675 100644 (file)
--- a/ghc/compiler/codeGen/CgCon.lhs
+++ b/ghc/compiler/codeGen/CgCon.lhs
@@ -38,14 +38,14 @@ import CgHeapery    ( allocDynClosure, inPlaceAllocDynClosure )
 import CgTailCall      ( performReturn, mkStaticAlgReturnCode, doTailCall,
                          mkUnboxedTupleReturnCode )
 import CLabel          ( mkClosureLabel )
-import ClosureInfo     ( mkConLFInfo, mkLFArgument,
-                         layOutDynCon, layOutDynClosure,
-                         layOutStaticClosure, closureSize
+import ClosureInfo     ( mkConLFInfo, mkLFArgument, closureLFInfo,
+                         layOutDynConstr, layOutDynClosure,
+                         layOutStaticConstr, closureSize, mkStaticClosure
                        )
 import CostCentre      ( currentOrSubsumedCCS, dontCareCCS, CostCentreStack,
                          currentCCS )
 import DataCon         ( DataCon, dataConName, dataConTag, 
-                         isUnboxedTupleCon, isNullaryDataCon, dataConId, 
+                         isUnboxedTupleCon, isNullaryDataCon, dataConWorkId, 
                          dataConWrapId, dataConRepArity
                        )
 import Id              ( Id, idName, idPrimRep )
@@ -67,33 +67,34 @@ import Outputable
 cgTopRhsCon :: Id              -- Name of thing bound to this RHS
            -> DataCon          -- Id
            -> [StgArg]         -- Args
+           -> SRT
            -> FCode (Id, CgIdInfo)
-cgTopRhsCon id con args
-  = ASSERT(not (isDllConApp con args)) -- checks for litlit args too
-    ASSERT(length args == dataConRepArity con)
-    let
-       name          = idName id
-       closure_label = mkClosureLabel name
-       lf_info       = mkConLFInfo con
-    in
+cgTopRhsCon id con args srt
+  = ASSERT( not (isDllConApp con args) )       -- checks for litlit args too
+    ASSERT( args `lengthIs` dataConRepArity con )
 
-    (
        -- LAY IT OUT
     getArgAmodes args          `thenFC` \ amodes ->
 
     let
-       (closure_info, amodes_w_offsets)
-         = layOutStaticClosure name getAmodeRep amodes lf_info
+       name          = idName id
+       lf_info       = closureLFInfo closure_info
+       closure_label = mkClosureLabel name
+       (closure_info, amodes_w_offsets) 
+               = layOutStaticConstr name con getAmodeRep amodes
     in
 
        -- BUILD THE OBJECT
-    absC (CStaticClosure
-           closure_label               -- Labelled with the name on lhs of defn
-           closure_info                -- Closure is static
-           (mkCCostCentreStack dontCareCCS) -- because it's static data
-           (map fst amodes_w_offsets)) -- Sorted into ptrs first, then nonptrs
-
-    ) `thenC`
+    absC (mkStaticClosure
+           closure_info
+           dontCareCCS                 -- because it's static data
+           (map fst amodes_w_offsets)  -- Sorted into ptrs first, then nonptrs
+           (nonEmptySRT srt)           -- has CAF refs
+         )                                     `thenC`
+               -- NOTE: can't use idCafInfo instead of nonEmptySRT above,
+               -- because top-level constructors that were floated by
+               -- CorePrep don't have CafInfo attached.  The SRT is more
+               -- reliable.
 
        -- RETURN
     returnFC (id, stableAmodeIdInfo id (CLbl closure_label PtrRep) lf_info)
@@ -186,7 +187,7 @@ buildDynCon binder ccs con args
     returnFC (heapIdInfo binder hp_off lf_info)
   where
     (closure_info, amodes_w_offsets)
-      = layOutDynClosure (idName binder) getAmodeRep args lf_info
+      = layOutDynClosure (idName binder) getAmodeRep args lf_info NoC_SRT
     lf_info = mkConLFInfo con
 
     use_cc     -- cost-centre to stick in the object
@@ -220,7 +221,9 @@ bindConArgs con args
     mapCs bind_arg args_w_offsets
    where
      bind_arg (arg, offset) = bindNewToNode arg offset mkLFArgument
-     (_, args_w_offsets) = layOutDynCon con idPrimRep args
+     (_, args_w_offsets)    = layOutDynConstr bogus_name con idPrimRep args
+
+bogus_name = panic "bindConArgs"
 \end{code}
 
 Unboxed tuples are handled slightly differently - the object is
@@ -235,8 +238,8 @@ bindUnboxedTupleComponents
 
 bindUnboxedTupleComponents args
  =  -- Assign as many components as possible to registers
-    let (arg_regs, leftovers) = assignRegs [] (map idPrimRep args)
-       (reg_args, stk_args) = splitAt (length arg_regs) args
+    let (arg_regs, _leftovers) = assignRegs [] (map idPrimRep args)
+       (reg_args, stk_args)   = splitAtList arg_regs args
     in
 
     -- Allocate the rest on the stack (ToDo: separate out pointers)
@@ -254,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}
 
 %************************************************************************
@@ -270,7 +273,7 @@ sure the @amodes@ passed don't conflict with each other.
 cgReturnDataCon :: DataCon -> [CAddrMode] -> Code
 
 cgReturnDataCon con amodes
-  = ASSERT(length amodes == dataConRepArity con)
+  = ASSERT( amodes `lengthIs` dataConRepArity con )
     getEndOfBlockInfo  `thenFC` \ (EndOfBlockInfo args_sp sequel) ->
 
     case sequel of
@@ -313,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 ->
@@ -338,11 +341,9 @@ cgReturnDataCon con amodes
           setEndOfBlockInfo (EndOfBlockInfo new_sp (OnStack new_sp)) $
           performReturn (AbsCNop) (mkStaticAlgReturnCode con)
 
-       where (closure_info, stuff) 
-                 = layOutDynClosure (dataConName con) 
-                       getAmodeRep amodes lf_info
-
-             lf_info = mkConLFInfo con
+       where
+          (closure_info, stuff) 
+                 = layOutDynConstr (dataConName con) con getAmodeRep amodes
 
       other_sequel     -- The usual case
 
@@ -351,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 
@@ -378,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}