diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-10-24 09:13:57 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-10-24 09:13:57 +0000 |
| commit | ab0e778ccfde61aed4c22679b24d175fc6cc9bf3 (patch) | |
| tree | a0f6148a77644c5a7baa68b521bf3b1116dce50b /includes/Rts.h | |
| parent | 2246c514eade324d70058ba3135dc0c51ee9353b (diff) | |
| download | haskell-ab0e778ccfde61aed4c22679b24d175fc6cc9bf3.tar.gz | |
Split GC.c, and move storage manager into sm/ directory
In preparation for parallel GC, split up the monolithic GC.c file into
smaller parts. Also in this patch (and difficult to separate,
unfortunatley):
- Don't include Stable.h in Rts.h, instead just include it where
necessary.
- consistently use STATIC_INLINE in source files, and INLINE_HEADER
in header files. STATIC_INLINE is now turned off when DEBUG is on,
to make debugging easier.
- The GC no longer takes the get_roots function as an argument.
We weren't making use of this generalisation.
Diffstat (limited to 'includes/Rts.h')
| -rw-r--r-- | includes/Rts.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/includes/Rts.h b/includes/Rts.h index 7a30d9ee52..7ed9c2d9b4 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -18,6 +18,12 @@ extern "C" { #endif #include "Stg.h" +// Turn off inlining when debugging - it obfuscates things +#ifdef DEBUG +# undef STATIC_INLINE +# define STATIC_INLINE static +#endif + #include "RtsTypes.h" #if __GNUC__ >= 3 @@ -138,16 +144,13 @@ extern void _assertFail (const char *, unsigned int); #include "OSThreads.h" #include "SMP.h" -/* STG/Optimised-C related stuff */ -#include "Block.h" - /* GNU mp library */ #include "gmp.h" /* Macros for STG/C code */ +#include "Block.h" #include "ClosureMacros.h" #include "StgTicky.h" -#include "Stable.h" /* Runtime-system hooks */ #include "Hooks.h" |