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

remove LocalCodePtr::IndexingBuf

Browse Source
This commit is contained in:
Mark Thom
2021-12-15 23:41:00 -07:00
parent b056d40eba
commit 6f9b6a29c4
8 changed files with 233 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/system_calls.rs
View File

@@ -3145,7 +3145,7 @@ impl MachineState {
let p_functor = self.store(self.deref(self.registers[2]));
let p = to_local_code_ptr(&self.heap, p_functor).unwrap();
let num_cells = match code_repo.lookup_instr(self.last_call, &CodePtr::Local(p)) {
let num_cells = match code_repo.lookup_instr(self, &CodePtr::Local(p)) {
Some(line) => {
let perm_vars = match line.as_ref() {
Line::Control(ref ctrl_instr) => ctrl_instr.perm_vars(),
@@ -3720,7 +3720,7 @@ impl MachineState {
}
};
if p.is_reset_cont_marker(code_repo, self.last_call) {
if self.is_reset_cont_marker(&code_repo, p) {
return return_from_clause!(self.last_call, self);
}
@@ -4408,7 +4408,7 @@ impl MachineState {
let mut cp = self.cp;
while e > 0 {
if cp.is_reset_cont_marker(code_repo, self.last_call) {
if self.is_reset_cont_marker(code_repo, cp) {
self.e = e;
self.p = CodePtr::Local(cp + 1); // skip the reset marker.