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

Add support for anonymous translation

Browse Source
This commit is contained in:
Rerumu 2022-05-21 19:52:25 -04:00
parent 830727d8d4
commit f02070a1b3
7 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codegen-luajit/src/lib.rs
View File

@ -1,6 +1,6 @@
pub static RUNTIME: &str = include_str!("../runtime/runtime.lua");
pub use translator::translate;
pub use translator::{from_inst_list, from_module};
mod analyzer;
mod backend;

10
codegen-luajit/src/translator.rs
View File

@ -321,7 +321,15 @@ fn write_module_start(
/// # Errors
/// Returns `Err` if writing to `Write` failed.
pub fn translate(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
pub fn from_inst_list(code: &[Instruction], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
Builder::new(type_info)
.with_anon(code)
.write(&mut Manager::default(), w)
}
/// # Errors
/// Returns `Err` if writing to `Write` failed.
pub fn from_module(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
let func_list = build_func_list(wasm, type_info);
write_localize_used(&func_list, w)?;

2
codegen-luau/src/lib.rs
View File

@ -5,7 +5,7 @@ pub static RUNTIME: &str = concat!(
include_str!("../runtime/runtime.lua")
);
pub use translator::translate;
pub use translator::{from_inst_list, from_module};
mod analyzer;
mod backend;

10
codegen-luau/src/translator.rs
View File

@ -321,7 +321,15 @@ fn write_module_start(
/// # Errors
/// Returns `Err` if writing to `Write` failed.
pub fn translate(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
pub fn from_inst_list(code: &[Instruction], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
Builder::new(type_info)
.with_anon(code)
.write(&mut Manager::default(), w)
}
/// # Errors
/// Returns `Err` if writing to `Write` failed.
pub fn from_module(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
let func_list = build_func_list(wasm, type_info);
write_localize_used(&func_list, w)?;

2
dev-test/fuzz_targets/luajit_translate.rs
View File

@ -14,5 +14,5 @@ libfuzzer_sys::fuzz_target!(|module: Module| {
let type_info = TypeInfo::from_module(&wasm);
let sink = &mut std::io::sink();
codegen_luajit::translate(&wasm, &type_info, sink).expect("LuaJIT should succeed");
codegen_luajit::from_module(&wasm, &type_info, sink).expect("LuaJIT should succeed");
});

2
dev-test/fuzz_targets/luau_translate.rs
View File

@ -14,5 +14,5 @@ libfuzzer_sys::fuzz_target!(|module: Module| {
let type_info = TypeInfo::from_module(&wasm);
let sink = &mut std::io::sink();
codegen_luau::translate(&wasm, &type_info, sink).expect("Luau should succeed");
codegen_luau::from_module(&wasm, &type_info, sink).expect("Luau should succeed");
});

4
wasm-synth/src/main.rs
View File

@ -23,8 +23,8 @@ fn run_translator(wasm: &Module, runtime: &str, translate: Translate) -> Result<
fn do_translate(name: &str, file: &str) {
let wasm = &parse_module(file);
let result = match name.to_lowercase().as_str() {
"luajit" => run_translator(wasm, codegen_luajit::RUNTIME, codegen_luajit::translate),
"luau" => run_translator(wasm, codegen_luau::RUNTIME, codegen_luau::translate),
"luajit" => run_translator(wasm, codegen_luajit::RUNTIME, codegen_luajit::from_module),
"luau" => run_translator(wasm, codegen_luau::RUNTIME, codegen_luau::from_module),
_ => panic!("Bad language: {name}"),
};