X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=d81b6af2e26efbf80e95ef2bd17a6a7e9c86a5e6;hb=3b6b5789852e84639be18d114cad4bde6139847e;hp=de778879fc5ddd34dfe1058c76ab8a707f4a49f7;hpb=e6ef290e6a8beb8cb7d5d5d0d2dc99090096315a;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index de77887..d81b6af 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.30 2000/11/19 19:40:08 simonmar Exp $ +-- $Id: DriverPipeline.hs,v 1.50 2001/02/05 17:52:49 rrt 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 @@ -35,10 +39,13 @@ import TmpFiles import HscTypes import Outputable import Module +import ErrUtils import CmdLineOpts import Config +import Panic import Util +import Time ( getClockTime ) import Directory import System import IOExts @@ -48,12 +55,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 @@ -64,6 +74,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 @@ -83,7 +94,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 @@ -93,7 +104,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 @@ -109,8 +120,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 @@ -142,12 +153,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 @@ -184,18 +199,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 @@ -227,18 +230,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 @@ -287,7 +304,7 @@ pipeLoop ((phase, keep, o_suffix):phases) run_phase Unlit _basename _suff input_fn output_fn = do unlit <- readIORef v_Pgm_L unlit_flags <- getOpts opt_L - run_something "Literate pre-processor" + runSomething "Literate pre-processor" ("echo '# 1 \"" ++input_fn++"\"' > "++output_fn++" && " ++ unlit ++ ' ':input_fn ++ " - >> " ++ output_fn) return True @@ -305,7 +322,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 @@ -317,19 +334,22 @@ run_phase Cpp basename suff input_fn output_fn let include_paths = map (\p -> "-I"++p) (cmdline_include_paths ++ pkg_include_dirs) - verb <- is_verbose - run_something "C pre-processor" + 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 - run_something "Ineffective C pre-processor" - ("echo '{-# LINE 1 \"" ++ input_fn ++ "\" -}' > " + runSomething "Ineffective C pre-processor" + ("echo '{-# LINE 1 \"" ++ input_fn ++ "\" #-}' > " ++ output_fn ++ " && cat " ++ input_fn ++ " >> " ++ output_fn) return True @@ -427,7 +447,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 @@ -466,8 +487,14 @@ run_phase Hsc basename suff input_fn output_fn HscFail pcs -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)); - HscOK details maybe_iface maybe_stub_h maybe_stub_c - _maybe_interpreted_code pcs -> do + 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 -- deal with stubs maybe_stub_o <- dealWithStubs basename maybe_stub_h maybe_stub_c @@ -475,8 +502,7 @@ run_phase Hsc basename suff input_fn output_fn Nothing -> return () Just stub_o -> add v_Ld_inputs stub_o - let keep_going = case maybe_iface of Just _ -> True; Nothing -> False - return keep_going + return True } ----------------------------------------------------------------------------- @@ -501,7 +527,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)) @@ -523,7 +549,7 @@ run_phase cc_phase _basename _suff input_fn output_fn mangle <- readIORef v_Do_asm_mangling (md_c_flags, md_regd_c_flags) <- machdepCCOpts - verb <- is_verbose + verb <- getVerbFlag o2 <- readIORef v_minus_o2_for_C let opt_flag | o2 = "-O2" @@ -537,7 +563,7 @@ run_phase cc_phase _basename _suff input_fn output_fn excessPrecision <- readIORef v_Excess_precision - run_something "C Compiler" + runSomething "C Compiler" (unwords ([ cc, "-x", "c", cc_help, "-o", output_fn ] ++ md_c_flags ++ (if cc_phase == HCc && mangle @@ -547,9 +573,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 @@ -567,10 +590,10 @@ 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 [] - run_something "Assembly Mangler" + runSomething "Assembly Mangler" (unwords (mangler : mangler_opts ++ [ input_fn, output_fn ] @@ -594,7 +617,7 @@ run_phase SplitMangle _basename _suff input_fn _output_fn -- allocate a tmp file to put the no. of split .s files in (sigh) n_files <- newTempName "n_files" - run_something "Split Assembly File" + runSomething "Split Assembly File" (unwords [ splitter , input_fn , split_s_prefix @@ -616,7 +639,7 @@ run_phase As _basename _suff input_fn output_fn cmdline_include_paths <- readIORef v_Include_paths let cmdline_include_flags = map (\p -> "-I"++p) cmdline_include_paths - run_something "Assembler" + runSomething "Assembler" (unwords (as : as_opts ++ cmdline_include_flags ++ [ "-c", input_fn, "-o", output_fn ] @@ -640,7 +663,7 @@ run_phase SplitAs basename _suff _input_fn _output_fn let output_o = newdir real_odir (basename ++ "__" ++ show n ++ ".o") real_o <- osuf_ify output_o - run_something "Assembler" + runSomething "Assembler" (unwords (as : as_opts ++ [ "-c", "-o", real_o, input_s ] )) @@ -654,7 +677,7 @@ run_phase SplitAs basename _suff _input_fn _output_fn doLink :: [String] -> IO () doLink o_files = do ln <- readIORef v_Pgm_l - verb <- is_verbose + verb <- getVerbFlag static <- readIORef v_Static let imp = if static then "" else "_imp" no_hs_main <- readIORef v_NoHsMain @@ -688,12 +711,11 @@ 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 - run_something "Linker" + runSomething "Linker" (unwords ([ ln, verb, "-o", output_fn ] ++ md_c_flags @@ -717,20 +739,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. -- @@ -757,31 +845,29 @@ compile :: GhciMode -- distinguish batch from interactive -> IO CompResult data CompResult - = CompOK ModDetails -- new details (HST additions) - (Maybe (ModIface, Linkable)) - -- summary and code; Nothing => compilation not reqd - -- (old summary and code are still valid) - PersistentCompilerState -- updated PCS + = CompOK PersistentCompilerState -- updated PCS + ModDetails -- new details (HST additions) + ModIface -- new iface (HIT additions) + (Maybe Linkable) + -- new code; Nothing => compilation was not reqd + -- (old code is still valid) | CompErrs PersistentCompilerState -- updated PCS compile ghci_mode summary source_unchanged old_iface hst hit pcs = do - verb <- readIORef v_Verbose - when verb (hPutStrLn stderr - (showSDoc (text "compile: compiling" - <+> ppr (name_of_summary summary)))) - 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 - let location = ms_location summary - let input_fn = unJust (ml_hs_file location) "compile:hs" - let input_fnpp = unJust (ml_hspp_file location) "compile:hspp" + showPass init_dyn_flags + (showSDoc (text "Compiling" <+> ppr (name_of_summary summary))) - when verb (hPutStrLn stderr ("compile: input file " ++ input_fnpp)) + let verb = verbosity init_dyn_flags + let location = ms_location summary + let input_fn = unJust "compile:hs" (ml_hs_file location) + let input_fnpp = unJust "compile:hspp" (ml_hspp_file location) + + when (verb >= 2) (hPutStrLn stderr ("compile: input file " ++ input_fnpp)) opts <- getOptionsFromSource input_fnpp processArgs dynamic_flags opts [] @@ -799,32 +885,30 @@ compile ghci_mode summary source_unchanged old_iface hst hit pcs = do source_unchanged location old_iface hst hit pcs - case hsc_result of { - HscFail pcs -> return (CompErrs pcs); + case hsc_result of + HscFail pcs -> return (CompErrs pcs) - HscOK details maybe_iface - maybe_stub_h maybe_stub_c maybe_interpreted_code pcs -> do - - -- if no compilation happened, bail out early - case maybe_iface of { - Nothing -> return (CompOK details Nothing pcs); - Just iface -> do + HscNoRecomp pcs details iface -> return (CompOK pcs details iface Nothing) + HscRecomp pcs details iface + maybe_stub_h maybe_stub_c maybe_interpreted_code -> do + let (basename, _) = splitFilename input_fn maybe_stub_o <- dealWithStubs basename maybe_stub_h maybe_stub_c let stub_unlinked = case maybe_stub_o of Nothing -> [] Just stub_o -> [ DotO stub_o ] - hs_unlinked <- + (hs_unlinked, unlinked_time) <- case hsc_lang of -- in interpreted mode, just return the compiled code -- as our "unlinked" object. HscInterpreted -> case maybe_interpreted_code of - Just (code,itbl_env) -> return [Trees code itbl_env] - Nothing -> panic "compile: no interpreted code" + 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. _other -> do pipe <- genPipeline (StopBefore Ln) "" True @@ -833,15 +917,16 @@ compile ghci_mode summary source_unchanged old_iface hst hit pcs = do -- the base name and use it as the base of -- the output object file. let (basename, suffix) = splitFilename input_fn - o_file <- pipeLoop pipe output_fn False False basename suffix - return [ DotO o_file ] + o_file <- pipeLoop pipe output_fn False False + basename suffix + o_time <- getModificationTime o_file + return ([DotO o_file], o_time) + + let linkable = LM unlinked_time (moduleName (ms_mod summary)) + (hs_unlinked ++ stub_unlinked) - let linkable = LM (moduleName (ms_mod summary)) - (hs_unlinked ++ stub_unlinked) + return (CompOK pcs details iface (Just linkable)) - return (CompOK details (Just (iface, linkable)) pcs) - } - } ----------------------------------------------------------------------------- -- stub .h and .c files (for foreign export support) @@ -855,7 +940,7 @@ dealWithStubs basename maybe_stub_h maybe_stub_c case maybe_stub_h of Nothing -> return () Just tmp_stub_h -> do - run_something "Copy stub .h file" + runSomething "Copy stub .h file" ("cp " ++ tmp_stub_h ++ ' ':stub_h) -- #include <..._stub.h> in .hc file @@ -865,10 +950,10 @@ dealWithStubs basename maybe_stub_h maybe_stub_c case maybe_stub_c of Nothing -> return Nothing Just tmp_stub_c -> do -- copy the _stub.c file into the current dir - run_something "Copy stub .c file" + 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 ])