Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update for wasmtime <=18.0 #12

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

update for wasmtime <=18.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ semver = { version = "1.0.20", default-features = false }
serde = { version = "1.0.193", optional = true, default-features = false, features = [ "derive", "rc" ] }
slab = { version = "0.4.9", default-features = false }
wasm_runtime_layer = { version = ">=0.2.0", default-features = false }
wasmtime-environ = { version = ">=18.0.1", features = [ "component-model" ] }
wasmtime-environ = { version = "<=18.0", features = [ "component-model" ] }
wit-component = { version = ">=0.19.0", default-features = false }
wit-parser = { version = ">=0.13.0", default-features = false }

Expand All @@ -28,4 +28,4 @@ serde = [ "dep:serde", "semver/serde" ]

[dev-dependencies]
wasmi = "0.31.1"
wasm_runtime_layer = { version = "0.2.0", features = [ "backend_wasmi" ] }
wasm_runtime_layer = { version = "0.2.0", features = [ "backend_wasmi" ] }
78 changes: 57 additions & 21 deletions src/abi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,41 @@ fn join(a: WasmType, b: WasmType) -> WasmType {
use WasmType::*;

match (a, b) {
(I32, I32) | (I64, I64) | (F32, F32) | (F64, F64) => a,
(I32, I32)
| (I64, I64)
| (F32, F32)
| (F64, F64)
| (Pointer, Pointer)
| (PointerOrI64, PointerOrI64)
| (Length, Length) => a,

(I32, F32) | (F32, I32) => I32,

// A length is at least an `i32`, maybe more, so it wins over
// 32-bit types.
(Length, I32 | F32) => Length,
(I32 | F32, Length) => Length,

// A length might be an `i64`, but might not be, so if we have
// 64-bit types, they win.
(Length, I64 | F64) => I64,
(I64 | F64, Length) => I64,

// Pointers have provenance and are at least an `i32`, so they
// win over 32-bit and length types.
(Pointer, I32 | F32 | Length) => Pointer,
(I32 | F32 | Length, Pointer) => Pointer,

// If we need 64 bits and provenance, we need to use the special
// `PointerOrI64`.
(Pointer, I64 | F64) => PointerOrI64,
(I64 | F64, Pointer) => PointerOrI64,

// PointerOrI64 wins over everything.
(PointerOrI64, _) => PointerOrI64,
(_, PointerOrI64) => PointerOrI64,

// Otherwise, `i64` wins.
(_, I64 | F64) | (I64 | F64, _) => I64,
}
}
Expand Down Expand Up @@ -782,8 +813,8 @@ impl<'a, B: Bindgen> Generator<'a, B> {
Type::S64 => self.emit(&I64FromS64),
Type::U64 => self.emit(&I64FromU64),
Type::Char => self.emit(&I32FromChar),
Type::Float32 => self.emit(&F32FromFloat32),
Type::Float64 => self.emit(&F64FromFloat64),
Type::F32 => self.emit(&F32FromFloat32),
Type::F64 => self.emit(&F64FromFloat64),
Type::String => {
let realloc = self.list_realloc();
self.emit(&StringLower { realloc })
Expand Down Expand Up @@ -958,8 +989,8 @@ impl<'a, B: Bindgen> Generator<'a, B> {
Type::S64 => self.emit(&S64FromI64),
Type::U64 => self.emit(&U64FromI64),
Type::Char => self.emit(&CharFromI32),
Type::Float32 => self.emit(&Float32FromF32),
Type::Float64 => self.emit(&Float64FromF64),
Type::F32 => self.emit(&Float32FromF32),
Type::F64 => self.emit(&Float64FromF64),
Type::String => self.emit(&StringLift),
Type::Id(id) => match &self.resolve.types[id].kind {
TypeDefKind::Type(t) => self.lift(t),
Expand Down Expand Up @@ -1153,8 +1184,8 @@ impl<'a, B: Bindgen> Generator<'a, B> {
self.lower_and_emit(ty, addr, &I32Store { offset })
}
Type::U64 | Type::S64 => self.lower_and_emit(ty, addr, &I64Store { offset }),
Type::Float32 => self.lower_and_emit(ty, addr, &F32Store { offset }),
Type::Float64 => self.lower_and_emit(ty, addr, &F64Store { offset }),
Type::F32 => self.lower_and_emit(ty, addr, &F32Store { offset }),
Type::F64 => self.lower_and_emit(ty, addr, &F64Store { offset }),
Type::String => self.write_list_to_memory(ty, addr, offset),

Type::Id(id) => match &self.resolve.types[id].kind {
Expand Down Expand Up @@ -1340,8 +1371,8 @@ impl<'a, B: Bindgen> Generator<'a, B> {
Type::S16 => self.emit_and_lift(ty, addr, &I32Load16S { offset }),
Type::U32 | Type::S32 | Type::Char => self.emit_and_lift(ty, addr, &I32Load { offset }),
Type::U64 | Type::S64 => self.emit_and_lift(ty, addr, &I64Load { offset }),
Type::Float32 => self.emit_and_lift(ty, addr, &F32Load { offset }),
Type::Float64 => self.emit_and_lift(ty, addr, &F64Load { offset }),
Type::F32 => self.emit_and_lift(ty, addr, &F32Load { offset }),
Type::F64 => self.emit_and_lift(ty, addr, &F64Load { offset }),
Type::String => self.read_list_from_memory(ty, addr, offset),

Type::Id(id) => match &self.resolve.types[id].kind {
Expand Down Expand Up @@ -1555,20 +1586,25 @@ fn cast(from: WasmType, to: WasmType) -> Bitcast {
use WasmType::*;

match (from, to) {
(I32, I32) | (I64, I64) | (F32, F32) | (F64, F64) => Bitcast::None,
(I32 | Pointer | Length, I32 | Pointer | Length)
| (I64 | PointerOrI64, I64 | PointerOrI64)
| (F32, F32)
| (F64, F64) => Bitcast::None,

(I32, I64) => Bitcast::I32ToI64,
(F32, I32) => Bitcast::F32ToI32,
(F64, I64) => Bitcast::F64ToI64,
(I32 | Pointer | Length, I64 | PointerOrI64) => Bitcast::I32ToI64,
(F32, I32 | Pointer | Length) => Bitcast::F32ToI32,
(F64, I64 | PointerOrI64) => Bitcast::F64ToI64,

(I64, I32) => Bitcast::I64ToI32,
(I32, F32) => Bitcast::I32ToF32,
(I64, F64) => Bitcast::I64ToF64,
(I64 | PointerOrI64, I32 | Pointer | Length) => Bitcast::I64ToI32,
(I32 | Pointer | Length, F32) => Bitcast::I32ToF32,
(I64 | PointerOrI64, F64) => Bitcast::I64ToF64,

(F32, I64) => Bitcast::F32ToI64,
(I64, F32) => Bitcast::I64ToF32,
(F32, I64 | PointerOrI64) => Bitcast::F32ToI64,
(I64 | PointerOrI64, F32) => Bitcast::I64ToF32,

(F32, F64) | (F64, F32) | (F64, I32) | (I32, F64) => unreachable!(),
(F32, F64) | (F64, F32) | (F64, I32 | Pointer | Length) | (I32 | Pointer | Length, F64) => {
unreachable!()
}
}
}

Expand All @@ -1585,8 +1621,8 @@ fn push_wasm(resolve: &Resolve, variant: AbiVariant, ty: &Type, result: &mut Vec
| Type::Char => result.push(WasmType::I32),

Type::U64 | Type::S64 => result.push(WasmType::I64),
Type::Float32 => result.push(WasmType::F32),
Type::Float64 => result.push(WasmType::F64),
Type::F32 => result.push(WasmType::F32),
Type::F64 => result.push(WasmType::F64),
Type::String => {
result.push(WasmType::I32);
result.push(WasmType::I32);
Expand Down
18 changes: 10 additions & 8 deletions src/func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,10 @@ impl<'a, C: AsContextMut> Bindgen for FuncBindgen<'a, C> {
Instruction::ConstZero { tys } => {
for t in tys.iter() {
match t {
WasmType::I32 => results.push(Value::S32(0)),
WasmType::I64 => results.push(Value::S64(0)),
WasmType::I32 | WasmType::Pointer | WasmType::Length => {
results.push(Value::S32(0))
}
WasmType::I64 | WasmType::PointerOrI64 => results.push(Value::S64(0)),
WasmType::F32 => results.push(Value::F32(0.0)),
WasmType::F64 => results.push(Value::F64(0.0)),
}
Expand Down Expand Up @@ -712,8 +714,8 @@ impl<'a, C: AsContextMut> Bindgen for FuncBindgen<'a, C> {
Type::S16 => self.store_array(ptr as usize, list.typed::<i16>()?)?,
Type::S32 => self.store_array(ptr as usize, list.typed::<i32>()?)?,
Type::S64 => self.store_array(ptr as usize, list.typed::<i64>()?)?,
Type::Float32 => self.store_array(ptr as usize, list.typed::<f32>()?)?,
Type::Float64 => self.store_array(ptr as usize, list.typed::<f64>()?)?,
Type::F32 => self.store_array(ptr as usize, list.typed::<f32>()?)?,
Type::F64 => self.store_array(ptr as usize, list.typed::<f64>()?)?,
_ => unreachable!(),
}

Expand Down Expand Up @@ -796,8 +798,8 @@ impl<'a, C: AsContextMut> Bindgen for FuncBindgen<'a, C> {
Type::S16 => self.load_array::<i16>(ptr as usize, len as usize)?.into(),
Type::S32 => self.load_array::<i32>(ptr as usize, len as usize)?.into(),
Type::S64 => self.load_array::<i64>(ptr as usize, len as usize)?.into(),
Type::Float32 => self.load_array::<f32>(ptr as usize, len as usize)?.into(),
Type::Float64 => self.load_array::<f64>(ptr as usize, len as usize)?.into(),
Type::F32 => self.load_array::<f32>(ptr as usize, len as usize)?.into(),
Type::F64 => self.load_array::<f64>(ptr as usize, len as usize)?.into(),
_ => unreachable!(),
}));
}
Expand Down Expand Up @@ -1188,8 +1190,8 @@ impl<'a, C: AsContextMut> Bindgen for FuncBindgen<'a, C> {
Type::S16 => LITTLE_ENDIAN,
Type::S32 => LITTLE_ENDIAN,
Type::S64 => LITTLE_ENDIAN,
Type::Float32 => LITTLE_ENDIAN,
Type::Float64 => LITTLE_ENDIAN,
Type::F32 => LITTLE_ENDIAN,
Type::F64 => LITTLE_ENDIAN,
Type::Char => false,
Type::String => false,
Type::Id(_) => false,
Expand Down
4 changes: 2 additions & 2 deletions src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ impl ValueType {
wit_parser::Type::S16 => Self::S16,
wit_parser::Type::S32 => Self::S32,
wit_parser::Type::S64 => Self::S64,
wit_parser::Type::Float32 => Self::F32,
wit_parser::Type::Float64 => Self::F64,
wit_parser::Type::F32 => Self::F32,
wit_parser::Type::F64 => Self::F64,
wit_parser::Type::Char => Self::Char,
wit_parser::Type::String => Self::String,
wit_parser::Type::Id(x) => Self::from_component_typedef(*x, component, resource_map)?,
Expand Down