X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=dd80922e0b3692e04b11581ab106212d07b4790e;hb=c5b03909e7c630a874f6f1abf76d28baf4b19d55;hp=c630c8dcfa7e6953115fb9ad5a02d218114ae856;hpb=7a3bd641457666e10d0a47be9f22762e03defbf0;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index c630c8d..dd80922 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,149 +10,99 @@ 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
 #else
-#define ASSERT(e)
+
+#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__ >= 200
-# define REALLY_HASKELL_1_3
-# define SYN_IE(a) a
-# define EXP_MODULE(a) module a
-# define IMPORT_DELOOPER(mod) import CAT2(mod,_1_3)
-# define IMPORT_1_3(mod) import mod
-# define _tagCmp compare
-# define _LT LT
-# define _EQ EQ
-# define _GT GT
-# define _Addr GHCbase.Addr
-# define Text Show
-# define IMP_Ubiq() IMPORT_DELOOPER(Ubiq); import qualified GHCbase
-# define CHK_Ubiq() IMPORT_DELOOPER(Ubiq); import qualified GHCbase
-# define minInt (minBound::Int)
-# define maxInt (maxBound::Int)
+#if __GLASGOW_HASKELL__ >= 620
+#define UNBOX_FIELD !!
 #else
-# define SYN_IE(a) a(..)
-# define EXP_MODULE(a) a..
-# define IMPORT_DELOOPER(mod) import mod
-# define IMPORT_1_3(mod) {--}
-# define IMP_Ubiq() IMPORT_DELOOPER(Ubiq)
-# define CHK_Ubiq() IMPORT_DELOOPER(Ubiq)
+#define UNBOX_FIELD !
 #endif
 
-#if __GLASGOW_HASKELL__ >= 26 && __GLASGOW_HASKELL__ < 200
-#define trace _trace
-#endif
+#define COMMA ,
 
-#define TAG_ Int#
-#define LT_ -1#
-#define EQ_ 0#
-#define GT_ 1#
-#define GT__ _
-
-#if defined(__GLASGOW_HASKELL__)
-#define FAST_INT Int#
-#define ILIT(x) (x#)
-#define IBOX(x) (I# (x))
-#define _ADD_ `plusInt#`
-#define _SUB_ `minusInt#`
-#define _MUL_ `timesInt#`
-#define _DIV_ `divInt#`
-#define _QUOT_ `quotInt#`
-#define _NEG_ negateInt#
-#define _EQ_ `eqInt#`
-#define _LT_ `ltInt#`
-#define _LE_ `leInt#`
-#define _GE_ `geInt#`
-#define _GT_ `gtInt#`
-
-#define FAST_BOOL Int#
-#define _TRUE_ 1#
-#define _FALSE_ 0#
-#define _IS_TRUE_(x) ((x) `eqInt#` 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 USE_FAST_STRINGS 1
-# if __GLASGOW_HASKELL__ < 200
-#  define FAST_STRING	_PackedString
-#  define SLIT(x)	(_packCString (A# x#))
-#  define _CMP_STRING_	cmpPString
-	/* cmpPString defined in utils/Util.lhs */
-#  define _NULL_	_nullPS
-#  define _NIL_		_nilPS
-#  define _CONS_	_consPS
-#  define _HEAD_	_headPS
-#  define _TAIL_	_tailPS
-#  define _LENGTH_	_lengthPS
-#  define _PK_		_packString
-#  define _UNPK_	_unpackPS
-#  define _SUBSTR_	_substrPS
-#  define _APPEND_	`_appendPS`
-#  define _CONCAT_	_concatPS
-# else
-#  define FAST_STRING	GHCbase.PackedString
-#  define SLIT(x)	(packCString (GHCbase.A# x#))
-#  define _CMP_STRING_	cmpPString
-#  define _NULL_	nullPS
-#  define _NIL_		nilPS
-#  define _CONS_	consPS
-#  define _HEAD_	headPS
-#  define _TAIL_	tailPS
-#  define _LENGTH_	lengthPS
-#  define _PK_		packString
-#  define _UNPK_	unpackPS
-#  define _SUBSTR_	substrPS
-#  define _APPEND_	`appendPS`
-#  define _CONCAT_	concatPS
-# endif
+#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 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
+#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
+#ifndef COMPILING_FAST_STRING
+-- 
+import qualified FastString as FS 
 #endif
+
+#define SLIT(x)	 (FS.mkLitString# (x#))
+#define FSLIT(x) (FS.mkFastString# (x#))
+
+-- Useful for declaring arguments to be strict
+#define STRICT1(f) f a b c | a `seq` False = undefined
+#define STRICT2(f) f a b | a `seq` b `seq` False = undefined
+#define STRICT3(f) f a b c | a `seq` b `seq` c `seq` False = undefined
+#define STRICT4(f) f a b c d | a `seq` b `seq` c `seq` d `seq` False = undefined
+#define STRICT5(f) f a b c d e | a `seq` b `seq` c `seq` d `seq` e `seq` False = undefined
+#define STRICT6(f) f a b c d e f | a `seq` b `seq` c `seq` d `seq` e `seq` f `seq` False = undefined
+
+#endif /* HsVersions.h */
+