T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now diagnosing missing vmctx arguments (fixes #376) (#384)

Browse Source 
* Now diagnosing missing vmctx arguments (fixes #376).

* Added filetest for fix of #376.

* Respect formatting rules in verifier/mod.rs.

* Added parameters for each use of vmctx in test files.

* Added comments on additions on vmctx verifications.
This commit is contained in:
Grégoire Geis
2018-07-04 05:59:32 +02:00
committed by Dan Gohman
parent e5014e0fff
commit dd72b54eef
6 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cranelift/filetests/parser/memory.cton
View File

@@ -1,7 +1,7 @@
test cat
test verifier
function %vmglobal() -> i32 {
function %vmglobal(i64 vmctx) -> i32 {
gv3 = vmctx+16
; check: gv3 = vmctx+16
gv4 = vmctx+0
@@ -9,29 +9,29 @@ function %vmglobal() -> i32 {
; not: +0
gv5 = vmctx -256
; check: gv5 = vmctx-256
ebb0:
ebb0(v0: i64):
v1 = global_value.i32 gv3
; check: v1 = global_value.i32 gv3
return v1
}
function %deref() -> i32 {
function %deref(i64 vmctx) -> i32 {
gv3 = vmctx+16
gv4 = deref(gv3)-32
; check: gv4 = deref(gv3)-32
ebb0:
ebb0(v0: i64):
v1 = global_value.i32 gv4
; check: v1 = global_value.i32 gv4
return v1
}
; Refer to a global value before it's been declared.
function %backref() -> i32 {
function %backref(i64 vmctx) -> i32 {
gv1 = deref(gv2)-32
; check: gv1 = deref(gv2)-32
gv2 = vmctx+16
; check: gv2 = vmctx+16
ebb0:
ebb0(v0: i64):
v1 = global_value.i32 gv1
return v1
}
@@ -51,21 +51,21 @@ ebb0:
}
; Declare static heaps.
function %sheap(i32) -> i64 {
function %sheap(i32, i64 vmctx) -> i64 {
heap1 = static reserved_reg, min 0x1_0000, bound 0x1_0000_0000, guard 0x8000_0000
heap2 = static gv5, guard 0x1000, bound 0x1_0000
gv5 = vmctx+64
; check: heap1 = static reserved_reg, min 0x0001_0000, bound 0x0001_0000_0000, guard 0x8000_0000
; check: heap2 = static gv5, min 0, bound 0x0001_0000, guard 4096
ebb0(v1: i32):
v2 = heap_addr.i64 heap1, v1, 0
; check: v2 = heap_addr.i64 heap1, v1, 0
return v2
ebb0(v1: i32, v2: i64):
v3 = heap_addr.i64 heap1, v1, 0
; check: v3 = heap_addr.i64 heap1, v1, 0
return v3
}
; Declare dynamic heaps.
function %dheap(i32) -> i64 {
function %dheap(i32, i64 vmctx) -> i64 {
heap1 = dynamic reserved_reg, min 0x1_0000, bound gv6, guard 0x8000_0000
heap2 = dynamic gv5, bound gv6, guard 0x1000
gv5 = vmctx+64
@@ -73,8 +73,8 @@ function %dheap(i32) -> i64 {
; check: heap1 = dynamic reserved_reg, min 0x0001_0000, bound gv6, guard 0x8000_0000
; check: heap2 = dynamic gv5, min 0, bound gv6, guard 4096
ebb0(v1: i32):
v2 = heap_addr.i64 heap2, v1, 0
; check: v2 = heap_addr.i64 heap2, v1, 0
return v2
ebb0(v1: i32, v2: i64):
v3 = heap_addr.i64 heap2, v1, 0
; check: v3 = heap_addr.i64 heap2, v1, 0
return v3
}