diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix broken, complicated code for slots

Browse Source
This commit is contained in:
Vitor Santos Costa 2013-11-20 22:22:33 +00:00
parent 94f1b223f7
commit ee179f316a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
C/heapgc.c
View File

@ -1915,20 +1915,20 @@ mark_trail(tr_fr_ptr trail_ptr, tr_fr_ptr trail_base, CELL *gc_H, choiceptr gc_B
static void static void
mark_slots( USES_REGS1 ) mark_slots( USES_REGS1 )
{ {
Int curslot = CurSlot; Int curslot = LOCAL_CurSlot;
while (curslot) { while (curslot) {
CELL *ptr = LCL0-curslot; CELL *ptr = LCL0-curslot;
Int ns = IntegerOfTerm(*ptr); Int ns = IntegerOfTerm(ptr[-1]);
curslot = IntegerOfTerm(ptr[0]);
ptr++; fprintf(stderr,"%ld\n", curslot);
ptr-=2;
while (ns > 0) { while (ns > 0) {
// Yap_DebugPlWrite(ptr); Yap_DebugPlWrite(ptr);
//fprintf(stderr,"\n"); fprintf(stderr,"\n");
mark_external_reference(ptr PASS_REGS); mark_external_reference(ptr PASS_REGS);
ptr++; ptr--;
ns--; ns--;
} }
curslot = IntegerOfTerm(*ptr);
} }
} }
@ -2930,11 +2930,12 @@ sweep_environments(CELL_PTR gc_ENV, OPREG size, CELL *pvbmap USES_REGS)
static void static void
sweep_slots( USES_REGS1 ) sweep_slots( USES_REGS1 )
{ {
Int curslot = CurSlot; Int curslot = LOCAL_CurSlot;
while (curslot) { while (curslot) {
CELL *ptr = LCL0-curslot; CELL *ptr = LCL0-curslot;
Int ns = IntOfTerm(*ptr); Int ns = IntOfTerm(ptr[-1]);
ptr++; curslot = IntegerOfTerm(ptr[0]);
ptr-=2;
while (ns > 0) { while (ns > 0) {
CELL cp_cell = *ptr; CELL cp_cell = *ptr;
if (MARKED_PTR(ptr)) { if (MARKED_PTR(ptr)) {
@ -2943,10 +2944,9 @@ sweep_slots( USES_REGS1 )
into_relocation_chain(ptr, GET_NEXT(cp_cell) PASS_REGS); into_relocation_chain(ptr, GET_NEXT(cp_cell) PASS_REGS);
} }
} }
ptr++; ptr--;
ns--; ns--;
} }
curslot = IntegerOfTerm(*ptr);
} }
} }