[project @ 2000-10-17 14:40:26 by sewardj]

[ghc-hetmet.git] / ghc / compiler / ghci / CmLink.lhs

diff --git a/ghc/compiler/ghci/CmLink.lhs b/ghc/compiler/ghci/CmLink.lhs
index 8bcb3a1..c7ee69f 100644 (file)
--- a/ghc/compiler/ghci/CmLink.lhs
+++ b/ghc/compiler/ghci/CmLink.lhs
@@ -1,60 +1,120 @@
 %
-% (c) The AQUA Project, Glasgow University, 1993-2000
+% (c) The University of Glasgow, 2000
 %
 \section[CmLink]{Linker for GHCI}
 
 \begin{code}
-module CmLink ( Linkable(..), 
+module CmLink ( Linkable(..),  Unlinked(..),
                filterModuleLinkables, 
                modname_of_linkable, is_package_linkable,
                LinkResult(..),
-                HValue,
                 link, 
-                PLS{-abstractly!-}, emptyPLS )
-                 
+                PersistentLinkerState{-abstractly!-}, emptyPLS )
 where
 
-import CmStaticInfo    ( PCI )
-import CmFind          ( Path, PkgName )
+import StgInterp       ( linkIModules, ClosureEnv, ItblEnv )
+import Linker
+
+import CmStaticInfo    ( PackageConfigInfo )
+import Module          ( ModuleName, PackageName )
+import InterpSyn       ( UnlinkedIBind, HValue, binder )
 import Module          ( Module )
 import Outputable      ( SDoc )
 import FiniteMap       ( FiniteMap, emptyFM )
 import RdrName         ( RdrName )
-import Digraph         ( SCC )
+import Digraph         ( SCC(..) )
 import Addr            ( Addr )
+import Outputable
 import Panic           ( panic )
 
 #include "HsVersions.h"
-
 \end{code}
 
 \begin{code}
-data PLS 
-   = MkPLS {
-        source_symtab :: FiniteMap RdrName HValue,
-        object_symtab :: FiniteMap String Addr
+data PersistentLinkerState 
+   = PersistentLinkerState {
+        closure_env :: ClosureEnv,
+        itbl_env    :: ItblEnv
+       -- notionally here, but really lives in the C part of the linker:
+       --            object_symtab :: FiniteMap String Addr
      }
 
-data HValue = HValue -- fix this ... just temporary?
+data LinkResult 
+   = LinkOK   PersistentLinkerState
+   | LinkErrs PersistentLinkerState [SDoc]
 
+data Unlinked
+   = DotO FilePath
+   | DotA FilePath
+   | DotDLL FilePath
+   | Trees [UnlinkedIBind]     -- bunch of interpretable bindings
 
-link :: PCI -> [SCC Linkable] -> PLS -> IO LinkResult
-link pci linkabless pls
-   = return (error "link:unimp")
+instance Outputable Unlinked where
+   ppr (DotO path)   = text "DotO" <+> text path
+   ppr (DotA path)   = text "DotA" <+> text path
+   ppr (DotDLL path) = text "DotDLL" <+> text path
+   ppr (Trees binds) = text "Trees" <+> ppr (map binder binds)
 
-data LinkResult 
-   = LinkOK   PLS
-   | LinkErrs PLS [SDoc]
 
-data Unlinked
-   = DotO Path
-   | DotA Path
-   | DotDLL Path
-   -- | Trees [StgTree RdrName]
+isObject (DotO _) = True
+isObject (DotA _) = True
+isObject (DotDLL _) = True
+isObject _ = False
+
+isInterpretable (Trees _) = True
+isInterpretable _ = False
 
 data Linkable
-   = LM {-should be:Module-} String{- == ModName-} [Unlinked]
-   | LP PkgName
+   = LM ModuleName [Unlinked]
+   | LP PackageName
+
+instance Outputable Linkable where
+   ppr (LM mod_nm unlinkeds) = text "LinkableM" <+> ppr mod_nm <+> ppr unlinkeds
+   ppr (LP package_nm)       = text "LinkableP" <+> ptext package_nm
+
+emptyPLS :: IO PersistentLinkerState
+emptyPLS = return (PersistentLinkerState { closure_env = emptyFM, 
+                                           itbl_env    = emptyFM })
+\end{code}
+
+\begin{code}
+link :: PackageConfigInfo 
+     -> [SCC Linkable] 
+     -> PersistentLinkerState 
+     -> IO LinkResult
+
+#ifndef GHCI_NOTYET
+--link = panic "CmLink.link: not implemented"
+link pci groups pls1
+   = do putStrLn "Hello from the Linker!"
+        putStrLn (showSDoc (vcat (map ppLinkableSCC groups)))
+        putStrLn "Bye-bye from the Linker!"
+        return (LinkOK pls1)
+
+ppLinkableSCC :: SCC Linkable -> SDoc
+ppLinkableSCC (CyclicSCC xs) = ppr xs
+ppLinkableSCC (AcyclicSCC x) = ppr [x]
+
+
+#else
+link pci [] pls = return (LinkOK pls)
+link pci (group:groups) pls = do
+   -- the group is either all objects or all interpretable, for now
+   if all isObject group
+       then do mapM loadObj [ file | DotO file <- group ]
+               resolveObjs
+               link pci groups pls
+    else if all isInterpretable group
+       then do (new_closure_env, new_itbl_env) <-
+                  linkIModules (closure_env pls)
+                               (itbl_env pls)
+                               [ trees | Trees trees <- group ]
+               link pci groups (PersistentLinkerState{
+                                  closure_env=new_closure_env,
+                                  itbl_env=new_itbl_env})
+    else
+       return (LinkErrs pls (ptext SLIT("linker: group must contain all objects or all interpreted modules")))
+#endif
 
 modname_of_linkable (LM nm _) = nm
 modname_of_linkable (LP _)    = panic "modname_of_linkable: package"
@@ -62,7 +122,7 @@ modname_of_linkable (LP _)    = panic "modname_of_linkable: package"
 is_package_linkable (LP _)   = True
 is_package_linkable (LM _ _) = False
 
-filterModuleLinkables :: (String{- ==ModName-} -> Bool) 
+filterModuleLinkables :: (ModuleName -> Bool) 
                       -> [Linkable] 
                       -> [Linkable]
 filterModuleLinkables p [] = []
@@ -73,8 +133,4 @@ filterModuleLinkables p (li:lis)
      where
         dump   = filterModuleLinkables p lis
         retain = li : dump
-
-emptyPLS :: IO PLS
-emptyPLS = return (MkPLS { source_symtab = emptyFM, 
-                           object_symtab = emptyFM })
 \end{code}