[spec] Update text for zero-byte OOB case (WebAssembly#101)

Also fix some typos from previous CL (see macros.def)
ioannad · Jun 28, 2019 · 8c6ea22 · 8c6ea22
1 parent d976981
commit 8c6ea22
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 57 deletions.
diff --git a/document/core/exec/instructions.rst b/document/core/exec/instructions.rst
@@ -645,13 +645,7 @@ Memory Instructions
 
 11. Pop the value :math:`\I32.\CONST~i` from the stack.
 
-12. If :math:`n` is :math:`0`, then:
-
-    a. If :math:`i` is larger than the length of :math:`\X{mem}.\MIDATA`, then:
-
-       i. Trap.
-
-13. Else:
+12. Else:
 
     a. Push the value :math:`\I32.\CONST~i` to the stack.
 
@@ -678,14 +672,7 @@ Memory Instructions
    \end{array} \\
    \begin{array}{lcl@{\qquad}l}
    S; F; (\I32.\CONST~i)~\val~(\I32.\CONST~0)~(\MEMORYFILL) &\stepto& S; F; \epsilon
-   \end{array}
-   \\ \qquad
-     (\iff i \leq |\SMEMS[F.\AMODULE.\MIMEMS[0]]|) \\
-   \begin{array}{lcl@{\qquad}l}
-   S; F; (\I32.\CONST~i)~\val~(\I32.\CONST~0)~(\MEMORYFILL) &\stepto& S; F; \TRAP
-   \end{array}
-   \\ \qquad
-     (\otherwise) \\
+   \end{array} \\
    \end{array}
 
 
@@ -728,17 +715,7 @@ Memory Instructions
 
 16. Pop the value :math:`\I32.\CONST~d` from the stack.
 
-17. If :math:`n` is :math:`0`, then:
-
-    a. If :math:`d` is larger than the length of :math:`\X{mem}.\MIDATA`, then:
-
-       i. Trap.
-
-    b. If :math:`s` is larger than the length of :math:`\X{data}.\DIINIT`, then:
-
-       i. Trap.
-
-18. Else:
+17. Else:
 
     a. Push the value :math:`\I32.\CONST~d` to the stack.
 
@@ -760,6 +737,10 @@ Memory Instructions
    ~\\[-1ex]
    \begin{array}{l}
    \begin{array}{lcl@{\qquad}l}
+   S; F; (\I32.\CONST~d)~(\I32.\CONST~s)~(\I32.\CONST~0)~(\MEMORYINIT~x) &\stepto& S; F; \epsilon
+   \end{array}
+   \\[1ex]
+   \begin{array}{lcl@{\qquad}l}
    S; F; (\I32.\CONST~d)~(\I32.\CONST~s)~(\I32.\CONST~(n+1))~(\MEMORYINIT~x) &\stepto& S; F;
      \begin{array}[t]{@{}l@{}}
      (\I32.\CONST~d)~(\I32.\CONST~b)~(\I32\K{.}\STORE\K{8}~\{ \OFFSET~0, \ALIGN~0 \}) \\
@@ -773,15 +754,6 @@ Memory Instructions
      \end{array}
    \\[1ex]
    \begin{array}{lcl@{\qquad}l}
-   S; F; (\I32.\CONST~d)~(\I32.\CONST~(s)~(\I32.\CONST~0)~(\MEMORYINIT~x) &\stepto& S; F; \epsilon
-   \end{array}
-   \\ \qquad
-     \begin{array}[t]{@{}r@{~}l@{}}
-     (\iff & d \leq |S.\SMEMS[F.\AMODULE.\MIMEMS[0]].\MIDATA| \\
-     \wedge & s \leq |S.\SDATA[F.\AMODULE.\MIDATAS[x]].\DIINIT|) \\
-     \end{array}
-   \\[1ex]
-   \begin{array}{lcl@{\qquad}l}
    S; F; (\I32.\CONST~d)~(\I32.\CONST~s)~(\I32.\CONST~n)~(\MEMORYINIT~x) &\stepto& S; F; \TRAP
    \end{array}
    \\ \qquad
@@ -877,17 +849,7 @@ Table Instructions
 
 16. Pop the value :math:`\I32.\CONST~d` from the stack.
 
-17. If :math:`n` is :math:`0`, then:
-
-    a. If :math:`d` is larger than the length of :math:`\X{table}.\TIELEM`, then:
-
-       i. Trap.
-
-    b. If :math:`s` is larger than the length of :math:`\X{elem}.\EIINIT`, then:
-
-       i. Trap.
-
-18. Else:
+17. Else:
 
     a. Push the value :math:`\I32.\CONST~d` to the stack.
 
@@ -907,6 +869,10 @@ Table Instructions
    ~\\[-1ex]
    \begin{array}{l}
    \begin{array}{lcl@{\qquad}l}
+   S; F; (\I32.\CONST~d)~(\I32.\CONST~(s)~(\I32.\CONST~0)~(\TABLEINIT~x) &\stepto& S; F; \epsilon
+   \end{array}
+   \\[1ex]
+   \begin{array}{lcl@{\qquad}l}
    S; F; (\I32.\CONST~d)~(\I32.\CONST~s)~(\I32.\CONST~(n+1))~(\TABLEINIT~x) &\stepto& S; F;
      \begin{array}[t]{@{}l@{}}
      (\I32.\CONST~d)~\funcelem~\TABLESET \\
@@ -920,15 +886,6 @@ Table Instructions
      \end{array}
    \\[1ex]
    \begin{array}{lcl@{\qquad}l}
-   S; F; (\I32.\CONST~d)~(\I32.\CONST~(s)~(\I32.\CONST~0)~(\TABLEINIT~x) &\stepto& S; F; \epsilon
-   \end{array}
-   \\ \qquad
-     \begin{array}[t]{@{}r@{~}l@{}}
-     (\iff & d \leq |S.\STABLES[F.\AMODULE.\MITABLES[0]].\TIELEM| \\
-     \wedge & s \leq |S.\SELEM[F.\AMODULE.\MIELEMS[x]].\EIINIT|) \\
-     \end{array}
-   \\[1ex]
-   \begin{array}{lcl@{\qquad}l}
    S; F; (\I32.\CONST~d)~(\I32.\CONST~s)~(\I32.\CONST~n)~(\TABLEINIT~x) &\stepto& S; F; \TRAP
    \end{array}
    \\ \qquad

diff --git a/document/core/util/macros.def b/document/core/util/macros.def
@@ -922,8 +922,8 @@
 .. |INVOKE| mathdef:: \xref{exec/runtime}{syntax-invoke}{\K{invoke}}
 .. |INITELEM| mathdef:: \xref{exec/runtime}{syntax-init_elem}{\K{init\_elem}}
 .. |INITDATA| mathdef:: \xref{exec/runtime}{syntax-init_data}{\K{init\_data}}
-.. |TABLEGET| mathdef:: \xref{exec/runtime}{syntax-table_get}{\K{table.get}
-.. |TABLESET| mathdef:: \xref{exec/runtime}{syntax-table_set}{\K{table.set}
+.. |TABLEGET| mathdef:: \xref{exec/runtime}{syntax-table_get}{\K{table.get}}
+.. |TABLESET| mathdef:: \xref{exec/runtime}{syntax-table_set}{\K{table.set}}
 
 
 .. Values & Results, non-terminals