X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=f0e2db99e36327807cf7195dfc9adf351d772ec1;hb=da25d580440a2b6a30eabedff19e7a6970f35991;hp=5a433fad274885573454691c282f15a2ffed0aba;hpb=cf2aab8a7cb0b74ec23453639503dd8c6f8e1353;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 5a433fa..f0e2db9 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.55 2001/03/15 11:26:27 simonmar Exp $ +-- $Id: DriverPipeline.hs,v 1.62 2001/03/28 16:51:03 simonmar Exp $ -- -- GHC Driver -- @@ -94,7 +94,7 @@ getGhcMode flags ([] , rest) -> return (rest, DoLink, "") -- default is to do linking ([(flag,one)], rest) -> return (rest, one, flag) (_ , _ ) -> - throwDyn (OtherError + throwDyn (UsageError "only one of the flags -M, -E, -C, -S, -c, --make, --interactive, -mk-dll is allowed") ----------------------------------------------------------------------------- @@ -148,6 +148,9 @@ genPipeline todo stop_flag persistent_output lang filename 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") +#endif osuf <- readIORef v_Object_suf let @@ -195,13 +198,14 @@ genPipeline todo stop_flag persistent_output lang filename | otherwise = [ ] -- just pass this file through to the linker -- ToDo: this is somewhat cryptic - not_valid = throwDyn (OtherError ("invalid option combination")) + + not_valid = throwDyn (UsageError ("invalid option combination")) ----------- ----- ---- --- -- -- - - - -- this shouldn't happen. if start_phase /= Ln && start_phase `notElem` pipeline - then throwDyn (OtherError ("can't find starting phase for " - ++ filename)) + then throwDyn (CmdLineError ("can't find starting phase for " + ++ filename)) else do let @@ -240,7 +244,8 @@ genPipeline todo stop_flag persistent_output lang filename StopBefore phase -> phase DoMkDependHS -> Ln DoLink -> Ln - annotated_pipeline = annotatePipeline (pipeline ++ [ Ln ]) stop_phase + + annotated_pipeline = annotatePipeline (pipeline ++ [Ln]) stop_phase phase_ne p (p1,_,_) = (p1 /= p) ----------- ----- ---- --- -- -- - - - @@ -251,7 +256,7 @@ genPipeline todo stop_flag persistent_output lang filename -- is already in linkable form (for example). if start_phase `elem` pipeline && (stop_phase /= Ln && stop_phase `notElem` pipeline) - then throwDyn (OtherError + then throwDyn (UsageError ("flag " ++ stop_flag ++ " is incompatible with source file `" ++ filename ++ "'")) else do @@ -320,12 +325,7 @@ 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 [] - - when (not (null unhandled_flags)) - (throwDyn (OtherError ( - basename ++ "." ++ suff - ++ ": static flags are not allowed in {-# OPTIONS #-} pragmas:\n\t" - ++ unwords unhandled_flags)) (ExitFailure 1)) + checkProcessArgsResult unhandled_flags basename suff do_cpp <- dynFlag cppFlag if do_cpp @@ -366,8 +366,8 @@ run_phase MkDependHS basename suff input_fn _output_fn = do src <- readFile input_fn 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 + 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 @@ -441,6 +441,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?) @@ -476,11 +490,14 @@ run_phase Hsc basename suff input_fn output_fn -- 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 OneShot - dyn_flags{ hscOutName = output_fn } - mod + dyn_flags' mod location{ ml_hspp_file=Just input_fn } source_unchanged False @@ -499,11 +516,11 @@ run_phase Hsc basename suff input_fn output_fn return False; }; - HscRecomp pcs details iface maybe_stub_h maybe_stub_c + 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 @@ -517,7 +534,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) @@ -532,26 +549,6 @@ 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 <- dynFlag cmdlineHcIncludes -- -#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 @@ -570,7 +567,7 @@ run_phase cc_phase _basename _suff input_fn output_fn excessPrecision <- readIORef v_Excess_precision runSomething "C Compiler" - (unwords ([ cc, "-x", "c", cc_help, "-o", output_fn ] + (unwords ([ cc, "-x", "c", input_fn, "-o", output_fn ] ++ md_c_flags ++ (if cc_phase == HCc && mangle then md_regd_c_flags @@ -582,7 +579,6 @@ run_phase cc_phase _basename _suff input_fn output_fn ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts --- ++ [">", ccout] )) return True @@ -678,6 +674,100 @@ 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 (ProgramError ( + basename ++ "." ++ suff + ++ ": static flags are not allowed in {-# OPTIONS #-} pragmas:\n\t" + ++ unwords flags)) (ExitFailure 1)) + +----------------------------------------------------------------------------- -- Linking doLink :: [String] -> IO () @@ -743,6 +833,12 @@ 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 (InstallationError ("cannot move binary to PVM dir"))) ----------------------------------------------------------------------------- -- Making a DLL @@ -891,8 +987,13 @@ compile ghci_mode summary source_unchanged have_object #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 ghci_mode dyn_flags{ hscOutName = output_fn } + hsc_result <- hscMain ghci_mode dyn_flags' (ms_mod summary) location source_unchanged have_object old_iface hst hit pcs @@ -902,10 +1003,10 @@ compile ghci_mode summary source_unchanged have_object HscNoRecomp pcs details iface -> return (CompOK pcs details iface Nothing) HscRecomp pcs details iface - maybe_stub_h maybe_stub_c maybe_interpreted_code -> do + stub_h_exists stub_c_exists maybe_interpreted_code -> do - let (basename, _) = splitFilename input_fn - maybe_stub_o <- dealWithStubs basename maybe_stub_h maybe_stub_c + 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 ] @@ -942,36 +1043,13 @@ compile ghci_mode summary source_unchanged have_object ----------------------------------------------------------------------------- -- stub .h and .c files (for foreign export support) -dealWithStubs basename maybe_stub_h maybe_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-} - = do let stub_h = basename ++ "_stub.h" - let stub_c = basename ++ "_stub.c" - - -- copy the .stub_h file into the current dir if necessary - case maybe_stub_h of - Nothing -> return () - Just tmp_stub_h -> do - runSomething "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 - runSomething "Copy stub .c file" - (unwords [ - "rm -f", stub_c, "&&", - "echo \'#include \"Stg.h\"\n#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)