6 files changed, 110 insertions, 3 deletions
diff --git a/test/wasm2c/spec/memory64/binary0.txt b/test/wasm2c/spec/memory64/binary0.txt
new file mode 100644
index 00000000..f49c0662
--- /dev/null
+++ b/test/wasm2c/spec/memory64/binary0.txt
@@ -0,0 +1,6 @@
+;;; TOOL: run-spec-wasm2c
+;;; STDIN_FILE: third_party/testsuite/proposals/memory64/binary0.wast
+;;; ARGS*: --enable-memory64 --enable-multi-memory
+(;; STDOUT ;;;
+0/0 tests passed.
+;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/memory64/imports.txt b/test/wasm2c/spec/memory64/imports.txt
new file mode 100644
index 00000000..7cefbce0
--- /dev/null
+++ b/test/wasm2c/spec/memory64/imports.txt
@@ -0,0 +1,19 @@
+;;; TOOL: run-spec-wasm2c
+;;; STDIN_FILE: third_party/testsuite/proposals/memory64/imports.wast
+;;; ARGS*: --enable-memory64 --enable-exceptions --enable-multi-memory
+(;; STDOUT ;;;
+spectest.print_i32(13)
+spectest.print_i32_f32(14 42)
+spectest.print_i32(13)
+spectest.print_i32(13)
+spectest.print_f32(13)
+spectest.print_i32(13)
+spectest.print_i64(24)
+spectest.print_f64_f64(25 53)
+spectest.print_i64(24)
+spectest.print_f64(24)
+spectest.print_f64(24)
+spectest.print_f64(24)
+spectest.print_i32(13)
+34/34 tests passed.
+;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/memory64/memory.txt b/test/wasm2c/spec/memory64/memory.txt
index 5260807c..0f06b345 100644
--- a/test/wasm2c/spec/memory64/memory.txt
+++ b/test/wasm2c/spec/memory64/memory.txt
@@ -2,5 +2,5 @@
 ;;; STDIN_FILE: third_party/testsuite/proposals/memory64/memory.wast
 ;;; ARGS*: --enable-memory64
 (;; STDOUT ;;;
-45/45 tests passed.
+53/53 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/memory64/table.txt b/test/wasm2c/spec/memory64/table.txt
index a553dd52..190e16b1 100644
--- a/test/wasm2c/spec/memory64/table.txt
+++ b/test/wasm2c/spec/memory64/table.txt
@@ -1,6 +1,82 @@
 ;;; TOOL: run-spec-wasm2c
-;;; STDIN_FILE: third_party/testsuite/proposals/memory64/table.wast
 ;;; ARGS*: --enable-memory64
+;; memory64 table.wast from last commit before wasm-3.0 merge
+
+(module (table 0 funcref))
+(module (table 1 funcref))
+(module (table 0 0 funcref))
+(module (table 0 1 funcref))
+(module (table 1 256 funcref))
+(module (table 0 65536 funcref))
+(module (table 0 0xffff_ffff funcref))
+
+(module (table 0 funcref) (table 0 funcref))
+(module (table (import "spectest" "table") 0 funcref) (table 0 funcref))
+
+(assert_invalid
+  (module (table 1 0 funcref))
+  "size minimum must not be greater than maximum"
+)
+(assert_invalid
+  (module (table 0xffff_ffff 0 funcref))
+  "size minimum must not be greater than maximum"
+)
+
+(assert_invalid
+  (module quote "(table 0x1_0000_0000 funcref)")
+  "table size must be at most 2^32-1"
+)
+(assert_invalid
+  (module quote "(table 0x1_0000_0000 0x1_0000_0000 funcref)")
+  "table size must be at most 2^32-1"
+)
+(assert_invalid
+  (module quote "(table 0 0x1_0000_0000 funcref)")
+  "table size must be at most 2^32-1"
+)
+
+;; Same as above but with i64 index types
+
+(module (table i64 0 funcref))
+(module (table i64 1 funcref))
+(module (table i64 0 0 funcref))
+(module (table i64 0 1 funcref))
+(module (table i64 1 256 funcref))
+(module (table i64 0 65536 funcref))
+(module (table i64 0 0xffff_ffff funcref))
+
+(module (table i64 0 funcref) (table i64 0 funcref))
+(module (table (import "spectest" "table64") i64 0 funcref) (table i64 0 funcref))
+
+(assert_invalid
+  (module (table i64 1 0 funcref))
+  "size minimum must not be greater than maximum"
+)
+(assert_invalid
+  (module (table i64 0xffff_ffff 0 funcref))
+  "size minimum must not be greater than maximum"
+)
+
+;; Elem segments with no table
+
+(assert_invalid (module (elem (i32.const 0))) "unknown table")
+(assert_invalid (module (elem (i32.const 0) $f) (func $f)) "unknown table")
+
+;; Duplicate table identifiers
+
+(assert_malformed (module quote
+  "(table $foo 1 funcref)"
+  "(table $foo 1 funcref)")
+  "duplicate table")
+(assert_malformed (module quote
+  "(import \"\" \"\" (table $foo 1 funcref))"
+  "(table $foo 1 funcref)")
+  "duplicate table")
+(assert_malformed (module quote
+  "(import \"\" \"\" (table $foo 1 funcref))"
+  "(import \"\" \"\" (table $foo 1 funcref))")
+  "duplicate table")
+
 (;; STDOUT ;;;
 0/0 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/memory64/table_copy_mixed.txt b/test/wasm2c/spec/memory64/table_copy_mixed.txt
new file mode 100644
index 00000000..e6d651f2
--- /dev/null
+++ b/test/wasm2c/spec/memory64/table_copy_mixed.txt
@@ -0,0 +1,6 @@
+;;; TOOL: run-spec-wasm2c
+;;; STDIN_FILE: third_party/testsuite/proposals/memory64/table_copy_mixed.wast
+;;; ARGS*: --enable-memory64
+(;; STDOUT ;;;
+0/0 tests passed.
+;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/memory64/table_grow.txt b/test/wasm2c/spec/memory64/table_grow.txt
index c97a1864..545d8d42 100644
--- a/test/wasm2c/spec/memory64/table_grow.txt
+++ b/test/wasm2c/spec/memory64/table_grow.txt
@@ -2,5 +2,5 @@
 ;;; STDIN_FILE: third_party/testsuite/proposals/memory64/table_grow.wast
 ;;; ARGS*: --enable-memory64
 (;; STDOUT ;;;
-59/59 tests passed.
+62/62 tests passed.
 ;;; STDOUT ;;)