projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid making Either String an instance of Monad in the Haddock parser
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
1a026bd
..
43f630c
100644
(file)
--- a/
compiler/main/StaticFlags.hs
+++ b/
compiler/main/StaticFlags.hs
@@
-1,3
+1,10
@@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
-----------------------------------------------------------------------------
--
-- Static flags
-----------------------------------------------------------------------------
--
-- Static flags
@@
-12,9
+19,10
@@
module StaticFlags (
parseStaticFlags,
staticFlags,
module StaticFlags (
parseStaticFlags,
staticFlags,
+ initStaticOpts,
-- Ways
-- 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,
-- Output style options
opt_PprUserLength,
@@
-27,6
+35,9
@@
module StaticFlags (
opt_SccProfilingOn,
opt_DoTickyProfiling,
opt_SccProfilingOn,
opt_DoTickyProfiling,
+ -- Hpc opts
+ opt_Hpc,
+
-- language opts
opt_DictsStrict,
opt_IrrefutableTuples,
-- language opts
opt_DictsStrict,
opt_IrrefutableTuples,
@@
-37,9
+48,7
@@
module StaticFlags (
-- optimisation opts
opt_NoMethodSharing,
opt_NoStateHack,
-- optimisation opts
opt_NoMethodSharing,
opt_NoStateHack,
- opt_LiberateCaseThreshold,
opt_CprOff,
opt_CprOff,
- opt_RulesOff,
opt_SimplNoPreInlining,
opt_SimplExcessPrecision,
opt_MaxWorkerArgs,
opt_SimplNoPreInlining,
opt_SimplExcessPrecision,
opt_MaxWorkerArgs,
@@
-55,6
+64,7
@@
module StaticFlags (
-- Related to linking
opt_PIC,
opt_Static,
-- Related to linking
opt_PIC,
opt_Static,
+ opt_HardwireLibPaths,
-- misc opts
opt_IgnoreDotGhci,
-- misc opts
opt_IgnoreDotGhci,
@@
-76,25
+86,28
@@
import Config
import FastString ( FastString, mkFastString )
import Util
import Maybes ( firstJust )
import FastString ( FastString, mkFastString )
import Util
import Maybes ( firstJust )
-import Panic ( GhcException(..), ghcError )
+import Panic
import Control.Exception ( throwDyn )
import Data.IORef
import System.IO.Unsafe ( unsafePerformIO )
import Control.Monad ( when )
import Data.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 )
+import Data.List
-----------------------------------------------------------------------------
-- Static flags
parseStaticFlags :: [String] -> IO [String]
parseStaticFlags args = do
-----------------------------------------------------------------------------
-- Static flags
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
(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
way_flags <- findBuildTag
-- if we're unregisterised, add some more flags
@@
-103,6
+116,9
@@
parseStaticFlags args = do
(more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags)
(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
-- 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
@@
-110,9
+126,17
@@
parseStaticFlags args = do
let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
| otherwise = []
let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
| otherwise = []
+ -- HACK: -fexcess-precision is both a static and a dynamic flag. If
+ -- the static flag parser has slurped it, we must return it as a
+ -- leftover too. ToDo: make -fexcess-precision dynamic only.
+ let excess_prec | opt_SimplExcessPrecision = ["-fexcess-precision"]
+ | otherwise = []
+
when (not (null errs)) $ ghcError (UsageError (unlines errs))
when (not (null errs)) $ ghcError (UsageError (unlines errs))
- return (cg_flags++more_leftover++leftover)
+ return (excess_prec++cg_flags++more_leftover++leftover)
+initStaticOpts :: IO ()
+initStaticOpts = writeIORef v_opt_C_ready True
static_flags :: [(String, OptKind IO)]
-- All the static flags should appear in this list. It describes how each
static_flags :: [(String, OptKind IO)]
-- All the static flags should appear in this list. It describes how each
@@
-135,7
+159,6
@@
static_flags = [
------- ways --------------------------------------------------------
, ( "prof" , NoArg (addWay WayProf) )
------- ways --------------------------------------------------------
, ( "prof" , NoArg (addWay WayProf) )
- , ( "unreg" , NoArg (addWay WayUnreg) )
, ( "ticky" , NoArg (addWay WayTicky) )
, ( "parallel" , NoArg (addWay WayPar) )
, ( "gransim" , NoArg (addWay WayGran) )
, ( "ticky" , NoArg (addWay WayTicky) )
, ( "parallel" , NoArg (addWay WayPar) )
, ( "gransim" , NoArg (addWay WayGran) )
@@
-197,7
+220,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])
-- 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"]
-- -static is the default
defaultStaticOpts = ["-static"]
@@
-262,7
+290,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_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")
-- language opts
opt_DictsStrict = lookUp FSLIT("-fdicts-strict")
@@
-274,13
+305,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_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
-- 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_GranMacros = lookUp FSLIT("-fgransim")
opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int)
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")
opt_HistorySize = lookup_def_int "-fhistory-size" 20
opt_OmitBlackHoling = lookUp FSLIT("-dno-black-holing")
opt_RuntimeTypes = lookUp FSLIT("-fruntime-types")
@@
-306,6
+335,7
@@
opt_PIC = True
opt_PIC = lookUp FSLIT("-fPIC")
#endif
opt_Static = lookUp FSLIT("-static")
opt_PIC = lookUp FSLIT("-fPIC")
#endif
opt_Static = lookUp FSLIT("-static")
+opt_HardwireLibPaths = lookUp FSLIT("-fhardwire-lib-paths")
opt_Unregisterised = lookUp FSLIT("-funregisterised")
-- Derived, not a real option. Determines whether we will be compiling
opt_Unregisterised = lookUp FSLIT("-funregisterised")
-- Derived, not a real option. Determines whether we will be compiling
@@
-332,7
+362,6
@@
isStaticFlag f =
"fauto-sccs-on-exported-toplevs",
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
"fauto-sccs-on-exported-toplevs",
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
- "fticky-ticky",
"fdicts-strict",
"firrefutable-tuples",
"fparallel",
"fdicts-strict",
"firrefutable-tuples",
"fparallel",
@@
-347,14
+376,15
@@
isStaticFlag f =
"fexcess-precision",
"funfolding-update-in-place",
"static",
"fexcess-precision",
"funfolding-update-in-place",
"static",
+ "fhardwire-lib-paths",
"funregisterised",
"fext-core",
"funregisterised",
"fext-core",
- "frules-off",
"fcpr-off",
"ferror-spans",
"fcpr-off",
"ferror-spans",
- "fPIC"
+ "fPIC",
+ "fhpc"
]
]
- || any (flip prefixMatch f) [
+ || any (`isPrefixOf` f) [
"fliberate-case-threshold",
"fmax-worker-args",
"fhistory-size",
"fliberate-case-threshold",
"fmax-worker-args",
"fhistory-size",
@@
-388,20
+418,15
@@
decodeSize str
| c == "G" || c == "g" = truncate (n * 1000 * 1000 * 1000)
| otherwise = throwDyn (CmdLineError ("can't decode size: " ++ str))
where (m, c) = span pred str
| c == "G" || c == "g" = truncate (n * 1000 * 1000 * 1000)
| otherwise = throwDyn (CmdLineError ("can't decode size: " ++ str))
where (m, c) = span pred str
- n = read m :: Double
+ n = readRational m
pred c = isDigit c || c == '.'
-----------------------------------------------------------------------------
-- RTS Hooks
pred c = isDigit c || c == '.'
-----------------------------------------------------------------------------
-- RTS Hooks
-#if __GLASGOW_HASKELL__ >= 504
foreign import ccall unsafe "setHeapSize" setHeapSize :: Int -> IO ()
foreign import ccall unsafe "enableTimingStats" enableTimingStats :: IO ()
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
-----------------------------------------------------------------------------
-- Ways
@@
-429,7
+454,6
@@
data WayName
= WayThreaded
| WayDebug
| WayProf
= WayThreaded
| WayDebug
| WayProf
- | WayUnreg
| WayTicky
| WayPar
| WayGran
| WayTicky
| WayPar
| WayGran
@@
-466,7
+490,6
@@
allowed_combination way = and [ x `allowedWith` y
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
- WayProf `allowedWith` WayUnreg = True
WayProf `allowedWith` WayNDP = True
_ `allowedWith` _ = False
WayProf `allowedWith` WayNDP = True
_ `allowedWith` _ = False
@@
-475,6
+498,7
@@
findBuildTag :: IO [String] -- new options
findBuildTag = do
way_names <- readIORef v_Ways
let ws = sort (nub way_names)
findBuildTag = do
way_names <- readIORef v_Ways
let ws = sort (nub way_names)
+
if not (allowed_combination ws)
then throwDyn (CmdLineError $
"combination not supported: " ++
if not (allowed_combination ws)
then throwDyn (CmdLineError $
"combination not supported: " ++
@@
-489,6
+513,8
@@
findBuildTag = do
writeIORef v_RTS_Build_tag rts_tag
return (concat flags)
writeIORef v_RTS_Build_tag rts_tag
return (concat flags)
+
+
mkBuildTag :: [Way] -> String
mkBuildTag ways = concat (intersperse "_" (map wayTag ways))
mkBuildTag :: [Way] -> String
mkBuildTag ways = concat (intersperse "_" (map wayTag ways))
@@
-497,6
+523,8
@@
lkupWay w =
Nothing -> error "findBuildTag"
Just details -> details
Nothing -> error "findBuildTag"
Just details -> details
+isRTSWay = wayRTSOnly . lkupWay
+
data Way = Way {
wayTag :: String,
wayRTSOnly :: Bool,
data Way = Way {
wayTag :: String,
wayRTSOnly :: Bool,
@@
-527,14
+555,10
@@
way_details =
, "-DPROFILING"
, "-optc-DPROFILING" ]),
, "-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" ]),
, "-optc-DTICKY_TICKY" ]),
- (WayUnreg, Way "u" False "Unregisterised"
- unregFlags ),
-
-- optl's below to tell linker where to find the PVM library -- HWL
(WayPar, Way "mp" False "Parallel"
[ "-fparallel"
-- optl's below to tell linker where to find the PVM library -- HWL
(WayPar, Way "mp" False "Parallel"
[ "-fparallel"