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

Encapsulate nodes

Browse Source
This commit is contained in:
Rerumu
2022-06-23 16:03:13 -04:00
parent b282bdf490
commit 9db21cc84b
14 changed files with 636 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codegen-luau/src/analyzer/localize.rs
+10 -10
View File
@@ -15,14 +15,14 @@ struct Visit {
impl Visitor for Visit {
fn visit_load_at(&mut self, v: &LoadAt) {
let name = v.what.as_name();
let name = v.load_type().as_name();
self.memory_set.insert(0);
self.local_set.insert(("load", name));
}
fn visit_store_at(&mut self, v: &StoreAt) {
let name = v.what.as_name();
let name = v.store_type().as_name();
self.memory_set.insert(0);
self.local_set.insert(("store", name));
@@ -40,37 +40,37 @@ impl Visitor for Visit {
}
fn visit_un_op(&mut self, v: &UnOp) {
let name = v.op.as_name();
let name = v.op_type().as_name();
self.local_set.insert(name);
}
fn visit_bin_op(&mut self, v: &BinOp) {
if bin_symbol_of(v.op).is_some() {
if bin_symbol_of(v.op_type()).is_some() {
return;
}
let name = v.op.as_name();
let name = v.op_type().as_name();
self.local_set.insert(name);
}
fn visit_cmp_op(&mut self, v: &CmpOp) {
if cmp_symbol_of(v.op).is_some() {
if cmp_symbol_of(v.op_type()).is_some() {
return;
}
let name = v.op.as_name();
let name = v.op_type().as_name();
self.local_set.insert(name);
}
fn visit_memory_size(&mut self, m: &MemorySize) {
self.memory_set.insert(m.memory);
self.memory_set.insert(m.memory());
}
fn visit_memory_grow(&mut self, m: &MemoryGrow) {
self.memory_set.insert(m.memory);
self.memory_set.insert(m.memory());
}
}
@@ -81,7 +81,7 @@ pub fn visit(ast: &FuncData) -> (BTreeSet<(&'static str, &'static str)>, BTreeSe
};
if ast
.local_data
.local_data()
.iter()
.any(|v| v.value_type() == ValueType::I64)
{
codegen-luau/src/backend/expression.rs
+19 -19
View File
@@ -31,40 +31,40 @@ macro_rules! impl_write_number {
impl Driver for Select {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "(")?;
write_condition(&self.cond, mng, w)?;
write_condition(self.condition(), mng, w)?;
write!(w, "and ")?;
self.a.write(mng, w)?;
self.on_true().write(mng, w)?;
write!(w, "or ")?;
self.b.write(mng, w)?;
self.on_false().write(mng, w)?;
write!(w, ")")
}
}
impl Driver for GetTemporary {
fn write(&self, _: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "reg_{} ", self.var)
write!(w, "reg_{} ", self.var())
}
}
impl Driver for GetLocal {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write_variable(self.var, mng, w)
write_variable(self.var(), mng, w)
}
}
impl Driver for GetGlobal {
fn write(&self, _: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "GLOBAL_LIST[{}].value ", self.var)
write!(w, "GLOBAL_LIST[{}].value ", self.var())
}
}
impl Driver for LoadAt {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "load_{}(memory_at_0, ", self.what.as_name())?;
self.pointer.write(mng, w)?;
write!(w, "load_{}(memory_at_0, ", self.load_type().as_name())?;
self.pointer().write(mng, w)?;
if self.offset != 0 {
write!(w, "+ {}", self.offset)?;
if self.offset() != 0 {
write!(w, "+ {}", self.offset())?;
}
write!(w, ")")
@@ -73,7 +73,7 @@ impl Driver for LoadAt {
impl Driver for MemorySize {
fn write(&self, _: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "memory_at_{}.min ", self.memory)
write!(w, "memory_at_{}.min ", self.memory())
}
}
@@ -113,29 +113,29 @@ impl Driver for Value {
impl Driver for UnOp {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
let (a, b) = self.op.as_name();
let (a, b) = self.op_type().as_name();
write!(w, "{a}_{b}(")?;
self.rhs.write(mng, w)?;
self.rhs().write(mng, w)?;
write!(w, ")")
}
}
impl Driver for BinOp {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
if let Some(symbol) = bin_symbol_of(self.op) {
if let Some(symbol) = bin_symbol_of(self.op_type()) {
write!(w, "(")?;
self.lhs.write(mng, w)?;
self.lhs().write(mng, w)?;
write!(w, "{symbol} ")?;
self.rhs.write(mng, w)?;
self.rhs().write(mng, w)?;
write!(w, ")")
} else {
let (head, tail) = self.op.as_name();
let (head, tail) = self.op_type().as_name();
write!(w, "{head}_{tail}(")?;
self.lhs.write(mng, w)?;
self.lhs().write(mng, w)?;
write!(w, ", ")?;
self.rhs.write(mng, w)?;
self.rhs().write(mng, w)?;
write!(w, ")")
}
}
codegen-luau/src/backend/manager.rs
+6 -6
View File
@@ -84,17 +84,17 @@ pub fn write_variable(var: usize, mng: &Manager, w: &mut dyn Write) -> Result<()
}
pub fn write_cmp_op(cmp: &CmpOp, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
if let Some(symbol) = cmp_symbol_of(cmp.op) {
cmp.lhs.write(mng, w)?;
if let Some(symbol) = cmp_symbol_of(cmp.op_type()) {
cmp.lhs().write(mng, w)?;
write!(w, "{symbol} ")?;
cmp.rhs.write(mng, w)
cmp.rhs().write(mng, w)
} else {
let (head, tail) = cmp.op.as_name();
let (head, tail) = cmp.op_type().as_name();
write!(w, "{head}_{tail}(")?;
cmp.lhs.write(mng, w)?;
cmp.lhs().write(mng, w)?;
write!(w, ", ")?;
cmp.rhs.write(mng, w)?;
cmp.rhs().write(mng, w)?;
write!(w, ")")
}
}
codegen-luau/src/backend/statement.rs
+55 -55
View File
@@ -17,21 +17,21 @@ use super::manager::{
impl Driver for Br {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
if !self.align.is_aligned() {
write_ascending("reg", self.align.new_range(), w)?;
if !self.align().is_aligned() {
write_ascending("reg", self.align().new_range(), w)?;
write!(w, " = ")?;
write_ascending("reg", self.align.old_range(), w)?;
write_ascending("reg", self.align().old_range(), w)?;
write!(w, " ")?;
}
if self.target == 0 {
if self.target() == 0 {
if let Some(&Label::Backward) = mng.label_list().last() {
write!(w, "continue ")?;
} else {
write!(w, "break ")?;
}
} else {
let level = mng.label_list().len() - 1 - self.target;
let level = mng.label_list().len() - 1 - self.target();
write!(w, "desired = {level} ")?;
write!(w, "break ")?;
@@ -44,8 +44,8 @@ impl Driver for Br {
fn to_ordered_table<'a>(list: &'a [Br], default: &'a Br) -> Vec<&'a Br> {
let mut data: Vec<_> = list.iter().chain(std::iter::once(default)).collect();
data.sort_by_key(|v| v.target);
data.dedup_by_key(|v| v.target);
data.sort_by_key(|v| v.target());
data.dedup_by_key(|v| v.target());
data
}
@@ -64,13 +64,13 @@ fn write_search_layer(
let br = list[center];
if range.start != center {
write!(w, "if temp < {} then ", br.target)?;
write!(w, "if temp < {} then ", br.target())?;
write_search_layer(range.start..center, list, mng, w)?;
write!(w, "else")?;
}
if range.end != center + 1 {
write!(w, "if temp > {} then ", br.target)?;
write!(w, "if temp > {} then ", br.target())?;
write_search_layer(center + 1..range.end, list, mng, w)?;
write!(w, "else")?;
}
@@ -87,31 +87,31 @@ fn write_table_setup(table: &BrTable, mng: &mut Manager, w: &mut dyn Write) -> R
write!(w, "br_map[{id}] = (function() return {{[0] =")?;
table
.data
.data()
.iter()
.try_for_each(|v| write!(w, "{},", v.target))?;
.try_for_each(|v| write!(w, "{},", v.target()))?;
write!(w, "}} end)()")?;
write!(w, "end ")?;
write!(w, "local temp = br_map[{id}][")?;
table.cond.write(mng, w)?;
write!(w, "] or {} ", table.default.target)
table.condition().write(mng, w)?;
write!(w, "] or {} ", table.default().target())
}
impl Driver for BrTable {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
if self.data.is_empty() {
if self.data().is_empty() {
// Our condition should be pure so we probably don't need
// to emit it in this case.
return self.default.write(mng, w);
return self.default().write(mng, w);
}
// `BrTable` is optimized by first mapping all indices to targets through
// a Lua table; this reduces the size of the code generated as duplicate entries
// don't need checking. Then, for speed, a binary search is done for the target
// and the appropriate jump is performed.
let list = to_ordered_table(&self.data, &self.default);
let list = to_ordered_table(self.data(), self.default());
write_table_setup(self, mng, w)?;
write_search_layer(0..list.len(), &list, mng, w)
@@ -157,9 +157,9 @@ impl Driver for Forward {
write!(w, "while true do ")?;
self.code.iter().try_for_each(|s| s.write(mng, w))?;
self.code().iter().try_for_each(|s| s.write(mng, w))?;
if let Some(v) = &self.last {
if let Some(v) = self.last() {
v.write(mng, w)?;
} else {
write!(w, "break ")?;
@@ -178,9 +178,9 @@ impl Driver for Backward {
write!(w, "while true do ")?;
self.code.iter().try_for_each(|s| s.write(mng, w))?;
self.code().iter().try_for_each(|s| s.write(mng, w))?;
if let Some(v) = &self.last {
if let Some(v) = self.last() {
v.write(mng, w)?;
} else {
write!(w, "break ")?;
@@ -196,9 +196,9 @@ impl Driver for Backward {
impl Driver for BrIf {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "if ")?;
write_condition(&self.cond, mng, w)?;
write_condition(self.condition(), mng, w)?;
write!(w, "then ")?;
self.target.write(mng, w)?;
self.target().write(mng, w)?;
write!(w, "end ")
}
}
@@ -206,15 +206,15 @@ impl Driver for BrIf {
impl Driver for If {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "if ")?;
write_condition(&self.cond, mng, w)?;
write_condition(self.condition(), mng, w)?;
write!(w, "then ")?;
self.truthy.write(mng, w)?;
self.on_true().write(mng, w)?;
if let Some(falsey) = &self.falsey {
if let Some(v) = self.on_false() {
write!(w, "else ")?;
falsey.write(mng, w)?;
v.write(mng, w)?;
}
write!(w, "end ")
@@ -232,70 +232,70 @@ fn write_call_store(result: Range<usize>, w: &mut dyn Write) -> Result<()> {
impl Driver for Call {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write_call_store(self.result.clone(), w)?;
write_call_store(self.result(), w)?;
write!(w, "FUNC_LIST[{}](", self.func)?;
self.param_list.as_slice().write(mng, w)?;
write!(w, "FUNC_LIST[{}](", self.function())?;
self.param_list().write(mng, w)?;
write!(w, ")")
}
}
impl Driver for CallIndirect {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write_call_store(self.result.clone(), w)?;
write_call_store(self.result(), w)?;
write!(w, "TABLE_LIST[{}].data[", self.table)?;
self.index.write(mng, w)?;
write!(w, "TABLE_LIST[{}].data[", self.table())?;
self.index().write(mng, w)?;
write!(w, "](")?;
self.param_list.as_slice().write(mng, w)?;
self.param_list().write(mng, w)?;
write!(w, ")")
}
}
impl Driver for SetTemporary {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "reg_{} = ", self.var)?;
self.value.write(mng, w)
write!(w, "reg_{} = ", self.var())?;
self.value().write(mng, w)
}
}
impl Driver for SetLocal {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write_variable(self.var, mng, w)?;
write_variable(self.var(), mng, w)?;
write!(w, "= ")?;
self.value.write(mng, w)
self.value().write(mng, w)
}
}
impl Driver for SetGlobal {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "GLOBAL_LIST[{}].value = ", self.var)?;
self.value.write(mng, w)
write!(w, "GLOBAL_LIST[{}].value = ", self.var())?;
self.value().write(mng, w)
}
}
impl Driver for StoreAt {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
write!(w, "store_{}(memory_at_0, ", self.what.as_name())?;
self.pointer.write(mng, w)?;
write!(w, "store_{}(memory_at_0, ", self.store_type().as_name())?;
self.pointer().write(mng, w)?;
if self.offset != 0 {
write!(w, "+ {}", self.offset)?;
if self.offset() != 0 {
write!(w, "+ {}", self.offset())?;
}
write!(w, ", ")?;
self.value.write(mng, w)?;
self.value().write(mng, w)?;
write!(w, ")")
}
}
impl Driver for MemoryGrow {
fn write(&self, mng: &mut Manager, w: &mut dyn Write) -> Result<()> {
let result = self.result;
let memory = self.memory;
let result = self.result();
let memory = self.memory();
write!(w, "reg_{result} = rt.allocator.grow(memory_at_{memory}, ")?;
self.value.write(mng, w)?;
self.size().write(mng, w)?;
write!(w, ")")
}
}
@@ -320,14 +320,14 @@ impl Driver for Statement {
fn write_parameter_list(ast: &FuncData, w: &mut dyn Write) -> Result<()> {
write!(w, "function(")?;
write_ascending("param", 0..ast.num_param, w)?;
write_ascending("param", 0..ast.num_param(), w)?;
write!(w, ")")
}
fn write_variable_list(ast: &FuncData, w: &mut dyn Write) -> Result<()> {
let mut total = 0;
for data in ast.local_data.iter().filter(|v| v.count() != 0) {
for data in ast.local_data().iter().filter(|v| v.count() != 0) {
let range = total..total + usize::try_from(data.count()).unwrap();
let zero = if data.value_type() == ValueType::I64 {
"i64_K_ZERO "
@@ -344,9 +344,9 @@ fn write_variable_list(ast: &FuncData, w: &mut dyn Write) -> Result<()> {
write!(w, " ")?;
}
if ast.num_stack != 0 {
if ast.num_stack() != 0 {
write!(w, "local ")?;
write_ascending("reg", 0..ast.num_stack, w)?;
write_ascending("reg", 0..ast.num_stack(), w)?;
write!(w, " ")?;
}
@@ -366,12 +366,12 @@ impl Driver for FuncData {
}
mng.set_table_map(br_map);
mng.set_num_param(self.num_param);
self.code.write(mng, w)?;
mng.set_num_param(self.num_param());
self.code().write(mng, w)?;
if self.num_result != 0 {
if self.num_result() != 0 {
write!(w, "return ")?;
write_ascending("reg", 0..self.num_result, w)?;
write_ascending("reg", 0..self.num_result(), w)?;
write!(w, " ")?;
}
codegen-luau/src/translator.rs
+2 -2
View File
@@ -50,8 +50,8 @@ fn write_named_array(name: &str, len: usize, w: &mut dyn Write) -> Result<()> {
fn write_constant(code: &[Instruction], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
let func = Builder::from_type_info(type_info).build_anonymous(code);
if let Some(Statement::SetTemporary(stat)) = func.code.code.last() {
stat.value.write(&mut Manager::default(), w)?;
if let Some(Statement::SetTemporary(stat)) = func.code().code().last() {
stat.value().write(&mut Manager::default(), w)?;
} else {
panic!("Not a valid constant");
}