[project @ 2003-03-25 16:19:55 by sof]

wibble - move LARGE_OBJECT_THRESHOLD from Constants.h to Block.h, as it's defined in terms of Block.h defines

diff --git a/ghc/includes/Block.h b/ghc/includes/Block.h
index 379b1e3..55cb18a 100644 (file)
--- a/ghc/includes/Block.h
+++ b/ghc/includes/Block.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Block.h,v 1.11 2002/12/11 15:36:37 simonmar Exp $
+ * $Id: Block.h,v 1.12 2003/03/25 16:19:56 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -32,6 +32,11 @@
 #define MBLOCK_ROUND_UP(p)   ((void *)(((W_)(p)+MBLOCK_SIZE-1) & ~MBLOCK_MASK))
 #define MBLOCK_ROUND_DOWN(p) ((void *)((W_)(p) & ~MBLOCK_MASK ))
 
+/* The largest size an object can be before we give it a block of its
+ * own and treat it as an immovable object during GC, expressed as a
+ * fraction of BLOCK_SIZE.
+ */
+#define LARGE_OBJECT_THRESHOLD ((nat)(BLOCK_SIZE * 8 / 10))
 
 /* -----------------------------------------------------------------------------
  * Block descriptor.  This structure *must* be the right length, so we

diff --git a/ghc/includes/Constants.h b/ghc/includes/Constants.h
index e9f863b..a47800a 100644 (file)
--- a/ghc/includes/Constants.h
+++ b/ghc/includes/Constants.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: Constants.h,v 1.23 2003/03/25 16:06:39 sof Exp $
+ * $Id: Constants.h,v 1.24 2003/03/25 16:19:55 sof Exp $
  *
  * (c) The GHC Team, 1998-2002
  *
@@ -145,12 +145,6 @@
 /* The size of a megablock (2^MBLOCK_SHIFT bytes) */
 #define MBLOCK_SHIFT   20
 
-/* the largest size an object can be before we give it a block of its
- * own and treat it as an immovable object during GC, expressed as a
- * fraction of BLOCK_SIZE.
- */
-#define LARGE_OBJECT_THRESHOLD ((nat)(BLOCK_SIZE * 8 / 10))
-
 /* -----------------------------------------------------------------------------
    Bitmap/size fields (used in info tables)
    -------------------------------------------------------------------------- */