X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=4ab9f5527e6f0cb894a63545d891b3d2293c8ecc;hb=fb7a723bfd7650a705cb226e07c5b08b7a8e9279;hp=d7a7b7e21c4f0ad76293833adbb8a0d7ebb1e810;hpb=1146fac547be56172cd0432028e3f4e794e401cd;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index d7a7b7e..4ab9f55 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,4 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.93 2001/07/24 04:52:49 ken Exp $ -- -- GHC Driver -- @@ -174,8 +173,11 @@ genPipeline todo stop_flag persistent_output lang (filename,suffix) 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 ] @@ -264,7 +266,7 @@ runPipeline pipeline (input_fn,suffix) do_linking use_ofile where (basename, _) = splitFilename input_fn pipeLoop [] input_fn _ _ _ _ = return input_fn -pipeLoop ((phase, keep, o_suffix):phases) +pipeLoop (all_phases@((phase, keep, o_suffix):phases)) (input_fn,real_suff) do_linking use_ofile orig_basename orig_suffix = do @@ -275,7 +277,7 @@ pipeLoop ((phase, keep, o_suffix):phases) -- checker has determined that recompilation isn't necessary. case mbCarryOn of Nothing -> do - let (_,keep,final_suffix) = last phases + let (_,keep,final_suffix) = last all_phases ofile <- outputFileName True keep final_suffix return (ofile, final_suffix) -- carry on ... @@ -327,7 +329,12 @@ run_phase Unlit _basename _suff input_fn output_fn -- 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 (unlit_flags ++ ["-h", unDosifyPath input_fn, input_fn, output_fn]) + 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) ------------------------------------------------------------------------------- @@ -355,12 +362,17 @@ run_phase Cpp basename suff input_fn output_fn 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 ]) + 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) ----------------------------------------------------------------------------- @@ -458,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 @@ -524,13 +536,14 @@ run_phase Hsc basename suff input_fn output_fn 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 (Just output_fn) + -- 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) } ----------------------------------------------------------------------------- @@ -569,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 []) @@ -581,7 +599,7 @@ run_phase cc_phase basename suff input_fn output_fn ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts - ) + )) return (Just output_fn) -- ToDo: postprocess the output from gcc @@ -596,9 +614,11 @@ 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) + SysTools.runMangle (map SysTools.Option mangler_opts + ++ [ SysTools.FileOption "" input_fn + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option machdep_opts) return (Just output_fn) ----------------------------------------------------------------------------- @@ -610,7 +630,10 @@ run_phase SplitMangle _basename _suff input_fn output_fn 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 @@ -630,9 +653,13 @@ 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 ]) + 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 @@ -650,11 +677,46 @@ 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 (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 -- After having produced a binary, move it somewhere else and generate a @@ -790,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 @@ -802,14 +868,9 @@ doLink o_files = do ++ pkg_extra_ld_opts ++ extra_ld_opts ++ if static && not no_hs_main then -#ifdef LEADING_UNDERSCORE - [ "-u", "_PrelMain_mainIO_closure" , - "-u", "___init_PrelMain"] -#else - [ "-u", prefixUnderscore "PrelMain_mainIO_closure" , - "-u", prefixUnderscore "__init_PrelMain"] -#endif - else []) + [ "-u", prefixUnderscore "PrelMain_mainIO_closure", + "-u", prefixUnderscore "__stginit_PrelMain"] + else [])) -- parallel only: move binary to another dir -- HWL ways_ <- readIORef v_Ways @@ -862,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" ] @@ -877,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 @@ -952,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", @@ -978,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)