X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=9d83e2f1a8a2cc652945a4b1ee8aa6ad2d293cf2;hb=66579ff945831c5fc9a17c58c722ff01f2268d76;hp=191705559d3deaa4834425e7ed30649b63874bee;hpb=fd8d04119e849f9c713d3e697228846d93c5ca69;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index 1917055..9d83e2f 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -30,6 +30,7 @@ import CgCallConv import CgClosure import CostCentre +import BlockId import Cmm import PprCmm import CmmUtils @@ -52,8 +53,10 @@ import FastString import Panic import Constants import Outputable +import Bag ( emptyBag, unitBag ) import Control.Monad +import Data.Array import Data.Char ( ord ) import System.Exit @@ -199,7 +202,9 @@ static :: { ExtFCode [CmmStatic] } | 'CLOSURE' '(' NAME lits ')' { do lits <- sequence $4; return $ map CmmStaticLit $ - mkStaticClosure (mkRtsInfoLabelFS $3) + mkStaticClosure (mkForeignLabel $3 Nothing True) + -- mkForeignLabel because these are only used + -- for CHARLIKE and INTLIKE closures in the RTS. dontCareCCS (map getLit lits) [] [] [] } -- arrays of closures required for the CHARLIKE & INTLIKE arrays @@ -469,10 +474,10 @@ cmm_kind_exprs :: { [ExtFCode CmmActual] } | cmm_kind_expr ',' cmm_kind_exprs { $1 : $3 } cmm_kind_expr :: { ExtFCode CmmActual } - : expr { do e <- $1; return (e, inferCmmKind e) } + : expr { do e <- $1; return (CmmKinded e (inferCmmKind e)) } | expr STRING {% do h <- parseCmmKind $2; return $ do - e <- $1; return (e,h) } + e <- $1; return (CmmKinded e h) } exprs0 :: { [ExtFCode CmmExpr] } : {- empty -} { [] } @@ -496,10 +501,10 @@ cmm_formals :: { [ExtFCode CmmFormal] } | cmm_formal ',' cmm_formals { $1 : $3 } cmm_formal :: { ExtFCode CmmFormal } - : local_lreg { do e <- $1; return (e, inferCmmKind (CmmReg (CmmLocal e))) } + : local_lreg { do e <- $1; return (CmmKinded e (inferCmmKind (CmmReg (CmmLocal e)))) } | STRING local_lreg {% do h <- parseCmmKind $1; return $ do - e <- $2; return (e,h) } + e <- $2; return (CmmKinded e h) } local_lreg :: { ExtFCode LocalReg } : NAME { do e <- lookupName $1; @@ -599,16 +604,16 @@ exprOp name args_code = exprMacros :: UniqFM ([CmmExpr] -> CmmExpr) exprMacros = listToUFM [ - ( FSLIT("ENTRY_CODE"), \ [x] -> entryCode x ), - ( FSLIT("INFO_PTR"), \ [x] -> closureInfoPtr x ), - ( FSLIT("STD_INFO"), \ [x] -> infoTable x ), - ( FSLIT("FUN_INFO"), \ [x] -> funInfoTable x ), - ( FSLIT("GET_ENTRY"), \ [x] -> entryCode (closureInfoPtr x) ), - ( FSLIT("GET_STD_INFO"), \ [x] -> infoTable (closureInfoPtr x) ), - ( 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 "ENTRY_CODE", \ [x] -> entryCode x ), + ( fsLit "INFO_PTR", \ [x] -> closureInfoPtr x ), + ( fsLit "STD_INFO", \ [x] -> infoTable x ), + ( fsLit "FUN_INFO", \ [x] -> funInfoTable x ), + ( fsLit "GET_ENTRY", \ [x] -> entryCode (closureInfoPtr x) ), + ( fsLit "GET_STD_INFO", \ [x] -> infoTable (closureInfoPtr x) ), + ( 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 ) ] -- we understand a subset of C-- primitives: @@ -725,43 +730,45 @@ stmtMacro fun args_code = do stmtMacros :: UniqFM ([CmmExpr] -> Code) stmtMacros = listToUFM [ - ( FSLIT("CCS_ALLOC"), \[words,ccs] -> profAlloc words ccs ), - ( FSLIT("CLOSE_NURSERY"), \[] -> emitCloseNursery ), - ( FSLIT("ENTER_CCS_PAP_CL"), \[e] -> enterCostCentrePAP e ), - ( FSLIT("ENTER_CCS_THUNK"), \[e] -> enterCostCentreThunk e ), - ( FSLIT("HP_CHK_GEN"), \[words,liveness,reentry] -> + ( fsLit "CCS_ALLOC", \[words,ccs] -> profAlloc words ccs ), + ( fsLit "CLOSE_NURSERY", \[] -> emitCloseNursery ), + ( fsLit "ENTER_CCS_PAP_CL", \[e] -> enterCostCentrePAP e ), + ( fsLit "ENTER_CCS_THUNK", \[e] -> enterCostCentreThunk e ), + ( fsLit "HP_CHK_GEN", \[words,liveness,reentry] -> hpChkGen words liveness reentry ), - ( FSLIT("HP_CHK_NP_ASSIGN_SP0"), \[e,f] -> hpChkNodePointsAssignSp0 e f ), - ( FSLIT("LOAD_THREAD_STATE"), \[] -> emitLoadThreadState ), - ( FSLIT("LDV_ENTER"), \[e] -> ldvEnter e ), - ( FSLIT("LDV_RECORD_CREATE"), \[e] -> ldvRecordCreate e ), - ( FSLIT("OPEN_NURSERY"), \[] -> emitOpenNursery ), - ( FSLIT("PUSH_UPD_FRAME"), \[sp,e] -> emitPushUpdateFrame sp e ), - ( FSLIT("SAVE_THREAD_STATE"), \[] -> emitSaveThreadState ), - ( FSLIT("SET_HDR"), \[ptr,info,ccs] -> + ( fsLit "HP_CHK_NP_ASSIGN_SP0", \[e,f] -> hpChkNodePointsAssignSp0 e f ), + ( fsLit "LOAD_THREAD_STATE", \[] -> emitLoadThreadState ), + ( fsLit "LDV_ENTER", \[e] -> ldvEnter e ), + ( fsLit "LDV_RECORD_CREATE", \[e] -> ldvRecordCreate e ), + ( fsLit "OPEN_NURSERY", \[] -> emitOpenNursery ), + ( fsLit "PUSH_UPD_FRAME", \[sp,e] -> emitPushUpdateFrame sp e ), + ( fsLit "SAVE_THREAD_STATE", \[] -> emitSaveThreadState ), + ( fsLit "SET_HDR", \[ptr,info,ccs] -> emitSetDynHdr ptr info ccs ), - ( FSLIT("STK_CHK_GEN"), \[words,liveness,reentry] -> + ( fsLit "STK_CHK_GEN", \[words,liveness,reentry] -> stkChkGen words liveness reentry ), - ( FSLIT("STK_CHK_NP"), \[e] -> stkChkNodePoints e ), - ( FSLIT("TICK_ALLOC_PRIM"), \[hdr,goods,slop] -> + ( fsLit "STK_CHK_NP", \[e] -> stkChkNodePoints e ), + ( fsLit "TICK_ALLOC_PRIM", \[hdr,goods,slop] -> tickyAllocPrim hdr goods slop ), - ( FSLIT("TICK_ALLOC_PAP"), \[goods,slop] -> + ( fsLit "TICK_ALLOC_PAP", \[goods,slop] -> tickyAllocPAP goods slop ), - ( FSLIT("TICK_ALLOC_UP_THK"), \[goods,slop] -> + ( fsLit "TICK_ALLOC_UP_THK", \[goods,slop] -> tickyAllocThunk goods slop ), - ( FSLIT("UPD_BH_UPDATABLE"), \[] -> emitBlackHoleCode False ), - ( FSLIT("UPD_BH_SINGLE_ENTRY"), \[] -> emitBlackHoleCode True ), - - ( FSLIT("RET_P"), \[a] -> emitRetUT [(PtrArg,a)]), - ( FSLIT("RET_N"), \[a] -> emitRetUT [(NonPtrArg,a)]), - ( FSLIT("RET_PP"), \[a,b] -> emitRetUT [(PtrArg,a),(PtrArg,b)]), - ( FSLIT("RET_NN"), \[a,b] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b)]), - ( FSLIT("RET_NP"), \[a,b] -> emitRetUT [(NonPtrArg,a),(PtrArg,b)]), - ( FSLIT("RET_PPP"), \[a,b,c] -> emitRetUT [(PtrArg,a),(PtrArg,b),(PtrArg,c)]), - ( FSLIT("RET_NPP"), \[a,b,c] -> emitRetUT [(NonPtrArg,a),(PtrArg,b),(PtrArg,c)]), - ( FSLIT("RET_NNP"), \[a,b,c] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b),(PtrArg,c)]), - ( FSLIT("RET_NNNP"), \[a,b,c,d] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b),(NonPtrArg,c),(PtrArg,d)]), - ( FSLIT("RET_NPNP"), \[a,b,c,d] -> emitRetUT [(NonPtrArg,a),(PtrArg,b),(NonPtrArg,c),(PtrArg,d)]) + ( fsLit "UPD_BH_UPDATABLE", \[] -> emitBlackHoleCode False ), + ( fsLit "UPD_BH_SINGLE_ENTRY", \[] -> emitBlackHoleCode True ), + + ( fsLit "RET_P", \[a] -> emitRetUT [(PtrArg,a)]), + ( fsLit "RET_N", \[a] -> emitRetUT [(NonPtrArg,a)]), + ( fsLit "RET_PP", \[a,b] -> emitRetUT [(PtrArg,a),(PtrArg,b)]), + ( fsLit "RET_NN", \[a,b] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b)]), + ( fsLit "RET_NP", \[a,b] -> emitRetUT [(NonPtrArg,a),(PtrArg,b)]), + ( fsLit "RET_PPP", \[a,b,c] -> emitRetUT [(PtrArg,a),(PtrArg,b),(PtrArg,c)]), + ( fsLit "RET_NPP", \[a,b,c] -> emitRetUT [(NonPtrArg,a),(PtrArg,b),(PtrArg,c)]), + ( fsLit "RET_NNP", \[a,b,c] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b),(PtrArg,c)]), + ( fsLit "RET_NNN", \[a,b,c] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b),(NonPtrArg,c)]), + ( fsLit "RET_NNNN", \[a,b,c,d] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b),(NonPtrArg,c),(NonPtrArg,d)]), + ( fsLit "RET_NNNP", \[a,b,c,d] -> emitRetUT [(NonPtrArg,a),(NonPtrArg,b),(NonPtrArg,c),(PtrArg,d)]), + ( fsLit "RET_NPNP", \[a,b,c,d] -> emitRetUT [(NonPtrArg,a),(PtrArg,b),(NonPtrArg,c),(PtrArg,d)]) ] @@ -909,15 +916,29 @@ foreignCall conv_string results_code expr_code args_code vols safety ret case convention of -- Temporary hack so at least some functions are CmmSafe CmmCallConv -> code (stmtC (CmmCall (CmmCallee expr convention) results args safety ret)) - _ -> case safety of + _ -> + let expr' = adjCallTarget convention expr args in + case safety of CmmUnsafe -> code (emitForeignCall' PlayRisky results - (CmmCallee expr convention) args vols NoC_SRT ret) + (CmmCallee expr' convention) args vols NoC_SRT ret) CmmSafe srt -> code (emitForeignCall' (PlaySafe unused) results - (CmmCallee expr convention) args vols NoC_SRT ret) where + (CmmCallee expr' convention) args vols NoC_SRT ret) where unused = panic "not used by emitForeignCall'" +adjCallTarget :: CCallConv -> CmmExpr -> [CmmKinded CmmExpr] -> CmmExpr +#ifdef mingw32_TARGET_OS +-- On Windows, we have to add the '@N' suffix to the label when making +-- a call with the stdcall calling convention. +adjCallTarget StdCallConv (CmmLit (CmmLabel lbl)) args + = CmmLit (CmmLabel (addLabelSize lbl (sum (map size args)))) + where size (CmmKinded e _) = max wORD_SIZE (machRepByteWidth (cmmExprRep e)) + -- c.f. CgForeignCall.emitForeignCall +#endif +adjCallTarget _ expr _ + = expr + primCall :: [ExtFCode CmmFormal] -> FastString @@ -1066,13 +1087,13 @@ doSwitch mb_range scrut arms deflt -- knows about here. initEnv :: Env initEnv = listToUFM [ - ( FSLIT("SIZEOF_StgHeader"), + ( fsLit "SIZEOF_StgHeader", Var (CmmLit (CmmInt (fromIntegral (fixedHdrSize * wORD_SIZE)) wordRep) )), - ( FSLIT("SIZEOF_StgInfoTable"), + ( fsLit "SIZEOF_StgInfoTable", Var (CmmLit (CmmInt (fromIntegral stdInfoTableSizeB) wordRep) )) ] -parseCmmFile :: DynFlags -> FilePath -> IO (Maybe Cmm) +parseCmmFile :: DynFlags -> FilePath -> IO (Messages, Maybe Cmm) parseCmmFile dflags filename = do showPass dflags "ParseCmm" buf <- hGetStringBuffer filename @@ -1082,14 +1103,17 @@ parseCmmFile dflags filename = do -- reset the lex_state: the Lexer monad leaves some stuff -- in there we don't want. case unP cmmParse init_state of - PFailed span err -> do printError span err; return Nothing + PFailed span err -> do + let msg = mkPlainErrMsg span err + return ((emptyBag, unitBag msg), Nothing) 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" (ppr cmm) - return (Just cmm) + cmm <- initC dflags no_module (getCmm (unEC code initEnv [] >> return ())) + let ms = getMessages pst + if (errorsFound dflags ms) + then return (ms, Nothing) + else do + dumpIfSet_dyn dflags Opt_D_dump_cmm "Cmm" (ppr cmm) + return (ms, Just cmm) where no_module = panic "parseCmmFile: no module" }