[project @ 1999-05-11 16:46:20 by keithw]

(this is number 8 of 9 commits to be applied together)

  The CPP flag LAZY_BLACKHOLING has been moved up from options.h into
  Stg.h, so GHC can see it as well as the interpreter, and
  EAGER_BLACKHOLING has been added.  The default is still
  LAZY_BLACKHOLING && !EAGER_BLACKHOLING.

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index f219b7a..932b4ec 100644 (file)
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.11 1999/05/10 08:23:57 sof Exp $
+ * $Id: Stg.h,v 1.12 1999/05/11 16:46:20 keithw Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -25,6 +25,23 @@
 /* Some macros to handle DLLing (Win32 only at the moment). */
 #include "StgDLL.h"
 
+/* Turn lazy blackholing and eager blackholing on/off.
+ *
+ * Using eager blackholing makes things easier to debug because
+ * the blackholes are more predictable - but it's slower and less sexy.
+ *
+ * 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
+#endif
+
 /* ToDo: Set this flag properly: COMPILER and INTERPRETER should not be mutually exclusive. */
 #ifndef INTERPRETER
 #define COMPILER 1

diff --git a/ghc/includes/options.h b/ghc/includes/options.h
index 5563636..a0315c5 100644 (file)
--- a/ghc/includes/options.h
+++ b/ghc/includes/options.h
@@ -13,8 +13,8 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: options.h,v $
- * $Revision: 1.7 $
- * $Date: 1999/04/27 14:07:53 $
+ * $Revision: 1.8 $
+ * $Date: 1999/05/11 16:46:20 $
  * ------------------------------------------------------------------------*/
 
 
@@ -239,13 +239,9 @@
  */
 /*#define DEBUG_EXTRA*/
 
-/* Turn lazy blackholing on/off.
- * Warning: Lazy blackholing can't be disabled in GHC generated code.
- *
- * Using eager blackholing makes things easier to debug because
- * the blackholes are more predicatable - but it's slower and less sexy.
+/* NB: LAZY_BLACKHOLING has been moved up to Stg.h where both Hugs and GHC can see it,
+ * and EAGER_BLACKHOLING has been introduced also.  KSW 1999-01.
  */
-#define LAZY_BLACKHOLING 
 
 /* Turn miniinterpreter on/off.
  *