[project @ 2004-11-26 16:19:45 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / CodeOutput.lhs

diff --git a/ghc/compiler/main/CodeOutput.lhs b/ghc/compiler/main/CodeOutput.lhs
index 7260f6e..3a3e4bb 100644 (file)
--- a/ghc/compiler/main/CodeOutput.lhs
+++ b/ghc/compiler/main/CodeOutput.lhs
@@ -24,23 +24,27 @@ import qualified PrintJava
 import OccurAnal       ( occurAnalyseBinds )
 #endif
 
+import Distribution.Package    ( showPackageId )
+import PprC            ( writeCs )
+import CmmLint         ( cmmLint )
 import Packages
-import DriverState     ( getExplicitPackagesAnd, getPackageCIncludes )
+import DriverUtil      ( filenameOf )
 import FastString      ( unpackFS )
-import AbsCSyn         ( AbstractC )
-import PprAbsC         ( dumpRealC, writeRealC )
+import Cmm             ( Cmm )
 import HscTypes
 import CmdLineOpts
-import ErrUtils                ( dumpIfSet_dyn, showPass )
+import ErrUtils                ( dumpIfSet_dyn, showPass, ghcExit )
 import Outputable
 import Pretty          ( Mode(..), printDoc )
 import Module          ( Module )
+import ListSetOps      ( removeDupsEq )
+import Maybes          ( firstJust )
 
+import Directory       ( doesFileExist )
 import Monad           ( when )
 import IO
 \end{code}
 
-
 %************************************************************************
 %*                                                                     *
 \subsection{Steering}
@@ -52,7 +56,7 @@ codeOutput :: DynFlags
           -> Module
           -> ForeignStubs
           -> Dependencies
-          -> AbstractC                 -- Compiled abstract C
+          -> [Cmm]                     -- Compiled C--
           -> IO (Bool{-stub_h_exists-}, Bool{-stub_c_exists-})
 
 codeOutput dflags this_mod foreign_stubs deps flat_abstractC
@@ -63,7 +67,17 @@ codeOutput dflags this_mod foreign_stubs deps flat_abstractC
 
     -- Dunno if the above comment is still meaningful now.  JRS 001024.
 
-    do { showPass dflags "CodeOutput"
+    do { when (dopt Opt_DoCmmLinting dflags) $ do
+               { showPass dflags "CmmLint"
+               ; let lints = map cmmLint flat_abstractC
+               ; case firstJust lints of
+                       Just err -> do { printDump err
+                                      ; ghcExit 1
+                                      }
+                       Nothing  -> return ()
+               }
+
+       ; showPass dflags "CodeOutput"
        ; let filenm = dopt_OutName dflags 
        ; stubs_exist <- outputForeignStubs dflags foreign_stubs
        ; case dopt_HscLang dflags of {
@@ -102,8 +116,7 @@ doOutput filenm io_action = bracket (openFile filenm WriteMode) hClose io_action
 \begin{code}
 outputC dflags filenm flat_absC 
        (stub_h_exists, _) dependencies foreign_stubs
-  = do dumpIfSet_dyn dflags Opt_D_dump_realC "Real C" (dumpRealC flat_absC)
-
+  = do 
        -- figure out which header files to #include in the generated .hc file:
        --
        --   * extra_includes from packages
@@ -111,20 +124,22 @@ outputC dflags filenm flat_absC
        --   * the _stub.h file, if there is one.
        --
        let packages = dep_pkgs dependencies
-       pkg_configs <- getExplicitPackagesAnd packages
-       let pkg_names = map name pkg_configs
+       pkg_configs <- getExplicitPackagesAnd dflags packages
+       let pkg_names = map (showPackageId.package) pkg_configs
 
        c_includes <- getPackageCIncludes pkg_configs
        let cmdline_includes = cmdlineHcIncludes dflags -- -#include options
        
-          ffi_decl_headers = case foreign_stubs of
-                               NoStubs                 -> []
-                               ForeignStubs _ _ fdhs _ -> fdhs 
+          ffi_decl_headers 
+             = case foreign_stubs of
+                 NoStubs                 -> []
+                 ForeignStubs _ _ fdhs _ -> map unpackFS (fst (removeDupsEq fdhs))
+                       -- Remove duplicates, because distinct foreign import decls
+                       -- may cite the same #include.  Order doesn't matter.
 
            all_headers =  c_includes
                       ++ reverse cmdline_includes
-                      ++ reverse (map unpackFS ffi_decl_headers)
-                          -- reverse correct?
+                      ++ ffi_decl_headers
 
        let cc_injects = unlines (map mk_include all_headers)
                   mk_include h_file = 
@@ -137,8 +152,8 @@ outputC dflags filenm flat_absC
          hPutStr h ("/* GHC_PACKAGES " ++ unwords pkg_names ++ "\n*/\n")
          hPutStr h cc_injects
          when stub_h_exists $ 
-            hPutStrLn h ("#include \"" ++ (hscStubHOutName dflags) ++ "\"")
-         writeRealC h flat_absC
+            hPutStrLn h ("#include \"" ++ (filenameOf (hscStubHOutName dflags)) ++ "\"")
+         writeCs h flat_absC
 \end{code}
 
 
@@ -154,9 +169,8 @@ outputAsm dflags filenm flat_absC
 #ifndef OMIT_NATIVE_CODEGEN
 
   = do ncg_uniqs <- mkSplitUniqSupply 'n'
-       let (stix_final, ncg_output_d) = _scc_ "NativeCodeGen" 
-                                       nativeCodeGen flat_absC ncg_uniqs
-       dumpIfSet_dyn dflags Opt_D_dump_stix "Final stix code" stix_final
+       ncg_output_d <- _scc_ "NativeCodeGen" 
+                         nativeCodeGen dflags flat_absC ncg_uniqs
        dumpIfSet_dyn dflags Opt_D_dump_asm "Asm code" (docToSDoc ncg_output_d)
        _scc_ "OutputAsm" doOutput filenm $
           \f -> printDoc LeftMode f ncg_output_d
@@ -217,15 +231,24 @@ outputIlx dflags filename mod tycons stg_binds
 outputForeignStubs :: DynFlags -> ForeignStubs
                   -> IO (Bool,         -- Header file created
                          Bool)         -- C file created
-outputForeignStubs dflags NoStubs = return (False, False)
+outputForeignStubs dflags NoStubs = do
+-- When compiling External Core files, may need to use stub files from a 
+-- previous compilation
+   hFileExists <- doesFileExist (hscStubHOutName dflags)
+   cFileExists <- doesFileExist (hscStubCOutName dflags)
+   return (hFileExists, cFileExists)
 outputForeignStubs dflags (ForeignStubs h_code c_code _ _)
   = do
        dumpIfSet_dyn dflags Opt_D_dump_foreign
                       "Foreign export header file" stub_h_output_d
 
        -- we need the #includes from the rts package for the stub files
-       rts_pkgs <- getPackageDetails [rtsPackage]
-       let rts_includes = concatMap mk_include (concatMap c_includes rts_pkgs)
+       let rtsid = rtsPackageId (pkgState dflags)
+           rts_includes 
+               | Just pid <- rtsid = 
+                       let rts_pkg = getPackageDetails (pkgState dflags) pid in
+                       concatMap mk_include (includes rts_pkg)
+               | otherwise = []
            mk_include i = "#include \"" ++ i ++ "\"\n"
 
        stub_h_file_exists
@@ -238,7 +261,7 @@ outputForeignStubs dflags (ForeignStubs h_code c_code _ _)
        stub_c_file_exists
            <- outputForeignStubs_help (hscStubCOutName dflags) stub_c_output_w
                ("#define IN_STG_CODE 0\n" ++ 
-                "#include \"RtsAPI.h\"\n" ++
+                "#include \"Rts.h\"\n" ++
                 rts_includes ++
                 cplusplus_hdr)
                 cplusplus_ftr