5 files changed, 21 insertions, 11 deletions
diff --git a/test/spec/bulk-memory-operations/binary.txt b/test/spec/bulk-memory-operations/binary.txt
index 3b2eb85d..7a70ead3 100644
--- a/test/spec/bulk-memory-operations/binary.txt
+++ b/test/spec/bulk-memory-operations/binary.txt
@@ -129,9 +129,9 @@ out/test/spec/bulk-memory-operations/binary.wast:630: assert_malformed passed:
 out/test/spec/bulk-memory-operations/binary.wast:641: assert_malformed passed:
   0000015: error: function signature count != function body count
 out/test/spec/bulk-memory-operations/binary.wast:664: assert_malformed passed:
-  000000e: error: data section without memory section
+  000000e: error: data segment count does not equal count in DataCount section
 out/test/spec/bulk-memory-operations/binary.wast:674: assert_malformed passed:
-  000000e: error: data section without memory section
+  000000e: error: data segment count does not equal count in DataCount section
 out/test/spec/bulk-memory-operations/binary.wast:684: assert_malformed passed:
   0000024: error: memory.init requires data count section
 out/test/spec/bulk-memory-operations/binary.wast:706: assert_malformed passed:
diff --git a/test/spec/bulk-memory-operations/data.txt b/test/spec/bulk-memory-operations/data.txt
index 828b1ca1..0517b51c 100644
--- a/test/spec/bulk-memory-operations/data.txt
+++ b/test/spec/bulk-memory-operations/data.txt
@@ -3,7 +3,8 @@
 ;;; ARGS*: --enable-bulk-memory
 (;; STDOUT ;;;
 out/test/spec/bulk-memory-operations/data.wast:293: assert_invalid passed:
-  000000b: error: data section without memory section
+  0000000: error: memory variable out of range: 0 (max 0)
+  000000c: error: BeginDataSegment callback failed
 out/test/spec/bulk-memory-operations/data.wast:302: assert_invalid passed:
   0000013: error: expected i32 init_expr
 out/test/spec/bulk-memory-operations/data.wast:310: assert_invalid passed:
diff --git a/test/spec/bulk-memory-operations/elem.txt b/test/spec/bulk-memory-operations/elem.txt
index b56ae0eb..419847d9 100644
--- a/test/spec/bulk-memory-operations/elem.txt
+++ b/test/spec/bulk-memory-operations/elem.txt
@@ -3,7 +3,8 @@
 ;;; ARGS*: --enable-bulk-memory
 (;; STDOUT ;;;
 out/test/spec/bulk-memory-operations/elem.wast:300: assert_invalid passed:
-  0000015: error: elem section without table section
+  0000000: error: table variable out of range: 0 (max 0)
+  0000016: error: BeginElemSegment callback failed
 out/test/spec/bulk-memory-operations/elem.wast:310: assert_invalid passed:
   0000014: error: expected i32 init_expr
 out/test/spec/bulk-memory-operations/elem.wast:318: assert_invalid passed:
diff --git a/test/spec/bulk-memory-operations/imports.txt b/test/spec/bulk-memory-operations/imports.txt
index edb158ef..d5bdf58a 100644
--- a/test/spec/bulk-memory-operations/imports.txt
+++ b/test/spec/bulk-memory-operations/imports.txt
@@ -13,7 +13,8 @@ called host spectest.print_f64(f64:24.000000) =>
 called host spectest.print_f64(f64:24.000000) =>
 called host spectest.print_f64(f64:24.000000) =>
 out/test/spec/bulk-memory-operations/imports.wast:91: assert_invalid passed:
-  000001e: error: invalid import signature index
+  0000000: error: function type variable out of range: 1 (max 1)
+  000001e: error: OnImportFunc callback failed
 out/test/spec/bulk-memory-operations/imports.wast:107: assert_unlinkable passed:
   error: invalid import "test.unknown"
 out/test/spec/bulk-memory-operations/imports.wast:111: assert_unlinkable passed:
@@ -88,9 +89,11 @@ out/test/spec/bulk-memory-operations/imports.wast:310: assert_invalid passed:
   error: only one table allowed
   0000017: error: OnImportTable callback failed
 out/test/spec/bulk-memory-operations/imports.wast:314: assert_invalid passed:
-  0000014: error: table count (2) must be 0 or 1
+  error: only one table allowed
+  0000017: error: OnTable callback failed
 out/test/spec/bulk-memory-operations/imports.wast:318: assert_invalid passed:
-  000000b: error: table count (2) must be 0 or 1
+  error: only one table allowed
+  0000011: error: OnTable callback failed
 out/test/spec/bulk-memory-operations/imports.wast:335: assert_unlinkable passed:
   error: invalid import "test.unknown"
 out/test/spec/bulk-memory-operations/imports.wast:339: assert_unlinkable passed:
@@ -117,9 +120,11 @@ out/test/spec/bulk-memory-operations/imports.wast:405: assert_invalid passed:
   error: only one memory block allowed
   0000015: error: OnImportMemory callback failed
 out/test/spec/bulk-memory-operations/imports.wast:409: assert_invalid passed:
-  0000013: error: memory count (2) must be 0 or 1
+  error: only one memory block allowed
+  0000015: error: OnMemory callback failed
 out/test/spec/bulk-memory-operations/imports.wast:413: assert_invalid passed:
-  000000b: error: memory count (2) must be 0 or 1
+  error: only one memory block allowed
+  000000f: error: OnMemory callback failed
 out/test/spec/bulk-memory-operations/imports.wast:428: assert_unlinkable passed:
   error: invalid import "test.unknown"
 out/test/spec/bulk-memory-operations/imports.wast:432: assert_unlinkable passed:
diff --git a/test/spec/bulk-memory-operations/table_init.txt b/test/spec/bulk-memory-operations/table_init.txt
index 61f8fdf7..9617a0a9 100644
--- a/test/spec/bulk-memory-operations/table_init.txt
+++ b/test/spec/bulk-memory-operations/table_init.txt
@@ -63,9 +63,12 @@ out/test/spec/bulk-memory-operations/table_init.wast:199: assert_invalid passed:
   0000000: error: elem_segment variable out of range: 0 (max 0)
   000002b: error: OnTableInitExpr callback failed
 out/test/spec/bulk-memory-operations/table_init.wast:205: assert_invalid passed:
-  0000024: error: elem section without table section
+  0000000: error: elem_segment variable out of range: 4 (max 1)
+  0000035: error: OnElemDropExpr callback failed
 out/test/spec/bulk-memory-operations/table_init.wast:213: assert_invalid passed:
-  0000024: error: elem section without table section
+  0000000: error: table variable out of range: 0 (max 0)
+  0000000: error: elem_segment variable out of range: 4 (max 1)
+  000003c: error: OnTableInitExpr callback failed
 test() =>
 out/test/spec/bulk-memory-operations/table_init.wast:265: assert_trap passed: out of bounds table access: table.init out of bounds
 test() =>