Merge pull request #28 from dhil/wasmfx-merge

Merge with WebAssembly/spec and WebAssembly/gc
WebAssembly · Feb 15, 2024 · 0af205c · 0af205c
2 parents ee9cbe7 + a33a6a0
commit 0af205c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/document/core/appendix/embedding.rst b/document/core/appendix/embedding.rst
@@ -674,7 +674,7 @@ Matching
 
 .. math::
    \begin{array}{lclll}
-   \F{match\_reftype}(t_1, t_2) &=& \TRUE && (\iff \vdashvaltypematch t_1 \matchesvaltype t_2) \\
+   \F{match\_reftype}(t_1, t_2) &=& \TRUE && (\iff {} \vdashvaltypematch t_1 \matchesvaltype t_2) \\
    \F{match\_reftype}(t_1, t_2) &=& \FALSE && (\otherwise) \\
    \end{array}
 
@@ -690,6 +690,6 @@ Matching
 
 .. math::
    \begin{array}{lclll}
-   \F{match\_externtype}(\X{et}_1, \X{et}_2) &=& \TRUE && (\iff \vdashexterntypematch \X{et}_1 \matchesexterntype \X{et}_2) \\
+   \F{match\_externtype}(\X{et}_1, \X{et}_2) &=& \TRUE && (\iff {} \vdashexterntypematch \X{et}_1 \matchesexterntype \X{et}_2) \\
    \F{match\_externtype}(\X{et}_1, \X{et}_2) &=& \FALSE && (\otherwise) \\
    \end{array}
diff --git a/document/core/appendix/index-instructions.py b/document/core/appendix/index-instructions.py
@@ -341,7 +341,7 @@ def Instruction(name, opcode, type=None, validation=None, execution=None, operat
     Instruction(r'\ARRAYINITELEM~x~y', r'\hex{FB}~\hex{13}', r'[(\REF~\NULL~x)~\I32~\I32~\I32] \to []', r'valid-array.init_elem', r'exec-array.init_elem'),
     Instruction(r'\REFTEST~(\REF~t)', r'\hex{FB}~\hex{14}', r"[(\REF~t')] \to [\I32]", r'valid-ref.test', r'exec-ref.test'),
     Instruction(r'\REFTEST~(\REF~\NULL~t)', r'\hex{FB}~\hex{15}', r"[(REF~\NULL~t')] \to [\I32]", r'valid-ref.test', r'exec-ref.test'),
-    Instruction(r'\REFCAST~(\REF~t)', r'\hex{FB}~\hex{16}', r"[(\REF~t')] \to [(\REF~t)]", r'valid-ref.test', r'exec-ref.test'),
+    Instruction(r'\REFCAST~(\REF~t)', r'\hex{FB}~\hex{16}', r"[(\REF~t')] \to [(\REF~t)]", r'valid-ref.cast', r'exec-ref.cast'),
     Instruction(r'\REFCAST~(\REF~\NULL~t)', r'\hex{FB}~\hex{17}', r"[(\REF~\NULL~t')] \to [(\REF~\NULL~t)]", r'valid-ref.cast', r'exec-ref.cast'),
     Instruction(r'\BRONCAST~t_1~t_2', r'\hex{FB}~\hex{18}', r'[t_1] \to [t_1\reftypediff t_2]', r'valid-br_on_cast', r'exec-br_on_cast'),
     Instruction(r'\BRONCASTFAIL~t_1~t_2', r'\hex{FB}~\hex{19}', r'[t_1] \to [t_2]', r'valid-br_on_cast_fail', r'exec-br_on_cast_fail'),

diff --git a/document/core/index.bs b/document/core/index.bs
@@ -6,7 +6,7 @@ Status: ED
 Level: 2
 TR: https://www.w3.org/TR/wasm-core-2/
 ED: https://webassembly.github.io/spec/core/bikeshed/
-Editor: Andreas Rossberg (Dfinity Stiftung)
+Editor: Andreas Rossberg
 Repository: WebAssembly/spec
 Markup Shorthands: css no, markdown no, algorithm no, idl no
 Abstract: This document describes release 2.0 of the core WebAssembly standard, a safe, portable, low-level code format designed for efficient execution and compact representation.

diff --git a/document/core/syntax/types.rst b/document/core/syntax/types.rst
@@ -325,7 +325,6 @@ Recursive Types
 
 *Recursive types* denote a group of mutually recursive :ref:`composite types <syntax-comptype>`, each of which can optionally declare a list of :ref:`type indices <syntax-typeidx>` of supertypes that it :ref:`matches <match-comptype>`.
 Each type can also be declared *final*, preventing further subtyping.
-.
 
 .. math::
    \begin{array}{llrl}

diff --git a/document/core/util/katex b/document/core/util/katex
diff --git a/document/core/util/mathjax2katex.py b/document/core/util/mathjax2katex.py
@@ -2,6 +2,7 @@
 # -*- coding: latin-1 -*-
 
 import queue
+import multiprocessing
 import os
 import re
 import shelve
@@ -229,7 +230,8 @@ def Worker():
       sys.stderr.write('.')
 
   q = queue.Queue()
-  for i in range(len(os.sched_getaffinity(0))):
+  for i in range(len(os.sched_getaffinity(0)) if "sched_getaffinity" in dir(os)
+                 else multiprocessing.cpu_count()):
     t = threading.Thread(target=Worker)
     t.daemon = True
     t.start()