Rename cbstest.c to fbmtest.c (free block management test) and generalize it so that it tests both the cbs and freelist modules.

Split FreelistFind into FreelistFindFirst and FreelistFindLast so that the interface exactly matches the CBS interface.
Fix errors in freelist.c: missing computation of size in FreelistBlockSetLimit; update linked list correct in coalesceRight case in FreelistInsert.
Avoid compiler warnings in freelist.c.
In cbs.c: use $U for Booleans ($B is for bit tables).

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

5 files changed, 410 insertions, 172 deletions

diff --git a/mps/code/cbs.c b/mps/code/cbs.c
index 8bf9a4300df..b235ec3da51 100644
--- a/mps/code/cbs.c
+++ b/mps/code/cbs.c
@@ -885,8 +885,8 @@ Res CBSDescribe(CBS cbs, mps_lib_FILE *stream)
                "CBS $P {\n", (WriteFP)cbs,
                "  alignment: $U\n", (WriteFU)cbs->alignment,
                "  blockPool: $P\n", (WriteFP)cbs->blockPool,
-               "  fastFind: $B\n", (WriteFB)cbs->fastFind,
-               "  inCBS: $B\n", (WriteFB)cbs->inCBS,
+               "  fastFind: $U\n", (WriteFU)cbs->fastFind,
+               "  inCBS: $U\n", (WriteFU)cbs->inCBS,
                "  splayTreeSize: $U\n", (WriteFU)cbs->splayTreeSize,
                NULL);
   if (res != ResOK) return res;
diff --git a/mps/code/cbstest.c b/mps/code/fbmtest.c
index 4f60880a756..7b91a04fa11 100644
--- a/mps/code/cbstest.c
+++ b/mps/code/fbmtest.c
@@ -1,38 +1,70 @@
-/* cbstest.c: COALESCING BLOCK STRUCTURE TEST
+/* fbmtest.c: FREE BLOCK MANAGEMENT TEST
  *
  *  $Id$
  * Copyright (c) 2001-2013 Ravenbrook Limited.  See end of file for license.
+ *
+ * The MPS contains two free block management modules:
+ *
+ * 1. the CBS (Coalescing Block Structure) module maintains free
+ * blocks in a splay tree for fast access with a cost in storage;
+ *
+ * 2. the Freelist module maintains free blocks in an address-ordered
+ * singly linked list for zero storage overhead with a cost in
+ * performance.
+ *
+ * The two modules present identical interfaces, so we apply the same
+ * test cases to both.
  */
 
 #include "cbs.h"
+#include "freelist.h"
 #include "mpm.h"
-#include "mpsavm.h"
 #include "mps.h"
+#include "mpsavm.h"
+#include "mpstd.h"
 #include "testlib.h"
 
-#include <stdlib.h>
 #include <stdarg.h>
-#include "mpstd.h"
+#include <stdlib.h>
 #include <time.h>
 
-SRCID(cbstest, "$Id$");
+SRCID(fbmtest, "$Id$");
 
 
 #define ArraySize ((Size)123456)
-#define NOperations ((Size)125000)
 #define Alignment ((Align)sizeof(void *))
 
+/* CBS is much faster than Freelist, so we apply more operations to
+ * the former. */
+#define nCBSOperations ((Size)125000)
+#define nFLOperations ((Size)12500)
 
 static Count NAllocateTried, NAllocateSucceeded, NDeallocateTried,
   NDeallocateSucceeded;
 
+static int verbose = 0;
+
+typedef unsigned FBMType;
+enum {
+  FBMTypeCBS = 1,
+  FBMTypeFreelist,
+  FBMTypeLimit
+};
 
-typedef struct CheckCBSClosureStruct {
+typedef struct FBMStateStruct {
+  FBMType type;
+  union {
+    CBS cbs;
+    Freelist fl;
+  } the;
+} FBMStateStruct, *FBMState;
+
+typedef struct CheckFBMClosureStruct {
   BT allocTable;
   Addr base;
   Addr limit;
   Addr oldLimit;
-} CheckCBSClosureStruct, *CheckCBSClosure;
+} CheckFBMClosureStruct, *CheckFBMClosure;
 
 
 static Addr (addrOfIndex)(Addr block, Index i)
@@ -47,13 +79,26 @@ static Index (indexOfAddr)(Addr block, Addr a)
 }
 
 
-static Bool checkCBSAction(CBS cbs, Range range, void *closureP, Size closureS)
+static void describe(FBMState state) {
+  switch (state->type) {
+  case FBMTypeCBS:
+    CBSDescribe(state->the.cbs, mps_lib_get_stdout());
+    break;
+  case FBMTypeFreelist:
+    FreelistDescribe(state->the.fl, mps_lib_get_stdout());
+    break;
+  default:
+    fail();
+    break;
+  }
+}
+
+
+static Bool checkCallback(Range range, void *closureP, Size closureS)
 {
   Addr base, limit;
-  CheckCBSClosure closure = (CheckCBSClosure)closureP;
+  CheckFBMClosure closure = (CheckFBMClosure)closureP;
 
-  /* Don't need to check cbs every time */
-  UNUSED(cbs);
   UNUSED(closureS);
   Insist(closure != NULL);
 
@@ -79,16 +124,42 @@ static Bool checkCBSAction(CBS cbs, Range range, void *closureP, Size closureS)
 }
 
 
-static void checkCBS(CBS cbs, BT allocTable, Addr dummyBlock)
+static Bool checkCBSCallback(CBS cbs, Range range,
+                             void *closureP, Size closureS)
+{
+  UNUSED(cbs);
+  return checkCallback(range, closureP, closureS);
+}
+
+
+static Bool checkFLCallback(Bool *deleteReturn, Range range,
+                            void *closureP, Size closureS)
 {
-  CheckCBSClosureStruct closure;
+  *deleteReturn = FALSE;
+  return checkCallback(range, closureP, closureS);
+}
+
+
+static void check(FBMState state, BT allocTable, Addr dummyBlock)
+{
+  CheckFBMClosureStruct closure;
 
   closure.allocTable = allocTable;
   closure.base = dummyBlock;
   closure.limit = addrOfIndex(closure.base, ArraySize);
   closure.oldLimit = closure.base;
 
-  CBSIterate(cbs, checkCBSAction, (void *)&closure, 0);
+  switch (state->type) {
+  case FBMTypeCBS:
+    CBSIterate(state->the.cbs, checkCBSCallback, (void *)&closure, 0);
+    break;
+  case FBMTypeFreelist:
+    FreelistIterate(state->the.fl, checkFLCallback, (void *)&closure, 0);
+    break;
+  default:
+    fail();
+    return;
+  }
 
   if (closure.oldLimit == closure.base)
     Insist(BTIsSetRange(allocTable, 0,
@@ -102,7 +173,7 @@ static void checkCBS(CBS cbs, BT allocTable, Addr dummyBlock)
 }
 
 
-static Word cbsRnd(Word limit)
+static Word fbmRnd(Word limit)
 {
   /* Not very uniform, but never mind. */
   return (Word)rnd() % limit;
@@ -182,22 +253,22 @@ static void randomRange(Addr *baseReturn, Addr *limitReturn,
                 /* after base */
   Index limit;  /* a randomly chosen value in (base, limit]. */
 
-  base = cbsRnd(ArraySize);
+  base = fbmRnd(ArraySize);
 
   do {
     end = nextEdge(allocTable, ArraySize, base);
-  } while(end < ArraySize && cbsRnd(2) == 0); /* p=0.5 exponential */
+  } while(end < ArraySize && fbmRnd(2) == 0); /* p=0.5 exponential */
 
   Insist(end > base);
 
-  limit = base + 1 + cbsRnd(end - base);
+  limit = base + 1 + fbmRnd(end - base);
 
   *baseReturn = addrOfIndex(block, base);
   *limitReturn = addrOfIndex(block, limit);
 }
 
 
-static void allocate(CBS cbs, Addr block, BT allocTable,
+static void allocate(FBMState state, Addr block, BT allocTable,
                      Addr base, Addr limit)
 {
   Res res;
@@ -210,11 +281,6 @@ static void allocate(CBS cbs, Addr block, BT allocTable,
   il = indexOfAddr(block, limit);
 
   isFree = BTIsResRange(allocTable, ib, il);
- 
-  /*
-  printf("allocate: [%p, %p) -- %s\n",
-         base, limit, isFree ? "succeed" : "fail");
-  */
 
   NAllocateTried++;
 
@@ -237,7 +303,23 @@ static void allocate(CBS cbs, Addr block, BT allocTable,
   }
 
   RangeInit(&range, base, limit);
-  res = CBSDelete(&oldRange, cbs, &range);
+  switch (state->type) {
+  case FBMTypeCBS:
+    res = CBSDelete(&oldRange, state->the.cbs, &range);
+    break;
+  case FBMTypeFreelist:
+    res = FreelistDelete(&oldRange, state->the.fl, &range);
+    break;
+  default:
+    fail();
+    return;
+  }
+
+  if (verbose) {
+    printf("allocate: [%p,%p) -- %s\n",
+           base, limit, isFree ? "succeed" : "fail");
+    describe(state);
+  }
 
   if (!isFree) {
     die_expect((mps_res_t)res, MPS_RES_FAIL,
@@ -253,25 +335,20 @@ static void allocate(CBS cbs, Addr block, BT allocTable,
 }
 
 
-static void deallocate(CBS cbs, Addr block, BT allocTable,
+static void deallocate(FBMState state, Addr block, BT allocTable,
                        Addr base, Addr limit)
 {
   Res res;
   Index ib, il;
   Bool isAllocated;
   Addr outerBase = base, outerLimit = limit; /* interval containing [ib, il) */
-  RangeStruct range, freeRange; /* interval returned by CBS */
+  RangeStruct range, freeRange; /* interval returned by the manager */
 
   ib = indexOfAddr(block, base);
   il = indexOfAddr(block, limit);
 
   isAllocated = BTIsSetRange(allocTable, ib, il);
 
-  /*
-  printf("deallocate: [%p, %p) -- %s\n",
-         base, limit, isAllocated ? "succeed" : "fail");
-  */
-
   NDeallocateTried++;
 
   if (isAllocated) {
@@ -303,7 +380,23 @@ static void deallocate(CBS cbs, Addr block, BT allocTable,
   }
 
   RangeInit(&range, base, limit);
-  res = CBSInsert(&freeRange, cbs, &range);
+  switch (state->type) {
+  case FBMTypeCBS:
+    res = CBSInsert(&freeRange, state->the.cbs, &range);
+    break;
+  case FBMTypeFreelist:
+    res = FreelistInsert(&freeRange, state->the.fl, &range);
+    break;
+  default:
+    fail();
+    return;
+  }
+
+  if (verbose) {
+    printf("deallocate: [%p,%p) -- %s\n",
+           base, limit, isAllocated ? "succeed" : "fail");
+    describe(state);
+  }
 
   if (!isAllocated) {
     die_expect((mps_res_t)res, MPS_RES_FAIL,
@@ -320,7 +413,7 @@ static void deallocate(CBS cbs, Addr block, BT allocTable,
 }
 
 
-static void find(CBS cbs, void *block, BT alloc, Size size, Bool high,
+static void find(FBMState state, void *block, BT alloc, Size size, Bool high,
                  FindDelete findDelete)
 {
   Bool expected, found;
@@ -366,8 +459,35 @@ static void find(CBS cbs, void *block, BT alloc, Size size, Bool high,
     UNUSED(newSize);
   }
 
-  found = (high ? CBSFindLast : CBSFindFirst)
-    (&foundRange, &oldRange, cbs, size * Alignment, findDelete);
+  switch (state->type) {
+  case FBMTypeCBS:
+    found = (high ? CBSFindLast : CBSFindFirst)
+      (&foundRange, &oldRange, state->the.cbs, size * Alignment, findDelete);
+    break;
+  case FBMTypeFreelist:
+    found = (high ? FreelistFindLast : FreelistFindFirst)
+      (&foundRange, &oldRange, state->the.fl, size * Alignment, findDelete);
+    break;
+  default:
+    fail();
+    return;
+  }
+
+  if (verbose) {
+    printf("find %s %lu: ", high ? "last" : "first",
+           (unsigned long)(size * Alignment));
+    if (expected) {
+      printf("expecting [%p,%p)\n", addrOfIndex(block, expectedBase),
+             addrOfIndex(block, expectedLimit));
+    } else {
+      printf("expecting this not to be found\n");
+    }
+    if (found) {
+      printf("  found [%p,%p)\n", RangeBase(&foundRange), RangeLimit(&foundRange));
+    } else {
+      printf("  not found\n");
+    }
+  }
 
   Insist(found == expected);
 
@@ -385,23 +505,59 @@ static void find(CBS cbs, void *block, BT alloc, Size size, Bool high,
   return;
 }
 
+static void test(FBMState state, Addr dummyBlock, BT allocTable, unsigned n) {
+  Addr base, limit;
+  unsigned i;
+  Size size;
+  Bool high;
+  FindDelete findDelete = FindDeleteNONE;
+
+  BTSetRange(allocTable, 0, ArraySize); /* Initially all allocated */
+  check(state, allocTable, dummyBlock);
+  for(i = 0; i < n; i++) {
+    switch(fbmRnd(3)) {
+    case 0:
+      randomRange(&base, &limit, allocTable, dummyBlock);
+      allocate(state, dummyBlock, allocTable, base, limit);
+      break;
+    case 1:
+      randomRange(&base, &limit, allocTable, dummyBlock);
+      deallocate(state, dummyBlock, allocTable, base, limit);
+      break;
+    case 2:
+      size = fbmRnd(ArraySize / 10) + 1;
+      high = fbmRnd(2) ? TRUE : FALSE;
+      switch(fbmRnd(6)) {
+      case 0:
+      case 1:
+      case 2: findDelete = FindDeleteNONE; break;
+      case 3: findDelete = FindDeleteLOW; break;
+      case 4: findDelete = FindDeleteHIGH; break;
+      case 5: findDelete = FindDeleteENTIRE; break;
+      }
+      find(state, dummyBlock, allocTable, size, high, findDelete);
+      break;
+    default:
+      fail();
+      return;
+    }
+    if ((i + 1) % 1000 == 0)
+      check(state, allocTable, dummyBlock);
+  }
+}
 
 #define testArenaSIZE   (((size_t)4)<<20)
 
 extern int main(int argc, char *argv[])
 {
-  unsigned i;
-  Addr base, limit;
   mps_arena_t mpsArena;
   Arena arena; /* the ANSI arena which we use to allocate the BT */
-  CBSStruct cbsStruct;
-  CBS cbs;
+  FBMStateStruct state;
   void *p;
   Addr dummyBlock;
   BT allocTable;
-  Size size;
-  Bool high;
-  FindDelete findDelete = FindDeleteNONE;
+  FreelistStruct flStruct;
+  CBSStruct cbsStruct;
 
   randomize(argc, argv);
 
@@ -415,54 +571,34 @@ extern int main(int argc, char *argv[])
   die((mps_res_t)BTCreate(&allocTable, arena, ArraySize),
       "failed to create alloc table");
 
-  die((mps_res_t)CBSInit(arena, &cbsStruct, NULL, Alignment, TRUE,
-                         mps_args_none),
-      "failed to initialise CBS");
-  cbs = &cbsStruct;
-
-  BTSetRange(allocTable, 0, ArraySize); /* Initially all allocated */
-
   /* We're not going to use this block, but I feel unhappy just */
   /* inventing addresses. */
   die((mps_res_t)ControlAlloc(&p, arena, ArraySize * Alignment,
                               /* withReservoirPermit */ FALSE),
       "failed to allocate block");
-  dummyBlock = (Addr)p; /* avoid pun */
+  dummyBlock = p; /* avoid pun */
 
-  printf("Allocated block [%p, %p)\n", (void*)dummyBlock,
-         (char *)dummyBlock + ArraySize);
-
-  checkCBS(cbs, allocTable, dummyBlock);
-  for(i = 0; i < NOperations; i++) {
-    switch(cbsRnd(3)) {
-    case 0: {
-      randomRange(&base, &limit, allocTable, dummyBlock);
-      allocate(cbs, dummyBlock, allocTable, base, limit);
-    } break;
-    case 1: {
-      randomRange(&base, &limit, allocTable, dummyBlock);
-      deallocate(cbs, dummyBlock, allocTable, base, limit);
-    } break;
-    case 2: {
-      size = cbsRnd(ArraySize / 10) + 1;
-      high = cbsRnd(2) ? TRUE : FALSE;
-      switch(cbsRnd(6)) {
-      case 0:
-      case 1:
-      case 2: findDelete = FindDeleteNONE; break;
-      case 3: findDelete = FindDeleteLOW; break;
-      case 4: findDelete = FindDeleteHIGH; break;
-      case 5: findDelete = FindDeleteENTIRE; break;
-      }
-      find(cbs, dummyBlock, allocTable, size, high, findDelete);
-    } break;
-    }
-    if (i % 5000 == 0)
-      checkCBS(cbs, allocTable, dummyBlock);
+  if (verbose) {
+    printf("Allocated block [%p,%p)\n", (void*)dummyBlock,
+           (char *)dummyBlock + ArraySize);
   }
 
-  /* CBSDescribe prints a very long line. */
-  /* CBSDescribe(cbs, mps_lib_get_stdout()); */
+  die((mps_res_t)CBSInit(arena, &cbsStruct, arena, Alignment,
+                         TRUE, mps_args_none),
+      "failed to initialise CBS");
+  state.type = FBMTypeCBS;
+  state.the.cbs = &cbsStruct;
+  test(&state, dummyBlock, allocTable, nCBSOperations);
+  CBSFinish(&cbsStruct);
+
+  die((mps_res_t)FreelistInit(&flStruct, Alignment),
+      "failed to initialise Freelist");
+  state.type = FBMTypeFreelist;
+  state.the.fl = &flStruct;
+  test(&state, dummyBlock, allocTable, nFLOperations);
+  FreelistFinish(&flStruct);
+
+  mps_arena_destroy(arena);
 
   printf("\nNumber of allocations attempted: %ld\n", NAllocateTried);
   printf("Number of allocations succeeded: %ld\n", NAllocateSucceeded);
diff --git a/mps/code/freelist.c b/mps/code/freelist.c
index f6e86ddf958..6db2e7e5d01 100644
--- a/mps/code/freelist.c
+++ b/mps/code/freelist.c
@@ -19,7 +19,7 @@ SRCID(freelist, "$Id$");
 
 #define FreelistTag(addr) ((Word)(addr) & 1)
 #define FreelistTagSet(addr) ((Addr)((Word)(addr) | 1))
-#define FreelistTagReset(addr) ((Addr)((Word)(addr) & ~1))
+#define FreelistTagReset(addr) ((Addr)((Word)(addr) & ~(Word)1))
 #define FreelistTagCopy(to, from) ((Addr)((Word)(to) | FreelistTag(from)))
 
 #define FreelistGrainSize(fl) ((fl)->alignment)
@@ -41,7 +41,7 @@ static Addr FreelistBlockLimit(Freelist fl, Addr addr)
 /* FreelistBlockNext -- return the next block in the list, or NULL if
  * there are no more blocks.
  */
-static Addr FreelistBlockNext(Freelist fl, Addr addr)
+static Addr FreelistBlockNext(Addr addr)
 {
   Addr *block = FreelistBlock(addr);
   return FreelistTagReset(block[0]);
@@ -56,7 +56,7 @@ static Addr FreelistBlockNext(Freelist fl, Addr addr)
 
 /* FreelistBlockSetNext -- update the next block in the list */
 
-static void FreelistBlockSetNext(Freelist fl, Addr addr, Addr next)
+static void FreelistBlockSetNext(Addr addr, Addr next)
 {
   Addr *block = FreelistBlock(addr);
   block[0] = FreelistTagCopy(next, block[0]);
@@ -68,7 +68,7 @@ static void FreelistBlockSetNext(Freelist fl, Addr addr, Addr next)
 static void FreelistBlockSetLimit(Freelist fl, Addr addr, Addr limit)
 {
   Addr *block = FreelistBlock(addr);
-  Size size = size;
+  Size size = AddrOffset(addr, limit);
   if (size > FreelistGrainSize(fl)) {
     block[0] = FreelistTagReset(block[0]);
     block[1] = limit;
@@ -132,13 +132,16 @@ static void freelistBlockSetPrevNext(Freelist fl, Addr prev,
                                      Addr next, int delta)
 {
   if (prev) {
-    FreelistBlockSetNext(fl, prev, next);
+    FreelistBlockSetNext(prev, next);
   } else {
     fl->list = next;
   }
-  if (delta < 0)
-    AVER(fl->listSize >= -delta);
-  fl->listSize += delta;
+  if (delta < 0) {
+    AVER(fl->listSize >= (Count)-delta);
+    fl->listSize -= (Count)-delta;
+  } else {
+    fl->listSize += (Count)delta;
+  }
 }
 
 
@@ -147,7 +150,6 @@ Res FreelistInsert(Range rangeReturn, Freelist fl, Range range)
   Addr prev, cur, next, new;
   Addr base, limit;
   Bool coalesceLeft, coalesceRight;
-  Res res = ResOK;
 
   AVER(rangeReturn != NULL);
   AVERT(Freelist, fl);
@@ -165,7 +167,7 @@ Res FreelistInsert(Range rangeReturn, Freelist fl, Range range)
       return ResFAIL; /* range overlaps with cur */
     if (limit <= cur)
       break;
-    next = FreelistBlockNext(fl, cur);
+    next = FreelistBlockNext(cur);
     if (next)
       /* Isolated range invariant (design.mps.freelist.impl.invariant). */
       AVER(FreelistBlockLimit(fl, cur) < next);
@@ -184,21 +186,23 @@ Res FreelistInsert(Range rangeReturn, Freelist fl, Range range)
     base = prev;
     limit = FreelistBlockLimit(fl, cur);
     FreelistBlockSetLimit(fl, prev, limit);
-    freelistBlockSetPrevNext(fl, prev, next, -1);
+    freelistBlockSetPrevNext(fl, prev, FreelistBlockNext(cur), -1);
 
   } else if (coalesceLeft) {
     base = prev;
     FreelistBlockSetLimit(fl, prev, limit);
 
   } else if (coalesceRight) {
+    next = FreelistBlockNext(cur);
     limit = FreelistBlockLimit(fl, cur);
     cur = FreelistBlockInit(fl, base, limit);
-    FreelistBlockSetNext(fl, cur, next);
+    FreelistBlockSetNext(cur, next);
+    freelistBlockSetPrevNext(fl, prev, cur, 0);
 
   } else {
     /* failed to coalesce: add new block */
     new = FreelistBlockInit(fl, base, limit);
-    FreelistBlockSetNext(fl, new, cur);
+    FreelistBlockSetNext(new, cur);
     freelistBlockSetPrevNext(fl, prev, new, +1);
   }
 
@@ -223,7 +227,7 @@ static void freelistDeleteFromBlock(Range rangeReturn, Freelist fl,
   AVERT(Freelist, fl);
   AVERT(Range, range);
   AVER(RangeIsAligned(range, fl->alignment));
-  AVER(prev == NULL || FreelistBlockNext(fl, prev) == block);
+  AVER(prev == NULL || FreelistBlockNext(prev) == block);
   AVER(block != NULL);
 
   AVER(block <= RangeBase(range));
@@ -233,7 +237,7 @@ static void freelistDeleteFromBlock(Range rangeReturn, Freelist fl,
   limit = RangeLimit(range);
   blockBase = block;
   blockLimit = FreelistBlockLimit(fl, block);
-  next = FreelistBlockNext(fl, block);
+  next = FreelistBlockNext(block);
 
   if (base == blockBase && limit == blockLimit) {
     /* No fragment at left; no fragment at right. */
@@ -242,7 +246,7 @@ static void freelistDeleteFromBlock(Range rangeReturn, Freelist fl,
   } else if (base == blockBase) {
     /* No fragment at left; block at right. */
     block = FreelistBlockInit(fl, limit, blockLimit);
-    FreelistBlockSetNext(fl, block, next);
+    FreelistBlockSetNext(block, next);
     freelistBlockSetPrevNext(fl, prev, block, 0);
 
   } else if (limit == blockLimit) {        
@@ -253,7 +257,7 @@ static void freelistDeleteFromBlock(Range rangeReturn, Freelist fl,
     /* Block at left; block at right. */
     FreelistBlockSetLimit(fl, block, base);
     new = FreelistBlockInit(fl, limit, blockLimit);
-    FreelistBlockSetNext(fl, new, next);
+    FreelistBlockSetNext(new, next);
     freelistBlockSetPrevNext(fl, block, new, +1);
   }
 
@@ -263,8 +267,7 @@ static void freelistDeleteFromBlock(Range rangeReturn, Freelist fl,
 
 Res FreelistDelete(Range rangeReturn, Freelist fl, Range range)
 {
-  Res res;
-  Addr prev, cur, next, new;
+  Addr prev, cur, next;
   Addr base, limit;
 
   AVER(rangeReturn != NULL);
@@ -290,7 +293,7 @@ Res FreelistDelete(Range rangeReturn, Freelist fl, Range range)
       return ResOK;
     }
     
-    next = FreelistBlockNext(fl, cur);
+    next = FreelistBlockNext(cur);
     prev = cur;
     cur = next;
   }
@@ -316,7 +319,7 @@ void FreelistIterate(Freelist fl, FreelistIterateMethod iterate,
     Bool cont;
     RangeInit(&range, cur, FreelistBlockLimit(fl, cur));
     cont = (*iterate)(&delete, &range, closureP, closureS);
-    next = FreelistBlockNext(fl, cur);
+    next = FreelistBlockNext(cur);
     if (delete) {
       freelistBlockSetPrevNext(fl, prev, next, -1);
     } else {
@@ -350,7 +353,7 @@ static void freelistFindDeleteFromBlock(Range rangeReturn, Range oldRangeReturn,
   AVERT(Freelist, fl);
   AVER(SizeIsAligned(size, fl->alignment));
   AVERT(FindDelete, findDelete);
-  AVER(prev == NULL || FreelistBlockNext(fl, prev) == block);
+  AVER(prev == NULL || FreelistBlockNext(prev) == block);
   AVER(block != NULL);
   AVER(FreelistBlockSize(fl, block) >= size);
   
@@ -388,10 +391,9 @@ static void freelistFindDeleteFromBlock(Range rangeReturn, Range oldRangeReturn,
 }
 
 
-Bool FreelistFind(Range rangeReturn, Range oldRangeReturn,
-                  Freelist fl, Size size, FindDelete findDelete)
+Bool FreelistFindFirst(Range rangeReturn, Range oldRangeReturn,
+                       Freelist fl, Size size, FindDelete findDelete)
 {
-  Res res;
   Addr prev, cur, next;
 
   AVER(rangeReturn != NULL);
@@ -408,7 +410,7 @@ Bool FreelistFind(Range rangeReturn, Range oldRangeReturn,
                                   findDelete, prev, cur);
       return TRUE;
     }
-    next = FreelistBlockNext(fl, cur);
+    next = FreelistBlockNext(cur);
     prev = cur;
     cur = next;
   }
@@ -417,6 +419,40 @@ Bool FreelistFind(Range rangeReturn, Range oldRangeReturn,
 }
 
 
+Bool FreelistFindLast(Range rangeReturn, Range oldRangeReturn,
+                      Freelist fl, Size size, FindDelete findDelete)
+{
+  Bool found = FALSE;
+  Addr prev, cur, next;
+  Addr foundPrev, foundCur;
+
+  AVER(rangeReturn != NULL);
+  AVER(oldRangeReturn != NULL);
+  AVERT(Freelist, fl);
+  AVER(SizeIsAligned(size, fl->alignment));
+  AVERT(FindDelete, findDelete);
+
+  prev = NULL;
+  cur = fl->list;
+  while (cur) {
+    if (FreelistBlockSize(fl, cur) >= size) {
+      found = TRUE;
+      foundPrev = prev;
+      foundCur = cur;
+    }
+    next = FreelistBlockNext(cur);
+    prev = cur;
+    cur = next;
+  }
+
+  if (found)
+    freelistFindDeleteFromBlock(rangeReturn, oldRangeReturn, fl, size,
+                                findDelete, foundPrev, foundCur);
+
+  return found;
+}
+
+
 Bool FreelistFindLargest(Range rangeReturn, Range oldRangeReturn,
                          Freelist fl, FindDelete findDelete)
 {
@@ -439,7 +475,7 @@ Bool FreelistFindLargest(Range rangeReturn, Range oldRangeReturn,
       bestPrev = prev;
       bestCur = cur;
     }
-    next = FreelistBlockNext(fl, cur);
+    next = FreelistBlockNext(cur);
     prev = cur;
     cur = next;
   }
@@ -467,10 +503,12 @@ static Bool freelistDescribeIterateMethod(Bool *deleteReturn, Range range,
   AVER(deleteReturn != NULL);
   AVERT(Range, range);
   AVER(stream != NULL);
+  UNUSED(closureS);
 
   res = WriteF(stream,
                "  [$P,", (WriteFP)RangeBase(range),
-               "$P)\n", (WriteFP)RangeLimit(range),
+               "$P)", (WriteFP)RangeLimit(range),
+               " {$U}\n", (WriteFU)RangeSize(range),
                NULL);
 
   *deleteReturn = FALSE;
diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj
index 36b3e7ddac8..e2a83d5cf5e 100644
--- a/mps/code/mps.xcodeproj/project.pbxproj
+++ b/mps/code/mps.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
                                 3114A65B156E95B4001E0AA3 /* PBXTargetDependency */,
                                 3114A5CC156E932C001E0AA3 /* PBXTargetDependency */,
                                 3114A5EA156E93C4001E0AA3 /* PBXTargetDependency */,
+                                228A22211759004C00270ECF /* PBXTargetDependency */,
                                 31D60034156D3D5A00337B26 /* PBXTargetDependency */,
                                 3114A5A0156E915A001E0AA3 /* PBXTargetDependency */,
                                 3114A6A7156E9739001E0AA3 /* PBXTargetDependency */,
@@ -66,6 +67,10 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+                22ABDC4E1758FD0C00965593 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; };
+                22ABDC501758FD0C00965593 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; };
+                22ABDC581758FD4F00965593 /* fbmtest.c in Sources */ = {isa = PBXBuildFile; fileRef = 22ABDC571758FD3D00965593 /* fbmtest.c */; };
+                22ABDC5A1758FDD500965593 /* freelist.c in Sources */ = {isa = PBXBuildFile; fileRef = 22ABDC591758FDCD00965593 /* freelist.c */; };
                 22FA176916E8D6FC0098B23F /* fmtdy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC6156BE48D00753214 /* fmtdy.c */; };
                 22FA176A16E8D6FC0098B23F /* fmtdytst.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC7156BE48D00753214 /* fmtdytst.c */; };
                 22FA176B16E8D6FC0098B23F /* fmthe.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAE4156BE6D500753214 /* fmthe.c */; };
@@ -137,7 +142,6 @@
                 3114A63E156E94EA001E0AA3 /* abqtest.c in Sources */ = {isa = PBXBuildFile; fileRef = 3114A63D156E94EA001E0AA3 /* abqtest.c */; };
                 3114A63F156E94F0001E0AA3 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; };
                 3114A640156E94F0001E0AA3 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; };
-                3114A657156E95A6001E0AA3 /* cbstest.c in Sources */ = {isa = PBXBuildFile; fileRef = 3114A656156E95A6001E0AA3 /* cbstest.c */; };
                 3114A66E156E95F2001E0AA3 /* btcv.c in Sources */ = {isa = PBXBuildFile; fileRef = 3114A66C156E95EB001E0AA3 /* btcv.c */; };
                 3114A66F156E95F2001E0AA3 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; };
                 3114A670156E95F2001E0AA3 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; };
@@ -227,6 +231,20 @@
                         remoteGlobalIDString = 2D604B9B16514B1A003AAF46;
                         remoteInfo = mpseventtxt;
                 };
+                228A22201759004C00270ECF /* PBXContainerItemProxy */ = {
+                        isa = PBXContainerItemProxy;
+                        containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
+                        proxyType = 1;
+                        remoteGlobalIDString = 22ABDC491758FD0C00965593;
+                        remoteInfo = fbmtest;
+                };
+                22ABDC4B1758FD0C00965593 /* PBXContainerItemProxy */ = {
+                        isa = PBXContainerItemProxy;
+                        containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
+                        proxyType = 1;
+                        remoteGlobalIDString = 31EEABFA156AAF9D00714D05;
+                        remoteInfo = mps;
+                };
                 22CDE92D16E9EB9300366D0A /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
                         containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
@@ -493,13 +511,6 @@
                         remoteGlobalIDString = 31EEABFA156AAF9D00714D05;
                         remoteInfo = mps;
                 };
-                3114A65A156E95B4001E0AA3 /* PBXContainerItemProxy */ = {
-                        isa = PBXContainerItemProxy;
-                        containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
-                        proxyType = 1;
-                        remoteGlobalIDString = 3114A64B156E9596001E0AA3;
-                        remoteInfo = cbstest;
-                };
                 3114A674156E9619001E0AA3 /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
                         containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
@@ -685,6 +696,15 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+                22ABDC511758FD0C00965593 /* CopyFiles */ = {
+                        isa = PBXCopyFilesBuildPhase;
+                        buildActionMask = 2147483647;
+                        dstPath = /usr/share/man/man1/;
+                        dstSubfolderSpec = 0;
+                        files = (
+                        );
+                        runOnlyForDeploymentPostprocessing = 1;
+                };
                 22FA177016E8D6FC0098B23F /* CopyFiles */ = {
                         isa = PBXCopyFilesBuildPhase;
                         buildActionMask = 2147483647;
@@ -987,6 +1007,9 @@
 /* Begin PBXFileReference section */
                 2219DEFF174BE51900F112E9 /* mpscmvt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpscmvt.h; sourceTree = "<group>"; };
                 226FDF2D174AC32C008E5B4F /* range.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = range.c; sourceTree = "<group>"; };
+                22ABDC561758FD0C00965593 /* fbmtest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fbmtest; sourceTree = BUILT_PRODUCTS_DIR; };
+                22ABDC571758FD3D00965593 /* fbmtest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fbmtest.c; sourceTree = "<group>"; };
+                22ABDC591758FDCD00965593 /* freelist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = freelist.c; sourceTree = "<group>"; };
                 22FA177516E8D6FC0098B23F /* amcssth */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = amcssth; sourceTree = BUILT_PRODUCTS_DIR; };
                 22FA177616E8D7A80098B23F /* amcssth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = amcssth.c; sourceTree = "<group>"; };
                 2D07B96C1636FC7200DB751B /* eventsql.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = eventsql.c; sourceTree = "<group>"; };
@@ -1024,8 +1047,6 @@
                 3114A633156E94DB001E0AA3 /* abqtest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = abqtest; sourceTree = BUILT_PRODUCTS_DIR; };
                 3114A63D156E94EA001E0AA3 /* abqtest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = abqtest.c; sourceTree = "<group>"; };
                 3114A645156E9525001E0AA3 /* abq.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = abq.c; sourceTree = "<group>"; };
-                3114A64C156E9596001E0AA3 /* cbstest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cbstest; sourceTree = BUILT_PRODUCTS_DIR; };
-                3114A656156E95A6001E0AA3 /* cbstest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cbstest.c; sourceTree = "<group>"; };
                 3114A662156E95D9001E0AA3 /* btcv */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = btcv; sourceTree = BUILT_PRODUCTS_DIR; };
                 3114A66C156E95EB001E0AA3 /* btcv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = btcv.c; sourceTree = "<group>"; };
                 3114A67C156E9668001E0AA3 /* mv2test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mv2test; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1177,6 +1198,14 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+                22ABDC4F1758FD0C00965593 /* Frameworks */ = {
+                        isa = PBXFrameworksBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                                22ABDC501758FD0C00965593 /* libmps.a in Frameworks */,
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                };
                 22FA176E16E8D6FC0098B23F /* Frameworks */ = {
                         isa = PBXFrameworksBuildPhase;
                         buildActionMask = 2147483647;
@@ -1501,9 +1530,9 @@
                                 31D60017156D3CC300337B26 /* awluthe.c */,
                                 3114A66C156E95EB001E0AA3 /* btcv.c */,
                                 3114A613156E944A001E0AA3 /* bttest.c */,
-                                3114A656156E95A6001E0AA3 /* cbstest.c */,
                                 3114A5CD156E9369001E0AA3 /* finalcv.c */,
                                 3114A5E5156E93B9001E0AA3 /* finaltest.c */,
+                                22ABDC571758FD3D00965593 /* fbmtest.c */,
                                 3124CAC6156BE48D00753214 /* fmtdy.c */,
                                 3124CAC7156BE48D00753214 /* fmtdytst.c */,
                                 3124CAE4156BE6D500753214 /* fmthe.c */,
@@ -1595,7 +1624,6 @@
                                 3114A605156E9430001E0AA3 /* bttest */,
                                 3114A61C156E9485001E0AA3 /* teletest */,
                                 3114A633156E94DB001E0AA3 /* abqtest */,
-                                3114A64C156E9596001E0AA3 /* cbstest */,
                                 3114A662156E95D9001E0AA3 /* btcv */,
                                 3114A67C156E9668001E0AA3 /* mv2test */,
                                 3114A695156E971B001E0AA3 /* messtest */,
@@ -1604,6 +1632,7 @@
                                 2D07B9711636FC9900DB751B /* mpseventsql */,
                                 2D604B9C16514B1A003AAF46 /* mpseventtxt */,
                                 22FA177516E8D6FC0098B23F /* amcssth */,
+                                22ABDC561758FD0C00965593 /* fbmtest */,
                         );
                         name = Products;
                         sourceTree = "<group>";
@@ -1639,6 +1668,7 @@
                                 311F2F5B17398AE900C15B6A /* eventpro.h */,
                                 311F2F5C17398AE900C15B6A /* eventrep.h */,
                                 31EEAC1A156AB2B200714D05 /* format.c */,
+                                22ABDC591758FDCD00965593 /* freelist.c */,
                                 31EEAC07156AB27B00714D05 /* global.c */,
                                 31EEAC2B156AB2F200714D05 /* ld.c */,
                                 311F2F5E17398B0E00C15B6A /* lock.h */,
@@ -1763,6 +1793,24 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
+                22ABDC491758FD0C00965593 /* fbmtest */ = {
+                        isa = PBXNativeTarget;
+                        buildConfigurationList = 22ABDC521758FD0C00965593 /* Build configuration list for PBXNativeTarget "fbmtest" */;
+                        buildPhases = (
+                                22ABDC4C1758FD0C00965593 /* Sources */,
+                                22ABDC4F1758FD0C00965593 /* Frameworks */,
+                                22ABDC511758FD0C00965593 /* CopyFiles */,
+                        );
+                        buildRules = (
+                        );
+                        dependencies = (
+                                22ABDC4A1758FD0C00965593 /* PBXTargetDependency */,
+                        );
+                        name = fbmtest;
+                        productName = fbmtest;
+                        productReference = 22ABDC561758FD0C00965593 /* fbmtest */;
+                        productType = "com.apple.product-type.tool";
+                };
                 22FA176416E8D6FC0098B23F /* amcssth */ = {
                         isa = PBXNativeTarget;
                         buildConfigurationList = 22FA177116E8D6FC0098B23F /* Build configuration list for PBXNativeTarget "amcssth" */;
@@ -2067,24 +2115,6 @@
                         productReference = 3114A633156E94DB001E0AA3 /* abqtest */;
                         productType = "com.apple.product-type.tool";
                 };
-                3114A64B156E9596001E0AA3 /* cbstest */ = {
-                        isa = PBXNativeTarget;
-                        buildConfigurationList = 3114A653156E9596001E0AA3 /* Build configuration list for PBXNativeTarget "cbstest" */;
-                        buildPhases = (
-                                3114A648156E9596001E0AA3 /* Sources */,
-                                3114A649156E9596001E0AA3 /* Frameworks */,
-                                3114A64A156E9596001E0AA3 /* CopyFiles */,
-                        );
-                        buildRules = (
-                        );
-                        dependencies = (
-                                3114A659156E95B1001E0AA3 /* PBXTargetDependency */,
-                        );
-                        name = cbstest;
-                        productName = cbstest;
-                        productReference = 3114A64C156E9596001E0AA3 /* cbstest */;
-                        productType = "com.apple.product-type.tool";
-                };
                 3114A661156E95D9001E0AA3 /* btcv */ = {
                         isa = PBXNativeTarget;
                         buildConfigurationList = 3114A669156E95D9001E0AA3 /* Build configuration list for PBXNativeTarget "btcv" */;
@@ -2406,9 +2436,9 @@
                                 31D6000C156D3CB200337B26 /* awluthe */,
                                 3114A661156E95D9001E0AA3 /* btcv */,
                                 3114A604156E9430001E0AA3 /* bttest */,
-                                3114A64B156E9596001E0AA3 /* cbstest */,
                                 3114A5BC156E9315001E0AA3 /* finalcv */,
                                 3114A5D5156E93A0001E0AA3 /* finaltest */,
+                                22ABDC491758FD0C00965593 /* fbmtest */,
                                 31D60026156D3D3E00337B26 /* lockcov */,
                                 3114A58F156E913C001E0AA3 /* locv */,
                                 3114A694156E971B001E0AA3 /* messtest */,
@@ -2444,12 +2474,22 @@
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "# bttest and teletest are not listed here because they cannot be run\n# unattended.\nTESTCASES=\"abqtest amcss amcsshe amcssth amsss amssshe apss arenacv \\\n           awlut awluthe btcv cbstest finalcv finaltest lockcov locv \\\n           messtest mpmss mpsicv mv2test poolncv qs sacss segsmss \\\n           steptest walkt0\"\n../tool/testrun.sh $(for TEST in $TESTCASES; do echo $TARGET_BUILD_DIR/$TEST; done)\n\n# Coverage\nif [ \"$CONFIGURATION\" == \"Debug\" ]; then\n    (cd xc/$PROJECT.build/$CONFIGURATION/$PROJECT.build/Objects-normal/x86_64 &&\n     gcov mps.c 2> /dev/null) | ../tool/gcovfmt.py\nfi";
+                        shellScript = "# bttest and teletest are not listed here because they cannot be run\n# unattended.\nTESTCASES=\"abqtest amcss amcsshe amcssth amsss amssshe apss arenacv \\\n           awlut awluthe btcv fbmtest finalcv finaltest lockcov locv \\\n           messtest mpmss mpsicv mv2test poolncv qs sacss segsmss \\\n           steptest walkt0\"\n../tool/testrun.sh $(for TEST in $TESTCASES; do echo $TARGET_BUILD_DIR/$TEST; done)\n\n# Coverage\nif [ \"$CONFIGURATION\" == \"Debug\" ]; then\n    (cd xc/$PROJECT.build/$CONFIGURATION/$PROJECT.build/Objects-normal/x86_64 &&\n     gcov mps.c 2> /dev/null) | ../tool/gcovfmt.py\nfi";
                         showEnvVarsInLog = 0;
                 };
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+                22ABDC4C1758FD0C00965593 /* Sources */ = {
+                        isa = PBXSourcesBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                                22ABDC5A1758FDD500965593 /* freelist.c in Sources */,
+                                22ABDC581758FD4F00965593 /* fbmtest.c in Sources */,
+                                22ABDC4E1758FD0C00965593 /* testlib.c in Sources */,
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                };
                 22FA176716E8D6FC0098B23F /* Sources */ = {
                         isa = PBXSourcesBuildPhase;
                         buildActionMask = 2147483647;
@@ -2625,15 +2665,6 @@
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
-                3114A648156E9596001E0AA3 /* Sources */ = {
-                        isa = PBXSourcesBuildPhase;
-                        buildActionMask = 2147483647;
-                        files = (
-                                3114A657156E95A6001E0AA3 /* cbstest.c in Sources */,
-                                3114A672156E95F6001E0AA3 /* testlib.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
                 3114A65E156E95D9001E0AA3 /* Sources */ = {
                         isa = PBXSourcesBuildPhase;
                         buildActionMask = 2147483647;
@@ -2814,6 +2845,16 @@
                         target = 2D604B9B16514B1A003AAF46 /* mpseventtxt */;
                         targetProxy = 2275798816C5422900B662B0 /* PBXContainerItemProxy */;
                 };
+                228A22211759004C00270ECF /* PBXTargetDependency */ = {
+                        isa = PBXTargetDependency;
+                        target = 22ABDC491758FD0C00965593 /* fbmtest */;
+                        targetProxy = 228A22201759004C00270ECF /* PBXContainerItemProxy */;
+                };
+                22ABDC4A1758FD0C00965593 /* PBXTargetDependency */ = {
+                        isa = PBXTargetDependency;
+                        target = 31EEABFA156AAF9D00714D05 /* mps */;
+                        targetProxy = 22ABDC4B1758FD0C00965593 /* PBXContainerItemProxy */;
+                };
                 22CDE92E16E9EB9300366D0A /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
                         target = 3104AFF1156D37A0000A585A /* all */;
@@ -3004,11 +3045,6 @@
                         target = 31EEABFA156AAF9D00714D05 /* mps */;
                         targetProxy = 3114A658156E95B1001E0AA3 /* PBXContainerItemProxy */;
                 };
-                3114A65B156E95B4001E0AA3 /* PBXTargetDependency */ = {
-                        isa = PBXTargetDependency;
-                        target = 3114A64B156E9596001E0AA3 /* cbstest */;
-                        targetProxy = 3114A65A156E95B4001E0AA3 /* PBXContainerItemProxy */;
-                };
                 3114A675156E9619001E0AA3 /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
                         target = 31EEABFA156AAF9D00714D05 /* mps */;
@@ -3142,6 +3178,33 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+                22ABDC531758FD0C00965593 /* Debug */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+                                GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+                                PRODUCT_NAME = fbmtest;
+                        };
+                        name = Debug;
+                };
+                22ABDC541758FD0C00965593 /* Release */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                GCC_GENERATE_TEST_COVERAGE_FILES = NO;
+                                GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
+                                PRODUCT_NAME = fbmtest;
+                        };
+                        name = Release;
+                };
+                22ABDC551758FD0C00965593 /* WE */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                GCC_GENERATE_TEST_COVERAGE_FILES = NO;
+                                GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
+                                PRODUCT_NAME = fbmtest;
+                        };
+                        name = WE;
+                };
                 22CDE8F116E9E97E00366D0A /* Debug */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
@@ -4267,6 +4330,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+                22ABDC521758FD0C00965593 /* Build configuration list for PBXNativeTarget "fbmtest" */ = {
+                        isa = XCConfigurationList;
+                        buildConfigurations = (
+                                22ABDC531758FD0C00965593 /* Debug */,
+                                22ABDC541758FD0C00965593 /* Release */,
+                                22ABDC551758FD0C00965593 /* WE */,
+                        );
+                        defaultConfigurationIsVisible = 0;
+                        defaultConfigurationName = Release;
+                };
                 22CDE8F016E9E97E00366D0A /* Build configuration list for PBXAggregateTarget "testrun" */ = {
                         isa = XCConfigurationList;
                         buildConfigurations = (
@@ -4457,16 +4530,6 @@
                         defaultConfigurationIsVisible = 0;
                         defaultConfigurationName = Release;
                 };
-                3114A653156E9596001E0AA3 /* Build configuration list for PBXNativeTarget "cbstest" */ = {
-                        isa = XCConfigurationList;
-                        buildConfigurations = (
-                                3114A654156E9596001E0AA3 /* Debug */,
-                                3114A655156E9596001E0AA3 /* Release */,
-                                3183880615DC30CC008E4EA0 /* WE */,
-                        );
-                        defaultConfigurationIsVisible = 0;
-                        defaultConfigurationName = Release;
-                };
                 3114A669156E95D9001E0AA3 /* Build configuration list for PBXNativeTarget "btcv" */ = {
                         isa = XCConfigurationList;
                         buildConfigurations = (
diff --git a/mps/code/range.c b/mps/code/range.c
index 4cd61d7b04d..b2d4494454e 100644
--- a/mps/code/range.c
+++ b/mps/code/range.c
@@ -52,8 +52,9 @@ Res RangeDescribe(Range range, mps_lib_FILE *stream)
 
   res = WriteF(stream,
                "Range $P\n{\n", (WriteFP)range,
-               "  base: $P \n", (WriteFP)RangeBase(range),
-               "  limit: $P \n", (WriteFP)RangeLimit(range),
+               "  base: $P\n", (WriteFP)RangeBase(range),
+               "  limit: $P\n", (WriteFP)RangeLimit(range),
+               "  size: $U\n", (WriteFU)RangeSize(range),
                "}\n", NULL);
   if (res != ResOK) {
     return res;