[project @ 2000-12-20 15:58:35 by simonmar]

[ghc-hetmet.git] / ghc / compiler / HsVersions.h

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index eae9cc9..abcaa99 100644 (file)
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,6 +10,12 @@ you will screw up the layout where they are used in case expressions!
 
 #endif
 
+#ifdef __GLASGOW_HASKELL__
+#define GLOBAL_VAR(name,value,ty)  \
+name = global (value) :: IORef (ty); \
+{-# NOINLINE name #-}
+#endif
+
 #define COMMA ,
 
 #ifdef DEBUG
@@ -22,6 +28,15 @@ you will screw up the layout where they are used in case expressions!
 #define WARN(e,msg)
 #endif
 
+-- temporary usage assertion control KSW 2000-10
+#ifdef DO_USAGES
+#define UASSERT(e) ASSERT(e)
+#define UASSERT2(e,msg) ASSERT2(e,msg)
+#else
+#define UASSERT(e)
+#define UASSERT2(e,msg)
+#endif
+
 #if __STDC__
 #define CAT2(a,b)a##b
 #else
@@ -37,57 +52,6 @@ you will screw up the layout where they are used in case expressions!
 # define MkIOError(h,errt,msg) (errt msg)
 #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
 
 -- This #ifndef lets us switch off the "import FastString"