cmmproc :: { ExtCode }
-- TODO: add real SRT/info tables to parsed Cmm
- : info maybe_formals '{' body '}'
- { do ((info_lbl, info, live, formals), stmts) <-
+ : info maybe_formals maybe_frame maybe_gc_block '{' body '}'
+ { do ((entry_ret_label, info, live, formals, frame, gc_block), stmts) <-
getCgStmtsEC' $ loopDecls $ do {
- (info_lbl, info, live) <- $1;
+ (entry_ret_label, info, live) <- $1;
formals <- sequence $2;
- $4;
- return (info_lbl, info, live, formals) }
+ frame <- $3;
+ gc_block <- $4;
+ $6;
+ return (entry_ret_label, info, live, formals, frame, gc_block) }
blks <- code (cgStmtsToBlocks stmts)
- code (emitInfoTableAndCode info_lbl info formals blks) }
+ code (emitInfoTableAndCode entry_ret_label (CmmInfo gc_block frame info) formals blks) }
| info maybe_formals ';'
- { do (info_lbl, info, live) <- $1;
+ { do (entry_ret_label, info, live) <- $1;
formals <- sequence $2;
- code (emitInfoTableAndCode info_lbl info formals []) }
+ code (emitInfoTableAndCode entry_ret_label (CmmInfo Nothing Nothing info) formals []) }
- | NAME maybe_formals '{' body '}'
- { do (formals, stmts) <-
+ | NAME maybe_formals maybe_frame maybe_gc_block '{' body '}'
+ { do ((formals, frame, gc_block), stmts) <-
getCgStmtsEC' $ loopDecls $ do {
formals <- sequence $2;
- $4;
- return formals }
+ frame <- $3;
+ gc_block <- $4;
+ $6;
+ return (formals, frame, gc_block) }
blks <- code (cgStmtsToBlocks stmts)
- code (emitProc (CmmNonInfo Nothing) (mkRtsCodeLabelFS $1) formals blks) }
+ code (emitProc (CmmInfo gc_block frame CmmNonInfoTable) (mkRtsCodeLabelFS $1) formals blks) }
-info :: { ExtFCode (CLabel, CmmInfo, [Maybe LocalReg]) }
+info :: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
: 'INFO_TABLE' '(' NAME ',' INT ',' INT ',' INT ',' STRING ',' STRING ')'
-- ptrs, nptrs, closure type, description, type
{ do prof <- profilingInfo $11 $13
- return (mkRtsInfoLabelFS $3,
- CmmInfo prof Nothing (fromIntegral $9)
- (ThunkInfo (fromIntegral $5, fromIntegral $7) NoC_SRT),
+ return (mkRtsEntryLabelFS $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
{ do prof <- profilingInfo $11 $13
- return (mkRtsInfoLabelFS $3,
- CmmInfo prof Nothing (fromIntegral $9)
- (FunInfo (fromIntegral $5, fromIntegral $7) NoC_SRT (fromIntegral $15) 0
- (ArgSpec 0)
- zeroCLit),
+ return (mkRtsEntryLabelFS $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.
-- 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,
- CmmInfo prof Nothing (fromIntegral $11)
- (ConstrInfo (fromIntegral $5, fromIntegral $7) (fromIntegral $9) desc_lit),
+ return (mkRtsEntryLabelFS $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
{ do prof <- profilingInfo $9 $11
- return (mkRtsInfoLabelFS $3,
- CmmInfo prof Nothing (fromIntegral $7)
- (ThunkSelectorInfo (fromIntegral $5) NoC_SRT),
+ return (mkRtsEntryLabelFS $3,
+ CmmInfoTable prof (fromIntegral $7)
+ (ThunkSelectorInfo (fromIntegral $5) NoC_SRT),
[]) }
| 'INFO_TABLE_RET' '(' NAME ',' INT ')'
-- closure type (no live regs)
- { return (mkRtsInfoLabelFS $3,
- CmmInfo (ProfilingInfo zeroCLit zeroCLit) Nothing (fromIntegral $5)
- (ContInfo [] NoC_SRT),
+ { do let infoLabel = mkRtsInfoLabelFS $3
+ return (mkRtsRetLabelFS $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,
- CmmInfo (ProfilingInfo zeroCLit zeroCLit) Nothing (fromIntegral $5)
- (ContInfo live NoC_SRT),
+ return (mkRtsRetLabelFS $3,
+ CmmInfoTable (ProfilingInfo zeroCLit zeroCLit) (fromIntegral $5)
+ (ContInfo live NoC_SRT),
live) }
body :: { ExtCode }
| STRING type names ';' {% do k <- parseKind $1;
return $ mapM_ (newLocal k $2) $3 }
- | 'import' names ';' { return () } -- ignore imports
+ | 'import' names ';' { mapM_ newImport $2 }
| 'export' names ';' { return () } -- ignore exports
names :: { [FastString] }
-- 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
-- an environment, which is looped back into the computation. In this
-- way, we can have embedded declarations that scope over the whole
-- procedure, and imports that scope over the entire module.
+-- Discards the local declaration contained within decl'
loopDecls :: ExtFCode a -> ExtFCode a
-loopDecls (EC fcode) =
- EC $ \e s -> fixC (\ ~(decls,a) -> fcode (addListToUFM e decls) [])
+loopDecls (EC fcode) =
+ EC $ \e globalDecls -> do
+ (decls', a) <- fixC (\ ~(decls,a) -> fcode (addListToUFM e (decls ++ globalDecls)) globalDecls)
+ return (globalDecls, a)
getEnv :: ExtFCode Env
getEnv = EC $ \e s -> return (s, e)
addVarDecl name (CmmReg (CmmLocal reg))
return reg
+-- Creates a foreign label in the import. CLabel's labelDynamic
+-- classifies these labels as dynamic, hence the code generator emits the
+-- PIC code for them.
+newImport :: FastString -> ExtFCode ()
+newImport name =
+ addVarDecl name (CmmLit (CmmLabel (mkForeignLabel name Nothing True)))
+
newLabel :: FastString -> ExtFCode BlockId
newLabel name = do
u <- code newUnique
-> 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 (CmmCallee expr convention) results args safety))
+ case convention of
+ -- Temporary hack so at least some functions are CmmSafe
+ CmmCallConv -> code (stmtC (CmmCall (CmmCallee expr convention) results args safety))
+ _ -> case safety of
+ CmmUnsafe ->
+ code (emitForeignCall' PlayRisky results
+ (CmmCallee expr convention) args vols NoC_SRT)
+ CmmSafe srt ->
+ code (emitForeignCall' (PlaySafe unused) results
+ (CmmCallee 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