projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-08-14 15:36:13 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
Stg.h
diff --git
a/ghc/includes/Stg.h
b/ghc/includes/Stg.h
index
f2140ca
..
b6bbcfa
100644
(file)
--- a/
ghc/includes/Stg.h
+++ b/
ghc/includes/Stg.h
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.43 2001/12/05 17:35:14 sewardj Exp $
+ * $Id: Stg.h,v 1.54 2003/07/22 13:23:44 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-7,6
+7,11
@@
*
* This file is included *automatically* by all .hc files.
*
*
* This file is included *automatically* by all .hc files.
*
+ * NOTE: always include Stg.h *before* any other headers, because we
+ * define some register variables which must be done before any inline
+ * functions are defined (some system headers have been known to
+ * define the odd inline function).
+ *
* ---------------------------------------------------------------------------*/
#ifndef STG_H
* ---------------------------------------------------------------------------*/
#ifndef STG_H
@@
-40,6
+45,10
@@
#define FLEXIBLE_ARRAY 0
#endif
#define FLEXIBLE_ARRAY 0
#endif
+#if defined(SMP) || defined(THREADED_RTS)
+#define RTS_SUPPORTS_THREADS 1
+#endif
+
/* Some macros to handle DLLing (Win32 only at the moment). */
#include "StgDLL.h"
/* Some macros to handle DLLing (Win32 only at the moment). */
#include "StgDLL.h"
@@
-69,15
+78,12
@@
# define LAZY_BLACKHOLING
#endif
# define LAZY_BLACKHOLING
#endif
-/* ToDo: remove */
-#define COMPILER 1
-
/* 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.
*/
/* 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
+#if !defined(USE_MINIINTERPRETER) && !defined(ia64_TARGET_ARCH)
#define TABLES_NEXT_TO_CODE
#endif
#define TABLES_NEXT_TO_CODE
#endif
@@
-161,6
+167,7
@@
typedef StgWord64 LW_;
#include "StgLdvProf.h"
/* Storage format definitions */
#include "StgLdvProf.h"
/* Storage format definitions */
+#include "StgFun.h"
#include "Closures.h"
#include "ClosureTypes.h"
#include "InfoTables.h"
#include "Closures.h"
#include "ClosureTypes.h"
#include "InfoTables.h"
@@
-182,21
+189,12
@@
typedef StgWord64 LW_;
/* RTS public interface */
#include "RtsAPI.h"
/* RTS public interface */
#include "RtsAPI.h"
-/* these are all ANSI C headers */
+/* System headers: stdlib.h is eeded so that we can use NULL. It must
+ * come after MachRegs.h, because stdlib.h might define some inline
+ * functions which may only be defined after register variables have
+ * been declared.
+ */
#include <stdlib.h>
#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#ifdef SMP
#include <pthread.h>
#ifdef SMP
#include <pthread.h>
@@
-217,7
+215,6
@@
typedef StgWord64 LW_;
#include "StgTicky.h"
#include "CCall.h"
#include "Stable.h"
#include "StgTicky.h"
#include "CCall.h"
#include "Stable.h"
-#include "PrimOpHelpers.h"
/* Built-in entry points */
#include "StgMiscClosures.h"
/* Built-in entry points */
#include "StgMiscClosures.h"
@@
-225,6
+222,8
@@
typedef StgWord64 LW_;
/* Runtime-system hooks */
#include "Hooks.h"
/* Runtime-system hooks */
#include "Hooks.h"
+#include "Signals.h"
+
#include "HsFFI.h"
/* Misc stuff without a home */
#include "HsFFI.h"
/* Misc stuff without a home */
@@
-233,6
+232,10
@@
DLL_IMPORT_RTS extern int prog_argc;
extern void stackOverflow(void);
extern void stackOverflow(void);
+#if defined(WANT_DOTNET_SUPPORT)
+#include "DNInvoke.h"
+#endif
+
/* Creating and destroying an adjustor thunk.
I cannot make myself create a separate .h file
for these two (sof.)
/* Creating and destroying an adjustor thunk.
I cannot make myself create a separate .h file
for these two (sof.)