2 files changed, 384 insertions, 234 deletions
diff --git a/test/passes/instrument-locals.txt b/test/passes/instrument-locals.txt
index 24cbdf44e..2637a69aa 100644
--- a/test/passes/instrument-locals.txt
+++ b/test/passes/instrument-locals.txt
@@ -4,14 +4,14 @@
  (type $FUNCSIG$jiij (func (param i32 i32 i64) (result i64)))
  (type $FUNCSIG$fiif (func (param i32 i32 f32) (result f32)))
  (type $FUNCSIG$diid (func (param i32 i32 f64) (result f64)))
- (import "instrument" "get_i32" (func $get_i32 (param i32 i32 i32) (result i32)))
- (import "instrument" "get_i64" (func $get_i64 (param i32 i32 i64) (result i64)))
- (import "instrument" "get_f32" (func $get_f32 (param i32 i32 f32) (result f32)))
- (import "instrument" "get_f64" (func $get_f64 (param i32 i32 f64) (result f64)))
- (import "instrument" "set_i32" (func $set_i32 (param i32 i32 i32) (result i32)))
- (import "instrument" "set_i64" (func $set_i64 (param i32 i32 i64) (result i64)))
- (import "instrument" "set_f32" (func $set_f32 (param i32 i32 f32) (result f32)))
- (import "instrument" "set_f64" (func $set_f64 (param i32 i32 f64) (result f64)))
+ (import "env" "get_i32" (func $get_i32 (param i32 i32 i32) (result i32)))
+ (import "env" "get_i64" (func $get_i64 (param i32 i32 i64) (result i64)))
+ (import "env" "get_f32" (func $get_f32 (param i32 i32 f32) (result f32)))
+ (import "env" "get_f64" (func $get_f64 (param i32 i32 f64) (result f64)))
+ (import "env" "set_i32" (func $set_i32 (param i32 i32 i32) (result i32)))
+ (import "env" "set_i64" (func $set_i64 (param i32 i32 i64) (result i64)))
+ (import "env" "set_f32" (func $set_f32 (param i32 i32 f32) (result f32)))
+ (import "env" "set_f64" (func $set_f64 (param i32 i32 f64) (result f64)))
  (func $A (; 8 ;) (type $0)
   (local $x i32)
   (local $y i64)
diff --git a/test/passes/instrument-memory.txt b/test/passes/instrument-memory.txt
index fc5221c3e..1bcc9ea01 100644
--- a/test/passes/instrument-memory.txt
+++ b/test/passes/instrument-memory.txt
@@ -1,453 +1,603 @@
 (module
  (type $1 (func))
  (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32)))
- (import "instrument" "load" (func $load (param i32 i32 i32 i32) (result i32)))
- (import "instrument" "store" (func $store (param i32 i32 i32 i32) (result i32)))
+ (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
+ (type $FUNCSIG$jij (func (param i32 i64) (result i64)))
+ (type $FUNCSIG$fif (func (param i32 f32) (result f32)))
+ (type $FUNCSIG$did (func (param i32 f64) (result f64)))
+ (import "env" "load_ptr" (func $load_ptr (param i32 i32 i32 i32) (result i32)))
+ (import "env" "load_val_i32" (func $load_val_i32 (param i32 i32) (result i32)))
+ (import "env" "load_val_i64" (func $load_val_i64 (param i32 i64) (result i64)))
+ (import "env" "load_val_f32" (func $load_val_f32 (param i32 f32) (result f32)))
+ (import "env" "load_val_f64" (func $load_val_f64 (param i32 f64) (result f64)))
+ (import "env" "store_ptr" (func $store_ptr (param i32 i32 i32 i32) (result i32)))
+ (import "env" "store_val_i32" (func $store_val_i32 (param i32 i32) (result i32)))
+ (import "env" "store_val_i64" (func $store_val_i64 (param i32 i64) (result i64)))
+ (import "env" "store_val_f32" (func $store_val_f32 (param i32 f32) (result f32)))
+ (import "env" "store_val_f64" (func $store_val_f64 (param i32 f64) (result f64)))
  (memory $0 256 256)
- (func $A (; 2 ;) (type $1)
+ (func $A (; 10 ;) (type $1)
   (drop
-   (i32.load8_s
-    (call $load
-     (i32.const 0)
-     (i32.const 1)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 1)
+    (i32.load8_s
+     (call $load_ptr
+      (i32.const 1)
+      (i32.const 1)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load8_u
-    (call $load
-     (i32.const 1)
-     (i32.const 1)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 2)
+    (i32.load8_u
+     (call $load_ptr
+      (i32.const 2)
+      (i32.const 1)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load16_s
-    (call $load
-     (i32.const 2)
-     (i32.const 2)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 3)
+    (i32.load16_s
+     (call $load_ptr
+      (i32.const 3)
+      (i32.const 2)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load16_u
-    (call $load
-     (i32.const 3)
-     (i32.const 2)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 4)
+    (i32.load16_u
+     (call $load_ptr
+      (i32.const 4)
+      (i32.const 2)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load
-    (call $load
-     (i32.const 4)
-     (i32.const 4)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 5)
+    (i32.load
+     (call $load_ptr
+      (i32.const 5)
+      (i32.const 4)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load8_s
-    (call $load
-     (i32.const 5)
-     (i32.const 1)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 6)
+    (i64.load8_s
+     (call $load_ptr
+      (i32.const 6)
+      (i32.const 1)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load8_u
-    (call $load
-     (i32.const 6)
-     (i32.const 1)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 7)
+    (i64.load8_u
+     (call $load_ptr
+      (i32.const 7)
+      (i32.const 1)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load16_s
-    (call $load
-     (i32.const 7)
-     (i32.const 2)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 8)
+    (i64.load16_s
+     (call $load_ptr
+      (i32.const 8)
+      (i32.const 2)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load16_u
-    (call $load
-     (i32.const 8)
-     (i32.const 2)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 9)
+    (i64.load16_u
+     (call $load_ptr
+      (i32.const 9)
+      (i32.const 2)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load32_s
-    (call $load
-     (i32.const 9)
-     (i32.const 4)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 10)
+    (i64.load32_s
+     (call $load_ptr
+      (i32.const 10)
+      (i32.const 4)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load32_u
-    (call $load
-     (i32.const 10)
-     (i32.const 4)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 11)
+    (i64.load32_u
+     (call $load_ptr
+      (i32.const 11)
+      (i32.const 4)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load
-    (call $load
-     (i32.const 11)
-     (i32.const 8)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 12)
+    (i64.load
+     (call $load_ptr
+      (i32.const 12)
+      (i32.const 8)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (f32.load
-    (call $load
-     (i32.const 12)
-     (i32.const 4)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_f32
+    (i32.const 13)
+    (f32.load
+     (call $load_ptr
+      (i32.const 13)
+      (i32.const 4)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (f64.load
-    (call $load
-     (i32.const 13)
-     (i32.const 8)
-     (i32.const 0)
-     (i32.const 0)
+   (call $load_val_f64
+    (i32.const 14)
+    (f64.load
+     (call $load_ptr
+      (i32.const 14)
+      (i32.const 8)
+      (i32.const 0)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load8_s offset=1
-    (call $load
-     (i32.const 14)
-     (i32.const 1)
-     (i32.const 1)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 15)
+    (i32.load8_s offset=1
+     (call $load_ptr
+      (i32.const 15)
+      (i32.const 1)
+      (i32.const 1)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load8_u offset=2
-    (call $load
-     (i32.const 15)
-     (i32.const 1)
-     (i32.const 2)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 16)
+    (i32.load8_u offset=2
+     (call $load_ptr
+      (i32.const 16)
+      (i32.const 1)
+      (i32.const 2)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load16_s offset=3 align=1
-    (call $load
-     (i32.const 16)
-     (i32.const 2)
-     (i32.const 3)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 17)
+    (i32.load16_s offset=3 align=1
+     (call $load_ptr
+      (i32.const 17)
+      (i32.const 2)
+      (i32.const 3)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load16_u offset=4 align=1
-    (call $load
-     (i32.const 17)
-     (i32.const 2)
-     (i32.const 4)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 18)
+    (i32.load16_u offset=4 align=1
+     (call $load_ptr
+      (i32.const 18)
+      (i32.const 2)
+      (i32.const 4)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i32.load offset=5 align=2
-    (call $load
-     (i32.const 18)
-     (i32.const 4)
-     (i32.const 5)
-     (i32.const 0)
+   (call $load_val_i32
+    (i32.const 19)
+    (i32.load offset=5 align=2
+     (call $load_ptr
+      (i32.const 19)
+      (i32.const 4)
+      (i32.const 5)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load8_s offset=6
-    (call $load
-     (i32.const 19)
-     (i32.const 1)
-     (i32.const 6)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 20)
+    (i64.load8_s offset=6
+     (call $load_ptr
+      (i32.const 20)
+      (i32.const 1)
+      (i32.const 6)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load8_u offset=7
-    (call $load
-     (i32.const 20)
-     (i32.const 1)
-     (i32.const 7)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 21)
+    (i64.load8_u offset=7
+     (call $load_ptr
+      (i32.const 21)
+      (i32.const 1)
+      (i32.const 7)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load16_s offset=8 align=1
-    (call $load
-     (i32.const 21)
-     (i32.const 2)
-     (i32.const 8)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 22)
+    (i64.load16_s offset=8 align=1
+     (call $load_ptr
+      (i32.const 22)
+      (i32.const 2)
+      (i32.const 8)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load16_u offset=9 align=1
-    (call $load
-     (i32.const 22)
-     (i32.const 2)
-     (i32.const 9)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 23)
+    (i64.load16_u offset=9 align=1
+     (call $load_ptr
+      (i32.const 23)
+      (i32.const 2)
+      (i32.const 9)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load32_s offset=10 align=2
-    (call $load
-     (i32.const 23)
-     (i32.const 4)
-     (i32.const 10)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 24)
+    (i64.load32_s offset=10 align=2
+     (call $load_ptr
+      (i32.const 24)
+      (i32.const 4)
+      (i32.const 10)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load32_u offset=11 align=2
-    (call $load
-     (i32.const 24)
-     (i32.const 4)
-     (i32.const 11)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 25)
+    (i64.load32_u offset=11 align=2
+     (call $load_ptr
+      (i32.const 25)
+      (i32.const 4)
+      (i32.const 11)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (i64.load offset=12 align=2
-    (call $load
-     (i32.const 25)
-     (i32.const 8)
-     (i32.const 12)
-     (i32.const 0)
+   (call $load_val_i64
+    (i32.const 26)
+    (i64.load offset=12 align=2
+     (call $load_ptr
+      (i32.const 26)
+      (i32.const 8)
+      (i32.const 12)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (f32.load offset=13 align=2
-    (call $load
-     (i32.const 26)
-     (i32.const 4)
-     (i32.const 13)
-     (i32.const 0)
+   (call $load_val_f32
+    (i32.const 27)
+    (f32.load offset=13 align=2
+     (call $load_ptr
+      (i32.const 27)
+      (i32.const 4)
+      (i32.const 13)
+      (i32.const 0)
+     )
     )
    )
   )
   (drop
-   (f64.load offset=14 align=2
-    (call $load
-     (i32.const 27)
-     (i32.const 8)
-     (i32.const 14)
-     (i32.const 0)
+   (call $load_val_f64
+    (i32.const 28)
+    (f64.load offset=14 align=2
+     (call $load_ptr
+      (i32.const 28)
+      (i32.const 8)
+      (i32.const 14)
+      (i32.const 0)
+     )
     )
    )
   )
  )
- (func $B (; 3 ;) (type $1)
+ (func $B (; 11 ;) (type $1)
   (i32.store8
-   (call $store
-    (i32.const 28)
+   (call $store_ptr
+    (i32.const 29)
     (i32.const 1)
     (i32.const 0)
     (i32.const 0)
    )
-   (i32.const 1)
+   (call $store_val_i32
+    (i32.const 29)
+    (i32.const 1)
+   )
   )
   (i32.store16
-   (call $store
-    (i32.const 29)
+   (call $store_ptr
+    (i32.const 30)
     (i32.const 2)
     (i32.const 0)
     (i32.const 0)
    )
-   (i32.const 2)
+   (call $store_val_i32
+    (i32.const 30)
+    (i32.const 2)
+   )
   )
   (i32.store
-   (call $store
-    (i32.const 30)
+   (call $store_ptr
+    (i32.const 31)
     (i32.const 4)
     (i32.const 0)
     (i32.const 0)
    )
-   (i32.const 3)
+   (call $store_val_i32
+    (i32.const 31)
+    (i32.const 3)
+   )
   )
   (i64.store8
-   (call $store
-    (i32.const 31)
+   (call $store_ptr
+    (i32.const 32)
     (i32.const 1)
     (i32.const 0)
     (i32.const 0)
    )
-   (i64.const 4)
+   (call $store_val_i64
+    (i32.const 32)
+    (i64.const 4)
+   )
   )
   (i64.store16
-   (call $store
-    (i32.const 32)
+   (call $store_ptr
+    (i32.const 33)
     (i32.const 2)
     (i32.const 0)
     (i32.const 0)
    )
-   (i64.const 5)
+   (call $store_val_i64
+    (i32.const 33)
+    (i64.const 5)
+   )
   )
   (i64.store32
-   (call $store
-    (i32.const 33)
+   (call $store_ptr
+    (i32.const 34)
     (i32.const 4)
     (i32.const 0)
     (i32.const 0)
    )
-   (i64.const 6)
+   (call $store_val_i64
+    (i32.const 34)
+    (i64.const 6)
+   )
   )
   (i64.store
-   (call $store
-    (i32.const 34)
+   (call $store_ptr
+    (i32.const 35)
     (i32.const 8)
     (i32.const 0)
     (i32.const 0)
    )
-   (i64.const 7)
+   (call $store_val_i64
+    (i32.const 35)
+    (i64.const 7)
+   )
   )
   (f32.store
-   (call $store
-    (i32.const 35)
+   (call $store_ptr
+    (i32.const 36)
     (i32.const 4)
     (i32.const 0)
     (i32.const 0)
    )
-   (f32.const 8)
+   (call $store_val_f32
+    (i32.const 36)
+    (f32.const 8)
+   )
   )
   (f64.store
-   (call $store
-    (i32.const 36)
+   (call $store_ptr
+    (i32.const 37)
     (i32.const 8)
     (i32.const 0)
     (i32.const 0)
    )
-   (f64.const 9)
+   (call $store_val_f64
+    (i32.const 37)
+    (f64.const 9)
+   )
   )
   (i32.store8 offset=1
-   (call $store
-    (i32.const 37)
+   (call $store_ptr
+    (i32.const 38)
     (i32.const 1)
     (i32.const 1)
     (i32.const 0)
    )
-   (i32.const 1)
+   (call $store_val_i32
+    (i32.const 38)
+    (i32.const 1)
+   )
   )
   (i32.store16 offset=2 align=1
-   (call $store
-    (i32.const 38)
+   (call $store_ptr
+    (i32.const 39)
     (i32.const 2)
     (i32.const 2)
     (i32.const 0)
    )
-   (i32.const 2)
+   (call $store_val_i32
+    (i32.const 39)
+    (i32.const 2)
+   )
   )
   (i32.store offset=3 align=2
-   (call $store
-    (i32.const 39)
+   (call $store_ptr
+    (i32.const 40)
     (i32.const 4)
     (i32.const 3)
     (i32.const 0)
    )
-   (i32.const 3)
+   (call $store_val_i32
+    (i32.const 40)
+    (i32.const 3)
+   )
   )
   (i64.store8 offset=4
-   (call $store
-    (i32.const 40)
+   (call $store_ptr
+    (i32.const 41)
     (i32.const 1)
     (i32.const 4)
     (i32.const 0)
    )
-   (i64.const 4)
+   (call $store_val_i64
+    (i32.const 41)
+    (i64.const 4)
+   )
   )
   (i64.store16 offset=5
-   (call $store
-    (i32.const 41)
+   (call $store_ptr
+    (i32.const 42)
     (i32.const 2)
     (i32.const 5)
     (i32.const 0)
    )
-   (i64.const 5)
+   (call $store_val_i64
+    (i32.const 42)
+    (i64.const 5)
+   )
   )
   (i64.store32 offset=6 align=2
-   (call $store
-    (i32.const 42)
+   (call $store_ptr
+    (i32.const 43)
     (i32.const 4)
     (i32.const 6)
     (i32.const 0)
    )
-   (i64.const 6)
+   (call $store_val_i64
+    (i32.const 43)
+    (i64.const 6)
+   )
   )
   (i64.store offset=7 align=2
-   (call $store
-    (i32.const 43)
+   (call $store_ptr
+    (i32.const 44)
     (i32.const 8)
     (i32.const 7)
     (i32.const 0)
    )
-   (i64.const 7)
+   (call $store_val_i64
+    (i32.const 44)
+    (i64.const 7)
+   )
   )
   (f32.store offset=8 align=2
-   (call $store
-    (i32.const 44)
+   (call $store_ptr
+    (i32.const 45)
     (i32.const 4)
     (i32.const 8)
     (i32.const 0)
    )
-   (f32.const 8)
+   (call $store_val_f32
+    (i32.const 45)
+    (f32.const 8)
+   )
   )
   (f64.store offset=9 align=2
-   (call $store
-    (i32.const 45)
+   (call $store_ptr
+    (i32.const 46)
     (i32.const 8)
     (i32.const 9)
     (i32.const 0)
    )
-   (f64.const 9)
+   (call $store_val_f64
+    (i32.const 46)
+    (f64.const 9)
+   )
   )
  )
 )