| ',' expr lits { $2 : $3 }
cmmproc :: { ExtCode }
+-- TODO: add real SRT/info tables to parsed Cmm
: info maybe_formals '{' body '}'
- { do (info_lbl, info1, info2) <- $1;
+ { do (info_lbl, info) <- $1;
formals <- sequence $2;
stmts <- getCgStmtsEC (loopDecls $4)
blks <- code (cgStmtsToBlocks stmts)
- code (emitInfoTableAndCode info_lbl info1 info2 formals blks) }
+ code (emitInfoTableAndCode info_lbl info formals blks) }
| info maybe_formals ';'
- { do (info_lbl, info1, info2) <- $1;
+ { do (info_lbl, info) <- $1;
formals <- sequence $2;
- code (emitInfoTableAndCode info_lbl info1 info2 formals []) }
+ code (emitInfoTableAndCode info_lbl info formals []) }
| NAME maybe_formals '{' body '}'
{ do formals <- sequence $2;
stmts <- getCgStmtsEC (loopDecls $4);
blks <- code (cgStmtsToBlocks stmts);
- code (emitProc [] (mkRtsCodeLabelFS $1) formals blks) }
+ code (emitProc (CmmNonInfo Nothing) (mkRtsCodeLabelFS $1) formals blks) }
-info :: { ExtFCode (CLabel, [CmmLit],[CmmLit]) }
+info :: { ExtFCode (CLabel, CmmInfo) }
: '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,
+ CmmInfo prof Nothing (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,
+ CmmInfo prof Nothing (fromIntegral $9)
+ (FunInfo (fromIntegral $5, fromIntegral $7) NoC_SRT (fromIntegral $15) 0 (panic "INFO_TABLE_FUN:ArgDesr") (panic "INFO_TABLE_FUN:SlowEntry"))) }
+ -- 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,
+ CmmInfo prof Nothing (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,
+ CmmInfo prof Nothing (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)) }
+
+ | 'INFO_TABLE_RET' '(' NAME ',' INT ',' formals ')'
+ -- 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)) }
body :: { ExtCode }
: {- empty -} { return () }
| NAME ':'
{ do l <- newLabel $1; code (labelC l) }
--- HACK: this should just be lregs but that causes a shift/reduce conflict
--- with foreign calls
--- | hint_lregs '=' expr ';'
--- { do reg <- head $1; e <- $3; stmtEC (CmmAssign (fst reg) e) }
+ | lreg '=' expr ';'
+ { do reg <- $1; e <- $3; stmtEC (CmmAssign reg e) }
| type '[' expr ']' '=' expr ';'
{ doStore $1 $3 $6 }
--- TODO: add real SRT to parsed Cmm
+
+ -- Gah! We really want to say "maybe_results" but that causes
+ -- a shift/reduce conflict with assignment. We either
+ -- we expand out the no-result and single result cases or
+ -- 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 ';'
maybe_results :: { [ExtFCode (CmmFormal, MachHint)] }
: {- empty -} { [] }
- | hint_lregs '=' { $1 }
-
-hint_lregs0 :: { [ExtFCode (CmmFormal, MachHint)] }
- : {- empty -} { [] }
- | hint_lregs { $1 }
+ | '(' hint_lregs ')' '=' { $2 }
hint_lregs :: { [ExtFCode (CmmFormal, MachHint)] }
- : hint_lreg ',' { [$1] }
- | hint_lreg { [$1] }
+ : hint_lreg { [$1] }
+ | hint_lreg ',' { [$1] }
| hint_lreg ',' hint_lregs { $1 : $3 }
hint_lreg :: { ExtFCode (CmmFormal, MachHint) }
where
zero = mkIntCLit 0
+profilingInfo desc_str ty_str = do
+ lit1 <- if opt_SccProfilingOn
+ then code $ mkStringCLit desc_str
+ else return (mkIntCLit 0)
+ lit2 <- if opt_SccProfilingOn
+ then code $ mkStringCLit ty_str
+ else return (mkIntCLit 0)
+ return (ProfilingInfo lit1 lit2)
+
staticClosure :: FastString -> FastString -> [CmmLit] -> ExtCode
staticClosure cl_label info payload