summaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/parser/src/conversion.rs5
-rw-r--r--crates/tinywasm/Cargo.toml1
-rw-r--r--crates/tinywasm/src/instance.rs7
-rw-r--r--crates/tinywasm/src/module.rs2
-rw-r--r--crates/tinywasm/src/runtime/executor/macros.rs30
-rw-r--r--crates/tinywasm/src/runtime/executor/mod.rs50
-rw-r--r--crates/tinywasm/src/store.rs4
-rw-r--r--crates/tinywasm/tests/generated/mvp.csv2
-rw-r--r--crates/tinywasm/tests/generated/progress-mvp.svg8
-rw-r--r--crates/tinywasm/tests/test-wast.rs4
-rw-r--r--crates/tinywasm/tests/testsuite/mod.rs14
-rw-r--r--crates/tinywasm/tests/testsuite/run.rs76
-rw-r--r--crates/types/src/instructions.rs4
-rw-r--r--crates/types/src/lib.rs11
14 files changed, 166 insertions, 52 deletions
diff --git a/crates/parser/src/conversion.rs b/crates/parser/src/conversion.rs
index 2c78e67..4053740 100644
--- a/crates/parser/src/conversion.rs
+++ b/crates/parser/src/conversion.rs
@@ -407,7 +407,8 @@ pub fn process_operators<'a>(
..
} => Instruction::CallIndirect(type_index, table_index),
Drop => Instruction::Drop,
- Select => Instruction::Select,
+ Select => Instruction::Select(None),
+ TypedSelect { ty } => Instruction::Select(Some(convert_valtype(&ty))),
LocalGet { local_index } => Instruction::LocalGet(local_index),
LocalSet { local_index } => Instruction::LocalSet(local_index),
LocalTee { local_index } => Instruction::LocalTee(local_index),
@@ -547,6 +548,8 @@ pub fn process_operators<'a>(
I32TruncF64U => Instruction::I32TruncF64U,
I64ExtendI32S => Instruction::I64ExtendI32S,
I64ExtendI32U => Instruction::I64ExtendI32U,
+ I32Extend8S => Instruction::I32Extend8S,
+ I32Extend16S => Instruction::I32Extend16S,
I64TruncF32S => Instruction::I64TruncF32S,
I64TruncF32U => Instruction::I64TruncF32U,
I64TruncF64S => Instruction::I64TruncF64S,
diff --git a/crates/tinywasm/Cargo.toml b/crates/tinywasm/Cargo.toml
index 86b65eb..a566db3 100644
--- a/crates/tinywasm/Cargo.toml
+++ b/crates/tinywasm/Cargo.toml
@@ -25,6 +25,7 @@ eyre={version="0.6"}
serde_json={version="1.0"}
serde={version="1.0", features=["derive"]}
plotters={version="0.3"}
+pretty_env_logger="0.5"
[features]
default=["std", "parser", "logging"]
diff --git a/crates/tinywasm/src/instance.rs b/crates/tinywasm/src/instance.rs
index 5e87e74..2fa9cf3 100644
--- a/crates/tinywasm/src/instance.rs
+++ b/crates/tinywasm/src/instance.rs
@@ -65,9 +65,16 @@ impl ModuleInstance {
}
let export = self.0.exports.get(name, ExternalKind::Func)?;
+ log::debug!("get_func: export: {:?}", export);
+
+ log::debug!("{:?}", self.0.func_addrs);
let func_addr = self.0.func_addrs[export.index as usize];
+ log::debug!("get_func: func index: {}", export.index);
let func = store.get_func(func_addr as usize)?;
+ log::debug!("get_func: func_addr: {}, func: {:?}", func_addr, func);
let ty = self.0.types[func.ty_addr() as usize].clone();
+ log::debug!("get_func: ty: {:?}", ty);
+ log::debug!("types: {:?}", self.0.types);
Ok(FuncHandle {
addr: export.index,
diff --git a/crates/tinywasm/src/module.rs b/crates/tinywasm/src/module.rs
index 9580f9a..4f3575d 100644
--- a/crates/tinywasm/src/module.rs
+++ b/crates/tinywasm/src/module.rs
@@ -59,8 +59,8 @@ impl Module {
// imports: Option<()>,
) -> Result<ModuleInstance> {
let idx = store.next_module_instance_idx();
-
let func_addrs = store.add_funcs(self.data.funcs.into(), idx);
+
let instance = ModuleInstance::new(
self.data.func_types,
self.data.start_func,
diff --git a/crates/tinywasm/src/runtime/executor/macros.rs b/crates/tinywasm/src/runtime/executor/macros.rs
index 5a9a570..9d7b01f 100644
--- a/crates/tinywasm/src/runtime/executor/macros.rs
+++ b/crates/tinywasm/src/runtime/executor/macros.rs
@@ -51,7 +51,7 @@ macro_rules! comp_zero {
}
/// Apply an arithmetic operation to two values on the stack
-macro_rules! arithmetic {
+macro_rules! arithmetic_op {
($op:tt, $ty:ty, $stack:ident) => {{
let [a, b] = $stack.values.pop_n_const::<2>()?;
let a: $ty = a.into();
@@ -60,19 +60,36 @@ macro_rules! arithmetic {
}};
}
+macro_rules! arithmetic_method {
+ ($op:ident, $ty:ty, $stack:ident) => {{
+ let [a, b] = $stack.values.pop_n_const::<2>()?;
+ let a: $ty = a.into();
+ let b: $ty = b.into();
+ let result = a.$op(b);
+ $stack.values.push(result.into());
+ }};
+}
+
/// Apply an arithmetic operation to two values on the stack
-macro_rules! checked_arithmetic {
+macro_rules! checked_arithmetic_method {
($op:ident, $ty:ty, $stack:ident, $trap:expr) => {{
let [a, b] = $stack.values.pop_n_const::<2>()?;
let a: $ty = a.into();
let b: $ty = b.into();
let result = a.$op(b).ok_or_else(|| Error::Trap($trap))?;
+ debug!(
+ "checked_arithmetic_method: {}, a: {}, b: {}, res: {}",
+ stringify!($op),
+ a,
+ b,
+ result
+ );
$stack.values.push(result.into());
}};
}
/// Apply an arithmetic operation to two values on the stack (cast to ty2 before operation)
-macro_rules! checked_arithmetic_cast {
+macro_rules! checked_arithmetic_method_cast {
($op:ident, $ty:ty, $ty2:ty, $stack:ident, $trap:expr) => {{
let [a, b] = $stack.values.pop_n_const::<2>()?;
let a: $ty = a.into();
@@ -87,9 +104,10 @@ macro_rules! checked_arithmetic_cast {
}};
}
-pub(super) use arithmetic;
-pub(super) use checked_arithmetic;
-pub(super) use checked_arithmetic_cast;
+pub(super) use arithmetic_method;
+pub(super) use arithmetic_op;
+pub(super) use checked_arithmetic_method;
+pub(super) use checked_arithmetic_method_cast;
pub(super) use comp;
pub(super) use comp_cast;
pub(super) use comp_zero;
diff --git a/crates/tinywasm/src/runtime/executor/mod.rs b/crates/tinywasm/src/runtime/executor/mod.rs
index 7f916f5..07cad44 100644
--- a/crates/tinywasm/src/runtime/executor/mod.rs
+++ b/crates/tinywasm/src/runtime/executor/mod.rs
@@ -85,7 +85,11 @@ fn exec_one(
Nop => { /* do nothing */ }
Unreachable => return Ok(ExecResult::Trap(crate::Trap::Unreachable)), // we don't need to include the call frame here because it's already on the stack
Drop => stack.values.pop().map(|_| ())?,
- Select => {
+ Select(t) => {
+ if t.is_some() {
+ unimplemented!("select with type");
+ }
+
let cond: i32 = stack.values.pop()?.into();
let val2 = stack.values.pop()?;
@@ -283,34 +287,34 @@ fn exec_one(
F32Gt => comp!(>, f32, stack),
F64Gt => comp!(>, f64, stack),
- I64Add => arithmetic!(+, i64, stack),
- I32Add => arithmetic!(+, i32, stack),
- F32Add => arithmetic!(+, f32, stack),
- F64Add => arithmetic!(+, f64, stack),
+ I64Add => arithmetic_method!(wrapping_add, i64, stack),
+ I32Add => arithmetic_method!(wrapping_add, i32, stack),
+ F32Add => arithmetic_op!(+, f32, stack),
+ F64Add => arithmetic_op!(+, f64, stack),
- I32Sub => arithmetic!(-, i32, stack),
- I64Sub => arithmetic!(-, i64, stack),
- F32Sub => arithmetic!(-, f32, stack),
- F64Sub => arithmetic!(-, f64, stack),
+ I32Sub => arithmetic_method!(wrapping_sub, i32, stack),
+ I64Sub => arithmetic_method!(wrapping_sub, i64, stack),
+ F32Sub => arithmetic_op!(-, f32, stack),
+ F64Sub => arithmetic_op!(-, f64, stack),
- F32Div => arithmetic!(/, f32, stack),
- F64Div => arithmetic!(/, f64, stack),
+ F32Div => arithmetic_op!(/, f32, stack),
+ F64Div => arithmetic_op!(/, f64, stack),
- I32Mul => arithmetic!(*, i32, stack),
- I64Mul => arithmetic!(*, i64, stack),
- F32Mul => arithmetic!(*, f32, stack),
- F64Mul => arithmetic!(*, f64, stack),
+ I32Mul => arithmetic_method!(wrapping_mul, i32, stack),
+ I64Mul => arithmetic_method!(wrapping_mul, i64, stack),
+ F32Mul => arithmetic_op!(*, f32, stack),
+ F64Mul => arithmetic_op!(*, f64, stack),
// these can trap
- I32DivS => checked_arithmetic!(checked_div, i32, stack, crate::Trap::DivisionByZero),
- I64DivS => checked_arithmetic!(checked_div, i64, stack, crate::Trap::DivisionByZero),
- I32DivU => checked_arithmetic_cast!(checked_div, i32, u32, stack, crate::Trap::DivisionByZero),
- I64DivU => checked_arithmetic_cast!(checked_div, i64, u64, stack, crate::Trap::DivisionByZero),
+ I32DivS => checked_arithmetic_method!(checked_div, i32, stack, crate::Trap::DivisionByZero),
+ I64DivS => checked_arithmetic_method!(checked_div, i64, stack, crate::Trap::DivisionByZero),
+ I32DivU => checked_arithmetic_method_cast!(checked_div, i32, u32, stack, crate::Trap::DivisionByZero),
+ I64DivU => checked_arithmetic_method_cast!(checked_div, i64, u64, stack, crate::Trap::DivisionByZero),
- I32RemS => checked_arithmetic!(checked_rem, i32, stack, crate::Trap::DivisionByZero),
- I64RemS => checked_arithmetic!(checked_rem, i64, stack, crate::Trap::DivisionByZero),
- I32RemU => checked_arithmetic_cast!(checked_rem, i32, u32, stack, crate::Trap::DivisionByZero),
- I64RemU => checked_arithmetic_cast!(checked_rem, i64, u64, stack, crate::Trap::DivisionByZero),
+ I32RemS => checked_arithmetic_method!(checked_rem, i32, stack, crate::Trap::DivisionByZero),
+ I64RemS => checked_arithmetic_method!(checked_rem, i64, stack, crate::Trap::DivisionByZero),
+ I32RemU => checked_arithmetic_method_cast!(checked_rem, i32, u32, stack, crate::Trap::DivisionByZero),
+ I64RemU => checked_arithmetic_method_cast!(checked_rem, i64, u64, stack, crate::Trap::DivisionByZero),
F32ConvertI32S => conv_1!(i32, f32, stack),
F32ConvertI64S => conv_1!(i64, f32, stack),
diff --git a/crates/tinywasm/src/store.rs b/crates/tinywasm/src/store.rs
index 1a9d968..ff44d0d 100644
--- a/crates/tinywasm/src/store.rs
+++ b/crates/tinywasm/src/store.rs
@@ -126,12 +126,12 @@ impl Store {
pub(crate) fn add_funcs(&mut self, funcs: Vec<Function>, idx: ModuleInstanceAddr) -> Vec<FuncAddr> {
let mut func_addrs = Vec::with_capacity(funcs.len());
- for func in funcs.into_iter() {
+ for (i, func) in funcs.into_iter().enumerate() {
self.data.funcs.push(Rc::new(FunctionInstance {
func,
_module_instance: idx,
}));
- func_addrs.push(idx as FuncAddr);
+ func_addrs.push(i as FuncAddr);
}
func_addrs
}
diff --git a/crates/tinywasm/tests/generated/mvp.csv b/crates/tinywasm/tests/generated/mvp.csv
index 0ba833a..7c144af 100644
--- a/crates/tinywasm/tests/generated/mvp.csv
+++ b/crates/tinywasm/tests/generated/mvp.csv
@@ -1,4 +1,4 @@
0.0.3,9258,7567,[{"name":"address.wast","passed":0,"failed":54},{"name":"align.wast","passed":0,"failed":109},{"name":"binary-leb128.wast","passed":66,"failed":25},{"name":"binary.wast","passed":104,"failed":8},{"name":"block.wast","passed":0,"failed":171},{"name":"br.wast","passed":0,"failed":21},{"name":"br_if.wast","passed":0,"failed":30},{"name":"br_table.wast","passed":0,"failed":25},{"name":"call.wast","passed":0,"failed":22},{"name":"call_indirect.wast","passed":0,"failed":56},{"name":"comments.wast","passed":4,"failed":4},{"name":"const.wast","passed":702,"failed":76},{"name":"conversions.wast","passed":0,"failed":93},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":0,"failed":61},{"name":"elem.wast","passed":0,"failed":76},{"name":"endianness.wast","passed":0,"failed":1},{"name":"exports.wast","passed":21,"failed":73},{"name":"f32.wast","passed":1005,"failed":1509},{"name":"f32_bitwise.wast","passed":1,"failed":363},{"name":"f32_cmp.wast","passed":2401,"failed":6},{"name":"f64.wast","passed":1005,"failed":1509},{"name":"f64_bitwise.wast","passed":1,"failed":363},{"name":"f64_cmp.wast","passed":2401,"failed":6},{"name":"fac.wast","passed":0,"failed":2},{"name":"float_exprs.wast","passed":269,"failed":591},{"name":"float_literals.wast","passed":34,"failed":129},{"name":"float_memory.wast","passed":0,"failed":6},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":4,"failed":75},{"name":"func_ptrs.wast","passed":0,"failed":16},{"name":"global.wast","passed":4,"failed":49},{"name":"i32.wast","passed":0,"failed":96},{"name":"i64.wast","passed":0,"failed":42},{"name":"if.wast","passed":0,"failed":118},{"name":"imports.wast","passed":1,"failed":156},{"name":"inline-module.wast","passed":0,"failed":1},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":5,"failed":46},{"name":"labels.wast","passed":1,"failed":28},{"name":"left-to-right.wast","passed":0,"failed":1},{"name":"linking.wast","passed":1,"failed":66},{"name":"load.wast","passed":0,"failed":60},{"name":"local_get.wast","passed":2,"failed":34},{"name":"local_set.wast","passed":5,"failed":48},{"name":"local_tee.wast","passed":0,"failed":42},{"name":"loop.wast","passed":0,"failed":43},{"name":"memory.wast","passed":0,"failed":34},{"name":"memory_grow.wast","passed":0,"failed":19},{"name":"memory_redundancy.wast","passed":0,"failed":1},{"name":"memory_size.wast","passed":0,"failed":6},{"name":"memory_trap.wast","passed":0,"failed":172},{"name":"names.wast","passed":484,"failed":1},{"name":"nop.wast","passed":0,"failed":5},{"name":"return.wast","passed":0,"failed":21},{"name":"select.wast","passed":0,"failed":32},{"name":"skip-stack-guard-page.wast","passed":0,"failed":11},{"name":"stack.wast","passed":0,"failed":2},{"name":"start.wast","passed":0,"failed":10},{"name":"store.wast","passed":0,"failed":59},{"name":"switch.wast","passed":1,"failed":27},{"name":"token.wast","passed":16,"failed":42},{"name":"traps.wast","passed":3,"failed":33},{"name":"type.wast","passed":1,"failed":2},{"name":"unreachable.wast","passed":0,"failed":59},{"name":"unreached-invalid.wast","passed":0,"failed":118},{"name":"unwind.wast","passed":1,"failed":49},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":0,"failed":176}]
0.0.4,9258,10909,[{"name":"address.wast","passed":0,"failed":54},{"name":"align.wast","passed":0,"failed":109},{"name":"binary-leb128.wast","passed":66,"failed":25},{"name":"binary.wast","passed":104,"failed":8},{"name":"block.wast","passed":0,"failed":171},{"name":"br.wast","passed":0,"failed":21},{"name":"br_if.wast","passed":0,"failed":30},{"name":"br_table.wast","passed":0,"failed":25},{"name":"call.wast","passed":0,"failed":22},{"name":"call_indirect.wast","passed":0,"failed":56},{"name":"comments.wast","passed":4,"failed":4},{"name":"const.wast","passed":702,"failed":76},{"name":"conversions.wast","passed":0,"failed":93},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":0,"failed":61},{"name":"elem.wast","passed":0,"failed":76},{"name":"endianness.wast","passed":0,"failed":1},{"name":"exports.wast","passed":21,"failed":73},{"name":"f32.wast","passed":1005,"failed":1509},{"name":"f32_bitwise.wast","passed":1,"failed":363},{"name":"f32_cmp.wast","passed":2401,"failed":6},{"name":"f64.wast","passed":1005,"failed":1509},{"name":"f64_bitwise.wast","passed":1,"failed":363},{"name":"f64_cmp.wast","passed":2401,"failed":6},{"name":"fac.wast","passed":0,"failed":2},{"name":"float_exprs.wast","passed":269,"failed":591},{"name":"float_literals.wast","passed":34,"failed":129},{"name":"float_memory.wast","passed":0,"failed":6},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":4,"failed":75},{"name":"func_ptrs.wast","passed":0,"failed":16},{"name":"global.wast","passed":4,"failed":49},{"name":"i32.wast","passed":0,"failed":96},{"name":"i64.wast","passed":0,"failed":42},{"name":"if.wast","passed":0,"failed":118},{"name":"imports.wast","passed":1,"failed":156},{"name":"inline-module.wast","passed":0,"failed":1},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":5,"failed":46},{"name":"labels.wast","passed":1,"failed":28},{"name":"left-to-right.wast","passed":0,"failed":1},{"name":"linking.wast","passed":1,"failed":66},{"name":"load.wast","passed":0,"failed":60},{"name":"local_get.wast","passed":2,"failed":34},{"name":"local_set.wast","passed":5,"failed":48},{"name":"local_tee.wast","passed":0,"failed":42},{"name":"loop.wast","passed":0,"failed":43},{"name":"memory.wast","passed":0,"failed":34},{"name":"memory_grow.wast","passed":0,"failed":19},{"name":"memory_redundancy.wast","passed":0,"failed":1},{"name":"memory_size.wast","passed":0,"failed":6},{"name":"memory_trap.wast","passed":0,"failed":172},{"name":"names.wast","passed":484,"failed":1},{"name":"nop.wast","passed":0,"failed":5},{"name":"return.wast","passed":0,"failed":21},{"name":"select.wast","passed":0,"failed":32},{"name":"skip-stack-guard-page.wast","passed":0,"failed":11},{"name":"stack.wast","passed":0,"failed":2},{"name":"start.wast","passed":0,"failed":10},{"name":"store.wast","passed":0,"failed":59},{"name":"switch.wast","passed":1,"failed":27},{"name":"token.wast","passed":16,"failed":42},{"name":"traps.wast","passed":3,"failed":33},{"name":"type.wast","passed":1,"failed":2},{"name":"unreachable.wast","passed":0,"failed":59},{"name":"unreached-invalid.wast","passed":0,"failed":118},{"name":"unwind.wast","passed":1,"failed":49},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":0,"failed":176}]
0.0.5,11135,9093,[{"name":"address.wast","passed":1,"failed":259},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":78,"failed":13},{"name":"binary.wast","passed":107,"failed":5},{"name":"block.wast","passed":170,"failed":53},{"name":"br.wast","passed":20,"failed":77},{"name":"br_if.wast","passed":29,"failed":89},{"name":"br_table.wast","passed":24,"failed":150},{"name":"call.wast","passed":18,"failed":73},{"name":"call_indirect.wast","passed":34,"failed":136},{"name":"comments.wast","passed":5,"failed":3},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":25,"failed":594},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":22,"failed":39},{"name":"elem.wast","passed":27,"failed":72},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":90,"failed":6},{"name":"f32.wast","passed":1018,"failed":1496},{"name":"f32_bitwise.wast","passed":4,"failed":360},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":1018,"failed":1496},{"name":"f64_bitwise.wast","passed":4,"failed":360},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":1,"failed":7},{"name":"float_exprs.wast","passed":275,"failed":625},{"name":"float_literals.wast","passed":112,"failed":51},{"name":"float_memory.wast","passed":0,"failed":90},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":81,"failed":91},{"name":"func_ptrs.wast","passed":7,"failed":29},{"name":"global.wast","passed":50,"failed":60},{"name":"i32.wast","passed":85,"failed":375},{"name":"i64.wast","passed":31,"failed":385},{"name":"if.wast","passed":116,"failed":125},{"name":"imports.wast","passed":23,"failed":160},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":25,"failed":26},{"name":"labels.wast","passed":13,"failed":16},{"name":"left-to-right.wast","passed":0,"failed":96},{"name":"linking.wast","passed":5,"failed":127},{"name":"load.wast","passed":59,"failed":38},{"name":"local_get.wast","passed":18,"failed":18},{"name":"local_set.wast","passed":38,"failed":15},{"name":"local_tee.wast","passed":41,"failed":56},{"name":"loop.wast","passed":42,"failed":78},{"name":"memory.wast","passed":30,"failed":49},{"name":"memory_grow.wast","passed":11,"failed":85},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":1,"failed":181},{"name":"names.wast","passed":484,"failed":2},{"name":"nop.wast","passed":4,"failed":84},{"name":"return.wast","passed":20,"failed":64},{"name":"select.wast","passed":28,"failed":120},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":4,"failed":16},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":39,"failed":19},{"name":"traps.wast","passed":4,"failed":32},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":0,"failed":64},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":9,"failed":41},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
-0.0.6-alpha.0,11414,8814,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":90,"failed":1},{"name":"binary.wast","passed":110,"failed":2},{"name":"block.wast","passed":174,"failed":49},{"name":"br.wast","passed":32,"failed":65},{"name":"br_if.wast","passed":36,"failed":82},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":20,"failed":71},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":5,"failed":3},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":25,"failed":594},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":50,"failed":49},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":90,"failed":6},{"name":"f32.wast","passed":1018,"failed":1496},{"name":"f32_bitwise.wast","passed":4,"failed":360},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":1018,"failed":1496},{"name":"f64_bitwise.wast","passed":4,"failed":360},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":1,"failed":7},{"name":"float_exprs.wast","passed":279,"failed":621},{"name":"float_literals.wast","passed":112,"failed":51},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":82,"failed":90},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":51,"failed":59},{"name":"i32.wast","passed":85,"failed":375},{"name":"i64.wast","passed":31,"failed":385},{"name":"if.wast","passed":117,"failed":124},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":51,"failed":57},{"name":"int_literals.wast","passed":25,"failed":26},{"name":"labels.wast","passed":13,"failed":16},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":21,"failed":111},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":18,"failed":18},{"name":"local_set.wast","passed":38,"failed":15},{"name":"local_tee.wast","passed":43,"failed":54},{"name":"loop.wast","passed":46,"failed":74},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":5,"failed":83},{"name":"return.wast","passed":21,"failed":63},{"name":"select.wast","passed":28,"failed":120},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":4,"failed":32},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":46,"failed":18},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":9,"failed":41},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
+0.0.6-alpha.0,12682,7546,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":90,"failed":1},{"name":"binary.wast","passed":110,"failed":2},{"name":"block.wast","passed":192,"failed":31},{"name":"br.wast","passed":84,"failed":13},{"name":"br_if.wast","passed":86,"failed":32},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":29,"failed":62},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":5,"failed":3},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":25,"failed":594},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":50,"failed":49},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":90,"failed":6},{"name":"f32.wast","passed":1174,"failed":1340},{"name":"f32_bitwise.wast","passed":4,"failed":360},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":1018,"failed":1496},{"name":"f64_bitwise.wast","passed":4,"failed":360},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":2,"failed":6},{"name":"float_exprs.wast","passed":477,"failed":423},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":328,"failed":113},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":116,"failed":56},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":51,"failed":59},{"name":"i32.wast","passed":326,"failed":134},{"name":"i64.wast","passed":31,"failed":385},{"name":"if.wast","passed":118,"failed":123},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":100,"failed":8},{"name":"int_literals.wast","passed":29,"failed":22},{"name":"labels.wast","passed":13,"failed":16},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":21,"failed":111},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":30,"failed":6},{"name":"local_set.wast","passed":49,"failed":4},{"name":"local_tee.wast","passed":65,"failed":32},{"name":"loop.wast","passed":92,"failed":28},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":40,"failed":48},{"name":"return.wast","passed":21,"failed":63},{"name":"select.wast","passed":84,"failed":64},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":14,"failed":22},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":50,"failed":14},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":27,"failed":23},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
diff --git a/crates/tinywasm/tests/generated/progress-mvp.svg b/crates/tinywasm/tests/generated/progress-mvp.svg
index 8bb754f..cecf850 100644
--- a/crates/tinywasm/tests/generated/progress-mvp.svg
+++ b/crates/tinywasm/tests/generated/progress-mvp.svg
@@ -49,11 +49,11 @@ v0.0.5 (11135)
</text>
<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="648,345 648,350 "/>
<text x="875" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
-v0.0.6-alpha.0 (11414)
+v0.0.6-alpha.0 (12682)
</text>
<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="875,345 875,350 "/>
-<rect x="85" y="212" width="217" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="767" y="181" width="217" height="163" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="539" y="185" width="218" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
<rect x="312" y="212" width="217" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="539" y="185" width="218" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="767" y="163" width="217" height="181" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="85" y="212" width="217" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
</svg>
diff --git a/crates/tinywasm/tests/test-wast.rs b/crates/tinywasm/tests/test-wast.rs
index 0770cb6..68372a0 100644
--- a/crates/tinywasm/tests/test-wast.rs
+++ b/crates/tinywasm/tests/test-wast.rs
@@ -29,15 +29,19 @@ fn main() -> Result<()> {
}
fn test_wast(wast_file: &str) -> Result<()> {
+ TestSuite::set_log_level(log::LevelFilter::Debug);
+
let args = std::env::args().collect::<Vec<_>>();
println!("args: {:?}", args);
let mut test_suite = TestSuite::new();
println!("running wast file: {}", wast_file);
+
test_suite.run_paths(&[wast_file])?;
if test_suite.failed() {
eprintln!("\n\nfailed one or more tests:\n{:#?}", test_suite);
+ test_suite.print_errors();
bail!("failed one or more tests")
} else {
println!("\n\npassed all tests:\n{:#?}", test_suite);
diff --git a/crates/tinywasm/tests/testsuite/mod.rs b/crates/tinywasm/tests/testsuite/mod.rs
index 2a9cf4e..fd3e39f 100644
--- a/crates/tinywasm/tests/testsuite/mod.rs
+++ b/crates/tinywasm/tests/testsuite/mod.rs
@@ -23,6 +23,20 @@ pub struct TestGroupResult {
pub struct TestSuite(BTreeMap<String, TestGroup>);
impl TestSuite {
+ pub fn set_log_level(level: log::LevelFilter) {
+ pretty_env_logger::formatted_builder().filter_level(level).init();
+ }
+
+ pub fn print_errors(&self) {
+ for (group_name, group) in &self.0 {
+ for (test_name, test) in &group.tests {
+ if let Err(e) = &test.result {
+ eprintln!("{}: {} failed: {:?}", group_name, test_name, e);
+ }
+ }
+ }
+ }
+
pub fn new() -> Self {
Self(BTreeMap::new())
}
diff --git a/crates/tinywasm/tests/testsuite/run.rs b/crates/tinywasm/tests/testsuite/run.rs
index afac117..b7a1336 100644
--- a/crates/tinywasm/tests/testsuite/run.rs
+++ b/crates/tinywasm/tests/testsuite/run.rs
@@ -3,6 +3,7 @@ use std::borrow::Cow;
use super::TestSuite;
use eyre::{eyre, Result};
+use log::{debug, error};
use tinywasm_types::TinyWasmModule;
use wast::{lexer::Lexer, parser::ParseBuffer, Wast};
@@ -11,6 +12,7 @@ impl TestSuite {
tests.iter().for_each(|group| {
let group_wast = std::fs::read(group).expect("failed to read test wast");
let group_wast = Cow::Owned(group_wast);
+ debug!("running group: {}", group);
self.run_group(group, group_wast).expect("failed to run group");
});
@@ -38,13 +40,18 @@ impl TestSuite {
let wast_data = wast::parser::parse::<Wast>(&buf).expect("failed to parse wat");
let mut last_module: Option<TinyWasmModule> = None;
+ debug!("running {} tests for group: {}", wast_data.directives.len(), group_name);
for (i, directive) in wast_data.directives.into_iter().enumerate() {
let span = directive.span();
use wast::WastDirective::*;
let name = format!("{}-{}", group_name, i);
+ debug!("directive: {:?}", directive);
+
match directive {
Wat(mut module) => {
+ debug!("got wat module");
+
let result = catch_unwind_silent(move || parse_module_bytes(&module.encode().unwrap()))
.map_err(|e| eyre!("failed to parse module: {:?}", e))
.and_then(|res| res);
@@ -54,6 +61,10 @@ impl TestSuite {
Ok(m) => last_module = Some(m.clone()),
}
+ if let Err(err) = &result {
+ debug!("failed to parse module: {:?}", err)
+ }
+
test_group.add_result(&format!("{}-parse", name), span, result.map(|_| ()));
}
@@ -102,12 +113,22 @@ impl TestSuite {
AssertTrap { exec, message: _, span } => {
let res: Result<tinywasm::Result<()>, _> = catch_unwind_silent(|| {
- let (module, name) = match exec {
- wast::WastExecute::Wat(_wat) => unimplemented!("wat"),
- wast::WastExecute::Get { module: _, global: _ } => unimplemented!("get"),
- wast::WastExecute::Invoke(invoke) => (last_module.as_ref(), invoke.name),
+ let (module, name, args) = match exec {
+ wast::WastExecute::Wat(_wat) => {
+ panic!("wat not supported");
+ }
+ wast::WastExecute::Get { module: _, global: _ } => {
+ panic!("wat not supported");
+ }
+ wast::WastExecute::Invoke(invoke) => (last_module.as_ref(), invoke.name, invoke.args),
};
- exec_fn(module, name, &[]).map(|_| ())
+ let args = args
+ .into_iter()
+ .map(wastarg2tinywasmvalue)
+ .collect::<Result<Vec<_>>>()
+ .expect("failed to convert args");
+
+ exec_fn(module, name, &args).map(|_| ())
});
match res {
@@ -133,38 +154,67 @@ impl TestSuite {
AssertReturn { span, exec, results } => {
let res: Result<Result<()>, _> = catch_unwind_silent(|| {
let invoke = match exec {
- wast::WastExecute::Wat(_) => unimplemented!("wat"),
+ wast::WastExecute::Wat(_) => {
+ error!("wat not supported");
+ return Err(eyre!("wat not supported"));
+ }
wast::WastExecute::Get { module: _, global: _ } => return Err(eyre!("get not supported")),
wast::WastExecute::Invoke(invoke) => invoke,
};
+ debug!("invoke: {:?}", invoke);
let args = invoke
.args
.into_iter()
.map(wastarg2tinywasmvalue)
- .collect::<Result<Vec<_>>>()?;
+ .collect::<Result<Vec<_>>>()
+ .map_err(|e| {
+ error!("failed to convert args: {:?}", e);
+ e
+ })?;
+
+ let outcomes = exec_fn(last_module.as_ref(), invoke.name, &args).map_err(|e| {
+ error!("failed to execute function: {:?}", e);
+ e
+ })?;
+
+ debug!("outcomes: {:?}", outcomes);
- let outcomes = exec_fn(last_module.as_ref(), invoke.name, &args)?;
let expected = results
.into_iter()
.map(wastret2tinywasmvalue)
- .collect::<Result<Vec<_>>>()?;
+ .collect::<Result<Vec<_>>>()
+ .map_err(|e| {
+ error!("failed to convert expected results: {:?}", e);
+ e
+ })?;
+
+ debug!("expected: {:?}", expected);
if outcomes.len() != expected.len() {
+ error!("expected {} results, got {}", expected.len(), outcomes.len());
return Err(eyre!("expected {} results, got {}", expected.len(), outcomes.len()));
}
+
outcomes
.iter()
.zip(expected)
.enumerate()
.try_for_each(|(i, (outcome, exp))| {
- (outcome == &exp)
- .then_some(())
- .ok_or_else(|| eyre!("result {} did not match: {:?} != {:?}", i, outcome, exp))
+ (outcome.eq_bits(&exp)).then_some(()).ok_or_else(|| {
+ error!("result {} did not match: {:?} != {:?}", i, outcome, exp);
+ eyre!("result {} did not match: {:?} != {:?}", i, outcome, exp)
+ })
})
});
- let res = res.map_err(|e| eyre!("test panicked: {:?}", e)).and_then(|r| r);
+ let res = res
+ .map_err(|e| {
+ error!("test panicked: {:?}", e);
+ eyre!("test panicked: {:?}", e.downcast_ref::<&str>())
+ })
+ .and_then(|r| r);
+
test_group.add_result(&format!("{}-return", name), span, res);
}
_ => test_group.add_result(&format!("{}-unknown", name), span, Err(eyre!("unsupported directive"))),
diff --git a/crates/types/src/instructions.rs b/crates/types/src/instructions.rs
index 3f7b2ef..5ccebaf 100644
--- a/crates/types/src/instructions.rs
+++ b/crates/types/src/instructions.rs
@@ -65,7 +65,7 @@ pub enum Instruction {
// Parametric Instructions
// See <https://webassembly.github.io/spec/core/binary/instructions.html#parametric-instructions>
Drop,
- Select,
+ Select(Option<ValType>),
// Variable Instructions
// See <https://webassembly.github.io/spec/core/binary/instructions.html#variable-instructions>
@@ -213,6 +213,8 @@ pub enum Instruction {
I32TruncF32U,
I32TruncF64S,
I32TruncF64U,
+ I32Extend8S,
+ I32Extend16S,
I64ExtendI32S,
I64ExtendI32U,
I64TruncF32S,
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index 85bfcd2..12cdbfb 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -103,6 +103,17 @@ impl WasmValue {
ValType::ExternRef => unimplemented!("ExternRef is not yet supported"),
}
}
+
+ pub fn eq_bits(&self, other: &Self) -> bool {
+ match (self, other) {
+ (Self::I32(a), Self::I32(b)) => a == b,
+ (Self::I64(a), Self::I64(b)) => a == b,
+ (Self::F32(a), Self::F32(b)) => a.to_bits() == b.to_bits(),
+ (Self::F64(a), Self::F64(b)) => a.to_bits() == b.to_bits(),
+ // (Self::V128(a), Self::V128(b)) => a == b,
+ _ => false,
+ }
+ }
}
impl From<i32> for WasmValue {
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-03 21:31:53 +0000