From 2136259d2a7fc09722cffd956ec2b462fad1de37 Mon Sep 17 00:00:00 2001
From: Richard Kistruck <rhsk@ravenbrook.com>
Date: Wed, 18 Jul 2007 18:17:55 +0100
Subject: [PATCH] Mps master: arenavm.c: fix vmarenadescribe to cope with any
 number

of gens, removing hardwired limit of 3.
vmArenaExtend(): diagnostic: report when VM arena is extended (#if0)

Copied from Perforce
 Change: 162933
 ServerID: perforce.ravenbrook.com
---
 mps/code/arenavm.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/mps/code/arenavm.c b/mps/code/arenavm.c
index 5f4921bdbc3..1262fea4b4b 100644
--- a/mps/code/arenavm.c
+++ b/mps/code/arenavm.c
@@ -197,6 +197,7 @@ static Res VMArenaDescribe(Arena arena, mps_lib_FILE *stream)
 {
   Res res;
   VMArena vmArena;
+  Index gen;
 
   if (!CHECKT(Arena, arena)) return ResFAIL;
   if (stream == NULL) return ResFAIL;
@@ -213,17 +214,23 @@ static Res VMArenaDescribe(Arena arena, mps_lib_FILE *stream)
    *
   */
 
-  AVER(3 < VMArenaGenCount);
+  for(gen = (Index)0; gen < VMArenaGenCount; gen++) {
+    if(vmArena->genZoneSet[gen] != ZoneSetEMPTY) {
+      res = WriteF(stream,
+                   "  genZoneSet[$U]: $B\n",
+                   (WriteFU)gen, (WriteFB)vmArena->genZoneSet[gen],
+                   NULL);
+      if(res != ResOK)
+        return res;
+    }
+  }
+  
   res = WriteF(stream,
-    "  blacklist:     $B\n", (WriteFB)vmArena->blacklist,
-    "  genZoneSet[0]: $B\n", (WriteFB)vmArena->genZoneSet[0],
-    "  genZoneSet[1]: $B\n", (WriteFB)vmArena->genZoneSet[1],
-    "  genZoneSet[2]: $B\n", (WriteFB)vmArena->genZoneSet[2],
-    "  genZoneSet[3]: $B\n", (WriteFB)vmArena->genZoneSet[3],
-    "  freeSet:       $B\n", (WriteFB)vmArena->freeSet,
-    NULL
-  );
-  if (res != ResOK) return res;
+               "  freeSet:       $B\n", (WriteFB)vmArena->freeSet,
+               "  blacklist:     $B\n", (WriteFB)vmArena->blacklist,
+               NULL);
+  if(res != ResOK)
+    return res;
 
   /* (incomplete: some fields are not Described) */
 
@@ -1052,6 +1059,13 @@ static Res vmArenaExtend(VMArena vmArena, Size size)
   /* size bytes free in the new chunk).  Fix this. */
   chunkSize = vmArena->extendBy + size;
 
+#if 0
+  /* diagnostic: report when VM arena is extended */
+  DIAG_WRITEF(( DIAG_STREAM, "\n** vmArenaExtend $U\n", chunkSize, 
+                NULL ));
+  DIAG( ArenaDescribe(VMArena2Arena(vmArena), DIAG_STREAM); );
+#endif
+
   res = VMChunkCreate(&newChunk, vmArena, chunkSize);
   /* .improve.chunk-create.fail: If we fail we could try again */
   /* (with a smaller size, say).  We don't do this. */