koniifer/holey-bytes
1
0
Fork 0
forked from AbleOS/holey-bytes
Code Pull requests Activity

fixed a binor uga buga

Browse source
This commit is contained in:
Jakub Doka 2024-10-26 01:07:35 +02:00
parent 2fc24f0f58
commit 855da58e06
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lang/src/son.rs
View file

@ -3800,7 +3800,7 @@ impl<'a> Function<'a> {
block.push(self.rg(ph)); block.push(self.rg(ph));
} }
self.blocks[self.nodes[nid].ralloc_backref as usize].params = block; self.blocks[self.nodes[nid].ralloc_backref as usize].params = block;
self.reschedule_block(&mut node.outputs); self.reschedule_block(nid, &mut node.outputs);
for o in node.outputs.into_iter().rev() { for o in node.outputs.into_iter().rev() {
self.emit_node(o, nid); self.emit_node(o, nid);
} }
@ -3874,7 +3874,7 @@ impl<'a> Function<'a> {
)]); )]);
} }
self.reschedule_block(&mut node.outputs); self.reschedule_block(nid, &mut node.outputs);
for o in node.outputs.into_iter().rev() { for o in node.outputs.into_iter().rev() {
self.emit_node(o, nid); self.emit_node(o, nid);
} }
@ -3882,7 +3882,7 @@ impl<'a> Function<'a> {
Kind::Then | Kind::Else => { Kind::Then | Kind::Else => {
self.nodes[nid].ralloc_backref = self.add_block(nid); self.nodes[nid].ralloc_backref = self.add_block(nid);
self.bridge(prev, nid); self.bridge(prev, nid);
self.reschedule_block(&mut node.outputs); self.reschedule_block(nid, &mut node.outputs);
for o in node.outputs.into_iter().rev() { for o in node.outputs.into_iter().rev() {
self.emit_node(o, nid); self.emit_node(o, nid);
} }
@ -3983,7 +3983,7 @@ impl<'a> Function<'a> {
self.add_instr(nid, ops); self.add_instr(nid, ops);
self.reschedule_block(&mut node.outputs); self.reschedule_block(nid, &mut node.outputs);
for o in node.outputs.into_iter().rev() { for o in node.outputs.into_iter().rev() {
if self.nodes[o].inputs[0] == nid if self.nodes[o].inputs[0] == nid
|| (matches!(self.nodes[o].kind, Kind::Loop | Kind::Region) || (matches!(self.nodes[o].kind, Kind::Loop | Kind::Region)
@ -4073,7 +4073,8 @@ impl<'a> Function<'a> {
.push(regalloc2::Block::new(self.nodes[pred].ralloc_backref as usize)); .push(regalloc2::Block::new(self.nodes[pred].ralloc_backref as usize));
} }
fn reschedule_block(&mut self, outputs: &mut Vc) { fn reschedule_block(&mut self, from: Nid, outputs: &mut Vc) {
let from = Some(&from);
let mut buf = Vec::with_capacity(outputs.len()); let mut buf = Vec::with_capacity(outputs.len());
let mut seen = BitSet::default(); let mut seen = BitSet::default();
seen.clear(self.nodes.values.len()); seen.clear(self.nodes.values.len());
@ -4089,11 +4090,11 @@ impl<'a> Function<'a> {
buf.push(o); buf.push(o);
while let Some(&n) = buf.get(cursor) { while let Some(&n) = buf.get(cursor) {
for &i in &self.nodes[n].inputs[1..] { for &i in &self.nodes[n].inputs[1..] {
if self.nodes[n].inputs.first() == self.nodes[i].inputs.first() if from == self.nodes[i].inputs.first()
&& self.nodes[i].outputs.iter().all(|&o| { && self.nodes[i]
self.nodes[o].inputs.first() != self.nodes[i].inputs.first() .outputs
|| seen.get(o) .iter()
}) .all(|&o| self.nodes[o].inputs.first() != from || seen.get(o))
&& seen.set(i) && seen.set(i)
{ {
buf.push(i); buf.push(i);
@ -4111,11 +4112,11 @@ impl<'a> Function<'a> {
buf.push(o); buf.push(o);
while let Some(&n) = buf.get(cursor) { while let Some(&n) = buf.get(cursor) {
for &i in &self.nodes[n].inputs[1..] { for &i in &self.nodes[n].inputs[1..] {
if self.nodes[n].inputs.first() == self.nodes[i].inputs.first() if from == self.nodes[i].inputs.first()
&& self.nodes[i].outputs.iter().all(|&o| { && self.nodes[i]
self.nodes[o].inputs.first() != self.nodes[i].inputs.first() .outputs
|| seen.get(o) .iter()
}) .all(|&o| self.nodes[o].inputs.first() != from || seen.get(o))
&& seen.set(i) && seen.set(i)
{ {
buf.push(i); buf.push(i);
@ -4125,7 +4126,12 @@ impl<'a> Function<'a> {
} }
} }
debug_assert!(outputs.len() == buf.len() || outputs.len() == buf.len() + 1,); debug_assert!(
outputs.len() == buf.len() || outputs.len() == buf.len() + 1,
"{:?} {:?}",
outputs,
buf
);
if buf.len() + 1 == outputs.len() { if buf.len() + 1 == outputs.len() {
outputs.remove(outputs.len() - 1); outputs.remove(outputs.len() - 1);