Skip to content

Commit 73f69fa

Browse files
committed
[spec] Remove obsolete invoke admin instruction
1 parent 7071edc commit 73f69fa

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

document/core/appendix/properties.rst

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,27 +1087,6 @@ To that end, all previous typing judgements :math:`C \vdash \X{prop}` are genera
10871087
}
10881088
10891089
1090-
.. index:: function address, extern value, extern type, function type
1091-
1092-
:math:`\INVOKE~\funcaddr`
1093-
.........................
1094-
1095-
* The :ref:`external function address <syntax-externaddr>` :math:`\XAFUNC~\funcaddr` must be :ref:`valid <valid-externaddr-func>` with :ref:`external function type <syntax-externtype>` :math:`\XTFUNC~\deftype'`.
1096-
1097-
* The :ref:`expansion <aux-expand-deftype>` of the :ref:`defined type <syntax-deftype>` :math:`\deftype` must be some :ref:`function type <syntax-functype>` :math:`\TFUNC~[t_1^\ast] \Tarrow [t_2^\ast])`.
1098-
1099-
* Then the instruction is valid with type :math:`[t_1^\ast] \to [t_2^\ast]`.
1100-
1101-
.. math::
1102-
\frac{
1103-
S \vdashexternaddr \XAFUNC~\funcaddr : \XTFUNC~\deftype
1104-
\qquad
1105-
\deftype \approx \TFUNC~[t_1^\ast] \Tarrow [t_2^\ast]
1106-
}{
1107-
S; C \vdashadmininstr \INVOKE~\funcaddr : [t_1^\ast] \to [t_2^\ast]
1108-
}
1109-
1110-
11111090
.. index:: label, instruction, result type
11121091

11131092
:math:`\LABEL_n\{\instr_0^\ast\}~\instr^\ast`

document/core/exec/instructions.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ Furthermore, the resulting store must be :ref:`valid <valid-store>`, i.e., all d
401401
~\\[-1ex]
402402
\begin{array}{l}
403403
\begin{array}{lcl@{\qquad}l}
404-
S; \val^n~(\INVOKE~a) &\stepto& S'; \result
404+
S; \val^n~(\REFFUNCADDR~a)~\CALLREF &\stepto& S'; \result
405405
\end{array}
406406
\\ \qquad
407407
\begin{array}[t]{@{}r@{~}l@{}}
@@ -410,7 +410,7 @@ Furthermore, the resulting store must be :ref:`valid <valid-store>`, i.e., all d
410410
\wedge & (S'; \result) \in \X{hf}(S; \val^n) \\
411411
\end{array} \\
412412
\begin{array}{lcl@{\qquad}l}
413-
S; \val^n~(\INVOKE~a) &\stepto& S; \val^n~(\INVOKE~a)
413+
S; \val^n~(\REFFUNCADDR~a)~\CALLREF &\stepto& S; \val^n~(\REFFUNCADDR~a)~\CALLREF
414414
\end{array}
415415
\\ \qquad
416416
\begin{array}[t]{@{}r@{~}l@{}}

document/core/util/macros.def

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,10 +1539,6 @@
15391539
.. |REFEXTERN| mathdef:: \xref{exec/runtime}{syntax-ref}{\K{ref{.}extern}}
15401540
.. |TRAP| mathdef:: \xref{exec/runtime}{syntax-trap}{\K{trap}}
15411541

1542-
.. TODO remove these
1543-
.. |INVOKE| mathdef:: \xref{exec/instructions}{exec-invoke}{\K{invoke}}
1544-
.. |RETURNINVOKE| mathdef:: \xref{exec/instructions}{exec-invoke}{\K{return\_invoke}}
1545-
15461542

15471543
.. Values & Results, non-terminals
15481544

0 commit comments

Comments
 (0)