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

Add a type parameter to VMOffsets for pointer size (#3020)

Browse Source 
* Add a type parameter to `VMOffsets` for pointer size

This commit adds a type parameter to `VMOffsets` representing the
pointer size to improve computations in `wasmtime-runtime` which always
use a constant value of the host's pointer size. The type parameter is
`u8` for `wasmtime-cranelift`'s use case where cross-compilation may be
involved.

* fix lightbeam
This commit is contained in:
Alex Crichton
2021-07-13 09:52:27 -05:00
committed by GitHub
parent 75e5219792
commit 992d85ae8b
7 changed files with 111 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/runtime/src/externref.rs
View File

@@ -965,8 +965,20 @@ mod tests {
let actual_offset = (ref_count_ptr as usize) - (extern_data_ptr as usize);
let offsets = wasmtime_environ::VMOffsets::from(wasmtime_environ::VMOffsetsFields {
ptr: 8,
num_signature_ids: 0,
num_imported_functions: 0,
num_imported_tables: 0,
num_imported_memories: 0,
num_imported_globals: 0,
num_defined_functions: 0,
num_defined_tables: 0,
num_defined_memories: 0,
num_defined_globals: 0,
});
assert_eq!(
wasmtime_environ::VMOffsets::vm_extern_data_ref_count(),
offsets.vm_extern_data_ref_count(),
actual_offset.try_into().unwrap(),
);
}
@@ -981,7 +993,7 @@ mod tests {
let actual_offset = (next_ptr as usize) - (table_ptr as usize);
let offsets = wasmtime_environ::VMOffsets::from(wasmtime_environ::VMOffsetsFields {
pointer_size: 8,
ptr: 8,
num_signature_ids: 0,
num_imported_functions: 0,
num_imported_tables: 0,
@@ -1008,7 +1020,7 @@ mod tests {
let actual_offset = (end_ptr as usize) - (table_ptr as usize);
let offsets = wasmtime_environ::VMOffsets::from(wasmtime_environ::VMOffsetsFields {
pointer_size: 8,
ptr: 8,
num_signature_ids: 0,
num_imported_functions: 0,
num_imported_tables: 0,