Skip to content

Commit bb29a9a

Browse files
committed
[spec] Handle block parameters more explicitly in execution prose
1 parent 95fa5b3 commit bb29a9a

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

document/core/exec/instructions.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2622,7 +2622,7 @@ Control Instructions
26222622

26232623
6. Pop the values :math:`\val^m` from the stack.
26242624

2625-
7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\val^m~\instr^\ast` with label :math:`L`.
2625+
7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\instr^\ast` with label :math:`L` and values :math:`\val^m`.
26262626

26272627
.. math::
26282628
~\\[-1ex]
@@ -2650,7 +2650,7 @@ Control Instructions
26502650

26512651
6. Pop the values :math:`\val^m` from the stack.
26522652

2653-
7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\val^m~\instr^\ast` with label :math:`L`.
2653+
7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\instr^\ast` with label :math:`L` and values :math:`\val^m`.
26542654

26552655
.. math::
26562656
~\\[-1ex]
@@ -2918,12 +2918,14 @@ that forms a :ref:`block <exec-instr-control>`.
29182918

29192919
.. _exec-instr-seq-enter:
29202920

2921-
Entering :math:`\instr^\ast` with label :math:`L`
2922-
.................................................
2921+
Entering :math:`\instr^\ast` with label :math:`L` and values :math:`\val^\ast`
2922+
..............................................................................
29232923

29242924
1. Push :math:`L` to the stack.
29252925

2926-
2. Jump to the start of the instruction sequence :math:`\instr^\ast`.
2926+
2. Push the values :math:`\val^\ast` to the stack.
2927+
2928+
3. Jump to the start of the instruction sequence :math:`\instr^\ast`.
29272929

29282930
.. note::
29292931
No formal reduction rule is needed for entering an instruction sequence,
@@ -2993,7 +2995,7 @@ Invocation of :ref:`function address <syntax-funcaddr>` :math:`a`
29932995

29942996
10. Let :math:`L` be the :ref:`label <syntax-label>` whose arity is :math:`m` and whose continuation is the end of the function.
29952997

2996-
11. :ref:`Enter <exec-instr-seq-enter>` the instruction sequence :math:`\instr^\ast` with label :math:`L`.
2998+
11. :ref:`Enter <exec-instr-seq-enter>` the instruction sequence :math:`\instr^\ast` with label :math:`L` and no values.
29972999

29983000
.. math::
29993001
~\\[-1ex]

interpreter/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,15 @@ install:
102102
dune install
103103

104104
opam-release/%:
105-
git tag -f opam-$*
106-
git push --tags
105+
#git tag -f opam-$*
106+
#git push -f --tags
107107
rm -f opam-$*.zip
108-
wget https://github.com/WebAssembly/spec/archive/opam-$*.zip
108+
#wget https://github.com/WebAssembly/spec/archive/opam-$*.zip
109+
wget 'https://download-directory.github.io?url=https://github.com/WebAssembly/spec/tree/opam-$*/interpreter&filename=opam-$*.zip'
109110
cp wasm.opam opam
110111
echo "url {" >> opam
111-
echo " src: \"https://github.com/WebAssembly/spec/archive/opam-$*.zip\"" >> opam
112+
#echo " src: \"https://github.com/WebAssembly/spec/archive/opam-$*.zip\"" >> opam
113+
echo " src: \"https://download-directory.github.io?url=https://github.com/WebAssembly/spec/tree/opam-$*/interpreter&filename=opam-$*.zip\"" >> opam
112114
echo " checksum: [" >> opam
113115
echo " \"md5=`md5 -q opam-$*.zip`\"" >> opam
114116
echo " \"sha256=`sha256 -q opam-$*.zip`\"" >> opam

0 commit comments

Comments
 (0)