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

Fix i64 generation for globals and elements

Browse Source
This commit is contained in:
Rerumu 2022-06-25 22:19:26 -04:00
parent 00cbe2df6c
commit 27c05550e4
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
codegen/luau/src/translator.rs
View File

@ -10,7 +10,7 @@ use wasm_ast::{
}; };
use wasmparser::{ use wasmparser::{
Data, DataKind, Element, ElementItem, ElementKind, Export, Import, InitExpr, Operator, Data, DataKind, Element, ElementItem, ElementKind, Export, Import, InitExpr, Operator,
OperatorsReader, OperatorsReader, ValType,
}; };
use crate::{ use crate::{
@ -224,10 +224,27 @@ fn write_local_operation(head: &str, tail: &str, w: &mut dyn Write) -> Result<()
} }
} }
fn write_localize_used(func_list: &[FuncData], w: &mut dyn Write) -> Result<BTreeSet<usize>> { fn write_localize_used(
wasm: &Module,
func_list: &[FuncData],
w: &mut dyn Write,
) -> Result<BTreeSet<usize>> {
let mut loc_set = BTreeSet::new(); let mut loc_set = BTreeSet::new();
let mut mem_set = BTreeSet::new(); let mut mem_set = BTreeSet::new();
let has_global_i64 = wasm
.global_section()
.iter()
.any(|g| g.ty.content_type == ValType::I64);
let has_element_i64 = wasm.element_section().iter().any(|e| e.ty == ValType::I64);
if has_global_i64 || has_element_i64 {
loc_set.insert(("i64", "K_ZERO"));
loc_set.insert(("i64", "K_ONE"));
loc_set.insert(("i64", "from_u32"));
}
for (loc, mem) in func_list.iter().map(localize::visit) { for (loc, mem) in func_list.iter().map(localize::visit) {
loc_set.extend(loc); loc_set.extend(loc);
mem_set.extend(mem); mem_set.extend(mem);
@ -308,7 +325,7 @@ pub fn from_inst_list(code: &[Operator], type_info: &TypeInfo, w: &mut dyn Write
/// Returns `Err` if writing to `Write` failed. /// Returns `Err` if writing to `Write` failed.
pub fn from_module_typed(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> { pub fn from_module_typed(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
let func_list = build_func_list(wasm, type_info); let func_list = build_func_list(wasm, type_info);
let mem_set = write_localize_used(&func_list, w)?; let mem_set = write_localize_used(wasm, &func_list, w)?;
write_named_array("FUNC_LIST", wasm.function_space(), w)?; write_named_array("FUNC_LIST", wasm.function_space(), w)?;
write_named_array("TABLE_LIST", wasm.table_space(), w)?; write_named_array("TABLE_LIST", wasm.table_space(), w)?;