X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=9e13360c1465fa197843f25b1539845252beadc6;hb=3e664735852117e5756472695b194055f5869510;hp=d8646cf494ed1acc32ce6397057f1d2990228232;hpb=f620397eb8b58931ef0be7cb54659a73bdc0cade;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index d8646cf..9e13360 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -12,9 +12,10 @@ module StaticFlags ( parseStaticFlags, staticFlags, + initStaticOpts, -- Ways - WayName(..), v_Ways, v_Build_tag, v_RTS_Build_tag, + WayName(..), v_Ways, v_Build_tag, v_RTS_Build_tag, isRTSWay, -- Output style options opt_PprUserLength, @@ -27,6 +28,9 @@ module StaticFlags ( opt_SccProfilingOn, opt_DoTickyProfiling, + -- Hpc opts + opt_Hpc, + -- language opts opt_DictsStrict, opt_IrrefutableTuples, @@ -37,9 +41,7 @@ module StaticFlags ( -- optimisation opts opt_NoMethodSharing, opt_NoStateHack, - opt_LiberateCaseThreshold, opt_CprOff, - opt_RulesOff, opt_SimplNoPreInlining, opt_SimplExcessPrecision, opt_MaxWorkerArgs, @@ -52,37 +54,37 @@ module StaticFlags ( opt_UF_UpdateInPlace, opt_UF_DearOp, + -- Related to linking + opt_PIC, + opt_Static, + -- misc opts opt_IgnoreDotGhci, opt_ErrorSpans, - opt_EmitCExternDecls, opt_GranMacros, opt_HiVersion, opt_HistorySize, opt_OmitBlackHoling, - opt_Static, opt_Unregisterised, opt_EmitExternalCore, - opt_PIC, v_Ld_inputs, + tablesNextToCode ) where #include "HsVersions.h" -import Util ( consIORef ) import CmdLineParser -import Config ( cProjectVersionInt, cProjectPatchLevel, - cGhcUnregisterised ) +import Config import FastString ( FastString, mkFastString ) import Util import Maybes ( firstJust ) -import Panic ( GhcException(..), ghcError ) +import Panic -import EXCEPTION ( throwDyn ) -import DATA_IOREF -import UNSAFE_IO ( unsafePerformIO ) -import Monad ( when ) -import Char ( isDigit ) +import Control.Exception ( throwDyn ) +import Data.IORef +import System.IO.Unsafe ( unsafePerformIO ) +import Control.Monad ( when ) +import Data.Char ( isDigit ) import Data.List ( sort, intersperse, nub ) ----------------------------------------------------------------------------- @@ -90,11 +92,14 @@ import Data.List ( sort, intersperse, nub ) parseStaticFlags :: [String] -> IO [String] parseStaticFlags args = do + ready <- readIORef v_opt_C_ready + when ready $ throwDyn (ProgramError "Too late for parseStaticFlags: call it before newSession") + (leftover, errs) <- processArgs static_flags args when (not (null errs)) $ throwDyn (UsageError (unlines errs)) -- deal with the way flags: the way (eg. prof) gives rise to - -- futher flags, some of which might be static. + -- further flags, some of which might be static. way_flags <- findBuildTag -- if we're unregisterised, add some more flags @@ -102,15 +107,37 @@ parseStaticFlags args = do | otherwise = [] (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags) + + -- see sanity code in staticOpts + writeIORef v_opt_C_ready True + + -- TABLES_NEXT_TO_CODE affects the info table layout. + -- Be careful to do this *after* all processArgs, + -- because evaluating tablesNextToCode involves looking at the global + -- static flags. Those pesky global variables... + let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"] + | otherwise = [] + when (not (null errs)) $ ghcError (UsageError (unlines errs)) - return (more_leftover++leftover) + return (cg_flags++more_leftover++leftover) +initStaticOpts :: IO () +initStaticOpts = writeIORef v_opt_C_ready True --- note that ordering is important in the following list: any flag which +static_flags :: [(String, OptKind IO)] +-- All the static flags should appear in this list. It describes how each +-- static flag should be processed. Two main purposes: +-- (a) if a command-line flag doesn't appear in the list, GHC can complain +-- (b) a command-line flag may remove, or add, other flags; e.g. the "-fno-X" things +-- +-- The common (PassFlag addOpt) action puts the static flag into the bunch of +-- things that are searched up by the top-level definitions like +-- opt_foo = lookUp FSLIT("-dfoo") + +-- Note that ordering is important in the following list: any flag which -- is a prefix flag (i.e. HasArg, Prefix, OptPrefix, AnySuffix) will override -- flags further down the list with the same prefix. -static_flags :: [(String, OptKind IO)] static_flags = [ ------- GHCi ------------------------------------------------------- ( "ignore-dot-ghci", PassFlag addOpt ) @@ -129,7 +156,6 @@ static_flags = [ -- ToDo: user ways ------ Debugging ---------------------------------------------------- - , ( "dppr-noprags", PassFlag addOpt ) , ( "dppr-debug", PassFlag addOpt ) , ( "dppr-user-length", AnySuffix addOpt ) -- rest of the debugging flags are dynamic @@ -181,7 +207,12 @@ lookup_str :: String -> Maybe String -- holds the static opts while they're being collected, before -- being unsafely read by unpacked_static_opts below. GLOBAL_VAR(v_opt_C, defaultStaticOpts, [String]) -staticFlags = unsafePerformIO (readIORef v_opt_C) +GLOBAL_VAR(v_opt_C_ready, False, Bool) +staticFlags = unsafePerformIO $ do + ready <- readIORef v_opt_C_ready + if (not ready) + then panic "a static opt was looked at too early!" + else readIORef v_opt_C -- -static is the default defaultStaticOpts = ["-static"] @@ -246,7 +277,10 @@ opt_AutoSccsOnAllToplevs = lookUp FSLIT("-fauto-sccs-on-all-toplevs") opt_AutoSccsOnExportedToplevs = lookUp FSLIT("-fauto-sccs-on-exported-toplevs") opt_AutoSccsOnIndividualCafs = lookUp FSLIT("-fauto-sccs-on-individual-cafs") opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling") -opt_DoTickyProfiling = lookUp FSLIT("-fticky-ticky") +opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways) + +-- Hpc opts +opt_Hpc = lookUp FSLIT("-fhpc") -- language opts opt_DictsStrict = lookUp FSLIT("-fdicts-strict") @@ -258,14 +292,11 @@ opt_Flatten = lookUp FSLIT("-fflatten") opt_NoStateHack = lookUp FSLIT("-fno-state-hack") opt_NoMethodSharing = lookUp FSLIT("-fno-method-sharing") opt_CprOff = lookUp FSLIT("-fcpr-off") -opt_RulesOff = lookUp FSLIT("-frules-off") -- Switch off CPR analysis in the new demand analyser -opt_LiberateCaseThreshold = lookup_def_int "-fliberate-case-threshold" (10::Int) opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int) -opt_EmitCExternDecls = lookUp FSLIT("-femit-extern-decls") opt_GranMacros = lookUp FSLIT("-fgransim") -opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Int +opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer opt_HistorySize = lookup_def_int "-fhistory-size" 20 opt_OmitBlackHoling = lookUp FSLIT("-dno-black-holing") opt_RuntimeTypes = lookUp FSLIT("-fruntime-types") @@ -285,14 +316,26 @@ opt_UF_UpdateInPlace = lookUp FSLIT("-funfolding-update-in-place") opt_UF_DearOp = ( 4 :: Int) +#if darwin_TARGET_OS && x86_64_TARGET_ARCH +opt_PIC = True +#else +opt_PIC = lookUp FSLIT("-fPIC") +#endif opt_Static = lookUp FSLIT("-static") opt_Unregisterised = lookUp FSLIT("-funregisterised") + +-- Derived, not a real option. Determines whether we will be compiling +-- info tables that reside just before the entry code, or with an +-- indirection to the entry code. See TABLES_NEXT_TO_CODE in +-- includes/InfoTables.h. +tablesNextToCode = not opt_Unregisterised + && cGhcEnableTablesNextToCode == "YES" + opt_EmitExternalCore = lookUp FSLIT("-fext-core") -- Include full span info in error messages, instead of just the start position. opt_ErrorSpans = lookUp FSLIT("-ferror-spans") -opt_PIC = lookUp FSLIT("-fPIC") -- object files and libraries to be linked in are collected here. -- ToDo: perhaps this could be done without a global, it wasn't obvious @@ -305,15 +348,10 @@ isStaticFlag f = "fauto-sccs-on-exported-toplevs", "fauto-sccs-on-individual-cafs", "fscc-profiling", - "fticky-ticky", - "fall-strict", "fdicts-strict", "firrefutable-tuples", "fparallel", "fflatten", - "fsemi-tagging", - "flet-no-escape", - "femit-extern-decls", "fgransim", "fno-hi-version-check", "dno-black-holing", @@ -326,11 +364,10 @@ isStaticFlag f = "static", "funregisterised", "fext-core", - "frule-check", - "frules-off", "fcpr-off", "ferror-spans", - "fPIC" + "fPIC", + "fhpc" ] || any (flip prefixMatch f) [ "fliberate-case-threshold", @@ -373,13 +410,8 @@ decodeSize str ----------------------------------------------------------------------------- -- RTS Hooks -#if __GLASGOW_HASKELL__ >= 504 foreign import ccall unsafe "setHeapSize" setHeapSize :: Int -> IO () foreign import ccall unsafe "enableTimingStats" enableTimingStats :: IO () -#else -foreign import "setHeapSize" unsafe setHeapSize :: Int -> IO () -foreign import "enableTimingStats" unsafe enableTimingStats :: IO () -#endif ----------------------------------------------------------------------------- -- Ways @@ -444,7 +476,6 @@ allowed_combination way = and [ x `allowedWith` y _ `allowedWith` WayDebug = True WayDebug `allowedWith` _ = True - WayThreaded `allowedWith` WayProf = True WayProf `allowedWith` WayUnreg = True WayProf `allowedWith` WayNDP = True _ `allowedWith` _ = False @@ -454,6 +485,7 @@ findBuildTag :: IO [String] -- new options findBuildTag = do way_names <- readIORef v_Ways let ws = sort (nub way_names) + if not (allowed_combination ws) then throwDyn (CmdLineError $ "combination not supported: " ++ @@ -468,6 +500,8 @@ findBuildTag = do writeIORef v_RTS_Build_tag rts_tag return (concat flags) + + mkBuildTag :: [Way] -> String mkBuildTag ways = concat (intersperse "_" (map wayTag ways)) @@ -476,6 +510,8 @@ lkupWay w = Nothing -> error "findBuildTag" Just details -> details +isRTSWay = wayRTSOnly . lkupWay + data Way = Way { wayTag :: String, wayRTSOnly :: Bool, @@ -506,9 +542,8 @@ way_details = , "-DPROFILING" , "-optc-DPROFILING" ]), - (WayTicky, Way "t" False "Ticky-ticky Profiling" - [ "-fticky-ticky" - , "-DTICKY_TICKY" + (WayTicky, Way "t" True "Ticky-ticky Profiling" + [ "-DTICKY_TICKY" , "-optc-DTICKY_TICKY" ]), (WayUnreg, Way "u" False "Unregisterised"