X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=4005542130059d3f6ff48ba49911e323b1f177aa;hb=0588967a4bc5f2e1b5e3bf433334fad59aa07221;hp=c5ad6f415aa0c0e0cfe8a8ba8b895cab7113fbfa;hpb=4551fa12c6de372089626ed44013b79bde85e3a7;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index c5ad6f4..4005542 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.14 1999/06/25 09:14:54 simonmar Exp $
+ * $Id: Stg.h,v 1.29 2000/04/14 15:10:20 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -13,7 +13,26 @@
 #define STG_H
 
 #ifndef NON_POSIX_SOURCE
-#define _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
+ * 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 */
@@ -33,13 +52,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 +107,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,10 +121,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 */
+#include "RtsAPI.h"
 
 /* these are all ANSI C headers */
 #include <stdlib.h>
@@ -118,12 +153,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"
 
@@ -131,7 +167,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"
@@ -145,13 +180,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;