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

read set_value args from temp regs of put_unsafe_value (#1812)

Browse Source
This commit is contained in:
Mark
2023-05-29 20:49:54 -06:00
parent e06ab1ca1c
commit 6093c2858d
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fixtures.rs
View File

@@ -258,6 +258,7 @@ pub(crate) struct UnsafeVarMarker {
pub(crate) safe_perm_vars: IndexSet<usize>, pub(crate) safe_perm_vars: IndexSet<usize>,
pub(crate) safe_temp_vars: IndexSet<usize>, pub(crate) safe_temp_vars: IndexSet<usize>,
pub(crate) temp_vars_to_perm_vars: IndexMap<usize, usize>, pub(crate) temp_vars_to_perm_vars: IndexMap<usize, usize>,
pub(crate) perm_vars_to_temp_vars: IndexMap<usize, usize>,
} }
impl UnsafeVarMarker { impl UnsafeVarMarker {
@@ -268,6 +269,7 @@ impl UnsafeVarMarker {
safe_perm_vars: IndexSet::new(), safe_perm_vars: IndexSet::new(),
safe_temp_vars: IndexSet::new(), safe_temp_vars: IndexSet::new(),
temp_vars_to_perm_vars: IndexMap::new(), temp_vars_to_perm_vars: IndexMap::new(),
perm_vars_to_temp_vars: IndexMap::new(),
} }
} }
@@ -344,14 +346,16 @@ impl UnsafeVarMarker {
if let Some(ph) = self.unsafe_perm_vars.swap_remove(&p) { if let Some(ph) = self.unsafe_perm_vars.swap_remove(&p) {
if ph == phase { if ph == phase {
*query_instr = Instruction::PutUnsafeValue(p, arg); *query_instr = Instruction::PutUnsafeValue(p, arg);
self.safe_perm_vars.insert(p); self.perm_vars_to_temp_vars.insert(p, arg);
} else { } else {
self.unsafe_perm_vars.insert(p, ph); self.unsafe_perm_vars.insert(p, ph);
} }
} }
} }
&mut Instruction::SetValue(r @ RegType::Perm(p)) &mut Instruction::SetValue(r @ RegType::Perm(p)) =>
if !self.safe_perm_vars.contains(&p) => { if let Some(t) = self.perm_vars_to_temp_vars.get(&p) {
*query_instr = Instruction::SetValue(RegType::Temp(*t));
} else {
*query_instr = Instruction::SetLocalValue(r); *query_instr = Instruction::SetLocalValue(r);
self.safe_perm_vars.insert(p); self.safe_perm_vars.insert(p);

20
src/heap_print.rs
View File

@@ -841,19 +841,19 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
} }
fn check_for_seen(&mut self) -> Option<HeapCellValue> { fn check_for_seen(&mut self) -> Option<HeapCellValue> {
if let Some(addr) = self.iter.next() { if let Some(cell) = self.iter.next() {
let is_cyclic = addr.get_forwarding_bit(); let is_cyclic = cell.get_forwarding_bit();
let addr = heap_bound_store( let cell = heap_bound_store(
self.iter.heap, self.iter.heap,
heap_bound_deref(self.iter.heap, addr), heap_bound_deref(self.iter.heap, cell),
); );
let addr = unmark_cell_bits!(addr); let cell = unmark_cell_bits!(cell);
match self.var_names.get(&addr).cloned() { match self.var_names.get(&cell).cloned() {
Some(var) if addr.is_var() => { Some(var) if cell.is_var() => {
// If addr is an unbound variable and maps to // If cell is an unbound variable and maps to
// a name via heap_locs, append the name to // a name via heap_locs, append the name to
// the current output, and return None. None // the current output, and return None. None
// short-circuits handle_heap_term. // short-circuits handle_heap_term.
@@ -868,7 +868,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
None None
} }
var_opt => { var_opt => {
if is_cyclic && addr.is_compound(self.iter.heap) { if is_cyclic && cell.is_compound(self.iter.heap) {
// self-referential variables are marked "cyclic". // self-referential variables are marked "cyclic".
match var_opt { match var_opt {
Some(var) => { Some(var) => {
@@ -889,7 +889,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
return None; return None;
} }
Some(addr) Some(cell)
} }
} }
} else { } else {