rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add queues, fix debray allocator bug.

Browse Source
This commit is contained in:
Mark Thom
2018-03-08 00:29:56 -07:00
parent 10db0f58dd
commit 179e425fb6
5 changed files with 86 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/prolog/debray_allocator.rs
View File

@@ -123,15 +123,13 @@ impl DebrayAllocator {
if r != k {
let r = RegType::Temp(r);
if r.reg_num() != k {
target.push(Target::move_to_register(r, k));
self.contents.remove(&k);
self.contents.insert(r.reg_num(), var.clone());
self.record_register(var, r);
self.in_use.insert(r.reg_num());
}
target.push(Target::move_to_register(r, k));
self.contents.remove(&k);
self.contents.insert(r.reg_num(), var.clone());
self.record_register(var, r);
self.in_use.insert(r.reg_num());
}
},
_ => {}
@@ -218,7 +216,7 @@ impl<'a> Allocator<'a> for DebrayAllocator
}
};
}
fn mark_non_var<Target>(&mut self, lvl: Level, term_loc: GenContext,
cell: &Cell<RegType>, target: &mut Vec<Target>)
where Target: CompilationTarget<'a>
@@ -336,8 +334,17 @@ impl<'a> Allocator<'a> for DebrayAllocator
self.bindings
}
fn reset_at_head(&mut self, args: &Vec<Box<Term>>) {
for (idx, arg) in args.iter().enumerate() {
if let &Term::Var(_, ref var) = arg.as_ref() {
self.contents.insert(idx + 1, var.clone());
self.in_use.insert(idx + 1);
}
}
}
fn reset_arg(&mut self, arity: usize) {
self.arg_c = 1;
self.temp_lb = arity + 1;
self.temp_lb = arity + 1;
}
}