X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=171cecf2a61d9f52c9999082300f90caa575da45;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=025a09bff2264fa78341c52f4fb58259ca5a5c51;hpb=4d5a0088afa8432d405ed4a15d6308e631b67379;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 025a09b..171cecf 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -55,6 +55,8 @@ import FastString ( mkFastString ) import Bag ( listToBag, emptyBag ) import SrcLoc ( Located(..) ) +import Distribution.Compiler ( extensionsToGHCFlag ) + import EXCEPTION import DATA_IOREF ( readIORef, writeIORef, IORef ) import GLAEXTS ( Int(..) ) @@ -93,7 +95,6 @@ preprocess dflags (filename, mb_phase) = -- NB. No old interface can also mean that the source has changed. compile :: HscEnv - -> (Messages -> IO ()) -- error message callback -> ModSummary -> Maybe Linkable -- Just linkable <=> source unchanged -> Maybe ModIface -- Old interface, if available @@ -108,7 +109,7 @@ data CompResult | CompErrs -compile hsc_env msg_act mod_summary maybe_old_linkable old_iface mod_index nmods = do +compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do let dflags0 = hsc_dflags hsc_env this_mod = ms_mod mod_summary @@ -124,16 +125,16 @@ compile hsc_env msg_act mod_summary maybe_old_linkable old_iface mod_index nmods let input_fn = expectJust "compile:hs" (ml_hs_file location) let input_fnpp = expectJust "compile:hspp" (ms_hspp_file mod_summary) - debugTraceMsg dflags0 2 ("compile: input file " ++ input_fnpp) + debugTraceMsg dflags0 2 (text "compile: input file" <+> text input_fnpp) -- Add in the OPTIONS from the source file -- This is nasty: we've done this once already, in the compilation manager -- It might be better to cache the flags in the ml_hspp_file field,say let hspp_buf = expectJust "compile:hspp_buf" (ms_hspp_buf mod_summary) - opts = getOptionsFromStringBuffer hspp_buf + opts = getOptionsFromStringBuffer hspp_buf input_fn (dflags1,unhandled_flags) <- parseDynamicFlags dflags0 (map snd opts) if (not (null unhandled_flags)) - then do msg_act (optionsErrorMsgs unhandled_flags opts input_fn) + then do printErrorsAndWarnings dflags1 (optionsErrorMsgs unhandled_flags opts input_fn) return CompErrs else do @@ -156,8 +157,6 @@ compile hsc_env msg_act mod_summary maybe_old_linkable old_iface mod_index nmods let dflags' = dflags { hscTarget = hsc_lang, hscOutName = output_fn, - hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h", extCoreName = basename ++ ".hcr" } -- -no-recomp should also work with --make @@ -167,7 +166,7 @@ compile hsc_env msg_act mod_summary maybe_old_linkable old_iface mod_index nmods object_filename = ml_obj_file location -- run the compiler - hsc_result <- hscMain hsc_env' msg_act mod_summary + hsc_result <- hscMain hsc_env' mod_summary source_unchanged have_object old_iface (Just (mod_index, nmods)) @@ -191,7 +190,7 @@ compile hsc_env msg_act mod_summary maybe_old_linkable old_iface mod_index nmods -> do stub_unlinked <- if stub_c_exists then do - stub_o <- compileStub dflags' object_filename + stub_o <- compileStub dflags' this_mod location return [ DotO stub_o ] else return [] @@ -234,8 +233,9 @@ compile hsc_env msg_act mod_summary maybe_old_linkable old_iface mod_index nmods ----------------------------------------------------------------------------- -- stub .h and .c files (for foreign export support) --- The _stub.c file is derived from the haskell source file (but stored --- in hscStubCOutName in the dflags for some reason, probably historical). +-- The _stub.c file is derived from the haskell source file, possibly taking +-- into account the -stubdir option. +-- -- Consequently, we derive the _stub.o filename from the haskell object -- filename. -- @@ -249,12 +249,13 @@ compile hsc_env msg_act mod_summary maybe_old_linkable old_iface mod_index nmods -- -odir obj, we would get obj/src/A_stub.o, which is wrong; we want -- obj/A_stub.o. -compileStub dflags object_filename = do - let (o_base, o_ext) = splitFilename object_filename +compileStub :: DynFlags -> Module -> ModLocation -> IO FilePath +compileStub dflags mod location = do + let (o_base, o_ext) = splitFilename (ml_obj_file location) stub_o = o_base ++ "_stub" `joinFileExt` o_ext -- compile the _stub.c file w/ gcc - let stub_c = hscStubCOutName dflags + let (stub_c,_) = mkStubPaths dflags mod location runPipeline StopLn dflags (stub_c,Nothing) (SpecificFile stub_o) Nothing{-no ModLocation-} @@ -298,12 +299,11 @@ link BatchCompile dflags batch_attempt_linking hpt -- the linkables to link linkables = map (fromJust.hm_linkable) home_mod_infos - debugTraceMsg dflags 3 "link: linkables are ..." - debugTraceMsg dflags 3 (showSDoc (vcat (map ppr linkables))) + debugTraceMsg dflags 3 (text "link: linkables are ..." $$ vcat (map ppr linkables)) -- check for the -no-link flag if isNoLink (ghcLink dflags) - then do debugTraceMsg dflags 3 "link(batch): linking omitted (-c flag given)." + then do debugTraceMsg dflags 3 (text "link(batch): linking omitted (-c flag given).") return Succeeded else do @@ -322,23 +322,27 @@ link BatchCompile dflags batch_attempt_linking hpt any (t <) (map linkableTime linkables) if dopt Opt_RecompChecking dflags && not linking_needed - then do debugTraceMsg dflags 1 (exe_file ++ " is up to date, linking not required.") + then do debugTraceMsg dflags 1 (text exe_file <+> ptext SLIT("is up to date, linking not required.")) return Succeeded else do - debugTraceMsg dflags 1 "Linking ..." + debugTraceMsg dflags 1 (ptext SLIT("Linking") <+> text exe_file + <+> 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 "link: done" + debugTraceMsg dflags 3 (text "link: done") -- staticLink only returns if it succeeds return Succeeded | otherwise - = do debugTraceMsg dflags 3 "link(batch): upsweep (partially) failed OR" - debugTraceMsg dflags 3 " Main.main not exported; not linking." + = do debugTraceMsg dflags 3 (text "link(batch): upsweep (partially) failed OR" $$ + text " Main.main not exported; not linking.") return Succeeded @@ -508,7 +512,7 @@ getOutputFilename dflags stop_phase output basename = func where hcsuf = hcSuf dflags - odir = outputDir dflags + odir = objectDir dflags osuf = objectSuf dflags keep_hc = dopt Opt_KeepHcFiles dflags keep_raw_s = dopt Opt_KeepRawSFiles dflags @@ -741,8 +745,6 @@ runPhase (Hsc src_flavour) stop dflags0 basename suff input_fn get_output_fn _ma let dflags' = dflags { hscTarget = hsc_lang, hscOutName = output_fn, - hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h", extCoreName = basename ++ ".hcr" } hsc_env <- newHscEnv dflags' @@ -751,7 +753,7 @@ 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 printErrorsAndWarnings + result <- hscMain hsc_env mod_summary source_unchanged False -- No object file Nothing -- No iface @@ -773,7 +775,7 @@ runPhase (Hsc src_flavour) stop dflags0 basename suff input_fn get_output_fn _ma _maybe_interpreted_code -> do when stub_c_exists $ do - stub_o <- compileStub dflags' o_file + 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 @@ -801,8 +803,6 @@ runPhase Cmm stop dflags basename suff input_fn get_output_fn maybe_loc let dflags' = dflags { hscTarget = hsc_lang, hscOutName = output_fn, - hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h", extCoreName = basename ++ ".hcr" } ok <- hscCmmFile dflags' input_fn @@ -855,6 +855,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. @@ -871,11 +888,13 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc ++ (if hcc && mangle then md_regd_c_flags else []) + ++ (if hcc + then more_hcc_opts + else []) ++ [ verb, "-S", "-Wimplicit", "-O" ] ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] ++ cc_opts ++ split_opt - ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts )) @@ -968,7 +987,7 @@ runPhase SplitAs stop dflags basename _suff _input_fn get_output_fn maybe_loc (split_s_prefix, n) <- readIORef v_Split_info let real_odir - | Just d <- outputDir dflags = d + | Just d <- objectDir dflags = d | otherwise = basename ++ "_split" let assemble_file n @@ -1208,7 +1227,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" @@ -1341,14 +1367,19 @@ hsSourceCppOpts = ----------------------------------------------------------------------------- -- Reading OPTIONS pragmas +-- This is really very ugly and should be rewritten. +-- - some error messages are thrown as exceptions (should return) +-- - we ignore LINE pragmas +-- - parsing is horrible, combination of prefixMatch and 'read'. + getOptionsFromSource :: String -- input file -> IO [String] -- options, if any getOptionsFromSource file = do h <- openFile file ReadMode - look h `finally` hClose h + look h 1 `finally` hClose h where - look h = do + look h i = do r <- tryJust ioErrors (hGetLine h) case r of Left e | isEOFError e -> return [] @@ -1356,18 +1387,18 @@ getOptionsFromSource file Right l' -> do let l = removeSpaces l' case () of - () | null l -> look h - | prefixMatch "#" l -> look h - | prefixMatch "{-# LINE" l -> look h -- -} - | Just opts <- matchOptions l - -> do rest <- look h + () | null l -> look h (i+1) + | prefixMatch "#" l -> look h (i+1) + | prefixMatch "{-# LINE" l -> look h (i+1) -- -} wrong! + | Just opts <- matchOptions i file l + -> do rest <- look h (i+1) return (opts ++ rest) | otherwise -> return [] -getOptionsFromStringBuffer :: StringBuffer -> [(Int,String)] -getOptionsFromStringBuffer buffer@(StringBuffer _ len# _) = +getOptionsFromStringBuffer :: StringBuffer -> FilePath -> [(Int,String)] +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 @@ -1377,37 +1408,57 @@ getOptionsFromStringBuffer buffer@(StringBuffer _ len# _) = case () of () | null l -> look (i+1) ls | prefixMatch "#" l -> look (i+1) ls - | prefixMatch "{-# LINE" l -> look (i+1) ls -- -} - | Just opts <- matchOptions l + | prefixMatch "{-# LINE" l -> look (i+1) ls -- -} wrong! + | Just opts <- matchOptions i fn l -> zip (repeat i) opts ++ look (i+1) ls | otherwise -> [] -- detect {-# OPTIONS_GHC ... #-}. For the time being, we accept OPTIONS -- instead of OPTIONS_GHC, but that is deprecated. -matchOptions s +matchOptions i fn s | Just s1 <- maybePrefixMatch "{-#" s -- -} - = matchOptions1 (removeSpaces s1) + = matchOptions1 i fn (removeSpaces s1) | otherwise = Nothing where - matchOptions1 s + matchOptions1 i fn s | Just s2 <- maybePrefixMatch "OPTIONS" s = case () of _ | Just s3 <- maybePrefixMatch "_GHC" s2, not (is_ident (head s3)) - -> matchOptions2 s3 + -> matchOptions2 i fn s3 | not (is_ident (head s2)) - -> matchOptions2 s2 + -> matchOptions2 i fn s2 | otherwise -> Just [] -- OPTIONS_anything is ignored, not treated as start of source | Just s2 <- maybePrefixMatch "INCLUDE" s, not (is_ident (head s2)), Just s3 <- maybePrefixMatch "}-#" (reverse s2) = Just ["-#include", removeSpaces (reverse s3)] + + | Just s2 <- maybePrefixMatch "LANGUAGE" s, not (is_ident (head s2)), + Just s3 <- maybePrefixMatch "}-#" (reverse s2) + = case [ exts | (exts,"") <- reads ('[' : reverse (']':s3))] of + [] -> languagePragParseError i fn + exts:_ -> case extensionsToGHCFlag exts of + ([], opts) -> Just opts + (unsup,_) -> unsupportedExtnError i fn unsup | otherwise = Nothing - matchOptions2 s + matchOptions2 i fn s | Just s3 <- maybePrefixMatch "}-#" (reverse s) = Just (words (reverse s3)) | otherwise = Nothing +languagePragParseError i fn = + pgmError (showSDoc (mkLocMessage loc ( + text "cannot parse LANGUAGE pragma"))) + where loc = srcLocSpan (mkSrcLoc (mkFastString fn) i 0) + +unsupportedExtnError i fn unsup = + pgmError (showSDoc (mkLocMessage loc ( + text "unsupported extensions: " <> + hcat (punctuate comma (map (text.show) unsup))))) + where loc = srcLocSpan (mkSrcLoc (mkFastString fn) i 0) + + optionsErrorMsgs :: [String] -> [(Int,String)] -> FilePath -> Messages optionsErrorMsgs unhandled_flags flags_lines filename = (emptyBag, listToBag (map mkMsg unhandled_flags_lines))