Merging recent improvements to master into version 1.110 prior to release.

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

21 files changed, 412 insertions, 262 deletions

diff --git a/mps/code/chain.h b/mps/code/chain.h
index 785c25e2349..0d2be1de068 100644
--- a/mps/code/chain.h
+++ b/mps/code/chain.h
@@ -64,7 +64,7 @@ typedef struct PoolGenStruct {
 
 #define ChainSig ((Sig)0x519C8A14)  /* SIGnature CHAIN */
 
-typedef struct ChainStruct {
+typedef struct mps_chain_s {
   Sig sig;
   Arena arena;
   RingStruct chainRing; /* list of chains in the arena */
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 483acb09710..15b77940b29 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -232,7 +232,7 @@ $(PFM)\$(VARIETY)\zmess.exe: $(PFM)\$(VARIETY)\zmess.obj \
         $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\eventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \
-        $(PFM)\$(VARIETY)\eventpro.obj $(MPMOBJ) $(PLINTHOBJ)
+        $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\mps.lib
 
 $(PFM)\$(VARIETY)\replay.exe: $(PFM)\$(VARIETY)\replay.obj \
   $(PFM)\$(VARIETY)\eventrep.obj \
diff --git a/mps/code/format.c b/mps/code/format.c
index 5155a740eb5..9867f562167 100644
--- a/mps/code/format.c
+++ b/mps/code/format.c
@@ -40,11 +40,11 @@ Bool FormatCheck(Format format)
 }
 
 
-static Addr FormatDefaultClass(Addr object)
+static mps_addr_t FormatDefaultClass(mps_addr_t object)
 {
   AVER(object != NULL);
 
-  return ((Addr *)object)[0];
+  return ((mps_addr_t *)object)[0];
 }
 
 
@@ -53,13 +53,13 @@ static Addr FormatDefaultClass(Addr object)
 Res FormatCreate(Format *formatReturn, Arena arena,
                  Align alignment,
                  FormatVariety variety,
-                 FormatScanMethod scan,
-                 FormatSkipMethod skip,
-                 FormatMoveMethod move,
-                 FormatIsMovedMethod isMoved,
-                 FormatCopyMethod copy,
-                 FormatPadMethod pad,
-                 FormatClassMethod class,
+                 mps_fmt_scan_t scan,
+                 mps_fmt_skip_t skip,
+                 mps_fmt_fwd_t move,
+                 mps_fmt_isfwd_t isMoved,
+                 mps_fmt_copy_t copy,
+                 mps_fmt_pad_t pad,
+                 mps_fmt_class_t class,
                  Size headerSize)
 {
   Format format;
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 165c7485e37..049cbf65343 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -807,13 +807,13 @@ extern Bool FormatCheck(Format format);
 extern Res FormatCreate(Format *formatReturn, Arena arena,
                         Align alignment,
                         FormatVariety variety,
-                        FormatScanMethod scan,
-                        FormatSkipMethod skip,
-                        FormatMoveMethod move,
-                        FormatIsMovedMethod isMoved,
-                        FormatCopyMethod copy,
-                        FormatPadMethod pad,
-                        FormatClassMethod class,
+                        mps_fmt_scan_t scan,
+                        mps_fmt_skip_t skip,
+                        mps_fmt_fwd_t move,
+                        mps_fmt_isfwd_t isMoved,
+                        mps_fmt_copy_t copy,
+                        mps_fmt_pad_t pad,
+                        mps_fmt_class_t class,
                         Size headerSize);
 extern void FormatDestroy(Format format);
 extern Arena FormatArena(Format format);
@@ -936,14 +936,14 @@ extern Res RootCreateTableMasked(Root *rootReturn, Arena arena,
                                  Word mask);
 extern Res RootCreateReg(Root *rootReturn, Arena arena,
                            Rank rank, Thread thread,
-                           RootScanRegMethod scan,
+                           mps_reg_scan_t scan,
                            void *p, size_t s);
 extern Res RootCreateFmt(Root *rootReturn, Arena arena,
                            Rank rank, RootMode mode,
-                           FormatScanMethod scan,
+                           mps_fmt_scan_t scan,
                            Addr base, Addr limit);
 extern Res RootCreateFun(Root *rootReturn, Arena arena,
-                        Rank rank, RootScanMethod scan,
+                        Rank rank, mps_root_scan_t scan,
                         void *p, size_t s);
 extern void RootDestroy(Root root);
 extern Bool RootModeCheck(RootMode mode);
diff --git a/mps/code/mpmst.h b/mps/code/mpmst.h
index 5c21c60a6a0..332d32084e1 100644
--- a/mps/code/mpmst.h
+++ b/mps/code/mpmst.h
@@ -46,7 +46,7 @@
 
 #define PoolClassSig    ((Sig)0x519C7A55) /* SIGnature pool CLASS */
 
-typedef struct PoolClassStruct {
+typedef struct mps_class_s {
   ProtocolClassStruct protocol;
   const char *name;             /* class name string */
   size_t size;                  /* size of outer structure */
@@ -93,7 +93,7 @@ typedef struct PoolClassStruct {
 
 #define PoolSig         ((Sig)0x519B0019) /* SIGnature POOL */
 
-typedef struct PoolStruct {     /* generic structure */
+typedef struct mps_pool_s {     /* generic structure */
   Sig sig;                      /* <design/sig/> */
   Serial serial;                /* from arena->poolSerial */
   PoolClass class;              /* pool class structure */
@@ -218,7 +218,7 @@ typedef struct MessageClassStruct {
  *
  * See <design/message/#message.struct>.  */
 
-typedef struct MessageStruct {
+typedef struct mps_message_s {
   Sig sig;                      /* <design/sig/> */
   Arena arena;                  /* owning arena */
   MessageClass class;           /* Message Class Structure */
@@ -399,20 +399,20 @@ typedef struct SegBufStruct {
 
 #define FormatSig       ((Sig)0x519F63A2) /* Signature FoRMAT */
 
-typedef struct FormatStruct {
+typedef struct mps_fmt_s {
   Sig sig;
   Serial serial;                /* from arena->formatSerial */
   FormatVariety variety;        /* format variety (e.g. A) */
   Arena arena;                  /* owning arena */
   RingStruct arenaRing;         /* formats are attached to the arena */
   Align alignment;              /* alignment of formatted objects */
-  FormatScanMethod scan;
-  FormatSkipMethod skip;
-  FormatMoveMethod move;
-  FormatIsMovedMethod isMoved;
-  FormatCopyMethod copy;
-  FormatPadMethod pad;
-  FormatClassMethod class;      /* pointer indicating class */
+  mps_fmt_scan_t scan;
+  mps_fmt_skip_t skip;
+  mps_fmt_fwd_t move;
+  mps_fmt_isfwd_t isMoved;
+  mps_fmt_copy_t copy;
+  mps_fmt_pad_t pad;
+  mps_fmt_class_t class;        /* pointer indicating class */
   Size headerSize;              /* size of header */
 } FormatStruct;
 
@@ -530,7 +530,7 @@ typedef struct ChunkCacheEntryStruct {
 
 #define ArenaClassSig   ((Sig)0x519A6C1A) /* SIGnature ARena CLAss */
 
-typedef struct ArenaClassStruct {
+typedef struct mps_arena_class_s {
   ProtocolClassStruct protocol;
   char *name;                   /* class name string */
   size_t size;                  /* size of outer structure */
diff --git a/mps/code/mpmtypes.h b/mps/code/mpmtypes.h
index b1853178cbb..984790baf56 100644
--- a/mps/code/mpmtypes.h
+++ b/mps/code/mpmtypes.h
@@ -67,10 +67,10 @@ typedef BufferClass SegBufClass;        /* <design/buffer/> */
 typedef BufferClass RankBufClass;       /* <design/buffer/> */
 typedef unsigned BufferMode;            /* <design/buffer/> */
 typedef unsigned FrameState;            /* <design/alloc-frame/> */
-typedef struct FormatStruct *Format;    /* design.mps.format */
+typedef struct mps_fmt_s *Format;       /* design.mps.format */
 typedef struct LockStruct *Lock;        /* <code/lock.c>* */
-typedef struct PoolStruct *Pool;        /* <design/pool/> */
-typedef struct PoolClassStruct *PoolClass; /* <code/poolclas.c> */
+typedef struct mps_pool_s *Pool;        /* <design/pool/> */
+typedef struct mps_class_s *PoolClass;  /* <code/poolclas.c> */
 typedef PoolClass AbstractPoolClass;    /* <code/poolabs.c> */
 typedef PoolClass AbstractAllocFreePoolClass; /* <code/poolabs.c> */
 typedef PoolClass AbstractBufferPoolClass; /* <code/poolabs.c> */
@@ -79,7 +79,7 @@ typedef PoolClass AbstractScanPoolClass; /* <code/poolabs.c> */
 typedef PoolClass AbstractCollectPoolClass; /* <code/poolabs.c> */
 typedef struct TraceStruct *Trace;      /* <design/trace/> */
 typedef struct ScanStateStruct *ScanState; /* <design/trace/> */
-typedef struct ChainStruct *Chain;      /* <design/trace/> */
+typedef struct mps_chain_s *Chain;      /* <design/trace/> */
 typedef struct TractStruct *Tract;      /* <design/arena/> */
 typedef struct ChunkStruct *Chunk;      /* <code/tract.c> */
 typedef struct ChunkCacheEntryStruct *ChunkCacheEntry; /* <code/tract.c> */
@@ -90,19 +90,20 @@ typedef struct SegClassStruct *SegClass; /* <code/seg.c> */
 typedef SegClass GCSegClass;            /* <code/seg.c> */
 typedef struct SegPrefStruct *SegPref;  /* design.mps.pref, <code/locus.c> */
 typedef int SegPrefKind;                /* design.mps.pref, <code/locus.c> */
-typedef struct ArenaClassStruct *ArenaClass; /* <design/arena/> */
+typedef struct mps_arena_class_s *ArenaClass; /* <design/arena/> */
 typedef ArenaClass AbstractArenaClass;  /* <code/arena.c> */
 typedef struct mps_arena_s *Arena;      /* <design/arena/> */
 typedef struct GlobalsStruct *Globals;  /* <design/arena/> */
 typedef struct VMStruct *VM;            /* <code/vm.c>* */
 typedef struct RootStruct *Root;        /* <code/root.c> */
-typedef struct ThreadStruct *Thread;    /* <code/th.c>* */
+typedef struct mps_thr_s *Thread;       /* <code/th.c>* */
 typedef struct MutatorFaultContextStruct
         *MutatorFaultContext;           /* <design/prot/> */
 typedef struct PoolDebugMixinStruct *PoolDebugMixin;
 typedef struct AllocPatternStruct *AllocPattern;
 typedef struct AllocFrameStruct *AllocFrame; /* <design/alloc-frame/> */
 typedef struct ReservoirStruct *Reservoir;   /* <design/reservoir/> */
+typedef struct StackContextStruct *StackContext;
 
 
 /* Arena*Method -- see <code/mpmst.h#ArenaClassStruct> */
@@ -223,7 +224,7 @@ typedef PoolDebugMixin (*PoolDebugMixinMethod)(Pool pool);
  */
 
 typedef unsigned MessageType;
-typedef struct MessageStruct *Message;
+typedef struct mps_message_s *Message;
 typedef struct MessageClassStruct *MessageClass;
 
 /* Message*Method -- <design/message/> */
@@ -242,27 +243,6 @@ typedef struct TraceStartMessageStruct *TraceStartMessage;
 typedef struct TraceMessageStruct *TraceMessage;  /* trace end */
 
 
-/* Format*Method -- see design.mps.format-interface */
-/* .fmt-methods: These methods must match those defined in the */
-/* MPS C Interface.  (See <code/mps.h#fmt-methods>.) */
-
-typedef Res  (*FormatScanMethod)(mps_ss_t ss, Addr base, Addr limit);
-typedef Addr (*FormatSkipMethod)(Addr object);
-typedef void (*FormatMoveMethod)(Addr object, Addr to);
-typedef Addr (*FormatIsMovedMethod)(Addr object);
-typedef void (*FormatCopyMethod)(Addr object, Addr to);
-typedef void (*FormatPadMethod)(Addr base, Size size);
-typedef Addr (*FormatClassMethod)(Addr object);
-
-
-/* Root*Method -- see design.mps.root-interface */
-/* .root-methods: These methods must match those defined in the */
-/* MPS C Interface.  (See <code/mps.h#root-methods>.) */
-
-typedef Res (*RootScanMethod)(mps_ss_t ss, void *p, size_t s);
-typedef Res (*RootScanRegMethod)(mps_ss_t ss, Thread thread, void *p, size_t s);
-
-
 /* CONSTANTS */
 
 
diff --git a/mps/code/mps.h b/mps/code/mps.h
index 469639b6c6d..6d0edbb75d2 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -178,8 +178,8 @@ typedef struct mps_ld_s {       /* location dependency descriptor */
 
 
 /* Format and Root Method Types */
-/* .fmt-methods: Keep in sync with <code/mpmtypes.h#fmt-methods> */
-/* .root-methods: Keep in sync with <code/mpmtypes.h#root-methods> */
+/* see design.mps.root-interface */
+/* see design.mps.format-interface */
 
 typedef mps_res_t (*mps_root_scan_t)(mps_ss_t, void *, size_t);
 typedef mps_res_t (*mps_fmt_scan_t)(mps_ss_t, mps_addr_t, mps_addr_t);
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 240861f8dad..15bc692ee00 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -324,7 +324,7 @@ mps_res_t mps_arena_create(mps_arena_t *mps_arena_o,
 /* mps_arena_create_v -- create an arena object */
 
 mps_res_t mps_arena_create_v(mps_arena_t *mps_arena_o,
-                             mps_arena_class_t mps_arena_class, va_list args)
+                             mps_arena_class_t arena_class, va_list args)
 {
   Arena arena;
   Res res;
@@ -335,7 +335,7 @@ mps_res_t mps_arena_create_v(mps_arena_t *mps_arena_o,
 
   AVER(mps_arena_o != NULL);
 
-  res = ArenaCreateV(&arena, (ArenaClass)mps_arena_class, args);
+  res = ArenaCreateV(&arena, arena_class, args);
   if (res != ResOK)
     return res;
 
@@ -463,12 +463,12 @@ mps_res_t mps_fmt_create_A(mps_fmt_t *mps_fmt_o,
                      arena,
                      (Align)mps_fmt_A->align,
                      FormatVarietyA,
-                     (FormatScanMethod)mps_fmt_A->scan,
-                     (FormatSkipMethod)mps_fmt_A->skip,
-                     (FormatMoveMethod)mps_fmt_A->fwd,
-                     (FormatIsMovedMethod)mps_fmt_A->isfwd,
-                     (FormatCopyMethod)mps_fmt_A->copy,
-                     (FormatPadMethod)mps_fmt_A->pad,
+                     mps_fmt_A->scan,
+                     mps_fmt_A->skip,
+                     mps_fmt_A->fwd,
+                     mps_fmt_A->isfwd,
+                     mps_fmt_A->copy,
+                     mps_fmt_A->pad,
                      NULL,
                      (Size)0);
 
@@ -497,13 +497,13 @@ mps_res_t mps_fmt_create_B(mps_fmt_t *mps_fmt_o,
                      arena,
                      (Align)mps_fmt_B->align,
                      FormatVarietyB,
-                     (FormatScanMethod)mps_fmt_B->scan,
-                     (FormatSkipMethod)mps_fmt_B->skip,
-                     (FormatMoveMethod)mps_fmt_B->fwd,
-                     (FormatIsMovedMethod)mps_fmt_B->isfwd,
-                     (FormatCopyMethod)mps_fmt_B->copy,
-                     (FormatPadMethod)mps_fmt_B->pad,
-                     (FormatClassMethod)mps_fmt_B->mps_class,
+                     mps_fmt_B->scan,
+                     mps_fmt_B->skip,
+                     mps_fmt_B->fwd,
+                     mps_fmt_B->isfwd,
+                     mps_fmt_B->copy,
+                     mps_fmt_B->pad,
+                     mps_fmt_B->mps_class,
                      (Size)0);
 
   ArenaLeave(arena);
@@ -531,12 +531,12 @@ mps_res_t mps_fmt_create_auto_header(mps_fmt_t *mps_fmt_o,
                      arena,
                      (Align)mps_fmt->align,
                      FormatVarietyAutoHeader,
-                     (FormatScanMethod)mps_fmt->scan,
-                     (FormatSkipMethod)mps_fmt->skip,
-                     (FormatMoveMethod)mps_fmt->fwd,
-                     (FormatIsMovedMethod)mps_fmt->isfwd,
+                     mps_fmt->scan,
+                     mps_fmt->skip,
+                     mps_fmt->fwd,
+                     mps_fmt->isfwd,
                      NULL,
-                     (FormatPadMethod)mps_fmt->pad,
+                     mps_fmt->pad,
                      NULL,
                      (Size)mps_fmt->mps_headerSize);
 
@@ -565,12 +565,12 @@ mps_res_t mps_fmt_create_fixed(mps_fmt_t *mps_fmt_o,
                      arena,
                      (Align)mps_fmt_fixed->align,
                      FormatVarietyFixed,
-                     (FormatScanMethod)mps_fmt_fixed->scan,
+                     mps_fmt_fixed->scan,
                      NULL,
-                     (FormatMoveMethod)mps_fmt_fixed->fwd,
-                     (FormatIsMovedMethod)mps_fmt_fixed->isfwd,
+                     mps_fmt_fixed->fwd,
+                     mps_fmt_fixed->isfwd,
                      NULL,
-                     (FormatPadMethod)mps_fmt_fixed->pad,
+                     mps_fmt_fixed->pad,
                      NULL,
                      (Size)0);
 
@@ -584,9 +584,8 @@ mps_res_t mps_fmt_create_fixed(mps_fmt_t *mps_fmt_o,
 
 /* mps_fmt_destroy -- destroy a format object */
 
-void mps_fmt_destroy(mps_fmt_t mps_fmt)
+void mps_fmt_destroy(mps_fmt_t format)
 {
-  Format format = (Format)mps_fmt;
   Arena arena;
 
   AVER(TESTT(Format, format));
@@ -612,10 +611,9 @@ mps_res_t mps_pool_create(mps_pool_t *mps_pool_o, mps_arena_t arena,
 }
 
 mps_res_t mps_pool_create_v(mps_pool_t *mps_pool_o, mps_arena_t arena,
-                            mps_class_t mps_class, va_list args)
+                            mps_class_t class, va_list args)
 {
   Pool pool;
-  PoolClass class = (PoolClass)mps_class;
   Res res;
 
   ArenaEnter(arena);
@@ -633,9 +631,8 @@ mps_res_t mps_pool_create_v(mps_pool_t *mps_pool_o, mps_arena_t arena,
   return res;
 }
 
-void mps_pool_destroy(mps_pool_t mps_pool)
+void mps_pool_destroy(mps_pool_t pool)
 {
-  Pool pool = (Pool)mps_pool;
   Arena arena;
 
   AVER(TESTT(Pool, pool));
@@ -649,9 +646,8 @@ void mps_pool_destroy(mps_pool_t mps_pool)
 }
 
 
-mps_res_t mps_alloc(mps_addr_t *p_o, mps_pool_t mps_pool, size_t size, ...)
+mps_res_t mps_alloc(mps_addr_t *p_o, mps_pool_t pool, size_t size, ...)
 {
-  Pool pool = (Pool)mps_pool;
   Arena arena;
   Addr p;
   Res res;
@@ -693,9 +689,8 @@ mps_res_t mps_alloc_v(mps_addr_t *p_o, mps_pool_t mps_pool, size_t size,
 }
 
 
-void mps_free(mps_pool_t mps_pool, mps_addr_t p, size_t size)
+void mps_free(mps_pool_t pool, mps_addr_t p, size_t size)
 {
-  Pool pool = (Pool)mps_pool;
   Arena arena;
 
   AVER(TESTT(Pool, pool));
@@ -716,9 +711,8 @@ void mps_free(mps_pool_t mps_pool, mps_addr_t p, size_t size)
 
 /* mps_ap_create -- create an allocation point */
 
-mps_res_t mps_ap_create(mps_ap_t *mps_ap_o, mps_pool_t mps_pool, ...)
+mps_res_t mps_ap_create(mps_ap_t *mps_ap_o, mps_pool_t pool, ...)
 {
-  Pool pool = (Pool)mps_pool;
   Arena arena;
   Buffer buf;
   BufferClass bufclass;
@@ -733,7 +727,7 @@ mps_res_t mps_ap_create(mps_ap_t *mps_ap_o, mps_pool_t mps_pool, ...)
 
   AVERT(Pool, pool);
 
-  va_start(args, mps_pool);
+  va_start(args, pool);
   bufclass = PoolDefaultBufferClass(pool);
   res = BufferCreateV(&buf, bufclass, pool, TRUE, args);
   va_end(args);
@@ -749,10 +743,9 @@ mps_res_t mps_ap_create(mps_ap_t *mps_ap_o, mps_pool_t mps_pool, ...)
 
 /* mps_ap_create_v -- create an allocation point, with varargs */
 
-mps_res_t mps_ap_create_v(mps_ap_t *mps_ap_o, mps_pool_t mps_pool,
+mps_res_t mps_ap_create_v(mps_ap_t *mps_ap_o, mps_pool_t pool,
                           va_list args)
 {
-  Pool pool = (Pool)mps_pool;
   Arena arena;
   Buffer buf;
   BufferClass bufclass;
@@ -1043,12 +1036,10 @@ mps_bool_t mps_ap_trip(mps_ap_t mps_ap, mps_addr_t p, size_t size)
 
 /* mps_sac_create -- create an SAC object */
 
-mps_res_t mps_sac_create(mps_sac_t *mps_sac_o, mps_pool_t mps_pool,
-                         size_t classes_count, mps_sac_classes_s *mps_classes)
+mps_res_t mps_sac_create(mps_sac_t *mps_sac_o, mps_pool_t pool,
+                         size_t classes_count, mps_sac_classes_s *classes)
 {
-  Pool pool = (Pool)mps_pool;
   Arena arena;
-  SACClasses classes;
   SAC sac;
   Res res;
 
@@ -1058,7 +1049,6 @@ mps_res_t mps_sac_create(mps_sac_t *mps_sac_o, mps_pool_t mps_pool,
 
   ArenaEnter(arena);
 
-  classes = (SACClasses)mps_classes;
   res = SACCreate(&sac, pool, (Count)classes_count, classes);
 
   ArenaLeave(arena);
@@ -1194,8 +1184,7 @@ mps_res_t mps_root_create(mps_root_t *mps_root_o, mps_arena_t arena,
   AVER(mps_rm == (mps_rm_t)0);
 
   /* See .root-mode. */
-  res = RootCreateFun(&root, arena, rank,
-                      (RootScanMethod)mps_root_scan, p, s);
+  res = RootCreateFun(&root, arena, rank, mps_root_scan, p, s);
 
   ArenaLeave(arena);
 
@@ -1266,11 +1255,10 @@ mps_res_t mps_root_create_table_masked(mps_root_t *mps_root_o,
 
 mps_res_t mps_root_create_fmt(mps_root_t *mps_root_o, mps_arena_t arena,
                               mps_rank_t mps_rank, mps_rm_t mps_rm,
-                              mps_fmt_scan_t mps_fmt_scan,
+                              mps_fmt_scan_t scan,
                               mps_addr_t base, mps_addr_t limit)
 {
   Rank rank = (Rank)mps_rank;
-  FormatScanMethod scan = (FormatScanMethod)mps_fmt_scan;
   Root root;
   RootMode mode = (RootMode)mps_rm;
   Res res;
@@ -1289,11 +1277,10 @@ mps_res_t mps_root_create_fmt(mps_root_t *mps_root_o, mps_arena_t arena,
 
 mps_res_t mps_root_create_reg(mps_root_t *mps_root_o, mps_arena_t arena,
                               mps_rank_t mps_rank, mps_rm_t mps_rm,
-                              mps_thr_t mps_thr, mps_reg_scan_t mps_reg_scan,
+                              mps_thr_t thread, mps_reg_scan_t mps_reg_scan,
                               void *reg_scan_p, size_t mps_size)
 {
   Rank rank = (Rank)mps_rank;
-  Thread thread = (Thread)mps_thr;
   Root root;
   Res res;
 
@@ -1308,8 +1295,7 @@ mps_res_t mps_root_create_reg(mps_root_t *mps_root_o, mps_arena_t arena,
 
   /* See .root-mode. */
   res = RootCreateReg(&root, arena, rank, thread,
-                      (RootScanRegMethod)mps_reg_scan,
-                      reg_scan_p, mps_size);
+                      mps_reg_scan, reg_scan_p, mps_size);
 
   ArenaLeave(arena);
 
@@ -1324,10 +1310,9 @@ mps_res_t mps_root_create_reg(mps_root_t *mps_root_o, mps_arena_t arena,
  * See .reg-scan.  */
 
 mps_res_t mps_stack_scan_ambig(mps_ss_t mps_ss,
-                               mps_thr_t mps_thr, void *p, size_t s)
+                               mps_thr_t thread, void *p, size_t s)
 {
   ScanState ss = PARENT(ScanStateStruct, ss_s, mps_ss);
-  Thread thread = (Thread)mps_thr;
   UNUSED(s);
   return ThreadScan(ss, thread, p);
 }
@@ -1379,9 +1364,8 @@ mps_res_t mps_thread_reg(mps_thr_t *mps_thr_o, mps_arena_t arena)
   return MPS_RES_OK;
 }
 
-void mps_thread_dereg(mps_thr_t mps_thr)
+void mps_thread_dereg(mps_thr_t thread)
 {
-  Thread thread = (Thread)mps_thr;
   Arena arena;
 
   AVER(ThreadCheckSimple(thread));
@@ -1564,10 +1548,8 @@ mps_bool_t mps_message_get(mps_message_t *mps_message_return,
 }
 
 void mps_message_discard(mps_arena_t arena,
-                         mps_message_t mps_message)
+                         mps_message_t message)
 {
-  Message message = (Message)mps_message;
-
   ArenaEnter(arena);
 
   MessageDiscard(arena, message);
@@ -1581,9 +1563,8 @@ void mps_message_discard(mps_arena_t arena,
 /* -- All Message Types */
 
 mps_message_type_t mps_message_type(mps_arena_t arena,
-                                    mps_message_t mps_message)
+                                    mps_message_t message)
 {
-  Message message = (Message)mps_message;
   MessageType type;
 
   ArenaEnter(arena);
@@ -1596,9 +1577,8 @@ mps_message_type_t mps_message_type(mps_arena_t arena,
 }
 
 mps_clock_t mps_message_clock(mps_arena_t arena,
-                              mps_message_t mps_message)
+                              mps_message_t message)
 {
-  Message message = (Message)mps_message;
   Clock postedClock;
 
   ArenaEnter(arena);
@@ -1615,9 +1595,8 @@ mps_clock_t mps_message_clock(mps_arena_t arena,
 
 void mps_message_finalization_ref(mps_addr_t *mps_addr_return,
                                   mps_arena_t arena,
-                                  mps_message_t mps_message)
+                                  mps_message_t message)
 {
-  Message message = (Message)mps_message;
   Ref ref;
 
   AVER(mps_addr_return != NULL);
@@ -1634,9 +1613,8 @@ void mps_message_finalization_ref(mps_addr_t *mps_addr_return,
 /* -- mps_message_type_gc */
 
 size_t mps_message_gc_live_size(mps_arena_t arena,
-                                              mps_message_t mps_message)
+                                              mps_message_t message)
 {
-  Message message = (Message)mps_message;
   Size size;
 
   ArenaEnter(arena);
@@ -1649,9 +1627,8 @@ size_t mps_message_gc_live_size(mps_arena_t arena,
 }
 
 size_t mps_message_gc_condemned_size(mps_arena_t arena,
-                                     mps_message_t mps_message)
+                                     mps_message_t message)
 {
-  Message message = (Message)mps_message;
   Size size;
 
   ArenaEnter(arena);
@@ -1664,9 +1641,8 @@ size_t mps_message_gc_condemned_size(mps_arena_t arena,
 }
 
 size_t mps_message_gc_not_condemned_size(mps_arena_t arena,
-                                         mps_message_t mps_message)
+                                         mps_message_t message)
 {
-  Message message = (Message)mps_message;
   Size size;
 
   ArenaEnter(arena);
@@ -1681,10 +1657,9 @@ size_t mps_message_gc_not_condemned_size(mps_arena_t arena,
 /* -- mps_message_type_gc_start */
 
 const char *mps_message_gc_start_why(mps_arena_t arena,
-  mps_message_t mps_message)
+  mps_message_t message)
 {
   const char *s;
-  Message message = (Message)mps_message;
 
   ArenaEnter(arena);
 
@@ -1888,10 +1863,9 @@ mps_res_t mps_chain_create(mps_chain_t *chain_o, mps_arena_t arena,
 
 /* mps_chain_destroy -- destroy a chain */
 
-void mps_chain_destroy(mps_chain_t mps_chain)
+void mps_chain_destroy(mps_chain_t chain)
 {
   Arena arena;
-  Chain chain = (Chain)mps_chain;
 
   AVER(TESTT(Chain, chain));
   arena = chain->arena;
diff --git a/mps/code/protsgix.c b/mps/code/protsgix.c
index 9552d18eeca..39f19c90b4c 100644
--- a/mps/code/protsgix.c
+++ b/mps/code/protsgix.c
@@ -80,8 +80,6 @@ static void sigHandle(int sig, siginfo_t *info, void *context)  /* .sigh.args */
   struct sigaction sa;
   
   UNUSED(context);
-
-  UNUSED(context);
   AVER(sig == PROT_SIGNAL);
 
   /* .sigh.context */
diff --git a/mps/code/root.c b/mps/code/root.c
index 9ce385a124c..edb932f800a 100644
--- a/mps/code/root.c
+++ b/mps/code/root.c
@@ -33,7 +33,7 @@ typedef struct RootStruct {
   RootVar var;                  /* union discriminator */
   union RootUnion {
     struct {
-      RootScanMethod scan;      /* the function which does the scanning */
+      mps_root_scan_t scan;     /* the function which does the scanning */
       void *p;                  /* environment for scan */
       size_t s;                 /* environment for scan */
     } fun;
@@ -47,13 +47,13 @@ typedef struct RootStruct {
       Word mask;                /* tag mask for scanning */
     } tableMasked;
     struct {
-      RootScanRegMethod scan;   /* function for scanning registers */
+      mps_reg_scan_t scan;      /* function for scanning registers */
       Thread thread;            /* passed to scan */
       void *p;                  /* passed to scan */
       size_t s;                 /* passed to scan */
     } reg;
     struct {
-      FormatScanMethod scan;    /* format-like scanner */
+      mps_fmt_scan_t scan;      /* format-like scanner */
       Addr base, limit;         /* passed to scan */
     } fmt;
   } the;
@@ -296,7 +296,7 @@ Res RootCreateTableMasked(Root *rootReturn, Arena arena,
 
 Res RootCreateReg(Root *rootReturn, Arena arena,
                   Rank rank, Thread thread,
-                  RootScanRegMethod scan, void *p, size_t s)
+                  mps_reg_scan_t scan, void *p, size_t s)
 {
   union RootUnion theUnion;
 
@@ -315,7 +315,7 @@ Res RootCreateReg(Root *rootReturn, Arena arena,
 }
 
 Res RootCreateFmt(Root *rootReturn, Arena arena,
-                  Rank rank, RootMode mode, FormatScanMethod scan,
+                  Rank rank, RootMode mode, mps_fmt_scan_t scan,
                   Addr base, Addr limit)
 {
   union RootUnion theUnion;
@@ -336,7 +336,7 @@ Res RootCreateFmt(Root *rootReturn, Arena arena,
 }
 
 Res RootCreateFun(Root *rootReturn, Arena arena, Rank rank,
-                  RootScanMethod scan, void *p, size_t s)
+                  mps_root_scan_t scan, void *p, size_t s)
 {
   union RootUnion theUnion;
 
diff --git a/mps/code/sc.h b/mps/code/sc.h
new file mode 100644
index 00000000000..765c4ccb033
--- /dev/null
+++ b/mps/code/sc.h
@@ -0,0 +1,205 @@
+/* sc.h: STACK CONTEXT
+ *
+ * $Id$
+ * Copyright (c) 2012 Ravenbrook Limited.  See end of file for license.
+ *
+ * Provides a context to hold the registers and stack pointer
+ * 
+ * This file provide wrappers for using setjmp or some similar mechanism
+ * to save the current callee-saves on the stack.
+ *
+ * See http://info.ravenbrook.com/mail/2012/08/03/14-36-35/0/ and the rest of
+ * the thread for the origin of the idea.
+ * 
+ * TODO: Make StackScan take a StackContext
+ */
+
+#ifndef sc_h
+#define sc_h
+
+#include "mpm.h"
+
+     
+/* StackContext -- holds the registers including a stack pointer
+ *
+ * This contains the callee-save registers and the stack pointer.
+ *
+ * This is used to save the registers after or on entry to the arena so that
+ * they can be scanned.
+ */
+
+/* STACK_CONTEXT_SAVE - save the callee-saves and stack pointer
+ * 
+ * This macro saves the callee-saves and stack pointer for the
+ * current function into the passed StackContext.  The StackContext
+ * is no longer valid after the function returns.
+ *
+ * This needs to be a macro because the compiler may need to do
+ * setjmp magic.
+ */
+ 
+/* StackContextStackTop - return the stack top from the stack context.
+ * 
+ * We assume the stack is full.  In other words the stack top points at
+ * a word that contains a potential Ref.
+ */
+
+
+/* Mac OS X on 32-bit Intel built with Clang or GCC */
+
+#if defined(MPS_PF_XCI3LL) || defined(MPS_PF_XCI3GC)
+
+#include <setjmp.h>
+
+typedef struct StackContextStruct {
+  jmp_buf jumpBuffer;
+} StackContextStruct;
+
+/* See the implementation of _setjmp in
+ * <http://www.opensource.apple.com/source/Libc/Libc-825.24/i386/sys/_setjmp.s> */
+
+#define JB_ESP 36 /* offset into the jmp_buf in bytes as defined in _setjmp.s */
+
+#define STACK_CONTEXT_SAVE(sc) ((void)_setjmp((sc)->jumpBuffer))
+
+#define StackContextSP(sc) ((Addr *)(sc)->jumpBuffer[JB_ESP/sizeof(int)])
+
+/* On MacOS X the stackPointer can end up pointing above the StackContext
+ * which we assume to be stored on the stack because it is no longer
+ * needed once we have _longjmp()ed back. So take the minimum of the 
+ * SP and the base of the StackContext structure. */
+#define StackContextStackTop(sc) \
+  (StackContextSP(sc) < (Addr*)(sc) ? StackContextSP(sc) : (Addr*)(sc))
+
+
+/* Mac OS X on 64-bit Intel build with Clang or GCC */
+
+#elif defined(MPS_PF_XCI6LL) || defined(MPS_PF_XCI6GC)
+
+#include <setjmp.h>
+
+/* We could use getcontext() from libunwind but that produces
+ * deprecation warnings.  See
+ * <http://stackoverflow.com/questions/3592914/how-can-i-implement-cooperative-lightweight-threading-with-c-on-mac-os-x>
+ */
+
+typedef struct StackContextStruct {
+  jmp_buf jumpBuffer;
+} StackContextStruct;
+
+/* See the implementation of _setjmp in
+ * <http://www.opensource.apple.com/source/Libc/Libc-825.24/x86_64/sys/_setjmp.s> */
+
+#define STACK_CONTEXT_SAVE(sc) ((void)_setjmp((sc)->jumpBuffer))
+
+#define JB_RSP 16 /* offset into the jmp_buf in bytes as defined in _setjmp.s */
+
+/* jmp_buf is an int[] but the stack pointer is 8 bytes so we need a cast */
+/* FIXME: possible aliasing problem */
+#define StackContextSP(sc) \
+  (*(Addr **)((char *)(sc)->jumpBuffer+JB_RSP))
+
+/* On MacOS X the stackPointer can end up pointing above the StackContext
+ * which we assume to be stored on the stack because it is no longer
+ * needed once we have _longjmp()ed back. So take the minimum of the 
+ * SP and the base of the StackContext structure. */
+#define StackContextStackTop(sc) \
+  (StackContextSP(sc) < (Addr*)(sc) ? StackContextSP(sc) : (Addr*)(sc))
+
+
+/* Windows on 32-bit Intel with Microsoft Visual Studio */
+
+#elif defined(MPS_PF_W3I3MV)
+
+#include <setjmp.h>
+
+typedef struct StackContextStruct {
+  jmp_buf jumpBuffer;
+} StackContextStruct;
+
+#define STACK_CONTEXT_SAVE(sc) ((void)setjmp((sc)->jumpBuffer))
+
+#define StackContextStackTop(sc) \
+  ((Addr *)((_JUMP_BUFFER *)(sc)->jumpBuffer)->Esp)
+
+
+/* Windows on 64-bit Intel with Microsoft Visual Studio */
+
+#elif defined(MPS_PF_W3I6MV)
+
+#include <setjmp.h>
+
+typedef struct StackContextStruct {
+  jmp_buf jumpBuffer;
+} StackContextStruct;
+
+#define STACK_CONTEXT_SAVE(sc) ((void)setjmp((sc)->jumpBuffer))
+
+#define StackContextStackTop(sc) \
+  ((Addr *)((_JUMP_BUFFER *)(sc)->jumpBuffer)->Rsp)
+
+
+#else
+
+/* TODO: implement this on other platforms in a safer way.
+ * Potentially the callee saves from the calling function could be spilled
+ * underneath the jmp_buf so returning the address of the jmp_buf for the
+ * stack top is not completely safe.  
+ */
+
+#include <setjmp.h>
+
+typedef struct StackContextStruct {
+  jmp_buf jumpBuffer;
+} StackContextStruct;
+
+#define STACK_CONTEXT_SAVE(sc) ((void)setjmp((sc)->jumpBuffer))
+
+#define StackContextStackTop(sc) ((Addr *)(sc)->jumpBuffer)
+
+
+#endif /* platform defines */
+
+#endif /* sc_h */
+
+
+/* C. COPYRIGHT AND LICENSE
+ *
+ * Copyright (C) 2001-2012 Ravenbrook Limited <http://www.ravenbrook.com/>.
+ * All rights reserved.  This is an open source license.  Contact
+ * Ravenbrook for commercial licensing options.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * 3. Redistributions in any form must be accompanied by information on how
+ * to obtain complete source code for this software and any accompanying
+ * software that uses this software.  The source code must either be
+ * included in the distribution or be available for no more than the cost
+ * of distribution plus a nominal fee, and must be freely redistributable
+ * under reasonable conditions.  For an executable file, complete source
+ * code means the source code for all modules it contains. It does not
+ * include source code for modules or files that typically accompany the
+ * major components of the operating system on which the executable file
+ * runs.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/mps/code/ssw3i3mv.c b/mps/code/ssw3i3mv.c
index d33bc378e46..aac035a5966 100755
--- a/mps/code/ssw3i3mv.c
+++ b/mps/code/ssw3i3mv.c
@@ -1,4 +1,4 @@
-/* ssw3i3.c: WIN32/INTEL STACK SCANNING
+/* ssw3i3mv.c: STACK SCANNING FOR WIN32 WITH MICROSOFT C
  *
  * $Id$
  * Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
@@ -6,20 +6,20 @@
  *  This scans the stack and fixes the registers which may contain
  *  roots.  See <design/thread-manager/>.
  *
- *  The registers edi, esi, ebx are the registers defined to be preserved
- *  across function calls and therefore may contain roots.
- *  These are pushed on the stack for scanning.
+ * REFERENCES
  *
- * ASSUMPTIONS
+ * "Argument Passing and Naming Conventions"; MSDN; Microsoft Corporation;
+ * <http://msdn.microsoft.com/en-us/library/984x0h58%28v=vs.100%29.aspx>.
  *
- * .align: The stack pointer is assumed to be aligned on a word
- * boundary.
+ * "Calling conventions for different C++ compilers and operating systems";
+ * Agner Fog; Copenhagen University College of Engineering; 2012-02-29;
+ * <http://agner.org./optimize/calling_conventions.pdf>.
  */
 
 
 #include "mpm.h"
 
-SRCID(ssw3i3, "$Id$");
+SRCID(ssw3i3mv, "$Id$");
 
 
 Res StackScan(ScanState ss, Addr *stackBot)
diff --git a/mps/code/ssw3i6mv.c b/mps/code/ssw3i6mv.c
index d3e1dd85f46..807577a89a2 100755
--- a/mps/code/ssw3i6mv.c
+++ b/mps/code/ssw3i6mv.c
@@ -1,16 +1,33 @@
-/* ssw3mv.c: STACK SCANNING FOR WIN32 WITH MICROSOFT C
+/* ssw3i6mv.c: STACK SCANNING FOR WIN32 WITH MICROSOFT C
  *
  * $Id$
  * Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
  *
  * This scans the stack and fixes the registers which may contain roots.
- * See <design/thread-manager/>.
+ * See <design/thread-manager/>.  It's unlikely that the callee-save
+ * registers contain mutator roots by the time this function is called, but
+ * we can't be certain, so we must scan them anyway.
+ *
+ * REFERENCES
+ *
+ * "Overview of x64 Calling Conventions"; MSDN; Microsoft Corporation;
+ * <http://msdn.microsoft.com/en-us/library/ms235286%28v=vs.100%29.aspx>.
+ *
+ * "Caller/Callee Saved Registers"; MSDN; Microsoft Corporation;
+ * <http://msdn.microsoft.com/en-us/library/6t169e9c%28v=vs.100%29.aspx>.
+ *
+ * "Register Usage"; MSDN; Microsoft Corporation;
+ * <http://msdn.microsoft.com/en-us/library/9z1stfyw%28v=vs.100%29.aspx>.
+ *
+ * "Calling conventions for different C++ compilers and operating systems";
+ * Agner Fog; Copenhagen University College of Engineering; 2012-02-29;
+ * <http://agner.org./optimize/calling_conventions.pdf>.
  */
 
 #include "mpm.h"
 #include <setjmp.h>
 
-SRCID(ssw3mv, "$Id$");
+SRCID(ssw3i6mv, "$Id$");
 
 
 Res StackScan(ScanState ss, Addr *stackBot)
@@ -44,3 +61,44 @@ Res StackScan(ScanState ss, Addr *stackBot)
 
   return StackScanInner(ss, stackBot, (Addr *)&((_JUMP_BUFFER *)jb)->Rbx, 9);
 }
+
+/* C. COPYRIGHT AND LICENSE
+ *
+ * Copyright (C) 2001-2002 Ravenbrook Limited <http://www.ravenbrook.com/>.
+ * All rights reserved.  This is an open source license.  Contact
+ * Ravenbrook for commercial licensing options.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * 3. Redistributions in any form must be accompanied by information on how
+ * to obtain complete source code for this software and any accompanying
+ * software that uses this software.  The source code must either be
+ * included in the distribution or be available for no more than the cost
+ * of distribution plus a nominal fee, and must be freely redistributable
+ * under reasonable conditions.  For an executable file, complete source
+ * code means the source code for all modules it contains. It does not
+ * include source code for modules or files that typically accompany the
+ * major components of the operating system on which the executable file
+ * runs.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/mps/code/table.c b/mps/code/table.c
index 7e6b1ec7149..3e5cc0c14ae 100644
--- a/mps/code/table.c
+++ b/mps/code/table.c
@@ -16,7 +16,7 @@
 SRCID(table, "$Id$");
 
 
-/* TableHash -- return a hash value from an address
+/* tableHash -- return a hash value from an address
  *
  * This uses a single cycle of an MLCG, more commonly seen as a 
  * pseudorandom number generator.  It works extremely well as a 
@@ -36,10 +36,16 @@ SRCID(table, "$Id$");
  * Of course it's only a 31-bit cycle, so we start by losing the top 
  * bit of the address, but that's hardly a great problem.
  *
+ * See `rnd` in testlib.c for more technical details.
+ *
  * The implementation is quite subtle.  See rnd() in testlib.c, where 
  * it has been exhaustively (ie: totally) tested.  RHSK 2010-12-28.
  *
- * TODO: Check how this works out on 64-bit. RB 2012-09-04
+ * NOTE: According to NB, still a fine function for producing a 31-bit hash
+ * value, although of course it only hashes on the lower 31 bits of the
+ * key; we could cheaply make it choose a different 31 bits if we'd prefer
+ * (e.g. ((key >> 2) & 0x7FFFFFFF)), or combine more of the key bits (e.g.
+ * ((key ^ (key >> 31)) & 0x7fffffff)).
  */
  
 #define R_m 2147483647UL
@@ -47,16 +53,16 @@ SRCID(table, "$Id$");
 
 typedef Word Hash;
 
-static Hash TableHash(Word key)
+static Hash tableHash(Word key)
 {
-  Hash seed = (Hash)(key & 0x7FFFFFFF);
+  Hash hash = (Hash)(key & 0x7FFFFFFF);
   /* requires m == 2^31-1, a < 2^16 */
-  Hash bot = R_a * (seed & 0x7FFF);
-  Hash top = R_a * (seed >> 15);
-  seed = bot + ((top & 0xFFFF) << 15) + (top >> 16);
-  if(seed > R_m)
-    seed -= R_m;
-  return seed;
+  Hash bot = R_a * (hash & 0x7FFF);
+  Hash top = R_a * (hash >> 15);
+  hash = bot + ((top & 0xFFFF) << 15) + (top >> 16);
+  if(hash > R_m)
+    hash -= R_m;
+  return hash;
 }
 
 
@@ -80,14 +86,14 @@ static Bool entryIsActive(Table table, TableEntry entry)
 }
 
 
-/* TableFind -- finds the entry for this key, or NULL
+/* tableFind -- finds the entry for this key, or NULL
  *
  * .worst: In the worst case, this looks at every slot before giving up,
  * but that's what you have to do in a closed hash table, to make sure
  * that all the items still fit in after growing the table.
  */
 
-static TableEntry TableFind(Table table, Word key, Bool skip_deleted)
+static TableEntry tableFind(Table table, Word key, Bool skip_deleted)
 {
   Hash hash;
   Index i;
@@ -98,7 +104,7 @@ static TableEntry TableFind(Table table, Word key, Bool skip_deleted)
   AVER(WordIsP2(table->length)); /* .find.visit */
 
   mask = table->length - 1; 
-  hash = TableHash(key) & mask;
+  hash = tableHash(key) & mask;
   i = hash;
   do {
     Word k = table->array[i].key;
@@ -191,7 +197,7 @@ Res TableGrow(Table table, Count extraCapacity)
   for(i = 0; i < oldLength; ++i) {
     if (entryIsActive(table, &oldArray[i])) {
       TableEntry entry;
-      entry = TableFind(table, oldArray[i].key, FALSE /* none deleted */);
+      entry = tableFind(table, oldArray[i].key, FALSE /* none deleted */);
       AVER(entry != NULL);
       AVER(entry->key == table->unusedKey);
       entry->key = oldArray[i].key;
@@ -275,7 +281,7 @@ extern void TableDestroy(Table table)
 
 extern Bool TableLookup(void **valueReturn, Table table, Word key)
 {
-  TableEntry entry = TableFind(table, key, TRUE /* skip deleted */);
+  TableEntry entry = tableFind(table, key, TRUE /* skip deleted */);
 
   if(entry == NULL || !entryIsActive(table, entry))
     return FALSE;
@@ -296,16 +302,16 @@ extern Res TableDefine(Table table, Word key, void *value)
   if (table->count >= table->length * SPACEFRACTION) {
     Res res = TableGrow(table, 1);
     if(res != ResOK) return res;
-    entry = TableFind(table, key, FALSE /* no deletions yet */);
+    entry = tableFind(table, key, FALSE /* no deletions yet */);
     AVER(entry != NULL);
     if (entryIsActive(table, entry))
       return ResFAIL;
   } else {
-    entry = TableFind(table, key, TRUE /* skip deleted */);
+    entry = tableFind(table, key, TRUE /* skip deleted */);
     if (entry != NULL && entryIsActive(table, entry))
       return ResFAIL;
     /* Search again to find the best slot, deletions included. */
-    entry = TableFind(table, key, FALSE /* don't skip deleted */);
+    entry = tableFind(table, key, FALSE /* don't skip deleted */);
     AVER(entry != NULL);
   }
 
@@ -321,8 +327,12 @@ extern Res TableDefine(Table table, Word key, void *value)
 
 extern Res TableRedefine(Table table, Word key, void *value)
 {
-  TableEntry entry = TableFind(table, key, TRUE /* skip deletions */);
+  TableEntry entry;
  
+  AVER(key != table->unusedKey);
+  AVER(key != table->deletedKey);
+
+  entry = tableFind(table, key, TRUE /* skip deletions */);
   if (entry == NULL || !entryIsActive(table, entry))
     return ResFAIL;
   AVER(entry->key == key);
@@ -335,8 +345,12 @@ extern Res TableRedefine(Table table, Word key, void *value)
 
 extern Res TableRemove(Table table, Word key)
 {
-  TableEntry entry = TableFind(table, key, TRUE);
+  TableEntry entry;
+
+  AVER(key != table->unusedKey);
+  AVER(key != table->deletedKey);
 
+  entry = tableFind(table, key, TRUE);
   if (entry == NULL || !entryIsActive(table, entry))
     return ResFAIL;
   entry->key = table->deletedKey;
diff --git a/mps/code/than.c b/mps/code/than.c
index 96553c7cd75..752ef3ed64c 100644
--- a/mps/code/than.c
+++ b/mps/code/than.c
@@ -17,7 +17,7 @@
 SRCID(than, "$Id$");
 
 
-typedef struct ThreadStruct {   /* ANSI fake thread structure */
+typedef struct mps_thr_s {      /* ANSI fake thread structure */
   Sig sig;                      /* <design/sig/> */
   Serial serial;                /* from arena->threadSerial */
   Arena arena;                  /* owning arena */
diff --git a/mps/code/thix.c b/mps/code/thix.c
index 5089f33f56e..b792cd96783 100644
--- a/mps/code/thix.c
+++ b/mps/code/thix.c
@@ -43,7 +43,7 @@ SRCID(thix, "$Id$");
 
 /* ThreadStruct -- thread desriptor */
 
-typedef struct ThreadStruct {    /* PThreads thread structure */
+typedef struct mps_thr_s {       /* PThreads thread structure */
   Sig sig;                       /* <design/sig/> */
   Serial serial;                 /* from arena->threadSerial */
   Arena arena;                   /* owning arena */
diff --git a/mps/code/thw3.h b/mps/code/thw3.h
index b3e67cb319d..7e3cd68e2f1 100644
--- a/mps/code/thw3.h
+++ b/mps/code/thw3.h
@@ -21,7 +21,7 @@
 
 #include "mpswin.h"
 
-typedef struct ThreadStruct {   /* Win32 thread structure */
+typedef struct mps_thr_s {      /* Win32 thread structure */
   Sig sig;                      /* <design/sig/> */
   Serial serial;                /* from arena->threadSerial */
   Arena arena;                  /* owning arena */
diff --git a/mps/code/version.c b/mps/code/version.c
index 08b562ce09f..03e7b78334e 100644
--- a/mps/code/version.c
+++ b/mps/code/version.c
@@ -29,7 +29,7 @@ SRCID(version, "$Id$");
  * (Note: before 2006-02-01 the style was "release.epcore.chub")
  */
 
-#define MPS_RELEASE "release/1.109.0"
+#define MPS_RELEASE "release/1.110.0"
 
 
 /* MPSCopyrightNotice -- copyright notice for the binary
diff --git a/mps/code/w3build.bat b/mps/code/w3build.bat
deleted file mode 100755
index ae84606bff6..00000000000
--- a/mps/code/w3build.bat
+++ /dev/null
@@ -1,79 +0,0 @@
-@rem impl.bat.gathconf: GATHERING A RELEASE FOR CONFIGURA
-@rem
-@rem $HopeName: !gathconf.bat(trunk.1) $
-@rem $Id$
-@rem Copyright (C) 2000 Harlequin Limited.  All rights reserved.
-@rem Copyright (C) 2005-2010 Ravenbrook Limited.  All rights reserved.
-
-
-@set mpsreleasename=rel-1_109_0
-
-
-rmdir /q/s w3i3mv
-nmake /f w3i3mv.nmk VARIETY=we mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-nmake /f w3i3mv.nmk VARIETY=hi mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-nmake /f w3i3mv.nmk VARIETY=di mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-nmake /f w3i3mv.nmk VARIETY=ci mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-
-rmdir /q/s %mpsreleasename%
-mkdir %mpsreleasename%
-
-mkdir %mpsreleasename%\include
-copy mps.h %mpsreleasename%\include
-copy mpstr.h %mpsreleasename%\include
-copy mpsavm.h %mpsreleasename%\include
-copy mpsacl.h %mpsreleasename%\include
-copy mpscamc.h %mpsreleasename%\include
-copy mpscams.h %mpsreleasename%\include
-copy mpscawl.h %mpsreleasename%\include
-copy mpsclo.h %mpsreleasename%\include
-copy mpscmv.h %mpsreleasename%\include
-copy mpscmvff.h %mpsreleasename%\include
-copy mpscsnc.h %mpsreleasename%\include
-copy mpsio.h %mpsreleasename%\include
-copy mpslib.h %mpsreleasename%\include
-copy mpslibcb.h %mpsreleasename%\include
-copy mpstd.h %mpsreleasename%\include
-copy mpsw3.h %mpsreleasename%\include
-copy mpswin.h %mpsreleasename%\include
-
-mkdir %mpsreleasename%\lib
-copy w3gen.def %mpsreleasename%\lib\mps-fns.def
-
-mkdir %mpsreleasename%\lib\w3i3
-
-mkdir %mpsreleasename%\lib\w3i3\we
-@echo we-%mpsreleasename% > %mpsreleasename%\lib\w3i3\we\we-%mpsreleasename%.txt
-copy w3i3mv\we\mps.lib %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsplan.lib %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsplcb.lib %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsdy.dll %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsdy.lib %mpsreleasename%\lib\w3i3\we
-
-mkdir %mpsreleasename%\lib\w3i3\hi
-@echo hi-%mpsreleasename% > %mpsreleasename%\lib\w3i3\hi\hi-%mpsreleasename%.txt
-copy w3i3mv\hi\mps.lib %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsplan.lib %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsplcb.lib %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsdy.dll %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsdy.lib %mpsreleasename%\lib\w3i3\hi
-
-mkdir %mpsreleasename%\lib\w3i3\di
-@echo di-%mpsreleasename% > %mpsreleasename%\lib\w3i3\di\di-%mpsreleasename%.txt
-copy w3i3mv\di\mps.lib %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsplan.lib %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsplcb.lib %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsdy.dll %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsdy.lib %mpsreleasename%\lib\w3i3\di
-
-mkdir %mpsreleasename%\lib\w3i3\ci
-@echo ci-%mpsreleasename% > %mpsreleasename%\lib\w3i3\ci\ci-%mpsreleasename%.txt
-copy w3i3mv\ci\mps.lib %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsplan.lib %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsplcb.lib %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsdy.dll %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsdy.lib %mpsreleasename%\lib\w3i3\ci
-
-mkdir %mpsreleasename%\src
-copy mpsliban.c %mpsreleasename%\src
-copy mpsioan.c %mpsreleasename%\src
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 37d440235e8..ebe971e1626 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -19,7 +19,7 @@ MPM = <ring> <mpm> <bt> <protocol> <boot> \
       <shield> <vmw3> <table> \
       <thw3> <thw3i3> <ss> <ssw3i3mv> <mpsi> <mpsiw3> <ld> <spi3> \
       <event> <seg> <sac> <poolmrg> <message> <dbgpool> <dbgpooli> \
-      <abq> <meter> <cbs> <poolmv2> <splay> <diag> <version>
+      <abq> <meter> <cbs> <poolmv2> <splay> <diag>
 PLINTH = <mpsliban> <mpsioan>
 AMC = <poolamc>
 AMS = <poolams> <poolamsi>
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk
index 23fc63ef66d..729509f05dc 100644
--- a/mps/code/w3i6mv.nmk
+++ b/mps/code/w3i6mv.nmk
@@ -20,7 +20,7 @@ MPM = <ring> <mpm> <bt> <protocol> <boot> \
       <shield> <vmw3> <table> \
       <thw3> <thw3i6> <ss> <ssw3i6mv> <mpsi> <mpsiw3> <ld> <span> \
       <event> <seg> <sac> <poolmrg> <message> <dbgpool> <dbgpooli> \
-      <abq> <meter> <cbs> <poolmv2> <splay> <diag> <version>
+      <abq> <meter> <cbs> <poolmv2> <splay> <diag>
 PLINTH = <mpsliban> <mpsioan>
 AMC = <poolamc>
 AMS = <poolams> <poolamsi>