[project @ 2000-04-03 15:54:49 by simonmar]

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

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 332f515..7a2266c 100644 (file)
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.16 1999/07/06 09:19:47 sof Exp $
+ * $Id: Stg.h,v 1.25 2000/04/03 15:54:49 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -16,6 +16,21 @@
 #define _POSIX_SOURCE
 #endif
 
+/* 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
+ * with that.  If "Stg.h" is included via "Rts.h", we're assumed to
+ * be in vanilla C.
+ */
+#ifndef IN_STG_CODE
+# define IN_STG_CODE 1
+#endif
+
+#if IN_STG_CODE == 0
+# ifndef NO_REGS
+#  define NO_REGS                      /* don't define fixed registers */
+# endif
+#endif
+
 /* Configuration */
 #include "config.h"
 #ifdef __HUGS__ /* vile hack till the GHC folks come on board */
@@ -33,13 +48,17 @@
  * For now, do lazy and not eager.
  */
 
-#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
+/* TICKY_TICKY needs EAGER_BLACKHOLING to verify no double-entries of
+ * single-entry thunks.
+ *
+ * SMP needs EAGER_BLACKHOLING because it has to lock thunks
+ * synchronously, in case another thread is trying to evaluate the
+ * same thunk simultaneously.
+ */
+#if defined(SMP) || defined(TICKY_TICKY)
+#  define EAGER_BLACKHOLING
+#else
+#  define LAZY_BLACKHOLING
 #endif
 
 /* ToDo: Set this flag properly: COMPILER and INTERPRETER should not be mutually exclusive. */
@@ -84,12 +103,13 @@ void _stgAssert (char *, unsigned int);
 
 /* Global type definitions*/
 #include "StgTypes.h"
+#include "RtsTypes.h"
 
 /* Global constaints */
 #include "Constants.h"
 
 /* Profiling information */
-#include "Profiling.h"
+#include "StgProf.h"
 
 /* Storage format definitions */
 #include "Closures.h"
@@ -97,15 +117,21 @@ void _stgAssert (char *, unsigned int);
 #include "InfoTables.h"
 #include "TSO.h"
 
+/* Simulated-parallel information */
+#include "GranSim.h"
+
+/* Parallel information */
+#include "Parallel.h"
+
 /* STG/Optimised-C related stuff */
+#include "SMP.h"
 #include "MachRegs.h"
 #include "Regs.h"
 #include "TailCalls.h"
+#include "Block.h"
 
 /* RTS public interface */
-#ifndef COMPILING_RTS
 #include "RtsAPI.h"
-#endif
 
 /* these are all ANSI C headers */
 #include <stdlib.h>
@@ -123,12 +149,13 @@ void _stgAssert (char *, unsigned int);
 #include <unistd.h>
 #endif
 
+#ifdef SMP
+#include <pthread.h>
+#endif
+
 /* GNU mp library */
 #include "gmp.h"
 
-/* Wired-in Prelude identifiers */
-#include "Prelude.h"
-
 /* Storage Manager */
 #include "StgStorage.h"
 
@@ -136,7 +163,6 @@ void _stgAssert (char *, unsigned int);
 #include "ClosureMacros.h"
 #include "InfoMacros.h"
 #include "StgMacros.h"
-#include "StgProf.h"
 #include "PrimOps.h"
 #include "Updates.h"
 #include "StgTicky.h"
@@ -150,13 +176,8 @@ void _stgAssert (char *, unsigned int);
 #include "Hooks.h"
 
 /* Misc stuff without a home */
-#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
-extern char **prog_argv;       /* so we can get at these from Haskell */
-extern int    prog_argc;
-#endif
+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;