Mps: merging branch/2004-12-15/dll

p4 integ -n -r -b mps/branch/2004-12-15/dll

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

14 files changed, 867 insertions, 49 deletions

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index b9057e678dc..13e313fc16e 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -268,7 +268,7 @@ all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \
      mpsicv lockcov poolncv locv qs apss \
      finalcv finaltest arenacv bttest teletest \
      abqtest cbstest btcv mv2test messtest steptest \
-     eventcnv walkt0 \
+     eventcnv walkt0 libcbt \
      mps.a
 
 swall: mmsw.a replaysw
@@ -293,6 +293,7 @@ mpmss sacss amcss amcssth amcsshe amsss amssshe segsmss awlut awlutth \
   awluthe mpsicv lockcov poolncv locv qs apss \
   finalcv finaltest arenacv bttest teletest \
   expt825 \
+  libcbt \
   abqtest cbstest btcv mv2test \
   messtest steptest \
   walkt0 \
@@ -349,98 +350,103 @@ endif
 ifdef VARIETY
 
 $(PFM)/$(VARIETY)/finalcv: $(PFM)/$(VARIETY)/finalcv.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/finaltest: $(PFM)/$(VARIETY)/finaltest.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/expt825: $(PFM)/$(VARIETY)/expt825.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+
+$(PFM)/$(VARIETY)/libcbt: $(PFM)/$(VARIETY)/libcbt.o \
+        $(PFM)/$(VARIETY)/mpslibcb.o \
+        $(PFM)/$(VARIETY)/mpsioan.o \
+        $(MPMOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/locv: $(PFM)/$(VARIETY)/locv.o \
-        $(MPMOBJ) $(LOOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(LOOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/mpmss: $(PFM)/$(VARIETY)/mpmss.o \
-        $(MPMOBJ) $(MVFFOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(MVFFOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/apss: $(PFM)/$(VARIETY)/apss.o \
-        $(MPMOBJ) $(MVFFOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(MVFFOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/sacss: $(PFM)/$(VARIETY)/sacss.o \
-        $(MPMOBJ) $(MVFFOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(MVFFOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/bttest: $(PFM)/$(VARIETY)/bttest.o \
-        $(MPMOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/teletest: $(PFM)/$(VARIETY)/teletest.o \
-        $(MPMOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/lockcov: $(PFM)/$(VARIETY)/lockcov.o \
-        $(MPMOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/mpsicv: $(PFM)/$(VARIETY)/mpsicv.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/amcss: $(PFM)/$(VARIETY)/amcss.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/amcssth: $(PFM)/$(VARIETY)/amcssth.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/amcsshe: $(PFM)/$(VARIETY)/amcsshe.o \
-        $(FMTHETSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTHETSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/amsss: $(PFM)/$(VARIETY)/amsss.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMSOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMSOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/amssshe: $(PFM)/$(VARIETY)/amssshe.o \
-        $(FMTHETSTOBJ) $(MPMOBJ) $(AMSOBJ) $(TESTLIBOBJ)
+        $(FMTHETSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMSOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/segsmss: $(PFM)/$(VARIETY)/segsmss.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMSOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMSOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/awlut: $(PFM)/$(VARIETY)/awlut.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(LOOBJ) $(AWLOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(LOOBJ) $(AWLOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/awluthe: $(PFM)/$(VARIETY)/awluthe.o \
-        $(FMTHETSTOBJ) $(MPMOBJ) $(LOOBJ) $(AWLOBJ) $(TESTLIBOBJ)
+        $(FMTHETSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(LOOBJ) $(AWLOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/awlutth: $(PFM)/$(VARIETY)/awlutth.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(LOOBJ) $(AWLOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(LOOBJ) $(AWLOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/poolncv: $(PFM)/$(VARIETY)/poolncv.o \
-        $(MPMOBJ) $(TESTLIBOBJ) $(POOLNOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(POOLNOBJ)
 
 $(PFM)/$(VARIETY)/qs: $(PFM)/$(VARIETY)/qs.o \
-        $(AMCOBJ) $(MPMOBJ) $(TESTLIBOBJ)
+        $(AMCOBJ) $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/arenacv: $(PFM)/$(VARIETY)/arenacv.o \
-        $(MPMOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/abqtest: $(PFM)/$(VARIETY)/abqtest.o \
-        $(PFM)/$(VARIETY)/abq.o $(MPMOBJ) $(TESTLIBOBJ)
+        $(PFM)/$(VARIETY)/abq.o $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/cbstest: $(PFM)/$(VARIETY)/cbstest.o \
-        $(MPMOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/btcv: $(PFM)/$(VARIETY)/btcv.o \
-        $(MPMOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/mv2test: $(PFM)/$(VARIETY)/mv2test.o \
         $(PFM)/$(VARIETY)/poolmv2.o $(PFM)/$(VARIETY)/abq.o \
-        $(MPMOBJ) $(TESTLIBOBJ)
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/messtest: $(PFM)/$(VARIETY)/messtest.o \
         $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/steptest: $(PFM)/$(VARIETY)/steptest.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/walkt0: $(PFM)/$(VARIETY)/walkt0.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/exposet0: $(PFM)/$(VARIETY)/exposet0.o \
-        $(FMTDYTSTOBJ) $(MPMOBJ) $(AMCOBJ) $(TESTLIBOBJ)
+        $(FMTDYTSTOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/eventcnv: $(PFM)/$(VARIETY)/eventcnv.o \
   $(PFM)/$(VARIETY)/eventpro.o $(PFM)/$(VARIETY)/table.o
@@ -448,7 +454,8 @@ $(PFM)/$(VARIETY)/eventcnv: $(PFM)/$(VARIETY)/eventcnv.o \
 $(PFM)/$(VARIETY)/replay: $(PFM)/$(VARIETY)/replay.o \
   $(PFM)/$(VARIETY)/eventrep.o \
   $(PFM)/$(VARIETY)/eventpro.o $(PFM)/$(VARIETY)/table.o \
-  $(MPMOBJ) $(AWLOBJ) $(AMSOBJ) $(POOLNOBJ) $(AMCOBJ) $(SNCOBJ) $(MVFFOBJ)
+  $(MPMOBJ) $(PLINTHOBJ) $(AWLOBJ) $(AMSOBJ) $(POOLNOBJ) \
+  $(AMCOBJ) $(SNCOBJ) $(MVFFOBJ)
 
 $(PFM)/$(VARIETY)/mps.a: $(MPMOBJ) $(AMCOBJ) $(SNCOBJ) $(MVFFOBJ)
 
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 4025b8bf8e5..a205a1a618c 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -37,7 +37,8 @@ mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awlu
      walkt0.exe locbwcss.exe locusss.exe \
      exposet0.exe \
      replay.exe replaysw.exe eventcnv.exe \
-     mmdw.lib mmsw.lib mps.lib mpsplan.lib:
+     mmdw.lib mmsw.lib mps.lib mpsplan.lib mpsplcb.lib \
+     mpsdy.dll:
 !IFDEF VARIETY
         $(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety
 !ELSE
@@ -252,10 +253,27 @@ $(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
         $(ECHO) $@
         $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
 
+# We would like to use $** in the linker command line here, but we
+# cannot because the target, mpsdy.dll, depends on the w3gen.def file,
+# but this is not to be treated as an object on the linker line.  Sorry
+# about the repetition of the object list.
+$(PFM)\$(VARIETY)\mpsdy.dll: $(PFM)\$(VARIETY)\mpslibcb.obj \
+        $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
+        $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) w3gen.def 
+        $(ECHO) $@
+        $(LINKER) $(LINKFLAGS) /def:w3gen.def /dll /OUT:$@ \
+          $(PFM)\$(VARIETY)\mpslibcb.obj \
+          $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
+          $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ)
+
 $(PFM)\$(VARIETY)\mpsplan.lib: $(PLINTHOBJ)
         $(ECHO) $@
         $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
 
+$(PFM)\$(VARIETY)\mpsplcb.lib: $(PFM)\$(VARIETY)\mpslibcb.obj
+        $(ECHO) $@
+        $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
+
 !ENDIF
 
 
diff --git a/mps/code/commpre.nmk b/mps/code/commpre.nmk
index 7e6cf8abc3e..c10da3de76d 100644
--- a/mps/code/commpre.nmk
+++ b/mps/code/commpre.nmk
@@ -129,8 +129,14 @@ CFLAGSCOMMONPOST = $(CFLAGSTARGETPOST)
 
 # Flags for use in the variety combinations
 CFLAGSHOT = /Ox /DNDEBUG
+# We used to have /GZ here (stack probe).
 # Note that GZ is specific to version 12 of the cl tool.  drj 2003-11-04
-CFLAGSCOOL = /Od /GZ
+# It is ignored on earlier versions of the cl tool.
+# /GZ here generates a dependency on the C library and when we are
+# building a DLL, mpsdy.dll, the linker step will fail (error LNK2001:
+# unresolved external symbol __chkesp).  See
+# http://support.microsoft.com/kb/q191669/
+CFLAGSCOOL = /Od
 CFLAGSINTERNAL = /Zi
 CFLAGSEXTERNAL =
 
diff --git a/mps/code/config.h b/mps/code/config.h
index 75ceb2131c0..6c4f8a49e0d 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -268,11 +268,6 @@
 #elif defined(CONFIG_PROD_DYLAN)
 #define MPS_PROD_STRING         "dylan"
 #define MPS_PROD_DYLAN
-/* .prod.arena-size: ARENA_SIZE is currently set larger for the
- * MM/Dylan product as an interim solution.
- * See request.dylan.170170.sol.patch and change.dylan.buffalo.170170.
- */
-#define ARENA_SIZE              ((Size)1<<30)
 #define ARENA_INIT_SPARE_COMMIT_LIMIT   ((Size)10uL*1024uL*1024uL)
 #define THREAD_MULTI
 #define PROTECTION
@@ -292,6 +287,14 @@
 #error "No target product configured."
 #endif
 
+/* .prod.arena-size: ARENA_SIZE is currently set larger for the
+ * MM/Dylan product as an interim solution.
+ * See request.dylan.170170.sol.patch and change.dylan.buffalo.170170.
+ * Note that this define is only used by the implementation of the
+ * deprecated mps_space_create interface.
+ */
+#define ARENA_SIZE              ((Size)1<<30)
+
 /* if CHECK_DEFAULT hasn't been defined already (e.g. by a variety, or
  * in a makefile), take the value from the product. */
 
diff --git a/mps/code/expgen.sh b/mps/code/expgen.sh
new file mode 100755
index 00000000000..69e790aeb15
--- /dev/null
+++ b/mps/code/expgen.sh
@@ -0,0 +1,155 @@
+#!/bin/sh
+# $Header$
+#
+# Copyright (C) 2004 Ravenbrook Limited.  All rights reserved.
+#
+# expgen.sh
+#
+# Export Generator
+#
+# This is a script to generate the a list of exports that is required
+# for Windows DLL creation.
+#
+# It processed the mps header files and produces a .DEF file that is
+# suitable for use with the linker when producing a DLL file on Windows.
+#
+# When run, this script produces the following output files:
+# expgen - a plain text list of functions declared in the header files.
+# w3gen.def - a .def file suitable for use in the linker stage when
+# building a Windows .DLL.
+#
+# Procedure for rebuilding a new w3gen.def
+#
+# This procedure should be carried out when the contents of w3gen.def
+# would change.  This is a bit tricky to say exactly when, but certainly
+# when:
+# a) new functions are declared in public header files.
+# b) different header files are released to a client.
+#
+# Procedure:
+#
+# 1) Ensure that the sources for w3gen.def are submitted.  w3gen.def
+# must be built from versioned sources.
+# The sources are:
+# expgen.sh
+# w3build.bat
+# all the headers that get included.
+# For safety's sake better to ensure that no files are open:
+# p4 opened ...
+# should say '... - file(s) not opened on this client.'
+#
+# 2) Open w3gen.def for edit (making it writable)
+# p4 open w3gen.def
+#
+# 3) Run this script.
+# sh expgen.sh
+# There should be no output when successful.
+#
+# 4) Eyeball the diff.
+# p4 diff ...
+# Check the that resulting diff is sane.  For most changes it should
+# just consist of a new symbol being included (plus some Header related
+# junk).
+#
+# 5) Submit the change.
+# p4 submit ...
+#
+#
+# Design
+#
+# The script works by using the -fdump-translation-unit option of gcc.
+# This produces a more easily parseable rendering of the header files.
+# A fairly simple awk script is used to process the output.
+#
+#
+# Dependencies
+#
+# This script currently depends fairly heavily on being run in a
+# Unix-like environment with access to the GNU compiler.
+#
+# It's also fairly sensitive to changes in the undocumented format
+# produced by gcc -fdump-translation-unit.  Hopefully it is fairly easy
+# to adapt to changes in this output.
+#
+# Assumes it can freely write to the files "fun", "name-s".
+#
+#
+# Awk crash course
+#
+# Awk processes files line-by-line, thus the entire script is executed
+# for each line of the input file (more complex awk scripts can control
+# this using "next" and "getline" and so on).
+#
+# In awk $exp identifies a field within the line.  $1 is the first
+# field, $2 is the second and so on.  $0 is the whole line.  By default
+# fields are separated by whitespace.
+#
+# string ~ RE is a matching expression and evaulated to true iff the
+# string is matched by the regular expression.
+#
+# REFERENCES
+#
+# [SUSV3] Single UNIX Specification Version 3,
+# http://www.unix.org/single_unix_specification/
+#
+# For documenation of the standard utilities: sh, awk, join, sort, sed
+#
+# [MSDN-LINKER-DEF] Module-Definition (.def) files,
+# http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/_core_module.2d.definition_files.asp
+#
+# For documentation on the format of .def files.
+
+tu () {
+  # if invoked on a file called spong.h will produce a file named
+  # spong.h.tu
+  gcc -fdump-translation-unit -o /dev/null "$@"
+}
+
+# This list of header files is produced by
+# awk '/^copy.*\.h/{print $2}' w3build.bat
+# followed by manual removal of mpsw3.h mpswin.h (which gcc on UNIX
+# cannot parse).  Also removed are mpsio.h mpslib.h as they defined
+# interfaces that mps _uses_ not defines.  Also removed is mpscmvff.h as
+# it does not get included in mps.lib
+# The functions declared in mpsw3.h have to be added to the .def file by
+# hand later in this script.
+f='mps.h
+mpsavm.h
+mpsacl.h
+mpscamc.h
+mpscams.h
+mpscawl.h
+mpsclo.h
+mpscmv.h
+mpscsnc.h
+mpslibcb.h
+mpstd.h'
+
+tu $f
+
+>expgen
+
+for a in $f
+do
+  >fun
+  awk '
+    $2=="function_decl" && $7=="srcp:" && $8 ~ /^'$a':/ {print $4 >"fun"}
+    $2=="identifier_node"{print $1,$4}
+  ' $a.tu |
+  sort -k 1 >name-s
+
+  echo ';' $a >>expgen
+  sort -k 1 fun |
+    join -o 2.2 - name-s >>expgen
+done
+
+{
+  printf '; %sHeader%s\n' '$' '$'
+  echo '; DO NOT EDIT.  Automatically generated by $Header$' | sed 's/\$/!/g'
+  echo 'EXPORTS'
+  cat expgen
+  # This is where we manually the functions declared in mpsw3.h
+  echo ';' mpsw3.h - by hand
+  echo mps_SEH_filter
+  echo mps_SEH_handler
+} > w3gen.def
diff --git a/mps/code/libcbt.c b/mps/code/libcbt.c
new file mode 100644
index 00000000000..a865795f19c
--- /dev/null
+++ b/mps/code/libcbt.c
@@ -0,0 +1,69 @@
+/* libcbt: MPS LIBRARY CALLBACK TEST
+ *
+ * $Header$
+ * Copyright (C) 2005 Ravenbrook Limited.  See end of file for license.
+ *
+ * This is a simple test of the MPS Library Callback interface
+ * (mpslibcb.h). */
+
+#include "mps.h"
+#include "mpsavm.h"
+#include "mpslib.h"
+#include "mpslibcb.h"
+
+#include "testlib.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+void libcbt_assert_fail(const char *);
+mps_clock_t libcbt_clock(void);
+
+int main(void)
+{
+  int res;
+  int defects = 0;
+  mps_arena_t arena;
+
+  res = mps_lib_callback_register("not a callback", (void(*)(void))0);
+  if(MPS_RES_OK == res) {
+    printf("mps_lib_callback_register claims to successfully register\n"
+      "an interface that does not exist.\n");
+    ++ defects;
+  }
+  die(mps_lib_callback_register("mps_lib_assert_fail",
+    (void(*)(void))libcbt_assert_fail),
+    "register assert_fail");
+  /* The following functions are registered in the order that you get by
+   * providing no functions and then providing functions as they are
+   * required by assertionn failures.
+   * Interestingly, for this very simple test, only mps_clock is
+   * required. */
+  die(mps_lib_callback_register("mps_clock",
+    (mps_lib_function_t)libcbt_clock),
+    "register clock");
+  die(mps_arena_create(&arena, mps_arena_class_vm(), 1000*1000),
+    "mps_arena_create");
+  if(defects) {
+    printf("Conclusion: Defects detected.\n");
+  } else {
+    printf("Conclusion: Failed to find any defects.\n");
+  }
+  return 0;
+}
+
+void libcbt_assert_fail(const char *message)
+{
+  fflush(stdout);
+  fprintf(stderr, "\nMPS ASSERTION FAILURE (TEST): %s\n", message);
+  fflush(stderr);
+  abort();
+}
+
+mps_clock_t libcbt_clock(void)
+{
+  static mps_clock_t c = 0;
+
+  ++ c;
+  return c;
+}
diff --git a/mps/code/mps.h b/mps/code/mps.h
index 53edb1a9fed..8952ebe1d32 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -273,7 +273,10 @@ extern mps_bool_t mps_arena_has_addr(mps_arena_t, mps_addr_t);
 
 /* Client memory arenas */
 extern mps_res_t mps_arena_extend(mps_arena_t, mps_addr_t, size_t);
+#if 0
+/* There's no implementation for this function. */
 extern mps_res_t mps_arena_retract(mps_arena_t, mps_addr_t, size_t);
+#endif
 
 
 /* Object Formats */
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 53fda434dd1..9bf1a478ff4 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -443,12 +443,11 @@ mps_res_t mps_arena_create_v(mps_arena_t *mps_arena_o,
   return MPS_RES_OK;
 }
 
-#ifdef MPS_PROD_DYLAN
+/* DEPRECATED */
 mps_res_t mps_space_create(mps_space_t *mps_space_o)
 {
   return mps_arena_create(mps_space_o, mps_arena_class_vm(), ARENA_SIZE);
 }
-#endif
 
 
 /* mps_arena_destroy -- destroy an arena object */
@@ -461,12 +460,11 @@ void mps_arena_destroy(mps_arena_t mps_arena)
   ArenaDestroy(arena);
 }
 
-#ifdef MPS_PROD_DYLAN
+/* DEPRECATED */
 void mps_space_destroy(mps_space_t mps_space)
 {
   mps_arena_destroy(mps_space);
 }
-#endif
 
 
 /* mps_arena_has_addr -- is this address managed by this arena? */
diff --git a/mps/code/mpslibcb.c b/mps/code/mpslibcb.c
new file mode 100644
index 00000000000..41bf5bcb6c7
--- /dev/null
+++ b/mps/code/mpslibcb.c
@@ -0,0 +1,343 @@
+/* mpslibcb.c: RAVENBROOK MEMORY POOL SYSTEM LIBRARY INTERFACE (CALLBACK)
+ *
+ * $Header$
+ * Copyright (c) 2005 Ravenbrook Limited.  See end of file for license.
+ *
+ * .purpose: The purpose of this code is
+ *   1. permit the MPS Library Interface to be used conveniently when
+ *      the MPS is packaged as a dynamic library (and in particular a
+ *      Windows DLL).
+ *
+ * .readership: For MPS client application developers and MPS developers.
+ * .sources: <design/lib/>
+ *
+ * .freestanding: This is designed to be deployed in a freestanding
+ * environment, so we can't use strcmp from <string.h>, so we have to
+ * roll our own (in fact we only ever need equality so we define a
+ * simpler interface).
+ *
+ * .mpm.not: This module occupies a halfway house between the MPM and
+ * the client.  Let's make it clearer: this module should not use any
+ * services of the MPM.  That is, it should be written as if the client
+ * could have, in principle, written it.  .mpm.not.why: Perhaps the most
+ * compelling reason is that if config.h is included (via mpm.h) then
+ * the compile breaks on platform.w3i3mv because of "#define
+ * mps_lib_memset memset" in config.h.
+ */
+
+#include "mpslibcb.h"
+#include "mpslib.h"
+#include "mps.h"
+
+/* Forward declarations. */
+
+int mps_lib_callback_default_get_EOF(void);
+mps_lib_FILE *mps_lib_callback_default_get_stderr(void);
+mps_lib_FILE *mps_lib_callback_default_get_stdout(void);
+int mps_lib_callback_default_fputc(int c_, mps_lib_FILE *f_);
+int mps_lib_callback_default_fputs(const char *s_, mps_lib_FILE *f_);
+void *mps_lib_callback_default_memset(void *p_, int c_, size_t n_);
+void *mps_lib_callback_default_memcpy(void *p_, const void *q_, size_t n_);
+int mps_lib_callback_default_memcmp(const void *p_, const void *q_, size_t n_);
+mps_clock_t mps_lib_callback_default_clock(void);
+mps_clock_t mps_lib_callback_default_clocks_per_sec(void);
+unsigned long mps_lib_callback_default_telemetry_control(void);
+int mps_lib_callback_streq(const char *, const char *);
+
+/* Macros */
+
+/* See .freestanding */
+#define EQ(p, q) (mps_lib_callback_streq((p), (q)))
+/* We use this to call mps_lib_asssert_fail (which we only ever do
+ * unconditionally).  See .mpm.not on why we cannot use ASSERT from
+ * mpm.h */
+#define AFAIL mps_lib_assert_fail
+/* Replaced UNUSED from mpm.h, see .mpm.not */
+#define UNUSED(x) ((void)(x))
+
+/* Structures and Types */
+
+struct mps_lib_callback_s
+{
+  int (*lib_get_EOF)(void);
+  mps_lib_FILE * (*lib_get_stderr)(void);
+  mps_lib_FILE * (*lib_get_stdout)(void);
+  int (*lib_fputc)(int, mps_lib_FILE *);
+  int (*lib_fputs)(const char *, mps_lib_FILE *);
+  void (*lib_assert_fail)(const char *);
+  void * (*lib_memset)(void *, int, size_t);
+  void * (*lib_memcpy)(void *, const void *, size_t);
+  int (*lib_memcmp)(const void *, const void *, size_t);
+  mps_clock_t (*clock)(void);
+  mps_clock_t (*clocks_per_sec)(void);
+  unsigned long (*lib_telemetry_control)(void);
+};
+
+/* Globals */
+
+/* .global.why: A global is necessary so that we can store the function
+ * pointers that the client gives us.  The functions in the mpslib.h
+ * interface _are_ global.  There is no scope for having one memset
+ * function for one Arena and a different memset function for another.
+ * */
+
+/* The default functions are stubs that assert.  Except for the
+ * assert_fail function (which is called when assertions fail) which
+ * will be NULL.  This means: if you provide assert_fail and forget
+ * something else, you'll know about it.  If you do not provide
+ * assert_fail then it will probably stop anyway.
+ *
+ * These functions really do need to fail, so they subvert the checking
+ * mechanism (which is in mpm.h and not available to us, see .mpm.not)
+ */
+  
+struct mps_lib_callback_s mps_lib_callback_global = {
+  mps_lib_callback_default_get_EOF,
+  mps_lib_callback_default_get_stderr,
+  mps_lib_callback_default_get_stdout,
+  mps_lib_callback_default_fputc,
+  mps_lib_callback_default_fputs,
+  NULL, /* assert_fail */
+  mps_lib_callback_default_memset,
+  mps_lib_callback_default_memcpy,
+  mps_lib_callback_default_memcmp,
+  mps_lib_callback_default_clock,
+  mps_lib_callback_default_clocks_per_sec,
+  mps_lib_callback_default_telemetry_control
+};
+
+/* Functions */
+
+int mps_lib_callback_register(const char *name, mps_lib_function_t f)
+{
+  if(NULL == name) {
+    return MPS_RES_FAIL;
+  }
+  if(EQ(name, "mps_lib_get_EOF")) {
+    mps_lib_callback_global.lib_get_EOF = (int(*)(void))f;
+  } else if(EQ(name, "mps_lib_get_stderr")) {
+    mps_lib_callback_global.lib_get_stderr = (mps_lib_FILE *(*)(void))f;
+  } else if(EQ(name, "mps_lib_get_stdout")) {
+    mps_lib_callback_global.lib_get_stdout = (mps_lib_FILE *(*)(void))f;
+  } else if(EQ(name, "mps_lib_fputc")) {
+    mps_lib_callback_global.lib_fputc = (int(*)(int, mps_lib_FILE *))f;
+  } else if(EQ(name, "mps_lib_fputs")) {
+    mps_lib_callback_global.lib_fputs =
+      (int(*)(const char *, mps_lib_FILE *))f;
+  } else if(EQ(name, "mps_lib_assert_fail")) {
+    mps_lib_callback_global.lib_assert_fail = (void(*)(const char *))f;
+  } else if(EQ(name, "mps_lib_memset")) {
+    mps_lib_callback_global.lib_memset = (void *(*)(void *, int, size_t))f;
+  } else if(EQ(name, "mps_lib_memcpy")) {
+    mps_lib_callback_global.lib_memcpy =
+      (void *(*)(void *, const void *, size_t))f;
+  } else if(EQ(name, "mps_lib_memcmp")) {
+    mps_lib_callback_global.lib_memcmp =
+      (int(*)(const void *, const void *, size_t))f;
+  } else if(EQ(name, "mps_clock")) {
+    mps_lib_callback_global.clock = (mps_clock_t(*)(void))f;
+  } else if(EQ(name, "mps_clocks_per_sec")) {
+    mps_lib_callback_global.clocks_per_sec = (mps_clock_t(*)(void))f;
+  } else if(EQ(name, "mps_lib_telemetry_control")) {
+    mps_lib_callback_global.lib_telemetry_control =
+      (unsigned long(*)(void))f;
+  } else {
+    return MPS_RES_UNIMPL;
+  }
+  return MPS_RES_OK;
+}
+
+/* Return non-zero if and only if string p equals string q. */
+int mps_lib_callback_streq(const char *p, const char *q)
+{
+  do {
+    if(*p == '\0' && *q == '\0') {
+      return 1;
+    }
+  } while(*p++ == *q++);
+  return 0;
+}
+
+int mps_lib_callback_default_get_EOF(void)
+{
+  AFAIL("mps_lib_get_EOF needs to be provided");
+  return 0;
+}
+
+mps_lib_FILE *mps_lib_callback_default_get_stderr(void)
+{
+  AFAIL("mps_lib_get_stderr needs to be provided");
+  return NULL;
+}
+
+mps_lib_FILE *mps_lib_callback_default_get_stdout(void)
+{
+  AFAIL("mps_lib_get_stdout needs to be provided");
+  return NULL;
+}
+
+int mps_lib_callback_default_fputc(int c_, mps_lib_FILE *f_)
+{
+  UNUSED(c_);
+  UNUSED(f_);
+  AFAIL("mps_lib_fputc needs to be provided");
+  return 0;
+}
+
+int mps_lib_callback_default_fputs(const char *s_, mps_lib_FILE *f_)
+{
+  UNUSED(s_);
+  UNUSED(f_);
+  AFAIL("mps_lib_fputs needs to be provided");
+  return 0;
+}
+
+/* No default implementation for mps_lib_assert_fail */
+
+void *mps_lib_callback_default_memset(void *p_, int c_, size_t n_)
+{
+  UNUSED(p_);
+  UNUSED(c_);
+  UNUSED(n_);
+  AFAIL("mps_lib_memset needs to be provided");
+  return NULL;
+}
+
+void *mps_lib_callback_default_memcpy(void *p_, const void *q_, size_t n_)
+{
+  UNUSED(p_);
+  UNUSED(q_);
+  UNUSED(n_);
+  AFAIL("mps_lib_memcpy needs to be provided");
+  return NULL;
+}
+
+int mps_lib_callback_default_memcmp(const void *p_, const void *q_, size_t n_)
+{
+  UNUSED(p_);
+  UNUSED(q_);
+  UNUSED(n_);
+  AFAIL("mps_lib_memcmp needs to be provided");
+  return 0;
+}
+
+mps_clock_t mps_lib_callback_default_clock(void)
+{
+  AFAIL("mps_clock needs to be provided");
+  return 0;
+}
+
+mps_clock_t mps_lib_callback_default_clocks_per_sec(void)
+{
+  AFAIL("mps_clocks_per_sec needs to be provided");
+  return 0;
+}
+
+unsigned long mps_lib_callback_default_telemetry_control(void)
+{
+  AFAIL("mps_lib_telemetry_control needs to be provided");
+  return 0;
+}
+
+int mps_lib_get_EOF(void)
+{
+  return mps_lib_callback_global.lib_get_EOF();
+}
+
+mps_lib_FILE *mps_lib_get_stderr(void)
+{
+  return mps_lib_callback_global.lib_get_stderr();
+}
+
+mps_lib_FILE *mps_lib_get_stdout(void)
+{
+  return mps_lib_callback_global.lib_get_stdout();
+}
+
+int mps_lib_fputc(int c, mps_lib_FILE *f)
+{
+  return mps_lib_callback_global.lib_fputc(c, f);
+}
+
+int mps_lib_fputs(const char *s, mps_lib_FILE *f)
+{
+  return mps_lib_callback_global.lib_fputs(s, f);
+}
+
+void mps_lib_assert_fail(const char *m)
+{
+  mps_lib_callback_global.lib_assert_fail(m);
+}
+
+void *(mps_lib_memset)(void *p, int c, size_t n)
+{
+  return mps_lib_callback_global.lib_memset(p, c, n);
+}
+
+void *(mps_lib_memcpy)(void *p, const void *q, size_t n)
+{
+  return mps_lib_callback_global.lib_memcpy(p, q, n);
+}
+
+int (mps_lib_memcmp)(const void *p, const void *q, size_t n)
+{
+  return mps_lib_callback_global.lib_memcmp(p, q, n);
+}
+
+mps_clock_t mps_clock(void)
+{
+  return mps_lib_callback_global.clock();
+}
+
+mps_clock_t mps_clocks_per_sec(void)
+{
+  return mps_lib_callback_global.clocks_per_sec();
+}
+
+unsigned long mps_lib_telemetry_control(void)
+{
+  return mps_lib_callback_global.lib_telemetry_control();
+}
+
+
+
+/* C. COPYRIGHT AND LICENSE
+ *
+ * Copyright (C) 2005 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/mpslibcb.h b/mps/code/mpslibcb.h
new file mode 100644
index 00000000000..140448e2482
--- /dev/null
+++ b/mps/code/mpslibcb.h
@@ -0,0 +1,58 @@
+/* mpslibcb.h: RAVENBROOK MEMORY POOL SYSTEM LIBRARY CALLBACK INTERFACE
+ *
+ * $Header$
+ * Copyright (c) 2005 Ravenbrook Limited.  See end of file for license.
+ *
+ * .readership: MPS client application developers, MPS developers.
+ *
+ */
+
+#ifndef mpslibcb_h
+#define mpslibcb_h
+
+typedef void (*mps_lib_function_t)(void);
+int mps_lib_callback_register(const char *, mps_lib_function_t);
+
+#endif /* mpslibcb_h */
+
+
+/* C. COPYRIGHT AND LICENSE
+ *
+ * Copyright (C) 2005 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/w3build.bat b/mps/code/w3build.bat
index 3d6c879cca0..15f508bb516 100755
--- a/mps/code/w3build.bat
+++ b/mps/code/w3build.bat
@@ -2,12 +2,13 @@
 @rem
 @rem $HopeName: !gathconf.bat(trunk.1) $
 @rem Copyright (C) 2000 Harlequin Limited.  All rights reserved.
+@rem Copyright (C) 2005 Ravenbrook Limited.  All rights reserved.
 
 rmdir /q/s w3i3mv
-nmake /f w3i3mv.nmk VARIETY=we mps.lib mpsplan.lib
-nmake /f w3i3mv.nmk VARIETY=wi mps.lib mpsplan.lib
-nmake /f w3i3mv.nmk VARIETY=ce mps.lib mpsplan.lib
-nmake /f w3i3mv.nmk VARIETY=ci mps.lib mpsplan.lib
+nmake /f w3i3mv.nmk VARIETY=we mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
+nmake /f w3i3mv.nmk VARIETY=wi mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
+nmake /f w3i3mv.nmk VARIETY=ce mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
+nmake /f w3i3mv.nmk VARIETY=ci mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
 mkdir release
 mkdir release\include
 mkdir release\lib
@@ -29,6 +30,7 @@ copy mpscmvff.h release\include
 copy mpscsnc.h release\include
 copy mpsio.h release\include
 copy mpslib.h release\include
+copy mpslibcb.h release\include
 copy mpstd.h release\include
 copy mpsw3.h release\include
 copy mpswin.h release\include
@@ -36,9 +38,21 @@ copy w3i3mv\we\mps.lib release\lib\w3i3\we
 copy w3i3mv\ce\mps.lib release\lib\w3i3\ce
 copy w3i3mv\we\mpsplan.lib release\lib\w3i3\we
 copy w3i3mv\ce\mpsplan.lib release\lib\w3i3\ce
+copy w3i3mv\we\mpsplcb.lib release\lib\w3i3\we
+copy w3i3mv\ce\mpsplcb.lib release\lib\w3i3\ce
+copy w3i3mv\we\mpsdy.dll release\lib\w3i3\we
+copy w3i3mv\ce\mpsdy.dll release\lib\w3i3\ce
+copy w3i3mv\we\mpsdy.lib release\lib\w3i3\we
+copy w3i3mv\ce\mpsdy.lib release\lib\w3i3\ce
 copy w3i3mv\wi\mps.lib release\lib\w3i3\wi
 copy w3i3mv\ci\mps.lib release\lib\w3i3\ci
 copy w3i3mv\wi\mpsplan.lib release\lib\w3i3\wi
 copy w3i3mv\ci\mpsplan.lib release\lib\w3i3\ci
+copy w3i3mv\wi\mpsplcb.lib release\lib\w3i3\wi
+copy w3i3mv\ci\mpsplcb.lib release\lib\w3i3\ci
+copy w3i3mv\wi\mpsdy.dll release\lib\w3i3\wi
+copy w3i3mv\ci\mpsdy.dll release\lib\w3i3\ci
+copy w3i3mv\wi\mpsdy.lib release\lib\w3i3\wi
+copy w3i3mv\ci\mpsdy.lib release\lib\w3i3\ci
 copy mpsliban.c release\src
 copy mpsioan.c release\src
diff --git a/mps/code/w3gen.def b/mps/code/w3gen.def
new file mode 100644
index 00000000000..d9ebcf013e0
--- /dev/null
+++ b/mps/code/w3gen.def
@@ -0,0 +1,141 @@
+; $Header$
+; DO NOT EDIT.  Automatically generated by !Header: //info.ravenbrook.com/project/mps/branch/2004-12-15/dll/code/expgen.sh#4 !
+EXPORTS
+; mps.h
+mps_ap_fill_with_reservoir_permit
+mps_ap_fill
+mps_commit
+mps_reserve
+mps_ap_destroy
+mps_ap_create_v
+mps_ap_create
+mps_free
+mps_alloc_v
+mps_alloc
+mps_chain_destroy
+mps_chain_create
+mps_pool_destroy
+mps_pool_create_v
+mps_pool_create
+mps_fmt_destroy
+mps_fmt_create_fixed
+mps_fmt_create_auto_header
+mps_fmt_create_B
+mps_fmt_create_A
+mps_arena_extend
+mps_arena_has_addr
+mps_space_committed
+mps_space_reserved
+mps_arena_formatted_objects_walk
+mps_arena_spare_commit_limit
+mps_arena_spare_commit_limit_set
+mps_arena_commit_limit_set
+mps_arena_commit_limit
+mps_arena_spare_committed
+mps_arena_committed
+mps_arena_reserved
+mps_space_destroy
+mps_space_create
+mps_arena_destroy
+mps_arena_create_v
+mps_arena_create
+mps_space_collect
+mps_space_park
+mps_space_release
+mps_space_clamp
+mps_arena_step
+mps_arena_collect
+mps_arena_start_collect
+mps_arena_unsafe_restore_protection
+mps_arena_unsafe_expose_remember_protection
+mps_arena_expose
+mps_arena_park
+mps_arena_release
+mps_arena_clamp
+mps_telemetry_flush
+mps_fix
+mps_pool_check_fenceposts
+mps_telemetry_label
+mps_telemetry_intern
+mps_telemetry_control
+mps_definalize
+mps_finalize
+mps_message_gc_not_condemned_size
+mps_message_gc_condemned_size
+mps_message_gc_live_size
+mps_message_finalization_ref
+mps_message_type
+mps_message_queue_type
+mps_message_discard
+mps_message_get
+mps_message_type_disable
+mps_message_type_enable
+mps_message_poll
+mps_collections
+mps_ld_isstale
+mps_ld_merge
+mps_ld_add
+mps_ld_reset
+mps_thread_dereg
+mps_thread_reg
+mps_tramp
+mps_stack_scan_ambig
+mps_root_destroy
+mps_root_create_reg
+mps_root_create_fmt
+mps_root_create_table_masked
+mps_root_create_table
+mps_root_create
+mps_reserve_with_reservoir_permit
+mps_reservoir_available
+mps_reservoir_limit
+mps_arena_roots_walk
+mps_reservoir_limit_set
+mps_sac_empty
+mps_pool_check_free_space
+mps_sac_fill
+mps_sac_flush
+mps_sac_free
+mps_sac_alloc
+mps_sac_destroy
+mps_sac_create
+mps_rank_weak
+mps_ap_alloc_pattern_reset
+mps_rank_exact
+mps_ap_alloc_pattern_end
+mps_rank_ambig
+mps_ap_alloc_pattern_begin
+mps_alloc_pattern_ramp_collect_all
+mps_alloc_pattern_ramp
+mps_ap_trip
+mps_ap_frame_pop
+mps_ap_frame_push
+; mpsavm.h
+mps_arena_class_vmnz
+mps_arena_class_vm
+; mpsacl.h
+mps_arena_class_cl
+; mpscamc.h
+mps_class_amc
+mps_amc_apply
+mps_class_amcz
+; mpscams.h
+mps_class_ams_debug
+mps_class_ams
+; mpscawl.h
+mps_class_awl
+; mpsclo.h
+mps_class_lo
+; mpscmv.h
+mps_mv_size
+mps_class_mv_debug
+mps_mv_free_size
+mps_class_mv
+; mpscsnc.h
+mps_class_snc
+; mpslibcb.h
+mps_lib_callback_register
+; mpstd.h
+; mpsw3.h - by hand
+mps_SEH_filter
+mps_SEH_handler
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index f3b98dbdea7..3f2c8cfce50 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -8,7 +8,10 @@ PFM = w3i3mv
 RAINBOWPATH = MSVISUAL\WIN32\I386
 DONGLELIB = $(RAINBOWPATH)\spromeps.lib
 
-PFMDEFS = /DWIN32 /D_WINDOWS /I$(RAINBOWPATH)
+# /Gs appears to be necessary to suppress stack checks.  Stack checks
+# (if not suppressed) generate a dependency on the C library, __chkesp,
+# which causes the linker step to fail when building the DLL, mpsdy.dll.
+PFMDEFS = /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH)
 
 MPM = <ring> <mpm> <bt> <protocol> <boot> \
       <arenavm> <arenacl> <locus> <arena> <global> <tract> <reserv> \
diff --git a/mps/code/xcppgc.gmk b/mps/code/xcppgc.gmk
index a160a700224..f26f10fc064 100644
--- a/mps/code/xcppgc.gmk
+++ b/mps/code/xcppgc.gmk
@@ -5,7 +5,7 @@
 
 PFM = xcppgc
 
-MPMPF = mpsliban.c mpsioan.c lockan.c than.c vmxc.c \
+MPMPF = lockan.c than.c vmxc.c \
         protan.c prmcan.c span.c ssan.c
 SWPF = than.c vmxc.c protsw.c prmcan.c ssan.c