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

introduce CutPoint heap tag so that they can be offset by call_continuation/1

Browse Source
This commit is contained in:
Mark
2023-06-29 12:14:06 -06:00
parent 83f352b95e
commit c36bd4dc07
7 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/dispatch.rs
View File

@@ -1149,17 +1149,17 @@ impl Machine {
&Instruction::GetLevel(r) => {
let b0 = self.machine_st.b0;
self.machine_st[r] = fixnum_as_cell!(Fixnum::build_with(b0 as i64));
self.machine_st[r] = fixnum_as_cell!(Fixnum::as_cutpoint(b0 as i64));
self.machine_st.p += 1;
}
&Instruction::GetPrevLevel(r) => {
let prev_b = self.machine_st.stack.index_or_frame(self.machine_st.b).prelude.b;
self.machine_st[r] = fixnum_as_cell!(Fixnum::build_with(prev_b as i64));
self.machine_st[r] = fixnum_as_cell!(Fixnum::as_cutpoint(prev_b as i64));
self.machine_st.p += 1;
}
&Instruction::GetCutPoint(r) => {
self.machine_st[r] = fixnum_as_cell!(Fixnum::build_with(self.machine_st.b as i64));
self.machine_st[r] = fixnum_as_cell!(Fixnum::as_cutpoint(self.machine_st.b as i64));
self.machine_st.p += 1;
}
&Instruction::Cut(r) => {

2
src/machine/machine_state.rs
View File

@@ -821,7 +821,7 @@ impl MachineState {
let b = self.b;
read_heap_cell!(value,
(HeapCellValueTag::Fixnum, b0) => {
(HeapCellValueTag::CutPoint, b0) => {
let b0 = b0.get_num() as usize;
if b > b0 {

16
src/machine/system_calls.rs
View File

@@ -981,7 +981,7 @@ impl MachineState {
self.p = cp + 1;
// adjust cut point to occur after call_continuation.
/*
if num_cells > 0 {
if let HeapCellValueTag::Fixnum = self.heap[s + 2].get_tag() {
and_frame[1] = fixnum_as_cell!(Fixnum::build_with(self.b as i64));
@@ -989,9 +989,15 @@ impl MachineState {
and_frame[1] = self.heap[s + 2];
}
}
*/
for index in s + 3..s + 2 + num_cells {
and_frame[index - (s + 1)] = self.heap[index];
for index in s + 2..s + 2 + num_cells {
if let HeapCellValueTag::CutPoint = self.heap[index].get_tag() {
// adjust cut point to occur after call_continuation.
and_frame[index - (s + 1)] = fixnum_as_cell!(Fixnum::as_cutpoint(self.b as i64));
} else {
and_frame[index - (s + 1)] = self.heap[index];
}
}
self.e = e;
@@ -5557,13 +5563,13 @@ impl Machine {
#[inline(always)]
pub(crate) fn get_b_value(&mut self) {
let n = Fixnum::build_with(i64::try_from(self.machine_st.b).unwrap());
let n = Fixnum::as_cutpoint(i64::try_from(self.machine_st.b).unwrap());
self.machine_st.unify_fixnum(n, self.machine_st.registers[1]);
}
#[inline(always)]
pub(crate) fn get_cut_point(&mut self) {
let n = Fixnum::build_with(i64::try_from(self.machine_st.b0).unwrap());
let n = Fixnum::as_cutpoint(i64::try_from(self.machine_st.b0).unwrap());
self.machine_st.unify_fixnum(n, self.machine_st.registers[1]);
}