X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Futils%2FFastMutInt.lhs;h=bdcf502f5260848eb30bb43d603a1fa741f76c41;hb=3da243bf737dc3e26dfbfa943df1fda1ce7c1bab;hp=b483a1428edf30bc592e3fd9e4361d8f25447054;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/utils/FastMutInt.lhs b/compiler/utils/FastMutInt.lhs
index b483a14..bdcf502 100644
--- a/compiler/utils/FastMutInt.lhs
+++ b/compiler/utils/FastMutInt.lhs
@@ -1,6 +1,6 @@
 {-# OPTIONS -cpp #-}
 --
--- (c) The University of Glasgow 2002
+-- (c) The University of Glasgow 2002-2006
 --
 -- Unboxed mutable Ints
 
@@ -10,45 +10,61 @@ module FastMutInt(
 	readFastMutInt, writeFastMutInt
   ) where
 
-#include "MachDeps.h"
+#include "HsVersions.h"
+
+#ifdef __GLASGOW_HASKELL__
 
+#include "MachDeps.h"
 #ifndef SIZEOF_HSINT
 #define SIZEOF_HSINT  INT_SIZE_IN_BYTES
 #endif
 
-
-#if __GLASGOW_HASKELL__ < 503
-import GlaExts
-import PrelIOBase
-#else
 import GHC.Base
 import GHC.IOBase
-#endif
 
-#if __GLASGOW_HASKELL__ < 411
-newByteArray# = newCharArray#
+#else /* ! __GLASGOW_HASKELL__ */
+
+import Data.IORef
+
 #endif
+
+newFastMutInt :: IO FastMutInt
+readFastMutInt :: FastMutInt -> IO Int
+writeFastMutInt :: FastMutInt -> Int -> IO ()
 \end{code}
 
 \begin{code}
 #ifdef __GLASGOW_HASKELL__
 data FastMutInt = FastMutInt (MutableByteArray# RealWorld)
 
-newFastMutInt :: IO FastMutInt
 newFastMutInt = IO $ \s ->
   case newByteArray# size s of { (# s, arr #) ->
   (# s, FastMutInt arr #) }
   where I# size = SIZEOF_HSINT
 
-readFastMutInt :: FastMutInt -> IO Int
 readFastMutInt (FastMutInt arr) = IO $ \s ->
   case readIntArray# arr 0# s of { (# s, i #) ->
   (# s, I# i #) }
 
-writeFastMutInt :: FastMutInt -> Int -> IO ()
 writeFastMutInt (FastMutInt arr) (I# i) = IO $ \s ->
   case writeIntArray# arr 0# i s of { s ->
   (# s, () #) }
-\end{code}
+#else /* ! __GLASGOW_HASKELL__ */
+newtype FastMutInt = FastMutInt (IORef Int)
+
+-- If any default value was chosen, it surely would be 0,
+-- so we will use that since IORef requires a default value.
+-- Or maybe it would be more interesting to package an error,
+-- assuming nothing relies on being able to read a bogus Int?
+-- That could interfere with its strictness for smart optimizers
+-- (are they allowed to optimize a 'newtype' that way?) ...
+-- Well, maybe that can be added (in DEBUG?) later.
+newFastMutInt = fmap FastMutInt (newIORef 0)
+
+readFastMutInt (FastMutInt ioRefInt) = readIORef ioRefInt
+
+-- FastMutInt is strict in the value it contains.
+writeFastMutInt (FastMutInt ioRefInt) i = i `seq` writeIORef ioRefInt i
 #endif
+\end{code}