Merging changes from union to masters. this incorporates pekka's updates: tuning and a type in amcsshe.c and some adding some missing checks in arenavm.c. it also brings our cope of their hopenames up to date.

Copied from Perforce Change: 24815 ServerID: perforce.ravenbrook.com
author: Richard Brooksby 2001-12-05 15:48:24 +0000
committer: Richard Brooksby 2001-12-05 15:48:24 +0000
commit: 492dd3c684e53bd42b28371bdaaa99ad67ebd835 (patch)
tree: 59a2df0f685b93b44fbc03847b76782275308aaf /mps/code
parent: 25c78993edd7b4a607eba951b6ab2a9a51c55b62 (diff)
download: emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.tar.gz
emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.zip
213 files changed, 313 insertions, 303 deletions
diff --git a/mps/code/abq.c b/mps/code/abq.c
index 4e082213472..a0b18ff7f17 100644
--- a/mps/code/abq.c
+++ b/mps/code/abq.c
@@ -1,6 +1,6 @@
 /* impl.c.abq: AVAILABLE BLOCK QUEUE
 *
- * $HopeName: MMsrc!abq.c(trunk.4) $
+ * $HopeName: MMsrc!abq.c(trunk.5) $
 * Copyright (C) 1999.  Harlequin Limited.  All rights reserved.
 *
 * .readership: Any MPS developer
@@ -15,7 +15,7 @@
 #include "cbs.h"
 #include "mpm.h"
-SRCID(abq, "$HopeName: MMsrc!abq.c(trunk.4) $");
+SRCID(abq, "$HopeName: MMsrc!abq.c(trunk.5) $");
 /* Private prototypes */
diff --git a/mps/code/abq.h b/mps/code/abq.h
index 00fa5f69c7a..41ef5f68469 100644
--- a/mps/code/abq.h
+++ b/mps/code/abq.h
@@ -1,6 +1,6 @@
 /* impl.h.abq: ABQ INTERFACE
 *
- * $HopeName: MMsrc!abq.h(trunk.3) $
+ * $HopeName: MMsrc!abq.h(trunk.4) $
 * Copyright (C) 1998 Harlequin Group plc.  All rights reserved.
 *
 * .purpose: A FIFO queue substrate for impl.c.poolmv2
diff --git a/mps/code/abqtest.c b/mps/code/abqtest.c
index 85efaa76bf6..a2355699e4f 100644
--- a/mps/code/abqtest.c
+++ b/mps/code/abqtest.c
@@ -1,6 +1,6 @@
 /* impl.c.abqtest: AVAILABLE BLOCK QUEUE TEST
 *
- * $HopeName: MMsrc!abqtest.c(trunk.5) $
+ * $HopeName: MMsrc!abqtest.c(trunk.6) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
@@ -20,7 +20,7 @@ struct itimerspec; /* stop complaints from time.h */
 #include <math.h>
-SRCID(abqtest, "$HopeName: MMsrc!abqtest.c(trunk.5) $");
+SRCID(abqtest, "$HopeName: MMsrc!abqtest.c(trunk.6) $");
 static ABQStruct abq; /* the ABQ which we will use */
diff --git a/mps/code/action.c b/mps/code/action.c
index f7f8d79a7d6..209470a51fd 100644
--- a/mps/code/action.c
+++ b/mps/code/action.c
@@ -1,12 +1,12 @@
 /* impl.c.action: STRATEGIC ACTION
 *
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
- * $HopeName: MMsrc!action.c(trunk.6) $
+ * $HopeName: MMsrc!action.c(trunk.7) $
 */
 #include "mpm.h"
-SRCID(action, "$HopeName: MMsrc!action.c(trunk.6) $");
+SRCID(action, "$HopeName: MMsrc!action.c(trunk.7) $");
 /* All contents obsolete. */
diff --git a/mps/code/amcss.c b/mps/code/amcss.c
index 32278402d74..623c1d1f816 100644
--- a/mps/code/amcss.c
+++ b/mps/code/amcss.c
@@ -1,6 +1,6 @@
 /* impl.c.amcss: POOL CLASS AMC STRESS TEST
 *
- * $HopeName: MMsrc!amcss.c(trunk.36) $
+ * $HopeName: MMsrc!amcss.c(trunk.37) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/amcsshe.c b/mps/code/amcsshe.c
index 5c5c5edff0f..fa56379db1d 100644
--- a/mps/code/amcsshe.c
+++ b/mps/code/amcsshe.c
@@ -1,6 +1,6 @@
 /* impl.c.amcsshe: POOL CLASS AMC STRESS TEST WITH HEADER
 *
- * $HopeName: MMsrc!amcsshe.c(trunk.4) $
+ * $HopeName: MMsrc!amcsshe.c(trunk.6) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 */
@@ -18,7 +18,7 @@
 /* These values have been tuned to cause one top-generation collection. */
-#define testArenaSIZE     ((size_t)1000*1024)
+#define testArenaSIZE     ((size_t)1400*1024)
 #define avLEN             3
 #define exactRootsCOUNT   200
 #define ambigRootsCOUNT   50
@@ -31,7 +31,7 @@
 /* testChain -- generation parameters for the test */
 static mps_gen_param_s testChain[genCOUNT] = {
-  { 150, 0.85 }, { 170, 0.45 } };
+  { 210, 0.85 }, { 248, 0.45 } };
 /* objNULL needs to be odd so that it's ignored in exactRoots. */
@@ -252,8 +252,8 @@ static void *test(void *arg, size_t s)
      }
      /*  fill bogusRoots with variations of a real pointer */
      r = rnd() % exactRootsCOUNT;
-      if (exactRoots[i] != objNULL) {
+      if (exactRoots[r] != objNULL) {
-        char *p = (char*)exactRoots[i];
+        char *p = (char*)exactRoots[r];
        for(i = 0; i < bogusRootsCOUNT; ++i, ++p)
          bogusRoots[i] = (mps_addr_t)p;
diff --git a/mps/code/amcssth.c b/mps/code/amcssth.c
index 4d54f6f69cd..8a87827c554 100644
--- a/mps/code/amcssth.c
+++ b/mps/code/amcssth.c
@@ -1,6 +1,6 @@
 /* impl.c.amcssth: POOL CLASS AMC STRESS TEST WITH TWO THREADS
 *
- * $HopeName: MMsrc!amcssth.c(trunk.3) $
+ * $HopeName: MMsrc!amcssth.c(trunk.4) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .posix: This is Posix only.
diff --git a/mps/code/amsss.c b/mps/code/amsss.c
index 9a3f6ff7072..6a477c63f17 100644
--- a/mps/code/amsss.c
+++ b/mps/code/amsss.c
@@ -1,6 +1,6 @@
 /* impl.c.amsss: POOL CLASS AMS STRESS TEST
 *
- * $HopeName: MMsrc!amsss.c(trunk.11) $
+ * $HopeName: MMsrc!amsss.c(trunk.12) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .design: Adapted from amcss.c, but not counting collections, just
diff --git a/mps/code/apss.c b/mps/code/apss.c
index 44c5c3503d4..00ab49f8cce 100644
--- a/mps/code/apss.c
+++ b/mps/code/apss.c
@@ -1,6 +1,6 @@
 /* impl.c.apss: AP MANUAL ALLOC STRESS TEST
 *
- * $HopeName$
+ * $HopeName: MMsrc!apss.c(trunk.5) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/arena.c b/mps/code/arena.c
index 83c3ee600ff..fcd3b8856ed 100644
--- a/mps/code/arena.c
+++ b/mps/code/arena.c
@@ -1,6 +1,6 @@
 /* impl.c.arena: ARENA ALLOCATION FEATURES
 *
- * $HopeName: MMsrc!arena.c(trunk.79) $
+ * $HopeName: MMsrc!arena.c(trunk.80) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 * 
 * .sources: design.mps.arena is the main design document.  */
@@ -9,7 +9,7 @@
 #include "poolmv.h"
 #include "mpm.h"
-SRCID(arena, "$HopeName: MMsrc!arena.c(trunk.79) $");
+SRCID(arena, "$HopeName: MMsrc!arena.c(trunk.80) $");
 /* ArenaControlPool -- get the control pool */
diff --git a/mps/code/arenacl.c b/mps/code/arenacl.c
index aa5d82e08cf..f2170bdc46e 100644
--- a/mps/code/arenacl.c
+++ b/mps/code/arenacl.c
@@ -1,6 +1,6 @@
 /* impl.c.arenacl: ARENA CLASS USING CLIENT MEMORY
 *
- * $HopeName: MMsrc!arenacl.c(trunk.23) $
+ * $HopeName: MMsrc!arenacl.c(trunk.24) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 * 
 * .design: See design.mps.arena.client.
@@ -16,7 +16,7 @@
 #include "mpm.h"
 #include "mpsacl.h"
-SRCID(arenacl, "$HopeName: MMsrc!arenacl.c(trunk.23) $");
+SRCID(arenacl, "$HopeName: MMsrc!arenacl.c(trunk.24) $");
 /* ClientArenaStruct -- Client Arena Structure */
diff --git a/mps/code/arenacv.c b/mps/code/arenacv.c
index bda889eb858..b31978c2a16 100644
--- a/mps/code/arenacv.c
+++ b/mps/code/arenacv.c
@@ -1,6 +1,6 @@
 /* impl.c.arenacv: ARENA COVERAGE TEST
 *
- * $HopeName: MMsrc!arenacv.c(trunk.14) $
+ * $HopeName: MMsrc!arenacv.c(trunk.15) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .coverage: At the moment, we're only trying to cover the new code
diff --git a/mps/code/arenavm.c b/mps/code/arenavm.c
index 494afd48338..add082986f1 100644
--- a/mps/code/arenavm.c
+++ b/mps/code/arenavm.c
@@ -1,6 +1,6 @@
 /* impl.c.arenavm: VIRTUAL MEMORY ARENA CLASS
 *
- * $HopeName: MMsrc!arenavm.c(trunk.73) $
+ * $HopeName: MMsrc!arenavm.c(trunk.74) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 *
@@ -26,7 +26,7 @@
 #include "mpm.h"
 #include "mpsavm.h"
-SRCID(arenavm, "$HopeName: MMsrc!arenavm.c(trunk.73) $");
+SRCID(arenavm, "$HopeName: MMsrc!arenavm.c(trunk.74) $");
 /* @@@@ Arbitrary calculation for the maximum number of distinct */
diff --git a/mps/code/arenavmx.c b/mps/code/arenavmx.c
index 5a77e29850c..7e1c09ca759 100644
--- a/mps/code/arenavmx.c
+++ b/mps/code/arenavmx.c
@@ -1,6 +1,6 @@
 /* impl.c.arenavmx: STUBS FOR ARENAVM
 *
- * $HopeName: MMsrc!arenavmx.c(trunk.3) $
+ * $HopeName: MMsrc!arenavmx.c(trunk.4) $
 * Copyright (C) 1999 Harlequin Group plc.  All rights reserved.
 *
 * .purpose: This file is not properly part of the MPS.  It is a
@@ -16,7 +16,7 @@
 #include "mpm.h"
 #include "mpsavm.h"
-SRCID(arenavmx, "$HopeName: MMsrc!arenavmx.c(trunk.3) $");
+SRCID(arenavmx, "$HopeName: MMsrc!arenavmx.c(trunk.4) $");
 mps_arena_class_t mps_arena_class_vm(void)
diff --git a/mps/code/assert.c b/mps/code/assert.c
index 206112e5d30..998795f1fce 100644
--- a/mps/code/assert.c
+++ b/mps/code/assert.c
@@ -1,6 +1,6 @@
 /* impl.c.assert: ASSERTION IMPLEMENTATION
 *
- * $HopeName$
+ * $HopeName: MMsrc!assert.c(trunk.12) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * This source provides the AssertFail function which is
@@ -11,7 +11,7 @@
 #include "check.h"
 #include "mpm.h"
-SRCID(assert, "$HopeName: MMsrc!assert.c(trunk.11) $");
+SRCID(assert, "$HopeName: MMsrc!assert.c(trunk.12) $");
 /* CheckLevel -- Control check level 
diff --git a/mps/code/awlut.c b/mps/code/awlut.c
index 58827e9d6cc..84fb71ecd59 100644
--- a/mps/code/awlut.c
+++ b/mps/code/awlut.c
@@ -1,6 +1,6 @@
 /* impl.c.awlut: POOL CLASS AWL UNIT TEST
 *
- * $HopeName: MMsrc!awlut.c(trunk.17) $
+ * $HopeName: MMsrc!awlut.c(trunk.18) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
diff --git a/mps/code/awlutth.c b/mps/code/awlutth.c
index 8e317d6c0ae..4d52a3ffde7 100644
--- a/mps/code/awlutth.c
+++ b/mps/code/awlutth.c
@@ -1,6 +1,6 @@
 /* impl.c.awlutth: THREADING UNIT TEST USING POOL CLASS AWL
 *
- * $HopeName: MMsrc!awlutth.c(trunk.1) $
+ * $HopeName: MMsrc!awlutth.c(trunk.2) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
diff --git a/mps/code/boot.c b/mps/code/boot.c
index 7888c8e381e..d7f8d9daa88 100644
--- a/mps/code/boot.c
+++ b/mps/code/boot.c
@@ -1,6 +1,6 @@
 /* impl.c.boot: BOOTSTRAP ALLOCATOR
 *
- * $HopeName: MMsrc!boot.c(MMdevel_pekka_locus.2) $
+ * $HopeName: MMsrc!boot.c(trunk.2) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .overview: A structure and protocols for allocating memory from a
@@ -14,7 +14,7 @@
 #include "boot.h"
 #include "mpm.h"
-SRCID(boot, "$HopeName: MMsrc!boot.c(MMdevel_pekka_locus.2) $");
+SRCID(boot, "$HopeName: MMsrc!boot.c(trunk.2) $");
 #define BootBlockSig ((Sig)0x519B002B) /* SIGnature BOOT Block */
diff --git a/mps/code/boot.h b/mps/code/boot.h
index 04b1c80d0f0..c6d53eab5da 100644
--- a/mps/code/boot.h
+++ b/mps/code/boot.h
@@ -1,6 +1,6 @@
 /* impl.h.boot: BOOTSTRAP ALLOCATOR INTERFACE
 *
- * $HopeName: MMsrc!boot.h(MMdevel_pekka_locus.2) $
+ * $HopeName: MMsrc!boot.h(trunk.2) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .overview:  A protocol for allocating memory from a given block.
diff --git a/mps/code/bt.c b/mps/code/bt.c
index e1fd8bfb6c6..19e51ddc4d8 100644
--- a/mps/code/bt.c
+++ b/mps/code/bt.c
@@ -1,6 +1,6 @@
 /* impl.c.bt: BIT TABLES
 *
- * $HopeName: MMsrc!bt.c(trunk.24) $
+ * $HopeName: MMsrc!bt.c(trunk.25) $
 * Copyright (C) 1999.  Harlequin Limited.  All rights reserved.
 *
 * READERSHIP
@@ -15,7 +15,7 @@
 #include "mpm.h"
-SRCID(bt, "$HopeName: MMsrc!bt.c(trunk.24) $");
+SRCID(bt, "$HopeName: MMsrc!bt.c(trunk.25) $");
 /* BTIndexAlignUp, BTIndexAlignDown -- Align bit-table indices
diff --git a/mps/code/btcv.c b/mps/code/btcv.c
index b82b383d891..b2125568f61 100644
--- a/mps/code/btcv.c
+++ b/mps/code/btcv.c
@@ -1,6 +1,6 @@
 /* impl.c.btss: BIT TABLE COVERAGE TEST
 *
- * $HopeName: MMsrc!btcv.c(trunk.4) $
+ * $HopeName: MMsrc!btcv.c(trunk.5) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .readership: MPS developers
@@ -19,7 +19,7 @@
 #include <stdlib.h>
-SRCID(btcv, "$HopeName: MMsrc!btcv.c(trunk.4) $");
+SRCID(btcv, "$HopeName: MMsrc!btcv.c(trunk.5) $");
 /* bt*Symmetric -- Symmetric operations on bit tables
diff --git a/mps/code/bttest.c b/mps/code/bttest.c
index 26c19b716d4..74e31b57039 100644
--- a/mps/code/bttest.c
+++ b/mps/code/bttest.c
@@ -1,6 +1,6 @@
 /* impl.c.bttest: BIT TABLE TEST
 *
- * $HopeName: MMsrc!bttest.c(trunk.4) $
+ * $HopeName: MMsrc!bttest.c(trunk.5) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
@@ -19,7 +19,7 @@ struct itimerspec; /* stop complaints from time.h */
 #include <time.h>
-SRCID(bttest, "$HopeName: MMsrc!bttest.c(trunk.4) $");
+SRCID(bttest, "$HopeName: MMsrc!bttest.c(trunk.5) $");
 static BT bt; /* the BT which we will use */
diff --git a/mps/code/buffer.c b/mps/code/buffer.c
index 22b4cda9485..d2f1d621af5 100644
--- a/mps/code/buffer.c
+++ b/mps/code/buffer.c
@@ -1,6 +1,6 @@
 /* impl.c.buffer: ALLOCATION BUFFER IMPLEMENTATION
 *
- * $HopeName: MMsrc!buffer.c(trunk.63) $
+ * $HopeName: MMsrc!buffer.c(trunk.64) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This is (part of) the implementation of allocation buffers.
@@ -26,7 +26,7 @@
 #include "mpm.h"
-SRCID(buffer, "$HopeName: MMsrc!buffer.c(trunk.63) $");
+SRCID(buffer, "$HopeName: MMsrc!buffer.c(trunk.64) $");
 /* forward declarations */
diff --git a/mps/code/cbs.c b/mps/code/cbs.c
index 7b4e2e06ad4..21562f5ef83 100644
--- a/mps/code/cbs.c
+++ b/mps/code/cbs.c
@@ -1,6 +1,6 @@
 /* impl.c.cbs: COALESCING BLOCK STRUCTURE IMPLEMENTATION
 *
- * $HopeName: MMsrc!cbs.c(trunk.20) $
+ * $HopeName: MMsrc!cbs.c(trunk.21) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .intro: This is a portable implementation of coalescing block
@@ -19,7 +19,7 @@
 #include "mpm.h"
-SRCID(cbs, "$HopeName: MMsrc!cbs.c(trunk.20) $");
+SRCID(cbs, "$HopeName: MMsrc!cbs.c(trunk.21) $");
 /* See design.mps.cbs.align */
diff --git a/mps/code/cbs.h b/mps/code/cbs.h
index 951bad89287..f5fbf683ca6 100644
--- a/mps/code/cbs.h
+++ b/mps/code/cbs.h
@@ -1,6 +1,6 @@
 /* impl.h.cbs: CBS -- Coalescing Block Structure
 *
- * $HopeName: MMsrc!cbs.h(trunk.3) $
+ * $HopeName: MMsrc!cbs.h(trunk.4) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .source: design.mps.cbs.
diff --git a/mps/code/cbstest.c b/mps/code/cbstest.c
index 20ca4a0f08c..06f80366e79 100644
--- a/mps/code/cbstest.c
+++ b/mps/code/cbstest.c
@@ -1,6 +1,6 @@
 /*  impl.c.cbstest: COALESCING BLOCK STRUCTURE TEST
 *
- *  $HopeName: MMsrc!cbstest.c(trunk.10) $
+ *  $HopeName: MMsrc!cbstest.c(trunk.11) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 */
@@ -18,7 +18,7 @@ struct itimerspec; /* stop complaints from time.h */
 #endif
 #include <time.h>
-SRCID(cbstest, "$HopeName: MMsrc!cbstest.c(trunk.10) $");
+SRCID(cbstest, "$HopeName: MMsrc!cbstest.c(trunk.11) $");
 #define ArraySize ((Size)123456)
diff --git a/mps/code/chain.h b/mps/code/chain.h
index ed1d2077b1a..3dfec4bfd08 100644
--- a/mps/code/chain.h
+++ b/mps/code/chain.h
@@ -1,6 +1,6 @@
 /* impl.h.chain: GENERATION CHAINS
 *
- * $HopeName: MMsrc!chain.h(trunk.1) $
+ * $HopeName: MMsrc!chain.h(trunk.2) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/check.h b/mps/code/check.h
index 0b789816a36..c848ee63019 100644
--- a/mps/code/check.h
+++ b/mps/code/check.h
@@ -1,6 +1,6 @@
 /* impl.h.check: ASSERTION INTERFACE
 *
- * $HopeName: MMsrc!check.h(trunk.17) $
+ * $HopeName: MMsrc!check.h(trunk.18) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .aver: This header defines a family of AVER and NOTREACHED macros.
diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 4699cd2756e..d0cae9faad9 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.comm: COMMON GNUMAKEFILE FRAGMENT
 #
-# $HopeName: MMsrc!comm.gmk(trunk.70) $
+# $HopeName: MMsrc!comm.gmk(trunk.71) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # DESCRIPTION
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 8f42d5a5101..5ea6c23ae25 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -1,6 +1,6 @@
 # impl.nmk.commpost: SECOND COMMON FRAGMENT FOR PLATFORMS USING MV AND NMAKE
 #
-# $HopeName: MMsrc!commpost.nmk(trunk.44) $
+# $HopeName: MMsrc!commpost.nmk(trunk.45) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # DESCRIPTION
diff --git a/mps/code/commpre.nmk b/mps/code/commpre.nmk
index 9bff42463eb..47cb75a436b 100644
--- a/mps/code/commpre.nmk
+++ b/mps/code/commpre.nmk
@@ -1,6 +1,6 @@
 # impl.nmk.commpre: FIRST COMMON FRAGMENT FOR PLATFORMS USING MV AND NMAKE
 #
-# $HopeName: MMsrc!commpre.nmk(trunk.19) $
+# $HopeName: MMsrc!commpre.nmk(trunk.20) $
 # Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 #
 # DESCRIPTION
diff --git a/mps/code/config.h b/mps/code/config.h
index 300f84d8a24..2813fd91158 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -1,6 +1,6 @@
 /* impl.h.config: MPS CONFIGURATION
 *
- * $HopeName: MMsrc!config.h(trunk.46) $
+ * $HopeName: MMsrc!config.h(trunk.47) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * PURPOSE
diff --git a/mps/code/cx.gmk b/mps/code/cx.gmk
index 42ded6ab2ac..3333c64afc5 100644
--- a/mps/code/cx.gmk
+++ b/mps/code/cx.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sc: GNUMAKEFILE FRAGMENT FOR CXREF
 #
-# $HopeName: MMsrc!cx.gmk(trunk.3) $
+# $HopeName: MMsrc!cx.gmk(trunk.4) $
 #
 # This file is included by platform makefiles that generate a c
 # cross-reference using the cxref tool.
diff --git a/mps/code/dbgpool.c b/mps/code/dbgpool.c
index 5d1b463a255..c2ff497a012 100644
--- a/mps/code/dbgpool.c
+++ b/mps/code/dbgpool.c
@@ -1,6 +1,6 @@
 /* impl.c.dbgpool: POOL DEBUG MIXIN
 *
- * $HopeName: MMsrc!dbgpool.c(trunk.13) $
+ * $HopeName: MMsrc!dbgpool.c(trunk.14) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .source: design.mps.object-debug
@@ -14,7 +14,7 @@
 #include "mps.h"
 #include <stdarg.h>
-SRCID(dbgpool, "$HopeName$");
+SRCID(dbgpool, "$HopeName: MMsrc!dbgpool.c(trunk.14) $");
 /* tagStruct -- tags for storing info about allocated objects */
diff --git a/mps/code/dbgpool.h b/mps/code/dbgpool.h
index b3bfb1c488d..5d5f3d45ad4 100644
--- a/mps/code/dbgpool.h
+++ b/mps/code/dbgpool.h
@@ -1,6 +1,6 @@
 /* impl.h.dbgpool: POOL DEBUG MIXIN
 *
- * $HopeName: MMsrc!dbgpool.h(trunk.3) $
+ * $HopeName: MMsrc!dbgpool.h(trunk.4) $
 * Copyright (C) 1998 Harlequin Group plc.  All rights reserved.
 */
diff --git a/mps/code/dc.gmk b/mps/code/dc.gmk
index 426f6d1b191..500e3ca7e9f 100644
--- a/mps/code/dc.gmk
+++ b/mps/code/dc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.dc: GNUMAKEFILE FRAGMENT FOR DIGITAL C COMPILER (DEC UNIX/OSF)
 #
-# $HopeName: MMsrc!dc.gmk(trunk.2) $
+# $HopeName: MMsrc!dc.gmk(trunk.3) $
 # Copyright(C) 1997, 1998 Harlequin Group, all rights reserved
 #
 # See design.buildsys.unix
diff --git a/mps/code/dumper.c b/mps/code/dumper.c
index 72b283c6108..0df6cd1985b 100644
--- a/mps/code/dumper.c
+++ b/mps/code/dumper.c
@@ -1,6 +1,6 @@
 /* impl.c.dumper: Simple Event Dumper
 *
- * $HopeName: MMsrc!dumper.c(trunk.4) $
+ * $HopeName: MMsrc!dumper.c(trunk.5) $
 * Copyright (C) 1997 Harlequin Group plc.  All rights reserved.
 *
 * .readership: MM developers.
diff --git a/mps/code/eg.gmk b/mps/code/eg.gmk
index 23d64ee8fc8..f3b84c531d9 100644
--- a/mps/code/eg.gmk
+++ b/mps/code/eg.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.eg: GNUMAKEFILE FRAGMENT FOR EGCS
 #
-# $HopeName$
+# $HopeName: MMsrc!eg.gmk(trunk.1) $
 # Copyright (C) 1996, 1997, 1998 Harlequin Group, all rights reserved
 #
 # This file is included by platform makefiles that use the EGCS
diff --git a/mps/code/event.c b/mps/code/event.c
index e5527c3f8f1..27a8aefb32f 100644
--- a/mps/code/event.c
+++ b/mps/code/event.c
@@ -1,6 +1,6 @@
 /* impl.c.event: EVENT LOGGING
 *
- * $HopeName: MMsrc!event.c(trunk.13) $
+ * $HopeName: MMsrc!event.c(trunk.14) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .sources: mps.design.event
@@ -25,7 +25,7 @@
 #include "event.h"
 #include "mpsio.h"
-SRCID(event, "$HopeName: MMsrc!event.c(trunk.13) $");
+SRCID(event, "$HopeName: MMsrc!event.c(trunk.14) $");
 #ifdef EVENT /* .trans.ifdef */
diff --git a/mps/code/event.h b/mps/code/event.h
index 21ed2db9a96..ef5ea2897ae 100644
--- a/mps/code/event.h
+++ b/mps/code/event.h
@@ -1,7 +1,7 @@
 /* impl.h.event -- Event Logging Interface
 *
 * Copyright (C) 1997. Harlequin Group plc. All rights reserved.
- * $HopeName: MMsrc!event.h(trunk.14) $
+ * $HopeName: MMsrc!event.h(trunk.15) $
 *
 * READERSHIP
 *
diff --git a/mps/code/eventcnv.c b/mps/code/eventcnv.c
index fd17d442702..7e669b8e2d3 100644
--- a/mps/code/eventcnv.c
+++ b/mps/code/eventcnv.c
@@ -1,7 +1,7 @@
 /* impl.c.eventcnv: Simple event log converter
 * Copyright (C) 1999 Harlequin Group plc.  All rights reserved.
 *
- * $HopeName: MMsrc!eventcnv.c(trunk.3) $
+ * $HopeName: MMsrc!eventcnv.c(trunk.4) $
 */
 #include "config.h"
diff --git a/mps/code/eventcom.h b/mps/code/eventcom.h
index 044473c1041..8e126ec8572 100644
--- a/mps/code/eventcom.h
+++ b/mps/code/eventcom.h
@@ -1,7 +1,7 @@
 /* impl.h.eventcom -- Event Logging Common Definitions
 *
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
- * $HopeName: MMsrc!eventcom.h(trunk.20) $
+ * $HopeName: MMsrc!eventcom.h(trunk.21) $
 *
 * .sources: mps.design.telemetry
 */
diff --git a/mps/code/eventdef.h b/mps/code/eventdef.h
index cd181a15274..624c2a2dbd8 100644
--- a/mps/code/eventdef.h
+++ b/mps/code/eventdef.h
@@ -1,6 +1,6 @@
 /* impl.h.eventdef -- Event Logging Definitions
 *
- * $HopeName: MMsrc!eventdef.h(trunk.24) $
+ * $HopeName: MMsrc!eventdef.h(trunk.25) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .source: design.mps.telemetry
diff --git a/mps/code/eventgen.h b/mps/code/eventgen.h
index d6c39d41683..dea2892e0f6 100644
--- a/mps/code/eventgen.h
+++ b/mps/code/eventgen.h
@@ -1,6 +1,6 @@
 /* impl.h.eventgen -- Automatic event header
 *
- * $HopeName$
+ * $HopeName: MMsrc!eventgen.h(trunk.21) $
 *
 * DO NOT EDIT THIS FILE!
 * This file was generated by MMsrc!eventgen.pl(trunk.11) $
diff --git a/mps/code/eventgen.pl b/mps/code/eventgen.pl
index d7ccd267981..4e49dd79382 100644
--- a/mps/code/eventgen.pl
+++ b/mps/code/eventgen.pl
@@ -1,7 +1,7 @@
 #!/usr/local/bin/perl -w
 # impl.pl.eventgen: GENERATOR FOR impl.h.eventgen
 #
-# $HopeName: MMsrc!eventgen.pl(trunk.12) $
+# $HopeName: MMsrc!eventgen.pl(trunk.13) $
 # Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 #
 # .how: Invoke this script in the src directory.  It works by scanning
@@ -11,7 +11,7 @@
 # You will need to have eventgen.h claimed, and you should
 # remember to check it in afterwards.
-$HopeName = '$HopeName: MMsrc!eventgen.pl(trunk.12) $';
+$HopeName = '$HopeName: MMsrc!eventgen.pl(trunk.13) $';
 %Formats = ();
diff --git a/mps/code/eventpro.c b/mps/code/eventpro.c
index dae0aecf1c9..0a96dede09d 100644
--- a/mps/code/eventpro.c
+++ b/mps/code/eventpro.c
@@ -1,7 +1,7 @@
 /* impl.c.eventpro: Event processing routines
 * Copyright (C) 1999 Harlequin Group plc.  All rights reserved.
 *
- * $HopeName: MMsrc!eventpro.c(trunk.3) $
+ * $HopeName: MMsrc!eventpro.c(trunk.4) $
 */
 #include "config.h"
diff --git a/mps/code/eventpro.h b/mps/code/eventpro.h
index 993b673fd7c..302076c9e7c 100644
--- a/mps/code/eventpro.h
+++ b/mps/code/eventpro.h
@@ -1,7 +1,7 @@
 /* impl.h.eventpro: Interface for event processing routines
 * Copyright (C) 1999 Harlequin Group plc.  All rights reserved.
 *
- * $HopeName: MMsrc!eventpro.h(trunk.3) $
+ * $HopeName: MMsrc!eventpro.h(trunk.4) $
 */
 #ifndef eventpro_h
diff --git a/mps/code/eventrep.c b/mps/code/eventrep.c
index 0d2738e5f45..2d565c70c60 100644
--- a/mps/code/eventrep.c
+++ b/mps/code/eventrep.c
@@ -1,7 +1,7 @@
 /* impl.c.eventrep: Allocation replayer routines
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
- * $HopeName: MMsrc!eventrep.c(trunk.2) $
+ * $HopeName: MMsrc!eventrep.c(trunk.3) $
 */
 #include "config.h"
diff --git a/mps/code/eventrep.h b/mps/code/eventrep.h
index 33787b5a16f..fd4f86b59fd 100644
--- a/mps/code/eventrep.h
+++ b/mps/code/eventrep.h
@@ -1,7 +1,7 @@
 /* impl.h.eventrep: Allocation replayer interface
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
- * $HopeName: MMsrc!eventrep.h(MMdevel_alloc_replay.1) $
+ * $HopeName: MMsrc!eventrep.h(trunk.2) $
 */
 #ifndef eventrep_h
diff --git a/mps/code/finalcv.c b/mps/code/finalcv.c
index 55df9d93beb..2d2972757b9 100644
--- a/mps/code/finalcv.c
+++ b/mps/code/finalcv.c
@@ -1,6 +1,6 @@
 /* impl.c.finalcv: FINALIZATION COVERAGE TEST
 *
- * $HopeName: MMsrc!finalcv.c(trunk.12) $
+ * $HopeName: MMsrc!finalcv.c(trunk.13) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
diff --git a/mps/code/fmtdy.c b/mps/code/fmtdy.c
index da45dbc11e5..8bc505421e1 100644
--- a/mps/code/fmtdy.c
+++ b/mps/code/fmtdy.c
@@ -1,6 +1,6 @@
 /* impl.c.fmtdy: DYLAN OBJECT FORMAT IMPLEMENTATION
 *
- *  $HopeName: MMsrc!fmtdy.c(trunk.19) $
+ *  $HopeName: MMsrc!fmtdy.c(trunk.20) $
 *  Copyright (C) 1996,1997 Harlequin Group, all rights reserved.
 *
 * .readership: MPS developers, Dylan developers
diff --git a/mps/code/fmtdy.h b/mps/code/fmtdy.h
index 10d26cbb5ef..8178a0d4342 100644
--- a/mps/code/fmtdy.h
+++ b/mps/code/fmtdy.h
@@ -1,6 +1,6 @@
 /* impl.h.fmtdy: DYLAN OBJECT FORMAT
 *
- * $HopeName: MMsrc!fmtdy.h(trunk.6) $
+ * $HopeName: MMsrc!fmtdy.h(trunk.7) $
 * Copyright (C) 1997 Harlequin Group, all rights reserved
 */
diff --git a/mps/code/fmtdytst.c b/mps/code/fmtdytst.c
index c39ee3ce8b3..ca5da986212 100644
--- a/mps/code/fmtdytst.c
+++ b/mps/code/fmtdytst.c
@@ -1,6 +1,6 @@
 /* impl.c.fmtdytst: DYLAN FORMAT TEST CODE
 *
- * $HopeName: MMsrc!fmtdytst.c(trunk.5) $
+ * $HopeName: MMsrc!fmtdytst.c(trunk.6) $
 * Copyright (C) 1998 Harlequin Group.  All rights reserved.
 *
 * .readership: MPS developers, Dylan developers.
diff --git a/mps/code/fmthe.c b/mps/code/fmthe.c
index 3455b30cc80..f43dfc3f752 100644
--- a/mps/code/fmthe.c
+++ b/mps/code/fmthe.c
@@ -1,6 +1,6 @@
 /* impl.c.fmthe: DYLAN-LIKE OBJECT FORMAT WITH HEADERS
 *
- * $HopeName: MMsrc!fmthe.c(trunk.1) $
+ * $HopeName: MMsrc!fmthe.c(trunk.2) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .source: This was derived from impl.c.fmtdy -- it's probably a good idea to
diff --git a/mps/code/fmthe.h b/mps/code/fmthe.h
index 174ab24c5a8..38bd9c08e9a 100644
--- a/mps/code/fmthe.h
+++ b/mps/code/fmthe.h
@@ -1,6 +1,6 @@
 /* impl.h.fmthe: DYLAN-LIKE OBJECT FORMAT WITH HEADERS
 *
- * $HopeName$
+ * $HopeName: MMsrc!fmthe.h(trunk.1) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/format.c b/mps/code/format.c
index c5403e15c5e..73a3d722806 100644
--- a/mps/code/format.c
+++ b/mps/code/format.c
@@ -1,6 +1,6 @@
 /* impl.c.format: OBJECT FORMATS
 *
- * $HopeName: MMsrc!format.c(trunk.20) $
+ * $HopeName: MMsrc!format.c(trunk.21) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -10,7 +10,7 @@
 #include "mpm.h"
-SRCID(format, "$HopeName: MMsrc!format.c(trunk.20) $");
+SRCID(format, "$HopeName: MMsrc!format.c(trunk.21) $");
 /* FormatCheck -- check a format */
diff --git a/mps/code/gathconf.bat b/mps/code/gathconf.bat
index 3f544dbdd19..ead02ffcba5 100644
--- a/mps/code/gathconf.bat
+++ b/mps/code/gathconf.bat
@@ -1,6 +1,6 @@
 @rem impl.bat.gathconf: GATHERING A RELEASE FOR CONFIGURA
 @rem
-@rem $HopeName: MMsrc!gathconf.bat(trunk.1) $
+@rem $HopeName: MMsrc!gathconf.bat(trunk.2) $
 @rem Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 mkdir release
diff --git a/mps/code/gc.gmk b/mps/code/gc.gmk
index a28c127b778..da1d3c7c35e 100644
--- a/mps/code/gc.gmk
+++ b/mps/code/gc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.gc: GNUMAKEFILE FRAGMENT FOR GNU CC
 #
-# $HopeName: MMsrc!gc.gmk(trunk.25) $
+# $HopeName: MMsrc!gc.gmk(trunk.26) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # This file is included by platform makefiles that use the GNU CC
diff --git a/mps/code/global.c b/mps/code/global.c
index 88dd8299a07..9ec3acbde8b 100644
--- a/mps/code/global.c
+++ b/mps/code/global.c
@@ -1,6 +1,6 @@
 /* impl.c.global: ARENA-GLOBAL INTERFACES
 *
- * $HopeName: MMsrc!global.c(trunk.12) $
+ * $HopeName: MMsrc!global.c(trunk.13) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .sources: See design.mps.arena.  design.mps.thread-safety is relevant
@@ -27,7 +27,7 @@
 #include "mpm.h"
-SRCID(global, "$HopeName: MMsrc!global.c(trunk.12) $");
+SRCID(global, "$HopeName: MMsrc!global.c(trunk.13) $");
 /* All static data objects are declared here. See .static */
diff --git a/mps/code/gp.gmk b/mps/code/gp.gmk
index aa3a3062e13..b0752f1e2be 100644
--- a/mps/code/gp.gmk
+++ b/mps/code/gp.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.gp: GNUMAKEFILE FRAGMENT FOR GNU CC/GPROF
 #
-# $HopeName$
+# $HopeName: MMsrc!gp.gmk(trunk.1) $
 # Copyright (C) 1998 Harlequin Group plc, all rights reserved
 #
 # This file is included by platform makefiles that use the GNU CC
diff --git a/mps/code/hqbuild/tools/hqbuild b/mps/code/hqbuild/tools/hqbuild
index cd6d69787fe..56e598b83a9 100644
--- a/mps/code/hqbuild/tools/hqbuild
+++ b/mps/code/hqbuild/tools/hqbuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # impl.sh.hqbuild
 #
-# $HopeName: MMsrc!tools:swbuild(trunk.1) $
+# $HopeName: MMsrc!hqbuild:tools:hqbuild(trunk.1) $
 # Copyright (C) 1996 Harlequin Group, all rights reserved
 #
 # Build script for SWIG autobuild system.
diff --git a/mps/code/hqbuild/tools/hqbuild.bat b/mps/code/hqbuild/tools/hqbuild.bat
index 6badae142d9..f9519b2479a 100644
--- a/mps/code/hqbuild/tools/hqbuild.bat
+++ b/mps/code/hqbuild/tools/hqbuild.bat
@@ -1,5 +1,5 @@
 @REM impl.bat.hqbuild: setup for SWIG autobuild system
-@REM $HopeName: MMsrc!hqbuild:tools:hqbuild.bat(trunk.5) $
+@REM $HopeName: MMsrc!hqbuild:tools:hqbuild.bat(trunk.6) $
 @REM Copyright (C) 1996-1998 Harlequin Group plc.  All rights reserved.
 @REM Called by SWIG autobuild system
 @
diff --git a/mps/code/i6cc.gmk b/mps/code/i6cc.gmk
index 6101975b4a9..afd31067e54 100644
--- a/mps/code/i6cc.gmk
+++ b/mps/code/i6cc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.ic: GNUMAKEFILE FRAGMENT FOR IRIX 6 CC (N32 or N64 ABI)
 #
-# $HopeName$
+# $HopeName: MMsrc!i6cc.gmk(trunk.5) $
 # Copyright (C) 1997, 1998 Harlequin Group plc.  All rights reserved.
 #
 # This file is included by platform makefiles that use the IRIX 6 CC
diff --git a/mps/code/iam4cc.gmk b/mps/code/iam4cc.gmk
index 51c6de546d4..1bb8b6ed9db 100644
--- a/mps/code/iam4cc.gmk
+++ b/mps/code/iam4cc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.iam4cc: BUILD FOR IRIX 6 N32/MIPS IV/CC PLATFORM
 #
-# $HopeName: MMsrc!iam4cc.gmk(trunk.9) $
+# $HopeName: MMsrc!iam4cc.gmk(trunk.10) $
 # Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 #
 # This is the GNU makefile for platform.iam4cc.
diff --git a/mps/code/ic.gmk b/mps/code/ic.gmk
index b376e017561..be68060ced8 100644
--- a/mps/code/ic.gmk
+++ b/mps/code/ic.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.ic: GNUMAKEFILE FRAGMENT FOR IRIX CC (IRIX 4 OR 5)
 #
-# $HopeName: MMsrc!ic.gmk(trunk.3) $
+# $HopeName: MMsrc!ic.gmk(trunk.4) $
 # Copyright (C) 1996, 1998 Harlequin Group, all rights reserved
 #
 # This file is included by platform makefiles that use the IRIX CC
diff --git a/mps/code/idlench.awk b/mps/code/idlench.awk
index cafeaaedb8f..ebc827e053a 100644
--- a/mps/code/idlench.awk
+++ b/mps/code/idlench.awk
@@ -1,6 +1,6 @@
 #!/bin/nawk -f
 # impl.awk.idlench: IDENTIFIER LENGTH CHECK
-# $HopeName$
+# $HopeName: MMsrc!idlench.awk(trunk.2) $
 # Copyright (C) 1998.  Harlequin Group plc.  All rights reserved.
 #
 # READERSHIP
diff --git a/mps/code/lc.gmk b/mps/code/lc.gmk
index 8741a825fcd..2d53bf01fe2 100644
--- a/mps/code/lc.gmk
+++ b/mps/code/lc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.lc: GNUMAKEFILE FRAGMENT FOR LCC
 #
-# $HopeName: MMsrc!lc.gmk(trunk.3) $
+# $HopeName: MMsrc!lc.gmk(trunk.4) $
 # Copyright (C) 1996,1997, 1998 Harlequin Group, all rights reserved
 #
 # This file is included by platform makefiles that use the LCC
diff --git a/mps/code/ld.c b/mps/code/ld.c
index 518786f4b21..21960f1ee34 100644
--- a/mps/code/ld.c
+++ b/mps/code/ld.c
@@ -1,6 +1,6 @@
 /* impl.c.ld: LOCATION DEPENDENCY IMPLEMENTATION
 *
- * $HopeName: MMsrc!ld.c(trunk.8) $
+ * $HopeName: MMsrc!ld.c(trunk.9) $
 * Copyright (C) 1996 Harlequin Limited.  All rights reserved.
 *
 * .def: A location dependency records the fact that the bit-patterns
@@ -48,7 +48,7 @@
 #include "mpm.h"
-SRCID(ld, "$HopeName: MMsrc!ld.c(trunk.8) $");
+SRCID(ld, "$HopeName: MMsrc!ld.c(trunk.9) $");
 /* LDReset -- reset a dependency to empty
diff --git a/mps/code/lii3eg.gmk b/mps/code/lii3eg.gmk
index 44143e262f1..7205cf3fd3e 100644
--- a/mps/code/lii3eg.gmk
+++ b/mps/code/lii3eg.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.lii3eg: BUILD FOR LINUX/INTEL/EGCS PLATFORM
 #
-# $HopeName: MMsrc!lii3eg.gmk(trunk.3) $
+# $HopeName: MMsrc!lii3eg.gmk(trunk.4) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # This is the GNU makefile for platform.lii3eg.
diff --git a/mps/code/lii4gc.gmk b/mps/code/lii4gc.gmk
index 2523ddc7f78..2eff2aaaffa 100644
--- a/mps/code/lii4gc.gmk
+++ b/mps/code/lii4gc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.lii4gc: BUILD FOR LINUX/INTEL/GCC PLATFORM
 #
-# $HopeName: MMsrc!lii4gc.gmk(trunk.5) $
+# $HopeName: MMsrc!lii4gc.gmk(trunk.6) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 PFM = lii4gc
diff --git a/mps/code/lippgc.gmk b/mps/code/lippgc.gmk
index 565e11ea0c0..81c0a5b290f 100644
--- a/mps/code/lippgc.gmk
+++ b/mps/code/lippgc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.lippgc: BUILD FOR LINUX/POWER(32)/GCC PLATFORM
 #
-# $HopeName: MMsrc!lippgc.gmk(trunk.5) $
+# $HopeName: MMsrc!lippgc.gmk(trunk.6) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # This is the GNU makefile for platform.lippgc.
diff --git a/mps/code/lo.h b/mps/code/lo.h
index 3d61fe9e23a..16119dbc0fc 100644
--- a/mps/code/lo.h
+++ b/mps/code/lo.h
@@ -2,7 +2,7 @@
 *
 *                   LEAF OBJECT POOL CLASS
 *
- *  $HopeName: MMsrc!lo.h(MMdevel_restr2.2) $
+ *  $HopeName: MMsrc!lo.h(trunk.3) $
 *
 *  Copyright (C) 1996 Harlequin Group, all rights reserved
 *
diff --git a/mps/code/lock.h b/mps/code/lock.h
index 5fb97ef238b..c43fe513d9a 100644
--- a/mps/code/lock.h
+++ b/mps/code/lock.h
@@ -1,6 +1,6 @@
 /* impl.h.lock: RECURSIVE LOCKS
 *
- * $HopeName: MMsrc!lock.h(trunk.5) $
+ * $HopeName: MMsrc!lock.h(trunk.6) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .description: [@@@@ Should be combined with design.mps.lock]
diff --git a/mps/code/lockan.c b/mps/code/lockan.c
index 358b0ffc5ec..a7ea5b011e8 100644
--- a/mps/code/lockan.c
+++ b/mps/code/lockan.c
@@ -1,6 +1,6 @@
 /* impl.c.lockan: ANSI RECURSIVE LOCKS
 *
- * $HopeName: MMsrc!lockan.c(trunk.9) $
+ * $HopeName: MMsrc!lockan.c(trunk.10) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This is a trivial implementation of recursive locks
@@ -14,7 +14,7 @@
 #include "lock.h"
 #include "mpmtypes.h"
-SRCID(lockan, "$HopeName: MMsrc!lockan.c(trunk.9) $");
+SRCID(lockan, "$HopeName: MMsrc!lockan.c(trunk.10) $");
 typedef struct LockStruct {     /* ANSI fake lock structure */
diff --git a/mps/code/lockcov.c b/mps/code/lockcov.c
index 1c3f64ae509..2139789336d 100644
--- a/mps/code/lockcov.c
+++ b/mps/code/lockcov.c
@@ -1,6 +1,6 @@
 /* impl.c.lockcov: LOCK COVERAGE TEST
 *
- * $HopeName: MMsrc!lockcov.c(trunk.4) $
+ * $HopeName: MMsrc!lockcov.c(trunk.5) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/lockli.c b/mps/code/lockli.c
index 97e242d1d6a..22629e781a4 100644
--- a/mps/code/lockli.c
+++ b/mps/code/lockli.c
@@ -1,6 +1,6 @@
 /* impl.c.lockli: RECURSIVE LOCKS FOR POSIX SYSTEMS
 *
- * $HopeName$
+ * $HopeName: MMsrc!lockli.c(trunk.2) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .linux: This implementation currently just supports LinuxThreads 
@@ -36,7 +36,7 @@
 #error "lockli.c is specific to LinuxThreads but MPS_OS_LI not defined"
 #endif
-SRCID(lockli, "$HopeName$");
+SRCID(lockli, "$HopeName: MMsrc!lockli.c(trunk.2) $");
 /* LockAttrSetRecursive -- Set mutexattr to permit recursive locking
diff --git a/mps/code/lockutw3.c b/mps/code/lockutw3.c
index b1b56a443ca..d1800f50042 100644
--- a/mps/code/lockutw3.c
+++ b/mps/code/lockutw3.c
@@ -1,6 +1,6 @@
 /* impl.c.lockutw3: LOCK UTILIZATION TEST
 *
- * $HopeName$
+ * $HopeName: MMsrc!lockutw3.c(trunk.9) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/lockw3.c b/mps/code/lockw3.c
index cf22084ef58..f5b951f3391 100644
--- a/mps/code/lockw3.c
+++ b/mps/code/lockw3.c
@@ -1,6 +1,6 @@
 /* impl.c.lockw3: RECURSIVE LOCKS IN WIN32
 *
- * $HopeName: MMsrc!lockw3.c(trunk.11) $
+ * $HopeName: MMsrc!lockw3.c(trunk.12) $
 * Copyright (C) 1995, 1997, 1998 Harlequin Group plc.  All rights reserved.
 *
 * .design: These are implemented using critical sections.
@@ -29,7 +29,7 @@
 #include "mpswin.h"
-SRCID(lockw3, "$HopeName: MMsrc!lockw3.c(trunk.11) $");
+SRCID(lockw3, "$HopeName: MMsrc!lockw3.c(trunk.12) $");
 /* .lock.win32: Win32 lock structure; uses CRITICAL_SECTION */
diff --git a/mps/code/locus.c b/mps/code/locus.c
index 6e1714884b7..20a1108bd1d 100644
--- a/mps/code/locus.c
+++ b/mps/code/locus.c
@@ -1,6 +1,6 @@
 /* impl.c.locus: LOCUS MANAGER
 *
- * $HopeName: MMsrc!locus.c(trunk.4) $
+ * $HopeName: MMsrc!locus.c(trunk.5) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -16,7 +16,7 @@
 #include <float.h> /* for DBL_MAX */
-SRCID(locus, "$HopeName: MMsrc!locus.c(trunk.4) $");
+SRCID(locus, "$HopeName: MMsrc!locus.c(trunk.5) $");
 /* SegPrefCheck -- check the consistency of a segment preference */
diff --git a/mps/code/locv.c b/mps/code/locv.c
index b63b163ff03..3cc40ab5e90 100644
--- a/mps/code/locv.c
+++ b/mps/code/locv.c
@@ -1,6 +1,6 @@
 /* impl.c.locv: LEAF OBJECT POOL CLASS COVERAGE TEST
 *
- * $HopeName: MMsrc!locv.c(trunk.15) $
+ * $HopeName: MMsrc!locv.c(trunk.16) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * This is (not much of) a coverage test for the Leaf Object
diff --git a/mps/code/message.c b/mps/code/message.c
index f29af31d258..bda231702f1 100644
--- a/mps/code/message.c
+++ b/mps/code/message.c
@@ -1,6 +1,6 @@
 /* impl.c.message: MPS/CLIENT MESSAGES
 *
- * $HopeName: MMsrc!message.c(trunk.10) $
+ * $HopeName: MMsrc!message.c(trunk.11) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -16,7 +16,7 @@
 #include "mpm.h"
-SRCID(message, "$HopeName: MMsrc!message.c(trunk.10) $");
+SRCID(message, "$HopeName: MMsrc!message.c(trunk.11) $");
 /* Maps from a Ring pointer to the message */
diff --git a/mps/code/messtest.c b/mps/code/messtest.c
index d5ab23ea8e5..b9b1c72e047 100644
--- a/mps/code/messtest.c
+++ b/mps/code/messtest.c
@@ -1,6 +1,6 @@
 /* impl.c.messtest: MESSAGE TEST
 *
- * $HopeName: MMsrc!messtest.c(trunk.2) $
+ * $HopeName: MMsrc!messtest.c(trunk.3) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 */
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
-SRCID(messtest, "$HopeName: MMsrc!messtest.c(trunk.2) $");
+SRCID(messtest, "$HopeName: MMsrc!messtest.c(trunk.3) $");
 /* Basic infrastructure for creating dummy messages */
diff --git a/mps/code/meter.c b/mps/code/meter.c
index fc3b36d7bbd..79e24b4a278 100644
--- a/mps/code/meter.c
+++ b/mps/code/meter.c
@@ -1,6 +1,6 @@
 /* impl.c.meter: METERS
 *
- * $HopeName: MMsrc!meter.c(trunk.9) $
+ * $HopeName: MMsrc!meter.c(trunk.10) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * TRANSGRESSIONS
@@ -13,7 +13,7 @@
 #include "meter.h"
 #include "mpm.h"
-SRCID(meter, "$HopeName$");
+SRCID(meter, "$HopeName: MMsrc!meter.c(trunk.10) $");
 /* MeterInit -- initialize a meter */
diff --git a/mps/code/meter.h b/mps/code/meter.h
index 02ad6811f4f..0271e4ab5fc 100644
--- a/mps/code/meter.h
+++ b/mps/code/meter.h
@@ -1,6 +1,6 @@
 /* impl.h.meter: METER INTERFACE
 *
- * $HopeName: MMsrc!meter.h(trunk.5) $
+ * $HopeName: MMsrc!meter.h(trunk.7) $
 * Copyright (C) 1998, 1999 Harlequin Group plc.  All rights reserved.
 *
 * .sources: mps.design.metrics.
diff --git a/mps/code/misc.h b/mps/code/misc.h
index 333f2214389..621f46e8033 100644
--- a/mps/code/misc.h
+++ b/mps/code/misc.h
@@ -1,6 +1,6 @@
 /* impl.h.misc: MISCELLANEOUS DEFINITIONS
 *
- * $HopeName: MMsrc!misc.h(trunk.26) $
+ * $HopeName: MMsrc!misc.h(trunk.27) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * Small general things which are useful for C but aren't part of the
diff --git a/mps/code/mpm.c b/mps/code/mpm.c
index 8f60f074882..e569857f870 100644
--- a/mps/code/mpm.c
+++ b/mps/code/mpm.c
@@ -1,6 +1,6 @@
 /* impl.c.mpm: GENERAL MPM SUPPORT
 *
- * $HopeName: MMsrc!mpm.c(trunk.34) $
+ * $HopeName: MMsrc!mpm.c(trunk.35) $
 * Copyright (C) 1996 Harlequin Limited.  All rights reserved.
 *
 * .purpose: Miscellaneous support for the implementation of the MPM
@@ -15,7 +15,7 @@
 #include <limits.h>
-SRCID(mpm, "$HopeName: MMsrc!mpm.c(trunk.34) $");
+SRCID(mpm, "$HopeName: MMsrc!mpm.c(trunk.35) $");
 /* MPMCheck -- test MPM assumptions */
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index a810d6b0b40..5b78acdda8c 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -1,6 +1,6 @@
 /* impl.h.mpm: MEMORY POOL MANAGER DEFINITIONS
 *
- * $HopeName: MMsrc!mpm.h(trunk.147) $
+ * $HopeName: MMsrc!mpm.h(trunk.148) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .trans.bufferinit: The Buffer data structure has an Init field and
diff --git a/mps/code/mpmss.c b/mps/code/mpmss.c
index 638d30de920..46409c07447 100644
--- a/mps/code/mpmss.c
+++ b/mps/code/mpmss.c
@@ -1,6 +1,6 @@
 /* impl.c.mpmss: MPM STRESS TEST
 *
- * $HopeName: MMsrc!mpmss.c(trunk.23) $
+ * $HopeName: MMsrc!mpmss.c(trunk.24) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpmst.h b/mps/code/mpmst.h
index 2ca29ec5dbb..361464f72f8 100644
--- a/mps/code/mpmst.h
+++ b/mps/code/mpmst.h
@@ -1,6 +1,6 @@
 /* impl.h.mpmst: MEMORY POOL MANAGER DATA STRUCTURES
 *
- * $HopeName: MMsrc!mpmst.h(trunk.98) $
+ * $HopeName: MMsrc!mpmst.h(trunk.99) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .design: This header file crosses module boundaries.  The relevant
diff --git a/mps/code/mpmtypes.h b/mps/code/mpmtypes.h
index abf12d6b7b0..584faf9dab5 100644
--- a/mps/code/mpmtypes.h
+++ b/mps/code/mpmtypes.h
@@ -1,6 +1,6 @@
 /* impl.h.mpmtypes: MEMORY POOL MANAGER TYPES
 *
- * $HopeName: MMsrc!mpmtypes.h(trunk.89) $
+ * $HopeName: MMsrc!mpmtypes.h(trunk.90) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .design: design.mps.type
diff --git a/mps/code/mps.h b/mps/code/mps.h
index 5af0608b240..263e21c3fe7 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -1,6 +1,6 @@
 /* impl.h.mps: HARLEQUIN MEMORY POOL SYSTEM C INTERFACE
 *
- * $HopeName: MMsrc!mps.h(trunk.63) $
+ * $HopeName: MMsrc!mps.h(trunk.64) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .readership: customers, MPS developers.
diff --git a/mps/code/mpsacl.h b/mps/code/mpsacl.h
index e881b3e97c7..5010ad6062c 100644
--- a/mps/code/mpsacl.h
+++ b/mps/code/mpsacl.h
@@ -1,6 +1,6 @@
 /* impl.h.mpsacl: MEMORY POOL SYSTEM ARENA CLASS "CL"
 *
- * $HopeName: MMsrc!mpsacl.h(trunk.2) $
+ * $HopeName: MMsrc!mpsacl.h(trunk.3) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpsavm.h b/mps/code/mpsavm.h
index e37329206a9..02e2af251b2 100644
--- a/mps/code/mpsavm.h
+++ b/mps/code/mpsavm.h
@@ -1,6 +1,6 @@
 /* impl.h.mpsavm: MEMORY POOL SYSTEM ARENA CLASS "VM"
 *
- * $HopeName: MMsrc!mpsavm.h(trunk.3) $
+ * $HopeName: MMsrc!mpsavm.h(trunk.4) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpscamc.h b/mps/code/mpscamc.h
index 8e49b0df1e4..785ccae98b8 100644
--- a/mps/code/mpscamc.h
+++ b/mps/code/mpscamc.h
@@ -1,6 +1,6 @@
 /* impl.h.mpscamc: MEMORY POOL SYSTEM CLASS "AMC"
 *
- * $HopeName: MMsrc!mpscamc.h(trunk.4) $
+ * $HopeName: MMsrc!mpscamc.h(trunk.5) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpscams.h b/mps/code/mpscams.h
index 9e629858bd8..f6f8ecedc51 100644
--- a/mps/code/mpscams.h
+++ b/mps/code/mpscams.h
@@ -1,6 +1,6 @@
 /* impl.h.mpscams: MEMORY POOL SYSTEM CLASS "AMS"
 *
- * $HopeName: MMsrc!mpscams.h(trunk.2) $
+ * $HopeName: MMsrc!mpscams.h(trunk.3) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpscawl.h b/mps/code/mpscawl.h
index 5b6b928dde0..660d81f34fd 100644
--- a/mps/code/mpscawl.h
+++ b/mps/code/mpscawl.h
@@ -1,6 +1,6 @@
 /* impl.h.mpscaawl: MEMORY POOL SYSTEM CLASS "AWL"
 *
- * $HopeName: MMsrc!mpscawl.h(trunk.1) $
+ * $HopeName: MMsrc!mpscawl.h(trunk.2) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpsclo.h b/mps/code/mpsclo.h
index 047e3e0b02c..ced61b1e2e3 100644
--- a/mps/code/mpsclo.h
+++ b/mps/code/mpsclo.h
@@ -1,6 +1,6 @@
 /* impl.h.mpsclo: MEMORY POOL SYSTEM CLASS "LO"
 *
- * $HopeName: MMsrc!mpsclo.h(trunk.1) $
+ * $HopeName: MMsrc!mpsclo.h(trunk.2) $
 *
 * Copyright (C) 1996 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpscmv.h b/mps/code/mpscmv.h
index 60c533dccd0..2b4873d5e79 100644
--- a/mps/code/mpscmv.h
+++ b/mps/code/mpscmv.h
@@ -1,6 +1,6 @@
 /* impl.h.mpscmv: MEMORY POOL SYSTEM CLASS "MV"
 *
- * $HopeName: MMsrc!mpscmv.h(trunk.3) $
+ * $HopeName: MMsrc!mpscmv.h(trunk.4) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpscmv2.h b/mps/code/mpscmv2.h
index 25d05d0b89e..6dbe5a1596a 100644
--- a/mps/code/mpscmv2.h
+++ b/mps/code/mpscmv2.h
@@ -1,6 +1,6 @@
 /* impl.h.mpscmv2: MEMORY POOL SYSTEM CLASS "MVT"
 *
- * $HopeName: MMsrc!mpscmv2.h(trunk.2) $
+ * $HopeName: MMsrc!mpscmv2.h(trunk.3) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpscmvff.h b/mps/code/mpscmvff.h
index ebd1b833076..886cbc1d3e1 100644
--- a/mps/code/mpscmvff.h
+++ b/mps/code/mpscmvff.h
@@ -1,6 +1,6 @@
 /* impl.h.mpscmvff: MEMORY POOL SYSTEM CLASS "MVFF"
 *
- * $HopeName: MMsrc!mpscmvff.h(trunk.3) $
+ * $HopeName: MMsrc!mpscmvff.h(trunk.4) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpscsnc.h b/mps/code/mpscsnc.h
index 75fbf06e7d7..1a349bb85b9 100644
--- a/mps/code/mpscsnc.h
+++ b/mps/code/mpscsnc.h
@@ -1,6 +1,6 @@
 /* impl.h.mpscsnc: MEMORY POOL SYSTEM CLASS "SNC"
 *
- * $HopeName: MMsrc!mpscsnc.h(trunk.1) $
+ * $HopeName: MMsrc!mpscsnc.h(trunk.2) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index cff889c8872..6bc5a6caec4 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -1,6 +1,6 @@
 /* impl.c.mpsi: MEMORY POOL SYSTEM C INTERFACE LAYER
 *
- * $HopeName: MMsrc!mpsi.c(trunk.78) $
+ * $HopeName: MMsrc!mpsi.c(trunk.79) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This code bridges between the MPS interface to C,
@@ -52,7 +52,7 @@
 #include "sac.h"
 #include "chain.h"
-SRCID(mpsi, "$HopeName: MMsrc!mpsi.c(trunk.78) $");
+SRCID(mpsi, "$HopeName: MMsrc!mpsi.c(trunk.79) $");
 /* mpsi_check -- check consistency of interface mappings
diff --git a/mps/code/mpsicv.c b/mps/code/mpsicv.c
index 2880e3c8380..bfb3ef06b7c 100644
--- a/mps/code/mpsicv.c
+++ b/mps/code/mpsicv.c
@@ -1,6 +1,6 @@
 /* impl.c.mpsicv: MPSI COVERAGE TEST
 *
- * $HopeName: MMsrc!mpsicv.c(trunk.19) $
+ * $HopeName: MMsrc!mpsicv.c(trunk.20) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/mpsio.h b/mps/code/mpsio.h
index 3eae6ecaa86..d80dca6ec0e 100644
--- a/mps/code/mpsio.h
+++ b/mps/code/mpsio.h
@@ -1,6 +1,6 @@
 /* impl.h.mpsio: HARLEQUIN MEMORY POOL SYSTEM I/O INTERFACE
 *
- * $HopeName: MMsrc!mpsio.h(trunk.2) $
+ * $HopeName: MMsrc!mpsio.h(trunk.3) $
 * Copyright (C) 1996 Harlequin Limited.  All rights reserved.
 *
 * .readership: For MPS client application developers, MPS developers.
diff --git a/mps/code/mpsioan.c b/mps/code/mpsioan.c
index 556adbe5adb..20d74642d32 100644
--- a/mps/code/mpsioan.c
+++ b/mps/code/mpsioan.c
@@ -1,6 +1,6 @@
 /* impl.c.mpsioan: HARLEQUIN MEMORY POOL SYSTEM I/O IMPLEMENTATION (ANSI)
 *
- * $HopeName: MMsrc!mpsioan.c(trunk.4) $
+ * $HopeName: MMsrc!mpsioan.c(trunk.5) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .readership: For MPS client application developers and MPS developers.
diff --git a/mps/code/mpsiw3.c b/mps/code/mpsiw3.c
index 2d8fcfd8023..e8d3e198ed0 100644
--- a/mps/code/mpsiw3.c
+++ b/mps/code/mpsiw3.c
@@ -2,7 +2,7 @@
 *
 *       WIN32 MEMORY POOL SYSTEM INTERFACE LAYER EXTRAS
 *
- *  $HopeName: MMsrc!mpsiw3.c(trunk.3) $
+ *  $HopeName: MMsrc!mpsiw3.c(trunk.4) $
 *
 *  Copyright (C) 1996, 1997 Harlequin Group, all rights reserved
 */
@@ -12,7 +12,7 @@
 #include "mpswin.h"
-SRCID(mpsint, "$HopeName: MMsrc!mpsiw3.c(trunk.3) $");
+SRCID(mpsint, "$HopeName: MMsrc!mpsiw3.c(trunk.4) $");
 /* This is defined in protnt.c */
 extern LONG ProtSEHfilter(LPEXCEPTION_POINTERS info);
diff --git a/mps/code/mpslib.h b/mps/code/mpslib.h
index b9570e977a8..567f213af44 100644
--- a/mps/code/mpslib.h
+++ b/mps/code/mpslib.h
@@ -1,6 +1,6 @@
 /* impl.h.mpslib: HARLEQUIN MEMORY POOL SYSTEM LIBRARY INTERFACE
 *
- * $HopeName: MMsrc!mpslib.h(trunk.8) $
+ * $HopeName: MMsrc!mpslib.h(trunk.9) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .readership: MPS client application developers, MPS developers.
diff --git a/mps/code/mpsliban.c b/mps/code/mpsliban.c
index 39ad626b93f..f530afcbec7 100644
--- a/mps/code/mpsliban.c
+++ b/mps/code/mpsliban.c
@@ -1,6 +1,6 @@
 /* impl.c.mpsliban: HARLEQUIN MEMORY POOL SYSTEM LIBRARY INTERFACE (ANSI)
 *
- * $HopeName: MMsrc!mpsliban.c(trunk.11) $
+ * $HopeName: MMsrc!mpsliban.c(trunk.12) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: The purpose of this code is
diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index 766e0da1980..fd653d40a73 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -1,6 +1,6 @@
 /* impl.h.mpstd: HARLEQUIN MEMORY POOL SYSTEM TARGET DETECTION
 *
- * $HopeName: MMsrc!mpstd.h(trunk.27) $
+ * $HopeName: MMsrc!mpstd.h(trunk.28) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * Detect the target platform using predefined preprocessor symbols
diff --git a/mps/code/mpsw3.h b/mps/code/mpsw3.h
index 73d39adb763..c90fdf5881e 100644
--- a/mps/code/mpsw3.h
+++ b/mps/code/mpsw3.h
@@ -1,6 +1,6 @@
 /* impl.h.mpsw3: HARLEQUIN MEMORY POOL SYSTEM C INTERFACE, WINDOWS PART
 *
- * $HopeName: MMsrc!mpsw3.h(trunk.2) $
+ * $HopeName: MMsrc!mpsw3.h(trunk.3) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .readership: customers, MPS developers.
diff --git a/mps/code/mpswin.h b/mps/code/mpswin.h
index b2beded87bd..70cecefde57 100644
--- a/mps/code/mpswin.h
+++ b/mps/code/mpswin.h
@@ -1,6 +1,6 @@
 /* impl.h.mpswin: HARLEQUIN MEMORY POOL SYSTEM WINDOWS.H INTERFACE
 *
- * $HopeName: MMsrc!mpswin.h(trunk.3) $
+ * $HopeName: MMsrc!mpswin.h(trunk.4) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 *
 * .readership: For MPS client application developers, MPS developers.
diff --git a/mps/code/mv2test.c b/mps/code/mv2test.c
index 26df55ef8aa..8105f5ea03d 100644
--- a/mps/code/mv2test.c
+++ b/mps/code/mv2test.c
@@ -1,6 +1,6 @@
 /* impl.c.mv2test: POOLMVT STRESS TEST
 *
- * $HopeName: MMsrc!mv2test.c(trunk.5) $
+ * $HopeName: MMsrc!mv2test.c(trunk.6) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/o1alcc.gmk b/mps/code/o1alcc.gmk
index dfd8fe76592..c82c80a5086 100644
--- a/mps/code/o1alcc.gmk
+++ b/mps/code/o1alcc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.o1alcc: BUILD FOR OSF/1, ALPHA, DIGITAL C PLATFORM
 #
-# $HopeName: MMsrc!o1alcc.gmk(trunk.16) $
+# $HopeName: MMsrc!o1alcc.gmk(trunk.17) $
 # Copyright (C) 2000.  Harlequin Ltd.  All rights reserved.
 #
 # This is the GNU makefile for platform.o1alcc.
diff --git a/mps/code/o1algc.gmk b/mps/code/o1algc.gmk
index 8b507f185f7..8dbf1d436fd 100644
--- a/mps/code/o1algc.gmk
+++ b/mps/code/o1algc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.o1algc: BUILD FOR OSF/1, ALPHA, GCC PLATFORM
 #
-# $HopeName: MMsrc!o1algc.gmk(trunk.23) $
+# $HopeName: MMsrc!o1algc.gmk(trunk.24) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # _ANSI_C_SOURCE is defined in PFMDEFS to avoid bug in library headers
diff --git a/mps/code/ossu.h b/mps/code/ossu.h
index 09ad7f02fa2..58d65ac27ff 100644
--- a/mps/code/ossu.h
+++ b/mps/code/ossu.h
@@ -1,6 +1,6 @@
 /* impl.h.ossu: SUNOS ANSI COMPATABILITY HEADER
 *
- *  $HopeName: MMsrc!ossu.h(trunk.10) $
+ *  $HopeName: MMsrc!ossu.h(trunk.11) $
 *
 *  Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 *
diff --git a/mps/code/osxc.h b/mps/code/osxc.h
index 61f14cc3c44..987e8fa6537 100644
--- a/mps/code/osxc.h
+++ b/mps/code/osxc.h
@@ -1,6 +1,6 @@
 /* impl.h.osxc: MacOS X (Carbon-compatible) system header hacks
 *
- * $HopeName: MMsrc!osxc.h(MM_epcore_brisling.1) $
+ * $HopeName: MMsrc!osxc.h(trunk.2) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This header fixes bugs in the system headers.
diff --git a/mps/code/pool.c b/mps/code/pool.c
index b02f41f638b..2cd8f1bc0f3 100644
--- a/mps/code/pool.c
+++ b/mps/code/pool.c
@@ -1,6 +1,6 @@
 /* impl.c.pool: POOL IMPLEMENTATION
 *
- * $HopeName: MMsrc!pool.c(trunk.75) $
+ * $HopeName: MMsrc!pool.c(trunk.76) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -31,7 +31,7 @@
 #include "mpm.h"
-SRCID(pool, "$HopeName: MMsrc!pool.c(trunk.75) $");
+SRCID(pool, "$HopeName: MMsrc!pool.c(trunk.76) $");
 /* PoolClassCheck -- check a pool class */
diff --git a/mps/code/poolabs.c b/mps/code/poolabs.c
index 0f530a1b68c..a51d3ce2d57 100644
--- a/mps/code/poolabs.c
+++ b/mps/code/poolabs.c
@@ -1,6 +1,6 @@
 /* impl.c.poolabs: ABSTRACT POOL CLASSES
 *
- * $HopeName: MMsrc!poolabs.c(trunk.8) $
+ * $HopeName: MMsrc!poolabs.c(trunk.9) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * PURPOSE
@@ -26,7 +26,7 @@
 #include "mpm.h"
-SRCID(poolabs, "$HopeName: MMsrc!poolabs.c(trunk.8) $");
+SRCID(poolabs, "$HopeName: MMsrc!poolabs.c(trunk.9) $");
 typedef PoolClassStruct AbstractPoolClassStruct;
diff --git a/mps/code/poolamc.c b/mps/code/poolamc.c
index 519e5831bc2..e7d709e4b53 100644
--- a/mps/code/poolamc.c
+++ b/mps/code/poolamc.c
@@ -1,6 +1,6 @@
 /* impl.c.poolamc: AUTOMATIC MOSTLY-COPYING MEMORY POOL CLASS
 *
- * $HopeName: MMsrc!poolamc.c(trunk.55) $
+ * $HopeName: MMsrc!poolamc.c(trunk.56) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .sources: design.mps.poolamc.
@@ -10,7 +10,7 @@
 #include "chain.h"
 #include "mpm.h"
-SRCID(poolamc, "$HopeName: MMsrc!poolamc.c(trunk.55) $");
+SRCID(poolamc, "$HopeName: MMsrc!poolamc.c(trunk.56) $");
 /* PType enumeration -- distinguishes AMCGen and AMCNailboard */
diff --git a/mps/code/poolams.c b/mps/code/poolams.c
index 45828b47a8b..aeae380f6e7 100644
--- a/mps/code/poolams.c
+++ b/mps/code/poolams.c
@@ -1,6 +1,6 @@
 /* impl.c.poolams: AUTOMATIC MARK & SWEEP POOL CLASS
 *
- * $HopeName: MMsrc!poolams.c(trunk.51) $
+ * $HopeName: MMsrc!poolams.c(trunk.52) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 * 
 * .design: See design.mps.poolams.
@@ -18,7 +18,7 @@
 #include "mpm.h"
 #include <stdarg.h>
-SRCID(poolams, "$HopeName: MMsrc!poolams.c(trunk.51) $");
+SRCID(poolams, "$HopeName: MMsrc!poolams.c(trunk.52) $");
 #define AMSSig          ((Sig)0x519A3599) /* SIGnature AMS */
diff --git a/mps/code/poolams.h b/mps/code/poolams.h
index 405d5dd6b95..4f4030cbaf0 100644
--- a/mps/code/poolams.h
+++ b/mps/code/poolams.h
@@ -1,6 +1,6 @@
 /* impl.h.poolams: AUTOMATIC MARK & SWEEP POOL CLASS INTERFACE
 *
- * $HopeName: MMsrc!poolams.h(trunk.16) $
+ * $HopeName: MMsrc!poolams.h(trunk.17) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .purpose: Internal interface to AMS functionality.
diff --git a/mps/code/poolawl.c b/mps/code/poolawl.c
index 9e755c4185e..baf65facfba 100644
--- a/mps/code/poolawl.c
+++ b/mps/code/poolawl.c
@@ -1,6 +1,6 @@
 /* impl.c.poolawl: AUTOMATIC WEAK LINKED POOL CLASS
 *
- * $HopeName: MMsrc!poolawl.c(trunk.72) $
+ * $HopeName: MMsrc!poolawl.c(trunk.73) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 *
@@ -44,7 +44,7 @@
 #include "chain.h"
-SRCID(poolawl, "$HopeName: MMsrc!poolawl.c(trunk.72) $");
+SRCID(poolawl, "$HopeName: MMsrc!poolawl.c(trunk.73) $");
 #define AWLSig ((Sig)0x519B7A37) /* SIGnature PooL AWL */
diff --git a/mps/code/poollo.c b/mps/code/poollo.c
index cbd04f19fd2..609c557aad6 100644
--- a/mps/code/poollo.c
+++ b/mps/code/poollo.c
@@ -1,6 +1,6 @@
 /* impl.c.poollo: LEAF POOL CLASS
 *
- * $HopeName: MMsrc!poollo.c(trunk.19) $
+ * $HopeName: MMsrc!poollo.c(trunk.20) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -12,7 +12,7 @@
 #include "mpm.h"
 #include "mps.h"
-SRCID(poollo, "$HopeName: MMsrc!poollo.c(trunk.19) $");
+SRCID(poollo, "$HopeName: MMsrc!poollo.c(trunk.20) $");
 #define LOGen ((Serial)1)
diff --git a/mps/code/poolmfs.c b/mps/code/poolmfs.c
index b3094bb3873..b30dbfdd46a 100644
--- a/mps/code/poolmfs.c
+++ b/mps/code/poolmfs.c
@@ -1,6 +1,6 @@
 /* impl.c.poolmfs: MANUAL FIXED SMALL UNIT POOL
 *
- * $HopeName: MMsrc!poolmfs.c(trunk.34) $
+ * $HopeName: MMsrc!poolmfs.c(trunk.35) $
 * Copyright (C) 1999.  Harlequin Limited.  All rights reserved.
 *
 * This is the implementation of the MFS pool class.
@@ -35,7 +35,7 @@
 #include "poolmfs.h"
 #include "mpm.h"
-SRCID(poolmfs, "$HopeName: MMsrc!poolmfs.c(trunk.34) $");
+SRCID(poolmfs, "$HopeName: MMsrc!poolmfs.c(trunk.35) $");
 /* ROUND -- Round up
diff --git a/mps/code/poolmfs.h b/mps/code/poolmfs.h
index df83ac5aca3..ca9cbdd4b34 100644
--- a/mps/code/poolmfs.h
+++ b/mps/code/poolmfs.h
@@ -2,7 +2,7 @@
 *
 *                    MANUAL FIXED SMALL UNIT POOL
 *
- *  $HopeName: MMsrc!poolmfs.h(MMdevel_restr2.2) $
+ *  $HopeName: MMsrc!poolmfs.h(trunk.5) $
 *
 *  Copyright (C) 1994,1995 Harlequin Group, all rights reserved
 *
diff --git a/mps/code/poolmrg.c b/mps/code/poolmrg.c
index e352aa5cc06..d0f39510f23 100644
--- a/mps/code/poolmrg.c
+++ b/mps/code/poolmrg.c
@@ -1,6 +1,6 @@
 /* impl.c.poolmrg: MANUAL RANK GUARDIAN POOL
 * 
- * $HopeName: MMsrc!poolmrg.c(trunk.41) $
+ * $HopeName: MMsrc!poolmrg.c(trunk.42) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 * 
 * DESIGN
@@ -29,7 +29,7 @@
 #include "mpm.h"
 #include "poolmrg.h"
-SRCID(poolmrg, "$HopeName: MMsrc!poolmrg.c(trunk.41) $");
+SRCID(poolmrg, "$HopeName: MMsrc!poolmrg.c(trunk.42) $");
 /* Types */
diff --git a/mps/code/poolmrg.h b/mps/code/poolmrg.h
index 00125c66bfb..0f0960bb9ba 100644
--- a/mps/code/poolmrg.h
+++ b/mps/code/poolmrg.h
@@ -2,7 +2,7 @@
 *
 *               MANUAL RANK GUARDIAN POOL CLASS
 *
- *  $HopeName: MMsrc!poolmrg.h(trunk.1) $
+ *  $HopeName: MMsrc!poolmrg.h(trunk.2) $
 *  Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 */
diff --git a/mps/code/poolmv.c b/mps/code/poolmv.c
index f8676339e45..7372f672d33 100644
--- a/mps/code/poolmv.c
+++ b/mps/code/poolmv.c
@@ -1,6 +1,6 @@
 /* impl.c.poolmv: MANUAL VARIABLE POOL
 *
- * $HopeName: MMsrc!poolmv.c(trunk.40) $
+ * $HopeName: MMsrc!poolmv.c(trunk.41) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * **** RESTRICTION: This pool may not allocate from the arena control
@@ -30,7 +30,7 @@
 #include "poolmfs.h"
 #include "mpm.h"
-SRCID(poolmv, "$HopeName: MMsrc!poolmv.c(trunk.40) $");
+SRCID(poolmv, "$HopeName: MMsrc!poolmv.c(trunk.41) $");
 #define mvBlockPool(mv) MFSPool(&(mv)->blockPoolStruct)
diff --git a/mps/code/poolmv.h b/mps/code/poolmv.h
index 0863d57746c..df11ad21a80 100644
--- a/mps/code/poolmv.h
+++ b/mps/code/poolmv.h
@@ -1,6 +1,6 @@
 /* .impl.h.poolmv: MANUAL VARIABLE POOL
 *
- * $HopeName: MMsrc!poolmv.h(trunk.6) $
+ * $HopeName: MMsrc!poolmv.h(trunk.7) $
 * Copyright (C) 1995 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This is the interface to the manual-variable pool class.
diff --git a/mps/code/poolmv2.c b/mps/code/poolmv2.c
index 5078735a236..e83c2d456ad 100644
--- a/mps/code/poolmv2.c
+++ b/mps/code/poolmv2.c
@@ -1,6 +1,6 @@
 /* impl.c.poolmv2: MANUAL VARIABLE-SIZED TEMPORAL POOL
 *
- * $HopeName: MMsrc!poolmv2.c(trunk.18) $
+ * $HopeName: MMsrc!poolmv2.c(trunk.19) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .purpose: A manual-variable pool designed to take advantage of
@@ -16,7 +16,7 @@
 #include "cbs.h"
 #include "meter.h"
-SRCID(poolmv2, "$HopeName: MMsrc!poolmv2.c(trunk.18) $");
+SRCID(poolmv2, "$HopeName: MMsrc!poolmv2.c(trunk.19) $");
 /* Signatures */
diff --git a/mps/code/poolmv2.h b/mps/code/poolmv2.h
index 94161595be0..88dc988c02a 100644
--- a/mps/code/poolmv2.h
+++ b/mps/code/poolmv2.h
@@ -1,6 +1,6 @@
 /*  impl.h.poolmv2: MANUAL VARIABLE-SIZED TEMPORAL POOL
 *
- * $HopeName: MMsrc!poolmv2.h(trunk.2) $
+ * $HopeName: MMsrc!poolmv2.h(trunk.3) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 * 
 * .purpose: The implementation of the new manual-variable pool class
diff --git a/mps/code/poolmvff.c b/mps/code/poolmvff.c
index f6abab4f853..bfbd4da5c4e 100644
--- a/mps/code/poolmvff.c
+++ b/mps/code/poolmvff.c
@@ -1,6 +1,6 @@
 /* impl.c.poolmvff: First Fit Manual Variable Pool
 * 
- * $HopeName: MMsrc!poolmvff.c(trunk.21) $
+ * $HopeName: MMsrc!poolmvff.c(trunk.22) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This is a pool class for manually managed objects of
@@ -22,7 +22,7 @@
 #include "cbs.h"
 #include "mpm.h"
-SRCID(poolmvff, "$HopeName: MMsrc!poolmvff.c(trunk.21) $");
+SRCID(poolmvff, "$HopeName: MMsrc!poolmvff.c(trunk.22) $");
 /* Would go in poolmvff.h if the class had any MPS-internal clients. */
diff --git a/mps/code/pooln.c b/mps/code/pooln.c
index 2f03007cf6e..76ba61f0df1 100644
--- a/mps/code/pooln.c
+++ b/mps/code/pooln.c
@@ -1,13 +1,13 @@
 /* impl.c.pooln: NULL POOL CLASS
 *
- * $HopeName: MMsrc!pooln.c(trunk.27) $
+ * $HopeName: MMsrc!pooln.c(trunk.28) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 */
 #include "pooln.h"
 #include "mpm.h"
-SRCID(pooln, "$HopeName: MMsrc!pooln.c(trunk.27) $");
+SRCID(pooln, "$HopeName: MMsrc!pooln.c(trunk.28) $");
 /* PoolNStruct -- the pool structure */
diff --git a/mps/code/pooln.h b/mps/code/pooln.h
index 1251ae38087..0683ef91009 100644
--- a/mps/code/pooln.h
+++ b/mps/code/pooln.h
@@ -1,6 +1,6 @@
 /* impl.h.pooln: NULL POOL
 *
- * $HopeName$
+ * $HopeName: MMsrc!pooln.h(trunk.4) $
 * Copyright (C) 1995 Harlequin Limited.  All rights reserved.
 *
 * .purpose: The null pool class is here for pedagogical purposes.  It
diff --git a/mps/code/poolncv.c b/mps/code/poolncv.c
index 2d905adcf6b..29b7524fcc6 100644
--- a/mps/code/poolncv.c
+++ b/mps/code/poolncv.c
@@ -1,6 +1,6 @@
 /*  impl.c.poolncv: NULL POOL COVERAGE TEST
 *
- *  $HopeName: MMsrc!poolncv.c(trunk.8) $
+ *  $HopeName: MMsrc!poolncv.c(trunk.9) $
 *  Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/poolsnc.c b/mps/code/poolsnc.c
index 022bc8df6f7..e9b777562ff 100644
--- a/mps/code/poolsnc.c
+++ b/mps/code/poolsnc.c
@@ -1,6 +1,6 @@
 /* impl.c.poolsnc: STACK NO CHECKING POOL CLASS
 *
- * $HopeName: MMsrc!poolsnc.c(trunk.12) $
+ * $HopeName: MMsrc!poolsnc.c(trunk.13) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -22,7 +22,7 @@
 #include "mpm.h"
-SRCID(poolsnc, "$HopeName: MMsrc!poolsnc.c(trunk.12) $");
+SRCID(poolsnc, "$HopeName: MMsrc!poolsnc.c(trunk.13) $");
 #define SNCGen  ((Serial)1) /* "generation" for SNC pools */
diff --git a/mps/code/prmcan.c b/mps/code/prmcan.c
index b5571aff386..b641a21335a 100644
--- a/mps/code/prmcan.c
+++ b/mps/code/prmcan.c
@@ -1,6 +1,6 @@
 /* impl.c.prmcan: PROTECTION MUTATOR CONTEXT (ANSI)
 *
- * $HopeName: MMsrc!prmcan.c(trunk.1) $
+ * $HopeName: MMsrc!prmcan.c(trunk.2) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .design: See design.mps.prot for the generic design of the interface
@@ -14,7 +14,7 @@
 #include "mpm.h"
-SRCID(prmcan, "$HopeName$");
+SRCID(prmcan, "$HopeName: MMsrc!prmcan.c(trunk.2) $");
 /* ProtCanStepInstruction -- can the current instruction be single-stepped */
diff --git a/mps/code/prmci3.h b/mps/code/prmci3.h
index 2498b727332..c8dd3312878 100644
--- a/mps/code/prmci3.h
+++ b/mps/code/prmci3.h
@@ -1,6 +1,6 @@
 /* impl.h.prmci3: PROTECTION MUTATOR CONTEXT (Intel 386)
 *
- * $HopeName: $
+ * $HopeName: MMsrc!prmci3.h(trunk.1) $
 * Copyright (C) 1999 The Harlequin Group Limited.  All rights reserved.
 *
 * .readership: MPS developers.
diff --git a/mps/code/prmci3li.c b/mps/code/prmci3li.c
index f0013092970..d279f424ca6 100644
--- a/mps/code/prmci3li.c
+++ b/mps/code/prmci3li.c
@@ -1,6 +1,6 @@
 /* impl.c.prmci3li: PROTECTION MUTATOR CONTEXT INTEL 386 (LINUX)
 *
- * $HopeName: MMsrc!prmci3li.c(trunk.3) $
+ * $HopeName: MMsrc!prmci3li.c(trunk.4) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This module implements the part of the protection module
@@ -25,7 +25,7 @@
 #include "prmcli.h"
 #include "prmci3.h"
-SRCID(prmci3li, "$HopeName$");
+SRCID(prmci3li, "$HopeName: MMsrc!prmci3li.c(trunk.4) $");
 /* Prmci3AddressHoldingReg -- return an address of a register in a context */
diff --git a/mps/code/prmci3w3.c b/mps/code/prmci3w3.c
index b4131f78304..1cf4c7adda6 100644
--- a/mps/code/prmci3w3.c
+++ b/mps/code/prmci3w3.c
@@ -1,6 +1,6 @@
 /* impl.c.prmci3w3: PROTECTION MUTATOR CONTEXT INTEL 386 (Win32)
 *
- * $HopeName: MMsrc!prmci3w3.c(trunk.1) $
+ * $HopeName: MMsrc!prmci3w3.c(trunk.2) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * PURPOSE
@@ -23,7 +23,7 @@
 #include "prmci3.h"
 #include "mpm.h"
-SRCID(prmci3w3, "$HopeName$");
+SRCID(prmci3w3, "$HopeName: MMsrc!prmci3w3.c(trunk.2) $");
 /* Prmci3AddressHoldingReg -- Return an address for a given machine register */
diff --git a/mps/code/prmcli.h b/mps/code/prmcli.h
index 477875303bc..a2611c3b8d8 100644
--- a/mps/code/prmcli.h
+++ b/mps/code/prmcli.h
@@ -1,6 +1,6 @@
 /* impl.h.prmcli:  PROTECTION MUTATOR CONTEXT (Linux)
 *
- * $HopeName: $
+ * $HopeName: MMsrc!prmcli.h(trunk.1) $
 * Copyright (C) 1998 The Harlequin Group Limited.  All rights reserved.
 *
 * .readership: MPS developers.
diff --git a/mps/code/prmcw3.h b/mps/code/prmcw3.h
index 1bb1e98e430..c81c0d8d664 100644
--- a/mps/code/prmcw3.h
+++ b/mps/code/prmcw3.h
@@ -1,6 +1,6 @@
 /* impl.h.prmcw3:  PROTECTION FOR WIN32
 *
- * $HopeName: $
+ * $HopeName: MMsrc!prmcw3.h(trunk.1) $
 * Copyright (C) 1998, 1999 The Harlequin Group Limited.  All rights reserved.
 *
 * .readership: MPS developers.
diff --git a/mps/code/proddw.bat b/mps/code/proddw.bat
index 924aba40dec..e80b89f0182 100644
--- a/mps/code/proddw.bat
+++ b/mps/code/proddw.bat
@@ -1,6 +1,6 @@
 @rem impl.bat.proddw
 @rem Script that automates building and collating a dylan product
-rem $HopeName: MMsrc!proddw.bat(trunk.5) $
+rem $HopeName: MMsrc!proddw.bat(trunk.6) $
 nmake /f w3i3mv.nmk VARIETY=ci mmdw.lib mpsplan.lib
 nmake /f w3i3mv.nmk VARIETY=hi mmdw.lib mpsplan.lib
 nmake /f w3i3mv.nmk VARIETY=he mmdw.lib mpsplan.lib
diff --git a/mps/code/protan.c b/mps/code/protan.c
index fc4a6ca2a7b..58e444a9cad 100644
--- a/mps/code/protan.c
+++ b/mps/code/protan.c
@@ -1,6 +1,6 @@
 /* impl.c.protan: ANSI MEMORY PROTECTION
 *
- * $HopeName: MMsrc!protan.c(trunk.8) $
+ * $HopeName: MMsrc!protan.c(trunk.9) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 *
 *
@@ -11,7 +11,7 @@
 #include "mpm.h"
-SRCID(protan, "$HopeName: MMsrc!protan.c(trunk.8) $");
+SRCID(protan, "$HopeName: MMsrc!protan.c(trunk.9) $");
 /* ProtSetup -- global protection setup */
diff --git a/mps/code/proti3.c b/mps/code/proti3.c
index 1056ec5a96e..7eed2dcbf75 100644
--- a/mps/code/proti3.c
+++ b/mps/code/proti3.c
@@ -1,6 +1,6 @@
 /* impl.c.proti3: PROTECTION MUTATOR CONTEXT (INTEL 386)
 *
- * $HopeName: MMsrc!proti3.c(trunk.1) $
+ * $HopeName: MMsrc!proti3.c(trunk.2) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .design: See design.mps.prot for the generic design of the interface
@@ -52,7 +52,7 @@
 #include "mpm.h"
 #include "prmci3.h"
-SRCID(proti3, "$HopeName$");
+SRCID(proti3, "$HopeName: MMsrc!proti3.c(trunk.2) $");
 /* DecodeCB -- Decode an Intel x86 control byte into Hi, Medium & Low fields */
diff --git a/mps/code/protli.c b/mps/code/protli.c
index 20c9dfc5b55..63279d50183 100644
--- a/mps/code/protli.c
+++ b/mps/code/protli.c
@@ -1,6 +1,6 @@
 /*  impl.c.protli: PROTECTION FOR LINUX
 *
- *  $HopeName: $
+ *  $HopeName: MMsrc!protli.c(trunk.1) $
 *  Copyright (C) 1995,1999 Harlequin Group, all rights reserved
 *
 */
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
-SRCID(protli, "$HopeName: $");
+SRCID(protli, "$HopeName: MMsrc!protli.c(trunk.1) $");
 /* ProtSet -- set protection
diff --git a/mps/code/protlii3.c b/mps/code/protlii3.c
index 3e3f6b3dd92..8629c750c58 100644
--- a/mps/code/protlii3.c
+++ b/mps/code/protlii3.c
@@ -1,6 +1,6 @@
 /*  impl.c.protlii3: PROTECTION FOR LINUX (INTEL 386)
 *
- *  $HopeName: MMsrc!protlii3.c(trunk.3) $
+ *  $HopeName: MMsrc!protlii3.c(trunk.4) $
 *  Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * SOURCES
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <signal.h>
-SRCID(protlii3, "$HopeName: MMsrc!protlii3.c(trunk.3) $");
+SRCID(protlii3, "$HopeName: MMsrc!protlii3.c(trunk.4) $");
 /* Useful stuff that doesn't appear to be in any header files. */
diff --git a/mps/code/proto1.c b/mps/code/proto1.c
index 12a39efe7ca..c96be76d4e8 100644
--- a/mps/code/proto1.c
+++ b/mps/code/proto1.c
@@ -1,6 +1,6 @@
 /* impl.c.proto1: PROTECTION FOR DIGITAL UNIX
 *
- *  $HopeName: MMsrc!proto1.c(trunk.2) $
+ *  $HopeName: MMsrc!proto1.c(trunk.3) $
 *  Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 */
@@ -27,7 +27,7 @@
 /* for getpid() */
 #include <unistd.h>
-SRCID(proto1, "$HopeName: MMsrc!proto1.c(trunk.2) $");
+SRCID(proto1, "$HopeName: MMsrc!proto1.c(trunk.3) $");
 /* The previously-installed signal action, as returned by */
diff --git a/mps/code/protocol.c b/mps/code/protocol.c
index 8faec02f188..c2f32b66073 100644
--- a/mps/code/protocol.c
+++ b/mps/code/protocol.c
@@ -1,6 +1,6 @@
 /* impl.c.pool: PROTOCOL IMPLEMENTATION
 *
- * $HopeName: MMsrc!protocol.c(trunk.2) $
+ * $HopeName: MMsrc!protocol.c(trunk.3) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -11,7 +11,7 @@
 #include "mpm.h"
-SRCID(protocol, "$HopeName: MMsrc!protocol.c(trunk.2) $");
+SRCID(protocol, "$HopeName: MMsrc!protocol.c(trunk.3) $");
 /* ProtocolClassCheck -- check a protocol class */
diff --git a/mps/code/protocol.h b/mps/code/protocol.h
index f2c7e4134fb..7acdf1c397f 100644
--- a/mps/code/protocol.h
+++ b/mps/code/protocol.h
@@ -1,6 +1,6 @@
 /* impl.h.protocol: PROTOCOL INHERITANCE DEFINITIONS
 *
- * $HopeName: MMsrc!protocol.h(trunk.4) $
+ * $HopeName: MMsrc!protocol.h(trunk.5) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/protso.c b/mps/code/protso.c
index 192a61b3323..c662d6cfe52 100644
--- a/mps/code/protso.c
+++ b/mps/code/protso.c
@@ -1,6 +1,6 @@
 /*  impl.c.protso: PROTECTION FOR SOLARIS
 *
- *  $HopeName: MMsrc!protso.c(trunk.5) $
+ *  $HopeName: MMsrc!protso.c(trunk.6) $
 *  Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 *
 */
@@ -29,7 +29,7 @@
 #error "protso.c is Solaris specific, but MPS_OS_SO is not set"
 #endif
-SRCID(protso, "$HopeName: MMsrc!protso.c(trunk.5) $");
+SRCID(protso, "$HopeName: MMsrc!protso.c(trunk.6) $");
 /* Fix up unprototyped system calls.  */
diff --git a/mps/code/protsu.c b/mps/code/protsu.c
index d6d15377ffb..b126520b8bc 100644
--- a/mps/code/protsu.c
+++ b/mps/code/protsu.c
@@ -1,6 +1,6 @@
 /* impl.c.protsu: PROTECTION FOR SUNOS
 *
- * $HopeName: MMsrc!protsu.c(trunk.10) $
+ * $HopeName: MMsrc!protsu.c(trunk.11) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 *
 * DESIGN
@@ -29,7 +29,7 @@
 #include <signal.h>
 #include <limits.h>
-SRCID(protsu, "$HopeName: MMsrc!protsu.c(trunk.10) $");
+SRCID(protsu, "$HopeName: MMsrc!protsu.c(trunk.11) $");
 /* Fix up unprototyped system calls. */
diff --git a/mps/code/protw3.c b/mps/code/protw3.c
index f4ac6ea57f3..8e0d73bfb51 100644
--- a/mps/code/protw3.c
+++ b/mps/code/protw3.c
@@ -1,6 +1,6 @@
 /*  impl.c.protw3: PROTECTION FOR WIN32
 *
- *  $HopeName: MMsrc!protw3.c(trunk.15) $
+ *  $HopeName: MMsrc!protw3.c(trunk.16) $
 *  Copyright (C) 1995, 1997 Harlequin Group, all rights reserved
 */
@@ -18,7 +18,7 @@
 #include "mpswin.h"
-SRCID(protw3, "$HopeName: MMsrc!protw3.c(trunk.15) $");
+SRCID(protw3, "$HopeName: MMsrc!protw3.c(trunk.16) $");
 void ProtSetup(void)
diff --git a/mps/code/pthrdext.c b/mps/code/pthrdext.c
index 3ba128d44b5..a568042905f 100644
--- a/mps/code/pthrdext.c
+++ b/mps/code/pthrdext.c
@@ -1,6 +1,6 @@
 /*  impl.c.pthreadext: POSIX THREAD EXTENSIONS
 *
- *  $HopeName: MMsrc!pthrdext.c(trunk.2) $
+ *  $HopeName: MMsrc!pthrdext.c(trunk.3) $
 *  Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: Provides extension to Pthreads.
@@ -31,7 +31,7 @@
 #include "pthrdext.h"
-SRCID(pthreadext, "$HopeName$");
+SRCID(pthreadext, "$HopeName: MMsrc!pthrdext.c(trunk.3) $");
 /* PTHREADEXT_SIGSUSPEND, PTHREADEXT_SIGRESUME -- signals used
diff --git a/mps/code/pthrdext.h b/mps/code/pthrdext.h
index 32fec1a0c7d..b5a971891e2 100644
--- a/mps/code/pthrdext.h
+++ b/mps/code/pthrdext.h
@@ -1,6 +1,6 @@
 /*  impl.h.pthreadext: POSIX THREAD EXTENSIONS
 *
- *  $HopeName: $
+ *  $HopeName: MMsrc!pthrdext.h(trunk.1) $
 *  Copyright (C) 2000 Harlequin Ltd, all rights reserved
 *
 * .readership: MM developers.
diff --git a/mps/code/qs.c b/mps/code/qs.c
index 3e4c6f81f3b..db662b74a01 100644
--- a/mps/code/qs.c
+++ b/mps/code/qs.c
@@ -1,6 +1,6 @@
 /*  impl.c.qs: QUICKSORT
 *
- *  $HopeName: MMsrc!qs.c(trunk.17) $
+ *  $HopeName: MMsrc!qs.c(trunk.18) $
 *  Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 *  The purpose of this program is to act as a "real" client of the MM.
diff --git a/mps/code/ref.c b/mps/code/ref.c
index 8614cd5b451..167940ccc6d 100644
--- a/mps/code/ref.c
+++ b/mps/code/ref.c
@@ -1,6 +1,6 @@
 /* impl.c.ref: REFERENCES
 *
- * $HopeName: MMsrc!ref.c(trunk.12) $
+ * $HopeName: MMsrc!ref.c(trunk.13) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .purpose: Implement operations on Ref, RefSet, ZoneSet, and Rank.
@@ -10,7 +10,7 @@
 #include "mpm.h"
-SRCID(ref, "$HopeName: MMsrc!ref.c(trunk.12) $");
+SRCID(ref, "$HopeName: MMsrc!ref.c(trunk.13) $");
 /* RankCheck -- check a rank value */
diff --git a/mps/code/replay.c b/mps/code/replay.c
index ab4ff61e204..cf79d4e58a9 100644
--- a/mps/code/replay.c
+++ b/mps/code/replay.c
@@ -1,7 +1,7 @@
 /* impl.c.replay: Allocation replayer
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
- * $HopeName: MMsrc!replay.c(MMdevel_alloc_replay.3) $
+ * $HopeName: MMsrc!replay.c(trunk.2) $
 */
 #include "config.h"
diff --git a/mps/code/reserv.c b/mps/code/reserv.c
index 77fcc831baf..7dc9467db1f 100644
--- a/mps/code/reserv.c
+++ b/mps/code/reserv.c
@@ -1,6 +1,6 @@
 /* impl.c.reserv: ARENA RESERVOIR
 *
- * $HopeName: MMsrc!reserv.c(trunk.5) $
+ * $HopeName: MMsrc!reserv.c(trunk.6) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * IMPROVEMENTS
@@ -11,7 +11,7 @@
 #include "mpm.h"
-SRCID(reserv, "$HopeName: MMsrc!reserv.c(trunk.5) $");
+SRCID(reserv, "$HopeName: MMsrc!reserv.c(trunk.6) $");
 /* The reservoir pool is defined here. See design.mps.reservoir */
diff --git a/mps/code/ring.c b/mps/code/ring.c
index 67674c9fbc7..2131008605a 100644
--- a/mps/code/ring.c
+++ b/mps/code/ring.c
@@ -1,6 +1,6 @@
 /* impl.c.ring: RING IMPLEMENTATION
 *
- * $HopeName$
+ * $HopeName: MMsrc!ring.c(trunk.8) $
 * Copyright (C) 1995 Harlequin Limited.  All rights reserved.
 *
 * .intro: This is a portable implementation of Rings.
@@ -17,7 +17,7 @@
 #include "misc.h"
-SRCID(ring, "$HopeName: MMsrc!ring.c(trunk.7) $");
+SRCID(ring, "$HopeName: MMsrc!ring.c(trunk.8) $");
 /* RingCheck, RingCheckSingle -- check the validity of a ring node
diff --git a/mps/code/ring.h b/mps/code/ring.h
index 43c71600ec0..ee5ba5170ae 100644
--- a/mps/code/ring.h
+++ b/mps/code/ring.h
@@ -1,6 +1,6 @@
 /* impl.h.ring: RING INTERFACE
 *
- * $HopeName: MMsrc!ring.h(MMdevel_pekka_locus.1) $
+ * $HopeName: MMsrc!ring.h(trunk.2) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/root.c b/mps/code/root.c
index 2643f70785d..20bd643023f 100644
--- a/mps/code/root.c
+++ b/mps/code/root.c
@@ -1,6 +1,6 @@
 /* impl.c.root: ROOT IMPLEMENTATION
 *
- * $HopeName: MMsrc!root.c(trunk.34) $
+ * $HopeName: MMsrc!root.c(trunk.35) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This is the implementation of the root datatype.
@@ -10,7 +10,7 @@
 #include "mpm.h"
-SRCID(root, "$HopeName: MMsrc!root.c(trunk.34) $");
+SRCID(root, "$HopeName: MMsrc!root.c(trunk.35) $");
 /* RootStruct -- tracing root structure */
diff --git a/mps/code/s7ppac/Makefile b/mps/code/s7ppac/Makefile
index 33a41921b8a..6c344d1d3e5 100644
--- a/mps/code/s7ppac/Makefile
+++ b/mps/code/s7ppac/Makefile
@@ -1,6 +1,6 @@
 # impl.makefile.s7ppac: S7PPAC MPW MAKE FILE
 #
-# $HopeName: MMsrc!s7ppac:Makefile(trunk.24) $
+# $HopeName: MMsrc!s7ppac:Makefile(trunk.25) $
 #
 # Copyright (C) 1999 Harlequin Limited.  All rights reserved.
diff --git a/mps/code/sac.c b/mps/code/sac.c
index c63a2cafeed..99232aaf7c0 100644
--- a/mps/code/sac.c
+++ b/mps/code/sac.c
@@ -1,13 +1,13 @@
 /* impl.c.sac: SEGREGATED ALLOCATION CACHES
 *
- * $HopeName: MMsrc!sac.c(trunk.3) $
+ * $HopeName: MMsrc!sac.c(trunk.4) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 */
 #include "mpm.h"
 #include "sac.h"
-SRCID(sac, "$HopeName: MMsrc!sac.c(trunk.3) $");
+SRCID(sac, "$HopeName: MMsrc!sac.c(trunk.4) $");
 /* SACCheck -- check function for SACs */
diff --git a/mps/code/sac.h b/mps/code/sac.h
index 51d55b2f51d..d1abbe00111 100644
--- a/mps/code/sac.h
+++ b/mps/code/sac.h
@@ -1,6 +1,6 @@
 /* impl.h.sac: SEGREGATED ALLOCATION CACHES INTERFACE
 *
- * $HopeName: MMsrc!sac.h(MM_epcore_brisling.1) $
+ * $HopeName: MMsrc!sac.h(trunk.2) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/sacss.c b/mps/code/sacss.c
index 774c0fef474..364ab0c7673 100644
--- a/mps/code/sacss.c
+++ b/mps/code/sacss.c
@@ -1,6 +1,6 @@
 /* impl.c.sacss: SAC MANUAL ALLOC STRESS TEST
 *
- * $HopeName: MMsrc!sacss.c(trunk.3) $
+ * $HopeName: MMsrc!sacss.c(trunk.4) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/sc.gmk b/mps/code/sc.gmk
index 2c1da32adbd..ae66dc48afd 100644
--- a/mps/code/sc.gmk
+++ b/mps/code/sc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sc: GNUMAKEFILE FRAGMENT FOR SunPro C
 #
-# $HopeName: MMsrc!sc.gmk(trunk.4) $
+# $HopeName: MMsrc!sc.gmk(trunk.5) $
 #
 # This file is included by platform makefiles that use the SunPro C
 # compiler.  It defines the compiler specific variables that the
diff --git a/mps/code/seg.c b/mps/code/seg.c
index 50225429efe..2e8c0db7476 100644
--- a/mps/code/seg.c
+++ b/mps/code/seg.c
@@ -1,6 +1,6 @@
 /* impl.c.seg: SEGMENTS
 *
- * $HopeName: MMsrc!seg.c(trunk.29) $
+ * $HopeName: MMsrc!seg.c(trunk.30) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .design: The design for this module is design.mps.seg.
@@ -29,7 +29,7 @@
 #include "tract.h"
 #include "mpm.h"
-SRCID(seg, "$HopeName: MMsrc!seg.c(trunk.29) $");
+SRCID(seg, "$HopeName: MMsrc!seg.c(trunk.30) $");
 /* SegGCSeg -- convert generic Seg to GCSeg */
diff --git a/mps/code/segsmss.c b/mps/code/segsmss.c
index ba557fc6378..16c7cfa70c6 100644
--- a/mps/code/segsmss.c
+++ b/mps/code/segsmss.c
@@ -1,6 +1,6 @@
 /* impl.c.segsmss: Segment splitting and merging stress test
 *
- * $HopeName: MMsrc!segsmss.c(trunk.7) $
+ * $HopeName: MMsrc!segsmss.c(trunk.8) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .design: Adapted from amsss.c (because AMS already supports 
diff --git a/mps/code/shield.c b/mps/code/shield.c
index c472e48d71e..15fe91b6626 100644
--- a/mps/code/shield.c
+++ b/mps/code/shield.c
@@ -1,6 +1,6 @@
 /* impl.c.shield: SHIELD IMPLEMENTATION
 *
- * $HopeName: MMsrc!shield.c(trunk.15) $
+ * $HopeName: MMsrc!shield.c(trunk.16) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 *
 * See: idea.shield, design.mps.shield.
@@ -74,7 +74,7 @@
 #include "mpm.h"
-SRCID(shield, "$HopeName: MMsrc!shield.c(trunk.15) $");
+SRCID(shield, "$HopeName: MMsrc!shield.c(trunk.16) $");
 void (ShieldSuspend)(Arena arena)
diff --git a/mps/code/sos8cx.gmk b/mps/code/sos8cx.gmk
index 0a961b81ddc..3d8d97fe51e 100644
--- a/mps/code/sos8cx.gmk
+++ b/mps/code/sos8cx.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sos8cx: BUILD FOR SOLARIS/SPARC v8/CXREF PLATFORM
 #
-# $HopeName: MMsrc!sos8cx.gmk(trunk.9) $
+# $HopeName: MMsrc!sos8cx.gmk(trunk.10) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # Instead of compiling object files, this platform (using the cxref
diff --git a/mps/code/sos8gc.gmk b/mps/code/sos8gc.gmk
index 683fe408034..b8ff1cbc894 100644
--- a/mps/code/sos8gc.gmk
+++ b/mps/code/sos8gc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sos8gc: BUILD FOR SOLARIS/SPARC V8/GCC PLATFORM
 #
-# $HopeName: MMsrc!sos8gc.gmk(trunk.28) $
+# $HopeName: MMsrc!sos8gc.gmk(trunk.29) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 PFM = sos8gc
diff --git a/mps/code/sos8gp.gmk b/mps/code/sos8gp.gmk
index cbac10da2b1..22154a215b7 100644
--- a/mps/code/sos8gp.gmk
+++ b/mps/code/sos8gp.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sos8gp: BUILD FOR SOLARIS/SPARC v8/GCC WITH PROFILING PLATFORM
 #
-# $HopeName: MMsrc!sos8gp.gmk(trunk.6) $
+# $HopeName: MMsrc!sos8gp.gmk(trunk.7) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # This is the GNU makefile for platform.sos8gp.
diff --git a/mps/code/sos9sc.gmk b/mps/code/sos9sc.gmk
index 69969395de8..c2537fbdde9 100644
--- a/mps/code/sos9sc.gmk
+++ b/mps/code/sos9sc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sos9sc: BUILD FOR SOLARIS/SPARC V9/SUNPRO C PLATFORM
 #
-# $HopeName: MMsrc!sos9sc.gmk(trunk.22) $
+# $HopeName: MMsrc!sos9sc.gmk(trunk.23) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # This is the GNU makefile for platform.sos9sc.
diff --git a/mps/code/span.c b/mps/code/span.c
index 24f203d26c4..0b42c6f1388 100644
--- a/mps/code/span.c
+++ b/mps/code/span.c
@@ -1,6 +1,6 @@
 /* impl.c.span: ANSI STACK PROBE
 *
- * $HopeName: MMsrc!span.c(trunk.2) $
+ * $HopeName: MMsrc!span.c(trunk.3) $
 * Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 *
 * PURPOSE
@@ -13,7 +13,7 @@
 #include "mpm.h"
-SRCID(span, "$HopeName: MMsrc!span.c(trunk.2) $");
+SRCID(span, "$HopeName: MMsrc!span.c(trunk.3) $");
 /* StackProbe -- probe above the stack to provoke early stack overflow */
diff --git a/mps/code/spi3.asm b/mps/code/spi3.asm
index c13e834ddad..a00196ce55f 100644
--- a/mps/code/spi3.asm
+++ b/mps/code/spi3.asm
@@ -1,6 +1,6 @@
 ;  impl.asm.spi3: STACK PROBE
 ;
-;  $HopeName: MMsrc!spi3.asm(trunk.1) $
+;  $HopeName: MMsrc!spi3.asm(trunk.2) $
 ;  Copyright (C) 1997 Harlequin Limited.  All rights reserved.
 ;
 ;  This function reads a location that is probeDepth words beyond
diff --git a/mps/code/splay.c b/mps/code/splay.c
index 5416e922598..0c425a67f70 100644
--- a/mps/code/splay.c
+++ b/mps/code/splay.c
@@ -1,6 +1,6 @@
 /* impl.c.splay: SPLAY TREE IMPLEMENTATION
 *
- * $HopeName: MMsrc!splay.c(trunk.8) $
+ * $HopeName: MMsrc!splay.c(trunk.9) $
 * Copyright (C) 1998 Harlequin Group plc.  All rights reserved.
 *
 * .purpose: Splay trees are used to manage potentially unbounded 
@@ -18,7 +18,7 @@
 #include "mpm.h"
-SRCID(splay, "$HopeName: MMsrc!splay.c(trunk.8) $");
+SRCID(splay, "$HopeName: MMsrc!splay.c(trunk.9) $");
 /* Basic getter and setter methods */
 #define SplayTreeRoot(t) RVALUE((t)->root)
diff --git a/mps/code/splay.h b/mps/code/splay.h
index 98e41a0cd89..5bc84496e94 100644
--- a/mps/code/splay.h
+++ b/mps/code/splay.h
@@ -1,6 +1,6 @@
 /* impl.h.splay: SPLAY TREE HEADER
 *
- * $HopeName: MMsrc!splay.h(trunk.2) $
+ * $HopeName: MMsrc!splay.h(trunk.3) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .source: design.mps.splay
diff --git a/mps/code/ss.h b/mps/code/ss.h
index 5bc8524d657..eb6951299b7 100644
--- a/mps/code/ss.h
+++ b/mps/code/ss.h
@@ -1,7 +1,7 @@
 /*  impl.h.ss
 *              STACK SCANNING
 *
- *  $HopeName: MMsrc!ss.h(MMdevel_restr.2) $
+ *  $HopeName: MMsrc!ss.h(trunk.3) $
 *
 *  Copyright (C) 1995 Harlequin Group, all rights reserved
 *
diff --git a/mps/code/ssan.c b/mps/code/ssan.c
index 0143a3738dc..c3af944a9ae 100644
--- a/mps/code/ssan.c
+++ b/mps/code/ssan.c
@@ -1,6 +1,6 @@
 /* impl.c.ssan: ANSI STACK SCANNER
 *
- * $HopeName$
+ * $HopeName: MMsrc!ssan.c(trunk.3) $
 * Copyright (C) 1996 Harlequin Limited.  All rights reserved.
 *
 * This module provides zero functionality.  It exists to feed the
@@ -12,7 +12,7 @@
 #include "ss.h"
-SRCID(ssan, "$HopeName$");
+SRCID(ssan, "$HopeName: MMsrc!ssan.c(trunk.3) $");
 Res StackScan(ScanState ss, Addr *stackBot)
diff --git a/mps/code/sslii3.c b/mps/code/sslii3.c
index 23e0f25c2a2..47c71b8d5b8 100644
--- a/mps/code/sslii3.c
+++ b/mps/code/sslii3.c
@@ -1,6 +1,6 @@
 /* impl.c.sslii3: LINUX/INTEL STACK SCANNING
 *
- * $HopeName: MMsrc!sslii3.c(trunk.1) $
+ * $HopeName: MMsrc!sslii3.c(trunk.2) $
 * Copyright (C) 1999.  Harlequin Group plc.  All rights reserved.
 *
 *  This scans the stack and fixes the registers which may contain 
@@ -32,7 +32,7 @@
 #include "mpm.h"
-SRCID(sslii3, "$HopeName: MMsrc!sslii3.c(trunk.1) $");
+SRCID(sslii3, "$HopeName: MMsrc!sslii3.c(trunk.2) $");
 /* .assume.asm.order */
 #define ASMV(x) __asm__ volatile (x)
diff --git a/mps/code/sso1al.s b/mps/code/sso1al.s
index 8ade1783d61..7bf85aa2a93 100644
--- a/mps/code/sso1al.s
+++ b/mps/code/sso1al.s
@@ -1,6 +1,6 @@
 # impl.s.sso1al: STACK SCANNING FOR DIGITAL UNIX / ALPHA
 #
- # $HopeName: MMsrc!sso1al.s(trunk.1) $
+ # $HopeName: MMsrc!sso1al.s(trunk.2) $
 # Copyright (C) 1997 Harlequin Group, all rights reserved
 #
 # .readership: Any MPS developer that is prepared to read Alpha
diff --git a/mps/code/sssos8.s b/mps/code/sssos8.s
index 41c0ea5807e..b0b13386fd8 100644
--- a/mps/code/sssos8.s
+++ b/mps/code/sssos8.s
@@ -2,7 +2,7 @@
 !
 !                      STACK SCANNING
 !
-!  $HopeName: MMsrc!sssos9sc.S(trunk.1) $
+!  $HopeName: MMsrc!sssos8.s(trunk.1) $
 !
 !  Copyright (C) 1995 Harlequin Group, all rights reserved
 !
diff --git a/mps/code/sssus8.s b/mps/code/sssus8.s
index 8fd9e5845aa..97b5c66f33d 100644
--- a/mps/code/sssus8.s
+++ b/mps/code/sssus8.s
@@ -2,7 +2,7 @@
 !
 !                      STACK SCANNING
 !
-!  $HopeName: MMsrc!sssos9sc.S(trunk.1) $
+!  $HopeName: MMsrc!sssus8.s(trunk.5) $
 !
 !  Copyright (C) 1995 Harlequin Group, all rights reserved
 !
diff --git a/mps/code/ssw3i3.c b/mps/code/ssw3i3.c
index 977ebffb180..7a6caa07add 100644
--- a/mps/code/ssw3i3.c
+++ b/mps/code/ssw3i3.c
@@ -1,6 +1,6 @@
 /* impl.c.ssw3i3: WIN32/INTEL STACK SCANNING
 *
- * $HopeName: MMsrc!ssw3i3.c() $
+ * $HopeName: MMsrc!ssw3i3.c(trunk.2) $
 * Copyright (C) 1999.  Harlequin Group plc.  All rights reserved.
 *
 *  This scans the stack and fixes the registers which may contain 
@@ -19,7 +19,7 @@
 #include "mpm.h"
-SRCID(ssw3i3, "$HopeName: MMsrc!ssw3i3.c() $");
+SRCID(ssw3i3, "$HopeName: MMsrc!ssw3i3.c(trunk.2) $");
 Res StackScan(ScanState ss, Addr *stackBot)
diff --git a/mps/code/sus8gc.gmk b/mps/code/sus8gc.gmk
index 53c9d7f6051..b76bcd13761 100644
--- a/mps/code/sus8gc.gmk
+++ b/mps/code/sus8gc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sus8gc: BUILD FOR SUNOS/SPARC V8/GCC PLATFORM
 #
-# $HopeName: MMsrc!sus8gc.gmk(trunk.42) $
+# $HopeName: MMsrc!sus8gc.gmk(trunk.43) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 PFM = sus8gc
diff --git a/mps/code/sus8lc.gmk b/mps/code/sus8lc.gmk
index fda51d3d574..cf75a5f05d1 100644
--- a/mps/code/sus8lc.gmk
+++ b/mps/code/sus8lc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.sus8lc: BUILD FOR SUNOS/SPARC V8/LCC PLATFORM
 #
-# $HopeName: MMsrc!sus8lc.gmk(trunk.20) $
+# $HopeName: MMsrc!sus8lc.gmk(trunk.21) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 #
 # This is the GNU makefile for platform.sus8lc.
diff --git a/mps/code/table.c b/mps/code/table.c
index edc8fb884b4..f22898a1aed 100644
--- a/mps/code/table.c
+++ b/mps/code/table.c
@@ -1,6 +1,6 @@
 /* impl.h.table: A dictionary mapping a Word to a void*
 *
- * $HopeName$
+ * $HopeName: MMsrc!table.c(trunk.3) $
 * Copyright (C) 1999 Harlequin Limited.  All rights reserved.
 *
 * .note.good-hash: As is common in hash table implementations, we
diff --git a/mps/code/table.h b/mps/code/table.h
index 46864a54b1b..7cab8ece95e 100644
--- a/mps/code/table.h
+++ b/mps/code/table.h
@@ -1,7 +1,7 @@
 /* impl.h.table: Interface for a dictionary
 * Copyright (C) 1997, 1999 Harlequin Group plc.  All rights reserved.
 *
- * $HopeName: MMsrc!table.h(trunk.1) $
+ * $HopeName: MMsrc!table.h(trunk.2) $
 */
 #ifndef table_h
diff --git a/mps/code/teletest.c b/mps/code/teletest.c
index 8300355afe5..863b2370c31 100644
--- a/mps/code/teletest.c
+++ b/mps/code/teletest.c
@@ -1,6 +1,6 @@
 /* impl.c.teletest: TELEMETRY TEST
 *
- * $HopeName: MMsrc!teletest.c(trunk.5) $
+ * $HopeName: MMsrc!teletest.c(trunk.6) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .source: The command parser here was taken and adapted from bttest.c.
@@ -14,7 +14,7 @@
 #include <stdlib.h>
-SRCID(teletest, "$HopeName: MMsrc!teletest.c(trunk.5) $");
+SRCID(teletest, "$HopeName: MMsrc!teletest.c(trunk.6) $");
 static mps_arena_t arena; 
diff --git a/mps/code/testlib.c b/mps/code/testlib.c
index d7ea32271f9..4afa690284c 100644
--- a/mps/code/testlib.c
+++ b/mps/code/testlib.c
@@ -1,6 +1,6 @@
 /* impl.c.testlib: TEST LIBRARY
 *
- * $HopeName: MMsrc!testlib.c(trunk.22) $
+ * $HopeName: MMsrc!testlib.c(trunk.23) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: A library of functions that may be of use to unit tests.
diff --git a/mps/code/testlib.h b/mps/code/testlib.h
index 0db0824c983..7e71de4b73d 100644
--- a/mps/code/testlib.h
+++ b/mps/code/testlib.h
@@ -1,6 +1,6 @@
 /* impl.h.testlib: TEST LIBRARY INTERFACE
 *
- * $HopeName: MMsrc!testlib.h(trunk.21) $
+ * $HopeName: MMsrc!testlib.h(trunk.22) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: A library of functions that may be of use to unit tests.
diff --git a/mps/code/th.h b/mps/code/th.h
index 66ade83520d..62f8c2382fd 100644
--- a/mps/code/th.h
+++ b/mps/code/th.h
@@ -1,6 +1,6 @@
 /*  impl.h.th: THREAD MANAGER
 *
- *  $HopeName$
+ *  $HopeName: MMsrc!th.h(trunk.9) $
 *  Copyright (C) 1995 Harlequin Limited.  All rights reserved.
 *
 *  .purpose: Provides thread suspension facilities to the shield.
diff --git a/mps/code/than.c b/mps/code/than.c
index 266705a0293..47c3dad683e 100644
--- a/mps/code/than.c
+++ b/mps/code/than.c
@@ -1,6 +1,6 @@
 /*  impl.c.than: ANSI THREADS MANAGER
 *
- *  $HopeName: MMsrc!than.c(trunk.19) $
+ *  $HopeName: MMsrc!than.c(trunk.20) $
 *  Copyright (C) 1999.  Harlequin Limited.  All rights reserved.
 *
 *  This is a single-threaded implementation of the threads manager.
@@ -14,7 +14,7 @@
 #include "mpm.h"
-SRCID(than, "$HopeName: MMsrc!than.c(trunk.19) $");
+SRCID(than, "$HopeName: MMsrc!than.c(trunk.20) $");
 typedef struct ThreadStruct {   /* ANSI fake thread structure */
diff --git a/mps/code/thlii4.c b/mps/code/thlii4.c
index f4384d611fe..2669df45a2f 100644
--- a/mps/code/thlii4.c
+++ b/mps/code/thlii4.c
@@ -1,6 +1,6 @@
 /*  impl.c.thlii3: Threads Manager for Intel x86 systems with LinuxThreads
 *
- *  $HopeName: MMsrc!thlii4.c(trunk.2) $
+ *  $HopeName: MMsrc!thlii4.c(trunk.3) $
 *  Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This is a pthreads implementation of the threads manager.
@@ -46,7 +46,7 @@
 #include <pthread.h>
 #include "pthrdext.h"
-SRCID(thlii4, "$HopeName: MMsrc!thlii4.c(trunk.2) $");
+SRCID(thlii4, "$HopeName: MMsrc!thlii4.c(trunk.3) $");
 /* ThreadStruct -- thread desriptor */
diff --git a/mps/code/thw3i3.c b/mps/code/thw3i3.c
index 1f193147753..84722c51c58 100644
--- a/mps/code/thw3i3.c
+++ b/mps/code/thw3i3.c
@@ -1,6 +1,6 @@
 /* impl.c.thw3i3: WIN32 THREAD MANAGER
 *
- * $HopeName: MMsrc!thw3i3.c(trunk.24) $
+ * $HopeName: MMsrc!thw3i3.c(trunk.25) $
 * Copyright (C) 1999.  Harlequin Limited.  All rights reserved.
 *
 * Implements thread registration, suspension, and stack
@@ -80,7 +80,7 @@
 #include "mpswin.h"
-SRCID(thw3i3, "$HopeName: MMsrc!thw3i3.c(trunk.24) $");
+SRCID(thw3i3, "$HopeName: MMsrc!thw3i3.c(trunk.25) $");
 typedef struct ThreadStruct {   /* Win32 thread structure */
diff --git a/mps/code/trace.c b/mps/code/trace.c
index 619e67480f0..f37d5b9e679 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -1,6 +1,6 @@
 /* impl.c.trace: GENERIC TRACER IMPLEMENTATION
 *
- * $HopeName: MMsrc!trace.c(trunk.102) $
+ * $HopeName: MMsrc!trace.c(trunk.103) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 *
 * .design: design.mps.trace.  */
@@ -9,7 +9,7 @@
 #include "mpm.h"
 #include <limits.h> /* for LONG_MAX */
-SRCID(trace, "$HopeName: MMsrc!trace.c(trunk.102) $");
+SRCID(trace, "$HopeName: MMsrc!trace.c(trunk.103) $");
 /* Types */
diff --git a/mps/code/tract.c b/mps/code/tract.c
index 8028ff8b1c5..69e6a766567 100644
--- a/mps/code/tract.c
+++ b/mps/code/tract.c
@@ -1,6 +1,6 @@
 /* impl.c.tract: PAGE TABLES
 *
- * $HopeName: MMsrc!tract.c(trunk.5) $
+ * $HopeName: MMsrc!tract.c(trunk.6) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .ullagepages: Pages whose page index is < allocBase are recorded as
@@ -13,7 +13,7 @@
 #include "boot.h"
 #include "mpm.h"
-SRCID(tract, "$HopeName: MMsrc!tract.c(trunk.5) $");
+SRCID(tract, "$HopeName: MMsrc!tract.c(trunk.6) $");
 static void ChunkDecache(Arena arena, Chunk chunk);
diff --git a/mps/code/tract.h b/mps/code/tract.h
index 427e480f5f2..372b85e4b17 100644
--- a/mps/code/tract.h
+++ b/mps/code/tract.h
@@ -1,6 +1,6 @@
 /* impl.h.tract: PAGE TABLE INTERFACE
 *
- * $HopeName: MMsrc!tract.h(trunk.6) $
+ * $HopeName: MMsrc!tract.h(trunk.7) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 */
diff --git a/mps/code/version.c b/mps/code/version.c
index 73517ab5a09..ac4b82587c1 100644
--- a/mps/code/version.c
+++ b/mps/code/version.c
@@ -1,6 +1,6 @@
 /* impl.c.version: VERSION INSPECTION
 *
- * $HopeName$
+ * $HopeName: MMsrc!version.c(trunk.3) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * PURPOSE
@@ -18,7 +18,7 @@
 #include "mpm.h"
-SRCID(version, "$HopeName$");
+SRCID(version, "$HopeName: MMsrc!version.c(trunk.3) $");
 /* MPS_RELEASE -- the release name
@@ -28,7 +28,7 @@ SRCID(version, "$HopeName$");
 * whatever.
 */
-#define MPS_RELEASE "$HopeName$ *** DEVELOPMENT ONLY ***"
+#define MPS_RELEASE "$HopeName: MMsrc!version.c(trunk.3) $ *** DEVELOPMENT ONLY ***"
 /* MPSCopyrightNotice -- copyright notice for the binary
diff --git a/mps/code/vman.c b/mps/code/vman.c
index d57a056320f..f5cc0e8cbc5 100644
--- a/mps/code/vman.c
+++ b/mps/code/vman.c
@@ -1,6 +1,6 @@
 /* impl.c.vman: ANSI VM: MALLOC-BASED PSEUDO MEMORY MAPPING
 *
- * $HopeName: MMsrc!vman.c(trunk.21) $
+ * $HopeName: MMsrc!vman.c(trunk.22) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 */
@@ -9,7 +9,7 @@
 #include <stdlib.h>     /* for malloc and free */
 #include <string.h>     /* for memset */
-SRCID(vman, "$HopeName: MMsrc!vman.c(trunk.21) $");
+SRCID(vman, "$HopeName: MMsrc!vman.c(trunk.22) $");
 /* VMStruct -- virtual memory structure */
diff --git a/mps/code/vmi5.c b/mps/code/vmi5.c
index 6eda6c4b16d..31a427a7a50 100644
--- a/mps/code/vmi5.c
+++ b/mps/code/vmi5.c
@@ -1,6 +1,6 @@
 /* impl.c.vmi5: VIRTUAL MEMORY MAPPING FOR IRIX 5 (AND 6)
 *
- * $HopeName: MMsrc!vmi5.c(trunk.4) $
+ * $HopeName: MMsrc!vmi5.c(trunk.6) $
 * Copyright (C) 1997, 1998 Harlequin Group plc.  All rights reserved.
 *
 * Design: design.mps.vm
@@ -51,7 +51,7 @@
 #define MAP_FAILED ((void *)-1)
 #endif
-SRCID(vmi5, "$HopeName: MMsrc!vmi5.c(trunk.4) $");
+SRCID(vmi5, "$HopeName: MMsrc!vmi5.c(trunk.6) $");
 /* VMStruct -- virtual memory structure */
@@ -71,6 +71,7 @@ typedef struct VMStruct {
 Align VMAlign(VM vm)
 {
+  AVERT(VM, vm);
  return vm->align;
 }
diff --git a/mps/code/vmli.c b/mps/code/vmli.c
index 8fb9c978ed4..461367422d7 100644
--- a/mps/code/vmli.c
+++ b/mps/code/vmli.c
@@ -1,6 +1,6 @@
 /* impl.c.vmli: VIRTUAL MEMORY MAPPING FOR LINUX
 *
- * $HopeName: MMsrc!vmli.c(trunk.7) $
+ * $HopeName: MMsrc!vmli.c(trunk.9) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .purpose: This is the implementation of the virtual memory mapping 
@@ -55,7 +55,7 @@
 #error "vmli.c is LINUX specific, but MPS_OS_LI is not set"
 #endif
-SRCID(vmli, "$HopeName: MMsrc!vmli.c(trunk.7) $");
+SRCID(vmli, "$HopeName: MMsrc!vmli.c(trunk.9) $");
 /* VMStruct -- virtual memory structure */
@@ -75,6 +75,8 @@ typedef struct VMStruct {
 Align VMAlign(VM vm)
 {
+  AVERT(VM, vm);
  return vm->align;
 }
diff --git a/mps/code/vmo1.c b/mps/code/vmo1.c
index 84c2e08e6da..0ee771eff38 100644
--- a/mps/code/vmo1.c
+++ b/mps/code/vmo1.c
@@ -1,6 +1,6 @@
 /* impl.c.vmo1: VIRTUAL MEMORY MAPPING FOR DIGITAL UNIX
 *
- * $HopeName: MMsrc!vmo1.c(trunk.9) $
+ * $HopeName: MMsrc!vmo1.c(trunk.11) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .design: design.mps.vm, design.mps.vmo1
@@ -41,7 +41,7 @@
 /* for getpagesize(2),close(2) */
 #include <unistd.h>
-SRCID(vmo1, "$HopeName: MMsrc!vmo1.c(trunk.9) $");
+SRCID(vmo1, "$HopeName: MMsrc!vmo1.c(trunk.11) $");
 /* Fix unprototyped system calls
@@ -74,6 +74,8 @@ typedef struct VMStruct {
 Align VMAlign(VM vm)
 {
+  AVERT(VM, vm);
  return vm->align;
 }
diff --git a/mps/code/vmso.c b/mps/code/vmso.c
index 4bc1122721c..cdbe1ce4087 100644
--- a/mps/code/vmso.c
+++ b/mps/code/vmso.c
@@ -1,6 +1,6 @@
 /* impl.c.vmso: VIRTUAL MEMORY MAPPING FOR SOLARIS 2.x
 *
- * $HopeName: MMsrc!vmso.c(trunk.14) $
+ * $HopeName: MMsrc!vmso.c(trunk.16) $
 * Copyright (C) 1998 Harlequin Group plc.  All rights reserved.
 *
 * DESIGN
@@ -53,7 +53,7 @@
 /* unistd for _SC_PAGESIZE */
 #include <unistd.h>
-SRCID(vmso, "$HopeName: MMsrc!vmso.c(trunk.14) $");
+SRCID(vmso, "$HopeName: MMsrc!vmso.c(trunk.16) $");
 /* Fix up unprototyped system calls.  */
@@ -80,6 +80,7 @@ typedef struct VMStruct {
 Align VMAlign(VM vm)
 {
+  AVERT(VM, vm);
  return vm->align;
 }
diff --git a/mps/code/vmsu.c b/mps/code/vmsu.c
index 50ab350b3c8..dd1c6a76573 100644
--- a/mps/code/vmsu.c
+++ b/mps/code/vmsu.c
@@ -1,6 +1,6 @@
 /* impl.c.vmsu: VIRTUAL MEMORY MAPPING FOR SUNOS 4
 *
- * $HopeName: MMsrc!vmsu.c(trunk.20) $
+ * $HopeName: MMsrc!vmsu.c(trunk.22) $
 * Copyright (C) 1998 Harlequin Limited.  All rights reserved.
 *
 * .design: See design.mps.vm for general design.
@@ -49,7 +49,7 @@
 #include <sys/errno.h>
 #include <limits.h>
-SRCID(vmsu, "$HopeName: MMsrc!vmsu.c(trunk.20) $");
+SRCID(vmsu, "$HopeName: MMsrc!vmsu.c(trunk.22) $");
 /* Fix up unprototyped system calls. */
@@ -79,6 +79,7 @@ typedef struct VMStruct {
 Align VMAlign(VM vm)
 {
+  AVERT(VM, vm);
  return vm->align;
 }
diff --git a/mps/code/vmw3.c b/mps/code/vmw3.c
index e57cee185c1..208357235ba 100644
--- a/mps/code/vmw3.c
+++ b/mps/code/vmw3.c
@@ -1,6 +1,6 @@
 /* impl.c.vmw3: VIRTUAL MEMORY MAPPING FOR WIN32
 *
- * $HopeName: MMsrc!vmw3.c(trunk.34) $
+ * $HopeName: MMsrc!vmw3.c(trunk.36) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .design: See design.mps.vm.
@@ -55,7 +55,7 @@
 #include "mpswin.h"
-SRCID(vmw3, "$HopeName: MMsrc!vmw3.c(trunk.34) $");
+SRCID(vmw3, "$HopeName: MMsrc!vmw3.c(trunk.36) $");
 /* VMStruct -- virtual memory structure */
@@ -75,6 +75,8 @@ typedef struct VMStruct {
 Align VMAlign(VM vm)
 {
+  AVERT(VM, vm);
  return vm->align;
 }
diff --git a/mps/code/vmxc.c b/mps/code/vmxc.c
index 26070589a57..6c2203612b6 100644
--- a/mps/code/vmxc.c
+++ b/mps/code/vmxc.c
@@ -1,6 +1,6 @@
 /* impl.c.vmxc: VIRTUAL MEMORY MAPPING FOR MacOS X
 *
- * $HopeName: MMsrc!vmxc.c(trunk.2) $
+ * $HopeName: MMsrc!vmxc.c(trunk.4) $
 * Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 *
 * .design: design.mps.vm
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <limits.h> /* for INT_MAX */
-SRCID(vmxc, "$HopeName: MMsrc!vmxc.c(trunk.2) $");
+SRCID(vmxc, "$HopeName: MMsrc!vmxc.c(trunk.4) $");
 /* VMStruct -- virtual memory structure */
@@ -58,6 +58,7 @@ typedef struct VMStruct {
 Align VMAlign(VM vm)
 {
+  AVERT(VM, vm);
  return vm->align;
 }
diff --git a/mps/code/w3almv.nmk b/mps/code/w3almv.nmk
index 93bf29d665f..42d068bf5c6 100644
--- a/mps/code/w3almv.nmk
+++ b/mps/code/w3almv.nmk
@@ -1,6 +1,6 @@
 # impl.nmk.w3almv: WINDOWS (ALPHA) NMAKE FILE
 #
-# $HopeName: MMsrc!w3almv.nmk(trunk.42) $
+# $HopeName: MMsrc!w3almv.nmk(trunk.43) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 PFM = w3almv
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index d4a812c576d..128df48ba2c 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -1,6 +1,6 @@
 # impl.nmk.w3i3mv: WINDOWS (INTEL) NMAKE FILE
 #
-# $HopeName: MMsrc!w3i3mv.nmk(trunk.71) $
+# $HopeName: MMsrc!w3i3mv.nmk(trunk.72) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 PFM = w3i3mv
diff --git a/mps/code/w3ppmv.nmk b/mps/code/w3ppmv.nmk
index 3d08649ddeb..37f3857d236 100644
--- a/mps/code/w3ppmv.nmk
+++ b/mps/code/w3ppmv.nmk
@@ -1,6 +1,6 @@
 # impl.nmk.w3ppmv: WINDOWS (POWERPC) NMAKE FILE
 #
-# $HopeName: MMsrc!w3ppmv.nmk(trunk.43) $
+# $HopeName: MMsrc!w3ppmv.nmk(trunk.44) $
 # Copyright (C) 2000 Harlequin Limited.  All rights reserved.
 PFM = w3ppmv
diff --git a/mps/code/walk.c b/mps/code/walk.c
index 9a3bd0122e3..1b139189ff6 100644
--- a/mps/code/walk.c
+++ b/mps/code/walk.c
@@ -1,13 +1,13 @@
 /* impl.c.walk: OBJECT WALKER
 *
- * $HopeName: MMsrc!walk.c(trunk.6) $
+ * $HopeName: MMsrc!walk.c(trunk.7) $
 * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 */
 #include "mpm.h"
 #include "mps.h"
-SRCID(walk, "$HopeName: MMsrc!walk.c(trunk.6) $");
+SRCID(walk, "$HopeName: MMsrc!walk.c(trunk.7) $");
 /* Heap Walking
diff --git a/mps/code/xcppgc.gmk b/mps/code/xcppgc.gmk
index 6c2cd7e64a8..f01408ed130 100644
--- a/mps/code/xcppgc.gmk
+++ b/mps/code/xcppgc.gmk
@@ -1,6 +1,6 @@
 # impl.gmk.xcppgc: BUILD FOR MACOS X (CARBON)/POWERPC/GCC PLATFORM
 #
-# $HopeName: MMsrc!xcppgc.gmk(MM_epcore_brisling.1) $
+# $HopeName: MMsrc!xcppgc.gmk(trunk.2) $
 # Copyright (C) 2001 Harlequin Limited.  All rights reserved.
 PFM = xcppgc
author	Richard Brooksby	2001-12-05 15:48:24 +0000
committer	Richard Brooksby	2001-12-05 15:48:24 +0000
commit	492dd3c684e53bd42b28371bdaaa99ad67ebd835 (patch)
tree	59a2df0f685b93b44fbc03847b76782275308aaf /mps/code
parent	25c78993edd7b4a607eba951b6ab2a9a51c55b62 (diff)
download	emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.tar.gz emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.zip