X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=0e4910abee10980c00e4f39c725b5a5ee5cff0c8;hb=671dfe67aaea136f0adbcc45952b04cb913b2dc9;hp=57f7d3d9cfef31477f42dc9659680c95551c22d4;hpb=16d5d1c75c999677783c9c1bda519540fa9a6e58;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 57f7d3d..0e4910a 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,10 +1,11 @@ -{-# OPTIONS -fno-warn-incomplete-patterns #-} +{-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} + ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.70 2001/06/14 12:50:06 simonpj Exp $ +-- $Id: Main.hs,v 1.106 2002/05/01 17:56:57 sof Exp $ -- -- GHC Driver program -- --- (c) Simon Marlow 2000 +-- (c) The University of Glasgow 2002 -- ----------------------------------------------------------------------------- @@ -17,65 +18,66 @@ module Main (main) where #ifdef GHCI -import InteractiveUI(ghciWelcomeMsg, interactiveUI) +import InteractiveUI #endif import Finder ( initFinder ) -import CompManager ( cmInit, cmLoadModule ) -import CmStaticInfo ( GhciMode(..), PackageConfig(..) ) +import CompManager ( cmInit, cmLoadModules, cmDepAnal ) +import HscTypes ( GhciMode(..) ) import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion ) -import SysTools ( packageConfigPath, initSysTools, cleanTempFiles ) -import ParsePkgConf ( parsePkgConf ) - -import DriverPipeline ( GhcMode(..), doLink, doMkDLL, genPipeline, - getGhcMode, pipeLoop, v_GhcMode - ) -import DriverState ( buildCoreToDo, buildStgToDo, defaultHscLang, - findBuildTag, getPackageInfo, unregFlags, v_Cmdline_libraries, - v_Keep_tmp_files, v_Ld_inputs, v_OptLevel, v_Output_file, - v_Output_hi, v_Package_details, v_Ways +import SysTools ( getPackageConfigPath, initSysTools, cleanTempFiles ) +import Packages ( showPackages ) + +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, 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(Hsc, HCc), haskellish_src_file, objish_file ) - -import DriverUtil ( add, handle, handleDyn, later, splitFilename, unknownFlagErr, my_prefix_match ) -import CmdLineOpts ( dynFlag, - DynFlags(verbosity, stgToDo, hscOutName, hscLang, coreToDo), - HscLang(HscInterpreted, HscC), - defaultDynFlags, restoreDynFlags, saveDynFlags, setDynFlags, - v_Static_hsc_opts +import DriverPhases ( Phase(HsPp, Hsc), haskellish_src_file, objish_file ) + +import DriverUtil ( add, handle, handleDyn, later, splitFilename, + 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 ) -- Standard Haskell libraries import IO -import Concurrent ( myThreadId, throwTo ) import Directory ( doesFileExist ) import IOExts ( readIORef, writeIORef ) -import Exception ( throwTo, throwDyn, Exception(DynException) ) +import Exception ( throwDyn, Exception(..), + AsyncException(StackOverflow) ) import System ( getArgs, exitWith, ExitCode(..) ) - -#ifndef mingw32_TARGET_OS -import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) -import Dynamic ( toDyn ) -#endif - import Monad import List import Maybe +#ifndef mingw32_HOST_OS +import Concurrent ( myThreadId ) +# if __GLASGOW_HASKELL__ < 500 +import Exception ( raiseInThread ) +#define throwTo raiseInThread +# else +import Exception ( throwTo ) +# endif ------------------------------------------------------------------------------ --- Changes: - --- * -fglasgow-exts NO LONGER IMPLIES -package lang!!! (-fglasgow-exts is a --- dynamic flag whereas -package is a static flag.) +import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) +import Dynamic ( toDyn ) +#endif ----------------------------------------------------------------------------- -- ToDo: @@ -95,7 +97,6 @@ import Maybe -- 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 ----------------------------------------------------------------------------- @@ -103,16 +104,26 @@ import Maybe main = -- top-level exception handler: any unrecognised exception is a compiler bug. - handle (\exception -> do hPutStr stderr (show (Panic (show exception))) - exitWith (ExitFailure 1) + handle (\exception -> do + hFlush stdout + case exception of + -- an IO exception probably isn't our fault, so don't panic + IOException _ -> hPutStr stderr (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 -- all error messages are propagated as exceptions - handleDyn (\dyn -> case dyn of - PhaseFailed _phase code -> exitWith code - Interrupted -> exitWith (ExitFailure 1) - _ -> do hPutStrLn stderr (show (dyn :: GhcException)) - exitWith (ExitFailure 1) + handleDyn (\dyn -> do + hFlush stdout + case dyn of + PhaseFailed _ code -> exitWith code + Interrupted -> exitWith (ExitFailure 1) + _ -> do hPutStrLn stderr (show (dyn :: GhcException)) + exitWith (ExitFailure 1) ) $ do -- make sure we clean up after ourselves @@ -126,42 +137,26 @@ main = -- signals. -- install signal handlers +#ifndef mingw32_HOST_OS main_thread <- myThreadId -#ifndef mingw32_TARGET_OS let sig_handler = Catch (throwTo main_thread (DynException (toDyn Interrupted))) installHandler sigQUIT sig_handler Nothing installHandler sigINT sig_handler Nothing #endif - argv <- getArgs - - -- grab any -B options from the command line first - let (top_dir, argv') = getTopDir argv + argv <- getArgs + let (minusB_args, argv') = partition (prefixMatch "-B") argv + top_dir <- initSysTools minusB_args - initSysTools top_dir - - -- read the package configuration - conf_file <- packageConfigPath - r <- parsePkgConf conf_file - case r of { - Left err -> throwDyn (InstallationError (showSDoc err)); - Right pkg_details -> do - - writeIORef v_Package_details (mungePackagePaths top_dir pkg_details) - - -- find the phase to stop after (i.e. -E, -C, -c, -S flags) - (flags2, mode, stop_flag) <- getGhcMode argv' - writeIORef v_GhcMode mode - - -- Show the GHCi banner? -# ifdef GHCI - when (mode == DoInteractive) $ - hPutStrLn stdout ghciWelcomeMsg -# endif + -- Read the package configuration + conf_file <- getPackageConfigPath + readPackageConf conf_file -- 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 @@ -170,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.") @@ -180,7 +175,9 @@ main = way_opts <- findBuildTag let unreg_opts | cGhcUnregisterised == "YES" = unregFlags | otherwise = [] - way_non_static <- processArgs static_flags (unreg_opts ++ way_opts) [] + pkg_extra_opts <- getPackageExtraGhcOpts + extra_non_static <- processArgs static_flags + (unreg_opts ++ way_opts ++ pkg_extra_opts) [] -- give the static flags to hsc static_opts <- buildStaticHscOpts @@ -195,38 +192,37 @@ 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 = case mode of - DoInteractive -> 1 - DoMake -> 1 - _other -> 0, - }) + 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 (way_non_static ++ non_static) [] + srcs <- processArgs dynamic_flags (extra_non_static ++ non_static) [] -- 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 +# ifdef GHCI + when (mode == DoInteractive && verb >= 1) $ + hPutStrLn stdout ghciWelcomeMsg +# endif + + -- Display details of the configuration in verbose mode when (verb >= 2) (do hPutStr stderr "Glasgow Haskell Compiler, Version " hPutStr stderr cProjectVersion @@ -236,6 +232,9 @@ main = when (verb >= 2) (hPutStrLn stderr ("Using package config file: " ++ conf_file)) + pkg_details <- readIORef v_Package_details + showPackages pkg_details + when (verb >= 3) (hPutStrLn stderr ("Hsc static flags: " ++ unwords static_opts)) @@ -249,7 +248,7 @@ main = -- -ohi sanity checking ohi <- readIORef v_Output_hi if (isJust ohi && - (mode == DoMake || mode == DoInteractive || length srcs > 1)) + (mode == DoMake || mode == DoInteractive || srcs `lengthExceeds` 1)) then throwDyn (UsageError "-ohi can only be used when compiling a single source file") else do @@ -259,7 +258,7 @@ main = -- -o sanity checking o_file <- readIORef v_Output_file - if (length srcs > 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL) + if (srcs `lengthExceeds` 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL) then throwDyn (UsageError "can't apply -o to multiple source files") else do @@ -277,18 +276,25 @@ main = let (basename, suffix) = splitFilename src -- just preprocess (Haskell source only) - pp <- if not (haskellish_src_file src) || mode == StopBefore Hsc - then return src else do + let src_and_suff = (src, getFileSuffix src) + 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 - pipeLoop phases src False{-no linking-} False{-no -o 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 - phases <- genPipeline mode stop_flag True hsc_lang pp - r <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) True{-use -o flag-} - basename suffix +-- 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 o_files <- mapM compileFile srcs @@ -296,44 +302,22 @@ main = when (mode == DoMkDependHS) endMkDependHS when (mode == DoLink) (doLink o_files) when (mode == DoMkDLL) (doMkDLL o_files) - } - - -- grab the last -B option on the command line, and - -- set topDir to its value. -getTopDir :: [String] -> (String, [String]) -getTopDir args - | null minusbs = throwDyn (InstallationError ("missing -B option")) - | otherwise = (drop 2 (last minusbs), others) - where - (minusbs, others) = partition (prefixMatch "-B") args - - --- replace the string "$libdir" at the beginning of a path with the --- current libdir (obtained from the -B option). -mungePackagePaths top_dir ps = map munge_pkg ps - where - munge_pkg p = p{ import_dirs = munge_paths (import_dirs p), - include_dirs = munge_paths (include_dirs p), - library_dirs = munge_paths (library_dirs p) } - munge_paths = map munge_path - - munge_path p - | Just p' <- my_prefix_match "$libdir" p = top_dir ++ p' - | otherwise = trace ("not: " ++ p) p beginMake :: [String] -> IO () beginMake fileish_args = do let (objs, mods) = partition objish_file fileish_args - mapM (add v_Ld_inputs) objs + mapM_ (add v_Ld_inputs) objs case mods of [] -> throwDyn (UsageError "no input files") - [mod] -> do state <- cmInit Batch - cmLoadModule state mod + _ -> do dflags <- getDynFlags + state <- cmInit Batch + graph <- cmDepAnal state dflags mods + (_, ok, _) <- cmLoadModules state dflags graph + when (not ok) (exitWith (ExitFailure 1)) return () - _ -> throwDyn (UsageError "only one module allowed with --make") beginInteractive :: [String] -> IO () @@ -344,12 +328,19 @@ beginInteractive fileish_args = do minus_ls <- readIORef v_Cmdline_libraries let (objs, mods) = partition objish_file fileish_args - libs = map Left objs ++ map Right minus_ls + libs = map Object objs ++ map DLL minus_ls state <- cmInit Interactive - case mods of - [] -> interactiveUI state Nothing libs - [mod] -> interactiveUI state (Just mod) libs - _ -> throwDyn (UsageError - "only one module allowed with --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). +