X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=8908cf3b154c91f6c37a916a05453743c8708619;hb=16d5d1c75c999677783c9c1bda519540fa9a6e58;hp=ac7d976e5627a7d2491e253b88c411af3bef5402;hpb=fda822c6090472110b7cd7ab76ea95ca07299f5c;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index ac7d976..8908cf3 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.31 2000/05/26 10:14:33 sewardj Exp $
+ * $Id: Stg.h,v 1.36 2001/03/01 12:25:32 rrt Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -37,13 +37,15 @@
 
 /* Configuration */
 #include "config.h"
-#ifdef __HUGS__ /* vile hack till the GHC folks come on board */
-#include "options.h"
-#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 +67,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.
@@ -102,13 +102,47 @@ void _stgAssert (char *, unsigned int);
 #endif /* DEBUG */
 
 /* -----------------------------------------------------------------------------
-   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"
 
@@ -179,11 +213,13 @@ 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 **envyron;
+extern char **environ;
 
 extern void stackOverflow(void);