X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmInfo.hs;h=a606da2aec4fc5dd19d811d7581c808966de683b;hp=3f458b53518f199912a59c505792c0e4844120a9;hb=f1fc7698ef9997f950be8cb37c9b30dadbb4b631;hpb=f47653a986cd329dc9159906432f2ed7819a4043 diff --git a/compiler/cmm/CmmInfo.hs b/compiler/cmm/CmmInfo.hs index 3f458b5..a606da2 100644 --- a/compiler/cmm/CmmInfo.hs +++ b/compiler/cmm/CmmInfo.hs @@ -1,16 +1,15 @@ module CmmInfo ( + emptyContInfoTable, cmmToRawCmm, - mkInfoTable + mkInfoTable, ) where #include "HsVersions.h" -import Cmm +import OldCmm import CmmUtils -import PprCmm import CLabel -import MachOp import Bitmap import ClosureInfo @@ -20,14 +19,19 @@ import CgUtils import SMRep import Constants +import Panic import StaticFlags -import DynFlags import Unique import UniqSupply -import Panic import Data.Bits +-- When we split at proc points, we need an empty info table. +emptyContInfoTable :: CmmInfoTable +emptyContInfoTable = CmmInfoTable False (ProfilingInfo zero zero) rET_SMALL + (ContInfo [] NoC_SRT) + where zero = CmmInt 0 wordWidth + cmmToRawCmm :: [Cmm] -> IO [RawCmm] cmmToRawCmm cmm = do info_tbl_uniques <- mkSplitUniqSupply 'i' @@ -51,7 +55,7 @@ cmmToRawCmm cmm = do -- -- -- --- See includes/InfoTables.h +-- See includes/rts/storage/InfoTables.h -- -- For return-points these are as follows -- @@ -70,78 +74,74 @@ cmmToRawCmm cmm = do -- * The SRT slot is only there if there is SRT info to record mkInfoTable :: Unique -> CmmTop -> [RawCmmTop] -mkInfoTable uniq (CmmData sec dat) = [CmmData sec dat] -mkInfoTable uniq (CmmProc info entry_label arguments blocks) = +mkInfoTable _ (CmmData sec dat) = [CmmData sec dat] +mkInfoTable uniq (CmmProc (CmmInfo _ _ info) entry_label blocks) = case info of - -- | Code without an info table. Easy. - CmmNonInfo _ -> [CmmProc [] entry_label arguments blocks] - - -- | A function entry point. - CmmInfo (ProfilingInfo ty_prof cl_prof) _ type_tag - (FunInfo (ptrs, nptrs) srt fun_type fun_arity - pap_bitmap slow_entry) -> - mkInfoTableAndCode info_label std_info fun_extra_bits entry_label - arguments blocks - where - fun_extra_bits = - [packHalfWordsCLit fun_type fun_arity] ++ - case pap_bitmap of + -- Code without an info table. Easy. + CmmNonInfoTable -> [CmmProc [] entry_label 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 + in case type_info of + -- A function entry point. + FunInfo (ptrs, nptrs) srt fun_arity pap_bitmap slow_entry -> + mkInfoTableAndCode info_label std_info fun_extra_bits entry_label + blocks + where + fun_type = argDescrType pap_bitmap + fun_extra_bits = + [packHalfWordsCLit fun_type fun_arity] ++ + case pap_bitmap of ArgGen liveness -> (if null srt_label then [mkIntCLit 0] else srt_label) ++ [makeRelativeRefTo info_label $ mkLivenessCLit liveness, makeRelativeRefTo info_label slow_entry] _ -> srt_label - std_info = mkStdInfoTable ty_prof cl_prof type_tag srt_bitmap layout - info_label = entryLblToInfoLbl entry_label - (srt_label, srt_bitmap) = mkSRTLit info_label srt - layout = packHalfWordsCLit ptrs nptrs - - -- | A constructor. - CmmInfo (ProfilingInfo ty_prof cl_prof) _ type_tag - (ConstrInfo (ptrs, nptrs) con_tag descr) -> - mkInfoTableAndCode info_label std_info [con_name] entry_label - arguments blocks - where - std_info = mkStdInfoTable ty_prof cl_prof type_tag con_tag layout - info_label = entryLblToInfoLbl entry_label - con_name = makeRelativeRefTo info_label descr - layout = packHalfWordsCLit ptrs nptrs - - -- | A thunk. - CmmInfo (ProfilingInfo ty_prof cl_prof) _ type_tag - (ThunkInfo (ptrs, nptrs) srt) -> - mkInfoTableAndCode info_label std_info srt_label entry_label - arguments blocks - where - std_info = mkStdInfoTable ty_prof cl_prof type_tag srt_bitmap layout - info_label = entryLblToInfoLbl entry_label - (srt_label, srt_bitmap) = mkSRTLit info_label srt - layout = packHalfWordsCLit ptrs nptrs - - -- | A selector thunk. - CmmInfo (ProfilingInfo ty_prof cl_prof) _ type_tag - (ThunkSelectorInfo offset srt) -> - mkInfoTableAndCode info_label std_info [{- no SRT -}] entry_label - arguments blocks - where - std_info = mkStdInfoTable ty_prof cl_prof type_tag 0 (mkWordCLit offset) - info_label = entryLblToInfoLbl entry_label - - -- A continuation/return-point. - CmmInfo (ProfilingInfo ty_prof cl_prof) _ type_tag (ContInfo stack_layout srt) -> - liveness_data ++ - mkInfoTableAndCode info_label std_info srt_label entry_label - arguments blocks - where - std_info = mkStdInfoTable ty_prof cl_prof maybe_big_type_tag srt_bitmap - (makeRelativeRefTo info_label liveness_lit) - info_label = entryLblToInfoLbl entry_label - (liveness_lit, liveness_data, liveness_tag) = - mkLiveness uniq stack_layout - maybe_big_type_tag = if type_tag == rET_SMALL - then liveness_tag - else type_tag - (srt_label, srt_bitmap) = mkSRTLit info_label srt + std_info = mkStdInfoTable ty_prof' cl_prof' type_tag srt_bitmap + layout + (srt_label, srt_bitmap) = mkSRTLit info_label srt + layout = packHalfWordsCLit ptrs nptrs + + -- A constructor. + ConstrInfo (ptrs, nptrs) con_tag descr -> + mkInfoTableAndCode info_label std_info [con_name] entry_label + blocks + where + std_info = mkStdInfoTable ty_prof' cl_prof' type_tag con_tag layout + con_name = makeRelativeRefTo info_label descr + layout = packHalfWordsCLit ptrs nptrs + -- A thunk. + ThunkInfo (ptrs, nptrs) srt -> + mkInfoTableAndCode info_label std_info srt_label entry_label + blocks + where + std_info = mkStdInfoTable ty_prof' cl_prof' type_tag srt_bitmap layout + (srt_label, srt_bitmap) = mkSRTLit info_label srt + layout = packHalfWordsCLit ptrs nptrs + + -- A selector thunk. + ThunkSelectorInfo offset _srt -> + mkInfoTableAndCode info_label std_info [{- no SRT -}] entry_label + blocks + where + std_info = mkStdInfoTable ty_prof' cl_prof' type_tag 0 (mkWordCLit offset) + + -- A continuation/return-point. + ContInfo stack_layout srt -> + liveness_data ++ + mkInfoTableAndCode info_label std_info srt_label entry_label + blocks + where + std_info = mkStdInfoTable ty_prof' cl_prof' maybe_big_type_tag srt_bitmap + (makeRelativeRefTo info_label liveness_lit) + (liveness_lit, liveness_data, liveness_tag) = + mkLiveness uniq stack_layout + maybe_big_type_tag = if type_tag == rET_SMALL + then liveness_tag + else type_tag + (srt_label, srt_bitmap) = mkSRTLit info_label srt -- Handle the differences between tables-next-to-code -- and not tables-next-to-code @@ -149,29 +149,28 @@ mkInfoTableAndCode :: CLabel -> [CmmLit] -> [CmmLit] -> CLabel - -> CmmFormals - -> [CmmBasicBlock] + -> ListGraph CmmStmt -> [RawCmmTop] -mkInfoTableAndCode info_lbl std_info extra_bits entry_lbl args blocks +mkInfoTableAndCode info_lbl std_info extra_bits entry_lbl blocks | tablesNextToCode -- Reverse the extra_bits; and emit the top-level proc = [CmmProc (map CmmStaticLit (reverse extra_bits ++ std_info)) - entry_lbl args blocks] + entry_lbl 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 - [mkDataLits info_lbl (CmmLabel entry_lbl : std_info ++ extra_bits), - CmmProc [] entry_lbl args blocks] + [CmmProc [] entry_lbl blocks, + mkDataLits info_lbl (CmmLabel entry_lbl : std_info ++ extra_bits)] mkSRTLit :: CLabel -> C_SRT -> ([CmmLit], -- srt_label StgHalfWord) -- srt_bitmap -mkSRTLit info_label NoC_SRT = ([], 0) +mkSRTLit _ NoC_SRT = ([], 0) mkSRTLit info_label (C_SRT lbl off bitmap) = ([makeRelativeRefTo info_label (cmmLabelOffW lbl off)], bitmap) @@ -199,28 +198,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) `quot` wORD_SIZE + 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 @@ -230,7 +230,7 @@ mkLiveness uniq live = small_bitmap = case bitmap of [] -> 0 - [b] -> fromIntegral b + [b] -> b _ -> panic "mkLiveness" small_liveness = fromIntegral (length bits) .|. (small_bitmap `shiftL` bITMAP_BITS_SHIFT) @@ -272,3 +272,4 @@ mkStdInfoTable type_descr closure_descr cl_type srt_len layout_lit | otherwise = [] type_lit = packHalfWordsCLit cl_type srt_len +