[project @ 2002-04-10 11:43:49 by stolz]

[ghc-base.git] / Foreign / Ptr.hs

diff --git a/Foreign/Ptr.hs b/Foreign/Ptr.hs
index d7f9cb0..7bbd4db 100644 (file)
--- a/Foreign/Ptr.hs
+++ b/Foreign/Ptr.hs
@@ -6,10 +6,10 @@
 -- License     :  BSD-style (see the file libraries/core/LICENSE)
 -- 
 -- Maintainer  :  ffi@haskell.org
--- Stability   :  experimental
--- Portability :  non-portable
+-- Stability   :  provisional
+-- Portability :  portable
 --
--- $Id: Ptr.hs,v 1.1 2001/06/28 14:15:03 simonmar Exp $
+-- $Id: Ptr.hs,v 1.6 2002/03/20 15:38:36 simonmar Exp $
 --
 -- Pointer types.
 --
@@ -40,16 +40,32 @@ module Foreign.Ptr (
 
  ) where
 
-import Data.Dynamic
-
 #ifdef __GLASGOW_HASKELL__
 import GHC.Ptr
 import GHC.IOBase
 import GHC.Err
+import GHC.Base
+import GHC.Num
+import GHC.List
+import GHC.Show
+import Numeric
 #endif
 
-foreign import "freeHaskellFunctionPtr" unsafe
-    freeHaskellFunPtr :: FunPtr a -> IO ()
+#include "MachDeps.h"
 
-#include "Dynamic.h"
-INSTANCE_TYPEABLE1(Ptr,ptrTc,"Ptr")
+#ifdef __GLASGOW_HASKELL__
+#if (WORD_SIZE_IN_BITS == 32 || WORD_SIZE_IN_BITS == 64)
+instance Show (Ptr a) where
+   showsPrec p (Ptr a) rs = pad_out (showHex (word2Integer(int2Word#(addr2Int# a))) "") rs
+     where
+        -- want 0s prefixed to pad it out to a fixed length.
+       pad_out ('0':'x':ls) rs = 
+         '0':'x':(replicate (2*SIZEOF_HSPTR - length ls) '0') ++ ls ++ rs
+       -- word2Integer :: Word# -> Integer (stolen from Word.lhs)
+       word2Integer w = case word2Integer# w of
+                       (# s, d #) -> J# s d
+#endif
+#endif
+
+foreign import ccall unsafe "freeHaskellFunctionPtr"
+    freeHaskellFunPtr :: FunPtr a -> IO ()