code002lover/Wasynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor test setup to use wasmparser

Browse Source
This commit is contained in:
Rerumu 2022-06-25 03:08:58 -04:00
parent 40c985e7e2
commit 273da80284
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev-test/Cargo.toml
View File

@ -8,19 +8,15 @@ publish = false
cargo-fuzz = true cargo-fuzz = true
[dependencies] [dependencies]
libfuzzer-sys = "0.4" libfuzzer-sys = "0.4.0"
wasm-smith = "0.8.0" wasm-smith = "0.8.0"
wasm-ast = { path = "../wasm-ast" }
codegen-luajit = { path = "../codegen/luajit" } codegen-luajit = { path = "../codegen/luajit" }
codegen-luau = { path = "../codegen/luau" } codegen-luau = { path = "../codegen/luau" }
[dependencies.parity-wasm]
git = "https://github.com/paritytech/parity-wasm.git"
features = ["multi_value", "sign_ext"]
[dev-dependencies] [dev-dependencies]
test-generator = "0.3.0" test-generator = "0.3.0"
wast = "41.0.0" wast = "41.0.0"
wasm-ast = { path = "../wasm-ast" }
[[bin]] [[bin]]
name = "luajit_translate" name = "luajit_translate"

10
dev-test/tests/target.rs
View File

@ -5,9 +5,9 @@ use std::{
process::Command, process::Command,
}; };
use parity_wasm::elements::Module as BinModule; use wasm_ast::module::Module as AstModule;
use wast::{ use wast::{
core::Module as AstModule, parser::ParseBuffer, token::Id, AssertExpression, QuoteWat, Wast, core::Module as WaModule, parser::ParseBuffer, token::Id, AssertExpression, QuoteWat, Wast,
WastDirective, WastExecute, WastInvoke, Wat, WastDirective, WastExecute, WastInvoke, Wat,
}; };
@ -42,7 +42,7 @@ macro_rules! impl_write_number_nan {
impl_write_number_nan!(write_f32, write_f32_nan, f32, wast::token::Float32); impl_write_number_nan!(write_f32, write_f32_nan, f32, wast::token::Float32);
impl_write_number_nan!(write_f64, write_f64_nan, f64, wast::token::Float64); impl_write_number_nan!(write_f64, write_f64_nan, f64, wast::token::Float64);
fn try_into_ast_module(data: QuoteWat) -> Option<AstModule> { fn try_into_ast_module(data: QuoteWat) -> Option<WaModule> {
if let QuoteWat::Wat(Wat::Module(data)) = data { if let QuoteWat::Wat(Wat::Module(data)) = data {
Some(data) Some(data)
} else { } else {
@ -73,7 +73,7 @@ pub trait Target: Sized {
fn write_runtime(w: &mut dyn Write) -> Result<()>; fn write_runtime(w: &mut dyn Write) -> Result<()>;
fn write_module(data: &BinModule, name: Option<&str>, w: &mut dyn Write) -> Result<()>; fn write_module(data: &AstModule, name: Option<&str>, w: &mut dyn Write) -> Result<()>;
fn write_variant(variant: WastDirective, w: &mut dyn Write) -> Result<()> { fn write_variant(variant: WastDirective, w: &mut dyn Write) -> Result<()> {
match variant { match variant {
@ -81,7 +81,7 @@ pub trait Target: Sized {
let mut ast = try_into_ast_module(data).expect("Must be a module"); let mut ast = try_into_ast_module(data).expect("Must be a module");
let bytes = ast.encode().unwrap(); let bytes = ast.encode().unwrap();
let data = parity_wasm::deserialize_buffer(&bytes).unwrap(); let data = AstModule::from_data(&bytes);
let name = ast.id.as_ref().map(Id::name); let name = ast.id.as_ref().map(Id::name);
Self::write_module(&data, name, w)?; Self::write_module(&data, name, w)?;