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

record places after inline instrs

Browse Source
This commit is contained in:
Mark Thom
2017-11-03 21:08:10 -06:00
parent 28069a301e
commit e78ffaabd8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/prolog/machine.rs
View File

@@ -408,11 +408,16 @@ impl Machine {
while self.ms.p < end_ptr { while self.ms.p < end_ptr {
if let CodePtr::TopLevel(mut cn, p) = self.ms.p { if let CodePtr::TopLevel(mut cn, p) = self.ms.p {
if let &Line::Control(ref ctrl_instr) = &self[CodePtr::TopLevel(cn, p)] { match &self[CodePtr::TopLevel(cn, p)] {
if ctrl_instr.is_jump_instr() { &Line::Control(ref ctrl_instr) if ctrl_instr.is_jump_instr() => {
self.record_var_places(cn, alloc_locs, heap_locs); self.record_var_places(cn, alloc_locs, heap_locs);
cn += 1; cn += 1;
} },
&Line::BuiltIn(BuiltInInstruction::IsAtomic(_))
| &Line::BuiltIn(BuiltInInstruction::IsVar(_)) => {
self.record_var_places(cn, alloc_locs, heap_locs);
},
_ => {}
} }
self.ms.p = CodePtr::TopLevel(cn, p); self.ms.p = CodePtr::TopLevel(cn, p);
@@ -424,11 +429,7 @@ impl Machine {
CodePtr::TopLevel(_, p) if p > 0 => {}, CodePtr::TopLevel(_, p) if p > 0 => {},
_ => break _ => break
}; };
} }
if let CodePtr::TopLevel(cn, _) = self.ms.p {
self.record_var_places(cn, alloc_locs, heap_locs);
}
} }
fn fail<'a>(&mut self) -> EvalSession<'a> fn fail<'a>(&mut self) -> EvalSession<'a>