X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=23f98801522380a79f33ef63e043b06b52987bd1;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hp=2bb986937f9adc1ee16d38ff642faea5de09e3b5;hpb=63b9fc6eccc2e9e9fae11a68f3adc0a05d7b7206;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index 2bb9869..23f9880 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -200,47 +200,51 @@ lits :: { [ExtFCode CmmExpr] } 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 ((info_lbl, info, live, formals, frame, gc_block), stmts) <- getCgStmtsEC' $ loopDecls $ do { (info_lbl, info, live) <- $1; formals <- sequence $2; - $4; - return (info_lbl, info, live, formals) } + frame <- $3; + gc_block <- $4; + $6; + return (info_lbl, info, live, formals, frame, gc_block) } blks <- code (cgStmtsToBlocks stmts) - code (emitInfoTableAndCode info_lbl info formals blks) } + 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 info formals []) } + code (emitInfoTableAndCode info_lbl (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), + 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), + 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. @@ -252,31 +256,31 @@ info :: { ExtFCode (CLabel, CmmInfo, [Maybe LocalReg]) } -- 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), + 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), + 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), + 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), + CmmInfoTable (ProfilingInfo zeroCLit zeroCLit) (fromIntegral $5) + (ContInfo live NoC_SRT), live) } body :: { ExtCode } @@ -313,10 +317,10 @@ stmt :: { ExtCode } -- 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 ')' ';' @@ -345,6 +349,11 @@ bool_op :: { ExtFCode BoolExpr } | '(' 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 [] } @@ -498,6 +507,17 @@ formal :: { ExtFCode LocalReg } | 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 } @@ -630,6 +650,11 @@ callishMachOps = listToUFM $ -- 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 @@ -830,9 +855,9 @@ foreignCall -> 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 @@ -841,23 +866,40 @@ foreignCall conv_string results_code expr_code args_code vols srt 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