X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=03ab8a596ec8d96b03377258f6f734c2a5afdedd;hb=d254a44b8392ff0a4327f1916ef921887ce78769;hp=fb1556c49926efeca7ba20add36bcb79954ffcdc;hpb=d6afbe3ebd127ece764bc943c015e74290318b6a;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index fb1556c..03ab8a5 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,11 +1,11 @@ {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.91 2001/11/03 01:30:42 sof Exp $ +-- $Id: Main.hs,v 1.104 2002/04/05 23:24:29 sof Exp $ -- -- GHC Driver program -- --- (c) Simon Marlow 2000 +-- (c) The University of Glasgow 2002 -- ----------------------------------------------------------------------------- @@ -23,35 +23,34 @@ import InteractiveUI(ghciWelcomeMsg, interactiveUI) import Finder ( initFinder ) -import CompManager ( cmInit, cmLoadModule ) +import CompManager ( cmInit, cmLoadModules, cmDepAnal ) import HscTypes ( GhciMode(..) ) import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion ) import SysTools ( getPackageConfigPath, initSysTools, cleanTempFiles ) import Packages ( showPackages ) -import DriverPipeline ( GhcMode(..), doLink, doMkDLL, genPipeline, - getGhcMode, pipeLoop, v_GhcMode - ) -import DriverState ( buildCoreToDo, buildStgToDo, defaultHscLang, +import DriverPipeline ( doLink, doMkDLL, genPipeline, pipeLoop ) +import DriverState ( buildCoreToDo, buildStgToDo, findBuildTag, getPackageInfo, unregFlags, + v_GhcMode, v_GhcModeFlag, GhcMode(..), v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs, v_OptLevel, v_Output_file, v_Output_hi, v_Package_details, v_Ways, getPackageExtraGhcOpts, - readPackageConf + readPackageConf, verifyOutputFiles ) -import DriverFlags ( dynFlag, buildStaticHscOpts, dynamic_flags, - processArgs, static_flags) +import DriverFlags ( buildStaticHscOpts, + dynamic_flags, processArgs, static_flags) import DriverMkDepend ( beginMkDependHS, endMkDependHS ) -import DriverPhases ( Phase(HsPp, Hsc, HCc), haskellish_src_file, objish_file ) +import DriverPhases ( Phase(HsPp, Hsc), haskellish_src_file, objish_file ) import DriverUtil ( add, handle, handleDyn, later, splitFilename, - unknownFlagErr, getFileSuffix ) -import CmdLineOpts ( dynFlag, defaultDynFlags, restoreDynFlags, - saveDynFlags, setDynFlags, - DynFlags(..), HscLang(..), v_Static_hsc_opts + unknownFlagsErr, getFileSuffix ) +import CmdLineOpts ( dynFlag, restoreDynFlags, + saveDynFlags, setDynFlags, getDynFlags, dynFlag, + DynFlags(..), HscLang(..), v_Static_hsc_opts, + defaultHscLang ) - import Outputable import Util import Panic ( GhcException(..), panic ) @@ -60,32 +59,26 @@ import Panic ( GhcException(..), panic ) import IO import Directory ( doesFileExist ) import IOExts ( readIORef, writeIORef ) -import Exception ( throwDyn, Exception(..) ) +import Exception ( throwDyn, Exception(..), + AsyncException(StackOverflow) ) import System ( getArgs, exitWith, ExitCode(..) ) import Monad import List import Maybe -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS import Concurrent ( myThreadId ) -#if __GLASGOW_HASKELL__ < 500 +# if __GLASGOW_HASKELL__ < 500 import Exception ( raiseInThread ) #define throwTo raiseInThread -#else +# else import Exception ( throwTo ) -#endif +# endif import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) import Dynamic ( toDyn ) #endif - ------------------------------------------------------------------------------ --- Changes: - --- * -fglasgow-exts NO LONGER IMPLIES -package lang!!! (-fglasgow-exts is a --- dynamic flag whereas -package is a static flag.) - ----------------------------------------------------------------------------- -- ToDo: @@ -104,7 +97,6 @@ import Dynamic ( toDyn ) -- No more "Enter your Haskell program, end with ^D (on a line of its own):" -- consistency checking removed (may do this properly later) --- removed -noC -- no -Ofile ----------------------------------------------------------------------------- @@ -117,7 +109,10 @@ main = case exception of -- an IO exception probably isn't our fault, so don't panic IOException _ -> hPutStr stderr (show exception) - _other -> hPutStr stderr (show (Panic (show exception))) + AsyncException StackOverflow -> + hPutStrLn stderr "stack overflow: use +RTS -K \ + \to increase it" + _other -> hPutStr stderr (show (Panic (show exception))) exitWith (ExitFailure 1) ) $ do @@ -125,7 +120,7 @@ main = handleDyn (\dyn -> do hFlush stdout case dyn of - PhaseFailed _phase code -> exitWith code + PhaseFailed _ code -> exitWith code Interrupted -> exitWith (ExitFailure 1) _ -> do hPutStrLn stderr (show (dyn :: GhcException)) exitWith (ExitFailure 1) @@ -142,7 +137,7 @@ main = -- signals. -- install signal handlers -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS main_thread <- myThreadId let sig_handler = Catch (throwTo main_thread (DynException (toDyn Interrupted))) @@ -158,12 +153,10 @@ main = conf_file <- getPackageConfigPath readPackageConf conf_file - -- find the phase to stop after (i.e. -E, -C, -c, -S flags) - (flags2, mode, stop_flag) <- getGhcMode argv' - writeIORef v_GhcMode mode - -- process all the other arguments, and get the source files - non_static <- processArgs static_flags flags2 [] + non_static <- processArgs static_flags argv' [] + mode <- readIORef v_GhcMode + stop_flag <- readIORef v_GhcModeFlag -- -O and --interactive are not a good combination -- ditto with any kind of way selection @@ -172,7 +165,7 @@ main = do putStr "warning: -O conflicts with --interactive; -O turned off.\n" writeIORef v_OptLevel 0 orig_ways <- readIORef v_Ways - when (not (null orig_ways) && mode == DoInteractive) $ + when (notNull orig_ways && mode == DoInteractive) $ do throwDyn (UsageError "--interactive can't be used with -prof, -ticky, -unreg or -smp.") @@ -199,23 +192,18 @@ main = -- set the "global" HscLang. The HscLang can be further adjusted on a module -- by module basis, using only the -fvia-C and -fasm flags. If the global -- HscLang is not HscC or HscAsm, -fvia-C and -fasm have no effect. - opt_level <- readIORef v_OptLevel - - + dyn_flags <- getDynFlags let lang = case mode of - StopBefore HCc -> HscC DoInteractive -> HscInterpreted - _other | opt_level >= 1 -> HscC -- -O implies -fvia-C - | otherwise -> defaultHscLang - - setDynFlags (defaultDynFlags{ coreToDo = core_todo, - stgToDo = stg_todo, - hscLang = lang, - -- leave out hscOutName for now - hscOutName = panic "Main.main:hscOutName not set", + _other -> hscLang dyn_flags - verbosity = 1 - }) + setDynFlags (dyn_flags{ coreToDo = core_todo, + stgToDo = stg_todo, + hscLang = lang, + -- leave out hscOutName for now + hscOutName = panic "Main.main:hscOutName not set", + verbosity = 1 + }) -- the rest of the arguments are "dynamic" srcs <- processArgs dynamic_flags (extra_non_static ++ non_static) [] @@ -223,9 +211,9 @@ main = -- save the "initial DynFlags" away saveDynFlags - -- complain about any unknown flags - mapM unknownFlagErr [ f | f@('-':_) <- srcs ] - + -- perform some checks of the options set / report unknowns. + checkOptions srcs + verb <- dynFlag verbosity -- Show the GHCi banner @@ -292,15 +280,19 @@ main = let not_hs_file = not (haskellish_src_file src) pp <- if not_hs_file || mode == StopBefore Hsc || mode == StopBefore HsPp then return src_and_suff else do +-- hPutStrLn stderr "before" >> hFlush stderr phases <- genPipeline (StopBefore Hsc) stop_flag False{-not persistent-} defaultHscLang src_and_suff +-- hPutStrLn stderr "after" >> hFlush stderr pipeLoop phases src_and_suff False{-no linking-} False{-no -o flag-} basename suffix -- rest of compilation hsc_lang <- dynFlag hscLang +-- hPutStrLn stderr ("before-1 " ++ show (pp,mode)) >> hFlush stderr phases <- genPipeline mode stop_flag True hsc_lang pp +-- hPutStrLn stderr "after" >> hFlush stderr (r,_) <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) True{-use -o flag-} basename suffix return r @@ -320,8 +312,10 @@ beginMake fileish_args case mods of [] -> throwDyn (UsageError "no input files") - mod -> do state <- cmInit Batch - (_, ok, _) <- cmLoadModule state mods + _ -> do dflags <- getDynFlags + state <- cmInit Batch + graph <- cmDepAnal state dflags mods + (_, ok, _) <- cmLoadModules state dflags graph when (not ok) (exitWith (ExitFailure 1)) return () @@ -339,3 +333,14 @@ beginInteractive fileish_args state <- cmInit Interactive interactiveUI state mods libs #endif + +checkOptions :: [String] -> IO () +checkOptions srcs = do + -- complain about any unknown flags + let unknown_opts = [ f | f@('-':_) <- srcs ] + when (notNull unknown_opts) (unknownFlagsErr unknown_opts) + -- verify that output files point somewhere sensible. + verifyOutputFiles + -- and anything else that it might be worth checking for + -- before kicking of a compilation (pipeline). +