X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=c0e58964d7efe98a1ce85507ce0abb8f296f6aa9;hb=436d7d6786f82883b898c694f69df23111d06a0f;hp=5438b631eed723b392500a30be9001a49f434c55;hpb=8fe9b1aff1871324e85189229ceb92d6d0c206e0;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 5438b63..c0e5896 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.35 2000/11/24 17:09:52 simonmar Exp $ +-- $Id: DriverPipeline.hs,v 1.51 2001/02/26 15:50:21 simonmar Exp $ -- -- GHC Driver -- @@ -7,22 +7,26 @@ -- ----------------------------------------------------------------------------- +#include "../includes/config.h" + module DriverPipeline ( -- interfaces for the batch-mode driver GhcMode(..), getGhcMode, v_GhcMode, - genPipeline, runPipeline, + genPipeline, runPipeline, pipeLoop, -- interfaces for the compilation manager (interpreted/batch-mode) preprocess, compile, CompResult(..), -- batch-mode linking interface - doLink + doLink, + -- DLL building + doMkDLL ) where #include "HsVersions.h" -import CmStaticInfo ( GhciMode(..) ) +import CmStaticInfo import CmTypes import GetImports import DriverState @@ -32,12 +36,14 @@ import DriverPhases import DriverFlags import HscMain import TmpFiles +import Finder import HscTypes import Outputable import Module import ErrUtils import CmdLineOpts import Config +import Panic import Util import Time ( getClockTime ) @@ -50,12 +56,15 @@ import IO import Monad import Maybe +import PackedString +import MatchPS + ----------------------------------------------------------------------------- -- GHC modes of operation data GhcMode = DoMkDependHS -- ghc -M - | DoMkDLL -- ghc -mk-dll + | DoMkDLL -- ghc --mk-dll | StopBefore Phase -- ghc -E | -C | -S | -c | DoMake -- ghc --make | DoInteractive -- ghc --interactive @@ -66,6 +75,7 @@ GLOBAL_VAR(v_GhcMode, error "todo", GhcMode) modeFlag :: String -> Maybe GhcMode modeFlag "-M" = Just $ DoMkDependHS +modeFlag "--mk-dll" = Just $ DoMkDLL modeFlag "-E" = Just $ StopBefore Hsc modeFlag "-C" = Just $ StopBefore HCc modeFlag "-S" = Just $ StopBefore As @@ -85,7 +95,7 @@ getGhcMode flags ([(flag,one)], rest) -> return (rest, one, flag) (_ , _ ) -> throwDyn (OtherError - "only one of the flags -M, -E, -C, -S, -c, --make, --interactive is allowed") + "only one of the flags -M, -E, -C, -S, -c, --make, --interactive, -mk-dll is allowed") ----------------------------------------------------------------------------- -- genPipeline @@ -95,7 +105,7 @@ getGhcMode flags -- what the suffix of the intermediate files should be, etc. -- The following compilation pipeline algorithm is fairly hacky. A --- better way to do this would be to express the whole comilation as a +-- better way to do this would be to express the whole compilation as a -- data flow DAG, where the nodes are the intermediate files and the -- edges are the compilation phases. This framework would also work -- nicely if a haskell dependency generator was included in the @@ -111,8 +121,8 @@ getGhcMode flags -- concurrently, automatically taking advantage of extra processors on -- the host machine. For example, when compiling two Haskell files -- where one depends on the other, the data flow graph would determine --- that the C compiler from the first comilation can be overlapped --- with the hsc comilation for the second file. +-- that the C compiler from the first compilation can be overlapped +-- with the hsc compilation for the second file. data IntermediateFileType = Temporary @@ -144,12 +154,16 @@ genPipeline todo stop_flag persistent_output lang filename ----------- ----- ---- --- -- -- - - - (_basename, suffix) = splitFilename filename - start_phase = startPhase suffix + start = startPhase suffix + + -- special case for mkdependHS: .hspp files go through MkDependHS + start_phase | todo == DoMkDependHS && start == Hsc = MkDependHS + | otherwise = start haskellish = haskellish_suffix suffix cish = cish_suffix suffix - -- for a .hc file we need to force lang to HscC + -- for a .hc file we need to force lang to HscC real_lang | start_phase == HCc = HscC | otherwise = lang @@ -186,18 +200,6 @@ genPipeline todo stop_flag persistent_output lang filename ++ filename)) else do - -- if we can't find the phase we're supposed to stop before, - -- something has gone wrong. - case todo of - StopBefore phase -> - when (phase /= Ln - && phase `notElem` pipeline - && not (phase == As && SplitAs `elem` pipeline)) $ - throwDyn (OtherError - ("flag " ++ stop_flag - ++ " is incompatible with source file `" ++ filename ++ "'")) - _ -> return () - let ----------- ----- ---- --- -- -- - - - myPhaseInputExt Ln = case osuf of Nothing -> phaseInputExt Ln @@ -229,18 +231,32 @@ genPipeline todo stop_flag persistent_output lang filename -- the suffix on an output file is determined by the next phase -- in the pipeline, so we add linking to the end of the pipeline -- to force the output from the final phase to be a .o file. - stop_phase = case todo of StopBefore phase -> phase - DoMkDependHS -> Ln - DoLink -> Ln + stop_phase = case todo of + StopBefore As | split -> SplitAs + StopBefore phase -> phase + DoMkDependHS -> Ln + DoLink -> Ln annotated_pipeline = annotatePipeline (pipeline ++ [ Ln ]) stop_phase phase_ne p (p1,_,_) = (p1 /= p) ----------- ----- ---- --- -- -- - - - - return $ - dropWhile (phase_ne start_phase) . - foldr (\p ps -> if phase_ne stop_phase p then p:ps else []) [] - $ annotated_pipeline + -- if we can't find the phase we're supposed to stop before, + -- something has gone wrong. This test carefully avoids the + -- case where we aren't supposed to do any compilation, because the file + -- is already in linkable form (for example). + if start_phase `elem` pipeline && + (stop_phase /= Ln && stop_phase `notElem` pipeline) + then throwDyn (OtherError + ("flag " ++ stop_flag + ++ " is incompatible with source file `" ++ filename ++ "'")) + else do + + return ( + takeWhile (phase_ne stop_phase ) $ + dropWhile (phase_ne start_phase) $ + annotated_pipeline + ) runPipeline @@ -307,7 +323,7 @@ run_phase Cpp basename suff input_fn output_fn ++ ": static flags are not allowed in {-# OPTIONS #-} pragmas:\n\t" ++ unwords unhandled_flags)) (ExitFailure 1)) - do_cpp <- readState cpp_flag + do_cpp <- dynFlag cppFlag if do_cpp then do cpp <- readIORef v_Pgm_P @@ -320,19 +336,21 @@ run_phase Cpp basename suff input_fn output_fn ++ pkg_include_dirs) verb <- getVerbFlag + (md_c_flags, _) <- machdepCCOpts runSomething "C pre-processor" (unwords - (["echo '{-# LINE 1 \"" ++ input_fn ++ "\" -}'", ">", output_fn, "&&", + (["echo '{-# LINE 1 \"" ++ input_fn ++ "\" #-}'", ">", output_fn, "&&", cpp, verb] ++ include_paths ++ hs_src_cpp_opts ++ hscpp_opts + ++ md_c_flags ++ [ "-x", "c", input_fn, ">>", output_fn ] )) else do runSomething "Ineffective C pre-processor" - ("echo '{-# LINE 1 \"" ++ input_fn ++ "\" -}' > " + ("echo '{-# LINE 1 \"" ++ input_fn ++ "\" #-}' > " ++ output_fn ++ " && cat " ++ input_fn ++ " >> " ++ output_fn) return True @@ -430,7 +448,8 @@ run_phase Hsc basename suff input_fn output_fn -- date wrt M.hs (or M.o doesn't exist) so we must recompile regardless. do_recomp <- readIORef v_Recomp todo <- readIORef v_GhcMode - o_file <- odir_ify (basename ++ '.':phaseInputExt Ln) + o_file' <- odir_ify (basename ++ '.':phaseInputExt Ln) + o_file <- osuf_ify o_file' source_unchanged <- if not (do_recomp && ( todo == DoLink || todo == StopBefore Ln )) then return False @@ -443,13 +462,12 @@ run_phase Hsc basename suff input_fn output_fn then return True else return False - -- build a ModuleLocation to pass to hscMain. - let location = ModuleLocation { - ml_hs_file = Nothing, - ml_hspp_file = Just input_fn, - ml_hi_file = Just hifile, - ml_obj_file = Just o_file - } + -- build a ModuleLocation to pass to hscMain. + modsrc <- readFile input_fn + let (srcimps,imps,mod_name) = getImports modsrc + + Just (mod, location) + <- mkHomeModuleLocn mod_name basename (basename ++ '.':suff) -- get the DynFlags dyn_flags <- readIORef v_DynFlags @@ -458,8 +476,9 @@ run_phase Hsc basename suff input_fn output_fn pcs <- initPersistentCompilerState result <- hscMain OneShot dyn_flags{ hscOutName = output_fn } + mod + location{ ml_hspp_file=Just input_fn } source_unchanged - location Nothing -- no iface emptyModuleEnv -- HomeSymbolTable emptyModuleEnv -- HomeIfaceTable @@ -469,7 +488,11 @@ run_phase Hsc basename suff input_fn output_fn HscFail pcs -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)); - HscNoRecomp pcs details iface -> return False; + HscNoRecomp pcs details iface -> + do { + runSomething "Touching object file" ("touch " ++ o_file); + return False; + }; HscRecomp pcs details iface maybe_stub_h maybe_stub_c _maybe_interpreted_code -> do @@ -505,7 +528,7 @@ run_phase cc_phase _basename _suff input_fn output_fn ++ pkg_include_dirs) c_includes <- getPackageCIncludes - cmdline_includes <- readState cmdline_hc_includes -- -#include options + cmdline_includes <- dynFlag cmdlineHcIncludes -- -#include options let cc_injects | hcc = unlines (map mk_include (c_includes ++ reverse cmdline_includes)) @@ -551,9 +574,6 @@ run_phase cc_phase _basename _suff input_fn output_fn ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] ++ cc_opts ++ split_opt -#ifdef mingw32_TARGET_OS - ++ [" -mno-cygwin"] -#endif ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts @@ -571,7 +591,7 @@ run_phase Mangle _basename _suff input_fn output_fn mangler_opts <- getOpts opt_m machdep_opts <- if (prefixMatch "i386" cTARGETPLATFORM) - then do n_regs <- readState stolen_x86_regs + then do n_regs <- dynFlag stolen_x86_regs return [ show n_regs ] else return [] runSomething "Assembly Mangler" @@ -692,9 +712,8 @@ doLink o_files = do #ifdef mingw32_TARGET_OS let extra_os = if static || no_hs_main then [] --- else [ head (lib_paths (head rts_pkg)) ++ "/Main.dll_o", --- head (lib_paths (head std_pkg)) ++ "/PrelMain.dll_o" ] - else [] + else [ head (library_dirs (head rts_pkg)) ++ "/Main.dll_o", + head (library_dirs (head std_pkg)) ++ "/PrelMain.dll_o" ] #endif (md_c_flags, _) <- machdepCCOpts runSomething "Linker" @@ -721,20 +740,86 @@ doLink o_files = do ) ----------------------------------------------------------------------------- +-- Making a DLL + +-- only for Win32, but bits that are #ifdefed in doLn are still #ifdefed here +-- in a vain attempt to aid future portability +doMkDLL :: [String] -> IO () +doMkDLL o_files = do + ln <- readIORef v_Pgm_dll + verb <- getVerbFlag + static <- readIORef v_Static + let imp = if static then "" else "_imp" + no_hs_main <- readIORef v_NoHsMain + + o_file <- readIORef v_Output_file + let output_fn = case o_file of { Just s -> s; Nothing -> "HSdll.dll"; } + + pkg_lib_paths <- getPackageLibraryPath + let pkg_lib_path_opts = map ("-L"++) pkg_lib_paths + + lib_paths <- readIORef v_Library_paths + let lib_path_opts = map ("-L"++) lib_paths + + pkg_libs <- getPackageLibraries + let pkg_lib_opts = map (\lib -> "-l" ++ lib ++ imp) pkg_libs + + libs <- readIORef v_Cmdline_libraries + let lib_opts = map ("-l"++) (reverse libs) + -- reverse because they're added in reverse order from the cmd line + + pkg_extra_ld_opts <- getPackageExtraLdOpts + + -- probably _stub.o files + extra_ld_inputs <- readIORef v_Ld_inputs + + -- opts from -optdll- + extra_ld_opts <- getStaticOpts v_Opt_dll + + rts_pkg <- getPackageDetails ["rts"] + std_pkg <- getPackageDetails ["std"] +#ifdef mingw32_TARGET_OS + let extra_os = if static || no_hs_main + then [] + else [ head (library_dirs (head rts_pkg)) ++ "/Main.dll_o", + head (library_dirs (head std_pkg)) ++ "/PrelMain.dll_o" ] +#endif + (md_c_flags, _) <- machdepCCOpts + runSomething "DLL creator" + (unwords + ([ ln, verb, "-o", output_fn ] + ++ md_c_flags + ++ o_files +#ifdef mingw32_TARGET_OS + ++ extra_os + ++ [ "--target=i386-mingw32" ] +#endif + ++ extra_ld_inputs + ++ lib_path_opts + ++ lib_opts + ++ pkg_lib_path_opts + ++ pkg_lib_opts + ++ pkg_extra_ld_opts + ++ (case findPS (packString (concat extra_ld_opts)) (packString "--def") of + Nothing -> [ "--export-all" ] + Just _ -> [ "" ]) + ++ extra_ld_opts + ) + ) + +----------------------------------------------------------------------------- -- Just preprocess a file, put the result in a temp. file (used by the -- compilation manager during the summary phase). preprocess :: FilePath -> IO FilePath preprocess filename = ASSERT(haskellish_file filename) - do init_driver_state <- readIORef v_InitDriverState - writeIORef v_Driver_state init_driver_state - + do init_dyn_flags <- readIORef v_InitDynFlags + writeIORef v_DynFlags init_dyn_flags pipeline <- genPipeline (StopBefore Hsc) ("preprocess") False defaultHscLang filename runPipeline pipeline filename False{-no linking-} False{-no -o flag-} - ----------------------------------------------------------------------------- -- Compile a single module, under the control of the compilation manager. -- @@ -774,8 +859,6 @@ data CompResult compile ghci_mode summary source_unchanged old_iface hst hit pcs = do init_dyn_flags <- readIORef v_InitDynFlags writeIORef v_DynFlags init_dyn_flags - init_driver_state <- readIORef v_InitDriverState - writeIORef v_Driver_state init_driver_state showPass init_dyn_flags (showSDoc (text "Compiling" <+> ppr (name_of_summary summary))) @@ -800,8 +883,8 @@ compile ghci_mode summary source_unchanged old_iface hst hit pcs = do -- run the compiler hsc_result <- hscMain ghci_mode dyn_flags{ hscOutName = output_fn } - source_unchanged - location old_iface hst hit pcs + (ms_mod summary) location + source_unchanged old_iface hst hit pcs case hsc_result of HscFail pcs -> return (CompErrs pcs) @@ -824,8 +907,8 @@ compile ghci_mode summary source_unchanged old_iface hst hit pcs = do -- as our "unlinked" object. HscInterpreted -> case maybe_interpreted_code of - Just (code,itbl_env) -> do tm <- getClockTime - return ([Trees code itbl_env], tm) + Just (bcos,itbl_env) -> do tm <- getClockTime + return ([BCOs bcos itbl_env], tm) Nothing -> panic "compile: no interpreted code" -- we're in batch mode: finish the compilation pipeline. @@ -871,7 +954,7 @@ dealWithStubs basename maybe_stub_h maybe_stub_c runSomething "Copy stub .c file" (unwords [ "rm -f", stub_c, "&&", - "echo \'#include \""++stub_h++"\"\' >"++stub_c, " &&", + "echo \'#include \"Stg.h\"\n#include \""++stub_h++"\"\' >"++stub_c, " &&", "cat", tmp_stub_c, ">> ", stub_c ])