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

74
src/l0/codegen.rs
View File

@@ -24,7 +24,7 @@ impl fmt::Display for MachineInstruction {
} }
enum IntTerm<'a> { 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>>), UnfinishedClause(usize, &'a Atom, &'a Vec<Box<Term>>),
FinishedAtom(usize, &'a Atom) FinishedAtom(usize, &'a Atom)
} }
@@ -38,7 +38,7 @@ pub fn compile_query<'a>(t: &'a Term) -> Program
match t { match t {
&Term::Clause(ref atom, ref terms) => { &Term::Clause(ref atom, ref terms) => {
stack.push(IntTerm::UnfinishedClause(1, atom, terms)); stack.push(IntTerm::UnfinishedClause(1, atom, terms));
variable_allocs.insert(atom, (1, true)); variable_allocs.insert(atom, (1, true));
}, },
&Term::Atom(ref atom) => { &Term::Atom(ref atom) => {
query.push(MachineInstruction::PutStructure(atom.clone(), 0, 1)); query.push(MachineInstruction::PutStructure(atom.clone(), 0, 1));
@@ -50,48 +50,51 @@ pub fn compile_query<'a>(t: &'a Term) -> Program
}, },
}; };
let mut max_reg_used : usize = 1;
while let Some(int_term) = stack.pop() { while let Some(int_term) = stack.pop() {
match int_term { match int_term {
IntTerm::UnfinishedClause(r, atom, terms) => { 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 { for t in terms {
if t.is_variable() && !variable_allocs.contains_key(t.name()) { if t.is_variable() && !variable_allocs.contains_key(t.name()) {
variable_allocs.insert(t.name(), (counter, false)); 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() { for t in terms.iter().rev() {
let r = if t.is_variable() { let r = if t.is_variable() {
variable_allocs.get(t.name()).unwrap().0 variable_allocs.get(t.name()).unwrap().0
} else { } else {
counter let oc = counter;
}; counter -= 1;
oc
match t.as_ref() {
&Term::Atom(ref atom) =>
stack.push(IntTerm::FinishedAtom(r, atom)),
&Term::Clause(ref atom, ref terms) =>
stack.push(IntTerm::UnfinishedClause(r, atom, terms)),
_ => {}
}; };
counter -= 1; match t.as_ref() {
&Term::Atom(ref atom) =>
stack.push(IntTerm::FinishedAtom(r, atom)),
&Term::Clause(ref atom, ref terms) =>
stack.push(IntTerm::UnfinishedClause(r, atom, terms)),
_ => {}
};
} }
}, },
IntTerm::FinishedAtom(r, atom) => IntTerm::FinishedAtom(r, atom) =>
query.push(MachineInstruction::PutStructure(atom.clone(), 0, r)), 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)); 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 { for t in terms {
if let &Term::Var(ref var) = t.as_ref() { if let &Term::Var(ref var) = t.as_ref() {
let &mut (reg, ref mut seen) = variable_allocs.get_mut(var).unwrap(); let &mut (reg, ref mut seen) = variable_allocs.get_mut(var).unwrap();
@@ -102,12 +105,17 @@ pub fn compile_query<'a>(t: &'a Term) -> Program
} else { } else {
query.push(MachineInstruction::SetValue(reg)); query.push(MachineInstruction::SetValue(reg));
} }
if reg == counter {
counter += 1;
}
} else { } else {
query.push(MachineInstruction::SetValue(counter)); query.push(MachineInstruction::SetValue(counter));
} counter += 1;
}
counter += 1;
} }
max_reg_used = counter - 1;
} }
}; };
} }
@@ -121,15 +129,15 @@ pub fn compile_fact<'a>(t: &'a Term) -> Program {
let mut variable_allocs : HashMap<&Var, usize> = HashMap::new(); let mut variable_allocs : HashMap<&Var, usize> = HashMap::new();
let mut fact : Program = Vec::new(); let mut fact : Program = Vec::new();
queue.push_back((1, t)); queue.push_back((1, t));
while let Some(t) = queue.pop_front() { while let Some(t) = queue.pop_front() {
match t { match t {
(r, &Term::Clause(ref atom, ref terms)) => { (r, &Term::Clause(ref atom, ref terms)) => {
fact.push(MachineInstruction::GetStructure(atom.clone(), terms.len(), r)); fact.push(MachineInstruction::GetStructure(atom.clone(), terms.len(), r));
let mut counter : usize = reg; let mut counter : usize = reg;
for t in terms { for t in terms {
if t.is_variable() && !variable_allocs.contains_key(t.name()) { if t.is_variable() && !variable_allocs.contains_key(t.name()) {
variable_allocs.insert(t.name(), counter); variable_allocs.insert(t.name(), counter);
@@ -142,7 +150,7 @@ pub fn compile_fact<'a>(t: &'a Term) -> Program {
fact.push(MachineInstruction::UnifyVariable(counter)); fact.push(MachineInstruction::UnifyVariable(counter));
queue.push_back((counter, t)); queue.push_back((counter, t));
counter += 1; counter += 1;
} }
} }
reg = counter; reg = counter;

46
src/l0/machine.rs
View File

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

4
src/main.rs
View File

@@ -6,7 +6,7 @@ use l0::machine::{MachineState};
use std::io::{self, Write}; use std::io::{self, Write};
fn print_instructions(program : Program) { fn print_instructions(program : &Program) {
for instruction in program { for instruction in program {
println!("{:}", instruction); println!("{:}", instruction);
} }
@@ -42,7 +42,7 @@ fn l0_repl<'a>() {
Ok(TopLevel::Query(query)) => { Ok(TopLevel::Query(query)) => {
if let Some(program) = ms.program.clone().take() { if let Some(program) = ms.program.clone().take() {
let query = compile_query(&query); let query = compile_query(&query);
for instruction in query { for instruction in query {
ms.execute(instruction); ms.execute(instruction);
} }