mirror of
https://github.com/fluencelabs/wasmer
synced 2025-07-31 23:32:04 +00:00
Merge branch 'master' into fix-runtime-c-api-header-preprocessor-clang
This commit is contained in:
Ivan Enderlin
GitHub
7
Cargo.lock
generated
7
Cargo.lock
generated
@@ -417,11 +417,6 @@ dependencies = [
|
||||
"synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "field-offset"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "fuchsia-cprng"
|
||||
version = "0.1.1"
|
||||
@@ -1529,7 +1524,6 @@ dependencies = [
|
||||
"cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"field-offset 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1714,7 +1708,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
|
||||
"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
|
||||
"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
|
||||
"checksum field-offset 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64e9bc339e426139e02601fa69d101e96a92aee71b58bc01697ec2a63a5c9e68"
|
||||
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
|
||||
"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
|
||||
"checksum generational-arena 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fd04ad33021a0409d3f1afbfb89d9f02c10caee73c28f5ac197474dd53e7cf7c"
|
||||
|
||||
@@ -42,9 +42,6 @@ version = "0.8"
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
winapi = { version = "0.3", features = ["memoryapi"] }
|
||||
|
||||
[dev-dependencies]
|
||||
field-offset = "0.1"
|
||||
|
||||
[build-dependencies]
|
||||
blake2b_simd = "0.5"
|
||||
rustc_version = "0.2"
|
||||
|
||||
@@ -26,10 +26,6 @@
|
||||
#![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")]
|
||||
#![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")]
|
||||
|
||||
#[cfg(test)]
|
||||
#[macro_use]
|
||||
extern crate field_offset;
|
||||
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
|
||||
@@ -754,78 +754,136 @@ mod vm_offset_tests {
|
||||
Anyfunc, Ctx, FuncCtx, ImportedFunc, InternalCtx, LocalGlobal, LocalMemory, LocalTable,
|
||||
};
|
||||
|
||||
// Inspired by https://internals.rust-lang.org/t/discussion-on-offset-of/7440/2.
|
||||
macro_rules! offset_of {
|
||||
($struct:path, $field:ident) => {{
|
||||
fn offset() -> usize {
|
||||
use std::mem;
|
||||
|
||||
let structure = mem::MaybeUninit::<$struct>::uninit();
|
||||
|
||||
let &$struct {
|
||||
$field: ref field, ..
|
||||
} = unsafe { &*structure.as_ptr() };
|
||||
|
||||
let offset =
|
||||
(field as *const _ as usize).wrapping_sub(&structure as *const _ as usize);
|
||||
|
||||
assert!((0..=mem::size_of_val(&structure)).contains(&offset));
|
||||
|
||||
offset
|
||||
}
|
||||
|
||||
offset()
|
||||
}};
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn offset_of() {
|
||||
use std::{mem, ptr::NonNull};
|
||||
|
||||
struct S0;
|
||||
|
||||
#[repr(C)]
|
||||
struct S1 {
|
||||
f1: u8,
|
||||
f2: u16,
|
||||
f3: u32,
|
||||
f4: u64,
|
||||
f5: u128,
|
||||
f6: f32,
|
||||
f7: f64,
|
||||
f8: NonNull<S0>,
|
||||
f9: Option<NonNull<S0>>,
|
||||
f10: *mut S0,
|
||||
z: u8,
|
||||
}
|
||||
|
||||
assert_eq!(offset_of!(S1, f1), 0);
|
||||
assert_eq!(offset_of!(S1, f2), 2);
|
||||
assert_eq!(offset_of!(S1, f3), 4);
|
||||
assert_eq!(offset_of!(S1, f4), 8);
|
||||
assert_eq!(offset_of!(S1, f5), 16);
|
||||
assert_eq!(offset_of!(S1, f6), 32);
|
||||
assert_eq!(offset_of!(S1, f7), 40);
|
||||
assert_eq!(offset_of!(S1, f8), 40 + mem::size_of::<usize>());
|
||||
assert_eq!(offset_of!(S1, f9), 48 + mem::size_of::<usize>());
|
||||
assert_eq!(offset_of!(S1, f10), 56 + mem::size_of::<usize>());
|
||||
assert_eq!(offset_of!(S1, z), 64 + mem::size_of::<usize>());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn vmctx() {
|
||||
assert_eq!(0usize, offset_of!(Ctx => internal).get_byte_offset(),);
|
||||
assert_eq!(0usize, offset_of!(Ctx, internal));
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_memories() as usize,
|
||||
offset_of!(InternalCtx => memories).get_byte_offset(),
|
||||
offset_of!(InternalCtx, memories),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_tables() as usize,
|
||||
offset_of!(InternalCtx => tables).get_byte_offset(),
|
||||
offset_of!(InternalCtx, tables),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_globals() as usize,
|
||||
offset_of!(InternalCtx => globals).get_byte_offset(),
|
||||
offset_of!(InternalCtx, globals),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_imported_memories() as usize,
|
||||
offset_of!(InternalCtx => imported_memories).get_byte_offset(),
|
||||
offset_of!(InternalCtx, imported_memories),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_imported_tables() as usize,
|
||||
offset_of!(InternalCtx => imported_tables).get_byte_offset(),
|
||||
offset_of!(InternalCtx, imported_tables),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_imported_globals() as usize,
|
||||
offset_of!(InternalCtx => imported_globals).get_byte_offset(),
|
||||
offset_of!(InternalCtx, imported_globals),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_imported_funcs() as usize,
|
||||
offset_of!(InternalCtx => imported_funcs).get_byte_offset(),
|
||||
offset_of!(InternalCtx, imported_funcs),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_intrinsics() as usize,
|
||||
offset_of!(InternalCtx => intrinsics).get_byte_offset(),
|
||||
offset_of!(InternalCtx, intrinsics),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_stack_lower_bound() as usize,
|
||||
offset_of!(InternalCtx => stack_lower_bound).get_byte_offset(),
|
||||
offset_of!(InternalCtx, stack_lower_bound),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_memory_base() as usize,
|
||||
offset_of!(InternalCtx => memory_base).get_byte_offset(),
|
||||
offset_of!(InternalCtx, memory_base),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_memory_bound() as usize,
|
||||
offset_of!(InternalCtx => memory_bound).get_byte_offset(),
|
||||
offset_of!(InternalCtx, memory_bound),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_internals() as usize,
|
||||
offset_of!(InternalCtx => internals).get_byte_offset(),
|
||||
offset_of!(InternalCtx, internals),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_interrupt_signal_mem() as usize,
|
||||
offset_of!(InternalCtx => interrupt_signal_mem).get_byte_offset(),
|
||||
offset_of!(InternalCtx, interrupt_signal_mem),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
Ctx::offset_local_functions() as usize,
|
||||
offset_of!(Ctx => local_functions).get_byte_offset(),
|
||||
offset_of!(Ctx, local_functions),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -838,21 +896,27 @@ mod vm_offset_tests {
|
||||
|
||||
#[test]
|
||||
fn imported_func() {
|
||||
assert_eq!(ImportedFunc::offset_func() as usize, 0);
|
||||
assert_eq!(
|
||||
ImportedFunc::offset_func() as usize,
|
||||
offset_of!(ImportedFunc, func),
|
||||
);
|
||||
|
||||
assert_eq!(ImportedFunc::offset_func_ctx() as usize, 8);
|
||||
assert_eq!(
|
||||
ImportedFunc::offset_func_ctx() as usize,
|
||||
offset_of!(ImportedFunc, func_ctx),
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn local_table() {
|
||||
assert_eq!(
|
||||
LocalTable::offset_base() as usize,
|
||||
offset_of!(LocalTable => base).get_byte_offset(),
|
||||
offset_of!(LocalTable, base),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
LocalTable::offset_count() as usize,
|
||||
offset_of!(LocalTable => count).get_byte_offset(),
|
||||
offset_of!(LocalTable, count),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -860,12 +924,12 @@ mod vm_offset_tests {
|
||||
fn local_memory() {
|
||||
assert_eq!(
|
||||
LocalMemory::offset_base() as usize,
|
||||
offset_of!(LocalMemory => base).get_byte_offset(),
|
||||
offset_of!(LocalMemory, base),
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
LocalMemory::offset_bound() as usize,
|
||||
offset_of!(LocalMemory => bound).get_byte_offset(),
|
||||
offset_of!(LocalMemory, bound),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -873,25 +937,19 @@ mod vm_offset_tests {
|
||||
fn local_global() {
|
||||
assert_eq!(
|
||||
LocalGlobal::offset_data() as usize,
|
||||
offset_of!(LocalGlobal => data).get_byte_offset(),
|
||||
offset_of!(LocalGlobal, data),
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cc_anyfunc() {
|
||||
assert_eq!(
|
||||
Anyfunc::offset_func() as usize,
|
||||
offset_of!(Anyfunc => func).get_byte_offset(),
|
||||
);
|
||||
assert_eq!(Anyfunc::offset_func() as usize, offset_of!(Anyfunc, func),);
|
||||
|
||||
assert_eq!(
|
||||
Anyfunc::offset_vmctx() as usize,
|
||||
offset_of!(Anyfunc => ctx).get_byte_offset(),
|
||||
);
|
||||
assert_eq!(Anyfunc::offset_vmctx() as usize, offset_of!(Anyfunc, ctx),);
|
||||
|
||||
assert_eq!(
|
||||
Anyfunc::offset_sig_id() as usize,
|
||||
offset_of!(Anyfunc => sig_id).get_byte_offset(),
|
||||
offset_of!(Anyfunc, sig_id),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user