diff --git a/Makefile.am b/Makefile.am
index ff58cb8d..43f057c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,133 +1,133 @@
 AUTOMAKE_OPTIONS=foreign
 ACLOCAL_AMFLAGS= -I m4 --install
 
 BOOTSTRAP_OPTIONS =
 
 if INTINFISINT
 POLYIMPORT_OPTIONS = --intIsIntInf
 else
 POLYIMPORT_OPTIONS =
 endif
 
 DIST_SUBDIRS = libpolyml libpolymain modules
 
 SUBDIRS = libpolyml libpolymain . modules
 
 bin_PROGRAMS = polyimport poly
 
 dist_bin_SCRIPTS = polyc
 
 man_MANS = poly.1 polyimport.1 polyc.1
 
 # Select the pre-built compiler
 if ARCHI386
 POLYIMPORT = $(srcdir)/bootstrap/bootstrap32.txt
 else
 if ARCHINTERPRET
 POLYIMPORT = $(srcdir)/bootstrap/bootstrap32.txt
 else
 if ARCHINTERPRET64
 POLYIMPORT = $(srcdir)/bootstrap/bootstrap64.txt
 else
 if ARCHX86_64
 POLYIMPORT = $(srcdir)/bootstrap/bootstrap64.txt
 else
 if ARCHX8632IN64
 POLYIMPORT = $(srcdir)/bootstrap/bootstrap32.txt
 else
 endif
 endif
 endif
 endif
 endif
 
 noinst_HEADERS = polyexports.h
 
 poly_LDFLAGS=
 polyimport_LDFLAGS=
 POLYRESOURCES=
 EXTRALDFLAGS=
 
 if NATIVE_WINDOWS
 if ARCHINTERPRET64
 EXTRALDFLAGS += -Wl,-u,WinMain
 else
 if ARCHX86_64
 EXTRALDFLAGS += -Wl,-u,WinMain
 else
 if ARCHX8632IN64
 EXTRALDFLAGS += -Wl,-u,WinMain
 else
 EXTRALDFLAGS += -Wl,-u,_WinMain@16 -Wl,--large-address-aware
 endif
 endif
 endif
 
 if WINDOWSGUI
 EXTRALDFLAGS += -mwindows
 polyimport_LDFLAGS += -mwindows
 else
 EXTRALDFLAGS += -mconsole
 polyimport_LDFLAGS += -mconsole
 endif
 
 poly_LDFLAGS += $(EXTRALDFLAGS)
 
 POLYOBJECTFILE = polyexport.obj
 POLYRESOURCES += polyresource.o
 OBJECTSUFFIX=obj
 else
 POLYOBJECTFILE = polyexport.o
 OBJECTSUFFIX=o
 endif
 
 if MACOSLDOPTS
 poly_LDFLAGS += -Wl,-no_pie
 endif
 
 poly_SOURCES = 
 poly_LDADD = $(POLYOBJECTFILE) $(POLYRESOURCES) libpolymain/libpolymain.la libpolyml/libpolyml.la 
 
 polyimport_SOURCES = polyimport.c
 polyimport_LDADD = $(POLYRESOURCES) libpolyml/libpolyml.la
 
 EXTRA_DIST = \
 	poly.1 \
 	polyimport.1
 
 dist-hook:
 	find {bootstrap,basis,mlsource}/ -type d -exec mkdir $(distdir)/{} \;
 	find {bootstrap,basis,mlsource}/ -type f -not -name .git \
 	    -exec cp -pf {} $(distdir)/{} \;
 
 # Unix.
-polyexport.o: polyimport exportPoly.sml $(POLYIMPORT)
+polyexport.o: polyimport bootstrap/Stage1.sml $(POLYIMPORT)
 	./polyimport $(POLYIMPORT_OPTIONS) $(POLYIMPORT) -I $(srcdir) < $(srcdir)/bootstrap/Stage1.sml
 
 # Windows.  When building on Windows make sure that we provide both stdin and stdout to suppress the GUI.
-polyexport.obj: polyimport$(EXEEXT) exportPoly.sml $(POLYIMPORT)
+polyexport.obj: polyimport$(EXEEXT) bootstrap/Stage1.sml $(POLYIMPORT)
 	./polyimport $(POLYIMPORT_OPTIONS) $(POLYIMPORT) -I $(srcdir) < $(srcdir)/bootstrap/Stage1.sml | cat
 
 polyresource.o: PolyML.rc poly.ico
 	$(WINDRES) -o polyresource.o $(srcdir)/PolyML.rc
 
 #polyc: buildpolyc
 #	./buildpolyc LINK=\"$(CC)\" BINDIR=\"$(bindir)\" LIBDIR=\"$(libdir)\" LIBS=\"$(LIBS)\" EXTRALDFLAGS=\"$(EXTRALDFLAGS)\" SUFFIX=\"$(OBJECTSUFFIX)\"
 
 # Recompiler the compiler using the last step of the bootstrap process.
 compiler: all
 	./poly $(BOOTSTRAP_OPTIONS) --error-exit < bootstrap/Stage6.sml
 	$(MAKE)
 
 reboot: compiler
 	cp $(POLYIMPORT)
 
 clean-local:
 	rm -f *.obj polyc
 
 # Run tests
 check-local: all
 	echo "val () = use \"$(srcdir)/Tests/RunTests\"; val () = OS.Process.exit(if runTests \"$(srcdir)/Tests\" then OS.Process.success else OS.Process.failure):unit;" | ./poly
 
 # Retain this target for backwards compatibility
 tests: check
diff --git a/Makefile.in b/Makefile.in
index cc04bca4..ff3fef9e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,1204 +1,1189 @@
 # Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = polyimport$(EXEEXT) poly$(EXEEXT)
 @ARCHINTERPRET64_TRUE@@NATIVE_WINDOWS_TRUE@am__append_1 = -Wl,-u,WinMain
 @ARCHINTERPRET64_FALSE@@ARCHX86_64_TRUE@@NATIVE_WINDOWS_TRUE@am__append_2 = -Wl,-u,WinMain
 @ARCHINTERPRET64_FALSE@@ARCHX8632IN64_TRUE@@ARCHX86_64_FALSE@@NATIVE_WINDOWS_TRUE@am__append_3 = -Wl,-u,WinMain
 @ARCHINTERPRET64_FALSE@@ARCHX8632IN64_FALSE@@ARCHX86_64_FALSE@@NATIVE_WINDOWS_TRUE@am__append_4 = -Wl,-u,_WinMain@16 -Wl,--large-address-aware
 @NATIVE_WINDOWS_TRUE@@WINDOWSGUI_TRUE@am__append_5 = -mwindows
 @NATIVE_WINDOWS_TRUE@@WINDOWSGUI_TRUE@am__append_6 = -mwindows
 @NATIVE_WINDOWS_TRUE@@WINDOWSGUI_FALSE@am__append_7 = -mconsole
 @NATIVE_WINDOWS_TRUE@@WINDOWSGUI_FALSE@am__append_8 = -mconsole
 @NATIVE_WINDOWS_TRUE@am__append_9 = $(EXTRALDFLAGS)
 @NATIVE_WINDOWS_TRUE@am__append_10 = polyresource.o
 @MACOSLDOPTS_TRUE@am__append_11 = -Wl,-no_pie
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(dist_bin_SCRIPTS) $(noinst_HEADERS) \
 	$(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = polyc
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_poly_OBJECTS =
 poly_OBJECTS = $(am_poly_OBJECTS)
 poly_DEPENDENCIES = $(POLYOBJECTFILE) $(POLYRESOURCES) \
 	libpolymain/libpolymain.la libpolyml/libpolyml.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 poly_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(poly_LDFLAGS) $(LDFLAGS) -o $@
 am_polyimport_OBJECTS = polyimport.$(OBJEXT)
 polyimport_OBJECTS = $(am_polyimport_OBJECTS)
 polyimport_DEPENDENCIES = $(POLYRESOURCES) libpolyml/libpolyml.la
 polyimport_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(polyimport_LDFLAGS) $(LDFLAGS) -o $@
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 SCRIPTS = $(dist_bin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/polyimport.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(poly_SOURCES) $(polyimport_SOURCES)
 DIST_SOURCES = $(poly_SOURCES) $(polyimport_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
 	install-ps-recursive install-recursive installcheck-recursive \
 	installdirs-recursive pdf-recursive ps-recursive \
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
   $(RECURSIVE_TARGETS) \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/polyc.in COPYING compile config.guess config.sub \
 	depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
   if test -d "$(distdir)"; then \
     find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
 am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
   sed_butlast='s,/*[^/]*$$,,'; \
   while test -n "$$dir1"; do \
     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
     if test "$$first" != "."; then \
       if test "$$first" = ".."; then \
         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
       else \
         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
         if test "$$first2" = "$$first"; then \
           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
         else \
           dir2="../$$dir2"; \
         fi; \
         dir0="$$dir0"/"$$first"; \
       fi; \
     fi; \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT_VERSION = @GIT_VERSION@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OSFLAG = @OSFLAG@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 dependentlibs = @dependentlibs@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gitinstalled = @gitinstalled@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 polyc_CFLAGS = @polyc_CFLAGS@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sys_symbol_underscore = @sys_symbol_underscore@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4 --install
 BOOTSTRAP_OPTIONS = 
 @INTINFISINT_FALSE@POLYIMPORT_OPTIONS = 
 @INTINFISINT_TRUE@POLYIMPORT_OPTIONS = --intIsIntInf
 DIST_SUBDIRS = libpolyml libpolymain modules
 SUBDIRS = libpolyml libpolymain . modules
 dist_bin_SCRIPTS = polyc
 man_MANS = poly.1 polyimport.1 polyc.1
-@ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX8632IN64_TRUE@@ARCHX86_64_FALSE@@WINDOWSCALLCONV_FALSE@POLYIMPORT = $(srcdir)/imports/polymlx64_32sysv.txt
-@ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX8632IN64_TRUE@@ARCHX86_64_FALSE@@WINDOWSCALLCONV_TRUE@POLYIMPORT = $(srcdir)/imports/polymlx64_32win.txt
-@ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX86_64_TRUE@@WINDOWSCALLCONV_FALSE@POLYIMPORT = $(srcdir)/imports/polymlx86_64sysv.txt
-@ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX86_64_TRUE@@WINDOWSCALLCONV_TRUE@POLYIMPORT = $(srcdir)/imports/polymlx86_64win.txt
-@ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@POLYIMPORT = $(srcdir)/imports/polymlint64.txt
-@ARCHI386_FALSE@@ARCHINTERPRET_TRUE@POLYIMPORT = $(srcdir)/imports/polymlint.txt
-
-# Select the architecture-specific pre-built compiler
-@ARCHI386_TRUE@POLYIMPORT = $(srcdir)/imports/polymli386.txt
+@ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX8632IN64_TRUE@@ARCHX86_64_FALSE@POLYIMPORT = $(srcdir)/bootstrap/bootstrap32.txt
+@ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX86_64_TRUE@POLYIMPORT = $(srcdir)/bootstrap/bootstrap64.txt
+@ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@POLYIMPORT = $(srcdir)/bootstrap/bootstrap64.txt
+@ARCHI386_FALSE@@ARCHINTERPRET_TRUE@POLYIMPORT = $(srcdir)/bootstrap/bootstrap32.txt
+
+# Select the pre-built compiler
+@ARCHI386_TRUE@POLYIMPORT = $(srcdir)/bootstrap/bootstrap32.txt
 noinst_HEADERS = polyexports.h
 poly_LDFLAGS = $(am__append_9) $(am__append_11)
 polyimport_LDFLAGS = $(am__append_6) $(am__append_8)
 POLYRESOURCES = $(am__append_10)
 EXTRALDFLAGS = $(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_7)
 @NATIVE_WINDOWS_FALSE@POLYOBJECTFILE = polyexport.o
 @NATIVE_WINDOWS_TRUE@POLYOBJECTFILE = polyexport.obj
 @NATIVE_WINDOWS_FALSE@OBJECTSUFFIX = o
 @NATIVE_WINDOWS_TRUE@OBJECTSUFFIX = obj
 poly_SOURCES = 
 poly_LDADD = $(POLYOBJECTFILE) $(POLYRESOURCES) libpolymain/libpolymain.la libpolyml/libpolyml.la 
 polyimport_SOURCES = polyimport.c
 polyimport_LDADD = $(POLYRESOURCES) libpolyml/libpolyml.la
 EXTRA_DIST = \
-	imports/polymli386.txt \
-	imports/polymlint64.txt \
-	imports/polymlint.txt \
-	imports/polymlx86_64sysv.txt \
-	imports/polymlx86_64win.txt \
-	imports/polymlx64_32sysv.txt \
-	imports/polymlx64_32win.txt \
-	libpolyml/x86asm.asm \
-	exportPoly.sml \
 	poly.1 \
 	polyimport.1
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
 	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@test -f $@ || rm -f stamp-h1
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
 polyc: $(top_builddir)/config.status $(srcdir)/polyc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p \
 	 || test -f $$p1 \
 	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
 	sed -e 'p;s,.*/,,;n;h' \
 	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
 	    else { print "f", $$3 "/" $$4, $$1; } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
 	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	    } \
 	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
 	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
 
 poly$(EXEEXT): $(poly_OBJECTS) $(poly_DEPENDENCIES) $(EXTRA_poly_DEPENDENCIES) 
 	@rm -f poly$(EXEEXT)
 	$(AM_V_CCLD)$(poly_LINK) $(poly_OBJECTS) $(poly_LDADD) $(LIBS)
 
 polyimport$(EXEEXT): $(polyimport_OBJECTS) $(polyimport_DEPENDENCIES) $(EXTRA_polyimport_DEPENDENCIES) 
 	@rm -f polyimport$(EXEEXT)
 	$(AM_V_CCLD)$(polyimport_LINK) $(polyimport_OBJECTS) $(polyimport_LDADD) $(LIBS)
 install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
 	done | \
 	sed -e 'p;s,.*/,,;n' \
 	    -e 'h;s|.*|.|' \
 	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
 	      if (++n[d] == $(am__install_max)) { \
 		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
 	    else { print "f", d "/" $$4, $$1 } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	     test -z "$$files" || { \
 	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	     } \
 	; done
 
 uninstall-dist_binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polyimport.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
 
 am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
 	-rm -f libtool config.lt
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
 	list2='$(man_MANS)'; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
 	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 	{ for i in $$list1; do echo "$$i"; done;  \
 	if test -n "$$list2"; then \
 	  for i in $$list2; do echo "$$i"; done \
 	    | sed -n '/\.1[a-z]*$$/p'; \
 	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
 	done | \
 	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
 	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
 	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
 	done; }
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
 	@list=''; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
 	@fail=; \
 	if $(am__make_keepgoing); then \
 	  failcom='fail=yes'; \
 	else \
 	  failcom='exit 1'; \
 	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscope: cscope.files
 	test ! -s cscope.files \
 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
 clean-cscope:
 	-rm -f cscope.files
 cscope.files: clean-cscope cscopelist
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
 distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
 	$(am__post_remove_distdir)
 
 dist dist-all:
 	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
 	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
 	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
 	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
 	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build/sub \
 	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
 	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
 	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@test -n '$(distuninstallcheck_dir)' || { \
 	  echo 'ERROR: trying to run $@ with an empty' \
 	       '$$(distuninstallcheck_dir)' >&2; \
 	  exit 1; \
 	}; \
 	$(am__cd) '$(distuninstallcheck_dir)' || { \
 	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
 	  exit 1; \
 	}; \
 	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
 	        fi ; \
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
 	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
 	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(HEADERS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
 	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 		-rm -f ./$(DEPDIR)/polyimport.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
 html: html-recursive
 
 html-am:
 
 info: info-recursive
 
 info-am:
 
 install-data-am: install-man
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS
 
 install-html: install-html-recursive
 
 install-html-am:
 
 install-info: install-info-recursive
 
 install-info-am:
 
 install-man: install-man1
 
 install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
 install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
 		-rm -f ./$(DEPDIR)/polyimport.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-recursive
 
 pdf-am:
 
 ps: ps-recursive
 
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
 	uninstall-man
 
 uninstall-man: uninstall-man1
 
 .MAKE: $(am__recursive_targets) all check-am install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--depfiles am--refresh check check-am check-local clean \
 	clean-binPROGRAMS clean-cscope clean-generic clean-libtool \
 	clean-local cscope cscopelist-am ctags ctags-am dist dist-all \
 	dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
 	dist-xz dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am \
 	install-dist_binSCRIPTS install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man1 \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
 	uninstall-man uninstall-man1
 
 .PRECIOUS: Makefile
 
 
 dist-hook:
-	find {basis,mlsource}/ -type d -exec mkdir $(distdir)/{} \;
-	find {basis,mlsource}/ -type f -not -name .svn \
+	find {bootstrap,basis,mlsource}/ -type d -exec mkdir $(distdir)/{} \;
+	find {bootstrap,basis,mlsource}/ -type f -not -name .git \
 	    -exec cp -pf {} $(distdir)/{} \;
 
 # Unix.
-polyexport.o: polyimport exportPoly.sml polytemp.txt
-	./polyimport $(POLYIMPORT_OPTIONS) polytemp.txt -I $(srcdir) < $(srcdir)/exportPoly.sml
+polyexport.o: polyimport bootstrap/Stage1.sml $(POLYIMPORT)
+	./polyimport $(POLYIMPORT_OPTIONS) $(POLYIMPORT) -I $(srcdir) < $(srcdir)/bootstrap/Stage1.sml
 
 # Windows.  When building on Windows make sure that we provide both stdin and stdout to suppress the GUI.
-polyexport.obj: polyimport$(EXEEXT) exportPoly.sml polytemp.txt
-	./polyimport $(POLYIMPORT_OPTIONS) polytemp.txt -I $(srcdir) < $(srcdir)/exportPoly.sml | cat
+polyexport.obj: polyimport$(EXEEXT) bootstrap/Stage1.sml $(POLYIMPORT)
+	./polyimport $(POLYIMPORT_OPTIONS) $(POLYIMPORT) -I $(srcdir) < $(srcdir)/bootstrap/Stage1.sml | cat
 
 polyresource.o: PolyML.rc poly.ico
 	$(WINDRES) -o polyresource.o $(srcdir)/PolyML.rc
 
-polytemp.txt: $(POLYIMPORT)
-	cp $(POLYIMPORT) polytemp.txt
-
 #polyc: buildpolyc
 #	./buildpolyc LINK=\"$(CC)\" BINDIR=\"$(bindir)\" LIBDIR=\"$(libdir)\" LIBS=\"$(LIBS)\" EXTRALDFLAGS=\"$(EXTRALDFLAGS)\" SUFFIX=\"$(OBJECTSUFFIX)\"
 
-# This builds the compiler but does not update the files in the imports directory.
-# It then builds a version of poly containing the new compiler.
+# Recompiler the compiler using the last step of the bootstrap process.
 compiler: all
-	./poly $(BOOTSTRAP_OPTIONS) --error-exit < mlsource/BuildExport.sml
+	./poly $(BOOTSTRAP_OPTIONS) --error-exit < bootstrap/Stage6.sml
 	$(MAKE)
 
 reboot: compiler
-	cp polytemp.txt $(POLYIMPORT)
+	cp $(POLYIMPORT)
 
 clean-local:
-	rm -f *.obj polytemp.txt polyc
+	rm -f *.obj polyc
 
 # Run tests
 check-local: all
 	echo "val () = use \"$(srcdir)/Tests/RunTests\"; val () = OS.Process.exit(if runTests \"$(srcdir)/Tests\" then OS.Process.success else OS.Process.failure):unit;" | ./poly
 
 # Retain this target for backwards compatibility
 tests: check
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libpolyml/Makefile.in b/libpolyml/Makefile.in
index 56c4baa6..794a384a 100644
--- a/libpolyml/Makefile.in
+++ b/libpolyml/Makefile.in
@@ -1,1113 +1,1120 @@
 # Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 
 # Force all references to be defined to build the DLL.
 @NO_UNDEFINED_TRUE@am__append_1 = -no-undefined
 @ARCHI386_FALSE@@ARCHINTERPRET_TRUE@am__append_2 = -DCODEISNOTEXECUTABLE
 @ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@am__append_3 = -DCODEISNOTEXECUTABLE
 subdir = libpolyml
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = polyml.pc
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libpolyml_la_LIBADD =
-am__libpolyml_la_SOURCES_DIST = arb.cpp bitmap.cpp check_objects.cpp \
-	diagnostics.cpp errors.cpp exporter.cpp gc.cpp \
-	gc_check_weak_ref.cpp gc_copy_phase.cpp gc_mark_phase.cpp \
-	gc_progress.cpp gc_share_phase.cpp gc_update_phase.cpp \
-	gctaskfarm.cpp heapsizing.cpp locking.cpp memmgr.cpp mpoly.cpp \
-	network.cpp objsize.cpp pexport.cpp poly_specific.cpp \
-	polyffi.cpp polystring.cpp process_env.cpp processes.cpp \
-	profiling.cpp quick_gc.cpp realconv.cpp reals.cpp \
-	rts_module.cpp rtsentry.cpp run_time.cpp save_vec.cpp \
-	savestate.cpp scanaddrs.cpp sharedata.cpp sighandler.cpp \
-	statistics.cpp timing.cpp xwindows.cpp x86_dep.cpp \
-	x86assembly_gas64.S interpret.cpp x86assembly_gas32.S \
-	machoexport.cpp elfexport.cpp pecoffexport.cpp basicio.cpp \
-	unix_specific.cpp osmemunix.cpp winstartup.cpp winbasicio.cpp \
-	winguiconsole.cpp windows_specific.cpp osmemwin.cpp
+am__libpolyml_la_SOURCES_DIST = arb.cpp bitmap.cpp bytecode.cpp \
+	check_objects.cpp diagnostics.cpp errors.cpp exporter.cpp \
+	gc.cpp gc_check_weak_ref.cpp gc_copy_phase.cpp \
+	gc_mark_phase.cpp gc_progress.cpp gc_share_phase.cpp \
+	gc_update_phase.cpp gctaskfarm.cpp heapsizing.cpp locking.cpp \
+	memmgr.cpp mpoly.cpp network.cpp objsize.cpp pexport.cpp \
+	poly_specific.cpp polyffi.cpp polystring.cpp process_env.cpp \
+	processes.cpp profiling.cpp quick_gc.cpp realconv.cpp \
+	reals.cpp rts_module.cpp rtsentry.cpp run_time.cpp \
+	save_vec.cpp savestate.cpp scanaddrs.cpp sharedata.cpp \
+	sighandler.cpp statistics.cpp timing.cpp xwindows.cpp \
+	x86_dep.cpp x86assembly_gas64.S interpreter.cpp \
+	x86assembly_gas32.S machoexport.cpp elfexport.cpp \
+	pecoffexport.cpp basicio.cpp unix_specific.cpp osmemunix.cpp \
+	winstartup.cpp winbasicio.cpp winguiconsole.cpp \
+	windows_specific.cpp osmemwin.cpp
 @ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX8632IN64_TRUE@@ARCHX86_64_FALSE@am__objects_1 = x86_dep.lo \
 @ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX8632IN64_TRUE@@ARCHX86_64_FALSE@	x86assembly_gas64.lo
 @ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX86_64_TRUE@am__objects_1 = x86_dep.lo \
 @ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX86_64_TRUE@	x86assembly_gas64.lo
-@ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@am__objects_1 = interpret.lo
-@ARCHI386_FALSE@@ARCHINTERPRET_TRUE@am__objects_1 = interpret.lo
+@ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@am__objects_1 = interpreter.lo
+@ARCHI386_FALSE@@ARCHINTERPRET_TRUE@am__objects_1 = interpreter.lo
 @ARCHI386_TRUE@am__objects_1 = x86_dep.lo x86assembly_gas32.lo
 @EXPELF_FALSE@@EXPMACHO_TRUE@@EXPPECOFF_FALSE@am__objects_2 =  \
 @EXPELF_FALSE@@EXPMACHO_TRUE@@EXPPECOFF_FALSE@	machoexport.lo
 @EXPELF_TRUE@@EXPPECOFF_FALSE@am__objects_2 = elfexport.lo
 @EXPPECOFF_TRUE@am__objects_2 = pecoffexport.lo
 @NATIVE_WINDOWS_FALSE@am__objects_3 = basicio.lo unix_specific.lo \
 @NATIVE_WINDOWS_FALSE@	osmemunix.lo
 @NATIVE_WINDOWS_TRUE@am__objects_3 = winstartup.lo winbasicio.lo \
 @NATIVE_WINDOWS_TRUE@	winguiconsole.lo windows_specific.lo \
 @NATIVE_WINDOWS_TRUE@	osmemwin.lo
-am_libpolyml_la_OBJECTS = arb.lo bitmap.lo check_objects.lo \
-	diagnostics.lo errors.lo exporter.lo gc.lo \
+am_libpolyml_la_OBJECTS = arb.lo bitmap.lo bytecode.lo \
+	check_objects.lo diagnostics.lo errors.lo exporter.lo gc.lo \
 	gc_check_weak_ref.lo gc_copy_phase.lo gc_mark_phase.lo \
 	gc_progress.lo gc_share_phase.lo gc_update_phase.lo \
 	gctaskfarm.lo heapsizing.lo locking.lo memmgr.lo mpoly.lo \
 	network.lo objsize.lo pexport.lo poly_specific.lo polyffi.lo \
 	polystring.lo process_env.lo processes.lo profiling.lo \
 	quick_gc.lo realconv.lo reals.lo rts_module.lo rtsentry.lo \
 	run_time.lo save_vec.lo savestate.lo scanaddrs.lo sharedata.lo \
 	sighandler.lo statistics.lo timing.lo xwindows.lo \
 	$(am__objects_1) $(am__objects_2) $(am__objects_3)
 libpolyml_la_OBJECTS = $(am_libpolyml_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 libpolyml_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libpolyml_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/arb.Plo ./$(DEPDIR)/basicio.Plo \
-	./$(DEPDIR)/bitmap.Plo ./$(DEPDIR)/check_objects.Plo \
-	./$(DEPDIR)/diagnostics.Plo ./$(DEPDIR)/elfexport.Plo \
-	./$(DEPDIR)/errors.Plo ./$(DEPDIR)/exporter.Plo \
-	./$(DEPDIR)/gc.Plo ./$(DEPDIR)/gc_check_weak_ref.Plo \
+	./$(DEPDIR)/bitmap.Plo ./$(DEPDIR)/bytecode.Plo \
+	./$(DEPDIR)/check_objects.Plo ./$(DEPDIR)/diagnostics.Plo \
+	./$(DEPDIR)/elfexport.Plo ./$(DEPDIR)/errors.Plo \
+	./$(DEPDIR)/exporter.Plo ./$(DEPDIR)/gc.Plo \
+	./$(DEPDIR)/gc_check_weak_ref.Plo \
 	./$(DEPDIR)/gc_copy_phase.Plo ./$(DEPDIR)/gc_mark_phase.Plo \
 	./$(DEPDIR)/gc_progress.Plo ./$(DEPDIR)/gc_share_phase.Plo \
 	./$(DEPDIR)/gc_update_phase.Plo ./$(DEPDIR)/gctaskfarm.Plo \
-	./$(DEPDIR)/heapsizing.Plo ./$(DEPDIR)/interpret.Plo \
+	./$(DEPDIR)/heapsizing.Plo ./$(DEPDIR)/interpreter.Plo \
 	./$(DEPDIR)/locking.Plo ./$(DEPDIR)/machoexport.Plo \
 	./$(DEPDIR)/memmgr.Plo ./$(DEPDIR)/mpoly.Plo \
 	./$(DEPDIR)/network.Plo ./$(DEPDIR)/objsize.Plo \
 	./$(DEPDIR)/osmemunix.Plo ./$(DEPDIR)/osmemwin.Plo \
 	./$(DEPDIR)/pecoffexport.Plo ./$(DEPDIR)/pexport.Plo \
 	./$(DEPDIR)/poly_specific.Plo ./$(DEPDIR)/polyffi.Plo \
 	./$(DEPDIR)/polystring.Plo ./$(DEPDIR)/process_env.Plo \
 	./$(DEPDIR)/processes.Plo ./$(DEPDIR)/profiling.Plo \
 	./$(DEPDIR)/quick_gc.Plo ./$(DEPDIR)/realconv.Plo \
 	./$(DEPDIR)/reals.Plo ./$(DEPDIR)/rts_module.Plo \
 	./$(DEPDIR)/rtsentry.Plo ./$(DEPDIR)/run_time.Plo \
 	./$(DEPDIR)/save_vec.Plo ./$(DEPDIR)/savestate.Plo \
 	./$(DEPDIR)/scanaddrs.Plo ./$(DEPDIR)/sharedata.Plo \
 	./$(DEPDIR)/sighandler.Plo ./$(DEPDIR)/statistics.Plo \
 	./$(DEPDIR)/timing.Plo ./$(DEPDIR)/unix_specific.Plo \
 	./$(DEPDIR)/winbasicio.Plo ./$(DEPDIR)/windows_specific.Plo \
 	./$(DEPDIR)/winguiconsole.Plo ./$(DEPDIR)/winstartup.Plo \
 	./$(DEPDIR)/x86_dep.Plo ./$(DEPDIR)/x86assembly_gas32.Plo \
 	./$(DEPDIR)/x86assembly_gas64.Plo ./$(DEPDIR)/xwindows.Plo
 am__mv = mv -f
 CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
 LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CCASFLAGS) $(CCASFLAGS)
 AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
 am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
 am__v_CPPAS_0 = @echo "  CPPAS   " $@;
 am__v_CPPAS_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
 am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libpolyml_la_SOURCES)
 DIST_SOURCES = $(am__libpolyml_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(pkgconfig_DATA)
 HEADERS = $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/polyml.pc.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT_VERSION = @GIT_VERSION@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OSFLAG = @OSFLAG@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 dependentlibs = @dependentlibs@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gitinstalled = @gitinstalled@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 polyc_CFLAGS = @polyc_CFLAGS@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sys_symbol_underscore = @sys_symbol_underscore@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 AM_CPPFLAGS = $(CFLAGS) $(OSFLAG) $(GIT_VERSION) -Wall \
 	-DMODULEDIR=\"$(moduledir)\" $(am__append_2) $(am__append_3)
 AM_CFLAGS = $(CFLAGS) $(OSFLAG) $(GIT_VERSION) -Wall -fno-strict-aliasing
 AM_ASFLAGS = $(OSFLAG)
 AM_CCASFLAGS = $(OSFLAG)
 lib_LTLIBRARIES = libpolyml.la
 libpolyml_la_LDFLAGS = -version-info 11:0:0 $(am__append_1)
 @ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX8632IN64_TRUE@@ARCHX86_64_FALSE@ARCHSOURCE = x86_dep.cpp x86assembly_gas64.S
 @ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX86_64_TRUE@ARCHSOURCE = x86_dep.cpp x86assembly_gas64.S
-@ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@ARCHSOURCE = interpret.cpp
-@ARCHI386_FALSE@@ARCHINTERPRET_TRUE@ARCHSOURCE = interpret.cpp
+@ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@ARCHSOURCE = interpreter.cpp
+@ARCHI386_FALSE@@ARCHINTERPRET_TRUE@ARCHSOURCE = interpreter.cpp
 
 # Select the architecture-specific modules
 @ARCHI386_TRUE@ARCHSOURCE = x86_dep.cpp x86assembly_gas32.S
 @EXPELF_FALSE@@EXPMACHO_TRUE@@EXPPECOFF_FALSE@EXPORTSOURCE = machoexport.cpp
 @EXPELF_TRUE@@EXPPECOFF_FALSE@EXPORTSOURCE = elfexport.cpp
 
 # Select the object-format-specific modules
 @EXPPECOFF_TRUE@EXPORTSOURCE = pecoffexport.cpp
 @NATIVE_WINDOWS_FALSE@OSSOURCE = basicio.cpp unix_specific.cpp osmemunix.cpp
 @NATIVE_WINDOWS_TRUE@OSSOURCE = winstartup.cpp winbasicio.cpp winguiconsole.cpp windows_specific.cpp osmemwin.cpp
 noinst_HEADERS = \
 	arb.h \
 	basicio.h \
 	bitmap.h \
+	bytecode.h \
 	check_objects.h \
 	diagnostics.h \
 	elfexport.h \
 	errors.h \
 	exporter.h \
 	gc.h \
 	gctaskfarm.h \
     gc_progress.h \
 	globals.h \
     heapsizing.h \
 	int_opcodes.h \
 	io_internal.h \
 	locking.h \
 	machine_dep.h \
 	machoexport.h \
 	memmgr.h \
 	mpoly.h \
 	network.h \
 	noreturn.h \
 	objsize.h \
 	osmem.h \
 	os_specific.h \
 	pecoffexport.h \
 	pexport.h \
 	PolyControl.h \
 	poly_specific.h \
 	polyffi.h \
 	polystring.h \
 	process_env.h \
 	processes.h \
 	profiling.h \
 	realconv.h \
 	reals.h \
 	rts_module.h \
 	rtsentry.h \
 	run_time.h \
 	savestate.h \
 	save_vec.h \
 	scanaddrs.h \
 	sharedata.h \
 	sighandler.h \
 	statistics.h \
 	sys.h \
 	timing.h \
 	version.h \
 	winguiconsole.h \
     winstartup.h \
 	xcall_numbers.h \
 	xwindows.h
 
 libpolyml_la_SOURCES = \
     arb.cpp \
     bitmap.cpp \
+	bytecode.cpp \
     check_objects.cpp \
     diagnostics.cpp \
     errors.cpp \
     exporter.cpp \
     gc.cpp \
     gc_check_weak_ref.cpp \
     gc_copy_phase.cpp \
     gc_mark_phase.cpp \
     gc_progress.cpp \
     gc_share_phase.cpp \
     gc_update_phase.cpp \
     gctaskfarm.cpp \
     heapsizing.cpp \
     locking.cpp \
     memmgr.cpp \
     mpoly.cpp \
     network.cpp \
     objsize.cpp \
     pexport.cpp \
     poly_specific.cpp \
     polyffi.cpp \
     polystring.cpp \
     process_env.cpp \
     processes.cpp \
     profiling.cpp \
     quick_gc.cpp \
     realconv.cpp \
     reals.cpp \
     rts_module.cpp \
     rtsentry.cpp \
     run_time.cpp \
     save_vec.cpp \
     savestate.cpp \
     scanaddrs.cpp \
     sharedata.cpp \
     sighandler.cpp \
     statistics.cpp \
     timing.cpp \
     xwindows.cpp \
     $(ARCHSOURCE) $(EXPORTSOURCE) $(OSSOURCE)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = polyml.pc
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .S .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libpolyml/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign libpolyml/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 polyml.pc: $(top_builddir)/config.status $(srcdir)/polyml.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
 	test -z "$$locs" || { \
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
 
 libpolyml.la: $(libpolyml_la_OBJECTS) $(libpolyml_la_DEPENDENCIES) $(EXTRA_libpolyml_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(libpolyml_la_LINK) -rpath $(libdir) $(libpolyml_la_OBJECTS) $(libpolyml_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arb.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basicio.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitmap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bytecode.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_objects.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diagnostics.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfexport.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exporter.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_check_weak_ref.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_copy_phase.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_mark_phase.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_progress.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_share_phase.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_update_phase.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gctaskfarm.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heapsizing.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpreter.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locking.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machoexport.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memmgr.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpoly.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objsize.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osmemunix.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osmemwin.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pecoffexport.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pexport.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poly_specific.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polyffi.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polystring.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_env.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/processes.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profiling.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick_gc.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realconv.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reals.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rts_module.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtsentry.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run_time.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save_vec.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savestate.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanaddrs.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sharedata.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sighandler.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statistics.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timing.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_specific.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winbasicio.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows_specific.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winguiconsole.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winstartup.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x86_dep.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x86assembly_gas32.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x86assembly_gas64.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwindows.Plo@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
 
 am--depfiles: $(am__depfiles_remade)
 
 .S.o:
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
 
 .S.obj:
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .S.lo:
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $<
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
 	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
 distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
 		-rm -f ./$(DEPDIR)/arb.Plo
 	-rm -f ./$(DEPDIR)/basicio.Plo
 	-rm -f ./$(DEPDIR)/bitmap.Plo
+	-rm -f ./$(DEPDIR)/bytecode.Plo
 	-rm -f ./$(DEPDIR)/check_objects.Plo
 	-rm -f ./$(DEPDIR)/diagnostics.Plo
 	-rm -f ./$(DEPDIR)/elfexport.Plo
 	-rm -f ./$(DEPDIR)/errors.Plo
 	-rm -f ./$(DEPDIR)/exporter.Plo
 	-rm -f ./$(DEPDIR)/gc.Plo
 	-rm -f ./$(DEPDIR)/gc_check_weak_ref.Plo
 	-rm -f ./$(DEPDIR)/gc_copy_phase.Plo
 	-rm -f ./$(DEPDIR)/gc_mark_phase.Plo
 	-rm -f ./$(DEPDIR)/gc_progress.Plo
 	-rm -f ./$(DEPDIR)/gc_share_phase.Plo
 	-rm -f ./$(DEPDIR)/gc_update_phase.Plo
 	-rm -f ./$(DEPDIR)/gctaskfarm.Plo
 	-rm -f ./$(DEPDIR)/heapsizing.Plo
-	-rm -f ./$(DEPDIR)/interpret.Plo
+	-rm -f ./$(DEPDIR)/interpreter.Plo
 	-rm -f ./$(DEPDIR)/locking.Plo
 	-rm -f ./$(DEPDIR)/machoexport.Plo
 	-rm -f ./$(DEPDIR)/memmgr.Plo
 	-rm -f ./$(DEPDIR)/mpoly.Plo
 	-rm -f ./$(DEPDIR)/network.Plo
 	-rm -f ./$(DEPDIR)/objsize.Plo
 	-rm -f ./$(DEPDIR)/osmemunix.Plo
 	-rm -f ./$(DEPDIR)/osmemwin.Plo
 	-rm -f ./$(DEPDIR)/pecoffexport.Plo
 	-rm -f ./$(DEPDIR)/pexport.Plo
 	-rm -f ./$(DEPDIR)/poly_specific.Plo
 	-rm -f ./$(DEPDIR)/polyffi.Plo
 	-rm -f ./$(DEPDIR)/polystring.Plo
 	-rm -f ./$(DEPDIR)/process_env.Plo
 	-rm -f ./$(DEPDIR)/processes.Plo
 	-rm -f ./$(DEPDIR)/profiling.Plo
 	-rm -f ./$(DEPDIR)/quick_gc.Plo
 	-rm -f ./$(DEPDIR)/realconv.Plo
 	-rm -f ./$(DEPDIR)/reals.Plo
 	-rm -f ./$(DEPDIR)/rts_module.Plo
 	-rm -f ./$(DEPDIR)/rtsentry.Plo
 	-rm -f ./$(DEPDIR)/run_time.Plo
 	-rm -f ./$(DEPDIR)/save_vec.Plo
 	-rm -f ./$(DEPDIR)/savestate.Plo
 	-rm -f ./$(DEPDIR)/scanaddrs.Plo
 	-rm -f ./$(DEPDIR)/sharedata.Plo
 	-rm -f ./$(DEPDIR)/sighandler.Plo
 	-rm -f ./$(DEPDIR)/statistics.Plo
 	-rm -f ./$(DEPDIR)/timing.Plo
 	-rm -f ./$(DEPDIR)/unix_specific.Plo
 	-rm -f ./$(DEPDIR)/winbasicio.Plo
 	-rm -f ./$(DEPDIR)/windows_specific.Plo
 	-rm -f ./$(DEPDIR)/winguiconsole.Plo
 	-rm -f ./$(DEPDIR)/winstartup.Plo
 	-rm -f ./$(DEPDIR)/x86_dep.Plo
 	-rm -f ./$(DEPDIR)/x86assembly_gas32.Plo
 	-rm -f ./$(DEPDIR)/x86assembly_gas64.Plo
 	-rm -f ./$(DEPDIR)/xwindows.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-pkgconfigDATA
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 		-rm -f ./$(DEPDIR)/arb.Plo
 	-rm -f ./$(DEPDIR)/basicio.Plo
 	-rm -f ./$(DEPDIR)/bitmap.Plo
+	-rm -f ./$(DEPDIR)/bytecode.Plo
 	-rm -f ./$(DEPDIR)/check_objects.Plo
 	-rm -f ./$(DEPDIR)/diagnostics.Plo
 	-rm -f ./$(DEPDIR)/elfexport.Plo
 	-rm -f ./$(DEPDIR)/errors.Plo
 	-rm -f ./$(DEPDIR)/exporter.Plo
 	-rm -f ./$(DEPDIR)/gc.Plo
 	-rm -f ./$(DEPDIR)/gc_check_weak_ref.Plo
 	-rm -f ./$(DEPDIR)/gc_copy_phase.Plo
 	-rm -f ./$(DEPDIR)/gc_mark_phase.Plo
 	-rm -f ./$(DEPDIR)/gc_progress.Plo
 	-rm -f ./$(DEPDIR)/gc_share_phase.Plo
 	-rm -f ./$(DEPDIR)/gc_update_phase.Plo
 	-rm -f ./$(DEPDIR)/gctaskfarm.Plo
 	-rm -f ./$(DEPDIR)/heapsizing.Plo
-	-rm -f ./$(DEPDIR)/interpret.Plo
+	-rm -f ./$(DEPDIR)/interpreter.Plo
 	-rm -f ./$(DEPDIR)/locking.Plo
 	-rm -f ./$(DEPDIR)/machoexport.Plo
 	-rm -f ./$(DEPDIR)/memmgr.Plo
 	-rm -f ./$(DEPDIR)/mpoly.Plo
 	-rm -f ./$(DEPDIR)/network.Plo
 	-rm -f ./$(DEPDIR)/objsize.Plo
 	-rm -f ./$(DEPDIR)/osmemunix.Plo
 	-rm -f ./$(DEPDIR)/osmemwin.Plo
 	-rm -f ./$(DEPDIR)/pecoffexport.Plo
 	-rm -f ./$(DEPDIR)/pexport.Plo
 	-rm -f ./$(DEPDIR)/poly_specific.Plo
 	-rm -f ./$(DEPDIR)/polyffi.Plo
 	-rm -f ./$(DEPDIR)/polystring.Plo
 	-rm -f ./$(DEPDIR)/process_env.Plo
 	-rm -f ./$(DEPDIR)/processes.Plo
 	-rm -f ./$(DEPDIR)/profiling.Plo
 	-rm -f ./$(DEPDIR)/quick_gc.Plo
 	-rm -f ./$(DEPDIR)/realconv.Plo
 	-rm -f ./$(DEPDIR)/reals.Plo
 	-rm -f ./$(DEPDIR)/rts_module.Plo
 	-rm -f ./$(DEPDIR)/rtsentry.Plo
 	-rm -f ./$(DEPDIR)/run_time.Plo
 	-rm -f ./$(DEPDIR)/save_vec.Plo
 	-rm -f ./$(DEPDIR)/savestate.Plo
 	-rm -f ./$(DEPDIR)/scanaddrs.Plo
 	-rm -f ./$(DEPDIR)/sharedata.Plo
 	-rm -f ./$(DEPDIR)/sighandler.Plo
 	-rm -f ./$(DEPDIR)/statistics.Plo
 	-rm -f ./$(DEPDIR)/timing.Plo
 	-rm -f ./$(DEPDIR)/unix_specific.Plo
 	-rm -f ./$(DEPDIR)/winbasicio.Plo
 	-rm -f ./$(DEPDIR)/windows_specific.Plo
 	-rm -f ./$(DEPDIR)/winguiconsole.Plo
 	-rm -f ./$(DEPDIR)/winstartup.Plo
 	-rm -f ./$(DEPDIR)/x86_dep.Plo
 	-rm -f ./$(DEPDIR)/x86assembly_gas32.Plo
 	-rm -f ./$(DEPDIR)/x86assembly_gas64.Plo
 	-rm -f ./$(DEPDIR)/xwindows.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-libLTLIBRARIES install-man install-pdf \
 	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libpolyml/bytecode.cpp b/libpolyml/bytecode.cpp
index 5597961f..b65a1870 100644
--- a/libpolyml/bytecode.cpp
+++ b/libpolyml/bytecode.cpp
@@ -1,2656 +1,2657 @@
 /*
     Title:  An interpreter for a compact instruction set.
     Author:     Dave Matthews, Cambridge University Computer Laboratory
 
     Copyright (c) 2000-7
         Cambridge University Technical Services Limited
     Further development Copyright David C.J. Matthews 2015-18, 2020.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License version 2.1 as published by the Free Software Foundation.
     
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
     
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #elif defined(_WIN32)
 #include "winconfig.h"
 #else
 #error "No configuration file"
 #endif
 
 
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
 
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
 #define ASSERT(x) assert(x)
 #else
 #define ASSERT(x) 0
 #endif
 
-/*
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 
+/*
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
 
 #ifdef HAVE_MATH_H
 #include <math.h>
 #endif
 */
 #include <cmath> // Currently just for isnan.
 
 
 #include "globals.h"
 #include "int_opcodes.h"
 #include "sys.h"
 #include "profiling.h"
 #include "arb.h"
 #include "reals.h"
 #include "run_time.h"
 #include "gc.h"
 #include "diagnostics.h"
 #include "polystring.h"
 #include "scanaddrs.h"
 #include "rtsentry.h"
 #include "bytecode.h"
 
 #if (SIZEOF_VOIDP == 8 && !defined(POLYML32IN64))
 #define IS64BITS 1
 #endif
 
 
 #define arg1    (pc[0] + pc[1]*256)
 #define arg2    (pc[2] + pc[3]*256)
 
 const PolyWord True = TAGGED(1);
 const PolyWord False = TAGGED(0);
 const PolyWord Zero = TAGGED(0);
 
 // This duplicates some code in reals.cpp but is now updated.
 #define DOUBLESIZE (sizeof(double)/sizeof(POLYUNSIGNED))
 
 union realdb { double dble; POLYUNSIGNED puns[DOUBLESIZE]; };
 
 #define LGWORDSIZE (sizeof(uintptr_t) / sizeof(PolyWord))
 
 // We're using float for Real32 so it needs to be 32-bits.
 // Assume that's true for the moment.
 #if (SIZEOF_FLOAT != 4)
 #error "Float is not 32-bits.  Please report this"
 #endif
 
 union flt { float fl; int32_t i; };
 
-ByteCodeInterpreter::ByteCodeInterpreter() : overflowPacket(0), dividePacket(0), mixedCode(false)
+ByteCodeInterpreter::ByteCodeInterpreter() : mixedCode(false), overflowPacket(0), dividePacket(0)
 {
 #ifdef PROFILEOPCODES
     memset(frequency, 0, sizeof(frequency));
     memset(arg1Value, 0, sizeof(arg1Value));
     memset(arg2Value, 0, sizeof(arg2Value));
 #endif
 }
 
 ByteCodeInterpreter::~ByteCodeInterpreter()
 {
 #ifdef PROFILEOPCODES
     OutputDebugStringA("Frequency\n");
     for (unsigned i = 0; i < 256; i++)
     {
         if (frequency[i] != 0)
         {
             char buffer[100];
             sprintf(buffer, "%02X: %u\n", i, frequency[i]);
             OutputDebugStringA(buffer);
         }
     }
     OutputDebugStringA("Arg1\n");
     for (unsigned i = 0; i < 256; i++)
     {
         if (arg1Value[i] != 0)
         {
             char buffer[100];
             sprintf(buffer, "%02X: %u\n", i, arg1Value[i]);
             OutputDebugStringA(buffer);
         }
     }
     OutputDebugStringA("Arg2\n");
     for (unsigned i = 0; i < 256; i++)
     {
         if (arg2Value[i] != 0)
         {
             char buffer[100];
             sprintf(buffer, "%02X: %u\n", i, arg2Value[i]);
             OutputDebugStringA(buffer);
         }
     }
 #endif
 }
 
 extern "C" {
     typedef POLYUNSIGNED(*callFastRts0)();
     typedef POLYUNSIGNED(*callFastRts1)(intptr_t);
     typedef POLYUNSIGNED(*callFastRts2)(intptr_t, intptr_t);
     typedef POLYUNSIGNED(*callFastRts3)(intptr_t, intptr_t, intptr_t);
     typedef POLYUNSIGNED(*callFastRts4)(intptr_t, intptr_t, intptr_t, intptr_t);
     typedef POLYUNSIGNED(*callFastRts5)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
     typedef POLYUNSIGNED(*callFullRts0)(PolyObject *);
     typedef POLYUNSIGNED(*callFullRts1)(PolyObject *, intptr_t);
     typedef POLYUNSIGNED(*callFullRts2)(PolyObject *, intptr_t, intptr_t);
     typedef POLYUNSIGNED(*callFullRts3)(PolyObject *, intptr_t, intptr_t, intptr_t);
     typedef double (*callRTSRtoR) (double);
     typedef double (*callRTSRRtoR) (double, double);
     typedef double (*callRTSGtoR) (intptr_t);
     typedef double (*callRTSRGtoR) (double, intptr_t);
     typedef float(*callRTSFtoF) (float);
     typedef float(*callRTSFFtoF) (float, float);
     typedef float(*callRTSGtoF) (intptr_t);
     typedef float(*callRTSFGtoF) (float, intptr_t);
 }
 
 
 // Allocate memory on the heap.  Returns with the address of the cell. Does not set the
 // length word or any of the data.
 PolyObject* ByteCodeInterpreter::allocateMemory(TaskData * taskData, POLYUNSIGNED words, POLYCODEPTR& pc, stackItem*& sp)
 {
     words++; // Add the size of the length word.
     // N.B. The allocation area may be empty so that both of these are zero.
     if (taskData->allocPointer >= taskData->allocLimit + words + 1)
     {
 #ifdef POLYML32IN64
         if (words & 1) words++;
 #endif
         taskData->allocPointer -= words;
         return (PolyObject*)(taskData->allocPointer + 1);
     }
     // Insufficient space.
     SaveInterpreterState(pc, sp);
     // Find some space to allocate in. Returns a pointer to the newly allocated space.
     // N.B. This may return zero if the heap is exhausted and it has set this
     // up for an exception.  Generally it allocates by decrementing allocPointer
     // but if the required memory is large it may allocate in a separate area.
     PolyWord* space = processes->FindAllocationSpace(taskData, words, true);
     LoadInterpreterState(pc, sp);
     if (space == 0) return 0;
     return (PolyObject*)(space + 1);
 }
 
 // Put a real result in a "box"
 PolyObject* ByteCodeInterpreter::boxDouble(TaskData* taskData, double d, POLYCODEPTR& pc, stackItem*& sp)
 {
     PolyObject* mem = this->allocateMemory(taskData, DOUBLESIZE, pc, sp);
     if (mem == 0) return 0;
     mem->SetLengthWord(DOUBLESIZE, F_BYTE_OBJ);
     union realdb uniondb;
     uniondb.dble = d;
     // Copy the words.  Depending on the word length this may copy one or more words.
     for (unsigned i = 0; i < DOUBLESIZE; i++)
         mem->Set(i, PolyWord::FromUnsigned(uniondb.puns[i]));
     return mem;
 }
 
 // Extract a double value from a box.
 double ByteCodeInterpreter::unboxDouble(PolyWord p)
 {
     union realdb uniondb;
     for (unsigned i = 0; i < DOUBLESIZE; i++)
         uniondb.puns[i] = p.AsObjPtr()->Get(i).AsUnsigned();
     return uniondb.dble;
 }
 
 // Largely copied from reals.cpp
 
 #if (SIZEOF_FLOAT < SIZEOF_POLYWORD)
 
     // Typically for 64-bit mode.  Use a tagged representation.
     // The code-generator on the X86/64 assumes the float is in the
     // high order word.
 #define FLT_SHIFT ((SIZEOF_POLYWORD-SIZEOF_FLOAT)*8)
 float ByteCodeInterpreter::unboxFloat(PolyWord p)
 {
     union flt argx;
     argx.i = p.AsSigned() >> FLT_SHIFT;
     return argx.fl;
 }
 
 PolyObject* ByteCodeInterpreter::boxFloat(TaskData* taskData, float f, POLYCODEPTR& pc, stackItem*& sp)
 {
     union flt argx;
     argx.fl = f;
     PolyWord p = PolyWord::FromSigned(((POLYSIGNED)argx.i << FLT_SHIFT) + 1);
     return p.AsObjPtr(); // Temporarily cast it to this even though it isn't really
 }
 #else
     // Typically for 32-bit mode.  Use a boxed representation.
 PolyObject* ByteCodeInterpreter::boxFloat(TaskData* taskData, float f, POLYCODEPTR& pc, stackItem*& sp)
 {
     PolyObject* mem = this->allocateMemory(taskData, 1, pc, sp);
     if (mem == 0) return 0;
     mem->SetLengthWord(1, F_BYTE_OBJ);
     union flt argx;
     argx.fl = f;
     mem->Set(0, PolyWord::FromSigned(argx.i));
     return mem;
 }
 
 // Extract a double value from a box.
 float ByteCodeInterpreter::unboxFloat(PolyWord p)
 {
     union flt argx;
     argx.i = (int32_t)p.AsObjPtr()->Get(0).AsSigned();
     return argx.fl;
 }
 
 #endif
 
 
 enum ByteCodeInterpreter::_returnValue ByteCodeInterpreter::RunInterpreter(TaskData *taskData)
 /* (Re)-enter the Poly code from C. */
 {
     // Make packets for exceptions.
     if (overflowPacket == 0)
         overflowPacket = makeExceptionPacket(taskData, EXC_overflow);
     if (dividePacket == 0)
         dividePacket = makeExceptionPacket(taskData, EXC_divide);
 
     // Local values.  These are copies of member variables but are used so frequently that
     // it is important that access should be fast.
     POLYCODEPTR     pc;
     stackItem*sp;
 
     LoadInterpreterState(pc, sp);
 
     // We may have taken an interrupt which has set an exception.
     if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
 
     for(;;){ /* Each instruction */
 #if (0)
         char buff[1000];
         sprintf(buff, "addr = %p sp=%p instr=%02x *sp=%p\n", pc, sp, *pc, (*sp).stackAddr);
         OutputDebugStringA(buff);
 #endif
         ASSERT(sp[0].argValue != 2);
         // These are temporary values used where one instruction jumps to
         // common code.
         POLYUNSIGNED    tailCount;
         stackItem*      tailPtr;
         POLYUNSIGNED    returnCount;
         POLYUNSIGNED    storeWords;
         POLYUNSIGNED    stackCheck;
         PolyObject      *closure;
         double          dv;
 
 #ifdef PROFILEOPCODES
         frequency[*pc]++;
 #endif
         switch(*pc++) {
 
         case INSTR_jump8false:
         {
             PolyWord u = *sp++;
             if (u == True) pc += 1;
             else pc += *pc + 1;
             break;
         }
 
         case INSTR_jump8: pc += *pc + 1; break;
 
         case INSTR_jump8True:
         {
             PolyWord u = *sp++;
             if (u == False) pc += 1;
             else pc += *pc + 1;
             break;
         }
 
         case INSTR_jump16True:
             // Invert the sense of the test and fall through.
             *sp = ((*sp).w() == True) ? False : True;
 
         case INSTR_jump16false:
         {
             PolyWord u = *sp++; /* Pop argument */
             if (u == True) { pc += 2; break; }
             /* else - false - take the jump */
         }
 
         case INSTR_jump16:
             pc += arg1 + 2; break;
 
         case INSTR_push_handler: /* Save the old handler value. */
             (*(--sp)).stackAddr = GetHandlerRegister(); /* Push old handler */
             break;
 
         case INSTR_setHandler8: /* Set up a handler */
             (*(--sp)).codeAddr = pc + *pc + 1; /* Address of handler */
             SetHandlerRegister(sp);
             pc += 1;
             break;
 
         case INSTR_setHandler16: /* Set up a handler */
             (*(--sp)).codeAddr = pc + arg1 + 2; /* Address of handler */
             SetHandlerRegister(sp);
             pc += 2;
             break;
 
         case INSTR_deleteHandler: /* Delete handler retaining the result. */
         {
             stackItem u = *sp++;
             sp = GetHandlerRegister();
             sp++; // Remove handler entry point
             SetHandlerRegister((*sp).stackAddr); // Restore old handler
             *sp = u; // Put back the result
             break;
         }
 
         case INSTR_case16:
             {
                 // arg1 is the largest value that is in the range
                 POLYSIGNED u = UNTAGGED(*sp++); /* Get the value */
                 if (u >= arg1 || u < 0) pc += 2 + arg1*2; /* Out of range */
                 else {
                     pc += 2;
                     pc += /* Index */pc[u*2]+pc[u*2 + 1]*256; }
                 break;
             }
 
 
         case INSTR_tail_3_bLegacy:
            tailCount = 3;
            tailPtr = sp + tailCount;
            sp = tailPtr + *pc;
            goto TAIL_CALL;
 
         case INSTR_tail_3_2Legacy:
            tailCount = 3;
            tailPtr = sp + tailCount;
            sp = tailPtr + 2;
            goto TAIL_CALL;
 
         case INSTR_tail_3_3Legacy:
            tailCount = 3;
            tailPtr = sp + tailCount;
            sp = tailPtr + 3;
            goto TAIL_CALL;
 
         case INSTR_tail_4_bLegacy:
            tailCount = 4;
            tailPtr = sp + tailCount;
            sp = tailPtr + *pc;
            goto TAIL_CALL;
 
         case INSTR_tail_b_b:
            tailCount = *pc;
            tailPtr = sp + tailCount;
            sp = tailPtr + pc[1];
        TAIL_CALL: /* For general case. */
            if (tailCount < 2) Crash("Invalid argument\n");
            numTailArguments = (unsigned)(tailCount - 2);
            for (; tailCount > 0; tailCount--) *(--sp) = *(--tailPtr);
            pc = (*sp++).codeAddr; /* Pop the original return address. */
            closure = (*sp++).w().AsObjPtr();
            if (mixedCode)
            {
                // Return to the caller in case the function we're calling is machine code.
                // The number of arguments we're passing is given in the tail-count.  There's
                // no enter-int after this because we're not coming back.
                (--sp)->codeAddr = pc;
                *(--sp) = (PolyWord)closure;
                SaveInterpreterState(pc, sp);
                return ReturnTailCall;
            }
            goto CALL_CLOSURE; /* And drop through. */
 
         case INSTR_call_closure: /* Closure call. */
         {
             closure = (*sp++).w().AsObjPtr();
             CALL_CLOSURE:
             (--sp)->codeAddr = pc; /* Save return address. */
             *(--sp) = (PolyWord)closure;
             if (mixedCode)
             {
-                POLYCODEPTR newPc = *(POLYCODEPTR*)closure;
                 SaveInterpreterState(pc, sp);
                 return ReturnCall; // Caller must look at enter-int to determine number of args
             }
             pc = *(POLYCODEPTR*)closure;    /* Get entry point. */
             SaveInterpreterState(pc, sp); // Update in case we're profiling
             // Check that there at least 128 words on the stack
             stackCheck = 128;
             goto STACKCHECK;
         }
 
         case INSTR_callConstAddr8:
             closure = (*(PolyWord*)(pc + pc[0] + 1)).AsObjPtr(); pc += 1; goto CALL_CLOSURE;
 
         case INSTR_callConstAddr16:
             closure = (*(PolyWord*)(pc + arg1 + 2)).AsObjPtr(); pc += 2; goto CALL_CLOSURE;
 
         case INSTR_callLocalB:
         {
             closure = (sp[*pc++]).w().AsObjPtr();
             goto CALL_CLOSURE;
         }
 
         case INSTR_return_w:
             returnCount = arg1; /* Get no. of args to remove. */
 
             RETURN: /* Common code for return. */
             {
                 stackItem result = *sp++; /* Result */
                 sp++; /* Remove the link/closure */
                 pc = (*sp++).codeAddr; /* Return address */
                 sp += returnCount; /* Add on number of args. */
                 *(--sp) = result; /* Result */
                 SaveInterpreterState(pc, sp); // Update in case we're profiling or if returning
                 if (mixedCode)
                     return ReturnReturn;
             }
             break;
 
         case INSTR_return_b: returnCount = *pc; goto RETURN;
         case INSTR_return_0Legacy: returnCount = 0; goto RETURN;
         case INSTR_return_1: returnCount = 1; goto RETURN;
         case INSTR_return_2: returnCount = 2; goto RETURN;
         case INSTR_return_3: returnCount = 3; goto RETURN;
 
         case INSTR_stackSize8Legacy:
             stackCheck = *pc++;
             goto STACKCHECK;
 
         case INSTR_stackSize16:
         {
             stackCheck = arg1; pc += 2;
         STACKCHECK:
             // Check stackl space.  This is combined with interrupts on the native code version.
             CheckStackAndInterrupt(stackCheck, pc, sp);
             break;
         }
 
         case INSTR_raise_ex:
         {
-            PolyException *exn = (PolyException*)((*sp).w().AsObjPtr());
-            taskData->SetException(exn);
+            {
+                PolyException *exn = (PolyException*)((*sp).w().AsObjPtr());
+                taskData->SetException(exn);
+            }
         RAISE_EXCEPTION:
             sp = GetHandlerRegister();
             pc = (*sp++).codeAddr;
             // It is possible we could raise an exception to be
             // handled by native code but that does not currently happen
             // during the bootstrap.
             SetHandlerRegister((*sp++).stackAddr);
             break;
         }
 
         case INSTR_tuple_2: storeWords = 2; goto TUPLE;
         case INSTR_tuple_3: storeWords = 3; goto TUPLE;
         case INSTR_tuple_4: storeWords = 4; goto TUPLE;
         case INSTR_tuple_b: storeWords = *pc; pc++; goto TUPLE;
 
         case INSTR_closureB:
             storeWords = *pc++;
             goto CREATE_CLOSURE;
             break;
 
         case INSTR_local_w:
             {
                 stackItem u = sp[arg1];
                 *(--sp) = u;
                 pc += 2;
                 break;
             }
 
         case INSTR_constAddr8:
             *(--sp) = *(PolyWord*)(pc + pc[0] + 1); pc += 1; break;
 
         case INSTR_constAddr16:
             *(--sp) = *(PolyWord*)(pc + arg1 + 2); pc += 2; break;
 
         case INSTR_const_int_w: *(--sp) = TAGGED(arg1); pc += 2; break;
 
         case INSTR_jump_back8:
             pc -= *pc + 1;
             // Check for interrupt in case we're in a loop
             CheckStackAndInterrupt(0, pc, sp);
             break;
 
         case INSTR_jump_back16:
             pc -= arg1 + 1;
             // Check for interrupt in case we're in a loop
             CheckStackAndInterrupt(0, pc, sp);
             break;
 
         case INSTR_lock:
             {
                 PolyObject *obj = (*sp).w().AsObjPtr();
                 obj->SetLengthWord(obj->LengthWord() & ~_OBJ_MUTABLE_BIT);
                 break;
             }
 
         case INSTR_ldexc: *(--sp) = GetExceptionPacket(); break;
 
         case INSTR_local_b: { stackItem u = sp[*pc]; *(--sp) = u; pc += 1; break; }
 
         case INSTR_indirect_b:
             *sp = (*sp).w().AsObjPtr()->Get(*pc); pc += 1; break;
 
         case INSTR_indirectLocalBB:
         { PolyWord u = sp[*pc++]; *(--sp) = u.AsObjPtr()->Get(*pc++); break; }
 
         case INSTR_indirectLocalB0:
         { PolyWord u = sp[*pc++]; *(--sp) = u.AsObjPtr()->Get(0); break; }
 
         case INSTR_indirect0Local0:
         { PolyWord u = sp[0]; *(--sp) = u.AsObjPtr()->Get(0); break; }
 
         case INSTR_indirectLocalB1:
         { PolyWord u = sp[*pc++]; *(--sp) = u.AsObjPtr()->Get(1); break; }
 
         case INSTR_moveToContainerB:
             { PolyWord u = *sp++; (*sp).stackAddr[*pc] = u; pc += 1; break; }
 
         case INSTR_moveToMutClosureB:
         {
             PolyWord u = *sp++;
             (*sp).w().AsObjPtr()->Set(*pc++ + sizeof(uintptr_t) / sizeof(PolyWord), u);
             break;
         }
 
         case INSTR_indirectContainerB:
             *sp = (*sp).stackAddr[*pc]; pc += 1; break;
 
         case INSTR_indirectClosureBB:
         { PolyWord u = sp[*pc++]; *(--sp) = u.AsObjPtr()->Get(*pc++ + sizeof(uintptr_t) / sizeof(PolyWord)); break; }
 
         case INSTR_indirectClosureB0:
         { PolyWord u = sp[*pc++]; *(--sp) = u.AsObjPtr()->Get(sizeof(uintptr_t) / sizeof(PolyWord)); break; }
 
         case INSTR_indirectClosureB1:
         { PolyWord u = sp[*pc++]; *(--sp) = u.AsObjPtr()->Get(sizeof(uintptr_t) / sizeof(PolyWord) + 1); break; }
 
         case INSTR_indirectClosureB2:
         { PolyWord u = sp[*pc++]; *(--sp) = u.AsObjPtr()->Get(sizeof(uintptr_t) / sizeof(PolyWord) + 2); break; }
 
         case INSTR_set_stack_val_b:
             { PolyWord u = *sp++; sp[*pc-1] = u; pc += 1; break; }
 
         case INSTR_reset_b: sp += *pc; pc += 1; break;
 
         case INSTR_reset_r_b:
             { PolyWord u = *sp; sp += *pc; *sp = u; pc += 1; break; }
 
         case INSTR_const_int_b: *(--sp) = TAGGED(*pc); pc += 1; break;
 
         case INSTR_local_0: { stackItem u = sp[0]; *(--sp) = u; break; }
         case INSTR_local_1: { stackItem u = sp[1]; *(--sp) = u; break; }
         case INSTR_local_2: { stackItem u = sp[2]; *(--sp) = u; break; }
         case INSTR_local_3: { stackItem u = sp[3]; *(--sp) = u; break; }
         case INSTR_local_4: { stackItem u = sp[4]; *(--sp) = u; break; }
         case INSTR_local_5: { stackItem u = sp[5]; *(--sp) = u; break; }
         case INSTR_local_6: { stackItem u = sp[6]; *(--sp) = u; break; }
         case INSTR_local_7: { stackItem u = sp[7]; *(--sp) = u; break; }
         case INSTR_local_8: { stackItem u = sp[8]; *(--sp) = u; break; }
         case INSTR_local_9: { stackItem u = sp[9]; *(--sp) = u; break; }
         case INSTR_local_10: { stackItem u = sp[10]; *(--sp) = u; break; }
         case INSTR_local_11: { stackItem u = sp[11]; *(--sp) = u; break; }
         case INSTR_local_12: { stackItem u = sp[12]; *(--sp) = u; break; }
         case INSTR_local_13: { stackItem u = sp[13]; *(--sp) = u; break; }
         case INSTR_local_14: { stackItem u = sp[14]; *(--sp) = u; break; }
         case INSTR_local_15: { stackItem u = sp[15]; *(--sp) = u; break; }
 
         case INSTR_indirect_0:
             *sp = (*sp).w().AsObjPtr()->Get(0); break;
 
         case INSTR_indirect_1:
             *sp = (*sp).w().AsObjPtr()->Get(1); break;
 
         case INSTR_indirect_2:
             *sp = (*sp).w().AsObjPtr()->Get(2); break;
 
         case INSTR_indirect_3:
             *sp = (*sp).w().AsObjPtr()->Get(3); break;
 
         case INSTR_indirect_4:
             *sp = (*sp).w().AsObjPtr()->Get(4); break;
 
         case INSTR_indirect_5:
             *sp = (*sp).w().AsObjPtr()->Get(5); break;
 
         case INSTR_const_0: *(--sp) = Zero; break;
         case INSTR_const_1: *(--sp) = TAGGED(1); break;
         case INSTR_const_2: *(--sp) = TAGGED(2); break;
         case INSTR_const_3: *(--sp) = TAGGED(3); break;
         case INSTR_const_4: *(--sp) = TAGGED(4); break;
         case INSTR_const_10: *(--sp) = TAGGED(10); break;
 
         case INSTR_reset_r_1: { PolyWord u = *sp; sp += 1; *sp = u; break; }
         case INSTR_reset_r_2: { PolyWord u = *sp; sp += 2; *sp = u; break; }
         case INSTR_reset_r_3: { PolyWord u = *sp; sp += 3; *sp = u; break; }
 
         case INSTR_reset_1: sp += 1; break;
         case INSTR_reset_2: sp += 2; break;
 
         case INSTR_stack_containerB:
         {
             POLYUNSIGNED words = *pc++;
             while (words-- > 0) *(--sp) = Zero;
             sp--;
             (*sp).stackAddr = sp + 1;
             break;
         }
 
         case INSTR_tuple_containerLegacy: /* Create a tuple from a container. */
             {
                 storeWords = arg1;
                 PolyObject *t = this->allocateMemory(taskData, storeWords, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(storeWords, 0);
                 for(; storeWords > 0; )
                 {
                     storeWords--;
                     t->Set(storeWords, (*sp).stackAddr[storeWords]);
                 }
                 *sp = (PolyWord)t;
                 pc += 2;
                 break;
             }
 
         case INSTR_callFastRTS0:
             {
                 callFastRts0 doCall = *(callFastRts0*)(*sp++).w().AsObjPtr();
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall();
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFastRTS1:
             {
                 callFastRts1 doCall = *(callFastRts1*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(rtsArg1);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFastRTS2:
             {
                 callFastRts2 doCall = *(callFastRts2*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg2 = (*sp++).argValue; // Pop off the args, last arg first.
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(rtsArg1, rtsArg2);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFastRTS3:
             {
                 callFastRts3 doCall = *(callFastRts3*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg3 = (*sp++).argValue; // Pop off the args, last arg first.
                 intptr_t rtsArg2 = (*sp++).argValue;
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(rtsArg1, rtsArg2, rtsArg3);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFastRTS4:
             {
                 callFastRts4 doCall = *(callFastRts4*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg4 = (*sp++).argValue; // Pop off the args, last arg first.
                 intptr_t rtsArg3 = (*sp++).argValue;
                 intptr_t rtsArg2 = (*sp++).argValue;
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(rtsArg1, rtsArg2, rtsArg3, rtsArg4);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFastRTS5:
             {
                 callFastRts5 doCall = *(callFastRts5*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg5 = (*sp++).argValue; // Pop off the args, last arg first.
                 intptr_t rtsArg4 = (*sp++).argValue;
                 intptr_t rtsArg3 = (*sp++).argValue;
                 intptr_t rtsArg2 = (*sp++).argValue;
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(rtsArg1, rtsArg2, rtsArg3, rtsArg4, rtsArg5);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFullRTS0:
             {
                 callFullRts0 doCall = *(callFullRts0*)(*sp++).w().AsObjPtr();
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(taskData->threadObject);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp)= PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFullRTS1:
             {
                 callFullRts1 doCall = *(callFullRts1*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(taskData->threadObject, rtsArg1);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFullRTS2:
             {
                 callFullRts2 doCall = *(callFullRts2*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg2 = (*sp++).argValue; // Pop off the args, last arg first.
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(taskData->threadObject, rtsArg1, rtsArg2);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_callFullRTS3:
             {
                 callFullRts3 doCall = *(callFullRts3*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg3 = (*sp++).argValue; // Pop off the args, last arg first.
                 intptr_t rtsArg2 = (*sp++).argValue;
                 intptr_t rtsArg1 = (*sp++).argValue;
                 ClearExceptionPacket();
                 SaveInterpreterState(pc, sp);
                 POLYUNSIGNED result = doCall(taskData->threadObject, rtsArg1, rtsArg2, rtsArg3);
                 LoadInterpreterState(pc, sp);
                 // If this raised an exception 
                 if (GetExceptionPacket().IsDataPtr()) goto RAISE_EXCEPTION;
                 *(--sp) = PolyWord::FromUnsigned(result);
                 break;
             }
 
         case INSTR_notBoolean:
             *sp = ((*sp).w() == True) ? False : True; break;
 
         case INSTR_isTagged:
             *sp = (*sp).w().IsTagged() ? True : False; break;
 
         case INSTR_cellLength:
             /* Return the length word. */
             *sp = TAGGED((*sp).w().AsObjPtr()->Length());
             break;
 
         case INSTR_cellFlags:
         {
             SaveInterpreterState(pc, sp);
             PolyObject *p = (*sp).w().AsObjPtr();
             POLYUNSIGNED f = (p->LengthWord()) >> OBJ_PRIVATE_FLAGS_SHIFT;
             *sp = TAGGED(f);
             break;
         }
 
         case INSTR_clearMutable:
         {
             PolyObject *obj = (*sp).w().AsObjPtr();
             POLYUNSIGNED lengthW = obj->LengthWord();
             /* Clear the mutable bit. */
             obj->SetLengthWord(lengthW & ~_OBJ_MUTABLE_BIT);
             *sp = Zero;
             break;
         }
 
 //        case INSTR_stringLength: // Now replaced by loadUntagged
 //            *sp = TAGGED(((PolyStringObject*)(*sp).AsObjPtr())->length);
 //            break;
 
         case INSTR_atomicIncr:
         {
             PolyObject* p = (*sp).w().AsObjPtr();
             POLYUNSIGNED newValue = taskData->AtomicIncrement(p);
             *sp = PolyWord::FromUnsigned(newValue);
             break;
         }
 
         case INSTR_atomicDecr:
         {
             PolyObject *p = (*sp).w().AsObjPtr();
             POLYUNSIGNED newValue = taskData->AtomicDecrement(p);
             *sp = PolyWord::FromUnsigned(newValue);
             break;
         }
 
         case INSTR_equalWord:
         {
             PolyWord u = *sp++;
             *sp = u == (*sp) ? True : False;
             break;
         }
 
         case INSTR_jumpNEqLocal:
         {
             // Compare a local with a constant and jump if not equal.
             PolyWord u = sp[pc[0]];
             if (u.IsTagged() && u.UnTagged() == pc[1])
                 pc += 3;
             else pc += pc[2] + 3;
             break;
         }
 
         case INSTR_jumpNEqLocalInd:
         {
             // Test the union tag value in the first word of a tuple.
             PolyWord u = sp[pc[0]];
             u = u.AsObjPtr()->Get(0);
             if (u.IsTagged() && u.UnTagged() == pc[1])
                 pc += 3;
             else pc += pc[2] + 3;
             break;
         }
 
         case INSTR_isTaggedLocalB:
         {
             PolyWord u = sp[*pc++];
             *(--sp) = u.IsTagged() ? True : False;
             break;
         }
 
         case INSTR_jumpTaggedLocal:
         {
             PolyWord u = sp[*pc];
             // Jump if the value is tagged.
             if (u.IsTagged())
                 pc += pc[1] + 2;
             else pc += 2;
             break;
         }
 
         case INSTR_lessSigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsSigned() < u.AsSigned()) ? True : False;
             break;
         }
 
         case INSTR_lessUnsigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsUnsigned() < u.AsUnsigned()) ? True : False;
             break;
         }
 
         case INSTR_lessEqSigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsSigned() <= u.AsSigned()) ? True : False;
             break;
         }
 
         case INSTR_lessEqUnsigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsUnsigned() <= u.AsUnsigned()) ? True : False;
             break;
         }
 
         case INSTR_greaterSigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsSigned() > u.AsSigned()) ? True : False;
             break;
         }
 
         case INSTR_greaterUnsigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsUnsigned() > u.AsUnsigned()) ? True : False;
             break;
         }
 
         case INSTR_greaterEqSigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsSigned() >= u.AsSigned()) ? True : False;
             break;
         }
 
         case INSTR_greaterEqUnsigned:
         {
             PolyWord u = *sp++;
             *sp = ((*sp).w().AsUnsigned() >= u.AsUnsigned()) ? True : False;
             break;
         }
 
         case INSTR_fixedAdd:
         {
             PolyWord x = *sp++;
             PolyWord y = (*sp);
             POLYSIGNED t = UNTAGGED(x) + UNTAGGED(y);
             if (t <= MAXTAGGED && t >= -MAXTAGGED-1)
                 *sp = TAGGED(t);
             else
             {
                 *(--sp) = (PolyWord)overflowPacket;
                 goto RAISE_EXCEPTION;
             }
             break;
         }
 
         case INSTR_fixedSub:
         {
             PolyWord x = *sp++;
             PolyWord y = (*sp);
             POLYSIGNED t = UNTAGGED(y) - UNTAGGED(x);
             if (t <= MAXTAGGED && t >= -MAXTAGGED-1)
                 *sp = TAGGED(t);
             else
             {
                 *(--sp) = (PolyWord)overflowPacket;
                 goto RAISE_EXCEPTION;
             }
             break;
         }
 
         case INSTR_fixedMult:
         {
             POLYSIGNED x = UNTAGGED(*sp++);
             POLYSIGNED y = (*sp).w().AsSigned() - 1; // Just remove the tag
             POLYSIGNED t = x * y;
             if (x != 0 && t / x != y)
             {
                 *(--sp) = (PolyWord)overflowPacket;
                 goto RAISE_EXCEPTION;
             }
             *sp = PolyWord::FromSigned(t+1); // Add back the tag
             break;
         }
 
         case INSTR_fixedQuot:
         {
             // Zero and overflow are checked for in ML.
             POLYSIGNED u = UNTAGGED(*sp++);
             PolyWord y = (*sp);
             *sp = TAGGED(UNTAGGED(y) / u);
             break;
         }
 
         case INSTR_fixedRem:
         {
             // Zero and overflow are checked for in ML.
             POLYSIGNED u = UNTAGGED(*sp++);
             PolyWord y = (*sp);
             *sp = TAGGED(UNTAGGED(y) % u);
             break;
         }
 
         case INSTR_wordAdd:
         {
             PolyWord u = *sp++;
             // Because we're not concerned with overflow we can just add the values and subtract the tag.
             *sp = PolyWord::FromUnsigned((*sp).w().AsUnsigned() + u.AsUnsigned() - TAGGED(0).AsUnsigned());
             break;
         }
 
         case INSTR_wordSub:
         {
             PolyWord u = *sp++;
             *sp = PolyWord::FromUnsigned((*sp).w().AsUnsigned() - u.AsUnsigned() + TAGGED(0).AsUnsigned());
             break;
         }
 
         case INSTR_wordMult:
         {
             PolyWord u = *sp++;
             *sp = TAGGED(UNTAGGED_UNSIGNED(*sp) * UNTAGGED_UNSIGNED(u));
             break;
         }
 
         case INSTR_wordDiv:
         {
             POLYUNSIGNED u = UNTAGGED_UNSIGNED(*sp++);
             // Detection of zero is done in ML
             *sp = TAGGED(UNTAGGED_UNSIGNED(*sp) / u); break;
         }
 
         case INSTR_wordMod:
         {
             POLYUNSIGNED u = UNTAGGED_UNSIGNED(*sp++);
             *sp = TAGGED(UNTAGGED_UNSIGNED(*sp) % u);
             break;
         }
 
         case INSTR_wordAnd:
         {
             PolyWord u = *sp++;
             // Since both of these should be tagged the tag bit will be preserved.
             *sp = PolyWord::FromUnsigned((*sp).w().AsUnsigned() & u.AsUnsigned());
             break;
         }
 
         case INSTR_wordOr:
         {
             PolyWord u = *sp++;
             // Since both of these should be tagged the tag bit will be preserved.
             *sp = PolyWord::FromUnsigned((*sp).w().AsUnsigned() | u.AsUnsigned());
             break;
         }
 
         case INSTR_wordXor:
         {
             PolyWord u = *sp++;
             // This will remove the tag bit so it has to be reinstated.
             *sp = PolyWord::FromUnsigned(((*sp).w().AsUnsigned() ^ u.AsUnsigned()) | TAGGED(0).AsUnsigned());
             break;
         }
 
         case INSTR_wordShiftLeft:
         {
             // ML requires shifts greater than a word to return zero. 
             // That's dealt with at the higher level.
             PolyWord u = *sp++;
             *sp = TAGGED(UNTAGGED_UNSIGNED(*sp) << UNTAGGED_UNSIGNED(u));
             break;
         }
 
         case INSTR_wordShiftRLog:
         {
             PolyWord u = *sp++;
             *sp = TAGGED(UNTAGGED_UNSIGNED(*sp) >> UNTAGGED_UNSIGNED(u));
             break;
         }
 
         case INSTR_allocByteMem:
         {
             // Allocate byte segment.  This does not need to be initialised.
             POLYUNSIGNED flags = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED length = UNTAGGED_UNSIGNED(*sp);
             PolyObject *t = this->allocateMemory(taskData, length, pc, sp);
             if (t == 0) goto RAISE_EXCEPTION; // Exception
             t->SetLengthWord(length, (byte)flags);
             *sp = (PolyWord)t;
             break;
         }
 
         case INSTR_getThreadId:
             *(--sp) = (PolyWord)taskData->threadObject;
             break;
 
         case INSTR_allocWordMemory:
         {
             // Allocate word segment.  This must be initialised.
             // We mustn't pop the initialiser until after any potential GC.
             POLYUNSIGNED length = UNTAGGED_UNSIGNED(sp[2]);
             PolyObject *t = this->allocateMemory(taskData, length, pc, sp);
             if (t == 0) goto RAISE_EXCEPTION;
             PolyWord initialiser = *sp++;
             POLYUNSIGNED flags = UNTAGGED_UNSIGNED(*sp++);
             t->SetLengthWord(length, (byte)flags);
             *sp = (PolyWord)t;
             // Have to initialise the data.
             for (; length > 0; ) t->Set(--length, initialiser);
             break;
         }
 
         case INSTR_alloc_ref:
         {
             // Allocate a single word mutable cell.  This is more common than allocWordMemory on its own.
             PolyObject *t = this->allocateMemory(taskData, 1, pc, sp);
             if (t == 0) goto RAISE_EXCEPTION;
             PolyWord initialiser = (*sp);
             t->SetLengthWord(1, F_MUTABLE_BIT);
             t->Set(0, initialiser);
             *sp = (PolyWord)t;
             break;
         }
 
         case INSTR_allocMutClosureB:
         {
             // Allocate memory for a mutable closure and copy in the code address.
             POLYUNSIGNED length = *pc++ + sizeof(uintptr_t) / sizeof(PolyWord);
             PolyObject* t = this->allocateMemory(taskData, length, pc, sp);
             if (t == 0) goto RAISE_EXCEPTION;
             t->SetLengthWord(length, F_CLOSURE_OBJ | F_MUTABLE_BIT);
             PolyObject* srcClosure = (*sp).w().AsObjPtr();
             *(uintptr_t*)t = *(uintptr_t*)srcClosure;
             *sp = (PolyWord)t;
             break;
         }
 
         case INSTR_loadMLWordLegacy:
         {
             // The values on the stack are base, index and offset.
             POLYUNSIGNED offset = UNTAGGED(*sp++);
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject *p = (PolyObject*)((*sp).w().AsCodePtr() + offset);
             *sp = p->Get(index);
             break;
         }
 
         case INSTR_loadMLWord:
         {
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject* p = (PolyObject*)((*sp).w().AsCodePtr());
             *sp = p->Get(index);
             break;
         }
 
         case INSTR_loadMLByte:
         {
             // The values on the stack are base and index.
             POLYUNSIGNED index = UNTAGGED(*sp++);
             POLYCODEPTR p = (*sp).w().AsCodePtr();
             *sp = TAGGED(p[index]); // Have to tag the result
             break;
         }
 
         case INSTR_loadUntaggedLegacy:
         {
             // The values on the stack are base, index and offset.
             POLYUNSIGNED offset = UNTAGGED(*sp++);
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject *p = (PolyObject*)((*sp).w().AsCodePtr() + offset);
             *sp = TAGGED(p->Get(index).AsUnsigned());
             break;
         }
 
         case INSTR_loadUntagged:
         {
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject* p = (PolyObject*)((*sp).w().AsCodePtr());
             *sp = TAGGED(p->Get(index).AsUnsigned());
             break;
         }
 
         case INSTR_storeMLWordLegacy: 
         {
             PolyWord toStore = *sp++;
             POLYUNSIGNED offset = UNTAGGED(*sp++);
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject *p = (PolyObject*)((*sp).w().AsCodePtr() + offset);
             p->Set(index, toStore);
             *sp = Zero;
             break;
         }
 
         case INSTR_storeMLWord:
         {
             PolyWord toStore = *sp++;
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject* p = (PolyObject*)((*sp).w().AsCodePtr());
             p->Set(index, toStore);
             *sp = Zero;
             break;
         }
 
         case INSTR_storeMLByte: 
         {
             POLYUNSIGNED toStore = UNTAGGED(*sp++);
             POLYUNSIGNED index = UNTAGGED(*sp++);
             POLYCODEPTR p = (*sp).w().AsCodePtr();
             p[index] = (byte)toStore;
             *sp = Zero;
             break; 
         }
 
         case INSTR_storeUntaggedLegacy: 
         {
             PolyWord toStore = PolyWord::FromUnsigned(UNTAGGED_UNSIGNED(*sp++));
             POLYUNSIGNED offset = UNTAGGED(*sp++);
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject *p = (PolyObject*)((*sp).w().AsCodePtr() + offset);
             p->Set(index, toStore);
             *sp = Zero;
             break;
         }
 
         case INSTR_storeUntagged:
         {
             PolyWord toStore = PolyWord::FromUnsigned(UNTAGGED_UNSIGNED(*sp++));
             POLYUNSIGNED index = UNTAGGED(*sp++);
             PolyObject* p = (PolyObject*)((*sp).w().AsCodePtr());
             p->Set(index, toStore);
             *sp = Zero;
             break;
         }
 
         case INSTR_blockMoveWordLegacy:
         {
             // The offsets are byte counts but the the indexes are in words.
             POLYUNSIGNED length = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED destOffset = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED destIndex = UNTAGGED_UNSIGNED(*sp++);
             PolyObject *dest = (PolyObject*)((*sp++).w().AsCodePtr() + destOffset);
             POLYUNSIGNED srcOffset = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED srcIndex = UNTAGGED_UNSIGNED(*sp++);
             PolyObject *src = (PolyObject*)((*sp).w().AsCodePtr() + srcOffset);
             for (POLYUNSIGNED u = 0; u < length; u++) dest->Set(destIndex+u, src->Get(srcIndex+u));
             *sp = Zero;
             break;
         }
 
         case INSTR_blockMoveWord:
         {
             POLYUNSIGNED length = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED destIndex = UNTAGGED_UNSIGNED(*sp++);
             PolyObject* dest = (PolyObject*)((*sp++).w().AsCodePtr());
             POLYUNSIGNED srcIndex = UNTAGGED_UNSIGNED(*sp++);
             PolyObject* src = (PolyObject*)((*sp).w().AsCodePtr());
             for (POLYUNSIGNED u = 0; u < length; u++) dest->Set(destIndex + u, src->Get(srcIndex + u));
             *sp = Zero;
             break;
         }
 
         case INSTR_blockMoveByte:
         {
             POLYUNSIGNED length = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED destOffset = UNTAGGED_UNSIGNED(*sp++);
             POLYCODEPTR dest = (*sp++).w().AsCodePtr();
             POLYUNSIGNED srcOffset = UNTAGGED_UNSIGNED(*sp++);
             POLYCODEPTR src = (*sp).w().AsCodePtr();
             memcpy(dest+destOffset, src+srcOffset, length);
             *sp = Zero;
             break;
         }
 
         case INSTR_blockEqualByte:
         {
             POLYUNSIGNED length = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED arg2Offset = UNTAGGED_UNSIGNED(*sp++);
             POLYCODEPTR arg2Ptr = (*sp++).w().AsCodePtr();
             POLYUNSIGNED arg1Offset = UNTAGGED_UNSIGNED(*sp++);
             POLYCODEPTR arg1Ptr = (*sp).w().AsCodePtr();
             *sp = memcmp(arg1Ptr+arg1Offset, arg2Ptr+arg2Offset, length) == 0 ? True : False;
             break;
         }
 
         case INSTR_blockCompareByte:
         {
             POLYUNSIGNED length = UNTAGGED_UNSIGNED(*sp++);
             POLYUNSIGNED arg2Offset = UNTAGGED_UNSIGNED(*sp++);
             POLYCODEPTR arg2Ptr = (*sp++).w().AsCodePtr();
             POLYUNSIGNED arg1Offset = UNTAGGED_UNSIGNED(*sp++);
             POLYCODEPTR arg1Ptr = (*sp).w().AsCodePtr();
             int result = memcmp(arg1Ptr+arg1Offset, arg2Ptr+arg2Offset, length);
             *sp = result == 0 ? TAGGED(0) : result < 0 ? TAGGED(-1) : TAGGED(1);
             break;
         }
 
         // Backwards compatibility.
         // These are either used in the current compiler or compiled by it
         // while building the basis library.
         case EXTINSTR_stack_containerW:
         case EXTINSTR_reset_r_w:
         case EXTINSTR_tuple_w:
         case EXTINSTR_unsignedToLongW:
         case EXTINSTR_signedToLongW:
         case EXTINSTR_longWToTagged:
         case EXTINSTR_lgWordShiftLeft:
         case EXTINSTR_fixedIntToReal:
         case EXTINSTR_callFastRtoR:
         case EXTINSTR_realMult:
         case EXTINSTR_realDiv:
         case EXTINSTR_realNeg:
         case EXTINSTR_realAbs:
         case EXTINSTR_realToFloat:
         case EXTINSTR_floatDiv:
         case EXTINSTR_floatNeg:
         case EXTINSTR_floatAbs:
         case EXTINSTR_callFastFtoF:
         case EXTINSTR_floatMult:
         case EXTINSTR_callFastGtoR:
         case EXTINSTR_realUnordered:
         case EXTINSTR_realEqual:
         case EXTINSTR_lgWordEqual:
         case EXTINSTR_lgWordOr:
         case EXTINSTR_wordShiftRArith:
         case EXTINSTR_lgWordLess:
             // Back up and handle them as though they were escaped.
             pc--;
 
         case INSTR_escape:
         {
             switch (*pc++) {
 
             case EXTINSTR_callFastRRtoR:
             {
                 // Floating point call.
                 callRTSRRtoR doCall = *(callRTSRRtoR*)(*sp++).w().AsObjPtr();
                 PolyWord rtsArg2 = *sp++;
                 PolyWord rtsArg1 = *sp++;
                 double argument1 = unboxDouble(rtsArg1);
                 double argument2 = unboxDouble(rtsArg2);
                 // Allocate memory for the result.
                 double result = doCall(argument1, argument2);
                 PolyObject* t = boxDouble(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_callFastRGtoR:
             {
                 // Call that takes a POLYUNSIGNED argument and returns a double.
                 callRTSRGtoR doCall = *(callRTSRGtoR*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg2 = (*sp++).w().AsSigned();
                 PolyWord rtsArg1 = *sp++;
                 double argument1 = unboxDouble(rtsArg1);
                 // Allocate memory for the result.
                 double result = doCall(argument1, rtsArg2);
                 PolyObject* t = boxDouble(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_callFastGtoR:
             {
                 // Call that takes a POLYUNSIGNED argument and returns a double.
                 callRTSGtoR doCall = *(callRTSGtoR*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg1 = (*sp++).w().AsSigned();
                 // Allocate memory for the result.
                 double result = doCall(rtsArg1);
                 PolyObject* t = boxDouble(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_callFastFtoF:
             {
                 // Floating point call.  The call itself does not allocate but we
                 // need to put the result into a "box".
                 callRTSFtoF doCall = *(callRTSFtoF*)(*sp++).w().AsObjPtr();
                 PolyWord rtsArg1 = *sp++;
                 float argument = unboxFloat(rtsArg1);
                 // Allocate memory for the result.
                 float result = doCall(argument);
                 PolyObject* t = boxFloat(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_callFastFFtoF:
             {
                 // Floating point call.
                 callRTSFFtoF doCall = *(callRTSFFtoF*)(*sp++).w().AsObjPtr();
                 PolyWord rtsArg2 = *sp++;
                 PolyWord rtsArg1 = *sp++;
                 float argument1 = unboxFloat(rtsArg1);
                 float argument2 = unboxFloat(rtsArg2);
                 // Allocate memory for the result.
                 float result = doCall(argument1, argument2);
                 PolyObject* t = boxFloat(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_callFastGtoF:
             {
                 // Call that takes a POLYUNSIGNED argument and returns a double.
                 callRTSGtoF doCall = *(callRTSGtoF*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg1 = (*sp++).w().AsSigned();
                 // Allocate memory for the result.
                 float result = doCall(rtsArg1);
                 PolyObject* t = boxFloat(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_callFastFGtoF:
             {
                 // Call that takes a POLYUNSIGNED argument and returns a double.
                 callRTSFGtoF doCall = *(callRTSFGtoF*)(*sp++).w().AsObjPtr();
                 intptr_t rtsArg2 = (*sp++).w().AsSigned();
                 PolyWord rtsArg1 = *sp++;
                 float argument1 = unboxFloat(rtsArg1);
                 // Allocate memory for the result.
                 float result = doCall(argument1, rtsArg2);
                 PolyObject* t = boxFloat(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_callFastRtoR:
             {
                 // Floating point call.  The call itself does not allocate but we
                 // need to put the result into a "box".
                 callRTSRtoR doCall = *(callRTSRtoR*)(*sp++).w().AsObjPtr();
                 PolyWord rtsArg1 = *sp++;
                 double argument = unboxDouble(rtsArg1);
                 // Allocate memory for the result.
                 double result = doCall(argument);
                 PolyObject* t = boxDouble(taskData, result, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *(--sp) = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_atomicReset:
             {
                 // This is needed in the interpreted version otherwise there
                 // is a chance that we could set the value to zero while another
                 // thread is between getting the old value and setting it to the new value.
                 PolyObject* p = (*sp).w().AsObjPtr();
                 taskData->AtomicReset(p);
                 *sp = TAGGED(0); // Push the unit result
                 break;
             }
 
             case EXTINSTR_longWToTagged:
             {
                 // Extract the first word and return it as a tagged value.  This loses the top-bit
                 POLYUNSIGNED wx = (*sp).w().AsObjPtr()->Get(0).AsUnsigned();
                 *sp = TAGGED(wx);
                 break;
             }
 
             case EXTINSTR_signedToLongW:
             {
                 // Shift the tagged value to remove the tag and put it into the first word.
                 // The original sign bit is copied in the shift.
                 intptr_t wx = (*sp).w().UnTagged();
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(intptr_t*)t = wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_unsignedToLongW:
             {
                 // As with the above except the value is treated as an unsigned
                 // value and the top bit is zero.
                 uintptr_t wx = (*sp).w().UnTaggedUnsigned();
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realAbs:
             {
                 PolyObject* t = this->boxDouble(taskData, fabs(unboxDouble(*sp)), pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realNeg:
             {
                 PolyObject* t = this->boxDouble(taskData, -(unboxDouble(*sp)), pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_floatAbs:
             {
                 PolyObject* t = this->boxFloat(taskData, fabs(unboxFloat(*sp)), pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_floatNeg:
             {
                 PolyObject* t = this->boxFloat(taskData, -(unboxFloat(*sp)), pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_fixedIntToReal:
             {
                 POLYSIGNED u = UNTAGGED(*sp);
                 PolyObject* t = this->boxDouble(taskData, (double)u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_fixedIntToFloat:
             {
                 POLYSIGNED u = UNTAGGED(*sp);
                 PolyObject* t = this->boxFloat(taskData, (float)u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_floatToReal:
             {
                 float u = unboxFloat(*sp);
                 PolyObject* t = this->boxDouble(taskData, (double)u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_wordShiftRArith:
             {
                 PolyWord u = *sp++;
                 // Strictly speaking, C does not require that this uses
                 // arithmetic shifting so we really ought to set the
                 // high-order bits explicitly.
                 *sp = TAGGED(UNTAGGED(*sp) >> UNTAGGED(u));
                 break;
             }
 
 
             case EXTINSTR_lgWordEqual:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 *sp = wx == wy ? True : False;
                 break;
             }
 
             case EXTINSTR_lgWordLess:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 *sp = (wy < wx) ? True : False;
                 break;
             }
 
             case EXTINSTR_lgWordLessEq:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 *sp = (wy <= wx) ? True : False;
                 break;
             }
 
             case EXTINSTR_lgWordGreater:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 *sp = (wy > wx) ? True : False;
                 break;
             }
 
             case EXTINSTR_lgWordGreaterEq:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 *sp = (wy >= wx) ? True : False;
                 break;
             }
 
             case EXTINSTR_lgWordAdd:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy + wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordSub:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy - wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordMult:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy * wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordDiv:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy / wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordMod:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy % wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordAnd:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy & wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordOr:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy | wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordXor:
             {
                 uintptr_t wx = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy ^ wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordShiftLeft:
             {
                 // The shift amount is a tagged word not a boxed large word
                 POLYUNSIGNED wx = UNTAGGED_UNSIGNED(*sp++);
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy << wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordShiftRLog:
             {
                 // The shift amount is a tagged word not a boxed large word
                 POLYUNSIGNED wx = UNTAGGED_UNSIGNED(*sp++);
                 uintptr_t wy = *(uintptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = wy >> wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_lgWordShiftRArith:
             {
                 // The shift amount is a tagged word not a boxed large word
                 POLYUNSIGNED wx = UNTAGGED_UNSIGNED(*sp++);
                 intptr_t wy = *(intptr_t*)((*sp).w().AsObjPtr());
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(intptr_t*)t = wy >> wx;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realEqual:
             {
                 double u = unboxDouble(*sp++);
                 *sp = u == unboxDouble(*sp) ? True : False;
                 break;
             }
 
             case EXTINSTR_realLess:
             {
                 double u = unboxDouble(*sp++);
                 *sp = unboxDouble(*sp) < u ? True : False;
                 break;
             }
 
             case EXTINSTR_realLessEq:
             {
                 double u = unboxDouble(*sp++);
                 *sp = unboxDouble(*sp) <= u ? True : False;
                 break;
             }
 
             case EXTINSTR_realGreater:
             {
                 double u = unboxDouble(*sp++);
                 *sp = unboxDouble(*sp) > u ? True : False;
                 break;
             }
 
             case EXTINSTR_realGreaterEq:
             {
                 double u = unboxDouble(*sp++);
                 *sp = unboxDouble(*sp) >= u ? True : False;
                 break;
             }
 
             case EXTINSTR_realUnordered:
             {
                 double u = unboxDouble(*sp++);
                 double v = unboxDouble(*sp);
                 *sp = (std::isnan(u) || std::isnan(v)) ? True : False;
                 break;
             }
 
             case EXTINSTR_realAdd:
             {
                 double u = unboxDouble(*sp++);
                 double v = unboxDouble(*sp);
                 PolyObject* t = this->boxDouble(taskData, v + u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realSub:
             {
                 double u = unboxDouble(*sp++);
                 double v = unboxDouble(*sp);
                 PolyObject* t = this->boxDouble(taskData, v - u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realMult:
             {
                 double u = unboxDouble(*sp++);
                 double v = unboxDouble(*sp);
                 PolyObject* t = this->boxDouble(taskData, v * u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realDiv:
             {
                 double u = unboxDouble(*sp++);
                 double v = unboxDouble(*sp);
                 PolyObject* t = this->boxDouble(taskData, v / u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_floatEqual:
             {
                 float u = unboxFloat(*sp++);
                 *sp = u == unboxFloat(*sp) ? True : False;
                 break;
             }
 
             case EXTINSTR_floatLess:
             {
                 float u = unboxFloat(*sp++);
                 *sp = unboxFloat(*sp) < u ? True : False;
                 break;
             }
 
             case EXTINSTR_floatLessEq:
             {
                 float u = unboxFloat(*sp++);
                 *sp = unboxFloat(*sp) <= u ? True : False;
                 break;
             }
 
             case EXTINSTR_floatGreater:
             {
                 float u = unboxFloat(*sp++);
                 *sp = unboxFloat(*sp) > u ? True : False;
                 break;
             }
 
             case EXTINSTR_floatGreaterEq:
             {
                 float u = unboxFloat(*sp++);
                 *sp = unboxFloat(*sp) >= u ? True : False;
                 break;
             }
 
             case EXTINSTR_floatUnordered:
             {
                 float u = unboxFloat(*sp++);
                 float v = unboxFloat(*sp);
                 *sp = (std::isnan(u) || std::isnan(v)) ? True : False;
                 break;
             }
 
             case EXTINSTR_floatAdd:
             {
                 float u = unboxFloat(*sp++);
                 float v = unboxFloat(*sp);
                 PolyObject* t = this->boxFloat(taskData, v + u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_floatSub:
             {
                 float u = unboxFloat(*sp++);
                 float v = unboxFloat(*sp);
                 PolyObject* t = this->boxFloat(taskData, v - u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_floatMult:
             {
                 float u = unboxFloat(*sp++);
                 float v = unboxFloat(*sp);
                 PolyObject* t = this->boxFloat(taskData, v * u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_floatDiv:
             {
                 float u = unboxFloat(*sp++);
                 float v = unboxFloat(*sp);
                 PolyObject* t = this->boxFloat(taskData, v / u, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realToFloat:
             {
                 // Convert a double to a float.  It's complicated because it depends on the rounding mode.
                 int rMode = *pc++;
                 int current = getrounding();
                 // If the rounding is 4 it means "use current rounding".
                 // Don't call unboxDouble until we're set the rounding.  GCC seems to convert it
                 // before the actual float cast.
                 if (rMode < 4) setrounding(rMode);
                 double d = unboxDouble(*sp);
                 float v = (float)d; // Convert with the appropriate rounding.
                 setrounding(current);
                 PolyObject* t = this->boxFloat(taskData, v, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_realToInt:
                 dv = unboxDouble(*sp);
                 goto realtoint;
 
             case EXTINSTR_floatToInt:
                 dv = (double)unboxFloat(*sp);
             realtoint:
                 {
                     // Convert a double or a float to a tagged integer.
                     int rMode = *pc++;
                     // We mustn't try converting a value that will overflow the conversion
                     // but we need to be careful that we don't raise overflow incorrectly due
                     // to rounding.
                     if (dv > (double)(MAXTAGGED + MAXTAGGED / 2) ||
                         dv < -(double)(MAXTAGGED + MAXTAGGED / 2))
                     {
                         *(--sp) = (PolyWord)overflowPacket;
                         goto RAISE_EXCEPTION;
                     }
                     POLYSIGNED p;
                     switch (rMode)
                     {
                     case POLY_ROUND_TONEAREST:
                         p = (POLYSIGNED)round(dv);
                         break;
                     case POLY_ROUND_DOWNWARD:
                         p = (POLYSIGNED)floor(dv);
                         break;
                     case POLY_ROUND_UPWARD:
                         p = (POLYSIGNED)ceil(dv);
                         break;
                     case POLY_ROUND_TOZERO:
                     default:
                         // Truncation is the default for C.
                         p = (POLYSIGNED)dv;
                     }
 
                     // Check that the value can be tagged.
                     if (p > MAXTAGGED || p < -MAXTAGGED - 1)
                     {
                         *(--sp) = (PolyWord)overflowPacket;
                         goto RAISE_EXCEPTION;
                     }
                     *sp = TAGGED(p);
                     break;
                 }
 
             case EXTINSTR_loadC8:
             {
                 // This is similar to loadMLByte except that the base address is a boxed large-word.
                 // Also the index is SIGNED.
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 *sp = TAGGED(p[index]); // Have to tag the result
                 break;
             }
 
             case EXTINSTR_loadC16:
             {
                 // This and the other loads are similar to loadMLWord with separate
                 // index and offset values.
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 POLYUNSIGNED r = ((uint16_t*)p)[index];
                 *sp = TAGGED(r);
                 break;
             }
 
             case EXTINSTR_loadC32:
             {
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 uintptr_t r = ((uint32_t*)p)[index];
 #ifdef IS64BITS
                 // This is tagged in 64-bit mode
                 * sp = TAGGED(r);
 #else
                 // But boxed in 32-bit mode.
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = r;
                 *sp = (PolyWord)t;
 #endif
                 break;
             }
 
 #if (defined(IS64BITS) || defined(POLYML32IN64))
             case EXTINSTR_loadC64:
             {
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 uintptr_t r = ((uint64_t*)p)[index];
                 // This must be boxed.
                 PolyObject* t = this->allocateMemory(taskData, LGWORDSIZE, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(LGWORDSIZE, F_BYTE_OBJ);
                 *(uintptr_t*)t = r;
                 *sp = (PolyWord)t;
                 break;
             }
 #endif
 
             case EXTINSTR_loadCFloat:
             {
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 double r = ((float*)p)[index];
                 // This must be boxed.
                 PolyObject* t = this->boxDouble(taskData, r, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_loadCDouble:
             {
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 double r = ((double*)p)[index];
                 // This must be boxed.
                 PolyObject* t = this->boxDouble(taskData, r, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_storeC8:
             {
                 // Similar to storeMLByte except that the base address is a boxed large-word.
                 POLYUNSIGNED toStore = UNTAGGED(*sp++);
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 p[index] = (byte)toStore;
                 *sp = Zero;
                 break;
             }
 
             case EXTINSTR_storeC16:
             {
                 uint16_t toStore = (uint16_t)UNTAGGED(*sp++);
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 ((uint16_t*)p)[index] = toStore;
                 *sp = Zero;
                 break;
             }
 
             case EXTINSTR_storeC32:
             {
 #ifdef IS64BITS
                 // This is a tagged value in 64-bit mode.
                 uint32_t toStore = (uint32_t)UNTAGGED(*sp++);
 #else
                 // but a boxed value in 32-bit mode.
                 uint32_t toStore = (uint32_t)(*(uintptr_t*)((*sp++).w().AsObjPtr()));
 #endif
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 ((uint32_t*)p)[index] = toStore;
                 *sp = Zero;
                 break;
         }
 
 #if (defined(IS64BITS) || defined(POLYML32IN64))
             case EXTINSTR_storeC64:
             {
                 // This is a boxed value.
                 uint64_t toStore = *(uintptr_t*)((*sp++).w().AsObjPtr());
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 ((uint64_t*)p)[index] = toStore;
                 *sp = Zero;
                 break;
             }
 #endif
 
             case EXTINSTR_storeCFloat:
             {
                 // This is a boxed value.
                 float toStore = (float)unboxDouble(*sp++);
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 ((float*)p)[index] = toStore;
                 *sp = Zero;
                 break;
             }
 
             case EXTINSTR_storeCDouble:
             {
                 // This is a boxed value.
                 double toStore = unboxDouble(*sp++);
                 POLYSIGNED offset = UNTAGGED(*sp++);
                 POLYSIGNED index = UNTAGGED(*sp++);
                 POLYCODEPTR p = *((byte**)((*sp).w().AsObjPtr())) + offset;
                 ((double*)p)[index] = toStore;
                 *sp = Zero;
                 break;
             }
 
             case EXTINSTR_jump32True:
                 // Invert the sense of the test and fall through.
                 *sp = ((*sp).w() == True) ? False : True;
 
             case EXTINSTR_jump32False:
             {
                 PolyWord u = *sp++; /* Pop argument */
                 if (u == True) { pc += 4; break; }
                 /* else - false - take the jump */
             }
 
             case EXTINSTR_jump32:
             {
                 // This is a 32-bit signed quantity on both 64-bits and 32-bits.
                 POLYSIGNED offset = pc[3] & 0x80 ? -1 : 0;
                 offset = (offset << 8) | pc[3];
                 offset = (offset << 8) | pc[2];
                 offset = (offset << 8) | pc[1];
                 offset = (offset << 8) | pc[0];
                 pc += offset + 4;
                 break;
             }
 
             case EXTINSTR_setHandler32: /* Set up a handler */
             {
                 POLYUNSIGNED offset = pc[0] + (pc[1] << 8) + (pc[2] << 16) + (pc[3] << 24);
                 (--sp)->codeAddr = pc + offset + 4; /* Address of handler */
                 SetHandlerRegister(sp);
                 pc += 4;
                 break;
             }
 
             case EXTINSTR_case32:
             {
                 // arg1 is the number of cases i.e. one more than the largest value
                 // This is followed by that number of 32-bit offsets.
                 // If the value is out of range the default case is immediately after the table.
                 POLYSIGNED u = UNTAGGED(*sp++); /* Get the value */
                 if (u >= arg1 || u < 0) pc += 2 + arg1 * 4; /* Out of range */
                 else
                 {
                     pc += 2;
                     pc += /* Index */pc[u * 4] + (pc[u * 4 + 1] << 8) + (pc[u * 4 + 2] << 16) + (pc[u * 4 + 3] << 24);
                 }
                 break;
             }
 
             case EXTINSTR_tuple_w:
             {
                 storeWords = arg1; pc += 2;
             TUPLE: /* Common code for tupling. */
                 PolyObject* p = this->allocateMemory(taskData, storeWords, pc, sp);
                 if (p == 0) goto RAISE_EXCEPTION; // Exception
                 p->SetLengthWord(storeWords, 0);
                 for (; storeWords > 0; ) p->Set(--storeWords, *sp++);
                 *(--sp) = (PolyWord)p;
                 break;
             }
 
             case EXTINSTR_indirect_w:
                 *sp = (*sp).w().AsObjPtr()->Get(arg1); pc += 2; break;
 
             case EXTINSTR_moveToContainerW:
             {
                 PolyWord u = *sp++;
                 (*sp).stackAddr[arg1] =u;
                 pc += 2;
                 break;
             }
 
             case EXTINSTR_moveToMutClosureW:
             {
                PolyWord u = *sp++;
                 (*sp).w().AsObjPtr()->Set(arg1 + sizeof(uintptr_t)/sizeof(PolyWord), u);
                 pc += 2;
                 break;
             }
 
             case EXTINSTR_indirectContainerW:
                 *sp = (*sp).stackAddr[arg1]; pc += 2; break;
 
             case EXTINSTR_indirectClosureW:
                 *sp = (*sp).w().AsObjPtr()->Get(arg1+sizeof(uintptr_t)/sizeof(PolyWord)); pc += 2; break;
 
             case EXTINSTR_set_stack_val_w:
             {
                 PolyWord u = *sp++;
                 sp[arg1 - 1] = u;
                 pc += 2;
                 break;
             }
 
             case EXTINSTR_reset_w: sp += arg1; pc += 2; break;
 
             case EXTINSTR_reset_r_w:
             {
                 PolyWord u = *sp;
                 sp += arg1;
                 *sp = u;
                 pc += 2;
                 break;
             }
 
             case EXTINSTR_stack_containerW:
             {
                 POLYUNSIGNED words = arg1; pc += 2;
                 while (words-- > 0) *(--sp) = Zero;
                 sp--;
                 (*sp).stackAddr = sp + 1;
                 break;
             }
 
             case EXTINSTR_constAddr32:
             {
                 POLYUNSIGNED offset = pc[0] + (pc[1] << 8) + (pc[2] << 16) + (pc[3] << 24);
                 *(--sp) = *(PolyWord*)(pc + offset + 4);
                 pc += 4;
                 break;
             }
 
             case EXTINSTR_allocCSpace:
             {
                 // Allocate this on the C heap.
                 POLYUNSIGNED length = UNTAGGED_UNSIGNED(*sp);
                 void* memory = malloc(length);
                 *sp = Make_sysword(taskData, (uintptr_t)memory)->Word();
                 break;
             }
 
             case EXTINSTR_freeCSpace:
             {
                 // Both the address and the size are passed as arguments.
                 sp++; // Size
                 PolyWord addr = *sp;
                 free(*(void**)(addr.AsObjPtr()));
                 *sp = TAGGED(0);
                 break;
             }
 
             case EXTINSTR_tail:
                 /* Tail recursive call. */
                 /* Move items up the stack. */
                 /* There may be an overlap if the function we are calling
                    has more args than this one. */
                 tailCount = arg1;
                 tailPtr = sp + tailCount;
                 sp = tailPtr + arg2;
                 goto TAIL_CALL;
 
 
             case EXTINSTR_allocMutClosureW:
             {
                 // Allocate memory for a mutable closure and copy in the code address.
                 POLYUNSIGNED length = arg1 + sizeof(uintptr_t) / sizeof(PolyWord);
                 pc += 2;
                 PolyObject* t = this->allocateMemory(taskData, length, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(length, F_CLOSURE_OBJ | F_MUTABLE_BIT);
                 PolyObject* srcClosure = (*sp).w().AsObjPtr();
                 *(uintptr_t*)t = *(uintptr_t*)srcClosure;
                 *sp = (PolyWord)t;
                 break;
             }
 
             case EXTINSTR_closureW:
             {
                 storeWords = arg1;
                 pc += 2;
             CREATE_CLOSURE:
                 // Allocate a closure.  storeWords is the number of non-locals.
                 POLYUNSIGNED length = storeWords + sizeof(uintptr_t) / sizeof(PolyWord);
                 PolyObject* t = this->allocateMemory(taskData, length, pc, sp);
                 if (t == 0) goto RAISE_EXCEPTION;
                 t->SetLengthWord(length, F_CLOSURE_OBJ);
                 for (; storeWords > 0; ) t->Set(--storeWords + sizeof(uintptr_t) / sizeof(PolyWord), *sp++);
                 PolyObject* srcClosure = (*sp).w().AsObjPtr();
                 *(uintptr_t*)t = *(uintptr_t*)srcClosure;
                 *sp = (PolyWord)t;
                 break;
             }
 
             default: Crash("Unknown extended instruction %x\n", pc[-1]);
             }
 
             break;
         }
 
         case INSTR_enterIntX86:
             // This is a no-op if we are already interpreting.
             pc += 3; break;
 
         default: Crash("Unknown instruction %x\n", pc[-1]);
 
         } /* switch */
      } /* for */
      return ReturnReturn; // Never actually reached
 }
 
 void ByteCodeInterpreter::GarbageCollect(ScanAddress* process)
 {
     if (overflowPacket != 0)
         overflowPacket = process->ScanObjectAddress(overflowPacket);
     if (dividePacket != 0)
         dividePacket = process->ScanObjectAddress(dividePacket);
 }
 
 extern "C" {
     POLYEXTERNALSYMBOL POLYUNSIGNED PolyInterpretedGetAbiList(FirstArgument threadId);
     POLYEXTERNALSYMBOL POLYUNSIGNED PolyInterpretedCreateCIF(FirstArgument threadId, PolyWord abiValue, PolyWord resultType, PolyWord argTypes);
     POLYEXTERNALSYMBOL POLYUNSIGNED PolyInterpretedCallFunction(FirstArgument threadId, PolyWord cifAddr, PolyWord cFunAddr, PolyWord resAddr, PolyWord argVec);
 }
 
 // FFI
 #if (defined(HAVE_LIBFFI) && defined(HAVE_FFI_H))
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 
 #include <ffi.h>
 
 static struct _abiTable { const char* abiName; ffi_abi abiCode; } abiTable[] =
 {
     // Unfortunately the ABI entries are enums rather than #defines so we
     // can't test individual entries.
     #ifdef X86_WIN32
         {"sysv", FFI_SYSV},
         {"stdcall", FFI_STDCALL},
         {"thiscall", FFI_THISCALL},
         {"fastcall", FFI_FASTCALL},
         {"ms_cdecl", FFI_MS_CDECL},
     #elif defined(X86_WIN64)
         {"win64", FFI_WIN64},
     #elif defined(X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
         {"unix64", FFI_UNIX64},
     #elif defined(X86_ANY)
         {"sysv", FFI_SYSV},
     #endif
         { "default", FFI_DEFAULT_ABI}
 };
 
 static Handle mkAbitab(TaskData* taskData, void*, char* p);
 
 static Handle toSysWord(TaskData* taskData, void* p)
 {
     return Make_sysword(taskData, (uintptr_t)p);
 }
 
 // Convert the Poly type info into ffi_type values.
 /*
     datatype cTypeForm =
             CTypeFloatingPt | CTypePointer | CTypeSignedInt | CTypeUnsignedInt
         |   CTypeStruct of cType list | CTypeVoid
         withtype cType = { typeForm: cTypeForm, align: word, size: word }
 */
 static ffi_type* decodeType(PolyWord pType)
 {
     PolyWord typeForm = pType.AsObjPtr()->Get(2);
     PolyWord typeSize = pType.AsObjPtr()->Get(0);
 
     if (typeForm.IsDataPtr())
     {
         // Struct
         size_t size = typeSize.UnTaggedUnsigned();
         unsigned short align = (unsigned short)pType.AsObjPtr()->Get(1).UnTaggedUnsigned();
         unsigned nElems = 0;
         PolyWord listStart = typeForm.AsObjPtr()->Get(0);
         for (PolyWord p = listStart; !ML_Cons_Cell::IsNull(p); p = ((ML_Cons_Cell*)p.AsObjPtr())->t)
             nElems++;
         size_t space = sizeof(ffi_type);
         // Add space for the elements plus one extra for the zero terminator.
         space += (nElems + 1) * sizeof(ffi_type*);
         ffi_type* result = (ffi_type*)calloc(1, space);
         // Raise an exception rather than returning zero.
         if (result == 0) return 0;
         ffi_type** elem = (ffi_type**)(result + 1);
         result->size = size;
         result->alignment = align;
         result->type = FFI_TYPE_STRUCT;
         result->elements = elem;
         if (elem != 0)
         {
             for (PolyWord p = listStart; !ML_Cons_Cell::IsNull(p); p = ((ML_Cons_Cell*)p.AsObjPtr())->t)
             {
                 PolyWord e = ((ML_Cons_Cell*)p.AsObjPtr())->h;
                 ffi_type* t = decodeType(e);
                 if (t == 0) return 0;
                 *elem++ = t;
             }
             *elem = 0; // Null terminator
         }
         return result;
     }
     else
     {
         switch (typeForm.UnTaggedUnsigned())
         {
         case 0:
         {
             // Floating point
             if (typeSize.UnTaggedUnsigned() == ffi_type_float.size)
                 return &ffi_type_float;
             else if (typeSize.UnTaggedUnsigned() == ffi_type_double.size)
                 return &ffi_type_double;
             ASSERT(0);
         }
         case 1: // FFI type poiner
             return &ffi_type_pointer;
         case 2: // Signed integer.
         {
             switch (typeSize.UnTaggedUnsigned())
             {
             case 1: return &ffi_type_sint8;
             case 2: return &ffi_type_sint16;
             case 4: return &ffi_type_sint32;
             case 8: return &ffi_type_sint64;
             default: ASSERT(0);
             }
         }
         case 3: // Unsigned integer.
         {
             switch (typeSize.UnTaggedUnsigned())
             {
             case 1: return &ffi_type_uint8;
             case 2: return &ffi_type_uint16;
             case 4: return &ffi_type_uint32;
             case 8: return &ffi_type_uint64;
             default: ASSERT(0);
             }
         }
         case 4: // Void
             return &ffi_type_void;
         }
         ASSERT(0);
     }
     return 0;
 }
 
 // Create a CIF.  This contains all the types and some extra information.
 // The arguments are the raw ML values.  That does make this dependent on the
 // representations used by the compiler.
 // This mallocs space for the CIF and the types.  The space is never freed.
 // 
 POLYUNSIGNED PolyInterpretedCreateCIF(FirstArgument threadId, PolyWord abiValue, PolyWord resultType, PolyWord argTypes)
 {
     TaskData* taskData = TaskData::FindTaskForId(threadId);
     ASSERT(taskData != 0);
     taskData->PreRTSCall();
     Handle reset = taskData->saveVec.mark();
     Handle result = 0;
     ffi_abi abi = (ffi_abi)get_C_ushort(taskData, abiValue);
 
     try {
         unsigned nArgs = 0;
         for (PolyWord p = argTypes; !ML_Cons_Cell::IsNull(p); p = ((ML_Cons_Cell*)p.AsObjPtr())->t)
             nArgs++;
         // Allocate space for the cif followed by the argument type vector
         size_t space = sizeof(ffi_cif) + nArgs * sizeof(ffi_type*);
         ffi_cif* cif = (ffi_cif*)malloc(space);
         if (cif == 0) raise_syscall(taskData, "Insufficient memory", ENOMEM);
         ffi_type* rtype = decodeType(resultType);
         if (rtype == 0) raise_syscall(taskData, "Insufficient memory", ENOMEM);
         ffi_type** atypes = (ffi_type**)(cif + 1);
         // Copy the arguments types.
         ffi_type** at = atypes;
         for (PolyWord p = argTypes; !ML_Cons_Cell::IsNull(p); p = ((ML_Cons_Cell*)p.AsObjPtr())->t)
         {
             PolyWord e = ((ML_Cons_Cell*)p.AsObjPtr())->h;
             ffi_type* atype = decodeType(e);
             if (atype == 0) raise_syscall(taskData, "Insufficient memory", ENOMEM);
             *at++ = atype;
         }
         ffi_status status = ffi_prep_cif(cif, abi, nArgs, rtype, atypes);
         if (status == FFI_BAD_TYPEDEF)
             raise_exception_string(taskData, EXC_foreign, "Bad typedef in ffi_prep_cif");
         else if (status == FFI_BAD_ABI)
             raise_exception_string(taskData, EXC_foreign, "Bad ABI in ffi_prep_cif");
         else if (status != FFI_OK)
             raise_exception_string(taskData, EXC_foreign, "Error in ffi_prep_cif");
         result = toSysWord(taskData, cif);
     }
     catch (...) {} // If an ML exception is raised
 
     taskData->saveVec.reset(reset);
     taskData->PostRTSCall();
     if (result == 0) return TAGGED(0).AsUnsigned();
     else return result->Word().AsUnsigned();
 }
 
 // Call a function.
 POLYUNSIGNED PolyInterpretedCallFunction(FirstArgument threadId, PolyWord cifAddr, PolyWord cFunAddr, PolyWord resAddr, PolyWord argVec)
 {
     ffi_cif* cif = *(ffi_cif**)cifAddr.AsAddress();
     void* f = *(void**)cFunAddr.AsAddress();
     void* res = *(void**)resAddr.AsAddress();
     void* arg = *(void**)argVec.AsAddress();
     // Poly passes the arguments as values, effectively a single struct.
     // Libffi wants a vector of addresses.
     void** argVector = (void**)calloc(cif->nargs + 1, sizeof(void*));
     unsigned n = 0;
     uintptr_t p = (uintptr_t)arg;
     while (n < cif->nargs)
     {
         uintptr_t align = cif->arg_types[n]->alignment;
         p = (p + align - 1) & (0 - align);
         argVector[n] = (void*)p;
         p += cif->arg_types[n]->size;
         n++;
     }
     // The result area we have provided is only as big as required.
     // Libffi may need a larger area.
     if (cif->rtype->size < FFI_SIZEOF_ARG)
     {
         char result[FFI_SIZEOF_ARG];
         ffi_call(cif, FFI_FN(f), &result, argVector);
         if (cif->rtype->type != FFI_TYPE_VOID)
             memcpy(res, result, cif->rtype->size);
     }
     else ffi_call(cif, FFI_FN(f), res, argVector);
     free(argVector);
     return TAGGED(0).AsUnsigned();
 }
 
 #else
 // Libffi is not present.
 
 // A basic table so that the Foreign structure will compile
 static struct _abiTable { const char* abiName; int abiCode; } abiTable[] =
 {
         { "default", 0}
 };
 
 // Don't raise an exception at this point so we can build calls.
 POLYUNSIGNED PolyInterpretedCreateCIF(FirstArgument threadId, PolyWord abiValue, PolyWord resultType, PolyWord argTypes)
 {
     return TAGGED(0).AsUnsigned();
 }
 
 POLYUNSIGNED PolyInterpretedCallFunction(FirstArgument threadId, PolyWord cifAddr, PolyWord cFunAddr, PolyWord resAddr, PolyWord argVec)
 {
     TaskData* taskData = TaskData::FindTaskForId(threadId);
     raise_exception_string(taskData, EXC_foreign, "Foreign function calling is not available.  Libffi is not installled.");
     return TAGGED(0).AsUnsigned();
 }
 
 #endif
 
 // Construct an entry in the ABI table.
 static Handle mkAbitab(TaskData* taskData, void* arg, char* p)
 {
     struct _abiTable* ab = (struct _abiTable*)p;
     // Construct a pair of the string and the code
     Handle name = taskData->saveVec.push(C_string_to_Poly(taskData, ab->abiName));
     Handle code = Make_arbitrary_precision(taskData, ab->abiCode);
     Handle result = alloc_and_save(taskData, 2);
     result->WordP()->Set(0, name->Word());
     result->WordP()->Set(1, code->Word());
     return result;
 }
 
 // Get ABI list.  This is called once only before the basis library is built.
 POLYUNSIGNED PolyInterpretedGetAbiList(FirstArgument threadId)
 {
     TaskData* taskData = TaskData::FindTaskForId(threadId);
     ASSERT(taskData != 0);
     taskData->PreRTSCall();
     Handle reset = taskData->saveVec.mark();
     Handle result = 0;
 
     try {
         result = makeList(taskData, sizeof(abiTable) / sizeof(abiTable[0]),
             (char*)abiTable, sizeof(abiTable[0]), 0, mkAbitab);
     }
     catch (...) {} // If an ML exception is raised
 
     taskData->saveVec.reset(reset);
     taskData->PostRTSCall();
     if (result == 0) return TAGGED(0).AsUnsigned();
     else return result->Word().AsUnsigned();
 }
 
 // No machine-specific calls in the interpreter.
 struct _entrypts byteCodeEPT[] =
 {
     { "PolyInterpretedGetAbiList",           (polyRTSFunction)&PolyInterpretedGetAbiList },
     { "PolyInterpretedCreateCIF",            (polyRTSFunction)&PolyInterpretedCreateCIF },
     { "PolyInterpretedCallFunction",         (polyRTSFunction)&PolyInterpretedCallFunction },
    { NULL, NULL} // End of list.
 };
diff --git a/libpolyml/bytecode.h b/libpolyml/bytecode.h
index a385210a..338701ad 100644
--- a/libpolyml/bytecode.h
+++ b/libpolyml/bytecode.h
@@ -1,71 +1,71 @@
 #pragma once
 /*
     Title: bytecode.h - Header for common code for the byte-code interpreter
 
     Copyright (c) 2006, 2015-17, 2020 David C.J. Matthews
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License version 2.1 as published by the Free Software Foundation.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 #ifndef BYTECODE_H_INCLUDED
 #define BYTECODE_H_INCLUDED
 
 #include "globals.h"
 
 class TaskData;
 
 class ByteCodeInterpreter
 {
 protected:
     ByteCodeInterpreter();
     ~ByteCodeInterpreter();
 
     enum _returnValue {
         ReturnTailCall,
         ReturnCall,
         ReturnReturn
     };
     enum _returnValue RunInterpreter(TaskData* taskData);
 
     virtual void SaveInterpreterState(POLYCODEPTR pc, stackItem* sp) = 0;
     virtual void LoadInterpreterState(POLYCODEPTR& pc, stackItem*& sp) = 0;
     virtual void ClearExceptionPacket() = 0;
     virtual PolyWord GetExceptionPacket() = 0; // Exception packet is set via TaskData::SetException
     virtual stackItem* GetHandlerRegister() = 0;
     virtual void SetHandlerRegister(stackItem* hr) = 0;
     virtual void CheckStackAndInterrupt(POLYUNSIGNED space, POLYCODEPTR& pc, stackItem*& sp) = 0;
 
     void GarbageCollect(ScanAddress* process);
     bool mixedCode;
     int numTailArguments;
 
 private:
     PolyObject *overflowPacket, *dividePacket;
 
 private:
     inline PolyObject* allocateMemory(TaskData* taskData, POLYUNSIGNED words, POLYCODEPTR& pc, stackItem*& sp);
-    inline PolyObject* ByteCodeInterpreter::boxDouble(TaskData* taskData, double d, POLYCODEPTR& pc, stackItem*& sp);
-    inline double ByteCodeInterpreter::unboxDouble(PolyWord p);
-    inline float ByteCodeInterpreter::unboxFloat(PolyWord p);
-    inline PolyObject* ByteCodeInterpreter::boxFloat(TaskData* taskData, float f, POLYCODEPTR& pc, stackItem*& sp);
+    inline PolyObject* boxDouble(TaskData* taskData, double d, POLYCODEPTR& pc, stackItem*& sp);
+    inline double unboxDouble(PolyWord p);
+    inline float unboxFloat(PolyWord p);
+    inline PolyObject* boxFloat(TaskData* taskData, float f, POLYCODEPTR& pc, stackItem*& sp);
 
 #ifdef PROFILEOPCODES
     unsigned frequency[256], arg1Value[256], arg2Value[256];
 #endif
 };
 
 extern struct _entrypts byteCodeEPT[];
 
 #endif