X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fcmm%2FCmmInfo.hs;h=eb226da03e201f3a9558419c4a23cc5ac84b0445;hb=176fa33f17dd78355cc572e006d2ab26898e2c69;hp=770baec2eac12f6f623b95983585dc6174f4ee71;hpb=16dc208aaad7aadaea970e47b8055d7d7f8781e5;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmInfo.hs b/compiler/cmm/CmmInfo.hs index 770baec..eb226da 100644 --- a/compiler/cmm/CmmInfo.hs +++ b/compiler/cmm/CmmInfo.hs @@ -14,10 +14,8 @@ module CmmInfo ( import Cmm import CmmUtils -import PprCmm import CLabel -import MachOp import Bitmap import ClosureInfo @@ -27,8 +25,8 @@ import CgUtils import SMRep import Constants +import Outputable import StaticFlags -import DynFlags import Unique import UniqSupply import Panic @@ -78,21 +76,22 @@ cmmToRawCmm cmm = do mkInfoTable :: Unique -> CmmTop -> [RawCmmTop] mkInfoTable uniq (CmmData sec dat) = [CmmData sec dat] -mkInfoTable uniq (CmmProc (CmmInfo _ _ info) entry_label arguments (ListGraph blocks)) = +mkInfoTable uniq (CmmProc (CmmInfo _ _ info) entry_label arguments blocks) = case info of - -- | Code without an info table. Easy. - CmmNonInfoTable -> [CmmProc [] entry_label arguments (ListGraph blocks)] + -- Code without an info table. Easy. + CmmNonInfoTable -> [CmmProc [] entry_label arguments blocks] CmmInfoTable (ProfilingInfo ty_prof cl_prof) type_tag type_info -> let info_label = entryLblToInfoLbl entry_label - ty_prof' = makeRelativeRefTo info_label ty_prof - cl_prof' = makeRelativeRefTo info_label cl_prof + ty_prof' = makeRelativeRefTo info_label ty_prof + cl_prof' = makeRelativeRefTo info_label cl_prof in case type_info of - -- | A function entry point. - FunInfo (ptrs, nptrs) srt fun_type fun_arity pap_bitmap slow_entry -> + -- A function entry point. + FunInfo (ptrs, nptrs) srt fun_arity pap_bitmap slow_entry -> mkInfoTableAndCode info_label std_info fun_extra_bits entry_label arguments blocks where + fun_type = argDescrType pap_bitmap fun_extra_bits = [packHalfWordsCLit fun_type fun_arity] ++ case pap_bitmap of @@ -106,7 +105,7 @@ mkInfoTable uniq (CmmProc (CmmInfo _ _ info) entry_label arguments (ListGraph bl (srt_label, srt_bitmap) = mkSRTLit info_label srt layout = packHalfWordsCLit ptrs nptrs - -- | A constructor. + -- A constructor. ConstrInfo (ptrs, nptrs) con_tag descr -> mkInfoTableAndCode info_label std_info [con_name] entry_label arguments blocks @@ -114,8 +113,7 @@ mkInfoTable uniq (CmmProc (CmmInfo _ _ info) entry_label arguments (ListGraph bl std_info = mkStdInfoTable ty_prof' cl_prof' type_tag con_tag layout con_name = makeRelativeRefTo info_label descr layout = packHalfWordsCLit ptrs nptrs - - -- | A thunk. + -- A thunk. ThunkInfo (ptrs, nptrs) srt -> mkInfoTableAndCode info_label std_info srt_label entry_label arguments blocks @@ -124,7 +122,7 @@ mkInfoTable uniq (CmmProc (CmmInfo _ _ info) entry_label arguments (ListGraph bl (srt_label, srt_bitmap) = mkSRTLit info_label srt layout = packHalfWordsCLit ptrs nptrs - -- | A selector thunk. + -- A selector thunk. ThunkSelectorInfo offset srt -> mkInfoTableAndCode info_label std_info [{- no SRT -}] entry_label arguments blocks @@ -153,21 +151,21 @@ mkInfoTableAndCode :: CLabel -> [CmmLit] -> CLabel -> CmmFormals - -> [CmmBasicBlock] + -> ListGraph CmmStmt -> [RawCmmTop] mkInfoTableAndCode info_lbl std_info extra_bits entry_lbl args blocks | tablesNextToCode -- Reverse the extra_bits; and emit the top-level proc = [CmmProc (map CmmStaticLit (reverse extra_bits ++ std_info)) - entry_lbl args (ListGraph blocks)] + entry_lbl args blocks] - | null blocks -- No actual code; only the info table is significant + | ListGraph [] <- blocks -- No code; only the info table is significant = -- Use a zero place-holder in place of the -- entry-label in the info table [mkRODataLits info_lbl (zeroCLit : std_info ++ extra_bits)] | otherwise -- Separately emit info table (with the function entry = -- point as first entry) and the entry code - [CmmProc [] entry_lbl args (ListGraph blocks), + [CmmProc [] entry_lbl args blocks, mkDataLits info_lbl (CmmLabel entry_lbl : std_info ++ extra_bits)] mkSRTLit :: CLabel @@ -202,30 +200,29 @@ mkSRTLit info_label (C_SRT lbl off bitmap) = -- TODO: combine with CgCallConv.mkLiveness (see comment there) mkLiveness :: Unique -> [Maybe LocalReg] - -> (CmmLit, -- ^ The bitmap (literal value or label) - [RawCmmTop], -- ^ Large bitmap CmmData if needed - ClosureTypeTag) -- ^ rET_SMALL or rET_BIG + -> (CmmLit, [RawCmmTop], ClosureTypeTag) + -- ^ Returns: + -- 1. The bitmap (literal value or label) + -- 2. Large bitmap CmmData if needed + -- 3. rET_SMALL or rET_BIG mkLiveness uniq live = if length bits > mAX_SMALL_BITMAP_SIZE -- does not fit in one word then (CmmLabel big_liveness, [data_lits], rET_BIG) -- fits in one word - else (mkWordCLit small_liveness, [], rET_SMALL) + else (mkWordCLit small_liveness, [], rET_SMALL) where mkBits [] = [] mkBits (reg:regs) = take sizeW bits ++ mkBits regs where sizeW = case reg of Nothing -> 1 - Just r -> (machRepByteWidth (localRegRep r) + wORD_SIZE - 1) + Just r -> (widthInBytes (typeWidth (localRegType r)) + wORD_SIZE - 1) `quot` wORD_SIZE -- number of words, rounded up bits = repeat $ is_non_ptr reg -- True <=> Non Ptr - is_non_ptr Nothing = True - is_non_ptr (Just reg) = - case localRegGCFollow reg of - KindNonPtr -> True - KindPtr -> False + is_non_ptr Nothing = True + is_non_ptr (Just reg) = not $ isGcPtrType (localRegType reg) bits :: [Bool] bits = mkBits live @@ -277,3 +274,4 @@ mkStdInfoTable type_descr closure_descr cl_type srt_len layout_lit | otherwise = [] type_lit = packHalfWordsCLit cl_type srt_len +