X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=4ab9f5527e6f0cb894a63545d891b3d2293c8ecc;hb=fb7a723bfd7650a705cb226e07c5b08b7a8e9279;hp=2ff3078ec86e4c8c61d861a9a92c82944093f256;hpb=16d5d1c75c999677783c9c1bda519540fa9a6e58;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 2ff3078..4ab9f55 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,4 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.78 2001/06/14 12:50:06 simonpj Exp $ -- -- GHC Driver -- @@ -26,7 +25,7 @@ module DriverPipeline ( #include "HsVersions.h" -import CmStaticInfo +import Packages import CmTypes import GetImports import DriverState @@ -34,7 +33,7 @@ import DriverUtil import DriverMkDepend import DriverPhases import DriverFlags -import SysTools ( newTempName, addFilesToClean, getSysMan ) +import SysTools ( newTempName, addFilesToClean, getSysMan, unDosifyPath ) import qualified SysTools import HscMain import Finder @@ -63,17 +62,6 @@ import MatchPS ----------------------------------------------------------------------------- -- GHC modes of operation -data GhcMode - = DoMkDependHS -- ghc -M - | DoMkDLL -- ghc --mk-dll - | StopBefore Phase -- ghc -E | -C | -S | -c - | DoMake -- ghc --make - | DoInteractive -- ghc --interactive - | DoLink -- [ the default ] - deriving (Eq) - -GLOBAL_VAR(v_GhcMode, error "todo", GhcMode) - modeFlag :: String -> Maybe GhcMode modeFlag "-M" = Just $ DoMkDependHS modeFlag "--mk-dll" = Just $ DoMkDLL @@ -131,18 +119,18 @@ data IntermediateFileType deriving (Eq, Show) genPipeline - :: GhcMode -- when to stop - -> String -- "stop after" flag (for error messages) - -> Bool -- True => output is persistent - -> HscLang -- preferred output language for hsc - -> String -- original filename + :: GhcMode -- when to stop + -> String -- "stop after" flag (for error messages) + -> Bool -- True => output is persistent + -> HscLang -- preferred output language for hsc + -> (FilePath, String) -- original filename & its suffix -> IO [ -- list of phases to run for this file (Phase, IntermediateFileType, -- keep the output from this phase? String) -- output file suffix ] -genPipeline todo stop_flag persistent_output lang filename +genPipeline todo stop_flag persistent_output lang (filename,suffix) = do split <- readIORef v_Split_object_files mangle <- readIORef v_Do_asm_mangling @@ -154,8 +142,6 @@ genPipeline todo stop_flag persistent_output lang filename let ----------- ----- ---- --- -- -- - - - - (_basename, suffix) = splitFilename filename - start = startPhase suffix -- special case for mkdependHS: .hspp files go through MkDependHS @@ -187,8 +173,11 @@ genPipeline todo stop_flag persistent_output lang filename HscJava | split -> not_valid | otherwise -> error "not implemented: compiling via Java" +#ifdef ILX HscILX | split -> not_valid - | otherwise -> [ Unlit, Cpp, Hsc ] + | otherwise -> [ Unlit, Cpp, Hsc, Ilx2Il, Ilasm ] +#endif + HscNothing -> [ Unlit, Cpp, Hsc ] | cish = [ Cc, As ] @@ -267,33 +256,51 @@ genPipeline todo stop_flag persistent_output lang filename runPipeline :: [ (Phase, IntermediateFileType, String) ] -- phases to run - -> String -- input file + -> (String,String) -- input file -> Bool -- doing linking afterward? -> Bool -- take into account -o when generating output? - -> IO String -- return final filename + -> IO (String, String) -- return final filename -runPipeline pipeline input_fn do_linking use_ofile - = pipeLoop pipeline input_fn do_linking use_ofile basename suffix - where (basename, suffix) = splitFilename input_fn +runPipeline pipeline (input_fn,suffix) do_linking use_ofile + = pipeLoop pipeline (input_fn,suffix) do_linking use_ofile basename suffix + where (basename, _) = splitFilename input_fn pipeLoop [] input_fn _ _ _ _ = return input_fn -pipeLoop ((phase, keep, o_suffix):phases) - input_fn do_linking use_ofile orig_basename orig_suffix +pipeLoop (all_phases@((phase, keep, o_suffix):phases)) + (input_fn,real_suff) do_linking use_ofile orig_basename orig_suffix = do output_fn <- outputFileName (null phases) keep o_suffix - carry_on <- run_phase phase orig_basename orig_suffix input_fn output_fn + mbCarryOn <- run_phase phase orig_basename orig_suffix input_fn output_fn -- sometimes we bail out early, eg. when the compiler's recompilation -- checker has determined that recompilation isn't necessary. - if not carry_on - then do let (_,keep,final_suffix) = last phases - ofile <- outputFileName True keep final_suffix - return ofile - else do -- carry on ... - - pipeLoop phases output_fn do_linking use_ofile orig_basename orig_suffix - + case mbCarryOn of + Nothing -> do + let (_,keep,final_suffix) = last all_phases + ofile <- outputFileName True keep final_suffix + return (ofile, final_suffix) + -- carry on ... + Just fn -> + {- + Notice that in order to keep the invariant that we can + determine a compilation pipeline's 'start phase' just + by looking at the input filename, the input filename + to the next stage/phase is associated here with the suffix + of the output file, *even* if it does not have that + suffix in reality. + + Why is this important? Because we may run a compilation + pipeline in stages (cf. Main.main.compileFile's two stages), + so when generating the next stage we need to be precise + about what kind of file (=> suffix) is given as input. + + [Not having to generate a pipeline in stages seems like + the right way to go, but I've punted on this for now --sof] + + -} + pipeLoop phases (fn, o_suffix) do_linking use_ofile + orig_basename orig_suffix where outputFileName last_phase keep suffix = do o_file <- readIORef v_Output_file @@ -305,13 +312,30 @@ pipeLoop ((phase, keep, o_suffix):phases) then odir_ify (orig_basename ++ '.':suffix) else newTempName suffix +run_phase :: Phase + -> String -- basename of original input source + -> String -- its extension + -> FilePath -- name of file which contains the input to this phase. + -> FilePath -- where to stick the result. + -> IO (Maybe FilePath) + -- Nothing => stop the compilation pipeline + -- Just fn => the result of this phase can be found in 'fn' + -- (this can either be 'input_fn' or 'output_fn'). ------------------------------------------------------------------------------- -- Unlit phase run_phase Unlit _basename _suff input_fn output_fn = do unlit_flags <- getOpts opt_L - SysTools.runUnlit (unlit_flags ++ ["-h", input_fn, input_fn, output_fn]) - return True + -- The -h option passes the file name for unlit to put in a #line directive; + -- we undosify it so that it doesn't contain backslashes in Windows, which + -- would disappear in error messages + SysTools.runUnlit (map SysTools.Option unlit_flags ++ + [ SysTools.Option "-h" + , SysTools.Option input_fn + , SysTools.FileOption "" input_fn + , SysTools.FileOption "" output_fn + ]) + return (Just output_fn) ------------------------------------------------------------------------------- -- Cpp phase @@ -322,50 +346,39 @@ run_phase Cpp basename suff input_fn output_fn checkProcessArgsResult unhandled_flags basename suff do_cpp <- dynFlag cppFlag - if do_cpp - then do + if not do_cpp then + -- no need to preprocess CPP, just pass input file along + -- to the next phase of the pipeline. + return (Just input_fn) + else do hscpp_opts <- getOpts opt_P hs_src_cpp_opts <- readIORef v_Hs_source_cpp_opts cmdline_include_paths <- readIORef v_Include_paths pkg_include_dirs <- getPackageIncludePath - let include_paths = map (\p -> "-I"++p) (cmdline_include_paths - ++ pkg_include_dirs) + let include_paths = foldr (\ x xs -> "-I" : x : xs) [] + (cmdline_include_paths ++ pkg_include_dirs) verb <- getVerbFlag (md_c_flags, _) <- machdepCCOpts - SysTools.runCpp ([verb] - ++ include_paths - ++ hs_src_cpp_opts - ++ hscpp_opts - ++ md_c_flags - ++ [ "-x", "c", input_fn, "-o", output_fn ]) - - -- ToDo: switch away from using 'echo' alltogether (but need - -- a faster alternative than what's done below). -#if defined(mingw32_TARGET_OS) && defined(MINIMAL_UNIX_DEPS) - else (do - h <- openFile output_fn WriteMode - hPutStrLn h ("{-# LINE 1 \"" ++ input_fn ++ "\" #-}") - ls <- readFile input_fn -- inefficient, but it'll do for now. - -- ToDo: speed up via slurping. - hPutStrLn h ls - hClose h) `catchAllIO` - (\_ -> throwDyn (PhaseFailed "Ineffective C pre-processor" (ExitFailure 1))) -#else - else do - SysTools.runSomething "Ineffective C pre-processor" - ("echo '{-# LINE 1 \"" ++ input_fn ++ "\" #-}' > " - ++ output_fn ++ " && cat " ++ input_fn - ++ " >> " ++ output_fn) [] -#endif - return True + SysTools.runCpp ([SysTools.Option verb] + ++ map SysTools.Option include_paths + ++ map SysTools.Option hs_src_cpp_opts + ++ map SysTools.Option hscpp_opts + ++ map SysTools.Option md_c_flags + ++ [ SysTools.Option "-x" + , SysTools.Option "c" + , SysTools.FileOption "" input_fn + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ]) + return (Just output_fn) ----------------------------------------------------------------------------- -- MkDependHS phase -run_phase MkDependHS basename suff input_fn _output_fn = do +run_phase MkDependHS basename suff input_fn output_fn = do src <- readFile input_fn let (import_sources, import_normals, _) = getImports src @@ -385,6 +398,7 @@ run_phase MkDependHS basename suff input_fn _output_fn = do objs <- mapM odir_ify ofiles + -- Handle for file that accumulates dependencies hdl <- readIORef v_Dep_tmp_hdl -- std dependency of the object(s) on the source file @@ -402,7 +416,7 @@ run_phase MkDependHS basename suff input_fn _output_fn = do mapM genDep [ d | Just d <- deps ] - return True + return (Just output_fn) -- add the lines to dep_makefile: -- always: @@ -456,8 +470,8 @@ run_phase Hsc basename suff input_fn output_fn (srcimps,imps,mod_name) <- getImportsFromFile input_fn -- build a ModuleLocation to pass to hscMain. - Just (mod, location') - <- mkHomeModuleLocn mod_name basename (Just (basename ++ '.':suff)) + (mod, location') + <- mkHomeModuleLocn mod_name basename (basename ++ '.':suff) -- take -ohi into account if present ohi <- readIORef v_Output_hi @@ -517,18 +531,19 @@ run_phase Hsc basename suff input_fn output_fn HscFail pcs -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)); HscNoRecomp pcs details iface -> do { SysTools.touch "Touching object file" o_file - ; return False } ; + ; return Nothing } ; HscRecomp pcs details iface stub_h_exists stub_c_exists _maybe_interpreted_code -> do - -- deal with stubs - maybe_stub_o <- compileStub dyn_flags' stub_c_exists - case maybe_stub_o of - Nothing -> return () - Just stub_o -> add v_Ld_inputs stub_o - - return True + -- deal with stubs + maybe_stub_o <- compileStub dyn_flags' stub_c_exists + case maybe_stub_o of + Nothing -> return () + Just stub_o -> add v_Ld_inputs stub_o + case hscLang dyn_flags of + HscNothing -> return Nothing + _ -> return (Just output_fn) } ----------------------------------------------------------------------------- @@ -540,7 +555,7 @@ run_phase Hsc basename suff input_fn output_fn run_phase cc_phase basename suff input_fn output_fn | cc_phase == Cc || cc_phase == HCc = do cc_opts <- getOpts opt_c - cmdline_include_dirs <- readIORef v_Include_paths + cmdline_include_paths <- readIORef v_Include_paths let hcc = cc_phase == HCc @@ -548,8 +563,8 @@ run_phase cc_phase basename suff input_fn output_fn -- .c files; this is the Value Add(TM) that using -- ghc instead of gcc gives you :) pkg_include_dirs <- getPackageIncludePath - let include_paths = map (\p -> "-I"++p) (cmdline_include_dirs - ++ pkg_include_dirs) + let include_paths = foldr (\ x xs -> "-I" : x : xs) [] + (cmdline_include_paths ++ pkg_include_dirs) mangle <- readIORef v_Do_asm_mangling (md_c_flags, md_regd_c_flags) <- machdepCCOpts @@ -567,8 +582,13 @@ run_phase cc_phase basename suff input_fn output_fn | otherwise = [ ] excessPrecision <- readIORef v_Excess_precision - SysTools.runCc ([ "-x", "c", input_fn, "-o", output_fn ] - ++ md_c_flags + SysTools.runCc ([ SysTools.Option "-x", SysTools.Option "c" + , SysTools.FileOption "" input_fn + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option ( + md_c_flags ++ (if cc_phase == HCc && mangle then md_regd_c_flags else []) @@ -579,8 +599,8 @@ run_phase cc_phase basename suff input_fn output_fn ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts - ) - return True + )) + return (Just output_fn) -- ToDo: postprocess the output from gcc @@ -594,21 +614,26 @@ run_phase Mangle _basename _suff input_fn output_fn return [ show n_regs ] else return [] - SysTools.runMangle (mangler_opts - ++ [ input_fn, output_fn ] - ++ machdep_opts) - return True + SysTools.runMangle (map SysTools.Option mangler_opts + ++ [ SysTools.FileOption "" input_fn + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option machdep_opts) + return (Just output_fn) ----------------------------------------------------------------------------- -- Splitting phase -run_phase SplitMangle _basename _suff input_fn _output_fn +run_phase SplitMangle _basename _suff input_fn output_fn = do -- tmp_pfx is the prefix used for the split .s files -- We also use it as the file to contain the no. of split .s files (sigh) split_s_prefix <- SysTools.newTempName "split" let n_files_fn = split_s_prefix - SysTools.runSplit [input_fn, split_s_prefix, n_files_fn] + SysTools.runSplit [ SysTools.FileOption "" input_fn + , SysTools.FileOption "" split_s_prefix + , SysTools.FileOption "" n_files_fn + ] -- Save the number of split files for future references s <- readFile n_files_fn @@ -619,7 +644,7 @@ run_phase SplitMangle _basename _suff input_fn _output_fn addFilesToClean [ split_s_prefix ++ "__" ++ show n ++ ".s" | n <- [1..n_files]] - return True + return (Just output_fn) ----------------------------------------------------------------------------- -- As phase @@ -628,12 +653,16 @@ run_phase As _basename _suff input_fn output_fn = do as_opts <- getOpts opt_a cmdline_include_paths <- readIORef v_Include_paths - SysTools.runAs (as_opts - ++ [ "-I" ++ p | p <- cmdline_include_paths ] - ++ [ "-c", input_fn, "-o", output_fn ]) - return True + SysTools.runAs (map SysTools.Option as_opts + ++ [ SysTools.Option ("-I" ++ p) | p <- cmdline_include_paths ] + ++ [ SysTools.Option "-c" + , SysTools.FileOption "" input_fn + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ]) + return (Just output_fn) -run_phase SplitAs basename _suff _input_fn _output_fn +run_phase SplitAs basename _suff _input_fn output_fn = do as_opts <- getOpts opt_a (split_s_prefix, n) <- readIORef v_Split_info @@ -648,10 +677,45 @@ 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 - SysTools.runAs (as_opts ++ ["-c", "-o", real_o, input_s]) + SysTools.runAs (map SysTools.Option as_opts ++ + [ SysTools.Option "-c" + , SysTools.Option "-o" + , SysTools.FileOption "" real_o + , SysTools.FileOption "" input_s + ]) mapM_ assemble_file [1..n] - return True + return (Just output_fn) + +#ifdef ILX +----------------------------------------------------------------------------- +-- Ilx2Il phase +-- Run ilx2il over the ILX output, getting an IL file + +run_phase Ilx2Il _basename _suff input_fn output_fn + = do ilx2il_opts <- getOpts opt_I + SysTools.runIlx2il (map SysTools.Option ilx2il_opts + ++ [ SysTools.Option "--no-add-suffix-to-assembly", + SysTools.Option "mscorlib", + SysTools.Option "-o", + SysTools.FileOption "" output_fn, + SysTools.FileOption "" input_fn ]) + return (Just output_fn) + +----------------------------------------------------------------------------- +-- Ilasm phase +-- Run ilasm over the IL, getting a DLL + +run_phase Ilasm _basename _suff input_fn output_fn + = do ilasm_opts <- getOpts opt_i + SysTools.runIlasm (map SysTools.Option ilasm_opts + ++ [ SysTools.Option "/QUIET", + SysTools.Option "/DLL", + SysTools.FileOption "/OUT=" output_fn, + SysTools.FileOption "" input_fn ]) + return (Just output_fn) + +#endif -- ILX ----------------------------------------------------------------------------- -- MoveBinary sort-of-phase @@ -788,8 +852,12 @@ doLink o_files = do head (library_dirs (head std_pkg)) ++ "/PrelMain.dll_o" ] (md_c_flags, _) <- machdepCCOpts - SysTools.runLink ( [verb, "-o", output_fn] - ++ md_c_flags + SysTools.runLink ( [ SysTools.Option verb + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option ( + md_c_flags ++ o_files ++ extra_os ++ extra_ld_inputs @@ -799,7 +867,10 @@ doLink o_files = do ++ pkg_lib_opts ++ pkg_extra_ld_opts ++ extra_ld_opts - ++ if static then [ "-u _PrelMain_mainIO_closure" , "-u ___init_PrelMain"] else []) + ++ if static && not no_hs_main then + [ "-u", prefixUnderscore "PrelMain_mainIO_closure", + "-u", prefixUnderscore "__stginit_PrelMain"] + else [])) -- parallel only: move binary to another dir -- HWL ways_ <- readIORef v_Ways @@ -852,8 +923,12 @@ doMkDLL o_files = do (md_c_flags, _) <- machdepCCOpts SysTools.runMkDLL - ([ verb, "-o", output_fn ] - ++ md_c_flags + ([ SysTools.Option verb + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option ( + md_c_flags ++ o_files ++ extra_os ++ [ "--target=i386-mingw32" ] @@ -867,7 +942,7 @@ doMkDLL o_files = do Nothing -> [ "--export-all" ] Just _ -> [ "" ]) ++ extra_ld_opts - ) + )) ----------------------------------------------------------------------------- -- Just preprocess a file, put the result in a temp. file (used by the @@ -878,8 +953,10 @@ preprocess filename = ASSERT(haskellish_src_file filename) do restoreDynFlags -- Restore to state of last save pipeline <- genPipeline (StopBefore Hsc) ("preprocess") False - defaultHscLang filename - runPipeline pipeline filename False{-no linking-} False{-no -o flag-} + defaultHscLang (filename, getFileSuffix filename) + (fn,_) <- runPipeline pipeline (filename,getFileSuffix filename) + False{-no linking-} False{-no -o flag-} + return fn ----------------------------------------------------------------------------- -- Compile a single module, under the control of the compilation manager. @@ -940,12 +1017,21 @@ compile ghci_mode summary source_unchanged have_object let hsc_lang = hscLang dyn_flags (basename, _) = splitFilename input_fn - output_fn <- case hsc_lang of - HscAsm -> newTempName (phaseInputExt As) - HscC -> newTempName (phaseInputExt HCc) - HscJava -> newTempName "java" -- ToDo - HscILX -> return (basename ++ ".ilx") -- newTempName "ilx" -- ToDo - HscInterpreted -> return (error "no output file") + keep_hc <- readIORef v_Keep_hc_files + keep_s <- readIORef v_Keep_s_files + + output_fn <- + case hsc_lang of + HscAsm | keep_s -> return (basename ++ '.':phaseInputExt As) + | otherwise -> newTempName (phaseInputExt As) + HscC | keep_hc -> return (basename ++ '.':phaseInputExt HCc) + | otherwise -> newTempName (phaseInputExt HCc) + HscJava -> newTempName "java" -- ToDo +#ifdef ILX + HscILX -> return (phaseInputExt Ilx2Il) +#endif + HscInterpreted -> return (error "no output file") + HscNothing -> return (error "no output file") let dyn_flags' = dyn_flags { hscOutName = output_fn, hscStubCOutName = basename ++ "_stub.c", @@ -966,10 +1052,14 @@ compile ghci_mode summary source_unchanged have_object writeIORef v_HCHeader cc_injects + -- -no-recomp should also work with --make + do_recomp <- readIORef v_Recomp + let source_unchanged' = source_unchanged && do_recomp + -- run the compiler hsc_result <- hscMain ghci_mode dyn_flags' (ms_mod summary) location - source_unchanged have_object old_iface hst hit pcs + source_unchanged' have_object old_iface hst hit pcs case hsc_result of HscFail pcs -> return (CompErrs pcs) @@ -992,19 +1082,23 @@ compile ghci_mode summary source_unchanged have_object -- as our "unlinked" object. HscInterpreted -> case maybe_interpreted_code of +#ifdef GHCI Just (bcos,itbl_env) -> do tm <- getClockTime return ([BCOs bcos itbl_env], tm) +#endif Nothing -> panic "compile: no interpreted code" -- we're in batch mode: finish the compilation pipeline. _other -> do pipe <- genPipeline (StopBefore Ln) "" True - hsc_lang output_fn + hsc_lang (output_fn, getFileSuffix output_fn) -- runPipeline takes input_fn so it can split off -- 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 + (o_file,_) <- + pipeLoop pipe (output_fn, getFileSuffix output_fn) + False False + basename suffix o_time <- getModificationTime o_file return ([DotO o_file], o_time) @@ -1022,8 +1116,7 @@ compileStub dflags stub_c_exists | stub_c_exists = do -- compile the _stub.c file w/ gcc let stub_c = hscStubCOutName dflags - pipeline <- genPipeline (StopBefore Ln) "" True defaultHscLang stub_c - stub_o <- runPipeline pipeline stub_c False{-no linking-} - False{-no -o option-} - + pipeline <- genPipeline (StopBefore Ln) "" True defaultHscLang (stub_c,"c") + (stub_o,_) <- runPipeline pipeline (stub_c,"c") False{-no linking-} + False{-no -o option-} return (Just stub_o)