X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=cd11e0f361971c6e10f3ec76726bc64439e0dc87;hb=374bc02f5feb4f5bf709d0a04d15ce28ec71eef1;hp=d045f0a24c2ccc5a8e143f3c745e7bb9ce965522;hpb=f2e730f34ab0134391c88fe58f9f9e94b736da91;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index d045f0a..cd11e0f 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -65,6 +65,7 @@ import Directory import System import IO import Monad +import Data.List ( isSuffixOf ) import Maybe @@ -165,70 +166,65 @@ compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do hsc_env' = hsc_env { hsc_dflags = dflags' } object_filename = ml_obj_file location + let getStubLinkable False = return [] + getStubLinkable True + = do stub_o <- compileStub dflags' this_mod location + return [ DotO stub_o ] + + handleMake (HscNoRecomp, iface, details) + = ASSERT (isJust maybe_old_linkable) + return (CompOK details iface maybe_old_linkable) + handleMake (HscRecomp hasStub, iface, details) + | isHsBoot src_flavour + = return (CompOK details iface Nothing) + | otherwise + = do stub_unlinked <- getStubLinkable hasStub + (hs_unlinked, unlinked_time) <- + case hsc_lang of + HscNothing + -> return ([], ms_hs_date mod_summary) + -- We're in --make mode: finish the compilation pipeline. + _other + -> do runPipeline StopLn dflags (output_fn,Nothing) Persistent + (Just location) + -- The object filename comes from the ModLocation + o_time <- getModificationTime object_filename + return ([DotO object_filename], o_time) + let linkable = LM unlinked_time this_mod + (hs_unlinked ++ stub_unlinked) + return (CompOK details iface (Just linkable)) + + handleInterpreted (InteractiveNoRecomp, iface, details) + = ASSERT (isJust maybe_old_linkable) + return (CompOK details iface maybe_old_linkable) + handleInterpreted (InteractiveRecomp hasStub comp_bc, iface, details) + = do stub_unlinked <- getStubLinkable hasStub + let hs_unlinked = [BCOs comp_bc] + unlinked_time = ms_hs_date mod_summary + -- Why do we use the timestamp of the source file here, + -- rather than the current time? This works better in + -- the case where the local clock is out of sync + -- with the filesystem's clock. It's just as accurate: + -- if the source is modified, then the linkable will + -- be out of date. + let linkable = LM unlinked_time this_mod + (hs_unlinked ++ stub_unlinked) + return (CompOK details iface (Just linkable)) + + let runCompiler compiler handle + = do mbResult <- compiler hsc_env' mod_summary + source_unchanged old_iface + (Just (mod_index, nmods)) + case mbResult of + Nothing -> return CompErrs + Just result -> handle result -- run the compiler - hsc_result <- hscMain hsc_env' mod_summary - source_unchanged have_object old_iface - (Just (mod_index, nmods)) - - case hsc_result of - HscFail -> return CompErrs - - HscNoRecomp details iface -> - ASSERT(isJust maybe_old_linkable) - return (CompOK details iface maybe_old_linkable) - - HscRecomp details iface stub_h_exists stub_c_exists maybe_interpreted_code - - | isHsBoot src_flavour -- No further compilation to do - -> do case hsc_lang of - HscInterpreted -> return () - _other -> SysTools.touch dflags' "Touching object file" - object_filename - return (CompOK details iface Nothing) - - | otherwise -- Normal source file - -> do - stub_unlinked <- - if stub_c_exists then do - stub_o <- compileStub dflags' this_mod location - return [ DotO stub_o ] - else - return [] - - (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 -#ifdef GHCI - Just comp_bc -> return ([BCOs comp_bc], ms_hs_date mod_summary) - -- Why do we use the timestamp of the source file here, - -- rather than the current time? This works better in - -- the case where the local clock is out of sync - -- with the filesystem's clock. It's just as accurate: - -- if the source is modified, then the linkable will - -- be out of date. -#endif - Nothing -> panic "compile: no interpreted code" - - HscNothing - -> return ([], ms_hs_date mod_summary) - - -- We're in --make mode: finish the compilation pipeline. - _other - -> do runPipeline StopLn dflags (output_fn,Nothing) Persistent - (Just location) - -- The object filename comes from the ModLocation - - o_time <- getModificationTime object_filename - return ([DotO object_filename], o_time) - - let linkable = LM unlinked_time this_mod - (hs_unlinked ++ stub_unlinked) - - return (CompOK details iface (Just linkable)) + case hsc_lang of + HscInterpreted | not (isHsBoot src_flavour) -- We can't compile boot files to + -- bytecode so don't even try. + -> runCompiler hscCompileInteractive handleInterpreted + _other + -> runCompiler hscCompileMake handleMake ----------------------------------------------------------------------------- -- stub .h and .c files (for foreign export support) @@ -297,7 +293,7 @@ link BatchCompile dflags batch_attempt_linking hpt pkg_deps = concatMap (dep_pkgs . mi_deps . hm_iface) home_mod_infos -- the linkables to link - linkables = map (fromJust.hm_linkable) home_mod_infos + linkables = map (expectJust "link".hm_linkable) home_mod_infos debugTraceMsg dflags 3 (text "link: linkables are ..." $$ vcat (map ppr linkables)) @@ -330,7 +326,10 @@ link BatchCompile dflags batch_attempt_linking hpt <+> text "...") -- Don't showPass in Batch mode; doLink will do that for us. - staticLink dflags obj_files pkg_deps + let link = case ghcLink dflags of + MkDLL -> doMkDLL + StaticLink -> staticLink + link dflags obj_files pkg_deps debugTraceMsg dflags 3 (text "link: done") @@ -750,38 +749,28 @@ runPhase (Hsc src_flavour) stop dflags0 basename suff input_fn get_output_fn _ma addHomeModuleToFinder hsc_env mod_name location4 -- run the compiler! - result <- hscMain hsc_env + mbResult <- hscCompileOneShot hsc_env mod_summary source_unchanged - False -- No object file Nothing -- No iface Nothing -- No "module i of n" progress info - case result of - - HscFail -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)) - - HscNoRecomp details iface -> do - SysTools.touch dflags' "Touching object file" o_file - -- The .o file must have a later modification date - -- than the source file (else we wouldn't be in HscNoRecomp) - -- but we touch it anyway, to keep 'make' happy (we think). - return (StopLn, dflags', Just location4, o_file) - - HscRecomp _details _iface - stub_h_exists stub_c_exists - _maybe_interpreted_code -> do - - when stub_c_exists $ do - stub_o <- compileStub dflags' mod_name location4 - consIORef v_Ld_inputs stub_o - - -- In the case of hs-boot files, generate a dummy .o-boot - -- stamp file for the benefit of Make - case src_flavour of - HsBootFile -> SysTools.touch dflags' "Touching object file" o_file - other -> return () - - return (next_phase, dflags', Just location4, output_fn) + case mbResult of + Nothing -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)) + Just HscNoRecomp + -> do SysTools.touch dflags' "Touching object file" o_file + -- The .o file must have a later modification date + -- than the source file (else we wouldn't be in HscNoRecomp) + -- but we touch it anyway, to keep 'make' happy (we think). + return (StopLn, dflags', Just location4, o_file) + Just (HscRecomp hasStub) + -> do when hasStub $ + do stub_o <- compileStub dflags' mod_name location4 + consIORef v_Ld_inputs stub_o + -- In the case of hs-boot files, generate a dummy .o-boot + -- stamp file for the benefit of Make + when (isHsBoot src_flavour) $ + SysTools.touch dflags' "Touching object file" o_file + return (next_phase, dflags', Just location4, output_fn) ----------------------------------------------------------------------------- -- Cmm phase @@ -844,6 +833,9 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc let excessPrecision = dopt Opt_ExcessPrecision dflags + let cc_opt | optLevel dflags >= 2 = "-O2" + | otherwise = "-O" + -- Decide next phase let mangle = dopt Opt_DoAsmMangling dflags @@ -852,6 +844,23 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc | otherwise = As output_fn <- get_output_fn next_phase maybe_loc + let + more_hcc_opts = +#if i386_TARGET_ARCH + -- on x86 the floating point regs have greater precision + -- than a double, which leads to unpredictable results. + -- By default, we turn this off with -ffloat-store unless + -- the user specified -fexcess-precision. + (if excessPrecision then [] else [ "-ffloat-store" ]) ++ +#endif + -- gcc's -fstrict-aliasing allows two accesses to memory + -- to be considered non-aliasing if they have different types. + -- This interacts badly with the C code we generate, which is + -- very weakly typed, being derived from C--. + ["-fno-strict-aliasing"] + + + SysTools.runCc dflags ( -- force the C compiler to interpret this file as C when -- compiling .hc files, by adding the -x c option. @@ -868,11 +877,13 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc ++ (if hcc && mangle then md_regd_c_flags else []) - ++ [ verb, "-S", "-Wimplicit", "-O" ] + ++ (if hcc + then more_hcc_opts + else []) + ++ [ verb, "-S", "-Wimplicit", cc_opt ] ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] ++ cc_opts ++ split_opt - ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts )) @@ -960,34 +971,64 @@ runPhase As stop dflags _basename _suff input_fn get_output_fn maybe_loc runPhase SplitAs stop dflags basename _suff _input_fn get_output_fn maybe_loc - = do let as_opts = getOpts dflags opt_a + = do + output_fn <- get_output_fn StopLn maybe_loc + + let (base_o, _) = splitFilename output_fn + split_odir = base_o ++ "_split" + osuf = objectSuf dflags + + createDirectoryHierarchy split_odir + + -- remove M_split/ *.o, because we're going to archive M_split/ *.o + -- later and we don't want to pick up any old objects. + fs <- getDirectoryContents split_odir + mapM_ removeFile $ map (split_odir `joinFileName`) + $ filter (osuf `isSuffixOf`) fs + + let as_opts = getOpts dflags opt_a (split_s_prefix, n) <- readIORef v_Split_info - let real_odir - | Just d <- objectDir dflags = d - | otherwise = basename ++ "_split" + let split_s n = split_s_prefix ++ "__" ++ show n `joinFileExt` "s" + split_obj n = split_odir `joinFileName` + filenameOf base_o ++ "__" ++ show n + `joinFileExt` osuf let assemble_file n - = do let input_s = split_s_prefix ++ "__" ++ show n ++ ".s" - let output_o = replaceFilenameDirectory - (basename ++ "__" ++ show n ++ ".o") - real_odir - let osuf = objectSuf dflags - let real_o = replaceFilenameSuffix output_o osuf - SysTools.runAs dflags - (map SysTools.Option as_opts ++ - [ SysTools.Option "-c" - , SysTools.Option "-o" - , SysTools.FileOption "" real_o - , SysTools.FileOption "" input_s - ]) + = SysTools.runAs dflags + (map SysTools.Option as_opts ++ + [ SysTools.Option "-c" + , SysTools.Option "-o" + , SysTools.FileOption "" (split_obj n) + , SysTools.FileOption "" (split_s n) + ]) mapM_ assemble_file [1..n] - output_fn <- get_output_fn StopLn maybe_loc + -- and join the split objects into a single object file: + let ld_r args = SysTools.runLink dflags ([ + SysTools.Option "-nostdlib", + SysTools.Option "-nodefaultlibs", + SysTools.Option "-Wl,-r", + SysTools.Option ld_x_flag, + SysTools.Option "-o", + SysTools.FileOption "" output_fn ] ++ args) + ld_x_flag | null cLD_X = "" + | otherwise = "-Wl,-x" + + if cLdIsGNULd == "YES" + then do + let script = split_odir `joinFileName` "ld.script" + writeFile script $ + "INPUT(" ++ unwords (map split_obj [1..n]) ++ ")" + ld_r [SysTools.FileOption "" script] + else do + ld_r (map (SysTools.FileOption "" . split_obj) [1..n]) + return (StopLn, dflags, maybe_loc, output_fn) + ----------------------------------------------------------------------------- -- MoveBinary sort-of-phase -- After having produced a binary, move it somewhere else and generate a @@ -1205,7 +1246,14 @@ staticLink dflags o_files dep_packages = do exeFileName :: DynFlags -> FilePath exeFileName dflags - | Just s <- outputFile dflags = s + | Just s <- outputFile dflags = +#if defined(mingw32_HOST_OS) + if null (suffixOf s) + then s `joinFileExt` "exe" + else s +#else + s +#endif | otherwise = #if defined(mingw32_HOST_OS) "main.exe" @@ -1367,9 +1415,9 @@ getOptionsFromSource file | otherwise -> return [] getOptionsFromStringBuffer :: StringBuffer -> FilePath -> [(Int,String)] -getOptionsFromStringBuffer buffer@(StringBuffer _ len# _) fn = +getOptionsFromStringBuffer buffer@(StringBuffer _ len _) fn = let - ls = lines (lexemeToString buffer (I# len#)) -- lazy, so it's ok + ls = lines (lexemeToString buffer len) -- lazy, so it's ok in look 1 ls where