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

fix trail overflow while copying huge terms

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1990 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2007-11-12 10:39:49 +00:00
parent c1a999bfb1
commit c0c2d8767b
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
C/utilpreds.c
View File

@ -245,6 +245,12 @@ copy_complex_term(CELL *pt0, CELL *pt0_end, int share, int newattvs, CELL *ptf,
#endif #endif
/* first time we met this term */ /* first time we met this term */
RESET_VARIABLE(ptf); RESET_VARIABLE(ptf);
if (TR > (tr_fr_ptr)Yap_TrailTop - 256) {
/* Trail overflow */
if (!Yap_growtrail((TR-TR0)*sizeof(tr_fr_ptr *), TRUE)) {
goto trail_overflow;
}
}
Bind_Global(ptd0, (CELL)ptf); Bind_Global(ptd0, (CELL)ptf);
ptf++; ptf++;
#ifdef COROUTINING #ifdef COROUTINING
@ -339,6 +345,7 @@ trail_overflow:
} }
#endif #endif
reset_trail(TR0); reset_trail(TR0);
Yap_Error_Size = (ADDR)AuxSp-(ADDR)to_visit0;
return -3; return -3;
} }
@ -357,10 +364,16 @@ handle_cp_overflow(int res, UInt arity, Term t)
case -2: case -2:
return Deref(XREGS[arity+1]); return Deref(XREGS[arity+1]);
case -3: case -3:
if (!Yap_ExpandPreAllocCodeSpace(0,NULL)) { {
UInt size = Yap_Error_Size;
Yap_Error_Size = 0L;
if (size > 4*1024*1024)
size = 4*1024*1024;
if (!Yap_ExpandPreAllocCodeSpace(size,NULL)) {
Yap_Error(OUT_OF_AUXSPACE_ERROR, TermNil, Yap_ErrorMessage); Yap_Error(OUT_OF_AUXSPACE_ERROR, TermNil, Yap_ErrorMessage);
return 0L; return 0L;
} }
}
return Deref(XREGS[arity+1]); return Deref(XREGS[arity+1]);
default: default:
return 0L; return 0L;

2
changes-5.1.html
View File

@ -17,6 +17,8 @@
<h2>Yap-5.1.3:</h2> <h2>Yap-5.1.3:</h2>
<ul> <ul>
<li> FIXED: trail overflow while copying huge terms (obs from Bernd
Gutmann).</li>
<li> NEW: compilation_mode option for load_files (request from <li> NEW: compilation_mode option for load_files (request from
Saverio).</li> Saverio).</li>
<li> FIXED: predicate table could not enough room while overflowing <li> FIXED: predicate table could not enough room while overflowing