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

Merge pull request #28 from RealEthanPlayzDev/trunk

Browse Source 
Fix build error within wasm-ast
This commit is contained in:
Rerumu 2023-02-23 23:33:39 -05:00 committed by GitHub
commit 857737ff52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codegen/luajit/src/backend/statement.rs
View File

@ -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),
}
}
}

4
codegen/luau/src/backend/statement.rs
View File

@ -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;

16
wasm-ast/src/factory.rs
View File

@ -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);
}

2
wasm-ast/src/node.rs
View File

@ -1162,7 +1162,7 @@ pub enum Statement {
StoreAt(StoreAt),
MemoryGrow(MemoryGrow),
MemoryCopy(MemoryCopy),
MemoryFill(MemoryFill)
MemoryFill(MemoryFill),
}
pub struct FuncData {

4
wasm-ast/src/visit.rs
View File

@ -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 {