cmmproc :: { ExtCode }
-- TODO: add real SRT/info tables to parsed Cmm
--- : info maybe_formals '{' body '}'
--- { do (info_lbl, info1, info2) <- $1;
--- formals <- sequence $2;
--- stmts <- getCgStmtsEC (loopDecls $4)
--- blks <- code (cgStmtsToBlocks stmts)
--- code (emitInfoTableAndCode info_lbl info1 info2 formals blks) }
---
--- | info maybe_formals ';'
--- { do (info_lbl, info1, info2) <- $1;
--- formals <- sequence $2;
--- code (emitInfoTableAndCode info_lbl info1 info2 formals []) }
-
- : NAME maybe_formals '{' body '}'
- { do formals <- sequence $2;
- stmts <- getCgStmtsEC (loopDecls $4);
- blks <- code (cgStmtsToBlocks stmts);
- code (emitProc CmmNonInfo (mkRtsCodeLabelFS $1) formals blks) }
-
-info :: { ExtFCode (CLabel, [CmmLit],[CmmLit]) }
+ : info maybe_formals maybe_frame maybe_gc_block '{' body '}'
+ { do ((info_lbl, info, live, formals, frame, gc_block), stmts) <-
+ getCgStmtsEC' $ loopDecls $ do {
+ (info_lbl, info, live) <- $1;
+ formals <- sequence $2;
+ frame <- $3;
+ gc_block <- $4;
+ $6;
+ return (info_lbl, info, live, formals, frame, gc_block) }
+ blks <- code (cgStmtsToBlocks stmts)
+ code (emitInfoTableAndCode info_lbl (CmmInfo Nothing frame info) formals blks) }
+
+ | info maybe_formals ';'
+ { do (info_lbl, info, live) <- $1;
+ formals <- sequence $2;
+ code (emitInfoTableAndCode info_lbl (CmmInfo Nothing Nothing info) formals []) }
+
+ | NAME maybe_formals maybe_frame maybe_gc_block '{' body '}'
+ { do ((formals, frame, gc_block), stmts) <-
+ getCgStmtsEC' $ loopDecls $ do {
+ formals <- sequence $2;
+ frame <- $3;
+ gc_block <- $4;
+ $6;
+ return (formals, frame, gc_block) }
+ blks <- code (cgStmtsToBlocks stmts)
+ code (emitProc (CmmInfo gc_block frame CmmNonInfoTable) (mkRtsCodeLabelFS $1) formals blks) }
+
+info :: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
: 'INFO_TABLE' '(' NAME ',' INT ',' INT ',' INT ',' STRING ',' STRING ')'
-- ptrs, nptrs, closure type, description, type
- { stdInfo $3 $5 $7 0 $9 $11 $13 }
+ { do prof <- profilingInfo $11 $13
+ return (mkRtsInfoLabelFS $3,
+ CmmInfoTable prof (fromIntegral $9)
+ (ThunkInfo (fromIntegral $5, fromIntegral $7) NoC_SRT),
+ []) }
| 'INFO_TABLE_FUN' '(' NAME ',' INT ',' INT ',' INT ',' STRING ',' STRING ',' INT ')'
-- ptrs, nptrs, closure type, description, type, fun type
- { funInfo $3 $5 $7 $9 $11 $13 $15 }
+ { do prof <- profilingInfo $11 $13
+ return (mkRtsInfoLabelFS $3,
+ CmmInfoTable prof (fromIntegral $9)
+ (FunInfo (fromIntegral $5, fromIntegral $7) NoC_SRT (fromIntegral $15) 0
+ (ArgSpec 0)
+ zeroCLit),
+ []) }
+ -- we leave most of the fields zero here. This is only used
+ -- to generate the BCO info table in the RTS at the moment.
| 'INFO_TABLE_CONSTR' '(' NAME ',' INT ',' INT ',' INT ',' INT ',' STRING ',' STRING ')'
-- ptrs, nptrs, tag, closure type, description, type
- { conInfo $3 $5 $7 $9 $11 $13 $15 }
+ { do prof <- profilingInfo $13 $15
+ -- If profiling is on, this string gets duplicated,
+ -- but that's the way the old code did it we can fix it some other time.
+ desc_lit <- code $ mkStringCLit $13
+ return (mkRtsInfoLabelFS $3,
+ CmmInfoTable prof (fromIntegral $11)
+ (ConstrInfo (fromIntegral $5, fromIntegral $7) (fromIntegral $9) desc_lit),
+ []) }
| 'INFO_TABLE_SELECTOR' '(' NAME ',' INT ',' INT ',' STRING ',' STRING ')'
-- selector, closure type, description, type
- { basicInfo $3 (mkIntCLit (fromIntegral $5)) 0 $7 $9 $11 }
-
- | 'INFO_TABLE_RET' '(' NAME ',' INT ',' INT ',' INT ')'
- -- size, live bits, closure type
- { retInfo $3 $5 $7 $9 }
+ { do prof <- profilingInfo $9 $11
+ return (mkRtsInfoLabelFS $3,
+ CmmInfoTable prof (fromIntegral $7)
+ (ThunkSelectorInfo (fromIntegral $5) NoC_SRT),
+ []) }
+
+ | 'INFO_TABLE_RET' '(' NAME ',' INT ')'
+ -- closure type (no live regs)
+ { return (mkRtsInfoLabelFS $3,
+ CmmInfoTable (ProfilingInfo zeroCLit zeroCLit) (fromIntegral $5)
+ (ContInfo [] NoC_SRT),
+ []) }
+
+ | 'INFO_TABLE_RET' '(' NAME ',' INT ',' formals0 ')'
+ -- closure type, live regs
+ { do live <- sequence (map (liftM Just) $7)
+ return (mkRtsInfoLabelFS $3,
+ CmmInfoTable (ProfilingInfo zeroCLit zeroCLit) (fromIntegral $5)
+ (ContInfo live NoC_SRT),
+ live) }
body :: { ExtCode }
: {- empty -} { return () }
-- we tweak the syntax to avoid the conflict. The later
-- option is taken here because the other way would require
-- multiple levels of expanding and get unwieldy.
- | maybe_results 'foreign' STRING expr '(' hint_exprs0 ')' vols ';'
- {% foreignCall $3 $1 $4 $6 $8 NoC_SRT }
- | maybe_results 'prim' '%' NAME '(' hint_exprs0 ')' vols ';'
- {% primCall $1 $4 $6 $8 NoC_SRT }
+ | maybe_results 'foreign' STRING expr '(' hint_exprs0 ')' safety vols ';'
+ {% foreignCall $3 $1 $4 $6 $9 $8 }
+ | maybe_results 'prim' '%' NAME '(' hint_exprs0 ')' safety vols ';'
+ {% primCall $1 $4 $6 $9 $8 }
-- stmt-level macros, stealing syntax from ordinary C-- function calls.
-- Perhaps we ought to use the %%-form?
| NAME '(' exprs0 ')' ';'
| '(' bool_op ')' { $2 }
-- This is not C-- syntax. What to do?
+safety :: { CmmSafety }
+ : {- empty -} { CmmUnsafe } -- Default may change soon
+ | STRING {% parseSafety $1 }
+
+-- This is not C-- syntax. What to do?
vols :: { Maybe [GlobalReg] }
: {- empty -} { Nothing }
| '[' ']' { Just [] }
| STRING type NAME {% do k <- parseKind $1;
return $ newLocal k $2 $3 }
+maybe_frame :: { ExtFCode (Maybe UpdateFrame) }
+ : {- empty -} { return Nothing }
+ | 'jump' expr '(' exprs0 ')' { do { target <- $2;
+ args <- sequence $4;
+ return $ Just (UpdateFrame target args) } }
+
+maybe_gc_block :: { ExtFCode (Maybe BlockId) }
+ : {- empty -} { return Nothing }
+ | 'goto' NAME
+ { do l <- lookupLabel $2; return (Just l) }
+
type :: { MachRep }
: 'bits8' { I8 }
| typenot8 { $1 }
-- ToDo: the rest, maybe
]
+parseSafety :: String -> P CmmSafety
+parseSafety "safe" = return (CmmSafe NoC_SRT)
+parseSafety "unsafe" = return CmmUnsafe
+parseSafety str = fail ("unrecognised safety: " ++ str)
+
parseHint :: String -> P MachHint
parseHint "ptr" = return PtrHint
parseHint "signed" = return SignedHint
stmtEC stmt = code (stmtC stmt)
stmtsEC stmts = code (stmtsC stmts)
getCgStmtsEC = code2 getCgStmts'
+getCgStmtsEC' = code2 (\m -> getCgStmts' m >>= f)
+ where f ((decl, b), c) = return ((decl, b), (b, c))
forkLabelledCodeEC ec = do
stmts <- getCgStmtsEC ec
code (forkCgStmts stmts)
-retInfo name size live_bits cl_type = do
- let liveness = smallLiveness (fromIntegral size) (fromIntegral live_bits)
- info_lbl = mkRtsRetInfoLabelFS name
- (info1,info2) = mkRetInfoTable info_lbl liveness NoC_SRT
- (fromIntegral cl_type)
- return (info_lbl, info1, info2)
-
-stdInfo name ptrs nptrs srt_bitmap cl_type desc_str ty_str =
- basicInfo name (packHalfWordsCLit ptrs nptrs)
- srt_bitmap cl_type desc_str ty_str
-
-conInfo name ptrs nptrs srt_bitmap cl_type desc_str ty_str = do
- (lbl, info1, _) <- basicInfo name (packHalfWordsCLit ptrs nptrs)
- srt_bitmap cl_type desc_str ty_str
- desc_lit <- code $ mkStringCLit desc_str
- let desc_field = makeRelativeRefTo lbl desc_lit
- return (lbl, info1, [desc_field])
-
-basicInfo name layout srt_bitmap cl_type desc_str ty_str = do
- let info_lbl = mkRtsInfoLabelFS name
+
+profilingInfo desc_str ty_str = do
lit1 <- if opt_SccProfilingOn
- then code $ do lit <- mkStringCLit desc_str
- return (makeRelativeRefTo info_lbl lit)
+ then code $ mkStringCLit desc_str
else return (mkIntCLit 0)
lit2 <- if opt_SccProfilingOn
- then code $ do lit <- mkStringCLit ty_str
- return (makeRelativeRefTo info_lbl lit)
+ then code $ mkStringCLit ty_str
else return (mkIntCLit 0)
- let info1 = mkStdInfoTable lit1 lit2 (fromIntegral cl_type)
- (fromIntegral srt_bitmap)
- layout
- return (info_lbl, info1, [])
-
-funInfo name ptrs nptrs cl_type desc_str ty_str fun_type = do
- (label,info1,_) <- stdInfo name ptrs nptrs 0{-srt_bitmap-}
- cl_type desc_str ty_str
- let info2 = mkFunGenInfoExtraBits (fromIntegral fun_type) 0 zero zero zero
- -- we leave most of the fields zero here. This is only used
- -- to generate the BCO info table in the RTS at the moment.
- return (label,info1,info2)
- where
- zero = mkIntCLit 0
+ return (ProfilingInfo lit1 lit2)
staticClosure :: FastString -> FastString -> [CmmLit] -> ExtCode
-> ExtFCode CmmExpr
-> [ExtFCode (CmmExpr,MachHint)]
-> Maybe [GlobalReg]
- -> C_SRT
+ -> CmmSafety
-> P ExtCode
-foreignCall conv_string results_code expr_code args_code vols srt
+foreignCall conv_string results_code expr_code args_code vols safety
= do convention <- case conv_string of
"C" -> return CCallConv
"C--" -> return CmmCallConv
results <- sequence results_code
expr <- expr_code
args <- sequence args_code
- code (emitForeignCall' PlayRisky results
- (CmmForeignCall expr convention) args vols srt) where
+ --code (stmtC (CmmCall (CmmForeignCall expr convention) results args safety))
+ case convention of
+ -- Temporary hack so at least some functions are CmmSafe
+ CmmCallConv -> code (stmtC (CmmCall (CmmForeignCall expr convention) results args safety))
+ _ -> case safety of
+ CmmUnsafe ->
+ code (emitForeignCall' PlayRisky results
+ (CmmForeignCall expr convention) args vols NoC_SRT)
+ CmmSafe srt ->
+ code (emitForeignCall' (PlaySafe unused) results
+ (CmmForeignCall expr convention) args vols NoC_SRT) where
+ unused = panic "not used by emitForeignCall'"
primCall
:: [ExtFCode (CmmFormal,MachHint)]
-> FastString
-> [ExtFCode (CmmExpr,MachHint)]
-> Maybe [GlobalReg]
- -> C_SRT
+ -> CmmSafety
-> P ExtCode
-primCall results_code name args_code vols srt
+primCall results_code name args_code vols safety
= case lookupUFM callishMachOps name of
Nothing -> fail ("unknown primitive " ++ unpackFS name)
Just p -> return $ do
results <- sequence results_code
args <- sequence args_code
- code (emitForeignCall' PlayRisky results (CmmPrim p) args vols srt)
+ case safety of
+ CmmUnsafe ->
+ code (emitForeignCall' PlayRisky results
+ (CmmPrim p) args vols NoC_SRT)
+ CmmSafe srt ->
+ code (emitForeignCall' (PlaySafe unused) results
+ (CmmPrim p) args vols NoC_SRT) where
+ unused = panic "not used by emitForeignCall'"
doStore :: MachRep -> ExtFCode CmmExpr -> ExtFCode CmmExpr -> ExtCode
doStore rep addr_code val_code
emitStmts stmts
when (sp /= 0) $ stmtC (CmmAssign spReg (cmmRegOffW spReg (-sp)))
stmtC (CmmJump (entryCode (CmmLoad (cmmRegOffW spReg sp) wordRep)) [])
+ -- TODO (when using CPS): emitStmt (CmmReturn (map snd args))
-- -----------------------------------------------------------------------------
-- If-then-else and boolean expressions
projects / ghc-hetmet.git / blobdiff