X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=1c07d2c5aeb127f038c6a2c68bc5e8bbc2120c5e;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=c5663b12dcf142e5d64d32611ffcb466b0f0ba1d;hpb=6c43076c1303c7501f1b3c3f4db63df6cd6702ff;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index c5663b1..1c07d2c 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,136 +10,81 @@ you will screw up the layout where they are used in case expressions!
 
 #endif
 
-#define COMMA ,
+/* Useful in the headers that we share with the RTS */
+#define COMPILING_GHC 1
+
+/* Pull in all the platform defines for this build (foo_TARGET_ARCH etc.) */
+#include "ghc_boot_platform.h"
+
+/* Pull in the autoconf defines (HAVE_FOO), but don't include
+ * ghcconfig.h, because that will include ghcplatform.h which has the
+ * wrong platform settings for the compiler (it has the platform
+ * settings for the target plat instead). */
+#include "../includes/ghcautoconf.h"
+
+#if __GLASGOW_HASKELL__ >= 504
+
+#define CONCURRENT  Control.Concurrent
+#define EXCEPTION   Control.Exception
+     /* If you want Control.Exception.try, get it as Panic.try, which
+        deals with the shift from 'tryAllIO' to 'try'.  */
+#define DYNAMIC     Data.Dynamic
+#define GLAEXTS     GHC.Exts
+#define DATA_BITS   Data.Bits
+#define DATA_INT    Data.Int
+#define DATA_WORD   Data.Word
+#define UNSAFE_IO   System.IO.Unsafe
+#define TRACE       Debug.Trace
+#define DATA_IOREF  Data.IORef
+#define FIX_IO      System.IO
+#define MONAD_ST    Control.Monad.ST
+#define ST_ARRAY    Data.Array.ST
 
-#ifdef DEBUG
-#define ASSERT(e) if (not (e)) then (assertPanic __FILE__ __LINE__) else
-#define ASSERT2(e,msg) if (not (e)) then (assertPprPanic __FILE__ __LINE__ (msg)) else
-#define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg))
 #else
-#define ASSERT(e)
-#define ASSERT2(e,msg)
-#define WARN(e,msg)
+
+#define CONCURRENT  Concurrent
+#define EXCEPTION   Exception
+#define DYNAMIC     Dynamic
+#define GLAEXTS     GlaExts
+#define DATA_BITS   Bits
+#define DATA_INT    Int
+#define DATA_WORD   Word
+#define UNSAFE_IO   IOExts
+#define TRACE       IOExts
+#define DATA_IOREF  IOExts
+#define FIX_IO      IOExts
+#define MONAD_ST    ST
+#define ST_ARRAY    ST
+
 #endif
 
-#if __STDC__
-#define CAT2(a,b)a##b
-#else
-#define CAT2(a,b)a/**/b
+#ifdef __GLASGOW_HASKELL__
+#define GLOBAL_VAR(name,value,ty)  \
+name = Util.global (value) :: IORef (ty); \
+{-# NOINLINE name #-}
 #endif
 
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 202
-# define REALLY_HASKELL_1_3
-# define SYN_IE(a) a
-# define EXP_MODULE(a) module a
-# define IMPORT_DELOOPER(mod) import mod
-# define IMPORT_1_3(mod) import mod
-# define _Addr Addr
-# define _ByteArray GlaExts.ByteArray
-# define _MutableByteArray GlaExts.MutableByteArray
-# define _MutableArray GlaExts.MutableArray
-# define _RealWorld GlaExts.RealWorld
-# define _ST GlaExts.ST
-# define _ForeignObj Foreign.ForeignObj
-# define _runST ST.runST
-# define seqStrictlyST seqST
-# define thenStrictlyST thenST
-# define returnStrictlyST return
-# define MkST ST
-# if __GLASGOW_HASKELL__ >= 209
-#  define STATE_TOK(x)    x
-#  define ST_RET(x,y)     STret (y) (x)
-#  define unsafePerformST(x)  runST (x)
-#  define ST_TO_PrimIO(x) (stToIO (x))
-# else
-#  define STATE_TOK(x)  (S# x)
-#  define ST_RET(x,y)   (x,y)
-#  define unsafePerformST(x) unsafePerformPrimIO(x)
-#  define ST_TO_PrimIO(x) x
-# endif
-# define failWith fail
-# define MkIOError(h,errt,msg) (IOError (Just h) errt msg)
-# define CCALL_THEN thenIO_Prim
-# define Text Show
-# define IMP_FASTSTRING() import FastString
-# if __GLASGOW_HASKELL__ >= 209
-#  define IMP_Ubiq() import GlaExts ; import Addr(Addr(..)); import FastString
-#  define CHK_Ubiq() import GlaExts ; import Addr(Addr(..)); import FastString
-# else
-#  define IMP_Ubiq() import GlaExts ; import FastString
-#  define CHK_Ubiq() import GlaExts ; import FastString
-# endif
-# define minInt (minBound::Int)
-# define maxInt (maxBound::Int)
+#if __GLASGOW_HASKELL__ >= 620
+#define UNBOX_FIELD !!
 #else
-# define STATE_TOK(x)  (S# x)
-# define ST_RET(x,y)   (x,y)
-# define unsafePerformST(x) unsafePerformPrimIO(x)
-# define ST_TO_PrimIO(x) x
-# define SYN_IE(a) a(..)
-# define EXP_MODULE(a) a..
-# define IMPORT_DELOOPER(mod) import mod
-# define IMPORT_1_3(mod) {--}
-# define IMP_FASTSTRING() import FastString
-# define IMP_Ubiq() IMPORT_DELOOPER(Ubiq) ; import FastString
-# define CHK_Ubiq() IMPORT_DELOOPER(Ubiq) ; import FastString
-# define MkST
-# define CCALL_THEN thenPrimIO
-# define MkIOError(h,errt,msg) (errt msg)
+#define UNBOX_FIELD !
 #endif
 
-#if defined(__GLASGOW_HASKELL__)
-
--- Import the beggars
-import GlaExts
-	( Int(..), Int#, (+#), (-#), (*#), 
-	  quotInt#, negateInt#, (==#), (<#), (<=#), (>=#), (>#)
-	)
-
-#define FAST_INT Int#
-#define ILIT(x) (x#)
-#define IBOX(x) (I# (x))
-#define _ADD_ +#
-#define _SUB_ -#
-#define _MUL_ *#
-#define _QUOT_ `quotInt#`
-#define _NEG_ negateInt#
-#define _EQ_ ==#
-#define _LT_ <#
-#define _LE_ <=#
-#define _GE_ >=#
-#define _GT_ >#
-
-#define FAST_BOOL Int#
-#define _TRUE_ 1#
-#define _FALSE_ 0#
-#define _IS_TRUE_(x) ((x) _EQ_ 1#)
-
-#else {- ! __GLASGOW_HASKELL__ -}
-
-#define FAST_INT Int
-#define ILIT(x) (x)
-#define IBOX(x) (x)
-#define _ADD_ +
-#define _SUB_ -
-#define _MUL_ *
-#define _DIV_ `div`
-#define _QUOT_ `quot`
-#define _NEG_ -
-#define _EQ_ ==
-#define _LT_ <
-#define _LE_ <=
-#define _GE_ >=
-#define _GT_ >
-
-#define FAST_BOOL Bool
-#define _TRUE_ True
-#define _FALSE_ False
-#define _IS_TRUE_(x) (x)
-
-#endif  {- ! __GLASGOW_HASKELL__ -}
-
-#if __GLASGOW_HASKELL__ >= 23
+#define COMMA ,
+
+#ifdef DEBUG
+#define ASSERT(e) if (not (e)) then (assertPanic __FILE__ __LINE__) else
+#define ASSERT2(e,msg) if (not (e)) then (assertPprPanic __FILE__ __LINE__ (msg)) else
+#define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg))
+#define ASSERTM(mbool) do { bool <- mbool; ASSERT(bool) return () }
+#define ASSERTM2(mbool,msg) do { bool <- mbool; ASSERT2(bool,msg) return () }
+#else
+#define ASSERT(e)      if False then error "ASSERT"  else
+#define ASSERT2(e,msg) if False then error "ASSERT2" else
+#define ASSERTM(e)
+#define ASSERTM2(e,msg)
+#define WARN(e,msg)    if False then error "WARN"    else
+#endif
 
 -- This #ifndef lets us switch off the "import FastString"
 -- when compiling FastString itself
@@ -148,34 +93,8 @@ import GlaExts
 import qualified FastString 
 #endif
 
-# define USE_FAST_STRINGS 1
-# define FAST_STRING	FastString.FastString
-# define SLIT(x)	(FastString.mkFastCharString# (x#))
-# define _NULL_		FastString.nullFastString
-# define _NIL_		(FastString.mkFastString "")
-# define _CONS_		FastString.consFS
-# define _HEAD_		FastString.headFS
-# define _TAIL_		FastString.tailFS
-# define _LENGTH_	FastString.lengthFS
-# define _PK_		FastString.mkFastString
-# define _UNPK_		FastString.unpackFS
-# define _APPEND_	`FastString.appendFS`
-# define _CONCAT_	FastString.concatFS
-#else
-# define FAST_STRING String
-# define SLIT(x)      (x)
-# define _CMP_STRING_ cmpString
-# define _NULL_	      null
-# define _NIL_	      ""
-# define _CONS_	      (:)
-# define _HEAD_	      head
-# define _TAIL_	      tail
-# define _LENGTH_     length
-# define _PK_	      (\x->x)
-# define _UNPK_	      (\x->x)
-# define _SUBSTR_     substr{-from Utils-}
-# define _APPEND_     ++
-# define _CONCAT_     concat
-#endif
+#define SLIT(x)	 (FastString.mkLitString# (x#))
+#define FSLIT(x) (FastString.mkFastString# (x#))
+
+#endif /* HsVersions.h */
 
-#endif