[project @ 2001-01-12 11:04:45 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / DriverFlags.hs

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index ce23caf..128a3a8 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,7 @@
+{-# OPTIONS -#include "hschooks.h" #-}
+
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.34 2000/12/12 14:35:08 simonmar Exp $
+-- $Id: DriverFlags.hs,v 1.39 2001/01/12 11:04:45 simonmar Exp $
 --
 -- Driver flags
 --
@@ -16,7 +18,6 @@ import DriverState
 import DriverUtil
 import TmpFiles        ( v_TmpDir )
 import CmdLineOpts
-import TmpFiles                ( newTempName )
 import Config
 import Util
 import Panic
@@ -24,7 +25,6 @@ import Panic
 import Exception
 import IOExts
 
-import Directory       ( removeFile )
 import IO
 import Maybe
 import Monad
@@ -263,10 +263,12 @@ static_flags =
 
        ----- Linker --------------------------------------------------------
   ,  ( "static"        , NoArg (writeIORef v_Static True) )
+  ,  ( "dynamic"        , NoArg (writeIORef v_Static False) )
   ,  ( "rdynamic"       , NoArg (return ()) ) -- ignored for compat w/ gcc
 
        ----- RTS opts ------------------------------------------------------
   ,  ( "H"                 , HasArg (setHeapSize . fromIntegral . decodeSize) )
+  ,  ( "Rghc-timing"      , NoArg  (enableTimingStats) )
 
         ------ Compiler flags -----------------------------------------------
   ,  ( "O2-for-C"         , NoArg (writeIORef v_minus_o2_for_C True) )
@@ -345,7 +347,7 @@ setVerbosityAtLeast n =
                          then dfs{ verbosity = n }
                          else dfs)
 
-setVerbosity "" = updDynFlags (\dfs -> dfs{ verbosity = 2 })
+setVerbosity "" = updDynFlags (\dfs -> dfs{ verbosity = 3 })
 setVerbosity n 
   | all isDigit n = updDynFlags (\dfs -> dfs{ verbosity = read n })
   | otherwise     = throwDyn (OtherError "can't parse verbosity flag (-v<n>)")
@@ -403,7 +405,7 @@ dynamic_flags = [
   ,  ( "ddump-rn-stats",         NoArg (setDynFlag Opt_D_dump_rn_stats) )
   ,  ( "ddump-stix",             NoArg (setDynFlag Opt_D_dump_stix) )
   ,  ( "ddump-simpl-stats",      NoArg (setDynFlag Opt_D_dump_simpl_stats) )
-  ,  ( "ddump-interpsyn",        NoArg (setDynFlag Opt_D_dump_InterpSyn) )
+  ,  ( "ddump-bcos",             NoArg (setDynFlag Opt_D_dump_BCOs) )
   ,  ( "dsource-stats",          NoArg (setDynFlag Opt_D_source_stats) )
   ,  ( "dverbose-core2core",     NoArg (setDynFlag Opt_D_verbose_core2core) )
   ,  ( "dverbose-stg2stg",       NoArg (setDynFlag Opt_D_verbose_stg2stg) )
@@ -476,15 +478,13 @@ decodeSize str
        pred c = isDigit c || c == '.'
 
 floatOpt :: IORef Double -> String -> IO ()
-floatOpt ref str
-  = writeIORef ref (read str :: Double)
+floatOpt ref str = writeIORef ref (read str :: Double)
+
+-----------------------------------------------------------------------------
+-- RTS Hooks
 
-#if __GLASGOW_HASKELL__ >= 411
-foreign import "setHeapSize" unsafe setHeapSize :: Int -> IO ()
-#else
-setHeapSize :: Int -> IO ()            -- -H<size> is ignored
-setHeapSize _ = return ()
-#endif
+foreign import "setHeapSize"       unsafe setHeapSize       :: Int -> IO ()
+foreign import "enableTimingStats" unsafe enableTimingStats :: IO ()
 
 -----------------------------------------------------------------------------
 -- Build the Hsc static command line opts
@@ -504,13 +504,10 @@ buildStaticHscOpts = do
            _ -> error "unknown opt level"
            -- ToDo: -Ofile
  
-  let stg_opts = [ "-flet-no-escape" ]
-       -- let-no-escape always on for now
-
        -- take into account -fno-* flags by removing the equivalent -f*
        -- flag from our list.
   anti_flags <- getStaticOpts v_Anti_opt_C
-  let basic_opts = opt_C_ ++ optimisation_opts ++ stg_opts
+  let basic_opts = opt_C_ ++ optimisation_opts
       filtered_opts = filter (`notElem` anti_flags) basic_opts
 
   static <- (do s <- readIORef v_Static; if s then return "-static" 
@@ -526,9 +523,9 @@ buildStaticHscOpts = do
 runSomething phase_name cmd
  = do
    verb <- dynFlag verbosity
-   when (verb >= 2) $ putStrLn ("*** " ++ phase_name)
-   when (verb >= 3) $ putStrLn cmd
-   hFlush stdout
+   when (verb >= 2) $ hPutStrLn stderr ("*** " ++ phase_name)
+   when (verb >= 3) $ hPutStrLn stderr cmd
+   hFlush stderr
 
    -- test for -n flag
    n <- readIORef v_Dry_run
@@ -539,5 +536,5 @@ runSomething phase_name cmd
 
    if exit_code /= ExitSuccess
        then throwDyn (PhaseFailed phase_name exit_code)
-       else do when (verb >= 3) (putStr "\n")
+       else do when (verb >= 3) (hPutStr stderr "\n")
                return ()