X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=72a57137c2ea529410f55c1711a87377ee36aeb0;hb=dc8ffcb9797ade3e3a68e6ec0a89fe2e7444e0ef;hp=73618bc35bd8e3ba87360e1d9d216ed6ef01cbe7;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index 73618bc..72a5713 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------- -- --- (c) The University of Glasgow, 2004 +-- (c) The University of Glasgow, 2004-2006 -- -- Parser for concrete Cmm. -- @@ -16,39 +16,39 @@ import CgProf import CgTicky import CgInfoTbls import CgForeignCall -import CgTailCall ( pushUnboxedTuple ) -import CgStackery ( emitPushUpdateFrame ) -import ClosureInfo ( C_SRT(..) ) -import CgCallConv ( smallLiveness ) -import CgClosure ( emitBlackHoleCode ) -import CostCentre ( dontCareCCS ) +import CgTailCall +import CgStackery +import ClosureInfo +import CgCallConv +import CgClosure +import CostCentre import Cmm import PprCmm -import CmmUtils ( mkIntCLit ) +import CmmUtils import CmmLex import CLabel import MachOp -import SMRep ( fixedHdrSize, CgRep(..) ) +import SMRep import Lexer -import ForeignCall ( CCallConv(..), Safety(..) ) -import Literal ( mkMachInt ) +import ForeignCall +import Literal import Unique import UniqFM import SrcLoc -import DynFlags ( DynFlags, DynFlag(..) ) -import Packages ( HomeModules ) -import StaticFlags ( opt_SccProfilingOn ) -import ErrUtils ( printError, dumpIfSet_dyn, showPass ) -import StringBuffer ( hGetStringBuffer ) +import DynFlags +import StaticFlags +import ErrUtils +import StringBuffer import FastString -import Panic ( panic ) -import Constants ( wORD_SIZE ) +import Panic +import Constants import Outputable -import Monad ( when ) +import Control.Monad import Data.Char ( ord ) +import System.Exit #include "HsVersions.h" } @@ -103,6 +103,7 @@ import Data.Char ( ord ) 'if' { L _ (CmmT_if) } 'jump' { L _ (CmmT_jump) } 'foreign' { L _ (CmmT_foreign) } + 'prim' { L _ (CmmT_prim) } 'import' { L _ (CmmT_import) } 'switch' { L _ (CmmT_switch) } 'case' { L _ (CmmT_case) } @@ -229,12 +230,8 @@ info :: { ExtFCode (CLabel, [CmmLit],[CmmLit]) } -- selector, closure type, description, type { basicInfo $3 (mkIntCLit (fromIntegral $5)) 0 $7 $9 $11 } - | 'INFO_TABLE_RET' '(' NAME ',' INT ',' INT ',' INT maybe_vec ')' - { retInfo $3 $5 $7 $9 $10 } - -maybe_vec :: { [CmmLit] } - : {- empty -} { [] } - | ',' NAME maybe_vec { CmmLabel (mkRtsCodeLabelFS $2) : $3 } + | 'INFO_TABLE_RET' '(' NAME ',' INT ',' INT ',' INT ')' + { retInfo $3 $5 $7 $9 } body :: { ExtCode } : {- empty -} { return () } @@ -253,7 +250,8 @@ names :: { [FastString] } stmt :: { ExtCode } : ';' { nopEC } - | block_id ':' { code (labelC $1) } + | NAME ':' + { do l <- newLabel $1; code (labelC l) } | lreg '=' expr ';' { do reg <- $1; e <- $3; stmtEC (CmmAssign reg e) } @@ -264,6 +262,11 @@ stmt :: { ExtCode } | lreg '=' 'foreign' STRING expr '(' hint_exprs0 ')' vols ';' {% let result = do r <- $1; return (r,NoHint) in foreignCall $4 [result] $5 $7 $9 } + | 'prim' '%' NAME '(' hint_exprs0 ')' vols ';' + {% primCall [] $3 $5 $7 } + | lreg '=' 'prim' '%' NAME '(' hint_exprs0 ')' vols ';' + {% let result = do r <- $1; return (r,NoHint) in + primCall [result] $5 $7 $9 } | STRING lreg '=' 'foreign' STRING expr '(' hint_exprs0 ')' vols ';' {% do h <- parseHint $1; let result = do r <- $2; return (r,h) in @@ -274,8 +277,8 @@ stmt :: { ExtCode } {% stmtMacro $1 $3 } | 'switch' maybe_range expr '{' arms default '}' { doSwitch $2 $3 $5 $6 } - | 'goto' block_id ';' - { stmtEC (CmmBranch $2) } + | 'goto' NAME ';' + { do l <- lookupLabel $2; stmtEC (CmmBranch l) } | 'jump' expr {-maybe_actuals-} ';' { do e <- $2; stmtEC (CmmJump e []) } | 'if' bool_expr '{' body '}' else @@ -403,13 +406,6 @@ lreg :: { ExtFCode CmmReg } other -> pprPanic "CmmParse:" (ftext $1 <> text " not a register") } | GLOBALREG { return (CmmGlobal $1) } -block_id :: { BlockId } - : NAME { BlockId (newTagUnique (getUnique $1) 'L') } - -- TODO: ugh. The unique of a FastString has a null - -- tag, so we have to put our own tag on. We should - -- really make a new unique for every label, and keep - -- them in an environment. - type :: { MachRep } : 'bits8' { I8 } | typenot8 { $1 } @@ -425,6 +421,7 @@ section :: String -> Section section "text" = Text section "data" = Data section "rodata" = ReadOnlyData +section "relrodata" = RelocatableReadOnlyData section "bss" = UninitialisedData section s = OtherSection s @@ -472,8 +469,7 @@ exprMacros = listToUFM [ ( FSLIT("GET_FUN_INFO"), \ [x] -> funInfoTable (closureInfoPtr x) ), ( FSLIT("INFO_TYPE"), \ [x] -> infoTableClosureType x ), ( FSLIT("INFO_PTRS"), \ [x] -> infoTablePtrs x ), - ( FSLIT("INFO_NPTRS"), \ [x] -> infoTableNonPtrs x ), - ( FSLIT("RET_VEC"), \ [info, conZ] -> retVec info conZ ) + ( FSLIT("INFO_NPTRS"), \ [x] -> infoTableNonPtrs x ) ] -- we understand a subset of C-- primitives: @@ -536,6 +532,12 @@ machOps = listToUFM $ ( "i2f64", flip MO_S_Conv F64 ) ] +callishMachOps = listToUFM $ + map (\(x, y) -> (mkFastString x, y)) [ + ( "write_barrier", MO_WriteBarrier ) + -- ToDo: the rest, maybe + ] + parseHint :: String -> P MachHint parseHint "ptr" = return PtrHint parseHint "signed" = return SignedHint @@ -623,8 +625,9 @@ stmtMacros = listToUFM [ -- to collect declarations as we parse the proc, and feed the environment -- back in circularly (to avoid a two-pass algorithm). -type Decls = [(FastString,CmmExpr)] -type Env = UniqFM CmmExpr +data Named = Var CmmExpr | Label BlockId +type Decls = [(FastString,Named)] +type Env = UniqFM Named newtype ExtFCode a = EC { unEC :: Env -> Decls -> FCode (Decls, a) } @@ -649,13 +652,30 @@ getEnv :: ExtFCode Env getEnv = EC $ \e s -> return (s, e) addVarDecl :: FastString -> CmmExpr -> ExtCode -addVarDecl var expr = EC $ \e s -> return ((var,expr):s, ()) +addVarDecl var expr = EC $ \e s -> return ((var, Var expr):s, ()) + +addLabel :: FastString -> BlockId -> ExtCode +addLabel name block_id = EC $ \e s -> return ((name, Label block_id):s, ()) newLocal :: MachRep -> FastString -> ExtCode newLocal ty name = do u <- code newUnique addVarDecl name (CmmReg (CmmLocal (LocalReg u ty))) +newLabel :: FastString -> ExtFCode BlockId +newLabel name = do + u <- code newUnique + addLabel name (BlockId u) + return (BlockId u) + +lookupLabel :: FastString -> ExtFCode BlockId +lookupLabel name = do + env <- getEnv + return $ + case lookupUFM env name of + Just (Label l) -> l + _other -> BlockId (newTagUnique (getUnique name) 'L') + -- Unknown names are treated as if they had been 'import'ed. -- This saves us a lot of bother in the RTS sources, at the expense of -- deferring some errors to link time. @@ -664,8 +684,8 @@ lookupName name = do env <- getEnv return $ case lookupUFM env name of - Nothing -> CmmLit (CmmLabel (mkRtsCodeLabelFS name)) - Just e -> e + Just (Var e) -> e + _other -> CmmLit (CmmLabel (mkRtsCodeLabelFS name)) -- Lifting FCode computations into the ExtFCode monad: code :: FCode a -> ExtFCode a @@ -684,11 +704,11 @@ forkLabelledCodeEC ec = do stmts <- getCgStmtsEC ec code (forkCgStmts stmts) -retInfo name size live_bits cl_type vector = do +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) vector + (fromIntegral cl_type) return (info_lbl, info1, info2) stdInfo name ptrs nptrs srt_bitmap cl_type desc_str ty_str = @@ -739,6 +759,19 @@ foreignCall "C" results_code expr_code args_code vols foreignCall conv _ _ _ _ = fail ("unknown calling convention: " ++ conv) +primCall + :: [ExtFCode (CmmReg,MachHint)] + -> FastString + -> [ExtFCode (CmmExpr,MachHint)] + -> Maybe [GlobalReg] -> P ExtCode +primCall results_code name args_code vols + = 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) + doStore :: MachRep -> ExtFCode CmmExpr -> ExtFCode CmmExpr -> ExtCode doStore rep addr_code val_code = do addr <- addr_code @@ -865,13 +898,13 @@ doSwitch mb_range scrut arms deflt initEnv :: Env initEnv = listToUFM [ ( FSLIT("SIZEOF_StgHeader"), - CmmLit (CmmInt (fromIntegral (fixedHdrSize * wORD_SIZE)) wordRep) ), + Var (CmmLit (CmmInt (fromIntegral (fixedHdrSize * wORD_SIZE)) wordRep) )), ( FSLIT("SIZEOF_StgInfoTable"), - CmmLit (CmmInt (fromIntegral stdInfoTableSizeB) wordRep) ) + Var (CmmLit (CmmInt (fromIntegral stdInfoTableSizeB) wordRep) )) ] -parseCmmFile :: DynFlags -> HomeModules -> FilePath -> IO (Maybe Cmm) -parseCmmFile dflags hmods filename = do +parseCmmFile :: DynFlags -> FilePath -> IO (Maybe Cmm) +parseCmmFile dflags filename = do showPass dflags "ParseCmm" buf <- hGetStringBuffer filename let @@ -881,9 +914,12 @@ parseCmmFile dflags hmods filename = do -- in there we don't want. case unP cmmParse init_state of PFailed span err -> do printError span err; return Nothing - POk _ code -> do - cmm <- initC dflags hmods no_module (getCmm (unEC code initEnv [] >> return ())) - dumpIfSet_dyn dflags Opt_D_dump_cmm "Cmm" (pprCmms [cmm]) + POk pst code -> do + cmm <- initC dflags no_module (getCmm (unEC code initEnv [] >> return ())) + let ms = getMessages pst + printErrorsAndWarnings dflags ms + when (errorsFound dflags ms) $ exitWith (ExitFailure 1) + dumpIfSet_dyn dflags Opt_D_dump_cmm "Cmm" (pprCmms [cmm]) return (Just cmm) where no_module = panic "parseCmmFile: no module"