[project @ 1999-06-25 09:14:54 by simonmar]

[ghc-hetmet.git] / ghc / includes / Stg.h

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index e0c42ee..c5ad6f4 100644 (file)
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.7 1999/03/02 19:44:17 sof Exp $
+ * $Id: Stg.h,v 1.14 1999/06/25 09:14:54 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -22,37 +22,38 @@
 #include "options.h"
 #endif
 
-/* ToDo: Set this flag properly: COMPILER and INTERPRETER should not be mutually exclusive. */
-#ifndef INTERPRETER
-#define COMPILER 1
-#endif
+/* Some macros to handle DLLing (Win32 only at the moment). */
+#include "StgDLL.h"
+
+/* Turn lazy blackholing and eager blackholing on/off.
+ *
+ * Using eager blackholing makes things easier to debug because
+ * the blackholes are more predictable - but it's slower and less sexy.
+ *
+ * For now, do lazy and not eager.
+ */
 
-/* This is a feature test - doesn't belong here. FixMe. */
-#ifdef __MINGW32__
-#define HAVE_WIN32_DLL_SUPPORT
+#define LAZY_BLACKHOLING
+/* #define EAGER_BLACKHOLING */
+
+#ifdef TICKY_TICKY
+/* TICKY_TICKY needs EAGER_BLACKHOLING to verify no double-entries of single-entry thunks. */
+# undef  LAZY_BLACKHOLING 
+# define EAGER_BLACKHOLING
 #endif
 
-#ifdef HAVE_WIN32_DLL_SUPPORT
-# if __GNUC__ && !defined(__declspec)
-#  define DLLIMPORT
-# else
-#  define DLLIMPORT __declspec(dllimport)
-#  define DLLIMPORT_DATA(x) _imp__##x
-# endif
-#else
-# define DLLIMPORT
+/* ToDo: Set this flag properly: COMPILER and INTERPRETER should not be mutually exclusive. */
+#ifndef INTERPRETER
+#define COMPILER 1
 #endif
 
-#ifdef COMPILING_RTS
-#define DLL_IMPORT DLLIMPORT
-#define DLL_IMPORT_RTS
-#define DLL_IMPORT_DATA
-#define DLL_IMPORT_DATA_VAR(x) x
-#else
-#define DLL_IMPORT
-#define DLL_IMPORT_RTS DLLIMPORT
-#define DLL_IMPORT_DATA DLLIMPORT
-#define DLL_IMPORT_DATA_VAR(x) _imp__##x
+/* TABLES_NEXT_TO_CODE says whether to assume that info tables are
+ * assumed to reside just before the code for a function.
+ *
+ * UNDEFINING THIS WON'T WORK ON ITS OWN.  You have been warned.
+ */
+#ifndef USE_MINIINTERPRETER
+#define TABLES_NEXT_TO_CODE
 #endif
 
 /* bit macros
@@ -92,6 +93,7 @@ void _stgAssert (char *, unsigned int);
 
 /* Storage format definitions */
 #include "Closures.h"
+#include "ClosureTypes.h"
 #include "InfoTables.h"
 #include "TSO.h"
 
@@ -100,20 +102,6 @@ void _stgAssert (char *, unsigned int);
 #include "Regs.h"
 #include "TailCalls.h"
 
-/**
- * Added by Ian McDonald 7/5/98 
- * XXX The position of this code is very
- * important - it must come after the 
- * Regs.h include
- **/
-#ifdef nemesis_TARGET_OS
-#define _NEMESIS_OS_
-#ifndef __LANGUAGE_C
-#define __LANGUAGE_C
-#endif
-#include <nemesis.h>
-#endif
-
 /* these are all ANSI C headers */
 #include <stdlib.h>
 #include <string.h>
@@ -157,7 +145,7 @@ void _stgAssert (char *, unsigned int);
 #include "Hooks.h"
 
 /* Misc stuff without a home */
-#ifdef BUILDING_RTS_DLL
+#if defined(ENABLE_WIN32_DLL_SUPPOT) && !defined(COMPILING_RTS)
 extern DLLIMPORT char **prog_argv;     /* so we can get at these from Haskell */
 extern DLLIMPORT int    prog_argc;
 #else
@@ -169,7 +157,8 @@ extern char **environ;
 
 /* Creating and destroying an adjustor thunk.
    I cannot make myself create a separate .h file
-   for these two (sof.)
+   for these two (sof.) 
+   
 */
 extern void* createAdjustor(int cconv, StgStablePtr hptr, StgFunPtr wptr);
 extern void  freeHaskellFunctionPtr(void* ptr);