1 files changed, 51 insertions, 51 deletions
diff --git a/test/dynamicLibrary.fromasm.imprecise.no-opts b/test/dynamicLibrary.fromasm.imprecise.no-opts
index ecd6e74d9..48f6d8219 100644
--- a/test/dynamicLibrary.fromasm.imprecise.no-opts
+++ b/test/dynamicLibrary.fromasm.imprecise.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$vi (func (param i32)))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table $table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 funcref))
  (import "env" "__memory_base" (global $__memory_base i32))
  (import "env" "__table_base" (global $__table_base i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
@@ -14,19 +14,19 @@
  (import "global" "Infinity" (global $inf$asm2wasm$import f64))
  (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32)))
  (import "env" "_puts" (func $_puts (param i32) (result i32)))
- (global $DYNAMICTOP_PTR (mut i32) (get_global $DYNAMICTOP_PTR$asm2wasm$import))
- (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import))
- (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import))
- (global $memoryBase (mut i32) (get_global $memoryBase$asm2wasm$import))
- (global $tableBase (mut i32) (get_global $tableBase$asm2wasm$import))
+ (global $DYNAMICTOP_PTR (mut i32) (global.get $DYNAMICTOP_PTR$asm2wasm$import))
+ (global $tempDoublePtr (mut i32) (global.get $tempDoublePtr$asm2wasm$import))
+ (global $ABORT (mut i32) (global.get $ABORT$asm2wasm$import))
+ (global $memoryBase (mut i32) (global.get $memoryBase$asm2wasm$import))
+ (global $tableBase (mut i32) (global.get $tableBase$asm2wasm$import))
  (global $STACKTOP (mut i32) (i32.const 0))
  (global $STACK_MAX (mut i32) (i32.const 0))
  (global $__THREW__ (mut i32) (i32.const 0))
  (global $threwValue (mut i32) (i32.const 0))
  (global $setjmpId (mut i32) (i32.const 0))
  (global $undef (mut i32) (i32.const 0))
- (global $nan (mut f64) (get_global $nan$asm2wasm$import))
- (global $inf (mut f64) (get_global $inf$asm2wasm$import))
+ (global $nan (mut f64) (global.get $nan$asm2wasm$import))
+ (global $inf (mut f64) (global.get $inf$asm2wasm$import))
  (global $tempInt (mut i32) (i32.const 0))
  (global $tempBigInt (mut i32) (i32.const 0))
  (global $tempBigIntP (mut i32) (i32.const 0))
@@ -46,19 +46,19 @@
  (export "_global" (global $_global))
  (func $stackAlloc (; 2 ;) (param $size i32) (result i32)
   (local $ret i32)
-  (set_local $ret
-   (get_global $STACKTOP)
+  (local.set $ret
+   (global.get $STACKTOP)
   )
-  (set_global $STACKTOP
+  (global.set $STACKTOP
    (i32.add
-    (get_global $STACKTOP)
-    (get_local $size)
+    (global.get $STACKTOP)
+    (local.get $size)
    )
   )
-  (set_global $STACKTOP
+  (global.set $STACKTOP
    (i32.and
     (i32.add
-     (get_global $STACKTOP)
+     (global.get $STACKTOP)
      (i32.const 15)
     )
     (i32.const -16)
@@ -66,47 +66,47 @@
   )
   (if
    (i32.ge_s
-    (get_global $STACKTOP)
-    (get_global $STACK_MAX)
+    (global.get $STACKTOP)
+    (global.get $STACK_MAX)
    )
    (call $abortStackOverflow
-    (get_local $size)
+    (local.get $size)
    )
   )
   (return
-   (get_local $ret)
+   (local.get $ret)
   )
  )
  (func $stackSave (; 3 ;) (result i32)
   (return
-   (get_global $STACKTOP)
+   (global.get $STACKTOP)
   )
  )
  (func $stackRestore (; 4 ;) (param $top i32)
-  (set_global $STACKTOP
-   (get_local $top)
+  (global.set $STACKTOP
+   (local.get $top)
   )
  )
  (func $establishStackSpace (; 5 ;) (param $stackBase i32) (param $stackMax i32)
-  (set_global $STACKTOP
-   (get_local $stackBase)
+  (global.set $STACKTOP
+   (local.get $stackBase)
   )
-  (set_global $STACK_MAX
-   (get_local $stackMax)
+  (global.set $STACK_MAX
+   (local.get $stackMax)
   )
  )
  (func $setThrew (; 6 ;) (param $threw i32) (param $value i32)
   (if
    (i32.eq
-    (get_global $__THREW__)
+    (global.get $__THREW__)
     (i32.const 0)
    )
    (block
-    (set_global $__THREW__
-     (get_local $threw)
+    (global.set $__THREW__
+     (local.get $threw)
     )
-    (set_global $threwValue
-     (get_local $value)
+    (global.set $threwValue
+     (local.get $value)
     )
    )
   )
@@ -114,12 +114,12 @@
  (func $___cxx_global_var_init (; 7 ;)
   (local $label i32)
   (local $sp i32)
-  (set_local $sp
-   (get_global $STACKTOP)
+  (local.set $sp
+   (global.get $STACKTOP)
   )
   (call $__ZN3FooC2Ev
    (i32.add
-    (get_global $memoryBase)
+    (global.get $memoryBase)
     (i32.const 5242912)
    )
   )
@@ -129,45 +129,45 @@
   (local $$1 i32)
   (local $label i32)
   (local $sp i32)
-  (set_local $sp
-   (get_global $STACKTOP)
+  (local.set $sp
+   (global.get $STACKTOP)
   )
-  (set_global $STACKTOP
+  (global.set $STACKTOP
    (i32.add
-    (get_global $STACKTOP)
+    (global.get $STACKTOP)
     (i32.const 16)
    )
   )
   (if
    (i32.ge_s
-    (get_global $STACKTOP)
-    (get_global $STACK_MAX)
+    (global.get $STACKTOP)
+    (global.get $STACK_MAX)
    )
    (call $abortStackOverflow
     (i32.const 16)
    )
   )
-  (set_local $$1
-   (get_local $$0)
+  (local.set $$1
+   (local.get $$0)
   )
   (drop
    (call $_puts
     (i32.add
-     (get_global $memoryBase)
+     (global.get $memoryBase)
      (i32.const 0)
     )
    )
   )
-  (set_global $STACKTOP
-   (get_local $sp)
+  (global.set $STACKTOP
+   (local.get $sp)
   )
   (return)
  )
  (func $__GLOBAL__sub_I_liblib_cpp (; 9 ;)
   (local $label i32)
   (local $sp i32)
-  (set_local $sp
-   (get_global $STACKTOP)
+  (local.set $sp
+   (global.get $STACKTOP)
   )
   (call $___cxx_global_var_init)
   (return)
@@ -177,15 +177,15 @@
   (nop)
  )
  (func $__post_instantiate (; 11 ;)
-  (set_global $STACKTOP
+  (global.set $STACKTOP
    (i32.add
-    (get_global $memoryBase)
+    (global.get $memoryBase)
     (i32.const 32)
    )
   )
-  (set_global $STACK_MAX
+  (global.set $STACK_MAX
    (i32.add
-    (get_global $STACKTOP)
+    (global.get $STACKTOP)
     (i32.const 5242880)
    )
   )