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

more fixes

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@869 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2003-09-15 17:56:27 +00:00
parent c14a52c419
commit ac19e411a2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/dbase.c
View File

@ -1766,7 +1766,7 @@ record_lu(PredEntry *pe, Term t, int position)
cl->Id = FunctorDBRef; cl->Id = FunctorDBRef;
cl->ClFlags = LogUpdMask; cl->ClFlags = LogUpdMask;
cl->ClSource = x; cl->ClSource = x;
cl->Owner = Yap_ConsultingFile(); cl->Owner = AtomUser;
cl->ClRefCount = 0; cl->ClRefCount = 0;
cl->ClPred = pe; cl->ClPred = pe;
cl->ClExt = NULL; cl->ClExt = NULL;

19
C/index.c
View File

@ -4883,8 +4883,8 @@ inserta_in_lu_block(LogUpdIndex *blk, PredEntry *ap, yamop *code)
} }
/* ok, we are in a sequence of try-retry-trust instructions, or something /* ok, we are in a sequence of try-retry-trust instructions, or something
similar */ similar */
here = next = NEXTOP(blk->ClCode, Ill); here = next = blk->ClCode->u.Ill.l1;
start = blk->ClCode->u.Ill.l1; start = NEXTOP(blk->ClCode,Ill);
here = PREVOP(here, ld); here = PREVOP(here, ld);
/* follow profiling and counting instructions */ /* follow profiling and counting instructions */
if (ap->PredFlags & ProfiledPredFlag) { if (ap->PredFlags & ProfiledPredFlag) {
@ -4897,19 +4897,16 @@ inserta_in_lu_block(LogUpdIndex *blk, PredEntry *ap, yamop *code)
} }
if (here >= start) { if (here >= start) {
/* we got space to put something in */ /* we got space to put something in */
op_numbers sop = Yap_op_from_opcode(start->opc); op_numbers sop = Yap_op_from_opcode(next->opc);
if (sop != _retry_killed) { if (sop != _retry_killed) {
next->opc = Yap_opcode(_retry); next->opc = Yap_opcode(_retry);
} }
start->u.Ill.l1 = here; blk->ClCode->u.Ill.l1 = here;
start->u.Ill.s++; blk->ClCode->u.Ill.s++;
if (sop == _retry_killed) here->opc = Yap_opcode(_try_clause);
here->opc = Yap_opcode(_try_clause);
else
here->opc = Yap_opcode(sop);
here->u.ld.s = next->u.ld.s; here->u.ld.s = next->u.ld.s;
here->u.ld.p = ap; here->u.ld.p = ap;
here->u.ld.d = next->u.ld.d; here->u.ld.d = code;
#ifdef YAPOR #ifdef YAPOR
/* FIX ME */ /* FIX ME */
here->u.ld.or_arg = next->u.ld.or_arg; here->u.ld.or_arg = next->u.ld.or_arg;
@ -4927,7 +4924,7 @@ inserta_in_lu_block(LogUpdIndex *blk, PredEntry *ap, yamop *code)
here->opc = Yap_opcode(_retry_profiled); here->opc = Yap_opcode(_retry_profiled);
here->u.p.p = ap; here->u.p.p = ap;
} }
return start; return blk->ClCode;
} else { } else {
return replace_lu_block(blk, RECORDA, ap, code, has_cut(code)); return replace_lu_block(blk, RECORDA, ap, code, has_cut(code));
} }

5
C/tracer.c
View File

@ -113,8 +113,11 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
/* extern int gc_calls; */ /* extern int gc_calls; */
vsc_count++; vsc_count++;
return;
#ifdef COMMENTED #ifdef COMMENTED
if (vsc_count < 123536430LL) {
if (vsc_count == 123536441LL) vsc_xstop = 1;
return;
}
if (vsc_count < 5530257LL) { if (vsc_count < 5530257LL) {
return; return;
} }