Merge branch 'main' into wasm-3.0

Author: rossberg

.github/workflows/ci-spec.yml

@@ -124,9 +124,27 @@ jobs:
           name: legacy-exceptions-js-api-rendered
           path: document/legacy/exceptions/js-api/index.html
 
+  build-spec-versions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: versions-rendered
+          path: document/versions/
+
   publish-spec:
     runs-on: ubuntu-latest
-    needs: [build-core-spec, build-js-api-spec, build-web-api-spec, build-code-metadata-spec, build-legacy-exceptions-core-spec, build-legacy-exceptions-js-api-spec]
+    needs:
+      - build-core-spec
+      - build-js-api-spec
+      - build-web-api-spec
+      - build-code-metadata-spec
+      - build-legacy-exceptions-core-spec
+      - build-legacy-exceptions-js-api-spec
+      - build-spec-versions
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -162,6 +180,11 @@ jobs:
         with:
           name: legacy-exceptions-js-api-rendered
           path: _output/legacy/exceptions/js-api
+      - name: Download spec versions artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: versions-rendered
+          path: _output/versions
       - name: Publish to GitHub Pages
         if: github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@v3

.github/workflows/w3c-publish.yml

@@ -5,12 +5,23 @@ on:
     branches: [ main ]
     paths: [ .github/**, document/** ]
 
-  # Allows you to run this workflow manually from the Actions tab
+  # Allows you to run this workflow manually from the Actions tab, gh CLI tool,
+  # or REST API. THe w3c-status options correspond to the valid options for
+  # Bikeshed's --md-status flag, and refer to the W3C rec-track document
+  # stages described in https://www.w3.org/policies/process/#maturity-stages
+  # (Editor's Draft, Working Draft, Candidiate Recommendation Draft, and
+  # Candidate Recommendation Snapshot).
   workflow_dispatch:
     inputs:
       w3c-status:
         required: true
-        type: string
+        type: choice
+        description: W3C Document Status
+        options:
+          - ED
+          - WD
+          - CRD
+          - CR
 
 jobs:
   publish-to-w3c-TR:
@@ -34,7 +45,7 @@ jobs:
       - name: Publish all specs to their https://www.w3.org/TR/ URLs
         run: cd document && make -e WD-echidna-CI
         env:
-          W3C_STATUS: ${{ github.event_name == 'push' && 'WD' || inputs.w3c-status }}
+          W3C_STATUS: ${{ github.event_name == 'push' && 'CRD' || inputs.w3c-status }}
           W3C_ECHIDNA_TOKEN_CORE: ${{ secrets.W3C_ECHIDNA_TOKEN_CORE }}
           W3C_ECHIDNA_TOKEN_JSAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_JSAPI }}
           W3C_ECHIDNA_TOKEN_WEBAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_WEBAPI }}

document/Makefile

@@ -1,4 +1,4 @@
-DIRS     = core js-api web-api metadata/code legacy/exceptions
+DIRS     = core js-api web-api metadata/code legacy/exceptions versions
 FILES    = index.html
 BUILDDIR = _build
 TAR      = tar
@@ -60,7 +60,7 @@ $(DIRS:%=build-%): build-%:
 	(cd $(@:build-%=%); make BUILDDIR=$(BUILDDIR) all)
 
 .PHONY: $(DIRS:%=dir-%)
-$(DIRS:%=dir-%): dir-%:
+$(DIRS:%=dir-%): dir-%: $(BUILDDIR)
 	mkdir -p $(BUILDDIR)/$(@:dir-%=%)
 	rm -rf $(BUILDDIR)/$(@:dir-%=%)/*
 	cp -R $(@:dir-%=%)/$(BUILDDIR)/html/* $(BUILDDIR)/$(@:dir-%=%)/

document/core/text/instructions.rst

@@ -950,6 +950,7 @@ Vector constant instructions have a mandatory :ref:`shape <syntax-vec-shape>` de
      \text{i32x4.all\_true} &\Rightarrow& \I32X4.\ALLTRUE\\ &&|&
      \text{i32x4.bitmask} &\Rightarrow& \I32X4.\BITMASK\\ &&|&
      \text{i32x4.extadd\_pairwise\_i16x8\_s} &\Rightarrow& \I32X4.\EXTADDPAIRWISE\K{\_i16x8\_s}\\ &&|&
+     \text{i32x4.extadd\_pairwise\_i16x8\_u} &\Rightarrow& \I32X4.\EXTADDPAIRWISE\K{\_i16x8\_u}\\ &&|&
      \text{i32x4.extend\_low\_i16x8\_s} &\Rightarrow& \I32X4.\VEXTEND\K{\_low\_i16x8\_s}\\ &&|&
      \text{i32x4.extend\_high\_i16x8\_s} &\Rightarrow& \I32X4.\VEXTEND\K{\_high\_i16x8\_s}\\ &&|&
      \text{i32x4.extend\_low\_i16x8\_u} &\Rightarrow& \I32X4.\VEXTEND\K{\_low\_i16x8\_u}\\ &&|&

document/index.html

@@ -14,13 +14,20 @@
 <div id="readme" class="readme blob isntapaper_body">
 <article class="markdown-body entry-content">
 
+
 <h1>WebAssembly Specifications</h1>
 
 <p>
 To support the <em>embedding</em> of WebAssembly into different environments, its specification is split into <em>layers</em> that are specified in separate documents.
 </p>
 
-<h3>Core specification</h3>
+<p>
+  Source for these documents is available
+  <a href="https://github.com/WebAssembly/spec/">here</a>.
+</p>
+
+
+<h3>Core Specification</h3>
 
 <p>Defines the semantics of WebAssembly modules independent from a concrete embedding.
   The WebAssembly core is specified in a single document:</p>
@@ -41,12 +48,13 @@ <h3>Core specification</h3>
     </li>
   </ul>
 
-<h3>Embedder specifications</h3>
+
+<h3>Embedder Specifications</h3>
 
 <p>Define <em>application programming interfaces</em> (APIs) enabling the use of WebAssembly modules in concrete embedding environments.
   Currently, two APIs are specified:</p>
 
-  <ul>
+<ul>
   <li><p><b>JavaScript Embedding</b>: 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.</p>
     <ul>
       <li><a href="js-api/">W3C version</a></li>
@@ -60,7 +68,8 @@ <h3>Embedder specifications</h3>
       <!-- <li><a href="https://github.com/WebAssembly/spec/document/web-api/">Sources</a></li> -->
     </ul>
   </li>
-  </ul>
+</ul>
+
 
 <h3>Metadata specifications</h3>
 
@@ -97,10 +106,14 @@ <h3>Legacy Extensions</h3>
     </li>
   </ul>
 
-<p>
-  Source for all documents is available
-  <a href="https://github.com/WebAssembly/spec/">here</a>.
-</p>
+
+<h3>All Versions</h3>
+
+<ul>
+  <li><a href="versions/core/WebAssembly-1.0.pdf">WebAssembly 1.0</a> (2017)</li>
+  <li><a href="versions/core/WebAssembly-2.0.pdf">WebAssembly 2.0</a> (2022)</li>
+  <li><a href="versions/core/WebAssembly-3.0-draft.pdf">WebAssembly 3.0</a> (Draft 2024)</li>
+</ul>
 
 </article>
 </div>

document/versions/Makefile

@@ -0,0 +1,23 @@
+DIRS = core
+DIRNAME = versions
+BUILDDIR = _build
+
+.PHONY: all
+all:
+	mkdir -p $(BUILDDIR)/html/$(DIRNAME)
+	cp -R $(DIRS) $(BUILDDIR)/html/$(DIRNAME)/
+
+.PHONY: WD-tar
+WD-tar:
+
+.PHONY: WD-echidna
+WD-echidna:
+
+.PHONY: WD-echidna-CI
+WD-echidna-CI:
+
+.PHONY: diff
+diff:
+
+.PHONY: clean
+clean: