X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=4597a5a55e04e8989d3164b144d915e6dde03669;hb=e1ac738d00eb2a5db0d20c49315f3247f970b61f;hp=ebc471adeb9f1f5c1c0ece376e16aa7143576fc7;hpb=5edbd17d0f915ff56666e92c008bb6e2a7311290;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index ebc471a..4597a5a 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.30 2000/05/18 11:32:21 panne Exp $
+ * $Id: Stg.h,v 1.44 2001/12/06 10:00:01 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -12,13 +12,6 @@
 #ifndef STG_H
 #define STG_H
 
-#ifndef NON_POSIX_SOURCE
-#define _POSIX_SOURCE   1
-#define _POSIX_C_SOURCE 199309L
-#define _ISOC9X_SOURCE
-#endif
-
-/* Let's be ISO C9X too... */
 
 /* If we include "Stg.h" directly, we're in STG code, and we therefore
  * get all the global register variables, macros etc. that go along
@@ -37,13 +30,24 @@
 
 /* Configuration */
 #include "config.h"
-#ifdef __HUGS__ /* vile hack till the GHC folks come on board */
-#include "options.h"
+
+#if __GNUC__ >= 3
+/* Assume that a flexible array member at the end of a struct
+ * can be defined thus: T arr[]; */
+#define FLEXIBLE_ARRAY
+#else
+/* Assume that it must be defined thus: T arr[0]; */
+#define FLEXIBLE_ARRAY 0
 #endif
 
 /* Some macros to handle DLLing (Win32 only at the moment). */
 #include "StgDLL.h"
 
+/* Fix for mingw stat problem (done here so it's early enough) */
+#ifdef mingw32_TARGET_OS
+#define __MSVCRT__ 1
+#endif
+
 /* Turn lazy blackholing and eager blackholing on/off.
  *
  * Using eager blackholing makes things easier to debug because
@@ -65,10 +69,8 @@
 #  define LAZY_BLACKHOLING
 #endif
 
-/* ToDo: Set this flag properly: COMPILER and INTERPRETER should not be mutually exclusive. */
-#ifndef INTERPRETER
+/* ToDo: remove */
 #define COMPILER 1
-#endif
 
 /* TABLES_NEXT_TO_CODE says whether to assume that info tables are
  * assumed to reside just before the code for a function.
@@ -101,19 +103,62 @@ void _stgAssert (char *, unsigned int);
 	    _stgAssert(__FILE__, __LINE__)
 #endif /* DEBUG */
 
+/* 
+ * Use this on the RHS of macros which expand to nothing
+ * to make sure that the macro can be used in a context which
+ * demands a non-empty statement.
+ */
+
+#define doNothing() do { } while (0)
+
 /* -----------------------------------------------------------------------------
-   Include everything STG-ish
+   Global type definitions
    -------------------------------------------------------------------------- */
 
-/* Global type definitions*/
 #include "StgTypes.h"
 #include "RtsTypes.h"
 
+/* -----------------------------------------------------------------------------
+   Shorthand forms
+   -------------------------------------------------------------------------- */
+
+typedef StgChar		C_;
+typedef StgWord		W_;
+typedef StgWord*	P_;
+typedef P_*		PP_;
+typedef StgInt		I_;
+typedef StgAddr	        A_;
+typedef const StgWord*  D_;
+typedef StgFunPtr       F_;
+typedef StgByteArray    B_;
+typedef StgClosurePtr   L_;
+
+typedef StgInt64        LI_;
+typedef StgWord64       LW_;
+
+/*
+ * We often want to know the size of something in units of an
+ * StgWord... (rounded up, of course!)
+ */
+
+#define sizeofW(t) ((sizeof(t)+sizeof(W_)-1)/sizeof(W_))
+
+/* 
+ * It's nice to be able to grep for casts
+ */
+
+#define stgCast(ty,e) ((ty)(e))
+
+/* -----------------------------------------------------------------------------
+   Include everything STG-ish
+   -------------------------------------------------------------------------- */
+
 /* Global constaints */
 #include "Constants.h"
 
 /* Profiling information */
 #include "StgProf.h"
+#include "StgLdvProf.h"
 
 /* Storage format definitions */
 #include "Closures.h"
@@ -179,12 +224,12 @@ void _stgAssert (char *, unsigned int);
 /* Runtime-system hooks */
 #include "Hooks.h"
 
+#include "HsFFI.h"
+
 /* Misc stuff without a home */
 DLL_IMPORT_RTS extern char **prog_argv;	/* so we can get at these from Haskell */
 DLL_IMPORT_RTS extern int    prog_argc;
 
-extern char **environ;
-
 extern void stackOverflow(void);
 
 /* Creating and destroying an adjustor thunk.