[project @ 2002-11-08 15:16:50 by simonpj]

[ghc-hetmet.git] / ghc / rts / Storage.h

diff --git a/ghc/rts/Storage.h b/ghc/rts/Storage.h
index adf4207..6a7c738 100644 (file)
--- a/ghc/rts/Storage.h
+++ b/ghc/rts/Storage.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.h,v 1.42 2002/03/21 11:24:00 sebc Exp $
+ * $Id: Storage.h,v 1.45 2002/10/21 11:38:54 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -412,7 +412,7 @@ void printMutableList(generation *gen);
 
 
 #undef TEXT_BEFORE_HEAP
-#ifndef mingw32_TARGET_OS
+#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
 #define TEXT_BEFORE_HEAP 1
 #endif
 
@@ -438,20 +438,6 @@ extern unsigned long macho_edata;
                        && is_not_dynamically_loaded_ptr((char *)p) )
 #endif
 
-/* The HEAP_ALLOCED test below is called FOR EVERY SINGLE CLOSURE
- * during GC.  It needs to be FAST.
- *
- * BEWARE: when we're dynamically loading code (for GHCi), make sure
- * that we don't load any code above HEAP_BASE, or this test won't work.
- */
-#ifdef TEXT_BEFORE_HEAP
-# define HEAP_ALLOCED(x)  ((StgPtr)(x) >= (StgPtr)(HEAP_BASE))
-#else
-/* mingw, really */
-# define HEAP_ALLOCED(x)  (is_heap_alloced(x))
-#endif
-
-
 /* --------------------------------------------------------------------------
    Macros for distinguishing data pointers from code pointers
    --------------------------------------------------------------------------
@@ -551,13 +537,17 @@ extern unsigned long macho_edata;
                      (MAX_INTLIKE-MIN_INTLIKE) * sizeof(StgIntCharlikeClosure)) )
 
 #define LOOKS_LIKE_STATIC_CLOSURE(r) (((*(((unsigned long *)(r))-1)) == 0) || IS_CHARLIKE_CLOSURE(r) || IS_INTLIKE_CLOSURE(r))
-#elif defined(darwin_TARGET_OS) && defined(USE_MINIINTERPRETER)
+
+#elif defined(darwin_TARGET_OS) && !defined(TABLES_NEXT_TO_CODE)
+
 #define LOOKS_LIKE_STATIC(r) (!(HEAP_ALLOCED(r)))
-#  define LOOKS_LIKE_STATIC_CLOSURE(r) \
-      (IS_DATA_PTR(r) && !LOOKS_LIKE_GHC_INFO(r))
+#define LOOKS_LIKE_STATIC_CLOSURE(r) (IS_DATA_PTR(r) && !LOOKS_LIKE_GHC_INFO(r))
+
 #else
+
 #define LOOKS_LIKE_STATIC(r) IS_DATA_PTR(r)
 #define LOOKS_LIKE_STATIC_CLOSURE(r) IS_DATA_PTR(r)
+
 #endif
 
 
@@ -577,9 +567,9 @@ extern unsigned long macho_edata;
 /* LOOKS_LIKE_GHC_INFO is called moderately often during GC, but
  * Certainly not as often as HEAP_ALLOCED.
  */
-#if defined(darwin_TARGET_OS) && defined(USE_MINIINTERPRETER)
+#if defined(darwin_TARGET_OS) && !defined(TABLES_NEXT_TO_CODE)
        /* Plan C, see above */
-# define LOOKS_LIKE_GHC_INFO(info) IS_CODE_PTR(((P_*)(info))[0])
+#define LOOKS_LIKE_GHC_INFO(info) IS_CODE_PTR(((StgInfoTable *)info).entry)
 #else
 #define LOOKS_LIKE_GHC_INFO(info) (!HEAP_ALLOCED(info) \
                                    && !LOOKS_LIKE_STATIC_CLOSURE(info))