X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FObjLink.lhs;h=1dbf0cfa731e018b8e6aa1010115b9d0530b9df7;hb=ee26207114635c480dbc7518c0510545a6f62611;hp=135afbb07dcadce0cc39d6fe3d2df47775a6a726;hpb=ab5b8aa357c685a7c702262903bce04c66f79156;p=ghc-hetmet.git diff --git a/compiler/ghci/ObjLink.lhs b/compiler/ghci/ObjLink.lhs index 135afbb..1dbf0cf 100644 --- a/compiler/ghci/ObjLink.lhs +++ b/compiler/ghci/ObjLink.lhs @@ -18,23 +18,18 @@ module ObjLink ( unloadObj, -- :: String -> IO () insertSymbol, -- :: String -> String -> Ptr a -> IO () lookupSymbol, -- :: String -> IO (Maybe (Ptr a)) - resolveObjs, -- :: IO SuccessFlag - lookupDataCon -- :: Ptr a -> IO (Maybe String) + resolveObjs -- :: IO SuccessFlag ) where -import ByteCodeItbls ( StgInfoTable ) -import Panic ( panic ) +import Panic import BasicTypes ( SuccessFlag, successIf ) import Config ( cLeadingUnderscore ) -import Outputable import Control.Monad ( when ) import Foreign.C import Foreign ( nullPtr ) import GHC.Exts ( Ptr(..), unsafeCoerce# ) -import Constants ( wORD_SIZE ) -import Foreign ( plusPtr ) -- --------------------------------------------------------------------------- @@ -57,14 +52,6 @@ lookupSymbol str_in = do then return Nothing else return (Just addr) --- | Expects a Ptr to an info table, not to a closure -lookupDataCon :: Ptr StgInfoTable -> IO (Maybe String) -lookupDataCon ptr = do - name <- c_lookupDataCon (ptr `plusPtr` (wORD_SIZE*2)) - if name == nullPtr - then return Nothing - else peekCString name >>= return . Just - prefixUnderscore :: String -> String prefixUnderscore | cLeadingUnderscore == "YES" = ('_':) @@ -98,7 +85,7 @@ 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; -- --------------------------------------------------------------------------- foreign import ccall unsafe "addDLL" c_addDLL :: CString -> IO CString @@ -108,6 +95,4 @@ foreign import ccall unsafe "lookupSymbol" c_lookupSymbol :: CString -> IO (Ptr 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 -foreign import ccall unsafe "lookupDataCon" c_lookupDataCon :: Ptr a -> IO CString - \end{code}