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

Merge pull request #1655 from triska/deref_register

Browse Source 
more uses of newly available deref_register(n)
This commit is contained in:
Mark Thom
2022-12-10 18:08:26 +01:00
committed by GitHub
parent afa9703eb5 309e5b320e
commit d5db0c641c
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/machine/system_calls.rs
View File

@@ -4165,11 +4165,8 @@ impl Machine {
#[inline(always)] #[inline(always)]
pub(crate) fn op_declaration(&mut self) -> CallResult { pub(crate) fn op_declaration(&mut self) -> CallResult {
let priority = self.machine_st.registers[1]; let priority = self.deref_register(1);
let specifier = self.machine_st.registers[2]; let specifier = cell_as_atom_cell!(self.deref_register(2)).get_name();
let op = self.machine_st.registers[3];
let priority = self.machine_st.store(self.machine_st.deref(priority));
let priority = match Number::try_from(priority) { let priority = match Number::try_from(priority) {
Ok(Number::Integer(n)) => n.to_u16().unwrap(), Ok(Number::Integer(n)) => n.to_u16().unwrap(),
@@ -4179,10 +4176,7 @@ impl Machine {
} }
}; };
let specifier = cell_as_atom_cell!(self.machine_st.store(self.machine_st.deref(specifier))) let op = read_heap_cell!(self.deref_register(3),
.get_name();
let op = read_heap_cell!(self.machine_st.store(self.machine_st.deref(op)),
(HeapCellValueTag::Char, c) => { (HeapCellValueTag::Char, c) => {
self.machine_st.atom_tbl.build_with(&c.to_string()) self.machine_st.atom_tbl.build_with(&c.to_string())
} }
@@ -4283,16 +4277,15 @@ impl Machine {
#[inline(always)] #[inline(always)]
pub(crate) fn get_attr_var_queue_delimiter(&mut self) { pub(crate) fn get_attr_var_queue_delimiter(&mut self) {
let addr = self.machine_st.registers[1]; let addr = self.deref_register(1);
let value = Fixnum::build_with(self.machine_st.attr_var_init.attr_var_queue.len() as i64); let value = Fixnum::build_with(self.machine_st.attr_var_init.attr_var_queue.len() as i64);
self.machine_st.unify_fixnum(value, self.machine_st.store(self.machine_st.deref(addr))); self.machine_st.unify_fixnum(value, addr);
} }
#[inline(always)] #[inline(always)]
pub(crate) fn get_attr_var_queue_beyond(&mut self) { pub(crate) fn get_attr_var_queue_beyond(&mut self) {
let addr = self.machine_st.registers[1]; let addr = self.deref_register(1);
let addr = self.machine_st.store(self.machine_st.deref(addr));
let b = match Number::try_from(addr) { let b = match Number::try_from(addr) {
Ok(Number::Integer(n)) => n.to_usize(), Ok(Number::Integer(n)) => n.to_usize(),