X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=339bb5cdc3264655ff7fd9601fc6a7bee01a9c2b;hb=e8964a486b2d0915617116eedf8b34670d443fbf;hp=f8f43d47cba28b7db2e11ce1cba6b290391beadc;hpb=10cbc75d37064b3ef76ca3ccd219d66e445ecb0f;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index f8f43d4..339bb5c 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -1,27 +1,34 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1993-2000 % + \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} module HscMain ( HscResult(..), hscMain, #ifdef GHCI - hscStmt, + hscStmt, hscThing, #endif initPersistentCompilerState ) where #include "HsVersions.h" #ifdef GHCI -import RdrHsSyn ( RdrNameStmt ) -import Rename ( renameStmt ) import ByteCodeGen ( byteCodeGen ) +import CoreTidy ( tidyCoreExpr ) +import CorePrep ( corePrepExpr ) +import SrcLoc ( noSrcLoc ) +import Rename ( renameStmt ) +import RdrName ( mkUnqual ) +import RdrHsSyn ( RdrNameStmt ) +import OccName ( dataName ) +import Type ( Type ) import Id ( Id, idName, setGlobalIdDetails ) import IdInfo ( GlobalIdDetails(VanillaGlobal) ) -import HscTypes ( InteractiveContext(..), TyThing(..) ) -import PrelNames ( iINTERACTIVE ) -import CoreTidy ( tidyCoreExpr ) +import HscTypes ( InteractiveContext(..) ) +import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) +import FastString ( mkFastString ) #endif import HsSyn @@ -32,11 +39,12 @@ import StringBuffer ( hGetStringBuffer, freeStringBuffer ) import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) +import Finder ( findModule ) import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) -import PrelNames ( vanillaSyntaxMap, knownKeyNames ) -import MkIface ( completeIface, writeIface, pprIface ) +import PrelNames ( knownKeyNames ) +import MkIface ( mkFinalIface ) import TcModule import InstEnv ( emptyInstEnv ) import Desugar @@ -60,21 +68,21 @@ import UniqSupply ( mkSplitUniqSupply ) import Bag ( emptyBag ) import Outputable import Interpreter -import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) import HscTypes import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) import OccName ( OccName ) import Name ( Name, nameModule, nameOccName, getName, isGlobalName ) import NameEnv ( emptyNameEnv, mkNameEnv ) -import Module ( Module, lookupModuleEnvByName ) -import Maybes ( orElse ) +import Module ( Module ) import IOExts ( newIORef, readIORef, writeIORef, unsafePerformIO ) import Monad ( when ) -import Maybe ( isJust ) +import Maybe ( isJust, fromJust ) import IO + +import MkExternalCore ( emitExternalCore ) \end{code} @@ -96,10 +104,13 @@ data HscResult | HscRecomp PersistentCompilerState -- updated PCS ModDetails -- new details (HomeSymbolTable additions) ModIface -- new iface (if any compilation was done) - (Maybe String) -- generated stub_h filename (in TMPDIR) - (Maybe String) -- generated stub_c filename (in TMPDIR) + Bool -- stub_h exists + Bool -- stub_c exists +#ifdef GHCI (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any - +#else + (Maybe ()) -- no interpreted code whatsoever +#endif -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves @@ -109,22 +120,24 @@ hscMain -> DynFlags -> Module -> ModuleLocation -- location info - -> Bool -- source unchanged? + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have an object file (for msgs only) -> Maybe ModIface -- old interface, if available -> HomeSymbolTable -- for home module ModDetails -> HomeIfaceTable -> PersistentCompilerState -- IN: persistent compiler state -> IO HscResult -hscMain ghci_mode dflags mod location source_unchanged maybe_old_iface hst hit pcs +hscMain ghci_mode dflags mod location source_unchanged have_object + maybe_old_iface hst hit pcs = do { showPass dflags ("Checking old interface for hs = " ++ show (ml_hs_file location) ++ ", hspp = " ++ show (ml_hspp_file location)); (pcs_ch, errs_found, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface ghci_mode dflags hit hst pcs - (unJust "hscMain" (ml_hi_file location)) + <- _scc_ "checkOldIface" + checkOldIface ghci_mode dflags hit hst pcs (ml_hi_file location) source_unchanged maybe_old_iface; if errs_found then @@ -135,13 +148,14 @@ hscMain ghci_mode dflags mod location source_unchanged maybe_old_iface hst hit p what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp ; - what_next ghci_mode dflags mod location maybe_checked_iface - hst hit pcs_ch + what_next ghci_mode dflags have_object mod location + maybe_checked_iface hst hit pcs_ch }} -- we definitely expect to have the old interface available -hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch +hscNoRecomp ghci_mode dflags have_object + mod location (Just old_iface) hst hit pcs_ch | ghci_mode == OneShot = do { hPutStrLn stderr "compilation IS NOT required"; @@ -151,7 +165,8 @@ hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch | otherwise = do { when (verbosity dflags >= 1) $ - hPutStrLn stderr ("Skipping " ++ compMsg mod location); + hPutStrLn stderr ("Skipping " ++ + compMsg have_object mod location); -- CLOSURE (pcs_cl, closure_errs, cl_hs_decls) @@ -162,7 +177,7 @@ hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch -- TYPECHECK maybe_tc_result - <- typecheckIface dflags pcs_cl hst old_iface (vanillaSyntaxMap, cl_hs_decls); + <- typecheckIface dflags pcs_cl hst old_iface cl_hs_decls; case maybe_tc_result of { Nothing -> return (HscFail pcs_cl); @@ -171,20 +186,26 @@ hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch return (HscNoRecomp pcs_tc new_details old_iface) }}} -compMsg mod location = - mod_str ++ take (12 - length mod_str) (repeat ' ') - ++ " (" ++ unJust "hscRecomp" (ml_hs_file location) ++ ")" +compMsg use_object mod location = + mod_str ++ take (max 0 (16 - length mod_str)) (repeat ' ') + ++" ( " ++ unJust "hscRecomp" (ml_hs_file location) ++ ", " + ++ (if use_object + then unJust "hscRecomp" (ml_obj_file location) + else "interpreted") + ++ " )" where mod_str = moduleUserString mod -hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch +hscRecomp ghci_mode dflags have_object + mod location maybe_checked_iface hst hit pcs_ch = do { - ; when (verbosity dflags >= 1) $ - hPutStrLn stderr ("Compiling " ++ compMsg mod location); - -- what target are we shooting for? ; let toInterp = dopt_HscLang dflags == HscInterpreted + ; when (verbosity dflags >= 1) $ + hPutStrLn stderr ("Compiling " ++ + compMsg (not toInterp) mod location); + ------------------- -- PARSE ------------------- @@ -231,12 +252,26 @@ hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch <- _scc_ "DeSugar" deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + ; pcs_middle + <- if ghci_mode == OneShot + then do init_pcs <- initPersistentCompilerState + init_prs <- initPersistentRenamerState + let + rules = pcs_rules pcs_tc + orig_tc = prsOrig (pcs_PRS pcs_tc) + new_prs = init_prs{ prsOrig=orig_tc } + + orig_tc `seq` rules `seq` new_prs `seq` + return init_pcs{ pcs_PRS = new_prs, + pcs_rules = rules } + else return pcs_tc + ------------------- -- SIMPLIFY ------------------- ; simpl_details <- _scc_ "Core2Core" - core2core dflags pcs_tc hst dont_discard ds_details + core2core dflags pcs_middle hst dont_discard ds_details ------------------- -- TIDY @@ -253,13 +288,22 @@ hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch -- Meanwhile, tidyCorePgm is careful not to look at cg_info! ; (pcs_simpl, tidy_details) - <- tidyCorePgm dflags this_mod pcs_tc cg_info simpl_details + <- _scc_ "CoreTidy" + tidyCorePgm dflags this_mod pcs_middle cg_info simpl_details + ; pcs_final <- if ghci_mode == OneShot then initPersistentCompilerState + else return pcs_simpl + + -- alive at this point: + -- tidy_details + -- new_iface + + ; emitExternalCore dflags new_iface tidy_details ------------------- -- PREPARE FOR CODE GENERATION ------------------- -- Do saturation and convert to A-normal form - ; prepd_details <- corePrepPgm dflags tidy_details + ; prepd_details <- _scc_ "CorePrep" corePrepPgm dflags tidy_details ------------------- -- CONVERT TO STG and COMPLETE CODE GENERATION @@ -271,23 +315,17 @@ hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch local_classes = typeEnvClasses env_tc imported_module_names = map ideclName (hsModuleImports rdr_module) - imported_modules = map mod_name_to_Module imported_module_names + + mod_name_to_Module nm + = do m <- findModule nm ; return (fst (fromJust m)) (h_code,c_code,fe_binders) = foreign_stuff - - pit = pcs_PIT pcs_simpl - mod_name_to_Module :: ModuleName -> Module - mod_name_to_Module nm - = let str_mi = lookupModuleEnvByName hit nm `orElse` - lookupModuleEnvByName pit nm `orElse` - pprPanic "mod_name_to_Module: no hst or pst mapping for" - (ppr nm) - in mi_module str_mi - - ; (maybe_stub_h_filename, maybe_stub_c_filename, - maybe_bcos, final_iface ) + ; imported_modules <- mapM mod_name_to_Module imported_module_names + + ; (stub_h_exists, stub_c_exists, maybe_bcos, final_iface ) <- if toInterp +#ifdef GHCI then do ----------------- Generate byte code ------------------ (bcos,itbl_env) <- byteCodeGen dflags binds @@ -301,8 +339,10 @@ hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch mkFinalIface ghci_mode dflags location maybe_checked_iface new_iface tidy_details - return ( Nothing, Nothing, - Just (bcos,itbl_env), final_iface ) + return ( False, False, Just (bcos,itbl_env), final_iface ) +#else + then error "GHC not compiled with interpreter" +#endif else do ----------------- Convert to STG ------------------ @@ -325,51 +365,24 @@ hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch local_tycons stg_binds ------------------ Code output ----------------------- - (maybe_stub_h_name, maybe_stub_c_name) + (stub_h_exists, stub_c_exists) <- codeOutput dflags this_mod local_tycons binds stg_binds c_code h_code abstractC - return ( maybe_stub_h_name, maybe_stub_c_name, - Nothing, final_iface ) + return (stub_h_exists, stub_c_exists, Nothing, final_iface) ; let final_details = tidy_details {md_binds = []} -- and the answer is ... - ; return (HscRecomp pcs_simpl + ; return (HscRecomp pcs_final final_details final_iface - maybe_stub_h_filename maybe_stub_c_filename + stub_h_exists stub_c_exists maybe_bcos) }}}}}}} - - -mkFinalIface ghci_mode dflags location - maybe_old_iface new_iface new_details - = case completeIface maybe_old_iface new_iface new_details of - - (new_iface, Nothing) -- no change in the interfacfe - -> do when (dopt Opt_D_dump_hi_diffs dflags) - (printDump (text "INTERFACE UNCHANGED")) - dumpIfSet_dyn dflags Opt_D_dump_hi - "UNCHANGED FINAL INTERFACE" (pprIface new_iface) - return new_iface - - (new_iface, Just sdoc_diffs) - -> do dumpIfSet_dyn dflags Opt_D_dump_hi_diffs "INTERFACE HAS CHANGED" - sdoc_diffs - dumpIfSet_dyn dflags Opt_D_dump_hi "NEW FINAL INTERFACE" - (pprIface new_iface) - - -- Write the interface file, if not in interactive mode - when (ghci_mode /= Interactive) - (writeIface (unJust "hscRecomp:hi" (ml_hi_file location)) - new_iface) - return new_iface - - myParseModule dflags src_filename = do -------------------------- Parser ---------------- showPass dflags "Parser" @@ -424,6 +437,8 @@ myCoreToStg dflags this_mod tidy_binds where stgBindPairs (StgNonRec _ b r) = [(b,r)] stgBindPairs (StgRec _ prs) = prs + + \end{code} @@ -488,8 +503,8 @@ hscStmt dflags hst hit pcs0 icontext stmt just_expr Nothing -> return (pcs0, Nothing) Just parsed_stmt -> do { - let { notExprStmt (ExprStmt _ _) = False; - notExprStmt _ = True + let { notExprStmt (ExprStmt _ _ _) = False; + notExprStmt _ = True }; if (just_expr && notExprStmt parsed_stmt) @@ -509,9 +524,9 @@ hscStmt dflags hst hit pcs0 icontext stmt just_expr -- Typecheck it maybe_tc_return <- if just_expr - then case rn_stmt of { (syn, ExprStmt e _, decls) -> + then case rn_stmt of { (ExprStmt e _ _, decls) -> typecheckExpr dflags pcs1 hst type_env - print_unqual iNTERACTIVE (syn,e,decls) } + print_unqual iNTERACTIVE (e,decls) } else typecheckStmt dflags pcs1 hst type_env print_unqual iNTERACTIVE bound_names rn_stmt @@ -528,11 +543,11 @@ hscStmt dflags hst hit pcs0 icontext stmt just_expr -- Tidy it (temporary, until coreSat does cloning) ; tidy_expr <- tidyCoreExpr simpl_expr - -- Saturate it - ; sat_expr <- coreSatExpr dflags tidy_expr + -- Prepare for codegen + ; prepd_expr <- corePrepExpr dflags tidy_expr -- Convert to BCOs - ; bcos <- coreExprToBCOs dflags sat_expr + ; bcos <- coreExprToBCOs dflags prepd_expr ; let -- Make all the bound ids "global" ids, now that @@ -547,6 +562,31 @@ hscStmt dflags hst hit pcs0 icontext stmt just_expr }}}}} +hscThing -- like hscStmt, but deals with a single identifier + :: DynFlags + -> HomeSymbolTable + -> HomeIfaceTable + -> PersistentCompilerState -- IN: persistent compiler state + -> InteractiveContext -- Context for compiling + -> String -- The identifier + -> IO ( PersistentCompilerState, + Maybe TyThing ) +hscThing dflags hst hit pcs0 icontext id + = let + InteractiveContext { + ic_rn_env = rn_env, + ic_type_env = type_env, + ic_module = scope_mod } = icontext + fname = mkFastString id + rn = mkUnqual dataName fname -- need to guess correct namespace + stmt = ResultStmt (HsVar rn) noSrcLoc + in + do { (pcs, err, maybe_stmt) <- renameStmt dflags hit hst pcs0 scope_mod scope_mod rn_env stmt + ; case maybe_stmt of + Nothing -> return (pcs, Nothing) + Just (n:ns, _) -> return (pcs, lookupType hst type_env n) + } + hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) hscParseStmt dflags str = do -------------------------- Parser ---------------- @@ -619,14 +659,4 @@ initOrigNames grab names = foldl add emptyFM names add env name = addToFM env (moduleName (nameModule name), nameOccName name) name - - -initRules :: PackageRuleBase -initRules = emptyRuleBase -{- SHOULD BE (ish) - foldl add emptyVarEnv builtinRules - where - add env (name,rule) - = extendRuleBase env name rule --} \end{code}