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

Minor rename and changes

Browse Source
This commit is contained in:
Rerumu 2022-06-25 03:31:40 -04:00
parent 21ca23b088
commit 0f96d430b6
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
codegen/luajit/src/translator.rs
View File

@ -122,10 +122,10 @@ fn write_memory_list(wasm: &Module, w: &mut dyn Write) -> Result<()> {
let offset = wasm.import_count(External::Memory); let offset = wasm.import_count(External::Memory);
let memory = wasm.memory_section(); let memory = wasm.memory_section();
for (i, v) in memory.iter().enumerate() { for (i, ty) in memory.iter().enumerate() {
let index = offset + i; let index = offset + i;
let min = v.initial; let min = ty.initial;
let max = v.maximum.unwrap_or(0xFFFF); let max = ty.maximum.unwrap_or(0xFFFF);
write!(w, "MEMORY_LIST[{index}] = rt.allocator.new({min}, {max})")?; write!(w, "MEMORY_LIST[{index}] = rt.allocator.new({min}, {max})")?;
} }
@ -137,9 +137,11 @@ fn write_global_list(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) ->
let offset = wasm.import_count(External::Global); let offset = wasm.import_count(External::Global);
let global = wasm.global_section(); let global = wasm.global_section();
for (i, v) in global.iter().enumerate() { for (i, global) in global.iter().enumerate() {
write!(w, "GLOBAL_LIST[{}] = {{ value =", i + offset)?; let index = offset + i;
write_constant(&v.init_expr, type_info, w)?;
write!(w, "GLOBAL_LIST[{index}] = {{ value =")?;
write_constant(&global.init_expr, type_info, w)?;
write!(w, "}}")?; write!(w, "}}")?;
} }
@ -147,8 +149,8 @@ fn write_global_list(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) ->
} }
fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> { fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
for v in list { for element in list {
let (index, init) = match v.kind { let (index, init) = match element.kind {
ElementKind::Active { ElementKind::Active {
table_index, table_index,
init_expr, init_expr,
@ -164,7 +166,7 @@ fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write)
write!(w, "local data = {{")?; write!(w, "local data = {{")?;
for item in v.items.get_items_reader().unwrap() { for item in element.items.get_items_reader().unwrap() {
match item.unwrap() { match item.unwrap() {
ElementItem::Func(index) => write!(w, "FUNC_LIST[{index}],"), ElementItem::Func(index) => write!(w, "FUNC_LIST[{index}],"),
ElementItem::Expr(init) => write_constant(&init, type_info, w), ElementItem::Expr(init) => write_constant(&init, type_info, w),

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

@ -121,10 +121,10 @@ fn write_memory_list(wasm: &Module, w: &mut dyn Write) -> Result<()> {
let offset = wasm.import_count(External::Memory); let offset = wasm.import_count(External::Memory);
let memory = wasm.memory_section(); let memory = wasm.memory_section();
for (i, v) in memory.iter().enumerate() { for (i, ty) in memory.iter().enumerate() {
let index = offset + i; let index = offset + i;
let min = v.initial; let min = ty.initial;
let max = v.maximum.unwrap_or(0xFFFF); let max = ty.maximum.unwrap_or(0xFFFF);
write!(w, "MEMORY_LIST[{index}] = rt.allocator.new({min}, {max})")?; write!(w, "MEMORY_LIST[{index}] = rt.allocator.new({min}, {max})")?;
} }
@ -136,9 +136,11 @@ fn write_global_list(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) ->
let offset = wasm.import_count(External::Global); let offset = wasm.import_count(External::Global);
let global = wasm.global_section(); let global = wasm.global_section();
for (i, v) in global.iter().enumerate() { for (i, global) in global.iter().enumerate() {
write!(w, "GLOBAL_LIST[{}] = {{ value =", i + offset)?; let index = offset + i;
write_constant(&v.init_expr, type_info, w)?;
write!(w, "GLOBAL_LIST[{index}] = {{ value =")?;
write_constant(&global.init_expr, type_info, w)?;
write!(w, "}}")?; write!(w, "}}")?;
} }
@ -146,8 +148,8 @@ fn write_global_list(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) ->
} }
fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> { fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
for v in list { for element in list {
let (index, init) = match v.kind { let (index, init) = match element.kind {
ElementKind::Active { ElementKind::Active {
table_index, table_index,
init_expr, init_expr,
@ -163,7 +165,7 @@ fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write)
write!(w, "local data = {{")?; write!(w, "local data = {{")?;
for item in v.items.get_items_reader().unwrap() { for item in element.items.get_items_reader().unwrap() {
match item.unwrap() { match item.unwrap() {
ElementItem::Func(index) => write!(w, "FUNC_LIST[{index}],"), ElementItem::Func(index) => write!(w, "FUNC_LIST[{index}],"),
ElementItem::Expr(init) => write_constant(&init, type_info, w), ElementItem::Expr(init) => write_constant(&init, type_info, w),