X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcodeGen%2FCgClosure.lhs;h=32f442e4d5c7e0b6d1efeee29d51ec65b919e28d;hb=6e4feb0ecf12e7890f5298ca55f715eed3411095;hp=c40320cc95ec302137d8dffcead1e7f3c699995a;hpb=90c6cd0e5b6ee9a9d34b9404a38cf0cf2433ffe4;p=ghc-hetmet.git diff --git a/ghc/compiler/codeGen/CgClosure.lhs b/ghc/compiler/codeGen/CgClosure.lhs index c40320c..32f442e 100644 --- a/ghc/compiler/codeGen/CgClosure.lhs +++ b/ghc/compiler/codeGen/CgClosure.lhs @@ -1,7 +1,7 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -% $Id: CgClosure.lhs,v 1.38 1999/11/11 17:50:49 simonpj Exp $ +% $Id: CgClosure.lhs,v 1.47 2001/08/21 10:00:22 simonpj Exp $ % \section[CgClosure]{Code generation for closures} @@ -57,8 +57,7 @@ import Outputable import Name ( nameOccName ) import OccName ( occNameFS ) - -getWrapperArgTypeCategories = panic "CgClosure.getWrapperArgTypeCategories (ToDo)" +import FastTypes ( iBox ) \end{code} %******************************************************** @@ -80,9 +79,13 @@ cgTopRhsClosure :: Id -> FCode (Id, CgIdInfo) cgTopRhsClosure id ccs binder_info args body lf_info - = -- LAY OUT THE OBJECT + = + -- LAY OUT THE OBJECT let - closure_info = layOutStaticNoFVClosure name lf_info + name = idName id + closure_info = layOutStaticNoFVClosure name lf_info + closure_label = mkClosureLabel name + cg_id_info = stableAmodeIdInfo id (CLbl closure_label PtrRep) lf_info in -- BUILD THE OBJECT (IF NECESSARY) @@ -114,10 +117,7 @@ cgTopRhsClosure id ccs binder_info args body lf_info ) `thenC` returnFC (id, cg_id_info) - where - name = idName id - closure_label = mkClosureLabel name - cg_id_info = stableAmodeIdInfo id (CLbl closure_label PtrRep) lf_info + \end{code} %******************************************************** @@ -158,9 +158,6 @@ cgStdRhsClosure binder cc binder_info fvs args body lf_info payload -- RETURN returnFC (binder, heapIdInfo binder heap_offset lf_info) - - where - is_std_thunk = isStandardFormThunk lf_info \end{code} Here's the general case. @@ -194,21 +191,19 @@ cgRhsClosure binder cc binder_info fvs args body lf_info then fvs `minusList` [binder] else fvs in - mapFCs getCAddrModeAndInfo reduced_fvs `thenFC` \ amodes_and_info -> + mapFCs getCAddrModeAndInfo reduced_fvs `thenFC` \ fvs_w_amodes_and_info -> let - fvs_w_amodes_and_info = reduced_fvs `zip` amodes_and_info - closure_info :: ClosureInfo - bind_details :: [((Id, (CAddrMode, LambdaFormInfo)), VirtualHeapOffset)] + bind_details :: [((Id, CAddrMode, LambdaFormInfo), VirtualHeapOffset)] (closure_info, bind_details) = layOutDynClosure (idName binder) get_kind fvs_w_amodes_and_info lf_info - bind_fv ((id, (_, lf_info)), offset) = bindNewToNode id offset lf_info + bind_fv ((id, _, lf_info), offset) = bindNewToNode id offset lf_info - amodes_w_offsets = [(amode,offset) | ((_, (amode,_)), offset) <- bind_details] + amodes_w_offsets = [(amode,offset) | ((_,amode,_), offset) <- bind_details] - get_kind (id, amode_and_info) = idPrimRep id + get_kind (id, _, _) = idPrimRep id in -- BUILD ITS INFO TABLE AND CODE forkClosureBody ( @@ -311,7 +306,7 @@ closureCodeBody binder_info closure_info cc all_args body -- Arg mapping for standard (slow) entry point; all args on stack, -- with tagging. - (sp_all_args, arg_offsets, arg_tags) + (sp_all_args, arg_offsets, _) = mkTaggedVirtStkOffsets vSp idPrimRep all_args -- Arg mapping for the fast entry point; as many args as poss in @@ -325,7 +320,7 @@ closureCodeBody binder_info closure_info cc all_args body -- arg_regs = case entry_conv of DirectEntry lbl arity regs -> regs - other -> panic "closureCodeBody:arg_regs" + other -> [] -- "(HWL ignored; no args passed in regs)" num_arg_regs = length arg_regs @@ -350,7 +345,7 @@ closureCodeBody binder_info closure_info cc all_args body mapCs bindNewToStack arg_offsets `thenC` setRealAndVirtualSp sp_all_args `thenC` - argSatisfactionCheck closure_info `thenC` + argSatisfactionCheck closure_info arg_regs `thenC` -- OK, so there are enough args. Now we need to stuff as -- many of them in registers as the fast-entry code @@ -415,7 +410,7 @@ closureCodeBody binder_info closure_info cc all_args body forkAbsC (if slow_code_needed then slow_entry_code else absC AbsCNop) `thenFC` \ slow_abs_c -> forkAbsC fast_entry_code `thenFC` \ fast_abs_c -> - moduleName `thenFC` \ mod_name -> + moduleName `thenFC` \ mod_name -> -- Now either construct the info table, or put the fast code in alone -- (We never have slow code without an info table) @@ -516,28 +511,28 @@ relative offset of this word tells how many words of arguments are expected. \begin{code} -argSatisfactionCheck :: ClosureInfo -> Code +argSatisfactionCheck :: ClosureInfo -> [MagicId] {-GRAN-} -> Code -argSatisfactionCheck closure_info +argSatisfactionCheck closure_info arg_regs = nodeMustPointToIt (closureLFInfo closure_info) `thenFC` \ node_points -> - let - emit_gran_macros = opt_GranMacros - in +-- let +-- emit_gran_macros = opt_GranMacros +-- in -- HWL ngo' ngoq: -- absC (CMacroStmt GRAN_FETCH []) `thenC` -- forceHeapCheck [] node_points (absC AbsCNop) `thenC` - (if emit_gran_macros - then if node_points - then fetchAndReschedule [] node_points - else yield [] node_points - else absC AbsCNop) `thenC` + --(if opt_GranMacros + -- then if node_points + -- then fetchAndReschedule arg_regs node_points + -- else yield arg_regs node_points + -- else absC AbsCNop) `thenC` getSpRelOffset 0 `thenFC` \ (SpRel sp) -> let - off = I# sp + off = iBox sp rel_arg = mkIntCLit off in ASSERT(off /= 0) @@ -565,16 +560,13 @@ thunkWrapper closure_info lbl thunk_code = -- Stack and heap overflow checks nodeMustPointToIt (closureLFInfo closure_info) `thenFC` \ node_points -> - let - emit_gran_macros = opt_GranMacros - in - -- HWL: insert macros for GrAnSim; 2 versions depending on liveness of node - -- (we prefer fetchAndReschedule-style context switches to yield ones) - (if emit_gran_macros - then if node_points - then fetchAndReschedule [] node_points - else yield [] node_points - else absC AbsCNop) `thenC` + -- HWL: insert macros for GrAnSim; 2 versions depending on liveness of node + -- (we prefer fetchAndReschedule-style context switches to yield ones) + (if opt_GranMacros + then if node_points + then fetchAndReschedule [] node_points + else yield [] node_points + else absC AbsCNop) `thenC` -- stack and/or heap checks thunkChecks lbl node_points ( @@ -597,13 +589,10 @@ funWrapper :: ClosureInfo -- Closure whose code body this is funWrapper closure_info arg_regs stk_tags info_label fun_body = -- Stack overflow check nodeMustPointToIt (closureLFInfo closure_info) `thenFC` \ node_points -> - let - emit_gran_macros = opt_GranMacros - in -- HWL chu' ngoq: - (if emit_gran_macros - then yield arg_regs node_points - else absC AbsCNop) `thenC` + (if opt_GranMacros + then yield arg_regs node_points + else absC AbsCNop) `thenC` -- heap and/or stack checks fastEntryChecks arg_regs stk_tags info_label node_points ( @@ -682,9 +671,8 @@ setupUpdate closure_info code -- updated with the new value when available. -- Alloc black hole specifying CC_HDR(Node) as the cost centre - -- Hack Warning: Using a CLitLit to get CAddrMode ! let - use_cc = CLitLit SLIT("CCS_HDR(R1.p)") PtrRep + use_cc = CMacroExpr PtrRep CCS_HDR [nodeReg] blame_cc = use_cc in allocDynClosure (bhCI closure_info) use_cc blame_cc [] `thenFC` \ heap_offset -> @@ -749,43 +737,3 @@ chooseDynCostCentres ccs args fvs body -======================================================================== -OLD CODE THAT EMITTED INFORMATON FOR QUANTITATIVE ANALYSIS - -It's pretty wierd, so I've nuked it for now. SLPJ Nov 96 - -\begin{pseudocode} -getWrapperArgTypeCategories - :: Type -- wrapper's type - -> StrictnessInfo bdee -- strictness info about its args - -> Maybe String - -getWrapperArgTypeCategories _ NoStrictnessInfo = Nothing -getWrapperArgTypeCategories _ BottomGuaranteed - = trace "getWrapperArgTypeCategories:BottomGuaranteed!" Nothing -- wrong -getWrapperArgTypeCategories _ (StrictnessInfo [] _) = Nothing - -getWrapperArgTypeCategories ty (StrictnessInfo arg_info _) - = Just (mkWrapperArgTypeCategories ty arg_info) - -mkWrapperArgTypeCategories - :: Type -- wrapper's type - -> [Demand] -- info about its arguments - -> String -- a string saying lots about the args - -mkWrapperArgTypeCategories wrapper_ty wrap_info - = case (splitFunTy_maybe wrapper_ty) of { Just (arg_tys,_) -> - map do_one (wrap_info `zip` (map showTypeCategory arg_tys)) } - where - -- ToDo: this needs FIXING UP (it was a hack anyway...) - do_one (WwPrim, _) = 'P' - do_one (WwEnum, _) = 'E' - do_one (WwStrict, arg_ty_char) = arg_ty_char - do_one (WwUnpack _ _ _, arg_ty_char) - = if arg_ty_char `elem` "CIJFDTS" - then toLower arg_ty_char - else if arg_ty_char == '+' then 't' - else trace ("mkWrapp..:funny char:"++[arg_ty_char]) '-' - do_one (other_wrap_info, _) = '-' -\end{pseudocode} -