X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=15ac137ae5463daf005a7160852d65fbbccc3af7;hb=de27420cb4fd03e84824a5bc0eca13d76e6cf00e;hp=99b96292205f18bac4a6411a1cf7631477aef980;hpb=9fd23f53af8c45b75b8a4b01d0e6fa1ad6f34aa9;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 99b9629..15ac137 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.63 2001/04/26 13:52:57 simonmar Exp $ +-- $Id: Main.hs,v 1.74 2001/06/18 21:45:49 sof Exp $ -- -- GHC Driver program -- @@ -17,42 +17,65 @@ module Main (main) where #ifdef GHCI -import InteractiveUI +import InteractiveUI(ghciWelcomeMsg, interactiveUI) #endif -#ifndef mingw32_TARGET_OS -import Dynamic -import Posix -#endif -import CompManager -import ParsePkgConf -import DriverPipeline -import DriverState -import DriverFlags -import DriverMkDepend -import DriverUtil -import Panic -import DriverPhases ( Phase(..), haskellish_file, objish_file ) -import CmdLineOpts -import TmpFiles import Finder ( initFinder ) -import CmStaticInfo -import Config +import CompManager ( cmInit, cmLoadModule ) +import HscTypes ( GhciMode(..) ) +import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion ) +import SysTools ( packageConfigPath, initSysTools, cleanTempFiles ) +import Packages ( showPackages, mungePackagePaths ) +import ParsePkgConf ( loadPackageConfig ) + +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 DriverFlags ( dynFlag, 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, defaultDynFlags, restoreDynFlags, saveDynFlags, setDynFlags, + DynFlags(..), HscLang(..), + v_Static_hsc_opts + ) + import Outputable +import ErrUtils ( dumpIfSet ) import Util +import Panic ( GhcException(..), panic ) -import Concurrent -import Directory -import IOExts -import Exception - +-- Standard Haskell libraries import IO +import Directory ( doesFileExist ) +import IOExts ( readIORef, writeIORef ) +import Exception ( throwDyn, Exception(DynException) ) +import System ( getArgs, exitWith, ExitCode(..) ) import Monad import List -import System import Maybe +#ifndef mingw32_TARGET_OS +import Concurrent ( myThreadId ) +#ifdef __GLASGOW_HASKELL__ < 500 +import Exception ( raiseInThread ) +#define throwTo raiseInThread +#else +import Exception ( throwTo ) +#endif + +import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) +import Dynamic ( toDyn ) +#endif + ----------------------------------------------------------------------------- -- Changes: @@ -63,7 +86,6 @@ import Maybe ----------------------------------------------------------------------------- -- ToDo: --- -nohi doesn't work -- new mkdependHS doesn't support all the options that the old one did (-X et al.) -- time commands when run with -v -- split marker @@ -110,58 +132,22 @@ main = -- signals. -- install signal handlers - main_thread <- myThreadId #ifndef mingw32_TARGET_OS + main_thread <- myThreadId 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 - argv' <- setTopDir argv - top_dir <- readIORef v_TopDir - - let installed s = top_dir ++ '/':s - inplace s = top_dir ++ '/':cCURRENT_DIR ++ '/':s - - installed_pkgconfig = installed ("package.conf") - inplace_pkgconfig = inplace (cGHC_DRIVER_DIR ++ "/package.conf.inplace") - - -- discover whether we're running in a build tree or in an installation, - -- by looking for the package configuration file. - am_installed <- doesFileExist installed_pkgconfig - - if am_installed - then writeIORef v_Path_package_config installed_pkgconfig - else do am_inplace <- doesFileExist inplace_pkgconfig - if am_inplace - then writeIORef v_Path_package_config inplace_pkgconfig - else throwDyn (InstallationError - ("Can't find package.conf in " ++ - inplace_pkgconfig)) - - -- set the location of our various files - if am_installed - then do writeIORef v_Path_usage (installed "ghc-usage.txt") - writeIORef v_Pgm_L (installed "unlit") - writeIORef v_Pgm_m (installed "ghc-asm") - writeIORef v_Pgm_s (installed "ghc-split") - - else do writeIORef v_Path_usage (inplace (cGHC_DRIVER_DIR ++ "/ghc-usage.txt")) - writeIORef v_Pgm_L (inplace cGHC_UNLIT) - writeIORef v_Pgm_m (inplace cGHC_MANGLER) - writeIORef v_Pgm_s (inplace cGHC_SPLIT) - - -- read the package configuration - conf_file <- readIORef v_Path_package_config - r <- parsePkgConf conf_file - case r of { - Left err -> throwDyn (InstallationError (showSDoc err)); - Right pkg_details -> do + argv <- getArgs + let (minusB_args, argv') = partition (prefixMatch "-B") argv + top_dir <- initSysTools minusB_args + -- Read the package configuration + conf_file <- packageConfigPath + proto_pkg_details <- loadPackageConfig conf_file + let pkg_details = mungePackagePaths top_dir proto_pkg_details writeIORef v_Package_details pkg_details -- find the phase to stop after (i.e. -E, -C, -c, -S flags) @@ -218,28 +204,28 @@ main = _other | opt_level >= 1 -> HscC -- -O implies -fvia-C | otherwise -> defaultHscLang - writeIORef v_DynFlags - defaultDynFlags{ coreToDo = core_todo, - stgToDo = stg_todo, - hscLang = lang, - -- leave out hscOutName for now - hscOutName = panic "Main.main:hscOutName not set", + setDynFlags (defaultDynFlags{ coreToDo = core_todo, + stgToDo = stg_todo, + hscLang = lang, + -- leave out hscOutName for now + hscOutName = panic "Main.main:hscOutName not set", - verbosity = case mode of - DoInteractive -> 1 - DoMake -> 1 - _other -> 0, - } + verbosity = case mode of + DoInteractive -> 1 + DoMake -> 1 + _other -> 0, + }) -- the rest of the arguments are "dynamic" srcs <- processArgs dynamic_flags (way_non_static ++ non_static) [] + -- save the "initial DynFlags" away - init_dyn_flags <- readIORef v_DynFlags - writeIORef v_InitDynFlags init_dyn_flags + saveDynFlags -- complain about any unknown flags mapM unknownFlagErr [ f | f@('-':_) <- srcs ] + -- Display details of the configuration in verbose mode verb <- dynFlag verbosity when (verb >= 2) @@ -254,6 +240,8 @@ main = when (verb >= 3) (hPutStrLn stderr ("Hsc static flags: " ++ unwords static_opts)) + showPackages pkg_details + -- initialise the finder pkg_avails <- getPackageInfo initFinder pkg_avails @@ -281,7 +269,7 @@ main = if null srcs then throwDyn (UsageError "no input files") else do let compileFile src = do - writeIORef v_DynFlags init_dyn_flags + restoreDynFlags exists <- doesFileExist src when (not exists) $ @@ -291,8 +279,8 @@ main = -- OPTIONS pragma that affects the compilation pipeline (eg. -fvia-C) let (basename, suffix) = splitFilename src - -- just preprocess - pp <- if not (haskellish_file src) || mode == StopBefore Hsc + -- just preprocess (Haskell source only) + pp <- if not (haskellish_src_file src) || mode == StopBefore Hsc then return src else do phases <- genPipeline (StopBefore Hsc) stop_flag False{-not persistent-} defaultHscLang src @@ -300,8 +288,8 @@ main = basename suffix -- rest of compilation - dyn_flags <- readIORef v_DynFlags - phases <- genPipeline mode stop_flag True (hscLang dyn_flags) pp + 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 return r @@ -311,16 +299,8 @@ 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. -setTopDir :: [String] -> IO [String] -setTopDir args = do - let (minusbs, others) = partition (prefixMatch "-B") args - (case minusbs of - [] -> throwDyn (InstallationError ("missing -B option")) - some -> writeIORef v_TopDir (drop 2 (last some))) - return others + + beginMake :: [String] -> IO () beginMake fileish_args