X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=3464c57a4706a030e81231df3bf980d810ab143c;hb=7d6569fbc7a7c8f9d45cf31bd6a7f699c86715fb;hp=06a44fc9da6683e098cf94391e8601f0ce8a4262;hpb=d68df63f75b4f614b0838ac45e6f7a8752167a16;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 06a44fc..3464c57 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.26 2000/11/15 15:43:31 sewardj Exp $ +-- $Id: DriverPipeline.hs,v 1.59 2001/03/26 12:28:15 simonmar Exp $ -- -- GHC Driver -- @@ -7,23 +7,28 @@ -- ----------------------------------------------------------------------------- +#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 CmSummarise -import CmLink +import CmStaticInfo +import CmTypes +import GetImports import DriverState import DriverUtil import DriverMkDepend @@ -31,13 +36,17 @@ 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 ) import Directory import System import IOExts @@ -47,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 @@ -63,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 @@ -82,17 +95,17 @@ 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 -- -- Herein is all the magic about which phases to run in which order, whether --- the intermediate files should be in /tmp or in the current directory, +-- the intermediate files should be in TMPDIR or in the current directory, -- 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 @@ -108,13 +121,13 @@ 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 | Persistent - deriving (Eq) + deriving (Eq, Show) genPipeline :: GhcMode -- when to stop @@ -141,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 @@ -168,12 +185,17 @@ 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 ] +#endif | cish = [ Cc, As ] | otherwise = [ ] -- just pass this file through to the linker -- ToDo: this is somewhat cryptic + not_valid = throwDyn (OtherError ("invalid option combination")) ----------- ----- ---- --- -- -- - - - @@ -183,18 +205,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 @@ -226,18 +236,33 @@ 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 - annotated_pipeline = annotatePipeline (pipeline ++ [ Ln ]) stop_phase + 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 @@ -286,7 +311,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 @@ -297,14 +322,9 @@ run_phase Unlit _basename _suff input_fn output_fn run_phase Cpp basename suff input_fn output_fn = do src_opts <- getOptionsFromSource input_fn unhandled_flags <- processArgs dynamic_flags src_opts [] + checkProcessArgsResult unhandled_flags basename suff - when (not (null unhandled_flags)) - (throwDyn (OtherError ( - basename ++ "." ++ suff - ++ ": 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 @@ -316,19 +336,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 @@ -338,7 +361,7 @@ run_phase Cpp basename suff input_fn output_fn run_phase MkDependHS basename suff input_fn _output_fn = do src <- readFile input_fn - let (import_sources, import_normals) = getImports src + let (import_sources, import_normals, module_name) = getImports src deps_sources <- mapM (findDependency True basename) import_sources deps_normals <- mapM (findDependency False basename) import_normals @@ -415,6 +438,20 @@ run_phase Hsc basename suff input_fn output_fn 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)) + mk_include h_file = + case h_file of + '"':_{-"-} -> "#include "++h_file + '<':_ -> "#include "++h_file + _ -> "#include \""++h_file++"\"" + + writeIORef v_HCHeader cc_injects + -- 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?) @@ -426,7 +463,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 @@ -439,22 +477,27 @@ 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 + let dyn_flags' = dyn_flags { hscOutName = output_fn, + hscStubCOutName = basename ++ "_stub.c", + hscStubHOutName = basename ++ "_stub.h" } + -- run the compiler! pcs <- initPersistentCompilerState - result <- hscMain dyn_flags{ hscOutName = output_fn } + result <- hscMain OneShot + dyn_flags' mod + location{ ml_hspp_file=Just input_fn } source_unchanged - location + False Nothing -- no iface emptyModuleEnv -- HomeSymbolTable emptyModuleEnv -- HomeIfaceTable @@ -464,17 +507,22 @@ 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 stub_h_exists stub_c_exists + _maybe_interpreted_code -> do -- deal with stubs - maybe_stub_o <- dealWithStubs basename maybe_stub_h maybe_stub_c + 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 - let keep_going = case maybe_iface of Just _ -> True; Nothing -> False - return keep_going + return True } ----------------------------------------------------------------------------- @@ -483,7 +531,7 @@ run_phase Hsc basename suff input_fn output_fn -- we don't support preprocessing .c files (with -E) now. Doing so introduces -- way too many hacks, and I can't say I've ever used it anyway. -run_phase cc_phase _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) @@ -498,30 +546,10 @@ run_phase cc_phase _basename _suff input_fn output_fn let include_paths = map (\p -> "-I"++p) (cmdline_include_dirs ++ pkg_include_dirs) - c_includes <- getPackageCIncludes - cmdline_includes <- readState cmdline_hc_includes -- -#include options - - let cc_injects | hcc = unlines (map mk_include - (c_includes ++ reverse cmdline_includes)) - | otherwise = "" - mk_include h_file = - case h_file of - '"':_{-"-} -> "#include "++h_file - '<':_ -> "#include "++h_file - _ -> "#include \""++h_file++"\"" - - cc_help <- newTempName "c" - h <- openFile cc_help WriteMode - hPutStr h cc_injects - hPutStrLn h ("#include \"" ++ input_fn ++ "\"\n") - hClose h - - ccout <- newTempName "ccout" - 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" @@ -535,8 +563,8 @@ run_phase cc_phase _basename _suff input_fn output_fn excessPrecision <- readIORef v_Excess_precision - run_something "C Compiler" - (unwords ([ cc, "-x", "c", cc_help, "-o", output_fn ] + 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 @@ -545,13 +573,9 @@ 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 --- ++ [">", ccout] )) return True @@ -565,10 +589,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 ] @@ -592,7 +616,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 @@ -609,12 +633,12 @@ run_phase SplitMangle _basename _suff input_fn _output_fn -- As phase run_phase As _basename _suff input_fn output_fn - = do as <- readIORef v_Pgm_a + = do as <- readIORef v_Pgm_a as_opts <- getOpts opt_a 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 ] @@ -638,7 +662,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 ] )) @@ -647,12 +671,106 @@ run_phase SplitAs basename _suff _input_fn _output_fn return True ----------------------------------------------------------------------------- +-- MoveBinary sort-of-phase +-- After having produced a binary, move it somewhere else and generate a +-- wrapper script calling the binary. Currently, we need this only in +-- a parallel way (i.e. in GUM), because PVM expects the binary in a +-- central directory. +-- This is called from doLink below, after linking. I haven't made it +-- a separate phase to minimise interfering with other modules, and +-- we don't need the generality of a phase (MoveBinary is always +-- done after linking and makes only sense in a parallel setup) -- HWL + +run_phase_MoveBinary input_fn + = do + top_dir <- readIORef v_TopDir + 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 + system ("cp -p " ++ input_fn ++ " " ++ pvm_executable) + -- generate a wrapper script for running a parallel prg under PVM + writeFile input_fn (mk_pvm_wrapper_script pvm_executable pvm_executable_base sysMan) + return True + +-- generates a Perl skript starting a parallel prg under PVM +mk_pvm_wrapper_script :: String -> String -> String -> String +mk_pvm_wrapper_script pvm_executable pvm_executable_base sysMan = unlines $ + [ + "eval 'exec perl -S $0 ${1+\"$@\"}'", + " if $running_under_some_shell;", + "# =!=!=!=!=!=!=!=!=!=!=!", + "# This script is automatically generated: DO NOT EDIT!!!", + "# Generated by Glasgow Haskell Compiler", + "# ngoqvam choHbogh vaj' vIHoHnISbej !!!!", + "#", + "$pvm_executable = '" ++ pvm_executable ++ "';", + "$pvm_executable_base = '" ++ pvm_executable_base ++ "';", + "$SysMan = '" ++ sysMan ++ "';", + "", + {- ToDo: add the magical shortcuts again iff we actually use them -- HWL + "# first, some magical shortcuts to run "commands" on the binary", + "# (which is hidden)", + "if ($#ARGV == 1 && $ARGV[0] eq '+RTS' && $ARGV[1] =~ /^--((size|file|strip|rm|nm).*)/ ) {", + " local($cmd) = $1;", + " system("$cmd $pvm_executable");", + " exit(0); # all done", + "}", -} + "", + "# Now, run the real binary; process the args first", + "$ENV{'PE'} = $pvm_executable_base;", -- ++ pvm_executable_base, + "$debug = '';", + "$nprocessors = 0; # the default: as many PEs as machines in PVM config", + "@nonPVM_args = ();", + "$in_RTS_args = 0;", + "", + "args: while ($a = shift(@ARGV)) {", + " if ( $a eq '+RTS' ) {", + " $in_RTS_args = 1;", + " } elsif ( $a eq '-RTS' ) {", + " $in_RTS_args = 0;", + " }", + " if ( $a eq '-d' && $in_RTS_args ) {", + " $debug = '-';", + " } elsif ( $a =~ /^-qN(\\d+)/ && $in_RTS_args ) {", + " $nprocessors = $1;", + " } elsif ( $a =~ /^-qp(\\d+)/ && $in_RTS_args ) {", + " $nprocessors = $1;", + " } else {", + " push(@nonPVM_args, $a);", + " }", + "}", + "", + "local($return_val) = 0;", + "# Start the parallel execution by calling SysMan", + "system(\"$SysMan $debug $pvm_executable $nprocessors @nonPVM_args\");", + "$return_val = $?;", + "# ToDo: fix race condition moving files and flushing them!!", + "system(\"cp $ENV{'HOME'}/$pvm_executable_base.???.gr .\") if -f \"$ENV{'HOME'}/$pvm_executable_base.002.gr\";", + "exit($return_val);" + ] + +----------------------------------------------------------------------------- +-- Complain about non-dynamic flags in OPTIONS pragmas + +checkProcessArgsResult flags basename suff + = do when (not (null flags)) (throwDyn (OtherError ( + basename ++ "." ++ suff + ++ ": static flags are not allowed in {-# OPTIONS #-} pragmas:\n\t" + ++ unwords flags)) (ExitFailure 1)) + +----------------------------------------------------------------------------- -- Linking 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 @@ -686,12 +804,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 @@ -713,6 +830,80 @@ doLink o_files = do #endif ) ) + -- 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 (OtherError ("cannot move binary to PVM dir"))) + +----------------------------------------------------------------------------- +-- 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 @@ -721,11 +912,12 @@ doLink o_files = do preprocess :: FilePath -> IO FilePath preprocess filename = ASSERT(haskellish_file filename) - do pipeline <- genPipeline (StopBefore Hsc) ("preprocess") False + 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. -- @@ -740,7 +932,12 @@ preprocess filename = -- the .hs file if necessary, and compiling up the .stub_c files to -- generate Linkables. -compile :: ModSummary -- summary, including source +-- NB. No old interface can also mean that the source has changed. + +compile :: GhciMode -- distinguish batch from interactive + -> ModSummary -- summary, including source + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have object -> Maybe ModIface -- old interface, if available -> HomeSymbolTable -- for home module ModDetails -> HomeIfaceTable -- for home module Ifaces @@ -748,29 +945,30 @@ compile :: ModSummary -- summary, including source -> 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 summary old_iface hst hit pcs = do - verb <- readIORef v_Verbose - when verb (hPutStrLn stderr - (showSDoc (text "compile: compiling" - <+> ppr (name_of_summary summary)))) - +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 - 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))) + + 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 (hPutStrLn stderr ("compile: input file " ++ input_fnpp)) + when (verb >= 2) (hPutStrLn stderr ("compile: input file " ++ input_fnpp)) opts <- getOptionsFromSource input_fnpp processArgs dynamic_flags opts [] @@ -781,86 +979,74 @@ compile summary old_iface hst hit pcs = do HscAsm -> newTempName (phaseInputExt As) HscC -> newTempName (phaseInputExt HCc) HscJava -> newTempName "java" -- ToDo +#ifdef ILX + HscILX -> newTempName "ilx" -- ToDo +#endif HscInterpreted -> return (error "no output file") + let (basename, _) = splitFilename input_fn + dyn_flags' = dyn_flags { hscOutName = output_fn, + hscStubCOutName = basename ++ "_stub.c", + hscStubHOutName = basename ++ "_stub.h" } + -- run the compiler - hsc_result <- hscMain dyn_flags{ hscOutName = output_fn } - False -- (panic "compile:source_unchanged") - location old_iface hst hit pcs + hsc_result <- hscMain ghci_mode dyn_flags' + (ms_mod summary) location + source_unchanged have_object 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) - let (basename, _) = splitFilename input_fn - maybe_stub_o <- dealWithStubs basename maybe_stub_h maybe_stub_c + HscRecomp pcs details iface + stub_h_exists stub_c_exists maybe_interpreted_code -> do + + let + maybe_stub_o <- compileStub dyn_flags' stub_c_exists 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 hsc_lang output_fn - o_file <- runPipeline pipe output_fn False False - return [ DotO o_file ] + -- 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_time <- getModificationTime o_file + return ([DotO o_file], o_time) - let linkable = LM (moduleName (ms_mod summary)) - (hs_unlinked ++ stub_unlinked) + let linkable = LM unlinked_time (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) -dealWithStubs basename maybe_stub_h maybe_stub_c - - = do let stub_h = basename ++ "_stub.h" - let stub_c = basename ++ "_stub.c" +compileStub dflags stub_c_exists + | not stub_c_exists = return Nothing + | 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-} - -- copy the .stub_h file into the current dir if necessary - case maybe_stub_h of - Nothing -> return () - Just tmp_stub_h -> do - run_something "Copy stub .h file" - ("cp " ++ tmp_stub_h ++ ' ':stub_h) - - -- #include <..._stub.h> in .hc file - addCmdlineHCInclude tmp_stub_h -- hack - - -- copy the .stub_c file into the current dir, and compile it, if necessary - 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" - (unwords [ - "rm -f", stub_c, "&&", - "echo \'#include \""++stub_h++"\"\' >"++stub_c, " &&", - "cat", tmp_stub_c, ">> ", stub_c - ]) - - -- compile the _stub.c file w/ gcc - pipeline <- genPipeline (StopBefore Ln) "" True - defaultHscLang stub_c - stub_o <- runPipeline pipeline stub_c False{-no linking-} - False{-no -o option-} - - return (Just stub_o) + return (Just stub_o)