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

remove add_term_to_free_list from AddToList (#1684)

Browse Source
This commit is contained in:
Mark Thom
2023-01-10 18:24:38 -07:00
parent a4e8bfc1ba
commit 0c4d93f01f
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/codegen.rs
View File

@@ -243,22 +243,14 @@ fn trim_structure_by_last_arg(instr: &mut Instruction, last_arg: &Term) {
} }
trait AddToFreeList<'a, Target: CompilationTarget<'a>> { trait AddToFreeList<'a, Target: CompilationTarget<'a>> {
fn add_term_to_free_list(&mut self, r: RegType);
fn add_subterm_to_free_list(&mut self, term: &Term); fn add_subterm_to_free_list(&mut self, term: &Term);
} }
impl<'a, 'b> AddToFreeList<'a, FactInstruction> for CodeGenerator<'b> { impl<'a, 'b> AddToFreeList<'a, FactInstruction> for CodeGenerator<'b> {
#[inline(always)]
fn add_term_to_free_list(&mut self, r: RegType) {
self.marker.add_to_free_list(r);
}
fn add_subterm_to_free_list(&mut self, _term: &Term) {} fn add_subterm_to_free_list(&mut self, _term: &Term) {}
} }
impl<'a, 'b> AddToFreeList<'a, QueryInstruction> for CodeGenerator<'b> { impl<'a, 'b> AddToFreeList<'a, QueryInstruction> for CodeGenerator<'b> {
fn add_term_to_free_list(&mut self, _r: RegType) {}
#[inline(always)] #[inline(always)]
fn add_subterm_to_free_list(&mut self, term: &Term) { fn add_subterm_to_free_list(&mut self, term: &Term) {
if let Some(cell) = structure_cell(term) { if let Some(cell) = structure_cell(term) {
@@ -382,8 +374,6 @@ impl<'b> CodeGenerator<'b> {
self.marker.mark_non_var::<Target>(lvl, term_loc, cell, &mut target); self.marker.mark_non_var::<Target>(lvl, term_loc, cell, &mut target);
target.push(Target::to_structure(name, terms.len(), cell.get())); target.push(Target::to_structure(name, terms.len(), cell.get()));
<CodeGenerator<'b> as AddToFreeList<'a, Target>>::add_term_to_free_list(self, cell.get());
if let Some(instr) = target.last_mut() { if let Some(instr) = target.last_mut() {
if let Some(term) = terms.last() { if let Some(term) = terms.last() {
trim_structure_by_last_arg(instr, term); trim_structure_by_last_arg(instr, term);
@@ -402,8 +392,6 @@ impl<'b> CodeGenerator<'b> {
self.marker.mark_non_var::<Target>(lvl, term_loc, cell, &mut target); self.marker.mark_non_var::<Target>(lvl, term_loc, cell, &mut target);
target.push(Target::to_list(lvl, cell.get())); target.push(Target::to_list(lvl, cell.get()));
<CodeGenerator<'b> as AddToFreeList<'a, Target>>::add_term_to_free_list(self, cell.get());
self.subterm_to_instr::<Target>(head, term_loc, &mut target); self.subterm_to_instr::<Target>(head, term_loc, &mut target);
self.subterm_to_instr::<Target>(tail, term_loc, &mut target); self.subterm_to_instr::<Target>(tail, term_loc, &mut target);

6
src/debray_allocator.rs
View File

@@ -214,10 +214,8 @@ impl DebrayAllocator {
pub fn add_to_free_list(&mut self, r: RegType) { pub fn add_to_free_list(&mut self, r: RegType) {
if let RegType::Temp(r) = r { if let RegType::Temp(r) = r {
if r > self.arity { self.in_use.remove(&r);
self.in_use.remove(&r); self.free_list.push(r);
self.free_list.push(r);
}
} }
} }
} }