X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FObjLink.lhs;h=135afbb07dcadce0cc39d6fe3d2df47775a6a726;hb=84923cc7de2a93c22a2f72daf9ac863959efae13;hp=48deb46783a9c9d210455b83c0ac12e76ac0510b;hpb=6ef2fc2ebf11755a54386f8e317d83cb19913be1;p=ghc-hetmet.git

diff --git a/compiler/ghci/ObjLink.lhs b/compiler/ghci/ObjLink.lhs
index 48deb46..135afbb 100644
--- a/compiler/ghci/ObjLink.lhs
+++ b/compiler/ghci/ObjLink.lhs
@@ -17,12 +17,12 @@ module ObjLink (
    loadObj,     	 -- :: String -> IO ()
    unloadObj,   	 -- :: String -> IO ()
    insertSymbol,         -- :: String -> String -> Ptr a -> IO ()
--- Suspicious; see defn
---    insertStableSymbol,   -- :: String -> String -> a -> IO ()
    lookupSymbol,	 -- :: String -> IO (Maybe (Ptr a))
-   resolveObjs  	 -- :: IO SuccessFlag
+   resolveObjs,  	 -- :: IO SuccessFlag
+   lookupDataCon         -- :: Ptr a  -> IO (Maybe String)
   )  where
 
+import ByteCodeItbls    ( StgInfoTable )
 import Panic		( panic )
 import BasicTypes	( SuccessFlag, successIf )
 import Config		( cLeadingUnderscore )
@@ -33,6 +33,10 @@ import Foreign.C
 import Foreign		( nullPtr )
 import GHC.Exts         ( Ptr(..), unsafeCoerce# )
 
+import Constants        ( wORD_SIZE )
+import Foreign          ( plusPtr )
+
+
 -- ---------------------------------------------------------------------------
 -- RTS Linker Interface
 -- ---------------------------------------------------------------------------
@@ -44,15 +48,6 @@ insertSymbol obj_name key symbol
          withCString str $ \c_str ->
           c_insertSymbol c_obj_name c_str symbol
 
-{- Deeply suspicious use of unsafeCoerce#; should use makeStablePtr#
-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
@@ -62,6 +57,14 @@ 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" = ('_':)
@@ -101,12 +104,10 @@ resolveObjs = do
 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 ()
--- Suspicious: should take a stable pointer
--- 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 "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}