63a3bbbf5a
* Change VMMemoryDefinition::current_length to `usize` This commit changes the definition of `VMMemoryDefinition::current_length` to `usize` from its previous definition of `u32`. This is a pretty impactful change because it also changes the cranelift semantics of "dynamic" heaps where the bound global value specifier must now match the pointer type for the platform rather than the index type for the heap. The motivation for this change is that the `current_length` field (or bound for the heap) is intended to reflect the current size of the heap. This is bound by `usize` on the host platform rather than `u32` or` u64`. The previous choice of `u32` couldn't represent a 4GB memory because we couldn't put a number representing 4GB into the `current_length` field. By using `usize`, which reflects the host's memory allocation, this should better reflect the size of the heap and allows Wasmtime to support a full 4GB heap for a wasm program (instead of 4GB minus one page). This commit also updates the legalization of the `heap_addr` clif instruction to appropriately cast the address to the platform's pointer type, handling bounds checks along the way. The practical impact for today's targets is that a `uextend` is happening sooner than it happened before, but otherwise there is no intended impact of this change. In the future when 64-bit memories are supported there will likely need to be fancier logic which handles offsets a bit differently (especially in the case of a 64-bit memory on a 32-bit host). The clif `filetest` changes should show the differences in codegen, and the Wasmtime changes are largely removing casts here and there. Closes #3022 * Add tests for memory.size at maximum memory size * Add a dfg helper method
46 lines
1.2 KiB
Plaintext
46 lines
1.2 KiB
Plaintext
test verifier
|
|
target x86_64
|
|
|
|
function %heap_base_type(i64 vmctx) {
|
|
gv0 = vmctx
|
|
gv1 = load.i32 notrap aligned gv0
|
|
heap0 = static gv1, offset_guard 0x1000, bound 0x1_0000, index_type i32 ; error: heap base has type i32, which is not the pointer type i64
|
|
|
|
block0(v0: i64):
|
|
return
|
|
}
|
|
|
|
function %invalid_base(i64 vmctx) {
|
|
gv0 = vmctx
|
|
heap0 = dynamic gv1, bound gv0, offset_guard 0x1000, index_type i64 ; error: invalid base global value gv1
|
|
|
|
block0(v0: i64):
|
|
return
|
|
}
|
|
|
|
function %invalid_bound(i64 vmctx) {
|
|
gv0 = vmctx
|
|
heap0 = dynamic gv0, bound gv1, offset_guard 0x1000, index_type i64 ; error: invalid bound global value gv1
|
|
|
|
block0(v0: i64):
|
|
return
|
|
}
|
|
|
|
function %heap_bound_type(i64 vmctx) {
|
|
gv0 = vmctx
|
|
gv1 = load.i16 notrap aligned gv0
|
|
heap0 = dynamic gv0, bound gv1, offset_guard 0x1000, index_type i32 ; error: heap pointer type i64 differs from the type of its bound, i16
|
|
|
|
block0(v0: i64):
|
|
return
|
|
}
|
|
|
|
function %heap_addr_index_type(i64 vmctx, i64) {
|
|
gv0 = vmctx
|
|
heap0 = static gv0, offset_guard 0x1000, bound 0x1_0000, index_type i32
|
|
|
|
block0(v0: i64, v1: i64):
|
|
v2 = heap_addr.i64 heap0, v1, 0; error: index type i64 differs from heap index type i32
|
|
return
|
|
}
|