cmmTopCodeGen no longer takes DynFlags as an argument

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

diff --git a/compiler/ghci/ObjLink.lhs b/compiler/ghci/ObjLink.lhs
index 5988165..cd593f7 100644 (file)
--- a/compiler/ghci/ObjLink.lhs
+++ b/compiler/ghci/ObjLink.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The University of Glasgow, 2000
+% (c) The University of Glasgow, 2000-2006
 %
 
 -- ---------------------------------------------------------------------------
@@ -9,52 +9,49 @@
 Primarily, this module consists of an interface to the C-land dynamic linker.
 
 \begin{code}
-{-# OPTIONS -#include "Linker.h" #-}
-
 module ObjLink ( 
    initObjLinker,       -- :: IO ()
    loadDLL,             -- :: String -> IO (Maybe String)
+   loadArchive,         -- :: String -> IO ()
    loadObj,             -- :: String -> IO ()
    unloadObj,           -- :: String -> IO ()
    insertSymbol,         -- :: String -> String -> Ptr a -> IO ()
-   insertStableSymbol,   -- :: String -> String -> a -> IO ()
    lookupSymbol,        -- :: String -> IO (Maybe (Ptr a))
    resolveObjs          -- :: IO SuccessFlag
   )  where
 
-import Monad            ( when )
+import Panic
+import BasicTypes      ( SuccessFlag, successIf )
+import Config          ( cLeadingUnderscore )
 
+import Control.Monad    ( when )
 import Foreign.C
 import Foreign         ( nullPtr )
-import Panic           ( panic )
-import BasicTypes      ( SuccessFlag, successIf )
-import Config          ( cLeadingUnderscore )
-import Outputable
+import GHC.Exts         ( Ptr(..) )
+import GHC.IO.Encoding  ( fileSystemEncoding )
+import qualified GHC.Foreign as GHC
+
 
-import GHC.Exts         ( Ptr(..), unsafeCoerce# )
 
 -- ---------------------------------------------------------------------------
 -- RTS Linker Interface
 -- ---------------------------------------------------------------------------
 
+-- UNICODE FIXME: Unicode object/archive/DLL file names on Windows will only work in the right code page
+withFileCString :: FilePath -> (CString -> IO a) -> IO a
+withFileCString = GHC.withCString fileSystemEncoding
+
 insertSymbol :: String -> String -> Ptr a -> IO ()
 insertSymbol obj_name key symbol
     = let str = prefixUnderscore key
-      in withCString obj_name $ \c_obj_name ->
-         withCString str $ \c_str ->
+      in withFileCString obj_name $ \c_obj_name ->
+         withCAString str $ \c_str ->
           c_insertSymbol c_obj_name c_str symbol
 
-insertStableSymbol :: String -> String -> a -> IO ()
-insertStableSymbol obj_name key symbol
-    = let str = prefixUnderscore key
-      in withCString obj_name $ \c_obj_name ->
-         withCString str $ \c_str ->
-          c_insertStableSymbol c_obj_name c_str (Ptr (unsafeCoerce# symbol))
-
 lookupSymbol :: String -> IO (Maybe (Ptr a))
 lookupSymbol str_in = do
    let str = prefixUnderscore str_in
-   withCString str $ \c_str -> do
+   withCAString str $ \c_str -> do
      addr <- c_lookupSymbol c_str
      if addr == nullPtr
        then return Nothing
@@ -69,23 +66,29 @@ loadDLL :: String -> IO (Maybe String)
 -- Nothing      => success
 -- Just err_msg => failure
 loadDLL str = do
-  maybe_errmsg <- withCString str $ \dll -> c_addDLL dll
+  maybe_errmsg <- withFileCString str $ \dll -> c_addDLL dll
   if maybe_errmsg == nullPtr
        then return Nothing
        else do str <- peekCString maybe_errmsg
                return (Just str)
 
+loadArchive :: String -> IO ()
+loadArchive str = do
+   withFileCString str $ \c_str -> do
+     r <- c_loadArchive c_str
+     when (r == 0) (panic ("loadArchive " ++ show str ++ ": failed"))
+
 loadObj :: String -> IO ()
 loadObj str = do
-   withCString str $ \c_str -> do
+   withFileCString str $ \c_str -> do
      r <- c_loadObj c_str
-     when (r == 0) (panic "loadObj: failed")
+     when (r == 0) (panic ("loadObj " ++ show str ++ ": failed"))
 
 unloadObj :: String -> IO ()
 unloadObj str =
-   withCString str $ \c_str -> do
+   withFileCString str $ \c_str -> do
      r <- c_unloadObj c_str
-     when (r == 0) (panic "unloadObj: failed")
+     when (r == 0) (panic ("unloadObj " ++ show str ++ ": failed"))
 
 resolveObjs :: IO SuccessFlag
 resolveObjs = do
@@ -93,29 +96,15 @@ resolveObjs = do
    return (successIf (r /= 0))
 
 -- ---------------------------------------------------------------------------
--- Foreign declaractions to RTS entry points which does the real work;
+-- Foreign declarations to RTS entry points which does the real work;
 -- ---------------------------------------------------------------------------
 
-#if __GLASGOW_HASKELL__ >= 504
 foreign import ccall unsafe "addDLL"      c_addDLL :: CString -> IO CString
 foreign import ccall unsafe "initLinker"   initObjLinker :: IO ()
 foreign import ccall unsafe "insertSymbol" c_insertSymbol :: CString -> CString -> Ptr a -> IO ()
-foreign import ccall unsafe "insertStableSymbol" c_insertStableSymbol
-    :: CString -> CString -> Ptr a -> IO ()
 foreign import ccall unsafe "lookupSymbol" c_lookupSymbol :: CString -> IO (Ptr a)
+foreign import ccall unsafe "loadArchive"  c_loadArchive :: CString -> IO Int
 foreign import ccall unsafe "loadObj"      c_loadObj :: CString -> IO Int
 foreign import ccall unsafe "unloadObj"    c_unloadObj :: CString -> IO Int
 foreign import ccall unsafe "resolveObjs"  c_resolveObjs :: IO Int
-#else
-foreign import "addDLL"       unsafe   c_addDLL :: CString -> IO CString
-foreign import "initLinker"   unsafe   initLinker :: IO ()
-foreign import "insertSymbol" unsafe   c_insertSymbol :: CString -> CString -> Ptr a -> IO ()
-foreign import "insertStableSymbol" unsafe c_insertStableSymbol
-    :: CString -> CString -> Ptr a -> IO ()
-foreign import "lookupSymbol" unsafe   c_lookupSymbol :: CString -> IO (Ptr a)
-foreign import "loadObj"      unsafe   c_loadObj :: CString -> IO Int
-foreign import "unloadObj"    unsafe   c_unloadObj :: CString -> IO Int
-foreign import "resolveObjs"  unsafe   c_resolveObjs :: IO Int
-#endif
-
 \end{code}