diff --git a/codegen/luajit/src/backend/statement.rs b/codegen/luajit/src/backend/statement.rs index 879f818..fa6236e 100644 --- a/codegen/luajit/src/backend/statement.rs +++ b/codegen/luajit/src/backend/statement.rs @@ -4,8 +4,8 @@ use std::{ }; use wasm_ast::node::{ - Block, Br, BrIf, BrTable, Call, CallIndirect, FuncData, If, LabelType, MemoryGrow, MemoryCopy, - MemoryFill, SetGlobal, SetLocal, SetTemporary, Statement, StoreAt, Terminator, + Block, Br, BrIf, BrTable, Call, CallIndirect, FuncData, If, LabelType, MemoryCopy, MemoryFill, + MemoryGrow, SetGlobal, SetLocal, SetTemporary, Statement, StoreAt, Terminator, }; use wasmparser::ValType; @@ -290,7 +290,6 @@ impl DriverNoContext for MemoryCopy { write!(w, "rt.allocator.copy(memory_at_0, {dst}, {src}, ")?; self.size().write(w)?; write!(w, ")") - } } @@ -328,7 +327,7 @@ impl Driver for Statement { Self::StoreAt(s) => write_stat(s, mng, w), Self::MemoryGrow(s) => write_stat(s, mng, w), Self::MemoryCopy(s) => write_stat(s, mng, w), - Self::MemoryFill(s) => write_stat(s, mng, w) + Self::MemoryFill(s) => write_stat(s, mng, w), } } } diff --git a/codegen/luau/src/backend/statement.rs b/codegen/luau/src/backend/statement.rs index 36dec2f..8ccd4d5 100644 --- a/codegen/luau/src/backend/statement.rs +++ b/codegen/luau/src/backend/statement.rs @@ -4,8 +4,8 @@ use std::{ }; use wasm_ast::node::{ - Block, Br, BrIf, BrTable, Call, CallIndirect, FuncData, If, LabelType, MemoryGrow, MemoryCopy, - MemoryFill, SetGlobal, SetLocal, SetTemporary, Statement, StoreAt, Terminator, + Block, Br, BrIf, BrTable, Call, CallIndirect, FuncData, If, LabelType, MemoryCopy, MemoryFill, + MemoryGrow, SetGlobal, SetLocal, SetTemporary, Statement, StoreAt, Terminator, }; use wasmparser::ValType; diff --git a/wasm-ast/src/factory.rs b/wasm-ast/src/factory.rs index 49cf34c..313bb8d 100644 --- a/wasm-ast/src/factory.rs +++ b/wasm-ast/src/factory.rs @@ -4,8 +4,8 @@ use crate::{ module::{read_checked, TypeInfo}, node::{ BinOp, BinOpType, Block, Br, BrIf, BrTable, Call, CallIndirect, CmpOp, CmpOpType, - Expression, FuncData, GetGlobal, GetLocal, If, LabelType, LoadAt, LoadType, MemoryGrow, - MemoryCopy, MemoryFill, MemorySize, Select, SetGlobal, SetLocal, Statement, StoreAt, + Expression, FuncData, GetGlobal, GetLocal, If, LabelType, LoadAt, LoadType, MemoryCopy, + MemoryFill, MemoryGrow, MemorySize, Select, SetGlobal, SetLocal, Statement, StoreAt, StoreType, Terminator, UnOp, UnOpType, Value, }, stack::{ReadType, Stack}, @@ -611,12 +611,12 @@ impl<'a> Factory<'a> { self.target.leak_memory_write(memory); self.target.code.push(data); } - Operator::MemoryCopy { src, dst } => { + Operator::MemoryCopy { dst_mem, src_mem } => { let size = self.target.stack.pop().into(); let data = Statement::MemoryCopy(MemoryCopy { - dst, - src, + dst: dst_mem, + src: src_mem, size, }); @@ -626,11 +626,7 @@ impl<'a> Factory<'a> { let n = self.target.stack.pop().into(); let value = self.target.stack.pop().into(); - let data = Statement::MemoryFill(MemoryFill { - mem, - n, - value, - }); + let data = Statement::MemoryFill(MemoryFill { mem, n, value }); self.target.code.push(data); } diff --git a/wasm-ast/src/node.rs b/wasm-ast/src/node.rs index f34f509..7cc4abe 100644 --- a/wasm-ast/src/node.rs +++ b/wasm-ast/src/node.rs @@ -1162,7 +1162,7 @@ pub enum Statement { StoreAt(StoreAt), MemoryGrow(MemoryGrow), MemoryCopy(MemoryCopy), - MemoryFill(MemoryFill) + MemoryFill(MemoryFill), } pub struct FuncData { diff --git a/wasm-ast/src/visit.rs b/wasm-ast/src/visit.rs index ab58bb2..acb1f7e 100644 --- a/wasm-ast/src/visit.rs +++ b/wasm-ast/src/visit.rs @@ -1,7 +1,7 @@ use crate::node::{ BinOp, Block, Br, BrIf, BrTable, Call, CallIndirect, CmpOp, Expression, FuncData, GetGlobal, - GetLocal, GetTemporary, If, LoadAt, MemoryGrow, MemorySize, MemoryCopy, MemoryFill, Select, SetGlobal, SetLocal, - SetTemporary, Statement, StoreAt, Terminator, UnOp, Value, + GetLocal, GetTemporary, If, LoadAt, MemoryCopy, MemoryFill, MemoryGrow, MemorySize, Select, + SetGlobal, SetLocal, SetTemporary, Statement, StoreAt, Terminator, UnOp, Value, }; pub trait Visitor {