diff --git a/document/Makefile b/document/Makefile
index 875efc72..629d5f51 100644
--- a/document/Makefile
+++ b/document/Makefile
@@ -1,4 +1,4 @@
-DIRS = core js-api web-api
+DIRS = core js-api web-api legacy/exceptions
FILES = index.html
BUILDDIR = _build
diff --git a/document/index.html b/document/index.html
index 37eed976..79a2a0cf 100644
--- a/document/index.html
+++ b/document/index.html
@@ -49,19 +49,32 @@ Embedder specifications
JavaScript Embedding : defines JavaScript classes and objects for accessing WebAssembly from within JavaScript, including methods for validation, compilation, instantiation, and classes for representing and manipulating imports and exports as JavaScript objects.
Web Embedding : defines extensions to the JavaScript API made available specifically in web browsers, in particular, an interface for streaming compilation and instantiation from origin-bound Response types.
+Legacy Extensions
+
+Define extensions that are deprecated, but may still be in use.
+
+
+
+
Source for these documents is available
here .
diff --git a/document/legacy/exceptions/.gitignore b/document/legacy/exceptions/.gitignore
new file mode 100644
index 00000000..b932ec28
--- /dev/null
+++ b/document/legacy/exceptions/.gitignore
@@ -0,0 +1,3 @@
+_build
+_static
+document/*.pyc
diff --git a/document/legacy/exceptions/LICENSE b/document/legacy/exceptions/LICENSE
new file mode 100644
index 00000000..795b406e
--- /dev/null
+++ b/document/legacy/exceptions/LICENSE
@@ -0,0 +1,50 @@
+W3C SOFTWARE AND DOCUMENT NOTICE AND LICENSE
+
+This work is being provided by the copyright holders under the following
+license.
+
+
+LICENSE
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+* The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+
+* Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice
+ (https://www.w3.org/Consortium/Legal/copyright-software-short-notice) should
+ be included.
+
+* Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+
+DISCLAIMERS
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+
+NOTES
+
+This version:
+http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
diff --git a/document/legacy/exceptions/Makefile b/document/legacy/exceptions/Makefile
new file mode 100644
index 00000000..56b9560a
--- /dev/null
+++ b/document/legacy/exceptions/Makefile
@@ -0,0 +1,358 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER = a4
+BUILDDIR = _build
+STATICDIR = _static
+DOWNLOADDIR = _download
+NAME = WebAssembly
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: usage
+usage:
+ @echo "Please use \`make ' where is one of"
+ @echo " html to make standalone HTML files"
+ @echo " pdf to make standalone PDF file"
+ @echo " bikeshed to make a bikeshed wrapped single large HTML file"
+ @echo " diff to make a diff of the bikeshed HTML file with the latest TR"
+ @echo " WD-tar generate tar file for updating the Working Draft"
+ @echo " WD-echidna publish the Working Draft tar file via Echidna"
+ @echo " all to make all 3"
+ @echo " publish to make all and push to gh-pages"
+ @echo " help to see more options"
+
+.PHONY: help
+help:
+ @echo "Usage: \`make ' where is one of"
+ @echo " html to make standalone HTML files"
+ @echo " pdf to make standalone PDF file"
+ @echo " bikeshed to make a bikeshed wrapped single large HTML file"
+ @echo " all to make all 3"
+ @echo " publish to make all and push to gh-pages"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " applehelp to make an Apple Help Book"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " epub3 to make an epub3"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " texinfo to make Texinfo files"
+ @echo " info to make Texinfo files and run them through makeinfo"
+ @echo " gettext to make PO message catalogs"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " xml to make Docutils-native XML files"
+ @echo " pseudoxml to make pseudoxml-XML files for display purposes"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+ @echo " coverage to run coverage check of the documentation (if enabled)"
+ @echo " dummy to check syntax errors of document sources"
+
+.PHONY: deploy
+deploy:
+ (cd ../..; make dir-core deploy-core)
+
+.PHONY: publish
+publish: clean all deploy
+
+.PHONY: publish-main
+publish-main: clean main bikeshed-keep deploy
+
+.PHONY: all
+all: pdf html bikeshed
+
+.PHONY: main
+main: pdf html
+
+# Dirty hack to avoid rebuilding the Bikeshed version for every push.
+.PHONY: bikeshed-keep
+bikeshed-keep:
+ test -e $(BUILDDIR)/html/bikeshed || \
+ wget -r -nH --cut-dirs=2 -P $(BUILDDIR)/html --no-check-certificate \
+ https://webassembly.github.io/spec/core/bikeshed || \
+ echo Downloaded Bikeshed.
+
+
+GENERATED = appendix/index-instructions.rst
+.INTERMEDIATE: $(GENERATED)
+
+%.rst: %.py
+ (cd `dirname $@`; ./`basename $^`)
+
+.PHONY: pdf
+pdf: $(GENERATED) latexpdf
+ mkdir -p $(BUILDDIR)/html/$(DOWNLOADDIR)
+ ln -f $(BUILDDIR)/latex/$(NAME).pdf $(BUILDDIR)/html/$(DOWNLOADDIR)/$(NAME).pdf
+
+
+.PHONY: clean
+clean:
+ rm -rf $(BUILDDIR)
+ rm -rf $(STATICDIR)
+ rm -f $(GENERATED)
+
+.PHONY: html
+html: $(GENERATED)
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ for file in `ls $(BUILDDIR)/html/*.html`; \
+ do \
+ sed s:BASEDIR:.:g <$$file >$$file.out; \
+ mv -f $$file.out $$file; \
+ done
+ for file in `ls $(BUILDDIR)/html/*/*.html`; \
+ do \
+ sed s:BASEDIR:..:g <$$file >$$file.out; \
+ mv -f $$file.out $$file; \
+ done
+ @echo
+ @echo "Build finished. The HTML pages are in `pwd`/$(BUILDDIR)/html/."
+
+.PHONY: dirhtml
+dirhtml: $(GENERATED)
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+.PHONY: singlehtml
+singlehtml: $(GENERATED)
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+.PHONY: bikeshed
+bikeshed: $(GENERATED)
+ $(SPHINXBUILD) -b singlehtml -c util/bikeshed \
+ $(ALLSPHINXOPTS) $(BUILDDIR)/bikeshed_singlehtml
+ python3 util/bikeshed_fixup.py $(BUILDDIR)/bikeshed_singlehtml/index.html \
+ >$(BUILDDIR)/bikeshed_singlehtml/index_fixed.html
+ @echo ==== Showing contents of _build/bikeshed_singlehtml/index_fixed.html ====
+ @head -n10 _build/bikeshed_singlehtml/index_fixed.html
+ @echo ... skipping $$(expr `cat _build/bikeshed_singlehtml/index_fixed.html | wc -l` - 20) lines ...
+ @tail -n10 _build/bikeshed_singlehtml/index_fixed.html
+ @echo
+ @echo =========================================================================
+ mkdir -p $(BUILDDIR)/bikeshed_mathjax/
+ bikeshed spec index.bs $(BUILDDIR)/bikeshed_mathjax/index.html
+ mkdir -p $(BUILDDIR)/html/bikeshed/
+ (cd util/katex/ && yarn && yarn build && npm install --only=prod)
+ python3 util/mathjax2katex.py $(BUILDDIR)/bikeshed_mathjax/index.html \
+ >$(BUILDDIR)/html/bikeshed/index.html
+ mkdir -p $(BUILDDIR)/html/bikeshed/katex/dist/
+ cp -r util/katex/dist/* $(BUILDDIR)/html/bikeshed/katex/dist/
+ patch -p0 $(BUILDDIR)/html/bikeshed/katex/dist/katex.css \
+ < util/katex_fix.patch
+ cp $(BUILDDIR)/bikeshed_singlehtml/_static/pygments.css \
+ $(BUILDDIR)/html/bikeshed/
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/html/bikeshed/."
+
+.PHONY: WD-tar
+WD-tar: bikeshed
+ @echo "Building tar file..."
+ tar cvf \
+ $(BUILDDIR)/WD.tar \
+ --transform='s|$(BUILDDIR)/html/bikeshed/||' \
+ --transform='s|index.html|Overview.html|' \
+ $(BUILDDIR)/html/bikeshed/index.html \
+ $(BUILDDIR)/html/bikeshed/pygments.css \
+ $(BUILDDIR)/html/bikeshed/katex/dist/katex.css \
+ $(BUILDDIR)/html/bikeshed/katex/dist/fonts
+ @echo "Built $(BUILDDIR)/WD.tar."
+
+.PHONY: WD-echidna
+WD-echidna: WD-tar
+ @if [ -z $(W3C_USERNAME) ] || \
+ [ -z $(W3C_PASSWORD) ] || \
+ [ -z $(DECISION_URL) ] ; then \
+ echo "Must provide W3C_USERNAME, W3C_PASSWORD, and DECISION_URL environment variables"; \
+ exit 1; \
+ fi
+ curl 'https://labs.w3.org/echidna/api/request' \
+ --user '$(W3C_USERNAME):$(W3C_PASSWORD)' \
+ -F "tar=@$(BUILDDIR)/WD.tar" \
+ -F "decision=$(DECISION_URL)" | tee $(BUILDDIR)/WD-echidna-id.txt
+ @echo
+ @echo "Published working draft. Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"
+
+.PHONY: diff
+diff: bikeshed
+ @echo "Downloading the old single-file html spec..."
+ curl `grep "^TR" index.bs | cut -d' ' -f2` -o $(BUILDDIR)/html/bikeshed/old.html
+ @echo "Done."
+ @echo "Diffing new against old (go get a coffee)..."
+ perl ../util/htmldiff.pl $(BUILDDIR)/html/bikeshed/old.html $(BUILDDIR)/html/bikeshed/index.html $(BUILDDIR)/html/bikeshed/diff.html
+ @echo "Done. The diff is at $(BUILDDIR)/html/bikeshed/diff.html"
+
+.PHONY: pickle
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+.PHONY: json
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+.PHONY: htmlhelp
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+.PHONY: qthelp
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/WebAssembly.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/WebAssembly.qhc"
+
+.PHONY: applehelp
+applehelp:
+ $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+ @echo
+ @echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+ @echo "N.B. You won't be able to view it unless you put it in" \
+ "~/Library/Documentation/Help or install it in your application" \
+ "bundle."
+
+.PHONY: devhelp
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/WebAssembly"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/WebAssembly"
+ @echo "# devhelp"
+
+.PHONY: epub
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+.PHONY: epub3
+epub3:
+ $(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
+ @echo
+ @echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
+
+.PHONY: latex
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+.PHONY: latexpdf
+latexpdf: $(GENERATED)
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex LATEXMKOPTS=" $(BUILDDIR)/latex/LOG 2>&1 || cat $(BUILDDIR)/latex/LOG
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: latexpdfja
+latexpdfja:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through platex and dvipdfmx..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: text
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+.PHONY: man
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+.PHONY: texinfo
+texinfo:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+ @echo "Run \`make' in that directory to run these through makeinfo" \
+ "(use \`make info' here to do that automatically)."
+
+.PHONY: info
+info:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo "Running Texinfo files through makeinfo..."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+.PHONY: gettext
+gettext:
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+.PHONY: changes
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+.PHONY: linkcheck
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+.PHONY: doctest
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
+
+.PHONY: coverage
+coverage:
+ $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+ @echo "Testing of coverage in the sources finished, look at the " \
+ "results in $(BUILDDIR)/coverage/python.txt."
+
+.PHONY: xml
+xml:
+ $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+ @echo
+ @echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+.PHONY: pseudoxml
+pseudoxml:
+ $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+ @echo
+ @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+.PHONY: dummy
+dummy:
+ $(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
+ @echo
+ @echo "Build finished. Dummy builder generates no files."
diff --git a/document/legacy/exceptions/README.md b/document/legacy/exceptions/README.md
new file mode 100644
index 00000000..06d07523
--- /dev/null
+++ b/document/legacy/exceptions/README.md
@@ -0,0 +1,25 @@
+# WebAssembly Core Specification Addendum: Legacy Exception Handling
+
+This is the official WebAssembly "language" specification.
+
+It uses [Sphinx](http://www.sphinx-doc.org/). To install that:
+```
+pip install sphinx
+```
+To make HTML (result in `_build/html`):
+```
+make html
+```
+To make PDF (result in `_build/latex`, requires LaTeX):
+```
+make pdf
+```
+To make all:
+```
+make all
+```
+Finally, to make all and update webassembly.github.io/spec with it:
+```
+make publish
+```
+Please make sure to only use that once a change has approval.
diff --git a/document/legacy/exceptions/appendix/index-instructions.py b/document/legacy/exceptions/appendix/index-instructions.py
new file mode 100755
index 00000000..ea315469
--- /dev/null
+++ b/document/legacy/exceptions/appendix/index-instructions.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+
+# This script generates the `index-instructions.rst` file. The table in that
+# file is particularly annoying to update by hand, since the Restructured Text
+# format requires the header and columns to line up properly. This is
+# especially tedious when merging changes from the upstream spec, or merging a
+# proposal back to the spec when it is standardized.
+
+import os
+
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+INDEX_INSTRUCTIONS_RST = os.path.join(SCRIPT_DIR, 'index-instructions.rst')
+
+HEADER = """\
+.. DO NOT EDIT: This file is auto-generated by the index-instructions.py script.
+
+.. _appendix:
+
+Appendix
+========
+
+.. index:: instruction
+.. _index-instr:
+
+Index of Instructions
+---------------------
+"""
+
+FOOTER = """\
+
+.. note::
+ Multi-byte opcodes are given with the shortest possible encoding in the table.
+ However, what is following the first byte is actually a :ref:`u32 ` with variable-length encoding
+ and consequently has multiple possible representations.\
+"""
+
+COLUMNS = [
+ 'Instruction',
+ 'Binary Opcode',
+ 'Type',
+ 'Validation',
+ 'Execution',
+]
+
+
+def MathWrap(s, default=''):
+ if s is None:
+ return default
+ else:
+ return f':math:`{s}`'
+
+
+def RefWrap(s, kind):
+ if s is None:
+ return ''
+ else:
+ return f':ref:`{kind} <{s}>`'
+
+
+def Instruction(name, opcode, type=None, validation=None, execution=None, operator=None, validation2=None, execution2=None):
+ if operator:
+ execution_str = ', '.join([RefWrap(execution, 'execution'),
+ RefWrap(operator, 'operator')])
+ elif execution2:
+ execution_str = ', '.join([RefWrap(execution, 'execution'),
+ RefWrap(execution, 'execution')])
+
+ else:
+ execution_str = RefWrap(execution, 'execution')
+
+ if validation2:
+ validation_str = ', '.join([RefWrap(validation, 'validation'),
+ RefWrap(validation2, 'validation')])
+ else:
+ validation_str = RefWrap(validation, 'validation')
+
+ return (
+ MathWrap(name, '(reserved)'),
+ MathWrap(opcode),
+ MathWrap(type),
+ validation_str,
+ execution_str
+ )
+
+
+INSTRUCTIONS = [
+ Instruction(r'\TRY~\X{bt}', r'\hex{06}', r'[t_1^\ast] \to [t_2^\ast]', r'valid-try-catch', r'exec-try-catch', None, r'valid-try-delegate', r'exec-try-delegate'),
+ Instruction(r'\CATCH~x', r'\hex{07}', None, r'valid-try-catch', r'exec-try-catch'),
+ Instruction(r'\RETHROW~n', r'\hex{09}', r'[t_1^\ast] \to [t_2^\ast]', r'valid-rethrow', r'exec-rethrow'),
+ Instruction(r'\DELEGATE~l', r'\hex{18}', None, r'valid-try-delegate', r'exec-try-delegate'),
+ Instruction(r'\CATCHALL', r'\hex{19}', None, r'valid-try-catch', r'exec-try-catch'),
+]
+
+
+def ColumnWidth(n):
+ return max([len(instr[n]) for instr in INSTRUCTIONS])
+
+COLUMN_WIDTHS = [ColumnWidth(i) for i in range(len(COLUMNS))]
+DIVIDER = ' '.join('=' * width for width in COLUMN_WIDTHS)
+
+def Row(columns):
+ return ' '.join(('{:%d}' % COLUMN_WIDTHS[i]).format(column)
+ for i, column in enumerate(columns))
+
+if __name__ == '__main__':
+ with open(INDEX_INSTRUCTIONS_RST, 'w') as f:
+ print(HEADER, file=f)
+ print(DIVIDER, file=f)
+ print(Row(COLUMNS), file=f)
+ print(DIVIDER, file=f)
+
+ for instr in INSTRUCTIONS:
+ print(Row(instr), file=f)
+
+ print(DIVIDER, file=f)
+ print(FOOTER, file=f)
diff --git a/document/legacy/exceptions/binary.rst b/document/legacy/exceptions/binary.rst
new file mode 100644
index 00000000..68ea09df
--- /dev/null
+++ b/document/legacy/exceptions/binary.rst
@@ -0,0 +1,31 @@
+.. _binary:
+
+Binary Format
+=============
+
+.. index:: instruction
+.. _binary-instr:
+
+Instructions
+------------
+
+.. _binary-instr-control:
+
+Control Instructions
+~~~~~~~~~~~~~~~~~~~~
+
+.. _binary-try:
+.. _binary-rethrow:
+
+.. math::
+ \begin{array}{llcllll}
+ \production{instruction} & \Binstr &::=& \dots \\ &&|&
+ \hex{06}~~\X{bt}{:}\Bblocktype~~(\X{in}_1{:}\Binstr)^\ast~~
+ (\hex{07}~~x{:}\Btagidx~~(\X{in}_2{:}\Binstr)^\ast)^\ast~~
+ (\hex{19}~~(\X{in}_3{:}\Binstr)^\ast)^?~~\hex{0B}
+ &\Rightarrow& \TRY~\X{bt}~\X{in}_1^\ast~(\CATCH~x~\X{in}_2^\ast)^\ast~
+ (\CATCHALL~\X{in}_3^\ast)^?\END \\ &&|&
+ \hex{06}~~\X{bt}{:}\Bblocktype~~(\X{in}{:}\Binstr)^\ast~~\hex{18}~~l{:}\Blabelidx
+ &\Rightarrow& \TRY~\X{bt}~\X{in}^\ast~\DELEGATE~l \\ &&|&
+ \hex{09}~~l{:}\Blabelidx &\Rightarrow& \RETHROW~l \\
+ \end{array}
diff --git a/document/legacy/exceptions/conf.py b/document/legacy/exceptions/conf.py
new file mode 100644
index 00000000..ebd159bd
--- /dev/null
+++ b/document/legacy/exceptions/conf.py
@@ -0,0 +1,498 @@
+# -*- coding: utf-8 -*-
+#
+# WebAssembly documentation build configuration file, created by
+# sphinx-quickstart on Mon Nov 21 11:32:49 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+import os
+import sys
+from datetime import date
+
+pwd = os.path.abspath('.')
+sys.path.insert(0, pwd)
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+needs_sphinx = '2.3'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+ 'sphinx.ext.todo',
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.mathjax',
+ 'sphinx.ext.ifconfig',
+ 'sphinx.ext.githubpages',
+ 'util.mathdef',
+ 'util.pseudo-lexer'
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+source_suffix = ['.rst']
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+name = 'WebAssembly'
+project = u'WebAssembly'
+title = u'WebAssembly Specification Addendum: Legacy Exception Handling'
+copyright = u'2023, WebAssembly Community Group'
+author = u'WebAssembly Community Group'
+editor = u'Andreas Rossberg (editor)'
+logo = 'static/webassembly.png'
+
+# The name of the GitHub repository this resides in
+repo = 'spec'
+
+# The draft version string (clear out for release cuts)
+draft = ' (Draft ' + date.today().strftime("%Y-%m-%d") + ')'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = u'0.1'
+# The full version, including alpha/beta/rc tags.
+release = version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = 'en'
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#
+html_theme_options = {
+ 'logo': logo,
+ 'logo_name': 'WebAssembly',
+ 'description': 'WebAssembly Specification',
+ 'fixed_sidebar': True,
+ 'sidebar_width': '260px',
+ 'sidebar_collapse': True,
+ 'show_powered_by': False,
+ 'extra_nav_links': {
+ 'Index': 'BASEDIR/genindex.html',
+ 'Download as PDF': 'BASEDIR/_download/' + name + '.pdf'
+ },
+}
+
+html_sidebars = {
+ '**': [
+ # 'about.html',
+ 'navigation.html',
+ # 'relations.html',
+ 'searchbox.html',
+ ]
+}
+
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# " v documentation" by default.
+#
+html_title = project + u' ' + release
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+html_logo = logo
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['static/custom.css']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+html_domain_indices = False
+
+# If false, no index is generated.
+#
+html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+html_split_index = False
+
+# If true, the reST sources are included in the HTML build as _sources/name. The default is True.
+#
+html_copy_source = False
+
+# If true, links to the reST sources are added to the pages.
+#
+html_show_sourcelink = False
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+html_show_sphinx = False
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+html_show_copyright = True
+
+# If this is not None, a ‘Last updated on:’ timestamp is inserted at every
+# page bottom, using the given strftime() format.
+#
+html_last_updated_fmt = '%Y-%m-%d'
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a `, :math:`\expand_F(\blocktype)` is defined.
+
+2. Let :math:`[t_1^m] \to [t_2^n]` be the :ref:`function type ` :math:`\expand_F(\blocktype)`.
+
+3. Let :math:`L` be the label whose arity is :math:`n` and whose continuation is the end of the |TRY| instruction.
+
+4. Assert: due to :ref:`validation `, there are at least :math:`m` values on the top of the stack.
+
+5. Pop the values :math:`\val^m` from the stack.
+
+6. Let :math:`F` be the :ref:`current ` :ref:`frame `.
+
+7. For each catch clause :math:`(\CATCH~x_i~\instr_{2i}^\ast)` do:
+
+ a. Assert: due to :ref:`validation `, :math:`F.\AMODULE.\MITAGS[x_i]` exists.
+
+ b. Let :math:`a_i` be the tag address :math:`F.\AMODULE.\MITAGS[x_i]`.
+
+ c. Let :math:`\catch_i` be the catch clause :math:`(\CATCH~a_i~\instr_{2i}^\ast)`.
+
+8. If there is a catch-all clause :math:`(\CATCHALL~\instr_3^\ast)`, then:
+
+ a. Let :math:`\catch'^?` be the handler :math:`(\CATCHALL~\instr_3^\ast)`.
+
+9. Else:
+
+ a. Let :math:`\catch'^?` be empty.
+
+10. Let :math:`\catch^\ast` be the concatenation of :math:`\catch_i` and :math:`\catch'^?`.
+
+11. :ref:`Enter ` the block :math:`\val^m~\instr_1^\ast` with label :math:`L` and exception handler :math:`\HANDLER_n\{\catch^\ast\}^\ast`.
+
+.. math::
+ ~\\[-1ex]
+ \begin{array}{l}
+ F; \val^m~(\TRY~\X{bt}~\instr_1^\ast~(\CATCH~x~\instr_2^\ast)^\ast~(\CATCHALL~\instr_3^\ast)^?~\END
+ \quad \stepto \\
+ \qquad F; \LABEL_n\{\epsilon\}~(\HANDLER_n\{(\CATCH~a_x~\instr_2^\ast)^\ast~(\CATCHALL~\instr_3^\ast)^?\}~\val^m~\instr_1^\ast~\END)~\END \\
+ (\iff \expand_F(\X{bt}) = [t_1^m] \to [t_2^n] \land (F.\AMODULE.\MITAGS[x]=a_x)^\ast)
+ \end{array}
+
+
+.. _exec-try-delegate:
+
+:math:`\TRY~\blocktype~\instr^\ast~\DELEGATE~l`
+...............................................
+
+1. Assert: due to :ref:`validation `, :math:`\expand_F(\blocktype)` is defined.
+
+2. Let :math:`[t_1^m] \to [t_2^n]` be the :ref:`function type ` :math:`\expand_F(\blocktype)`.
+
+3. Let :math:`L` be the label whose arity is :math:`n` and whose continuation is the end of the |TRY| instruction.
+
+4. Let :math:`H` be the :ref:`exception handler ` :math:`l`, targeting the :math:`l`-th surrounding block.
+
+5. Assert: due to :ref:`validation `, there are at least :math:`m` values on the top of the stack.
+
+6. Pop the values :math:`\val^m` from the stack.
+
+7. :ref:`Enter ` the block :math:`\val^m~\instr^\ast` with label :math:`L` and exception handler `\HANDLER_n\{\DELEGATE~l\}`.
+
+.. math::
+ ~\\[-1ex]
+ \begin{array}{lcl}
+ F; \val^m~(\TRY~\X{bt}~\instr^\ast~\DELEGATE~l) &\stepto&
+ F; \LABEL_n\{\epsilon\}~(\HANDLER_n\{\DELEGATE~l\}~\val^m~\instr^\ast~\END)~\END \\
+ && (\iff \expand_F(\X{bt}) = [t_1^m] \to [t_2^n])
+ \end{array}
+
+
+.. _exec-throw_ref:
+
+:math:`\THROWREF`
+.................
+
+1. Let :math:`F` be the :ref:`current ` :ref:`frame `.
+
+2. Assert: due to :ref:`validation `, a :ref:`reference ` is on the top of the stack.
+
+3. Pop the reference :math:`\reff` from the stack.
+
+4. If :math:`\reff` is :math:`\REFNULL~\X{ht}`, then:
+
+ a. Trap.
+
+5. Assert: due to :ref:`validation `, :math:`\reff` is an :ref:`exception reference `.
+
+6. Let :math:`\REFEXNADDR~\X{ea}` be :math:`\reff`.
+
+7. Assert: due to :ref:`validation `, :math:`S.\SEXNS[\X{ea}]` exists.
+
+8. Let :math:`\X{exn}` be the :ref:`exception instance ` :math:`S.\SEXNS[\X{ea}]`.
+
+9. Let :math:`a` be the :ref:`tag address ` :math:`\X{exn}.\EITAG`.
+
+10. While the stack is not empty and the top of the stack is not an :ref:`exception handler `, do:
+
+ a. Pop the top element from the stack.
+
+11. Assert: the stack is now either empty, or there is an exception handler on the top of the stack.
+
+12. If the stack is empty, then:
+
+ a. Return the exception :math:`(\REFEXNADDR~a)` as a :ref:`result `.
+
+13. Assert: there is an :ref:`exception handler ` on the top of the stack.
+
+14. Pop the exception handler :math:`\HANDLER_n\{\catch^\ast\}` from the stack.
+
+15. If :math:`\catch^\ast` is empty, then:
+
+ a. Push the exception reference :math:`\REFEXNADDR~\X{ea}` back to the stack.
+
+ b. Execute the instruction |THROWREF| again.
+
+16. Else:
+
+ a. Let :math:`\catch_1` be the first :ref:`catch clause ` in :math:`\catch^\ast` and :math:`{\catch'}^\ast` the remaining clauses.
+
+ b. If :math:`\catch_1` is of the form :math:`\CATCH~x~l` and the :ref:`exception address ` :math:`a` equals :math:`F.\AMODULE.\MITAGS[x]`, then:
+
+ i. Push the values :math:`\X{exn}.\EIFIELDS` to the stack.
+
+ ii. Execute the instruction :math:`\BR~l`.
+
+ c. Else if :math:`\catch_1` is of the form :math:`\CATCHREF~x~l` and the :ref:`exception address ` :math:`a` equals :math:`F.\AMODULE.\MITAGS[x]`, then:
+
+ i. Push the values :math:`\X{exn}.\EIFIELDS` to the stack.
+
+ ii. Push the exception reference :math:`\REFEXNADDR~\X{ea}` to the stack.
+
+ iii. Execute the instruction :math:`\BR~l`.
+
+ d. Else if :math:`\catch_1` is of the form :math:`\CATCHALL~l`, then:
+
+ i. Execute the instruction :math:`\BR~l`.
+
+ e. Else if :math:`\catch_1` is of the form :math:`\CATCHALLREF~l`, then:
+
+ i. Push the exception reference :math:`\REFEXNADDR~\X{ea}` to the stack.
+
+ ii. Execute the instruction :math:`\BR~l`.
+
+ f. Else if :math:`\catch_1` is of the form :math:`\CATCH~x~\instr^\ast` and the :ref:`exception address ` :math:`a` equals :math:`F.\AMODULE.\MITAGS[x]`, then:
+
+ i. Push the caught exception :math:`\CAUGHT_n\{\X{ea}\}` to the stack.
+
+ ii. Push the values :math:`\X{exn}.\EIFIELDS` to the stack.
+
+ iii. :ref:`Enter ` the catch block :math:`\instr^\ast`.
+
+ g. Else if :math:`\catch_1` is of the form :math:`\CATCHALL~\instr^\ast`, then:
+
+ i. Push the caught exception :math:`\CAUGHT_n\{\X{ea}\}` to the stack.
+
+ ii. :ref:`Enter ` the catch block :math:`\instr^\ast`.
+
+ h. Else if :math:`\catch_1` is of the form :math:`\DELEGATE~l`, then:
+
+ i. Assert: due to :ref:`validation `, the stack contains at least :math:`l` labels.
+
+ ii. Repeat :math:`l` times:
+
+ * While the top of the stack is not a label, do:
+
+ - Pop the top element from the stack.
+
+ iii. Assert: due to :ref:`validation `, the top of the stack now is a label.
+
+ iv. Pop the label from the stack.
+
+ v. Push the exception reference :math:`\REFEXNADDR~\X{ea}` back to the stack.
+
+ vi. Execute the instruction :math:`\THROWREF` again.
+
+ i. Else:
+
+ 1. Push the modified handler :math:`\HANDLER_n\{{\catch'}^\ast\}` back to the stack.
+
+ 2. Push the exception reference :math:`\REFEXNADDR~\X{ea}` back to the stack.
+
+ 3. Execute the instruction :math:`\THROWREF` again.
+
+.. math::
+ ~\\[-1ex]
+ \begin{array}{rcl}
+ \dots \\
+ \HANDLER_n\{(\CATCH~x~\instr^\ast)~\catch^\ast\}~\XT[(\REFEXNADDR~a)~\THROWREF]~\END &\stepto&
+ \CAUGHT_n\{a\}~\X{exn}.\EIFIELDS~\instr^\ast~\END \\ &&
+ (\begin{array}[t]{@{}r@{~}l@{}}
+ \iff & \X{exn} = S.\SEXNS[a] \\
+ \land & \X{exn}.\EITAG = F.\AMODULE.\MITAGS[x]) \\
+ \end{array} \\
+ \HANDLER_n\{(\CATCHALL~\instr^\ast)~\catch^\ast\}~\XT[(\REFEXNADDR~a)~\THROWREF]~\END &\stepto&
+ \CAUGHT_n\{a\}~\instr^\ast~\END \\
+ \XB^l[\HANDLER_n\{(\DELEGATE~l)~\catch^\ast\}~\XT[(\REFEXNADDR~a)~\THROWREF]~\END] &\stepto&
+ (\REFEXNADDR~a)~\THROWREF \\
+ \end{array}
+
+
+.. _exec-rethrow:
+
+:math:`\RETHROW~l`
+..................
+
+1. Assert: due to :ref:`validation `, the stack contains at least :math:`l+1` labels.
+
+2. Let :math:`L` be the :math:`l`-th label appearing on the stack, starting from the top and counting from zero.
+
+3. Assert: due to :ref:`validation `, :math:`L` is a catch label, i.e., a label of the form :math:`(\LCATCH~[t^\ast])`, which is a label followed by a caught exception in an active catch clause.
+
+4. Let :math:`a` be the caught exception address.
+
+5. Push the value :math:`\REFEXNADDR~a` onto the stack.
+
+6. Execute the instruction |THROWREF|.
+
+.. math::
+ ~\\[-1ex]
+ \begin{array}{lclr@{\qquad}}
+ \CAUGHT_n\{a\}~\XB^l[\RETHROW~l]~\END &\stepto&
+ \CAUGHT_n\{a\}~\XB^l[(\REFEXNADDR~a)~\THROWREF]~\END \\
+ \end{array}
+
+
+.. _exec-caught-enter:
+
+Entering a catch block
+......................
+
+1. Jump to the start of the instruction sequence :math:`\instr^\ast`.
+
+
+.. _exec-caught-exit:
+
+Exiting a catch block
+.....................
+
+When the |END| of a catch block is reached without a jump, thrown exception, or trap, then the following steps are performed.
+
+1. Let :math:`\val^m` be the values on the top of the stack.
+
+2. Pop the values :math:`\val^m` from the stack.
+
+3. Assert: due to :ref:`validation `, a caught exception is now on the top of the stack.
+
+4. Pop the caught exception from the stack.
+
+5. Push :math:`\val^m` back to the stack.
+
+6. Jump to the position after the |END| of the administrative instruction associated with the caught exception.
+
+.. math::
+ \begin{array}{rcl}
+ \CAUGHT_n\{a\}~\val^m~\END &\stepto& \val^m
+ \end{array}
+
+.. note::
+ A caught exception can only be rethrown from the scope of the administrative instruction associated with it, i.e., from the scope of the |CATCH| or |CATCHALL| block of a legacy |TRY| instruction. Upon exit from that block, the caught exception is discarded.
diff --git a/document/legacy/exceptions/index.rst b/document/legacy/exceptions/index.rst
new file mode 100644
index 00000000..b6428fb7
--- /dev/null
+++ b/document/legacy/exceptions/index.rst
@@ -0,0 +1,22 @@
+WebAssembly Specification Addendum: Legacy Exception Handling
+=============================================================
+
+.. only:: html
+
+ | Release |release|
+
+ | Editor: Andreas Rossberg
+
+ | Latest Draft: |WasmDraft|
+ | Issue Tracker: |WasmIssues|
+
+.. toctree::
+ :maxdepth: 1
+
+ intro
+ syntax
+ valid
+ exec
+ binary
+ text
+ appendix/index-instructions
diff --git a/document/legacy/exceptions/intro.rst b/document/legacy/exceptions/intro.rst
new file mode 100644
index 00000000..b8d8c57c
--- /dev/null
+++ b/document/legacy/exceptions/intro.rst
@@ -0,0 +1,8 @@
+.. _intro:
+
+Introduction
+============
+
+This document describes an extension of the official WebAssembly standard
+developed by its `W3C Community Group ` as some :ref:`function type ` :math:`[t_1^\ast] \to [t_2^\ast]`.
+
+* Let :math:`C'` be the same :ref:`context ` as :math:`C`, but with the :ref:`label type ` :math:`[t_2^\ast]` prepended to the |CLABELS| vector.
+
+* Under context :math:`C'`,
+ the instruction sequence :math:`\instr_1^\ast` must be :ref:`valid ` with type :math:`[t_1^\ast] \to [t_2^\ast]`.
+
+* Let :math:`C''` be the same :ref:`context ` as :math:`C`, but with the :ref:`label type ` :math:`\LCATCH~[t_2^\ast]` prepended to the |CLABELS| vector.
+
+* For every :math:`x_i` and :math:`\instr_{2i}^\ast` in :math:`(\CATCH~x~\instr_2^\ast)^\ast`:
+
+ * The tag :math:`C.\CTAGS[x_i]` must be defined in the context :math:`C`.
+
+ * Let :math:`[t_{3i}^\ast] \to [t_{4i}^\ast]` be the :ref:`tag type ` :math:`C.\CTAGS[x_i]`.
+
+ * The :ref:`result type ` :math:`[t_{4i}^\ast]` must be empty.
+
+ * Under context :math:`C''`,
+ the instruction sequence :math:`\instr_{2i}^\ast` must be :ref:`valid ` with type :math:`[t_{3i}^\ast] \to [t_2^\ast]`.
+
+* If :math:`(\CATCHALL~\instr_3^\ast)^?` is not empty, then:
+
+ * Under context :math:`C''`,
+ the instruction sequence :math:`\instr_3^\ast` must be :ref:`valid ` with type :math:`[] \to [t_2^\ast]`.
+
+* Then the compound instruction is valid with type :math:`[t_1^\ast] \to [t_2^\ast]`.
+
+.. math::
+ \frac{
+ \begin{array}{c}
+ C \vdashblocktype \blocktype : [t_1^\ast] \to [t_2^\ast]
+ \qquad
+ C,\CLABELS\,[t_2^\ast] \vdashinstrseq \instr_1^\ast : [t_1^\ast] \to [t_2^\ast] \\
+ (C.\CTAGS[x] = [t^\ast] \to [])^\ast \\
+ C,\CLABELS\,(\LCATCH~[t_2^\ast]) \vdashinstrseq \instr_2^\ast : [t^\ast] \to [t_2^\ast])^\ast \\
+ (C,\CLABELS\,(\LCATCH~[t_2^\ast]) \vdashinstrseq \instr_3^\ast : [] \to [t_2^\ast])^?
+ \end{array}
+ }{
+ C \vdashinstr \TRY~\blocktype~\instr_1^\ast~(\CATCH~x~\instr_2^\ast)^\ast~(\CATCHALL~\instr_3^\ast)^?~\END : [t_1^\ast] \to [t_2^\ast]
+ }
+
+
+.. note::
+ The :ref:`notation ` :math:`C,\CLABELS\,(\LCATCH^?~[t^\ast])` inserts the new label type at index :math:`0`, shifting all others.
+
+
+.. _valid-try-delegate:
+
+:math:`\TRY~\blocktype~\instr^\ast~\DELEGATE~l`
+...............................................
+
+* The label :math:`C.\CLABELS[l]` must be defined in the context.
+
+* The :ref:`block type ` must be :ref:`valid ` as some :ref:`function type ` :math:`[t_1^\ast] \to [t_2^\ast]`.
+
+* Let :math:`C'` be the same :ref:`context ` as :math:`C`, but with the :ref:`result type ` :math:`[t_2^\ast]` prepended to the |CLABELS| vector.
+
+* Under context :math:`C'`,
+ the instruction sequence :math:`\instr^\ast` must be :ref:`valid ` with type :math:`[t_1^\ast] \to [t_2^\ast]`.
+
+* Then the compound instruction is valid with type :math:`[t_1^\ast] \to [t_2^\ast]`.
+
+.. math::
+ \frac{
+ C \vdashblocktype \blocktype : [t_1^\ast] \to [t_2^\ast]
+ \qquad
+ C,\CLABELS\,[t_2^\ast] \vdashinstrseq \instr^\ast : [t_1^\ast]\to[t_2^\ast]
+ \qquad
+ C.\CLABELS[l] = [t_0^\ast]
+ }{
+ C \vdashinstrseq \TRY~\blocktype~\instr^\ast~\DELEGATE~l : [t_1^\ast]\to[t_2^\ast]
+ }
+
+.. note::
+ The :ref:`label index ` space in the :ref:`context ` :math:`C` contains the most recent label first, so that :math:`C.\CLABELS[l]` performs a relative lookup as expected.
+
+
+.. _valid-rethrow:
+
+:math:`\RETHROW~l`
+..................
+
+* The label :math:`C.\CLABELS[l]` must be defined in the context.
+
+* Let :math:`(\LCATCH^?~[t^\ast])` be the :ref:`label type ` :math:`C.\CLABELS[l]`.
+
+* The |LCATCH| must be present in the :ref:`label type ` :math:`C.\CLABELS[l]`.
+
+* Then the instruction is valid with type :math:`[t_1^\ast] \to [t_2^\ast]`, for any sequences of :ref:`value types ` :math:`t_1^\ast` and :math:`t_2^\ast`.
+
+
+.. math::
+ \frac{
+ C.\CLABELS[l] = \LCATCH~[t^\ast]
+ }{
+ C \vdashinstr \RETHROW~l : [t_1^\ast] \to [t_2^\ast]
+ }
+
+
+.. note::
+ The |RETHROW| instruction is stack-polymorphic.
diff --git a/test/legacy/exceptions/rethrow.wast b/test/legacy/exceptions/rethrow.wast
new file mode 100644
index 00000000..e41d94b2
--- /dev/null
+++ b/test/legacy/exceptions/rethrow.wast
@@ -0,0 +1,96 @@
+;; Test rethrow instruction.
+
+(module
+ (tag $e0)
+ (tag $e1)
+
+ (func (export "catch-rethrow-0")
+ (try
+ (do (throw $e0))
+ (catch $e0 (rethrow 0))
+ )
+ )
+
+ (func (export "catch-rethrow-1") (param i32) (result i32)
+ (try (result i32)
+ (do (throw $e0))
+ (catch $e0
+ (if (i32.eqz (local.get 0)) (then (rethrow 1))) (i32.const 23)
+ )
+ )
+ )
+
+ (func (export "catchall-rethrow-0")
+ (try
+ (do (throw $e0))
+ (catch_all (rethrow 0))
+ )
+ )
+
+ (func (export "catchall-rethrow-1") (param i32) (result i32)
+ (try (result i32)
+ (do (throw $e0))
+ (catch_all
+ (if (i32.eqz (local.get 0)) (then (rethrow 1))) (i32.const 23)
+ )
+ )
+ )
+
+ (func (export "rethrow-nested") (param i32) (result i32)
+ (try (result i32)
+ (do (throw $e1))
+ (catch $e1
+ (try (result i32)
+ (do (throw $e0))
+ (catch $e0
+ (if (i32.eq (local.get 0) (i32.const 0)) (then (rethrow 1)))
+ (if (i32.eq (local.get 0) (i32.const 1)) (then (rethrow 2)))
+ (i32.const 23)
+ )
+ )
+ )
+ )
+ )
+
+ (func (export "rethrow-recatch") (param i32) (result i32)
+ (try (result i32)
+ (do (throw $e0))
+ (catch $e0
+ (try (result i32)
+ (do (if (i32.eqz (local.get 0)) (then (rethrow 2))) (i32.const 42))
+ (catch $e0 (i32.const 23))
+ )
+ )
+ )
+ )
+
+ (func (export "rethrow-stack-polymorphism")
+ (try
+ (do (throw $e0))
+ (catch $e0 (i32.const 1) (rethrow 0))
+ )
+ )
+)
+
+(assert_exception (invoke "catch-rethrow-0"))
+
+(assert_exception (invoke "catch-rethrow-1" (i32.const 0)))
+(assert_return (invoke "catch-rethrow-1" (i32.const 1)) (i32.const 23))
+
+(assert_exception (invoke "catchall-rethrow-0"))
+
+(assert_exception (invoke "catchall-rethrow-1" (i32.const 0)))
+(assert_return (invoke "catchall-rethrow-1" (i32.const 1)) (i32.const 23))
+(assert_exception (invoke "rethrow-nested" (i32.const 0)))
+(assert_exception (invoke "rethrow-nested" (i32.const 1)))
+(assert_return (invoke "rethrow-nested" (i32.const 2)) (i32.const 23))
+
+(assert_return (invoke "rethrow-recatch" (i32.const 0)) (i32.const 23))
+(assert_return (invoke "rethrow-recatch" (i32.const 1)) (i32.const 42))
+
+(assert_exception (invoke "rethrow-stack-polymorphism"))
+
+(assert_invalid (module (func (rethrow 0))) "invalid rethrow label")
+(assert_invalid (module (func (block (rethrow 0)))) "invalid rethrow label")
+(assert_invalid (module (func (try (do (rethrow 0)) (delegate 0))))
+ "invalid rethrow label")
diff --git a/test/legacy/exceptions/throw.wast b/test/legacy/exceptions/throw.wast
new file mode 100644
index 00000000..d53b5b55
--- /dev/null
+++ b/test/legacy/exceptions/throw.wast
@@ -0,0 +1,51 @@
+;; Test throw instruction.
+
+(module
+ (tag $e0)
+ (tag $e-i32 (param i32))
+ (tag $e-f32 (param f32))
+ (tag $e-i64 (param i64))
+ (tag $e-f64 (param f64))
+ (tag $e-i32-i32 (param i32 i32))
+
+ (func $throw-if (export "throw-if") (param i32) (result i32)
+ (local.get 0)
+ (i32.const 0) (if (i32.ne) (then (throw $e0)))
+ (i32.const 0)
+ )
+
+ (func (export "throw-param-f32") (param f32) (local.get 0) (throw $e-f32))
+
+ (func (export "throw-param-i64") (param i64) (local.get 0) (throw $e-i64))
+
+ (func (export "throw-param-f64") (param f64) (local.get 0) (throw $e-f64))
+
+ (func $throw-1-2 (i32.const 1) (i32.const 2) (throw $e-i32-i32))
+ (func (export "test-throw-1-2")
+ (try
+ (do (call $throw-1-2))
+ (catch $e-i32-i32
+ (i32.const 2)
+ (if (i32.ne) (then (unreachable)))
+ (i32.const 1)
+ (if (i32.ne) (then (unreachable)))
+ )
+ )
+ )
+)
+
+(assert_return (invoke "throw-if" (i32.const 0)) (i32.const 0))
+(assert_exception (invoke "throw-if" (i32.const 10)))
+(assert_exception (invoke "throw-if" (i32.const -1)))
+
+(assert_exception (invoke "throw-param-f32" (f32.const 5.0)))
+(assert_exception (invoke "throw-param-i64" (i64.const 5)))
+(assert_exception (invoke "throw-param-f64" (f64.const 5.0)))
+
+(assert_return (invoke "test-throw-1-2"))
+
+(assert_invalid (module (func (throw 0))) "unknown tag 0")
+(assert_invalid (module (tag (param i32)) (func (throw 0)))
+ "type mismatch: instruction requires [i32] but stack has []")
+(assert_invalid (module (tag (param i32)) (func (i64.const 5) (throw 0)))
+ "type mismatch: instruction requires [i32] but stack has [i64]")
diff --git a/test/legacy/exceptions/try_catch.wast b/test/legacy/exceptions/try_catch.wast
new file mode 100644
index 00000000..2a0e9ff6
--- /dev/null
+++ b/test/legacy/exceptions/try_catch.wast
@@ -0,0 +1,265 @@
+;; Test try-catch blocks.
+
+(module
+ (tag $e0 (export "e0"))
+ (func (export "throw") (throw $e0))
+)
+
+(register "test")
+
+(module
+ (tag $imported-e0 (import "test" "e0"))
+ (func $imported-throw (import "test" "throw"))
+ (tag $e0)
+ (tag $e1)
+ (tag $e2)
+ (tag $e-i32 (param i32))
+ (tag $e-f32 (param f32))
+ (tag $e-i64 (param i64))
+ (tag $e-f64 (param f64))
+
+ (func $throw-if (param i32) (result i32)
+ (local.get 0)
+ (i32.const 0) (if (i32.ne) (then (throw $e0)))
+ (i32.const 0)
+ )
+
+ (func (export "empty-catch") (try (do) (catch $e0)))
+
+ (func (export "simple-throw-catch") (param i32) (result i32)
+ (try (result i32)
+ (do (local.get 0) (i32.eqz) (if (then (throw $e0)) (else)) (i32.const 42))
+ (catch $e0 (i32.const 23))
+ )
+ )
+
+ (func (export "unreachable-not-caught") (try (do (unreachable)) (catch_all)))
+
+ (func $div (param i32 i32) (result i32)
+ (local.get 0) (local.get 1) (i32.div_u)
+ )
+ (func (export "trap-in-callee") (param i32 i32) (result i32)
+ (try (result i32)
+ (do (local.get 0) (local.get 1) (call $div))
+ (catch_all (i32.const 11))
+ )
+ )
+
+ (func (export "catch-complex-1") (param i32) (result i32)
+ (try (result i32)
+ (do
+ (try (result i32)
+ (do
+ (local.get 0)
+ (i32.eqz)
+ (if
+ (then (throw $e0))
+ (else
+ (local.get 0)
+ (i32.const 1)
+ (i32.eq)
+ (if (then (throw $e1)) (else (throw $e2)))
+ )
+ )
+ (i32.const 2)
+ )
+ (catch $e0 (i32.const 3))
+ )
+ )
+ (catch $e1 (i32.const 4))
+ )
+ )
+
+ (func (export "catch-complex-2") (param i32) (result i32)
+ (try (result i32)
+ (do
+ (local.get 0)
+ (i32.eqz)
+ (if
+ (then (throw $e0))
+ (else
+ (local.get 0)
+ (i32.const 1)
+ (i32.eq)
+ (if (then (throw $e1)) (else (throw $e2)))
+ )
+ )
+ (i32.const 2)
+ )
+ (catch $e0 (i32.const 3))
+ (catch $e1 (i32.const 4))
+ )
+ )
+
+ (func (export "throw-catch-param-i32") (param i32) (result i32)
+ (try (result i32)
+ (do (local.get 0) (throw $e-i32) (i32.const 2))
+ (catch $e-i32 (return))
+ )
+ )
+
+ (func (export "throw-catch-param-f32") (param f32) (result f32)
+ (try (result f32)
+ (do (local.get 0) (throw $e-f32) (f32.const 0))
+ (catch $e-f32 (return))
+ )
+ )
+
+ (func (export "throw-catch-param-i64") (param i64) (result i64)
+ (try (result i64)
+ (do (local.get 0) (throw $e-i64) (i64.const 2))
+ (catch $e-i64 (return))
+ )
+ )
+
+ (func (export "throw-catch-param-f64") (param f64) (result f64)
+ (try (result f64)
+ (do (local.get 0) (throw $e-f64) (f64.const 0))
+ (catch $e-f64 (return))
+ )
+ )
+
+ (func $throw-param-i32 (param i32) (local.get 0) (throw $e-i32))
+ (func (export "catch-param-i32") (param i32) (result i32)
+ (try (result i32)
+ (do (i32.const 0) (local.get 0) (call $throw-param-i32))
+ (catch $e-i32)
+ )
+ )
+
+ (func (export "catch-imported") (result i32)
+ (try (result i32)
+ (do
+ (i32.const 1)
+ (call $imported-throw)
+ )
+ (catch $imported-e0 (i32.const 2))
+ )
+ )
+
+ (func (export "catchless-try") (param i32) (result i32)
+ (try (result i32)
+ (do
+ (try (result i32)
+ (do (local.get 0) (call $throw-if))
+ )
+ )
+ (catch $e0 (i32.const 1))
+ )
+ )
+
+ (func $throw-void (throw $e0))
+ (func (export "return-call-in-try-catch")
+ (try
+ (do
+ (return_call $throw-void)
+ )
+ (catch $e0)
+ )
+ )
+
+ (table funcref (elem $throw-void))
+ (func (export "return-call-indirect-in-try-catch")
+ (try
+ (do
+ (return_call_indirect (param) (i32.const 0))
+ )
+ (catch $e0)
+ )
+ )
+)
+
+(assert_return (invoke "empty-catch"))
+
+(assert_return (invoke "simple-throw-catch" (i32.const 0)) (i32.const 23))
+(assert_return (invoke "simple-throw-catch" (i32.const 1)) (i32.const 42))
+
+(assert_trap (invoke "unreachable-not-caught") "unreachable")
+
+(assert_return (invoke "trap-in-callee" (i32.const 7) (i32.const 2)) (i32.const 3))
+(assert_trap (invoke "trap-in-callee" (i32.const 1) (i32.const 0)) "integer divide by zero")
+
+(assert_return (invoke "catch-complex-1" (i32.const 0)) (i32.const 3))
+(assert_return (invoke "catch-complex-1" (i32.const 1)) (i32.const 4))
+(assert_exception (invoke "catch-complex-1" (i32.const 2)))
+
+(assert_return (invoke "catch-complex-2" (i32.const 0)) (i32.const 3))
+(assert_return (invoke "catch-complex-2" (i32.const 1)) (i32.const 4))
+(assert_exception (invoke "catch-complex-2" (i32.const 2)))
+
+(assert_return (invoke "throw-catch-param-i32" (i32.const 0)) (i32.const 0))
+(assert_return (invoke "throw-catch-param-i32" (i32.const 1)) (i32.const 1))
+(assert_return (invoke "throw-catch-param-i32" (i32.const 10)) (i32.const 10))
+
+(assert_return (invoke "throw-catch-param-f32" (f32.const 5.0)) (f32.const 5.0))
+(assert_return (invoke "throw-catch-param-f32" (f32.const 10.5)) (f32.const 10.5))
+
+(assert_return (invoke "throw-catch-param-i64" (i64.const 5)) (i64.const 5))
+(assert_return (invoke "throw-catch-param-i64" (i64.const 0)) (i64.const 0))
+(assert_return (invoke "throw-catch-param-i64" (i64.const -1)) (i64.const -1))
+
+(assert_return (invoke "throw-catch-param-f64" (f64.const 5.0)) (f64.const 5.0))
+(assert_return (invoke "throw-catch-param-f64" (f64.const 10.5)) (f64.const 10.5))
+
+(assert_return (invoke "catch-param-i32" (i32.const 5)) (i32.const 5))
+
+(assert_return (invoke "catch-imported") (i32.const 2))
+
+(assert_return (invoke "catchless-try" (i32.const 0)) (i32.const 0))
+(assert_return (invoke "catchless-try" (i32.const 1)) (i32.const 1))
+
+(assert_exception (invoke "return-call-in-try-catch"))
+(assert_exception (invoke "return-call-indirect-in-try-catch"))
+
+(module
+ (func $imported-throw (import "test" "throw"))
+ (tag $e0)
+
+ (func (export "imported-mismatch") (result i32)
+ (try (result i32)
+ (do
+ (try (result i32)
+ (do
+ (i32.const 1)
+ (call $imported-throw)
+ )
+ (catch $e0 (i32.const 2))
+ )
+ )
+ (catch_all (i32.const 3))
+ )
+ )
+)
+
+(assert_return (invoke "imported-mismatch") (i32.const 3))
+
+(assert_malformed
+ (module quote "(module (func (catch_all)))")
+ "unexpected token"
+)
+
+(assert_malformed
+ (module quote "(module (tag $e) (func (catch $e)))")
+ "unexpected token"
+)
+
+(assert_malformed
+ (module quote
+ "(module (func (try (do) (catch_all) (catch_all))))"
+ )
+ "unexpected token"
+)
+
+(assert_invalid (module (func (result i32) (try (result i32) (do))))
+ "type mismatch: instruction requires [i32] but stack has []")
+(assert_invalid (module (func (result i32) (try (result i32) (do (i64.const 42)))))
+ "type mismatch: instruction requires [i32] but stack has [i64]")
+(assert_invalid (module (tag) (func (try (do) (catch 0 (i32.const 42)))))
+ "type mismatch: block requires [] but stack has [i32]")
+(assert_invalid (module
+ (tag (param i64))
+ (func (result i32)
+ (try (result i32) (do (i32.const 42)) (catch 0))))
+ "type mismatch: instruction requires [i32] but stack has [i64]")
+(assert_invalid (module (func (try (do) (catch_all (i32.const 42)))))
+ "type mismatch: block requires [] but stack has [i32]")
diff --git a/test/legacy/exceptions/try_delegate.wast b/test/legacy/exceptions/try_delegate.wast
new file mode 100644
index 00000000..aae3a301
--- /dev/null
+++ b/test/legacy/exceptions/try_delegate.wast
@@ -0,0 +1,199 @@
+;; Test try-delegate blocks.
+
+(module
+ (tag $e0)
+ (tag $e1)
+
+ (func (export "delegate-no-throw") (result i32)
+ (try $t (result i32)
+ (do (try (result i32) (do (i32.const 1)) (delegate $t)))
+ (catch $e0 (i32.const 2))
+ )
+ )
+
+ (func $throw-if (param i32)
+ (local.get 0)
+ (if (then (throw $e0)) (else))
+ )
+
+ (func (export "delegate-throw") (param i32) (result i32)
+ (try $t (result i32)
+ (do
+ (try (result i32)
+ (do (local.get 0) (call $throw-if) (i32.const 1))
+ (delegate $t)
+ )
+ )
+ (catch $e0 (i32.const 2))
+ )
+ )
+
+ (func (export "delegate-skip") (result i32)
+ (try $t (result i32)
+ (do
+ (try (result i32)
+ (do
+ (try (result i32)
+ (do (throw $e0) (i32.const 1))
+ (delegate $t)
+ )
+ )
+ (catch $e0 (i32.const 2))
+ )
+ )
+ (catch $e0 (i32.const 3))
+ )
+ )
+
+ (func (export "delegate-to-block") (result i32)
+ (try (result i32)
+ (do (block (try (do (throw $e0)) (delegate 0)))
+ (i32.const 0))
+ (catch_all (i32.const 1)))
+ )
+
+ (func (export "delegate-to-catch") (result i32)
+ (try (result i32)
+ (do (try
+ (do (throw $e0))
+ (catch $e0
+ (try (do (rethrow 1)) (delegate 0))))
+ (i32.const 0))
+ (catch_all (i32.const 1)))
+ )
+
+ (func (export "delegate-to-caller-trivial")
+ (try
+ (do (throw $e0))
+ (delegate 0)))
+
+ (func (export "delegate-to-caller-skipping")
+ (try (do (try (do (throw $e0)) (delegate 1))) (catch_all))
+ )
+
+ (func $select-tag (param i32)
+ (block (block (block (local.get 0) (br_table 0 1 2)) (return)) (throw $e0))
+ (throw $e1)
+ )
+
+ (func (export "delegate-merge") (param i32 i32) (result i32)
+ (try $t (result i32)
+ (do
+ (local.get 0)
+ (call $select-tag)
+ (try
+ (result i32)
+ (do (local.get 1) (call $select-tag) (i32.const 1))
+ (delegate $t)
+ )
+ )
+ (catch $e0 (i32.const 2))
+ )
+ )
+
+ (func (export "delegate-throw-no-catch") (result i32)
+ (try (result i32)
+ (do (try (result i32) (do (throw $e0) (i32.const 1)) (delegate 0)))
+ (catch $e1 (i32.const 2))
+ )
+ )
+
+ (func (export "delegate-correct-targets") (result i32)
+ (try (result i32)
+ (do (try $l3
+ (do (try $l2
+ (do (try $l1
+ (do (try $l0
+ (do (try
+ (do (throw $e0))
+ (delegate $l1)))
+ (catch_all unreachable)))
+ (delegate $l3)))
+ (catch_all unreachable)))
+ (catch_all (try
+ (do (throw $e0))
+ (delegate $l3))))
+ unreachable)
+ (catch_all (i32.const 1))))
+
+ (func $throw-void (throw $e0))
+ (func (export "return-call-in-try-delegate")
+ (try $l
+ (do
+ (try
+ (do
+ (return_call $throw-void)
+ )
+ (delegate $l)
+ )
+ )
+ (catch $e0)
+ )
+ )
+
+ (table funcref (elem $throw-void))
+ (func (export "return-call-indirect-in-try-delegate")
+ (try $l
+ (do
+ (try
+ (do
+ (return_call_indirect (param) (i32.const 0))
+ )
+ (delegate $l)
+ )
+ )
+ (catch $e0)
+ )
+ )
+)
+
+(assert_return (invoke "delegate-no-throw") (i32.const 1))
+
+(assert_return (invoke "delegate-throw" (i32.const 0)) (i32.const 1))
+(assert_return (invoke "delegate-throw" (i32.const 1)) (i32.const 2))
+
+(assert_exception (invoke "delegate-throw-no-catch"))
+
+(assert_return (invoke "delegate-merge" (i32.const 1) (i32.const 0)) (i32.const 2))
+(assert_exception (invoke "delegate-merge" (i32.const 2) (i32.const 0)))
+(assert_return (invoke "delegate-merge" (i32.const 0) (i32.const 1)) (i32.const 2))
+(assert_exception (invoke "delegate-merge" (i32.const 0) (i32.const 2)))
+(assert_return (invoke "delegate-merge" (i32.const 0) (i32.const 0)) (i32.const 1))
+
+(assert_return (invoke "delegate-skip") (i32.const 3))
+
+(assert_return (invoke "delegate-to-block") (i32.const 1))
+(assert_return (invoke "delegate-to-catch") (i32.const 1))
+
+(assert_exception (invoke "delegate-to-caller-trivial"))
+(assert_exception (invoke "delegate-to-caller-skipping"))
+
+(assert_return (invoke "delegate-correct-targets") (i32.const 1))
+
+(assert_exception (invoke "return-call-in-try-delegate"))
+(assert_exception (invoke "return-call-indirect-in-try-delegate"))
+
+(assert_malformed
+ (module quote "(module (func (delegate 0)))")
+ "unexpected token"
+)
+
+(assert_malformed
+ (module quote "(module (tag $e) (func (try (do) (catch $e) (delegate 0))))")
+ "unexpected token"
+)
+
+(assert_malformed
+ (module quote "(module (func (try (do) (catch_all) (delegate 0))))")
+ "unexpected token"
+)
+
+(assert_malformed
+ (module quote "(module (func (try (do) (delegate) (delegate 0))))")
+ "unexpected token"
+)
+
+(assert_invalid
+ (module (func (try (do) (delegate 1))))
+ "unknown label"
+)
diff --git a/test/legacy/run.py b/test/legacy/run.py
new file mode 100755
index 00000000..f727aeef
--- /dev/null
+++ b/test/legacy/run.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+
+from __future__ import print_function
+import argparse
+import os
+import os.path
+import unittest
+import subprocess
+import glob
+import sys
+
+
+ownDir = os.path.dirname(os.path.abspath(sys.argv[0]))
+inputDir = ownDir
+outputDir = os.path.join(inputDir, "_output")
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--wasm", metavar="", default=os.path.join(os.getcwd(), "wasm"))
+parser.add_argument("--js", metavar="")
+parser.add_argument("--generate-js-only", action='store_true')
+parser.add_argument("--out", metavar="", default=outputDir)
+parser.add_argument("file", nargs='*')
+arguments = parser.parse_args()
+sys.argv = sys.argv[:1]
+
+exceptions_test_files = glob.glob(os.path.join(inputDir, "exceptions", "*.wast"))
+
+wasmCommand = arguments.wasm
+jsCommand = arguments.js
+generateJsOnly = arguments.generate_js_only
+outputDir = arguments.out
+inputFiles = arguments.file if arguments.file else exceptions_test_files
+
+if not os.path.exists(wasmCommand):
+ sys.stderr.write("""\
+Error: The executable '%s' does not exist.
+Provide the correct path with the '--wasm' flag.
+
+""" % (wasmCommand))
+ parser.print_help()
+ sys.exit(1)
+
+
+class RunTests(unittest.TestCase):
+ def _runCommand(self, command, logPath, expectedExitCode = 0):
+ with open(logPath, 'w+') as out:
+ exitCode = subprocess.call(command, shell=True, stdout=out, stderr=subprocess.STDOUT)
+ self.assertEqual(expectedExitCode, exitCode, "failed with exit code %i (expected %i) for %s" % (exitCode, expectedExitCode, command))
+
+ def _auxFile(self, path):
+ if os.path.exists(path):
+ os.remove(path)
+ return path
+
+ def _compareFile(self, expectFile, actualFile):
+ if os.path.exists(expectFile):
+ with open(expectFile) as expect:
+ with open(actualFile) as actual:
+ expectText = expect.read()
+ actualText = actual.read()
+ self.assertEqual(expectText, actualText)
+
+ def _runTestFile(self, inputPath):
+ dir, inputFile = os.path.split(inputPath)
+ outputPath = os.path.join(outputDir, inputFile)
+
+ # Generate JS first, then return early if we are only generating JS.
+ jsPath = self._auxFile(outputPath.replace(".wast", ".js"))
+ logPath = self._auxFile(jsPath + ".log")
+ self._runCommand(('%s -d "%s" -o "%s"') % (wasmCommand, inputPath, jsPath), logPath)
+
+ if generateJsOnly:
+ return
+
+ # Run original file
+ expectedExitCode = 1 if ".fail." in inputFile else 0
+ logPath = self._auxFile(outputPath + ".log")
+ self._runCommand(('%s "%s"') % (wasmCommand, inputPath), logPath, expectedExitCode)
+
+ if expectedExitCode != 0:
+ return
+
+ # Convert to binary and run again
+ wasmPath = self._auxFile(outputPath + ".bin.wast")
+ logPath = self._auxFile(wasmPath + ".log")
+ self._runCommand(('%s -d "%s" -o "%s"') % (wasmCommand, inputPath, wasmPath), logPath)
+ self._runCommand(('%s "%s"') % (wasmCommand, wasmPath), logPath)
+
+ # Convert back to text and run again
+ wastPath = self._auxFile(wasmPath + ".wast")
+ logPath = self._auxFile(wastPath + ".log")
+ self._runCommand(('%s -d "%s" -o "%s"') % (wasmCommand, wasmPath, wastPath), logPath)
+ self._runCommand(('%s "%s"') % (wasmCommand, wastPath), logPath)
+
+ # Convert back to binary once more and compare
+ wasm2Path = self._auxFile(wastPath + ".bin.wast")
+ logPath = self._auxFile(wasm2Path + ".log")
+ self._runCommand(('%s -d "%s" -o "%s"') % (wasmCommand, wastPath, wasm2Path), logPath)
+ self._compareFile(wasmPath, wasm2Path)
+
+ # Convert back to text once more and compare
+ wast2Path = self._auxFile(wasm2Path + ".wast")
+ logPath = self._auxFile(wast2Path + ".log")
+ self._runCommand(('%s -d "%s" -o "%s"') % (wasmCommand, wasm2Path, wast2Path), logPath)
+ self._compareFile(wastPath, wast2Path)
+
+ if jsCommand != None:
+ self._runCommand(('%s "%s"') % (jsCommand, jsPath), logPath)
+
+
+if __name__ == "__main__":
+ if not os.path.exists(outputDir):
+ os.makedirs(outputDir)
+ for fileName in inputFiles:
+ testName = 'test ' + os.path.basename(fileName)
+ setattr(RunTests, testName, lambda self, file=fileName: self._runTestFile(file))
+ unittest.main()