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

codegen fixes

Browse Source
This commit is contained in:
Mark Thom
2016-10-29 13:18:12 -06:00
parent 36ca0087c9
commit 63075c9739
3 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/l0/codegen.rs
View File

@@ -24,7 +24,7 @@ impl fmt::Display for MachineInstruction {
}
enum IntTerm<'a> {
FinishedClause(usize, &'a Atom, &'a Vec<Box<Term>>),
FinishedClause(usize, usize, &'a Atom, &'a Vec<Box<Term>>),
UnfinishedClause(usize, &'a Atom, &'a Vec<Box<Term>>),
FinishedAtom(usize, &'a Atom)
}
@@ -50,28 +50,33 @@ pub fn compile_query<'a>(t: &'a Term) -> Program
},
};
let mut max_reg_used : usize = 1;
while let Some(int_term) = stack.pop() {
match int_term {
IntTerm::UnfinishedClause(r, atom, terms) => {
stack.push(IntTerm::FinishedClause(r, atom, terms));
stack.push(IntTerm::FinishedClause(r, max_reg_used, atom, terms));
let mut counter : usize = r + 1;
let mut counter : usize = max_reg_used; // r + 1;
for t in terms {
if t.is_variable() && !variable_allocs.contains_key(t.name()) {
counter += 1;
variable_allocs.insert(t.name(), (counter, false));
} else if !t.is_variable() {
counter += 1;
}
counter += 1;
}
counter = r + terms.len();
max_reg_used = counter;
for t in terms.iter().rev() {
let r = if t.is_variable() {
variable_allocs.get(t.name()).unwrap().0
} else {
counter
let oc = counter;
counter -= 1;
oc
};
match t.as_ref() {
@@ -81,16 +86,14 @@ pub fn compile_query<'a>(t: &'a Term) -> Program
stack.push(IntTerm::UnfinishedClause(r, atom, terms)),
_ => {}
};
counter -= 1;
}
},
IntTerm::FinishedAtom(r, atom) =>
query.push(MachineInstruction::PutStructure(atom.clone(), 0, r)),
IntTerm::FinishedClause(r, atom, terms) => {
IntTerm::FinishedClause(r, mr, atom, terms) => {
query.push(MachineInstruction::PutStructure(atom.clone(), terms.len(), r));
let mut counter : usize = r + 1;
let mut counter : usize = mr + 1;
for t in terms {
if let &Term::Var(ref var) = t.as_ref() {
@@ -102,12 +105,17 @@ pub fn compile_query<'a>(t: &'a Term) -> Program
} else {
query.push(MachineInstruction::SetValue(reg));
}
if reg == counter {
counter += 1;
}
} else {
query.push(MachineInstruction::SetValue(counter));
counter += 1;
}
counter += 1;
}
max_reg_used = counter - 1;
}
};
}

44
src/l0/machine.rs
View File

@@ -163,37 +163,27 @@ impl MachineState {
self.h += 1;
},
MachineInstruction::UnifyVariable(reg) => {
if self.s < self.h {
match self.mode {
MachineMode::Read => self.registers[reg] = self.heap[self.s].clone(),
MachineMode::Write => {
self.heap.push(HeapCell::Ref(self.h));
self.registers[reg] = self.heap[self.h].clone();
self.h += 1;
}
};
self.s += 1;
} else {
self.fail = true;
}
match self.mode {
MachineMode::Read => self.registers[reg] = self.heap[self.s].clone(),
MachineMode::Write => {
self.heap.push(HeapCell::Ref(self.h));
self.registers[reg] = self.heap[self.h].clone();
self.h += 1;
}
};
},
MachineInstruction::UnifyValue(reg) => {
if self.s < self.h {
let s = self.s;
let s = self.s;
match self.mode {
MachineMode::Read => self.unify(Addr::RegNum(reg), Addr::HeapCell(s)),
MachineMode::Write => {
self.heap.push(self.registers[reg].clone());
self.h += 1;
}
};
match self.mode {
MachineMode::Read => self.unify(Addr::RegNum(reg), Addr::HeapCell(s)),
MachineMode::Write => {
self.heap.push(self.registers[reg].clone());
self.h += 1;
}
};
self.s += 1;
} else {
self.fail = true;
}
self.s += 1;
}
}
}

2
src/main.rs
View File

@@ -6,7 +6,7 @@ use l0::machine::{MachineState};
use std::io::{self, Write};
fn print_instructions(program : Program) {
fn print_instructions(program : &Program) {
for instruction in program {
println!("{:}", instruction);
}