Mps: check in my broken branch

Copied from Perforce
 Change: 51937
 ServerID: perforce.ravenbrook.com

3 files changed, 49 insertions, 5 deletions

diff --git a/mps/code/chain.h b/mps/code/chain.h
index d37a46ccde4..325b9e876ce 100644
--- a/mps/code/chain.h
+++ b/mps/code/chain.h
@@ -1,7 +1,7 @@
 /* chain.h: GENERATION CHAINS
  *
  * $Id$
- * Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
+ * Copyright (c) 2001,2003 Ravenbrook Limited.  See end of file for license.
  */
 
 #ifndef chain_h
@@ -11,6 +11,22 @@
 #include "ring.h"
 
 
+/* PoolGenMessageStruct implements mps_message_type_gc_gen().  Embedded
+   in PoolGenStruct. */
+
+typedef struct PoolGenMessageStruct *PoolGenMessage;
+
+#define PoolGenMessageSig ((Sig)0x519B9359) /* SIGnature PoolGenMeSsaGe */
+
+typedef struct PoolGenMessageStruct {
+  Sig sig;
+  char id[POOL_GEN_MESSAGE_ID_LEN];
+  Size condemned;     /* byte count */
+  /* Textual description of forwarding generation. */
+  char forward[POOL_GEN_MESSAGE_FORWARD_LEN];
+  MessageStruct messageStruct;
+}
+
 /* GenParamStruct -- structure for specifying generation parameters */
 /* .gen-param: This structure must match <code/mps.h#gen-param>. */
 
@@ -35,7 +51,6 @@ typedef struct GenDescStruct {
   RingStruct locusRing; /* Ring of all PoolGen's in this GenDesc (locus) */
 } GenDescStruct;
 
-
 /* PoolGen -- descriptor of a generation in a pool */
 
 typedef struct PoolGenStruct *PoolGen;
@@ -51,6 +66,7 @@ typedef struct PoolGenStruct {
   RingStruct genRing;
   Size totalSize;     /* total size of segs in gen in this pool */
   Size newSize;       /* size allocated since last GC */
+  PoolGenMessageStruct message;
 } PoolGenStruct;
 
 
@@ -94,7 +110,7 @@ extern void PoolGenUpdateZones(PoolGen gen, Seg seg);
 
 /* C. COPYRIGHT AND LICENSE
  *
- * Copyright (C) 2001-2002 Ravenbrook Limited <http://www.ravenbrook.com/>.
+ * Copyright (C) 2001-2003 Ravenbrook Limited <http://www.ravenbrook.com/>.
  * All rights reserved.  This is an open source license.  Contact
  * Ravenbrook for commercial licensing options.
  * 
diff --git a/mps/code/config.h b/mps/code/config.h
index c25b6c443c0..6afc19e48ad 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -203,6 +203,14 @@
 #define VMANPageALIGNMENT ((Align)4096)
 #define VMJunkBYTE ((unsigned char)0xA9)
 
+/* Pool Gen Configuration -- see <code/chain.h> */
+
+/* Length (in chars) of a char buffer used to store the id and
+   forwarding generation in the implementation of
+   mps_message_type_gc_gen(). */
+#define POOL_GEN_MESSAGE_ID_LEN 64
+#define POOL_GEN_MESSAGE_FORWARD_LEN 64
+
 
 /* Tracer Configuration -- see <code/trace.c> */
 
diff --git a/mps/code/locus.c b/mps/code/locus.c
index 81972cc860e..42cfa48f099 100644
--- a/mps/code/locus.c
+++ b/mps/code/locus.c
@@ -361,6 +361,24 @@ void ChainEndGC(Chain chain, Trace trace)
   chain->activeTraces = TraceSetDel(chain->activeTraces, trace);
 }
 
+#define PoolGenMessageMessage(m) (&(m)->messageStruct)
+#define MessagePoolGenMessage(message) \
+  (PARENT(PoolGenMessageStruct, messageStruct, message))
+
+static void PoolGenMessageInit(PoolGenMessage message, PoolGen gen)
+{
+  size_t i = 0;
+  size_t l;
+  /* message is to be initialised so can't be checked. */
+  /* gen is halfway through intialisation.  Naughtily, we will
+     use some of it but not check it. */
+
+  message->id[i++] = '[';
+  ClassOfPool(gen->pool);
+  mps_lib_memcpy(message->id, 
+  message->condemned = 0;
+}
+
 
 /* PoolGenInit -- initialize a PoolGen */
 
@@ -377,13 +395,15 @@ Res PoolGenInit(PoolGen gen, Chain chain, Serial nr, Pool pool)
   RingInit(&gen->genRing);
   gen->totalSize = (Size)0;
   gen->newSize = (Size)0;
+  PoolGenMessageInit(&gen->messageStruct);
   gen->sig = PoolGenSig;
 
-  if (nr != chain->genCount)
+  if(nr != chain->genCount)  {
     RingAppend(&chain->gens[nr].locusRing, &gen->genRing);
-  else
+  } else {
     /* Dynamic generation is linked to the arena, not the chain. */
     RingAppend(&chain->arena->topGen.locusRing, &gen->genRing);
+  }
   AVERT(PoolGen, gen);
   return ResOK;
 }