X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FAbsCStixGen.lhs;h=6a93c2b3191e3aa4403a63de3598b4bc7cbbf3a6;hb=259be9ef2ecc354d52622479921634606d6d2832;hp=df6ea2e56eb12eab7d8df7c1198371d77624ced0;hpb=e929d7b06933c1daa80dbeee3f1318bf363fc73e;p=ghc-hetmet.git diff --git a/ghc/compiler/nativeGen/AbsCStixGen.lhs b/ghc/compiler/nativeGen/AbsCStixGen.lhs index df6ea2e..6a93c2b 100644 --- a/ghc/compiler/nativeGen/AbsCStixGen.lhs +++ b/ghc/compiler/nativeGen/AbsCStixGen.lhs @@ -14,38 +14,45 @@ import Stix import MachMisc import AbsCUtils ( getAmodeRep, mixedTypeLocn, - nonemptyAbsC, mkAbsCStmts, mkAbsCStmtList + nonemptyAbsC, mkAbsCStmts ) import PprAbsC ( dumpRealC ) import SMRep ( fixedItblSize, rET_SMALL, rET_BIG, rET_VEC_SMALL, rET_VEC_BIG ) -import Constants ( mIN_UPD_SIZE ) +import Constants ( mIN_UPD_SIZE, wORD_SIZE ) import CLabel ( CLabel, mkReturnInfoLabel, mkReturnPtLabel, - mkClosureTblLabel, mkStaticClosureLabel ) + mkClosureTblLabel, mkClosureLabel, + labelDynamic, mkSplitMarkerLabel ) import ClosureInfo ( infoTableLabelFromCI, entryLabelFromCI, - fastLabelFromCI, closureUpdReqd, - staticClosureNeedsLink + closureLabelFromCI, fastLabelFromCI ) -import Const ( Literal(..) ) +import Literal ( Literal(..), word2IntLit ) import Maybes ( maybeToBool ) -import PrimOp ( primOpNeedsWrapper, PrimOp(..) ) -import PrimRep ( isFloatingRep, PrimRep(..) ) -import StixInfo ( genCodeInfoTable, genBitmapInfoTable ) +import StgSyn ( StgOp(..) ) +import MachOp ( MachOp(..), resultRepOfMachOp ) +import PrimRep ( isFloatingRep, is64BitRep, + PrimRep(..), getPrimRepSizeInBytes ) +import StixInfo ( genCodeInfoTable, genBitmapInfoTable, + livenessIsSmall, bitmapToIntegers ) import StixMacro ( macroCode, checkCode ) -import StixPrim ( primCode, amodeToStix, amodeToStix' ) -import Outputable ( pprPanic ) +import StixPrim ( foreignCallCode, amodeToStix, amodeToStix' ) +import Outputable ( pprPanic, ppr ) import UniqSupply ( returnUs, thenUs, mapUs, getUniqueUs, UniqSM ) import Util ( naturalMergeSortLe ) import Panic ( panic ) import TyCon ( tyConDataCons ) -import BitSet ( intBS ) +import DataCon ( dataConWrapId ) import Name ( NamedThing(..) ) +import CmdLineOpts ( opt_Static, opt_EnsureSplittableC ) +import Outputable ( assertPanic ) + +-- DEBUGGING ONLY +--import IOExts ( trace ) +--import Outputable ( showSDoc ) +--import MachOp ( pprMachOp ) -#ifdef REALLY_HASKELL_1_3 -ord = fromEnum :: Char -> Int -#endif \end{code} For each independent chunk of AbstractC code, we generate a list of @@ -54,17 +61,15 @@ We leave the chunks separated so that register allocation can be performed locally within the chunk. \begin{code} -genCodeAbstractC :: AbstractC -> UniqSM [[StixTree]] +genCodeAbstractC :: AbstractC -> UniqSM [StixStmt] genCodeAbstractC absC - = mapUs gentopcode (mkAbsCStmtList absC) `thenUs` \ trees -> - returnUs ([StComment SLIT("Native Code")] : trees) + = gentopcode absC where a2stix = amodeToStix a2stix' = amodeToStix' volsaves = volatileSaves volrestores = volatileRestores - p2stix = primCode macro_code = macroCode -- real code follows... --------- \end{code} @@ -83,13 +88,32 @@ Here we handle top-level things, like @CCodeBlock@s and = gencode absC `thenUs` \ code -> returnUs (StSegment TextSegment : StFunBegin lbl : code [StFunEnd lbl]) - gentopcode stmt@(CStaticClosure lbl _ _ _) + gentopcode stmt@(CStaticClosure closure_info _ _) = genCodeStaticClosure stmt `thenUs` \ code -> - returnUs (StSegment DataSegment : StLabel lbl : code []) + returnUs ( + if opt_Static + then StSegment DataSegment + : StLabel lbl : code [] + else StSegment DataSegment + : StData PtrRep [StInt 0] -- DLLised world, need extra zero word + : StLabel lbl : code [] + ) + where + lbl = closureLabelFromCI closure_info gentopcode stmt@(CRetVector lbl _ _ _) = genCodeVecTbl stmt `thenUs` \ code -> - returnUs (StSegment TextSegment : code [StLabel lbl]) + returnUs (StSegment TextSegment + : code [StLabel lbl, vtbl_post_label_word]) + where + -- We put a dummy word after the vtbl label so as to ensure the label + -- is in the same (Text) section as the vtbl it labels. This is critical + -- for ensuring the GC works correctly, although GC crashes due to + -- misclassification are much more likely to show up in the interactive + -- system than in compile code. For details see comment near line 1164 + -- of ghc/driver/mangler/ghc-asm.lprl, which contains an analogous fix + -- for the mangled via-C route. + vtbl_post_label_word = StData PtrRep [StInt 0] gentopcode stmt@(CRetDirect uniq absC srt liveness) = gencode absC `thenUs` \ code -> @@ -99,9 +123,7 @@ Here we handle top-level things, like @CCodeBlock@s and where lbl_info = mkReturnInfoLabel uniq lbl_ret = mkReturnPtLabel uniq - closure_type = case liveness of - LvSmall _ -> rET_SMALL - LvLarge _ -> rET_BIG + closure_type = if livenessIsSmall liveness then rET_SMALL else rET_BIG gentopcode stmt@(CClosureInfoAndCode cl_info slow Nothing _) @@ -133,27 +155,57 @@ Here we handle top-level things, like @CCodeBlock@s and gentopcode stmt@(CSRT lbl closures) = returnUs [ StSegment TextSegment , StLabel lbl - , StData DataPtrRep (map StCLbl closures) + , StData DataPtrRep (map mk_StCLbl_for_SRT closures) ] + where + mk_StCLbl_for_SRT :: CLabel -> StixExpr + mk_StCLbl_for_SRT label + | labelDynamic label + = StIndex Int8Rep (StCLbl label) (StInt 1) + | otherwise + = StCLbl label gentopcode stmt@(CBitmap lbl mask) - = returnUs [ StSegment TextSegment - , StLabel lbl - , StData WordRep (StInt (toInteger (length mask)) : - map (StInt . toInteger . intBS) mask) - ] + = returnUs $ case bitmapToIntegers mask of + mask'@(_:_:_) -> + [ StSegment TextSegment + , StLabel lbl + , StData WordRep (map StInt (toInteger (length mask') : mask')) + ] + _ -> [] gentopcode stmt@(CClosureTbl tycon) = returnUs [ StSegment TextSegment , StLabel (mkClosureTblLabel tycon) - , StData DataPtrRep (map (StCLbl . mkStaticClosureLabel . getName) + , StData DataPtrRep (map (StCLbl . mkClosureLabel . getName . dataConWrapId) (tyConDataCons tycon) ) ] + gentopcode stmt@(CModuleInitBlock plain_lbl lbl absC) + = gencode absC `thenUs` \ code -> + getUniqLabelNCG `thenUs` \ tmp_lbl -> + getUniqLabelNCG `thenUs` \ flag_lbl -> + returnUs ( StSegment DataSegment + : StLabel flag_lbl + : StData IntRep [StInt 0] + : StSegment TextSegment + : StLabel plain_lbl + : StJump NoDestInfo (StCLbl lbl) + : StLabel lbl + : StCondJump tmp_lbl (StMachOp MO_Nat_Ne + [StInd IntRep (StCLbl flag_lbl), + StInt 0]) + : StAssignMem IntRep (StCLbl flag_lbl) (StInt 1) + : code + [ StLabel tmp_lbl + , StAssignReg PtrRep stgSp + (StIndex PtrRep (StReg stgSp) (StInt (-1))) + , StJump NoDestInfo (StInd WordRep (StReg stgSp)) + ]) + gentopcode absC = gencode absC `thenUs` \ code -> returnUs (StSegment TextSegment : code []) - \end{code} \begin{code} @@ -167,9 +219,7 @@ Here we handle top-level things, like @CCodeBlock@s and returnUs (\xs -> vectbl : itbl xs) where vectbl = StData PtrRep (reverse (map a2stix amodes)) - closure_type = case liveness of - LvSmall _ -> rET_VEC_SMALL - LvLarge _ -> rET_VEC_BIG + closure_type = if livenessIsSmall liveness then rET_VEC_SMALL else rET_VEC_BIG \end{code} @@ -179,32 +229,22 @@ Here we handle top-level things, like @CCodeBlock@s and :: AbstractC -> UniqSM StixTreeList -} - genCodeStaticClosure (CStaticClosure _ cl_info cost_centre amodes) + genCodeStaticClosure (CStaticClosure cl_info cost_centre amodes) = returnUs (\xs -> table ++ xs) where table = StData PtrRep [StCLbl (infoTableLabelFromCI cl_info)] : - map (\amode -> StData (getAmodeRep amode) [a2stix amode]) amodes ++ - [StData PtrRep (padding_wds ++ static_link)] - - -- always at least one padding word: this is the static link field - -- for the garbage collector. - padding_wds = if closureUpdReqd cl_info then - take (max 0 (mIN_UPD_SIZE - length amodes)) zeros - else - [] - - static_link | staticClosureNeedsLink cl_info = [StInt 0] - | otherwise = [] - - zeros = StInt 0 : zeros - - {- needed??? --SDM - -- Watch out for VoidKinds...cf. PprAbsC - amodeZeroVoid item - | getAmodeRep item == VoidRep = StInt 0 - | otherwise = a2stix item - -} - + foldr do_one_amode [] amodes + + do_one_amode amode rest + | rep == VoidRep = rest + | otherwise = StData (promote_to_word rep) [a2stix amode] : rest + where + rep = getAmodeRep amode + + -- We need to promote any item smaller than a word to a word + promote_to_word pk + | getPrimRepSizeInBytes pk >= getPrimRepSizeInBytes IntRep = pk + | otherwise = IntRep \end{code} Now the individual AbstractC statements. @@ -225,11 +265,14 @@ Now the individual AbstractC statements. \end{code} -Split markers are a NOP in this land. +Split markers just insert a __stg_split_marker, which is caught by the +split-mangler later on and used to split the assembly into chunks. \begin{code} - gencode CSplitMarker = returnUs id + gencode CSplitMarker + | opt_EnsureSplittableC = returnUs (\xs -> StLabel mkSplitMarkerLabel : xs) + | otherwise = returnUs id \end{code} @@ -243,6 +286,14 @@ resulting StixTreeLists are joined together. gencode c2 `thenUs` \ b2 -> returnUs (b1 . b2) + gencode (CSequential stuff) + = foo stuff + where + foo [] = returnUs id + foo (s:ss) = gencode s `thenUs` \ stix -> + foo ss `thenUs` \ stixes -> + returnUs (stix . stixes) + \end{code} Initialising closure headers in the heap...a fairly complex ordeal if @@ -253,12 +304,12 @@ addresses, etc.) \begin{code} - gencode (CInitHdr cl_info reg_rel _) + gencode (CInitHdr cl_info reg_rel _ _) = let lhs = a2stix reg_rel lbl = infoTableLabelFromCI cl_info in - returnUs (\xs -> StAssign PtrRep (StInd PtrRep lhs) (StCLbl lbl) : xs) + returnUs (\xs -> StAssignMem PtrRep lhs (StCLbl lbl) : xs) \end{code} @@ -282,14 +333,23 @@ of the source? Be careful about floats/doubles. \begin{code} gencode (CAssign lhs rhs) - | getAmodeRep lhs == VoidRep = returnUs id + | lhs_rep == VoidRep + = returnUs id | otherwise - = let pk = getAmodeRep lhs - pk' = if mixedTypeLocn lhs && not (isFloatingRep pk) then IntRep else pk + = let -- This is a Hack. Should be cleaned up. + -- JRS, 10 Dec 01 + pk' | ncg_target_is_32bit && is64BitRep lhs_rep + = lhs_rep + | otherwise + = if mixedTypeLocn lhs && not (isFloatingRep lhs_rep) + then IntRep + else lhs_rep lhs' = a2stix lhs rhs' = a2stix' rhs in - returnUs (\xs -> StAssign pk' lhs' rhs' : xs) + returnUs (\xs -> mkStAssign pk' lhs' rhs' : xs) + where + lhs_rep = getAmodeRep lhs \end{code} @@ -304,48 +364,44 @@ which varies depending on whether we're profiling etc. \begin{code} gencode (CJump dest) - = returnUs (\xs -> StJump (a2stix dest) : xs) + = returnUs (\xs -> StJump NoDestInfo (a2stix dest) : xs) gencode (CFallThrough (CLbl lbl _)) = returnUs (\xs -> StFallThrough lbl : xs) gencode (CReturn dest DirectReturn) - = returnUs (\xs -> StJump (a2stix dest) : xs) + = returnUs (\xs -> StJump NoDestInfo (a2stix dest) : xs) gencode (CReturn table (StaticVectoredReturn n)) - = returnUs (\xs -> StJump dest : xs) + = returnUs (\xs -> StJump NoDestInfo dest : xs) where dest = StInd PtrRep (StIndex PtrRep (a2stix table) (StInt (toInteger (-n-fixedItblSize-1)))) gencode (CReturn table (DynamicVectoredReturn am)) - = returnUs (\xs -> StJump dest : xs) + = returnUs (\xs -> StJump NoDestInfo dest : xs) where dest = StInd PtrRep (StIndex PtrRep (a2stix table) dyn_off) - dyn_off = StPrim IntSubOp [StPrim IntNegOp [a2stix am], - StInt (toInteger (fixedItblSize+1))] + dyn_off = StMachOp MO_Nat_Sub [StMachOp MO_NatS_Neg [a2stix am], + StInt (toInteger (fixedItblSize+1))] \end{code} Now the PrimOps, some of which may need caller-saves register wrappers. \begin{code} - - gencode (COpStmt results op args vols) - -- ToDo (ADR?): use that liveness mask - | primOpNeedsWrapper op - = let - saves = volsaves vols - restores = volrestores vols - in - p2stix (nonVoid results) op (nonVoid args) - `thenUs` \ code -> - returnUs (\xs -> saves ++ code (restores ++ xs)) - - | otherwise = p2stix (nonVoid results) op (nonVoid args) - where - nonVoid = filter ((/= VoidRep) . getAmodeRep) - + gencode (COpStmt results (StgFCallOp fcall _) args vols) + = ASSERT( null vols ) + foreignCallCode (nonVoid results) fcall (nonVoid args) + + gencode (COpStmt results (StgPrimOp op) args vols) + = panic "AbsCStixGen.gencode: un-translated PrimOp" + + gencode (CMachOpStmt res mop args vols) + = returnUs (\xs -> mkStAssign (resultRepOfMachOp mop) (a2stix res) + (StMachOp mop (map a2stix args)) + : xs + ) \end{code} Now the dreaded conditional jump. @@ -374,8 +430,8 @@ Now the if statement. Almost *all* flow of control are of this form. Nothing -> gencode alt_code Just dc -> mkIfThenElse discrim tag alt_code dc - [(tag1@(MachInt i1 _), alt_code1), - (tag2@(MachInt i2 _), alt_code2)] + [(tag1@(MachInt i1), alt_code1), + (tag2@(MachInt i2), alt_code2)] | deflt_is_empty && i1 == 0 && i2 == 1 -> mkIfThenElse discrim tag1 alt_code1 alt_code2 | deflt_is_empty && i1 == 1 && i2 == 0 @@ -418,8 +474,12 @@ Finally, all of the disgusting AbstractC macros. gencode (CCallProfCCMacro macro _) = returnUs (\xs -> StComment macro : xs) + gencode CCallTypedef{} = returnUs id + gencode other = pprPanic "AbsCStixGen.gencode" (dumpRealC other) + + nonVoid = filter ((/= VoidRep) . getAmodeRep) \end{code} Here, we generate a jump table if there are more than four (integer) @@ -430,15 +490,16 @@ be tuned.) \begin{code} intTag :: Literal -> Integer - intTag (MachChar c) = toInteger (ord c) - intTag (MachInt i _) = i - intTag _ = panic "intTag" + intTag (MachChar c) = toInteger c + intTag (MachInt i) = i + intTag (MachWord w) = intTag (word2IntLit (MachWord w)) + intTag _ = panic "intTag" fltTag :: Literal -> Rational - fltTag (MachFloat f) = f + fltTag (MachFloat f) = f fltTag (MachDouble d) = d - fltTag _ = panic "fltTag" + fltTag x = pprPanic "fltTag" (ppr x) {- mkSimpleSwitches @@ -461,12 +522,14 @@ be tuned.) highest = if floating then targetMaxDouble else targetMaxInt in ( - if not floating && choices > 4 && highTag - lowTag < toInteger (2 * choices) then + if not floating && choices > 4 + && highTag - lowTag < toInteger (2 * choices) + then mkJumpTable am' sortedAlts lowTag highTag udlbl else mkBinaryTree am' floating sortedAlts choices lowest highest udlbl ) - `thenUs` \ alt_code -> + `thenUs` \ alt_code -> gencode absC `thenUs` \ dflt_code -> returnUs (\xs -> alt_code (StLabel udlbl : dflt_code (StLabel ujlbl : xs))) @@ -476,7 +539,8 @@ be tuned.) choices = length alts (x@(MachChar _),_) `leAlt` (y,_) = intTag x <= intTag y - (x@(MachInt _ _),_) `leAlt` (y,_) = intTag x <= intTag y + (x@(MachInt _), _) `leAlt` (y,_) = intTag x <= intTag y + (x@(MachWord _), _) `leAlt` (y,_) = intTag x <= intTag y (x,_) `leAlt` (y,_) = fltTag x <= fltTag y \end{code} @@ -505,12 +569,13 @@ already finish with a jump to the join point. mkJumpTable am alts lowTag highTag dflt = getUniqLabelNCG `thenUs` \ utlbl -> mapUs genLabel alts `thenUs` \ branches -> - let cjmpLo = StCondJump dflt (StPrim IntLtOp [am, StInt (toInteger lowTag)]) - cjmpHi = StCondJump dflt (StPrim IntGtOp [am, StInt (toInteger highTag)]) + let cjmpLo = StCondJump dflt (StMachOp MO_NatS_Lt [am, StInt (toInteger lowTag)]) + cjmpHi = StCondJump dflt (StMachOp MO_NatS_Gt [am, StInt (toInteger highTag)]) - offset = StPrim IntSubOp [am, StInt lowTag] + offset = StMachOp MO_Nat_Sub [am, StInt lowTag] + dsts = DestInfo (dflt : map fst branches) - jump = StJump (StInd PtrRep (StIndex PtrRep (StCLbl utlbl) offset)) + jump = StJump dsts (StInd PtrRep (StIndex PtrRep (StCLbl utlbl) offset)) tlbl = StLabel utlbl table = StData PtrRep (mkTable branches [lowTag..highTag] []) in @@ -564,8 +629,8 @@ alternatives should already finish with a jump to the join point. | rangeOfOne = gencode alt | otherwise = let tag' = a2stix (CLit tag) - cmpOp = if floating then DoubleNeOp else IntNeOp - test = StPrim cmpOp [am, tag'] + cmpOp = if floating then MO_Dbl_Ne else MO_Nat_Ne + test = StMachOp cmpOp [am, tag'] cjmp = StCondJump udlbl test in gencode alt `thenUs` \ alt_code -> @@ -578,8 +643,8 @@ alternatives should already finish with a jump to the join point. mkBinaryTree am floating alts choices lowTag highTag udlbl = getUniqLabelNCG `thenUs` \ uhlbl -> let tag' = a2stix (CLit splitTag) - cmpOp = if floating then DoubleGeOp else IntGeOp - test = StPrim cmpOp [am, tag'] + cmpOp = if floating then MO_Dbl_Ge else MO_NatS_Ge + test = StMachOp cmpOp [am, tag'] cjmp = StCondJump uhlbl test in mkBinaryTree am floating alts_lo half lowTag splitTag udlbl @@ -611,8 +676,8 @@ alternatives should already finish with a jump to the join point. getUniqLabelNCG `thenUs` \ utlbl -> let discrim' = a2stix discrim tag' = a2stix (CLit tag) - cmpOp = if (isFloatingRep (getAmodeRep discrim)) then DoubleNeOp else IntNeOp - test = StPrim cmpOp [discrim', tag'] + cmpOp = if (isFloatingRep (getAmodeRep discrim)) then MO_Dbl_Ne else MO_Nat_Ne + test = StMachOp cmpOp [discrim', tag'] cjmp = StCondJump utlbl test dest = StLabel utlbl join = StLabel ujlbl @@ -621,8 +686,8 @@ alternatives should already finish with a jump to the join point. gencode deflt `thenUs` \ dflt_code -> returnUs (\xs -> cjmp : alt_code (dest : dflt_code (join : xs))) -mkJoin :: AbstractC -> CLabel -> AbstractC +mkJoin :: AbstractC -> CLabel -> AbstractC mkJoin code lbl | mightFallThrough code = mkAbsCStmts code (CJump (CLbl lbl PtrRep)) | otherwise = code