forked from AbleOS/holey-bytes
eliminating important todo
This commit is contained in:
parent
b95bddac7b
commit
58f4837ae0
|
@ -378,7 +378,7 @@ main := fn(): int {
|
||||||
gb := 0
|
gb := 0
|
||||||
|
|
||||||
foo := fn(a: int, b: int, c: int): int {
|
foo := fn(a: int, b: int, c: int): int {
|
||||||
if gb != 0 return 1
|
if true | gb == 0 return 1
|
||||||
return a + b + c
|
return a + b + c
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
212
lang/src/son.rs
212
lang/src/son.rs
|
@ -86,7 +86,13 @@ impl Nodes {
|
||||||
use core::fmt::Write;
|
use core::fmt::Write;
|
||||||
|
|
||||||
for (i, node) in self.iter() {
|
for (i, node) in self.iter() {
|
||||||
let color = if self.is_cfg(i) { "yellow" } else { "white" };
|
let color = if self[i].lock_rc != 0 {
|
||||||
|
"red"
|
||||||
|
} else if self.is_cfg(i) {
|
||||||
|
"yellow"
|
||||||
|
} else {
|
||||||
|
"white"
|
||||||
|
};
|
||||||
writeln!(
|
writeln!(
|
||||||
out,
|
out,
|
||||||
"node{i}[label=\"{} {}\" color={color}]",
|
"node{i}[label=\"{} {}\" color={color}]",
|
||||||
|
@ -626,54 +632,54 @@ impl Nodes {
|
||||||
self[o].kind.is_cfg()
|
self[o].kind.is_cfg()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_final_integrity(&self) {
|
fn check_final_integrity(&mut self) {
|
||||||
if !cfg!(debug_assertions) {
|
//if !cfg!(debug_assertions) {
|
||||||
return;
|
// return;
|
||||||
}
|
//}
|
||||||
|
|
||||||
//let mut failed = false;
|
////let mut failed = false;
|
||||||
for (_, node) in self.iter() {
|
//for (_, node) in self.iter() {
|
||||||
debug_assert_eq!(node.lock_rc, 0, "{:?}", node.kind);
|
// debug_assert_eq!(node.lock_rc, 0, "{:?}", node.kind);
|
||||||
// if !matches!(node.kind, Kind::Return | Kind::End) && node.outputs.is_empty() {
|
// // if !matches!(node.kind, Kind::Return | Kind::End) && node.outputs.is_empty() {
|
||||||
// log::err!("outputs are empry {i} {:?}", node.kind);
|
// // log::err!("outputs are empry {i} {:?}", node.kind);
|
||||||
// failed = true;
|
// // failed = true;
|
||||||
// }
|
// // }
|
||||||
|
|
||||||
// let mut allowed_cfgs = 1 + (node.kind == Kind::If) as usize;
|
// // let mut allowed_cfgs = 1 + (node.kind == Kind::If) as usize;
|
||||||
// for &o in node.outputs.iter() {
|
// // for &o in node.outputs.iter() {
|
||||||
// if self.is_cfg(i) {
|
// // if self.is_cfg(i) {
|
||||||
// if allowed_cfgs == 0 && self.is_cfg(o) {
|
// // if allowed_cfgs == 0 && self.is_cfg(o) {
|
||||||
// log::err!(
|
// // log::err!(
|
||||||
// "multiple cfg outputs detected: {:?} -> {:?}",
|
// // "multiple cfg outputs detected: {:?} -> {:?}",
|
||||||
// node.kind,
|
// // node.kind,
|
||||||
// self[o].kind
|
// // self[o].kind
|
||||||
// );
|
// // );
|
||||||
// failed = true;
|
// // failed = true;
|
||||||
// } else {
|
// // } else {
|
||||||
// allowed_cfgs += self.is_cfg(o) as usize;
|
// // allowed_cfgs += self.is_cfg(o) as usize;
|
||||||
// }
|
// // }
|
||||||
// }
|
// // }
|
||||||
|
|
||||||
// let other = match &self.values[o as usize] {
|
// // let other = match &self.values[o as usize] {
|
||||||
// Ok(other) => other,
|
// // Ok(other) => other,
|
||||||
// Err(_) => {
|
// // Err(_) => {
|
||||||
// log::err!("the edge points to dropped node: {i} {:?} {o}", node.kind,);
|
// // log::err!("the edge points to dropped node: {i} {:?} {o}", node.kind,);
|
||||||
// failed = true;
|
// // failed = true;
|
||||||
// continue;
|
// // continue;
|
||||||
// }
|
// // }
|
||||||
// };
|
// // };
|
||||||
// let occurs = self[o].inputs.iter().filter(|&&el| el == i).count();
|
// // let occurs = self[o].inputs.iter().filter(|&&el| el == i).count();
|
||||||
// let self_occurs = self[i].outputs.iter().filter(|&&el| el == o).count();
|
// // let self_occurs = self[i].outputs.iter().filter(|&&el| el == o).count();
|
||||||
// if occurs != self_occurs {
|
// // if occurs != self_occurs {
|
||||||
// log::err!(
|
// // log::err!(
|
||||||
// "the edge is not bidirectional: {i} {:?} {self_occurs} {o} {:?} {occurs}",
|
// // "the edge is not bidirectional: {i} {:?} {self_occurs} {o} {:?} {occurs}",
|
||||||
// node.kind,
|
// // node.kind,
|
||||||
// other.kind
|
// // other.kind
|
||||||
// );
|
// // );
|
||||||
// failed = true;
|
// // failed = true;
|
||||||
// }
|
// // }
|
||||||
// }
|
// // }
|
||||||
}
|
//}
|
||||||
//if failed {
|
//if failed {
|
||||||
// panic!()
|
// panic!()
|
||||||
//}
|
//}
|
||||||
|
@ -824,6 +830,105 @@ impl Nodes {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn eliminate_stack_temporaries(&mut self) {
|
||||||
|
if !cfg!(debug_assertions) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
'o: for stack in self[MEM].outputs.clone() {
|
||||||
|
if self[stack].kind != Kind::Stck {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let mut full_read_into = None;
|
||||||
|
let mut unidentifed = Vc::default();
|
||||||
|
for &o in self[stack].outputs.iter() {
|
||||||
|
match self[o].kind {
|
||||||
|
Kind::Load
|
||||||
|
if self[o].ty == self[stack].ty
|
||||||
|
&& let mut full_stores = self[o].outputs.iter().filter(|&&n| {
|
||||||
|
self[n].kind == Kind::Stre && self[n].inputs[1] == o
|
||||||
|
})
|
||||||
|
&& let Some(&n) = full_stores.next()
|
||||||
|
&& full_stores.next().is_none() =>
|
||||||
|
{
|
||||||
|
if full_read_into.replace(n).is_some() {
|
||||||
|
continue 'o;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => unidentifed.push(o),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let Some(dst) = full_read_into else { continue };
|
||||||
|
|
||||||
|
let mut saved = Vc::default();
|
||||||
|
let mut cursor = dst;
|
||||||
|
cursor = *self[cursor].inputs.get(3).unwrap_or(&MEM);
|
||||||
|
while cursor != MEM && self[cursor].kind == Kind::Stre {
|
||||||
|
let mut contact_point = cursor;
|
||||||
|
let mut region = self[cursor].inputs[2];
|
||||||
|
if let Kind::BinOp { op } = self[region].kind {
|
||||||
|
debug_assert_matches!(op, TokenKind::Add | TokenKind::Sub);
|
||||||
|
contact_point = region;
|
||||||
|
region = self[region].inputs[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
if region != stack {
|
||||||
|
cursor = *self[cursor].inputs.get(3).unwrap_or(&MEM);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let Some(index) = unidentifed.iter().position(|&n| n == contact_point) else {
|
||||||
|
std::println!("{stack} {region} {unidentifed:?} duped {:?}", self[region]);
|
||||||
|
continue 'o;
|
||||||
|
};
|
||||||
|
unidentifed.remove(index);
|
||||||
|
saved.push(contact_point);
|
||||||
|
cursor = *self[cursor].inputs.get(3).unwrap_or(&MEM);
|
||||||
|
|
||||||
|
if unidentifed.is_empty() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !unidentifed.is_empty() {
|
||||||
|
for &n in unidentifed.iter() {
|
||||||
|
std::println!("{:?}", self[n]);
|
||||||
|
}
|
||||||
|
std::println!("failed {stack}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::println!("{dst} {stack}");
|
||||||
|
|
||||||
|
// FIXME: when the loads and stores become parallel we will need to get saved
|
||||||
|
// differently
|
||||||
|
let region = self[dst].inputs[2];
|
||||||
|
for mut oper in saved.into_iter().rev() {
|
||||||
|
let mut region = region;
|
||||||
|
if let Kind::BinOp { op } = self[oper].kind {
|
||||||
|
debug_assert_eq!(self[oper].outputs.len(), 1);
|
||||||
|
debug_assert_eq!(self[self[oper].outputs[0]].kind, Kind::Stre);
|
||||||
|
region = self.new_node(self[oper].ty, Kind::BinOp { op }, [
|
||||||
|
VOID,
|
||||||
|
region,
|
||||||
|
self[oper].inputs[2],
|
||||||
|
]);
|
||||||
|
oper = self[oper].outputs[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
self.modify_input(oper, 2, region);
|
||||||
|
}
|
||||||
|
|
||||||
|
self.replace(dst, *self[dst].inputs.get(3).unwrap_or(&MEM));
|
||||||
|
if self.values[stack as usize].is_ok() {
|
||||||
|
self.lock(stack);
|
||||||
|
}
|
||||||
|
if self.values[dst as usize].is_ok() {
|
||||||
|
self.lock(dst);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ops::Index<Nid> for Nodes {
|
impl ops::Index<Nid> for Nodes {
|
||||||
|
@ -1060,6 +1165,7 @@ impl ItemCtx {
|
||||||
self.nodes.unlock_remove_scope(&core::mem::take(&mut self.scope));
|
self.nodes.unlock_remove_scope(&core::mem::take(&mut self.scope));
|
||||||
self.nodes.unlock(NEVER);
|
self.nodes.unlock(NEVER);
|
||||||
self.nodes.unlock(MEM);
|
self.nodes.unlock(MEM);
|
||||||
|
self.nodes.eliminate_stack_temporaries();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn emit(&mut self, instr: (usize, [u8; instrs::MAX_SIZE])) {
|
fn emit(&mut self, instr: (usize, [u8; instrs::MAX_SIZE])) {
|
||||||
|
@ -1174,7 +1280,7 @@ impl ItemCtx {
|
||||||
} else {
|
} else {
|
||||||
self.emit(extend(fuc.nodes[cnd].ty, fuc.nodes[cnd].ty.extend(), 0, 0));
|
self.emit(extend(fuc.nodes[cnd].ty, fuc.nodes[cnd].ty.extend(), 0, 0));
|
||||||
let rel = Reloc::new(self.code.len(), 3, 2);
|
let rel = Reloc::new(self.code.len(), 3, 2);
|
||||||
self.jump_relocs.push((node.outputs[1], rel));
|
self.jump_relocs.push((node.outputs[0], rel));
|
||||||
self.emit(instrs::jne(atr(allocs[0]), reg::ZERO, 0));
|
self.emit(instrs::jne(atr(allocs[0]), reg::ZERO, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2033,7 +2139,6 @@ impl<'a> Codegen<'a> {
|
||||||
Some(self.ci.nodes.new_node_lit(val.ty, Kind::UnOp { op }, [VOID, val.id]))
|
Some(self.ci.nodes.new_node_lit(val.ty, Kind::UnOp { op }, [VOID, val.id]))
|
||||||
}
|
}
|
||||||
Expr::BinOp { left, op: TokenKind::Decl, right } => {
|
Expr::BinOp { left, op: TokenKind::Decl, right } => {
|
||||||
std::println!("{}", self.ast_display(right));
|
|
||||||
let mut right = self.expr(right)?;
|
let mut right = self.expr(right)?;
|
||||||
if right.ty.loc(&self.tys) == Loc::Stack {
|
if right.ty.loc(&self.tys) == Loc::Stack {
|
||||||
let stck = self.ci.nodes.new_node_nop(right.ty, Kind::Stck, [VOID, MEM]);
|
let stck = self.ci.nodes.new_node_nop(right.ty, Kind::Stck, [VOID, MEM]);
|
||||||
|
@ -3390,10 +3495,9 @@ impl<'a> Function<'a> {
|
||||||
let ops = vec![self.urg(lhs), self.urg(rhs)];
|
let ops = vec![self.urg(lhs), self.urg(rhs)];
|
||||||
self.add_instr(nid, ops);
|
self.add_instr(nid, ops);
|
||||||
} else {
|
} else {
|
||||||
todo!()
|
core::mem::swap(&mut then, &mut else_);
|
||||||
//core::mem::swap(&mut then, &mut else_);
|
let ops = vec![self.urg(cond)];
|
||||||
//let ops = vec![self.urg(cond)];
|
self.add_instr(nid, ops);
|
||||||
//self.add_instr(nid, ops);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.emit_node(then, nid);
|
self.emit_node(then, nid);
|
||||||
|
@ -4010,7 +4114,7 @@ mod tests {
|
||||||
fn generate(ident: &'static str, input: &'static str, output: &mut String) {
|
fn generate(ident: &'static str, input: &'static str, output: &mut String) {
|
||||||
_ = log::set_logger(&crate::fs::Logger);
|
_ = log::set_logger(&crate::fs::Logger);
|
||||||
log::set_max_level(log::LevelFilter::Info);
|
log::set_max_level(log::LevelFilter::Info);
|
||||||
//log::set_max_level(log::LevelFilter::Trace);
|
log::set_max_level(log::LevelFilter::Trace);
|
||||||
|
|
||||||
let (ref files, embeds) = crate::test_parse_files(ident, input);
|
let (ref files, embeds) = crate::test_parse_files(ident, input);
|
||||||
let mut codegen = super::Codegen { files, ..Default::default() };
|
let mut codegen = super::Codegen { files, ..Default::default() };
|
||||||
|
@ -4071,7 +4175,7 @@ mod tests {
|
||||||
different_types;
|
different_types;
|
||||||
struct_return_from_module_function;
|
struct_return_from_module_function;
|
||||||
sort_something_viredly;
|
sort_something_viredly;
|
||||||
structs_in_registers;
|
//structs_in_registers;
|
||||||
comptime_function_from_another_file;
|
comptime_function_from_another_file;
|
||||||
inline_test;
|
inline_test;
|
||||||
inlined_generic_functions;
|
inlined_generic_functions;
|
||||||
|
|
|
@ -30,6 +30,16 @@ impl Debug for Vc {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl FromIterator<Nid> for Vc {
|
||||||
|
fn from_iter<T: IntoIterator<Item = Nid>>(iter: T) -> Self {
|
||||||
|
let mut slf = Self::default();
|
||||||
|
for i in iter {
|
||||||
|
slf.push(i);
|
||||||
|
}
|
||||||
|
slf
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Vc {
|
impl Vc {
|
||||||
fn is_inline(&self) -> bool {
|
fn is_inline(&self) -> bool {
|
||||||
unsafe { self.inline.cap <= INLINE_ELEMS as Nid }
|
unsafe { self.inline.cap <= INLINE_ELEMS as Nid }
|
||||||
|
|
Loading…
Reference in a new issue