projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some Outputable instances
[ghc-hetmet.git]
/
compiler
/
main
/
DynFlags.hs
diff --git
a/compiler/main/DynFlags.hs
b/compiler/main/DynFlags.hs
index
2a46d0e
..
fc3f434
100644
(file)
--- a/
compiler/main/DynFlags.hs
+++ b/
compiler/main/DynFlags.hs
@@
-1,3
+1,4
@@
+{-# OPTIONS -fno-warn-missing-fields #-}
-----------------------------------------------------------------------------
--
-- Dynamic flags
-----------------------------------------------------------------------------
--
-- Dynamic flags
@@
-38,13
+39,14
@@
module DynFlags (
getVerbFlag,
updOptLevel,
setTmpDir,
getVerbFlag,
updOptLevel,
setTmpDir,
+ setPackageName,
-- parsing DynFlags
parseDynamicFlags,
allFlags,
-- misc stuff
-- parsing DynFlags
parseDynamicFlags,
allFlags,
-- misc stuff
- machdepCCOpts, picCCOpts,
+ machdepCCOpts, picCCOpts
) where
#include "HsVersions.h"
) where
#include "HsVersions.h"
@@
-63,20
+65,24
@@
import Config
import CmdLineParser
import Constants ( mAX_CONTEXT_REDUCTION_DEPTH )
import Panic ( panic, GhcException(..) )
import CmdLineParser
import Constants ( mAX_CONTEXT_REDUCTION_DEPTH )
import Panic ( panic, GhcException(..) )
+import UniqFM ( UniqFM )
import Util ( notNull, splitLongestPrefix, normalisePath )
import Maybes ( fromJust, orElse )
import SrcLoc ( SrcSpan )
import Util ( notNull, splitLongestPrefix, normalisePath )
import Maybes ( fromJust, orElse )
import SrcLoc ( SrcSpan )
+import Outputable
+import {-# SOURCE #-} ErrUtils ( Severity(..), Message, mkLocMessage )
-import DATA_IOREF ( readIORef )
-import EXCEPTION ( throwDyn )
-import Monad ( when )
+import Data.IORef ( readIORef )
+import Control.Exception ( throwDyn )
+import Control.Monad ( when )
#ifdef mingw32_TARGET_OS
import Data.List ( isPrefixOf )
#ifdef mingw32_TARGET_OS
import Data.List ( isPrefixOf )
+#else
+import Util ( split )
#endif
#endif
-import Char ( isDigit, isUpper )
-import Outputable
+
+import Data.Char ( isDigit, isUpper )
import System.IO ( hPutStrLn, stderr )
import System.IO ( hPutStrLn, stderr )
-import {-# SOURCE #-} ErrUtils ( Severity(..), Message, mkLocMessage )
-- -----------------------------------------------------------------------------
-- DynFlags
-- -----------------------------------------------------------------------------
-- DynFlags
@@
-115,6
+121,7
@@
data DynFlag
| Opt_D_dump_splices
| Opt_D_dump_BCOs
| Opt_D_dump_vect
| Opt_D_dump_splices
| Opt_D_dump_BCOs
| Opt_D_dump_vect
+ | Opt_D_dump_hpc
| Opt_D_source_stats
| Opt_D_verbose_core2core
| Opt_D_verbose_stg2stg
| Opt_D_source_stats
| Opt_D_verbose_core2core
| Opt_D_verbose_stg2stg
@@
-151,16
+158,18
@@
data DynFlag
| Opt_AllowIncoherentInstances
| Opt_MonomorphismRestriction
| Opt_MonoPatBinds
| Opt_AllowIncoherentInstances
| Opt_MonomorphismRestriction
| Opt_MonoPatBinds
+ | Opt_ExtendedDefaultRules -- Use GHC's extended rules for defaulting
| Opt_GlasgowExts
| Opt_FFI
| Opt_GlasgowExts
| Opt_FFI
- | Opt_PArr -- syntactic support for parallel arrays
- | Opt_Arrows -- Arrow-notation syntax
+ | Opt_PArr -- Syntactic support for parallel arrays
+ | Opt_Arrows -- Arrow-notation syntax
| Opt_TH
| Opt_ImplicitParams
| Opt_Generics
| Opt_ImplicitPrelude
| Opt_ScopedTypeVariables
| Opt_BangPatterns
| Opt_TH
| Opt_ImplicitParams
| Opt_Generics
| Opt_ImplicitPrelude
| Opt_ScopedTypeVariables
| Opt_BangPatterns
+ | Opt_IndexedTypes
-- optimisation opts
| Opt_Strictness
-- optimisation opts
| Opt_Strictness
@@
-179,7
+188,7
@@
data DynFlag
-- misc opts
| Opt_Cpp
| Opt_Pp
-- misc opts
| Opt_Cpp
| Opt_Pp
- | Opt_RecompChecking
+ | Opt_ForceRecomp
| Opt_DryRun
| Opt_DoAsmMangling
| Opt_ExcessPrecision
| Opt_DryRun
| Opt_DoAsmMangling
| Opt_ExcessPrecision
@@
-188,6
+197,10
@@
data DynFlag
| Opt_SplitObjs
| Opt_StgStats
| Opt_HideAllPackages
| Opt_SplitObjs
| Opt_StgStats
| Opt_HideAllPackages
+ | Opt_PrintBindResult
+ | Opt_Haddock
+ | Opt_Hpc
+ | Opt_Hpc_Trace
-- keeping stuff
| Opt_KeepHiDiffs
-- keeping stuff
| Opt_KeepHiDiffs
@@
-242,6
+255,11
@@
data DynFlags = DynFlags {
cmdlineFrameworks :: [String], -- ditto
tmpDir :: String, -- no trailing '/'
cmdlineFrameworks :: [String], -- ditto
tmpDir :: String, -- no trailing '/'
+ ghcUsagePath :: FilePath, -- Filled in by SysTools
+ ghciUsagePath :: FilePath, -- ditto
+
+ hpcDir :: String, -- ^ path to store the .mix files
+
-- options for particular phases
opt_L :: [String],
opt_P :: [String],
-- options for particular phases
opt_L :: [String],
opt_P :: [String],
@@
-263,16
+281,23
@@
data DynFlags = DynFlags {
pgm_a :: (String,[Option]),
pgm_l :: (String,[Option]),
pgm_dll :: (String,[Option]),
pgm_a :: (String,[Option]),
pgm_l :: (String,[Option]),
pgm_dll :: (String,[Option]),
+ pgm_T :: String,
+ pgm_sysman :: String,
- -- ** Package flags
+ -- Package flags
extraPkgConfs :: [FilePath],
extraPkgConfs :: [FilePath],
+ topDir :: FilePath, -- filled in by SysTools
+ systemPackageConfig :: FilePath, -- ditto
-- The -package-conf flags given on the command line, in the order
-- they appeared.
packageFlags :: [PackageFlag],
-- The -package and -hide-package flags from the command-line
-- The -package-conf flags given on the command line, in the order
-- they appeared.
packageFlags :: [PackageFlag],
-- The -package and -hide-package flags from the command-line
- -- ** Package state
+ -- Package state
+ -- NB. do not modify this field, it is calculated by
+ -- Packages.initPackages and Packages.updatePackages.
+ pkgDatabase :: Maybe (UniqFM InstalledPackageInfo),
pkgState :: PackageState,
-- hsc dynamic flags
pkgState :: PackageState,
-- hsc dynamic flags
@@
-286,7
+311,6
@@
data HscTarget
= HscC
| HscAsm
| HscJava
= HscC
| HscAsm
| HscJava
- | HscILX
| HscInterpreted
| HscNothing
deriving (Eq, Show)
| HscInterpreted
| HscNothing
deriving (Eq, Show)
@@
-318,6
+342,7
@@
data PackageFlag
= ExposePackage String
| HidePackage String
| IgnorePackage String
= ExposePackage String
| HidePackage String
| IgnorePackage String
+ deriving Eq
defaultHscTarget
| cGhcWithNativeCodeGen == "YES" = HscAsm
defaultHscTarget
| cGhcWithNativeCodeGen == "YES" = HscAsm
@@
-355,10
+380,6
@@
defaultDynFlags =
ctxtStkDepth = mAX_CONTEXT_REDUCTION_DEPTH,
thisPackage = mainPackageId,
ctxtStkDepth = mAX_CONTEXT_REDUCTION_DEPTH,
thisPackage = mainPackageId,
-
- wayNames = panic "ways",
- buildTag = panic "buildTag",
- rtsBuildTag = panic "rtsBuildTag",
objectDir = Nothing,
hiDir = Nothing,
objectDir = Nothing,
hiDir = Nothing,
@@
-376,6
+397,8
@@
defaultDynFlags =
cmdlineFrameworks = [],
tmpDir = cDEFAULT_TMPDIR,
cmdlineFrameworks = [],
tmpDir = cDEFAULT_TMPDIR,
+ hpcDir = ".hpc",
+
opt_L = [],
opt_P = [],
opt_F = [],
opt_L = [],
opt_P = [],
opt_F = [],
@@
-386,22
+409,12
@@
defaultDynFlags =
opt_dll = [],
opt_dep = [],
opt_dll = [],
opt_dep = [],
- pgm_L = panic "pgm_L",
- pgm_P = panic "pgm_P",
- pgm_F = panic "pgm_F",
- pgm_c = panic "pgm_c",
- pgm_m = panic "pgm_m",
- pgm_s = panic "pgm_s",
- pgm_a = panic "pgm_a",
- pgm_l = panic "pgm_l",
- pgm_dll = panic "pgm_mkdll",
-
extraPkgConfs = [],
packageFlags = [],
extraPkgConfs = [],
packageFlags = [],
- pkgState = panic "pkgState",
+ pkgDatabase = Nothing,
+ pkgState = panic "no package state yet: call GHC.setSessionDynFlags",
flags = [
flags = [
- Opt_RecompChecking,
Opt_ReadUserPackageConf,
Opt_MonoPatBinds, -- Experimentally, I'm making this non-standard
Opt_ReadUserPackageConf,
Opt_MonoPatBinds, -- Experimentally, I'm making this non-standard
@@
-426,8
+439,10
@@
defaultDynFlags =
-- and the default no-optimisation options:
Opt_IgnoreInterfacePragmas,
-- and the default no-optimisation options:
Opt_IgnoreInterfacePragmas,
- Opt_OmitInterfacePragmas
+ Opt_OmitInterfacePragmas,
+ -- on by default:
+ Opt_PrintBindResult
] ++ standardWarnings,
log_action = \severity srcSpan style msg ->
] ++ standardWarnings,
log_action = \severity srcSpan style msg ->
@@
-806,7
+821,6
@@
dynamic_flags = [
, ( "F" , NoArg (setDynFlag Opt_Pp))
, ( "#include" , HasArg (addCmdlineHCInclude) )
, ( "v" , OptIntSuffix setVerbosity )
, ( "F" , NoArg (setDynFlag Opt_Pp))
, ( "#include" , HasArg (addCmdlineHCInclude) )
, ( "v" , OptIntSuffix setVerbosity )
-
------- Specific phases --------------------------------------------
, ( "pgmL" , HasArg (upd . setPgmL) )
, ( "pgmP" , HasArg (upd . setPgmP) )
------- Specific phases --------------------------------------------
, ( "pgmL" , HasArg (upd . setPgmL) )
, ( "pgmP" , HasArg (upd . setPgmP) )
@@
-867,15
+881,17
@@
dynamic_flags = [
------- Miscellaneous ----------------------------------------------
, ( "no-hs-main" , NoArg (setDynFlag Opt_NoHsMain))
, ( "main-is" , SepArg setMainIs )
------- Miscellaneous ----------------------------------------------
, ( "no-hs-main" , NoArg (setDynFlag Opt_NoHsMain))
, ( "main-is" , SepArg setMainIs )
+ , ( "haddock" , NoArg (setDynFlag Opt_Haddock) )
+ , ( "hpcdir" , SepArg setOptHpcDir )
- ------- recompilation checker --------------------------------------
- , ( "recomp" , NoArg (setDynFlag Opt_RecompChecking) )
- , ( "no-recomp" , NoArg (unSetDynFlag Opt_RecompChecking) )
+ ------- recompilation checker (DEPRECATED, use -fforce-recomp) -----
+ , ( "recomp" , NoArg (unSetDynFlag Opt_ForceRecomp) )
+ , ( "no-recomp" , NoArg (setDynFlag Opt_ForceRecomp) )
------- Packages ----------------------------------------------------
, ( "package-conf" , HasArg extraPkgConf_ )
, ( "no-user-package-conf", NoArg (unSetDynFlag Opt_ReadUserPackageConf) )
------- Packages ----------------------------------------------------
, ( "package-conf" , HasArg extraPkgConf_ )
, ( "no-user-package-conf", NoArg (unSetDynFlag Opt_ReadUserPackageConf) )
- , ( "package-name" , HasArg setPackageName )
+ , ( "package-name" , HasArg (upd . setPackageName) )
, ( "package" , HasArg exposePackage )
, ( "hide-package" , HasArg hidePackage )
, ( "hide-all-packages", NoArg (setDynFlag Opt_HideAllPackages) )
, ( "package" , HasArg exposePackage )
, ( "hide-package" , HasArg hidePackage )
, ( "hide-all-packages", NoArg (setDynFlag Opt_HideAllPackages) )
@@
-930,10
+946,12
@@
dynamic_flags = [
, ( "ddump-hi", setDumpFlag Opt_D_dump_hi)
, ( "ddump-minimal-imports", NoArg (setDynFlag Opt_D_dump_minimal_imports))
, ( "ddump-vect", setDumpFlag Opt_D_dump_vect)
, ( "ddump-hi", setDumpFlag Opt_D_dump_hi)
, ( "ddump-minimal-imports", NoArg (setDynFlag Opt_D_dump_minimal_imports))
, ( "ddump-vect", setDumpFlag Opt_D_dump_vect)
+ , ( "ddump-hpc", setDumpFlag Opt_D_dump_hpc)
+
, ( "dcore-lint", NoArg (setDynFlag Opt_DoCoreLinting))
, ( "dstg-lint", NoArg (setDynFlag Opt_DoStgLinting))
, ( "dcmm-lint", NoArg (setDynFlag Opt_DoCmmLinting))
, ( "dcore-lint", NoArg (setDynFlag Opt_DoCoreLinting))
, ( "dstg-lint", NoArg (setDynFlag Opt_DoStgLinting))
, ( "dcmm-lint", NoArg (setDynFlag Opt_DoCmmLinting))
- , ( "dshow-passes", NoArg (do unSetDynFlag Opt_RecompChecking
+ , ( "dshow-passes", NoArg (do setDynFlag Opt_ForceRecomp
setVerbosity (Just 2)) )
, ( "dfaststring-stats", NoArg (setDynFlag Opt_D_faststring_stats))
setVerbosity (Just 2)) )
, ( "dfaststring-stats", NoArg (setDynFlag Opt_D_faststring_stats))
@@
-970,7
+988,6
@@
dynamic_flags = [
, ( "fasm", AnySuffix (\_ -> setTarget HscAsm) )
, ( "fvia-c", NoArg (setTarget HscC) )
, ( "fvia-C", NoArg (setTarget HscC) )
, ( "fasm", AnySuffix (\_ -> setTarget HscAsm) )
, ( "fvia-c", NoArg (setTarget HscC) )
, ( "fvia-C", NoArg (setTarget HscC) )
- , ( "filx", NoArg (setTarget HscILX) )
, ( "fglasgow-exts", NoArg (mapM_ setDynFlag glasgowExtsFlags) )
, ( "fno-glasgow-exts", NoArg (mapM_ unSetDynFlag glasgowExtsFlags) )
, ( "fglasgow-exts", NoArg (mapM_ setDynFlag glasgowExtsFlags) )
, ( "fno-glasgow-exts", NoArg (mapM_ unSetDynFlag glasgowExtsFlags) )
@@
-1010,8
+1027,10
@@
fFlags = [
( "implicit-prelude", Opt_ImplicitPrelude ),
( "scoped-type-variables", Opt_ScopedTypeVariables ),
( "bang-patterns", Opt_BangPatterns ),
( "implicit-prelude", Opt_ImplicitPrelude ),
( "scoped-type-variables", Opt_ScopedTypeVariables ),
( "bang-patterns", Opt_BangPatterns ),
+ ( "indexed-types", Opt_IndexedTypes ),
( "monomorphism-restriction", Opt_MonomorphismRestriction ),
( "mono-pat-binds", Opt_MonoPatBinds ),
( "monomorphism-restriction", Opt_MonomorphismRestriction ),
( "mono-pat-binds", Opt_MonoPatBinds ),
+ ( "extended-default-rules", Opt_ExtendedDefaultRules ),
( "implicit-params", Opt_ImplicitParams ),
( "allow-overlapping-instances", Opt_AllowOverlappingInstances ),
( "allow-undecidable-instances", Opt_AllowUndecidableInstances ),
( "implicit-params", Opt_ImplicitParams ),
( "allow-overlapping-instances", Opt_AllowOverlappingInstances ),
( "allow-undecidable-instances", Opt_AllowUndecidableInstances ),
@@
-1030,15
+1049,20
@@
fFlags = [
( "unbox-strict-fields", Opt_UnboxStrictFields ),
( "dicts-cheap", Opt_DictsCheap ),
( "excess-precision", Opt_ExcessPrecision ),
( "unbox-strict-fields", Opt_UnboxStrictFields ),
( "dicts-cheap", Opt_DictsCheap ),
( "excess-precision", Opt_ExcessPrecision ),
- ( "asm-mangling", Opt_DoAsmMangling )
+ ( "asm-mangling", Opt_DoAsmMangling ),
+ ( "print-bind-result", Opt_PrintBindResult ),
+ ( "force-recomp", Opt_ForceRecomp ),
+ ( "hpc", Opt_Hpc ),
+ ( "hpc-tracer", Opt_Hpc )
]
]
+
glasgowExtsFlags = [
Opt_GlasgowExts,
Opt_FFI,
Opt_ImplicitParams,
Opt_ScopedTypeVariables,
glasgowExtsFlags = [
Opt_GlasgowExts,
Opt_FFI,
Opt_ImplicitParams,
Opt_ScopedTypeVariables,
- Opt_BangPatterns ]
+ Opt_IndexedTypes ]
isFFlag f = f `elem` (map fst fFlags)
getFFlag f = fromJust (lookup f fFlags)
isFFlag f = f `elem` (map fst fFlags)
getFFlag f = fromJust (lookup f fFlags)
@@
-1068,7
+1092,7
@@
unSetDynFlag f = upd (\dfs -> dopt_unset dfs f)
setDumpFlag :: DynFlag -> OptKind DynP
setDumpFlag dump_flag
setDumpFlag :: DynFlag -> OptKind DynP
setDumpFlag dump_flag
- = NoArg (unSetDynFlag Opt_RecompChecking >> setDynFlag dump_flag)
+ = NoArg (setDynFlag Opt_ForceRecomp >> setDynFlag dump_flag)
-- Whenver we -ddump, switch off the recompilation checker,
-- else you don't see the dump!
-- Whenver we -ddump, switch off the recompilation checker,
-- else you don't see the dump!
@@
-1085,20
+1109,20
@@
hidePackage p =
upd (\s -> s{ packageFlags = HidePackage p : packageFlags s })
ignorePackage p =
upd (\s -> s{ packageFlags = IgnorePackage p : packageFlags s })
upd (\s -> s{ packageFlags = HidePackage p : packageFlags s })
ignorePackage p =
upd (\s -> s{ packageFlags = IgnorePackage p : packageFlags s })
+
setPackageName p
| Nothing <- unpackPackageId pid
= throwDyn (CmdLineError ("cannot parse \'" ++ p ++ "\' as a package identifier"))
| otherwise
setPackageName p
| Nothing <- unpackPackageId pid
= throwDyn (CmdLineError ("cannot parse \'" ++ p ++ "\' as a package identifier"))
| otherwise
- = upd (\s -> s{ thisPackage = pid })
+ = \s -> s{ thisPackage = pid }
where
pid = stringToPackageId p
where
pid = stringToPackageId p
--- we can only switch between HscC, HscAsmm, and HscILX with dynamic flags
+-- we can only switch between HscC, and HscAsmm with dynamic flags
-- (-fvia-C, -fasm, -filx respectively).
setTarget l = upd (\dfs -> case hscTarget dfs of
HscC -> dfs{ hscTarget = l }
HscAsm -> dfs{ hscTarget = l }
-- (-fvia-C, -fasm, -filx respectively).
setTarget l = upd (\dfs -> case hscTarget dfs of
HscC -> dfs{ hscTarget = l }
HscAsm -> dfs{ hscTarget = l }
- HscILX -> dfs{ hscTarget = l }
_ -> dfs)
setOptLevel :: Int -> DynFlags -> DynFlags
_ -> dfs)
setOptLevel :: Int -> DynFlags -> DynFlags
@@
-1232,6
+1256,12
@@
setTmpDir dir dflags = dflags{ tmpDir = canonicalise dir }
#endif
-----------------------------------------------------------------------------
#endif
-----------------------------------------------------------------------------
+-- Hpc stuff
+
+setOptHpcDir :: String -> DynP ()
+setOptHpcDir arg = upd $ \ d -> d{hpcDir = arg}
+
+-----------------------------------------------------------------------------
-- Via-C compilation stuff
machdepCCOpts :: DynFlags -> ([String], -- flags for all C compilations
-- Via-C compilation stuff
machdepCCOpts :: DynFlags -> ([String], -- flags for all C compilations
@@
-1321,9
+1351,6
@@
machdepCCOpts dflags
-- version.
] )
-- version.
] )
-#elif mips_TARGET_ARCH
- = ( ["-static"], [] )
-
#elif sparc_TARGET_ARCH
= ( [], ["-w"] )
-- For now, to suppress the gcc warning "call-clobbered
#elif sparc_TARGET_ARCH
= ( [], ["-w"] )
-- For now, to suppress the gcc warning "call-clobbered