X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=c43381c374ea6a5cb7bd8dd877d3fa402865f6a8;hb=099c27165f511374eb22c39c2b75d5f8de8ee3a5;hp=f0e2db99e36327807cf7195dfc9adf351d772ec1;hpb=da25d580440a2b6a30eabedff19e7a6970f35991;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index f0e2db9..c43381c 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,4 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.62 2001/03/28 16:51:03 simonmar Exp $ -- -- GHC Driver -- @@ -26,7 +25,7 @@ module DriverPipeline ( #include "HsVersions.h" -import CmStaticInfo +import Packages import CmTypes import GetImports import DriverState @@ -34,8 +33,9 @@ import DriverUtil import DriverMkDepend import DriverPhases import DriverFlags +import SysTools ( newTempName, addFilesToClean, getSysMan, copy ) +import qualified SysTools import HscMain -import TmpFiles import Finder import HscTypes import Outputable @@ -62,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 @@ -95,7 +84,7 @@ getGhcMode flags ([(flag,one)], rest) -> return (rest, one, flag) (_ , _ ) -> throwDyn (UsageError - "only one of the flags -M, -E, -C, -S, -c, --make, --interactive, -mk-dll is allowed") + "only one of the flags -M, -E, -C, -S, -c, --make, --interactive, --mk-dll is allowed") ----------------------------------------------------------------------------- -- genPipeline @@ -130,33 +119,33 @@ 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 keep_hc <- readIORef v_Keep_hc_files - keep_raw_s <- readIORef v_Keep_raw_s_files - keep_s <- readIORef v_Keep_s_files #ifdef ILX - writeIORef v_Object_suf (Just "ilx") + keep_il <- readIORef v_Keep_il_files + keep_ilx <- readIORef v_Keep_ilx_files #endif + keep_raw_s <- readIORef v_Keep_raw_s_files + keep_s <- readIORef v_Keep_s_files osuf <- readIORef v_Object_suf + hcsuf <- readIORef v_HC_suf let ----------- ----- ---- --- -- -- - - - - (_basename, suffix) = splitFilename filename - start = startPhase suffix -- special case for mkdependHS: .hspp files go through MkDependHS @@ -167,52 +156,69 @@ genPipeline todo stop_flag persistent_output lang filename cish = cish_suffix suffix -- for a .hc file we need to force lang to HscC - real_lang | start_phase == HCc = HscC - | otherwise = lang + real_lang | start_phase == HCc || start_phase == Mangle = HscC + | otherwise = lang let ----------- ----- ---- --- -- -- - - - pipeline - | todo == DoMkDependHS = [ Unlit, Cpp, MkDependHS ] + | todo == DoMkDependHS = [ Unlit, Cpp, HsPp, MkDependHS ] | haskellish = case real_lang of - HscC | split && mangle -> [ Unlit, Cpp, Hsc, HCc, Mangle, + HscC | split && mangle -> [ Unlit, Cpp, HsPp, Hsc, HCc, Mangle, SplitMangle, SplitAs ] - | mangle -> [ Unlit, Cpp, Hsc, HCc, Mangle, As ] + | mangle -> [ Unlit, Cpp, HsPp, Hsc, HCc, Mangle, As ] | split -> not_valid - | otherwise -> [ Unlit, Cpp, Hsc, HCc, As ] + | otherwise -> [ Unlit, Cpp, HsPp, Hsc, HCc, As ] - HscAsm | split -> [ Unlit, Cpp, Hsc, SplitMangle, SplitAs ] - | otherwise -> [ Unlit, Cpp, Hsc, As ] + HscAsm | split -> [ Unlit, Cpp, HsPp, Hsc, SplitMangle, SplitAs ] + | otherwise -> [ Unlit, Cpp, HsPp, Hsc, As ] HscJava | split -> not_valid | otherwise -> error "not implemented: compiling via Java" #ifdef ILX HscILX | split -> not_valid - | otherwise -> [ Unlit, Cpp, Hsc ] + | otherwise -> [ Unlit, Cpp, HsPp, Hsc, Ilx2Il, Ilasm ] #endif + HscNothing -> [ Unlit, Cpp, HsPp, Hsc ] | cish = [ Cc, As ] | otherwise = [ ] -- just pass this file through to the linker -- ToDo: this is somewhat cryptic - not_valid = throwDyn (UsageError ("invalid option combination")) + + stop_phase = case todo of + StopBefore As | split -> SplitAs +#ifdef ILX + | real_lang == HscILX -> Ilasm +#endif + StopBefore phase -> phase + DoMkDependHS -> Ln + DoLink -> Ln + DoMkDLL -> Ln ----------- ----- ---- --- -- -- - - - -- this shouldn't happen. - if start_phase /= Ln && start_phase `notElem` pipeline - then throwDyn (CmdLineError ("can't find starting phase for " - ++ filename)) - else do - + when (start_phase /= Ln && start_phase `notElem` pipeline) + (throwDyn (CmdLineError ("can't find starting phase for " + ++ filename))) + -- 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). + when (start_phase `elem` pipeline && + (stop_phase /= Ln && stop_phase `notElem` pipeline)) + (throwDyn (UsageError + ("flag " ++ stop_flag + ++ " is incompatible with source file `" ++ filename ++ "'"))) let - ----------- ----- ---- --- -- -- - - - - myPhaseInputExt Ln = case osuf of Nothing -> phaseInputExt Ln - Just s -> s - myPhaseInputExt other = phaseInputExt other + -- .o and .hc suffixes can be overriden by command-line options: + myPhaseInputExt Ln | Just s <- osuf = s + myPhaseInputExt HCc | Just s <- hcsuf = s + myPhaseInputExt other = phaseInputExt other annotatePipeline :: [Phase] -- raw pipeline @@ -233,34 +239,22 @@ genPipeline todo stop_flag persistent_output lang filename Mangle | keep_raw_s -> Persistent As | keep_s -> Persistent HCc | keep_hc -> Persistent +#ifdef ILX + Ilx2Il | keep_ilx -> Persistent + Ilasm | keep_il -> Persistent +#endif _other -> Temporary -- add information about output files to the pipeline -- 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 As | split -> SplitAs - StopBefore phase -> phase - DoMkDependHS -> Ln - DoLink -> Ln annotated_pipeline = annotatePipeline (pipeline ++ [Ln]) stop_phase phase_ne p (p1,_,_) = (p1 /= p) ----------- ----- ---- --- -- -- - - - - -- 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 (UsageError - ("flag " ++ stop_flag - ++ " is incompatible with source file `" ++ filename ++ "'")) - else do - return ( takeWhile (phase_ne stop_phase ) $ dropWhile (phase_ne start_phase) $ @@ -270,37 +264,75 @@ 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 -> do + {- + Check to see whether we've reached the end of the + pipeline, but did so with an ineffective last stage. + (i.e., it returned the input_fn as the output filename). + + If we did and the output is persistent, copy the contents + of input_fn into the file where the pipeline's output is + expected to end up. + -} + atEnd <- finalStage (null phases) + when (atEnd && fn == input_fn) + (copy "Saving away compilation pipeline's output" + input_fn + output_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 + finalStage lastPhase = do + o_file <- readIORef v_Output_file + return (lastPhase && not do_linking && use_ofile && isJust o_file) + outputFileName last_phase keep suffix = do o_file <- readIORef v_Output_file - if last_phase && not do_linking && use_ofile && isJust o_file + atEnd <- finalStage last_phase + if atEnd then case o_file of Just s -> return s Nothing -> error "outputFileName" @@ -308,16 +340,28 @@ 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 <- readIORef v_Pgm_L - unlit_flags <- getOpts opt_L - runSomething "Literate pre-processor" - ("echo '# 1 \"" ++input_fn++"\"' > "++output_fn++" && " - ++ unlit ++ ' ':input_fn ++ " - >> " ++ output_fn) - return True + = do unlit_flags <- getOpts opt_L + -- The -h option passes the file name for unlit to put in a #line directive + 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 @@ -328,77 +372,108 @@ run_phase Cpp basename suff input_fn output_fn checkProcessArgsResult unhandled_flags basename suff do_cpp <- dynFlag cppFlag - if do_cpp - then do - cpp <- readIORef v_Pgm_P - hscpp_opts <- getOpts opt_P + 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 - runSomething "C pre-processor" - (unwords - (["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 ++ "\" #-}' > " - ++ output_fn ++ " && cat " ++ input_fn - ++ " >> " ++ output_fn) - 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.Option input_fn + -- We hackily use Option instead of FileOption here, so that the file + -- name is not back-slashed on Windows. cpp is capable of + -- dealing with / in filenames, so it works fine. Furthermore + -- if we put in backslashes, cpp outputs #line directives + -- with *double* backslashes. And that in turn means that + -- our error messages get double backslashes in them. + -- In due course we should arrange that the lexer deals + -- with these \\ escapes properly. + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ]) + return (Just output_fn) + +------------------------------------------------------------------------------- +-- HsPp phase +run_phase HsPp basename suff input_fn output_fn + = do src_opts <- getOptionsFromSource input_fn + unhandled_flags <- processArgs dynamic_flags src_opts [] + checkProcessArgsResult unhandled_flags basename suff + + let orig_fn = basename ++ '.':suff + do_pp <- dynFlag ppFlag + if not do_pp then + -- no need to preprocess, just pass input file along + -- to the next phase of the pipeline. + return (Just input_fn) + else do + hspp_opts <- getOpts opt_F + hs_src_pp_opts <- readIORef v_Hs_source_pp_opts + SysTools.runPp ( [ SysTools.Option orig_fn + , SysTools.Option input_fn + , SysTools.FileOption "" output_fn + ] ++ + map SysTools.Option hs_src_pp_opts ++ + map SysTools.Option hspp_opts + ) + return (Just output_fn) ----------------------------------------------------------------------------- -- MkDependHS phase -run_phase MkDependHS basename suff input_fn _output_fn = do - src <- readFile input_fn - let (import_sources, import_normals, module_name) = getImports src +run_phase MkDependHS basename suff input_fn output_fn + = do src <- readFile input_fn + let (import_sources, import_normals, _) = getImports src + let orig_fn = basename ++ '.':suff + deps_sources <- mapM (findDependency True orig_fn) import_sources + deps_normals <- mapM (findDependency False orig_fn) import_normals + let deps = deps_sources ++ deps_normals - deps_sources <- mapM (findDependency True src) import_sources - deps_normals <- mapM (findDependency False src) import_normals - let deps = deps_sources ++ deps_normals + osuf_opt <- readIORef v_Object_suf + let osuf = case osuf_opt of + Nothing -> phaseInputExt Ln + Just s -> s - osuf_opt <- readIORef v_Object_suf - let osuf = case osuf_opt of - Nothing -> phaseInputExt Ln - Just s -> s + extra_suffixes <- readIORef v_Dep_suffixes + let suffixes = osuf : map (++ ('_':osuf)) extra_suffixes + ofiles = map (\suf -> basename ++ '.':suf) suffixes - extra_suffixes <- readIORef v_Dep_suffixes - let suffixes = osuf : map (++ ('_':osuf)) extra_suffixes - ofiles = map (\suf -> basename ++ '.':suf) suffixes - - objs <- mapM odir_ify ofiles - - hdl <- readIORef v_Dep_tmp_hdl + 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 - hPutStrLn hdl (unwords objs ++ " : " ++ basename ++ '.':suff) - - let genDep (dep, False {- not an hi file -}) = - hPutStrLn hdl (unwords objs ++ " : " ++ dep) - genDep (dep, True {- is an hi file -}) = do - hisuf <- readIORef v_Hi_suf - let dep_base = remove_suffix '.' dep - deps = (dep_base ++ hisuf) - : map (\suf -> dep_base ++ suf ++ '_':hisuf) extra_suffixes + hPutStrLn hdl (unwords objs ++ " : " ++ basename ++ '.':suff) + + let genDep (dep, False {- not an hi file -}) = + hPutStrLn hdl (unwords objs ++ " : " ++ dep) + genDep (dep, True {- is an hi file -}) = do + hisuf <- readIORef v_Hi_suf + let dep_base = remove_suffix '.' dep + deps = (dep_base ++ hisuf) + : map (\suf -> dep_base ++ suf ++ '_':hisuf) extra_suffixes -- length objs should be == length deps - sequence_ (zipWith (\o d -> hPutStrLn hdl (o ++ " : " ++ d)) objs deps) - - mapM genDep [ d | Just d <- deps ] + sequence_ (zipWith (\o d -> hPutStrLn hdl (o ++ " : " ++ d)) objs deps) - return True + sequence_ (map genDep [ d | Just d <- deps ]) + return (Just output_fn) -- add the lines to dep_makefile: -- always: @@ -434,19 +509,12 @@ run_phase Hsc basename suff input_fn output_fn paths <- readIORef v_Include_paths writeIORef v_Include_paths (current_dir : paths) - -- figure out where to put the .hi file - ohi <- readIORef v_Output_hi - hisuf <- readIORef v_Hi_suf - let hifile = case ohi of - Nothing -> basename ++ '.':hisuf - Just fn -> fn - -- figure out which header files to #include in a generated .hc file c_includes <- getPackageCIncludes cmdline_includes <- dynFlag cmdlineHcIncludes -- -#include options let cc_injects = unlines (map mk_include - (c_includes ++ reverse cmdline_includes)) + (c_includes ++ reverse cmdline_includes)) mk_include h_file = case h_file of '"':_{-"-} -> "#include "++h_file @@ -455,6 +523,18 @@ run_phase Hsc basename suff input_fn output_fn writeIORef v_HCHeader cc_injects + -- gather the imports and module name + (srcimps,imps,mod_name) <- getImportsFromFile input_fn + + -- build a ModuleLocation to pass to hscMain. + (mod, location') + <- mkHomeModuleLocn mod_name basename (basename ++ '.':suff) + + -- take -ohi into account if present + ohi <- readIORef v_Output_hi + let location | Just fn <- ohi = location'{ ml_hi_file = fn } + | otherwise = location' + -- figure out if the source has changed, for recompilation avoidance. -- only do this if we're eventually going to generate a .o file. -- (ToDo: do when generating .hc files too?) @@ -464,10 +544,13 @@ run_phase Hsc basename suff input_fn output_fn -- changed (which the compiler itself figures out). -- Setting source_unchanged to False tells the compiler that M.o is out of -- 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 <- osuf_ify o_file' + do_recomp <- readIORef v_Recomp + todo <- readIORef v_GhcMode + expl_o_file <- readIORef v_Output_file + let o_file = + case expl_o_file of + Nothing -> unJust "source_unchanged" (ml_obj_file location) + Just x -> x source_unchanged <- if not (do_recomp && ( todo == DoLink || todo == StopBefore Ln )) then return False @@ -480,19 +563,13 @@ run_phase Hsc basename suff input_fn output_fn then return True else return False - -- 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 + dyn_flags <- getDynFlags let dyn_flags' = dyn_flags { hscOutName = output_fn, hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h" } + hscStubHOutName = basename ++ "_stub.h", + extCoreName = basename ++ ".hcr" } -- run the compiler! pcs <- initPersistentCompilerState @@ -510,22 +587,20 @@ run_phase Hsc basename suff input_fn output_fn HscFail pcs -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)); - HscNoRecomp pcs details iface -> - do { - runSomething "Touching object file" ("touch " ++ o_file); - return False; - }; + HscNoRecomp pcs details iface -> do { SysTools.touch "Touching object file" o_file + ; 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) } ----------------------------------------------------------------------------- @@ -536,9 +611,8 @@ 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 <- readIORef v_Pgm_c - cc_opts <- (getOpts opt_c) - cmdline_include_dirs <- readIORef v_Include_paths + = do cc_opts <- getOpts opt_c + cmdline_include_paths <- readIORef v_Include_paths let hcc = cc_phase == HCc @@ -546,8 +620,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 @@ -565,22 +639,25 @@ run_phase cc_phase basename suff input_fn output_fn | otherwise = [ ] excessPrecision <- readIORef v_Excess_precision - - runSomething "C Compiler" - (unwords ([ cc, "-x", "c", input_fn, "-o", output_fn ] - ++ md_c_flags - ++ (if cc_phase == HCc && mangle - then md_regd_c_flags - else []) - ++ [ verb, "-S", "-Wimplicit", opt_flag ] - ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] - ++ cc_opts - ++ split_opt - ++ (if excessPrecision then [] else [ "-ffloat-store" ]) - ++ include_paths - ++ pkg_extra_cc_opts - )) - return True + 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 []) + ++ [ verb, "-S", "-Wimplicit", opt_flag ] + ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] + ++ cc_opts + ++ split_opt + ++ (if excessPrecision then [] else [ "-ffloat-store" ]) + ++ include_paths + ++ pkg_extra_cc_opts + )) + return (Just output_fn) -- ToDo: postprocess the output from gcc @@ -588,90 +665,114 @@ run_phase cc_phase basename suff input_fn output_fn -- Mangle phase run_phase Mangle _basename _suff input_fn output_fn - = do mangler <- readIORef v_Pgm_m - mangler_opts <- getOpts opt_m - machdep_opts <- - if (prefixMatch "i386" cTARGETPLATFORM) - then do n_regs <- dynFlag stolen_x86_regs - return [ show n_regs ] - else return [] - runSomething "Assembly Mangler" - (unwords (mangler : - mangler_opts - ++ [ input_fn, output_fn ] - ++ machdep_opts - )) - return True + = do mangler_opts <- getOpts opt_m + machdep_opts <- if (prefixMatch "i386" cTARGETPLATFORM) + then do n_regs <- dynFlag stolen_x86_regs + return [ show n_regs ] + else return [] + + 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 - = do splitter <- readIORef v_Pgm_s - - -- this is the prefix used for the split .s files - tmp_pfx <- readIORef v_TmpDir - x <- myGetProcessID - let split_s_prefix = tmp_pfx ++ "/ghc" ++ show x - writeIORef v_Split_prefix split_s_prefix - addFilesToClean [split_s_prefix ++ "__*"] -- d:-) - - -- allocate a tmp file to put the no. of split .s files in (sigh) - n_files <- newTempName "n_files" - - runSomething "Split Assembly File" - (unwords [ splitter - , input_fn - , split_s_prefix - , n_files ] - ) - - -- save the number of split files for future references - s <- readFile n_files - let n = read s :: Int - writeIORef v_N_split_files n - return True +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 [ 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 + let n_files = read s :: Int + writeIORef v_Split_info (split_s_prefix, n_files) + + -- Remember to delete all these files + addFilesToClean [ split_s_prefix ++ "__" ++ show n ++ ".s" + | n <- [1..n_files]] + + return (Just output_fn) ----------------------------------------------------------------------------- -- As phase run_phase As _basename _suff input_fn output_fn - = do as <- readIORef v_Pgm_a - as_opts <- getOpts opt_a - + = do as_opts <- getOpts opt_a cmdline_include_paths <- readIORef v_Include_paths - let cmdline_include_flags = map (\p -> "-I"++p) cmdline_include_paths - runSomething "Assembler" - (unwords (as : as_opts - ++ cmdline_include_flags - ++ [ "-c", input_fn, "-o", output_fn ] - )) - return True -run_phase SplitAs basename _suff _input_fn _output_fn - = do as <- readIORef v_Pgm_a - as_opts <- getOpts opt_a + 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) - split_s_prefix <- readIORef v_Split_prefix - n <- readIORef v_N_split_files +run_phase SplitAs basename _suff _input_fn output_fn + = do as_opts <- getOpts opt_a + + (split_s_prefix, n) <- readIORef v_Split_info odir <- readIORef v_Output_dir let real_odir = case odir of Nothing -> basename Just d -> d - let assemble_file n = do - let input_s = split_s_prefix ++ "__" ++ show n ++ ".s" + let assemble_file n + = do let input_s = split_s_prefix ++ "__" ++ show n ++ ".s" let output_o = newdir real_odir (basename ++ "__" ++ show n ++ ".o") real_o <- osuf_ify output_o - runSomething "Assembler" - (unwords (as : 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 @@ -686,13 +787,12 @@ run_phase SplitAs basename _suff _input_fn _output_fn run_phase_MoveBinary input_fn = do - top_dir <- readIORef v_TopDir + sysMan <- getSysMan pvm_root <- getEnv "PVM_ROOT" pvm_arch <- getEnv "PVM_ARCH" let pvm_executable_base = "=" ++ input_fn pvm_executable = pvm_root ++ "/bin/" ++ pvm_arch ++ "/" ++ pvm_executable_base - sysMan = top_dir ++ "/ghc/rts/parallel/SysMan"; -- nuke old binary; maybe use configur'ed names for cp and rm? system ("rm -f " ++ pvm_executable) -- move the newly created binary into PVM land @@ -772,10 +872,8 @@ checkProcessArgsResult flags basename suff doLink :: [String] -> IO () doLink o_files = do - ln <- readIORef v_Pgm_l - verb <- getVerbFlag - static <- readIORef v_Static - let imp = if static then "" else "_imp" + verb <- getVerbFlag + static <- readIORef v_Static no_hs_main <- readIORef v_NoHsMain o_file <- readIORef v_Output_file @@ -788,7 +886,8 @@ doLink o_files = do let lib_path_opts = map ("-L"++) lib_paths pkg_libs <- getPackageLibraries - let pkg_lib_opts = map (\lib -> "-l" ++ lib ++ imp) pkg_libs + let imp = if static then "" else "_imp" + pkg_lib_opts = map (\lib -> "-l" ++ lib ++ imp) pkg_libs libs <- readIORef v_Cmdline_libraries let lib_opts = map ("-l"++) (reverse libs) @@ -804,53 +903,46 @@ doLink o_files = do 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 "Linker" - (unwords - ([ ln, verb, "-o", output_fn ] - ++ md_c_flags - ++ o_files -#ifdef mingw32_TARGET_OS - ++ extra_os -#endif - ++ extra_ld_inputs - ++ lib_path_opts - ++ lib_opts - ++ pkg_lib_path_opts - ++ pkg_lib_opts - ++ pkg_extra_ld_opts - ++ extra_ld_opts -#ifdef mingw32_TARGET_OS - ++ if static then [ "-u _PrelMain_mainIO_closure" , "-u ___init_PrelMain"] else [] -#else - ++ [ "-u PrelMain_mainIO_closure" , "-u __init_PrelMain"] -#endif - ) - ) + 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 + ++ lib_path_opts + ++ lib_opts + ++ pkg_lib_path_opts + ++ pkg_lib_opts + ++ pkg_extra_ld_opts + ++ extra_ld_opts + ++ 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 - when (WayPar `elem` ways_) (do - success <- run_phase_MoveBinary output_fn - if success then return () - else throwDyn (InstallationError ("cannot move binary to PVM dir"))) + when (WayPar `elem` ways_) + (do success <- run_phase_MoveBinary output_fn + if success then return () + else throwDyn (InstallationError ("cannot move binary to PVM dir"))) ----------------------------------------------------------------------------- --- Making a DLL +-- Making a DLL (only for Win32) --- 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" + verb <- getVerbFlag + static <- readIORef v_Static no_hs_main <- readIORef v_NoHsMain o_file <- readIORef v_Output_file @@ -863,7 +955,8 @@ doMkDLL o_files = do let lib_path_opts = map ("-L"++) lib_paths pkg_libs <- getPackageLibraries - let pkg_lib_opts = map (\lib -> "-l" ++ lib ++ imp) pkg_libs + let imp = if static then "" else "_imp" + pkg_lib_opts = map (\lib -> "-l" ++ lib ++ imp) pkg_libs libs <- readIORef v_Cmdline_libraries let lib_opts = map ("-l"++) (reverse libs) @@ -879,22 +972,23 @@ doMkDLL o_files = do 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 + SysTools.runMkDLL + ([ SysTools.Option verb + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option ( + md_c_flags ++ o_files -#ifdef mingw32_TARGET_OS ++ extra_os ++ [ "--target=i386-mingw32" ] -#endif ++ extra_ld_inputs ++ lib_path_opts ++ lib_opts @@ -905,8 +999,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 @@ -914,12 +1007,14 @@ doMkDLL o_files = do preprocess :: FilePath -> IO FilePath preprocess filename = - ASSERT(haskellish_file filename) - do init_dyn_flags <- readIORef v_InitDynFlags - writeIORef v_DynFlags init_dyn_flags + ASSERT(haskellish_src_file filename) + do restoreDynFlags -- Restore to state of last save + let fInfo = (filename, getFileSuffix filename) pipeline <- genPipeline (StopBefore Hsc) ("preprocess") False - defaultHscLang filename - runPipeline pipeline filename False{-no linking-} False{-no -o flag-} + defaultHscLang fInfo + (fn,_) <- runPipeline pipeline fInfo + False{-no linking-} False{-no -o flag-} + return fn ----------------------------------------------------------------------------- -- Compile a single module, under the control of the compilation manager. @@ -960,13 +1055,13 @@ data CompResult compile ghci_mode summary source_unchanged have_object old_iface hst hit pcs = do - init_dyn_flags <- readIORef v_InitDynFlags - writeIORef v_DynFlags init_dyn_flags + dyn_flags <- restoreDynFlags -- Restore to the state of the last save - showPass init_dyn_flags + + showPass dyn_flags (showSDoc (text "Compiling" <+> ppr (name_of_summary summary))) - let verb = verbosity init_dyn_flags + let verb = verbosity 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) @@ -975,27 +1070,58 @@ compile ghci_mode summary source_unchanged have_object opts <- getOptionsFromSource input_fnpp processArgs dynamic_flags opts [] - dyn_flags <- readIORef v_DynFlags + dyn_flags <- getDynFlags - let hsc_lang = hscLang dyn_flags - output_fn <- case hsc_lang of - HscAsm -> newTempName (phaseInputExt As) - HscC -> newTempName (phaseInputExt HCc) - HscJava -> newTempName "java" -- ToDo + let hsc_lang = hscLang dyn_flags + (basename, _) = splitFilename input_fn + + keep_hc <- readIORef v_Keep_hc_files +#ifdef ILX + keep_il <- readIORef v_Keep_il_files +#endif + 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 -> newTempName "ilx" -- ToDo + HscILX | keep_il -> return (basename ++ '.':phaseInputExt Ilasm) + | otherwise -> newTempName (phaseInputExt Ilx2Il) #endif - HscInterpreted -> return (error "no output file") + HscInterpreted -> return (error "no output file") + HscNothing -> return (error "no output file") - let (basename, _) = splitFilename input_fn - dyn_flags' = dyn_flags { hscOutName = output_fn, + let dyn_flags' = dyn_flags { hscOutName = output_fn, hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h" } + hscStubHOutName = basename ++ "_stub.h", + extCoreName = basename ++ ".hcr" } + + -- figure out which header files to #include in a generated .hc file + c_includes <- getPackageCIncludes + cmdline_includes <- dynFlag cmdlineHcIncludes -- -#include options + + let cc_injects = unlines (map mk_include + (c_includes ++ reverse cmdline_includes)) + mk_include h_file = + case h_file of + '"':_{-"-} -> "#include "++h_file + '<':_ -> "#include "++h_file + _ -> "#include \""++h_file++"\"" + + 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) @@ -1018,19 +1144,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) @@ -1048,8 +1178,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)