Merge branch 'main' into wasm-3.0

rossberg · rossberg · commit 50139ecb896e · 2025-06-17T08:59:17.000+02:00
diff --git a/document/core/exec/instructions.rst b/document/core/exec/instructions.rst
@@ -4149,7 +4149,7 @@ Control Instructions
 
 6. Pop the values :math:`\val^m` from the stack.
 
-7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\val^m~\instr^\ast` with label :math:`L`.
+7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\instr^\ast` with label :math:`L` and values :math:`\val^m`.
 
 .. math::
    ~\\[-1ex]
@@ -4177,7 +4177,7 @@ Control Instructions
 
 6. Pop the values :math:`\val^m` from the stack.
 
-7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\val^m~\instr^\ast` with label :math:`L`.
+7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`\instr^\ast` with label :math:`L` and values :math:`\val^m`.
 
 .. math::
    ~\\[-1ex]
@@ -4881,12 +4881,14 @@ that forms a :ref:`block <exec-instr-control>`.
 
 .. _exec-instr-seq-enter:
 
-Entering :math:`\instr^\ast` with label :math:`L`
-.................................................
+Entering :math:`\instr^\ast` with label :math:`L` and values :math:`\val^\ast`
+..............................................................................
 
 1. Push :math:`L` to the stack.
 
-2. Jump to the start of the instruction sequence :math:`\instr^\ast`.
+2. Push the values :math:`\val^\ast` to the stack.
+
+3. Jump to the start of the instruction sequence :math:`\instr^\ast`.
 
 .. note::
    No formal reduction rule is needed for entering an instruction sequence,
@@ -5010,7 +5012,7 @@ Invocation of :ref:`function address <syntax-funcaddr>` :math:`a`
 
 10. Let :math:`L` be the :ref:`label <syntax-label>` whose arity is :math:`m` and whose continuation is the end of the function.
 
-11. :ref:`Enter <exec-instr-seq-enter>` the instruction sequence :math:`\instr^\ast` with label :math:`L`.
+11. :ref:`Enter <exec-instr-seq-enter>` the instruction sequence :math:`\instr^\ast` with label :math:`L` and no values.
 
 .. math::
    ~\\[-1ex]
diff --git a/document/versions/core/WebAssembly-3.0-draft.pdf b/document/versions/core/WebAssembly-3.0-draft.pdf
diff --git a/interpreter/Makefile b/interpreter/Makefile
@@ -129,18 +129,24 @@ customquiettest/%:	$(NAME)
 .PHONY: install
 
 install:
+	rm -f $(NAME).exe
 	dune build -p $(NAME) @install
 	dune install
 
 opam-release/%:
-	git tag opam-$*
-	git push --tags
+	#git tag -f opam-$*
+	#git push -f --tags
 	rm -f opam-$*.zip
-	wget https://github.com/WebAssembly/spec/archive/opam-$*.zip
+	#wget https://github.com/WebAssembly/spec/archive/opam-$*.zip
+	wget 'https://download-directory.github.io?url=https://github.com/WebAssembly/spec/tree/opam-$*/interpreter&filename=opam-$*.zip'
 	cp wasm.opam opam
 	echo "url {" >> opam
-	echo "  src: \"https://github.com/WebAssembly/spec/archive/opam-$*.zip\"" >> opam
-	echo "  checksum: \"md5=`md5 -q opam-$*.zip`\"" >> opam
+	#echo "  src: \"https://github.com/WebAssembly/spec/archive/opam-$*.zip\"" >> opam
+	echo "  src: \"https://download-directory.github.io?url=https://github.com/WebAssembly/spec/tree/opam-$*/interpreter&filename=opam-$*.zip\"" >> opam
+	echo "  checksum: [" >> opam
+	echo "    \"md5=`md5 -q opam-$*.zip`\"" >> opam
+	echo "    \"sha256=`sha256 -q opam-$*.zip`\"" >> opam
+	echo "  ]" >> opam
 	echo "}" >> opam
 	rm opam-$*.zip
 	@echo Created file ./opam, submit to github opam-repository/packages/wasm/wasm.$*/opam
diff --git a/interpreter/dune-project b/interpreter/dune-project
@@ -16,7 +16,7 @@
   (synopsis "Library to read and write WebAssembly (Wasm) files and manipulate their AST")
   (tags (wasm webassembly spec interpreter))
   (depends
-    (ocaml (>= 4.12))
+    (ocaml (>= 4.14))
     (menhir (>= 20220210))
   )
 )
diff --git a/interpreter/main/main.ml b/interpreter/main/main.ml
@@ -29,7 +29,7 @@ let add_custom name =
     prerr_endline ("option -c: unknown custom section \"" ^ name ^ "\"");
     exit 1
 
-let quote s = "\"" ^ String.escaped s ^ "\""
+let quote = Arrange.string
 
 let argspec = Arg.align
 [
diff --git a/interpreter/wasm.opam b/interpreter/wasm.opam
@@ -14,20 +14,6 @@ depends: [
   "menhir" {>= "20220210"}
   "odoc" {with-doc}
 ]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
+build: [make "-C" "interpreter"]
+install: [make "-C" "interpreter" "install"]
 dev-repo: "git+https://github.com/WebAssembly/spec.git"
diff --git a/test/core/binary.wast b/test/core/binary.wast
@@ -1160,6 +1160,7 @@
 (assert_malformed
   (module binary
       "\00asm" "\01\00\00\00"
+      "\01\04\01\60\00\00"        ;; Type section
       "\03\02\01\00"              ;; Function section
       "\08\01\00"                 ;; Start section: function 0
       "\07\01\00"                 ;; Export section with zero entries
@@ -1171,6 +1172,7 @@
 (assert_malformed
   (module binary
       "\00asm" "\01\00\00\00"
+      "\01\04\01\60\00\00"        ;; Type section
       "\03\02\01\00"              ;; Function section
       "\09\01\00"                 ;; Element section with zero entries
       "\08\01\00"                 ;; Start section: function 0
diff --git a/test/core/data.wast b/test/core/data.wast
@@ -16,6 +16,8 @@
   (data (memory $m) (i32.const 1) "a" "" "bcd")
   (data (memory $m) (offset (i32.const 0)))
   (data (memory $m) (offset (i32.const 0)) "" "a" "bc" "")
+  (data)
+  (data "a" "" "bcd")
 
   (data $d1 (i32.const 0))
   (data $d2 (i32.const 1) "a" "" "bcd")
@@ -29,6 +31,8 @@
   (data $d10 (memory $m) (i32.const 1) "a" "" "bcd")
   (data $d11 (memory $m) (offset (i32.const 0)))
   (data $d12 (memory $m) (offset (i32.const 0)) "" "a" "bc" "")
+  (data $d13)
+  (data $d14 "a" "" "bcd")
 )
 
 ;; Basic use

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`(synopsis "Library to read and write WebAssembly (Wasm) files and manipulate their AST")`
`17`	`17`	`(tags (wasm webassembly spec interpreter))`
`18`	`18`	`(depends`
`19`		`- (ocaml (>= 4.12))`
	`19`	`+ (ocaml (>= 4.14))`
`20`	`20`	`(menhir (>= 20220210))`
`21`	`21`	`)`
`22`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ let add_custom name =`
`29`	`29`	`prerr_endline ("option -c: unknown custom section \"" ^ name ^ "\"");`
`30`	`30`	`exit 1`
`31`	`31`
`32`		`-let quote s = "\"" ^ String.escaped s ^ "\""`
	`32`	`+let quote = Arrange.string`
`33`	`33`
`34`	`34`	`let argspec = Arg.align`
`35`	`35`	`[`