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

Fix function name translation offset

Browse Source
This commit is contained in:
Rerumu 2022-06-16 14:06:48 -04:00
parent e956b3a790
commit 9ca2c60021
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@ fn write_memory_used(func_list: &[FuncData], w: &mut dyn Write) -> Result<Vec<us
Ok(list) Ok(list)
} }
fn write_func_start(wasm: &Module, index: u32, offset: u32, w: &mut dyn Write) -> Result<()> { fn write_func_start(wasm: &Module, index: u32, w: &mut dyn Write) -> Result<()> {
let opt = wasm let opt = wasm
.names_section() .names_section()
.and_then(NameSection::functions) .and_then(NameSection::functions)
@ -276,7 +276,7 @@ fn write_func_start(wasm: &Module, index: u32, offset: u32, w: &mut dyn Write) -
write!(w, "--[[ {name} ]]")?; write!(w, "--[[ {name} ]]")?;
} }
write!(w, "[{}] =", index + offset) write!(w, "[{index}] =")
} }
fn write_func_list( fn write_func_list(
@ -285,10 +285,10 @@ fn write_func_list(
func_list: &[FuncData], func_list: &[FuncData],
w: &mut dyn Write, w: &mut dyn Write,
) -> Result<()> { ) -> Result<()> {
let offset = type_info.len_ex().try_into().unwrap();
func_list.iter().enumerate().try_for_each(|(i, v)| { func_list.iter().enumerate().try_for_each(|(i, v)| {
write_func_start(wasm, i.try_into().unwrap(), offset, w)?; let index = (type_info.len_ex() + i).try_into().unwrap();
write_func_start(wasm, index, w)?;
v.write(&mut Manager::default(), w) v.write(&mut Manager::default(), w)
}) })

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

@ -260,7 +260,7 @@ fn write_memory_used(func_list: &[FuncData], w: &mut dyn Write) -> Result<Vec<us
Ok(list) Ok(list)
} }
fn write_func_start(wasm: &Module, index: u32, offset: u32, w: &mut dyn Write) -> Result<()> { fn write_func_start(wasm: &Module, index: u32, w: &mut dyn Write) -> Result<()> {
let opt = wasm let opt = wasm
.names_section() .names_section()
.and_then(NameSection::functions) .and_then(NameSection::functions)
@ -272,7 +272,7 @@ fn write_func_start(wasm: &Module, index: u32, offset: u32, w: &mut dyn Write) -
write!(w, "--[[ {name} ]]")?; write!(w, "--[[ {name} ]]")?;
} }
write!(w, "[{}] =", index + offset) write!(w, "[{index}] =")
} }
fn write_func_list( fn write_func_list(
@ -281,10 +281,10 @@ fn write_func_list(
func_list: &[FuncData], func_list: &[FuncData],
w: &mut dyn Write, w: &mut dyn Write,
) -> Result<()> { ) -> Result<()> {
let offset = type_info.len_ex().try_into().unwrap();
func_list.iter().enumerate().try_for_each(|(i, v)| { func_list.iter().enumerate().try_for_each(|(i, v)| {
write_func_start(wasm, i.try_into().unwrap(), offset, w)?; let index = (type_info.len_ex() + i).try_into().unwrap();
write_func_start(wasm, index, w)?;
v.write(&mut Manager::default(), w) v.write(&mut Manager::default(), w)
}) })