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

fix bad consult stack expansion

This commit is contained in:
Vitor Santos Costa 2016-05-14 11:27:53 +01:00
parent c0db3d4e18
commit d86f0d1942
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
C/cdmgr.c
View File

@ -1347,9 +1347,9 @@ static void expand_consult(void) {
/* next, set up pointers correctly */ /* next, set up pointers correctly */
new_cs += (LOCAL_ConsultSp - LOCAL_ConsultLow); new_cs += (LOCAL_ConsultSp - LOCAL_ConsultLow);
/* put LOCAL_ConsultBase at same offset as before move */ /* put LOCAL_ConsultBase at same offset as before move */
LOCAL_ConsultBase = LOCAL_ConsultBase + (new_cs - LOCAL_ConsultSp); LOCAL_ConsultBase = new_cl + ((LOCAL_ConsultBase - LOCAL_ConsultLow)+InitialConsultCapacity);
/* new consult pointer */ /* new consult pointer */
LOCAL_ConsultSp = new_cs; LOCAL_ConsultSp = new_cl + ((LOCAL_ConsultSp - LOCAL_ConsultLow)+InitialConsultCapacity);
/* new end of memory */ /* new end of memory */
LOCAL_ConsultLow = new_cl; LOCAL_ConsultLow = new_cl;
} }
@ -1389,9 +1389,9 @@ static int not_was_reconsulted(PredEntry *p, Term t, int mode) {
//%s\n",NameOfFunctor(p->FunctorOfPred)->StrOfAE,p->src.OwnerFile->StrOfAE); //%s\n",NameOfFunctor(p->FunctorOfPred)->StrOfAE,p->src.OwnerFile->StrOfAE);
} }
if (mode) { if (mode) {
if (LOCAL_ConsultSp == LOCAL_ConsultLow + 1) { if (LOCAL_ConsultSp <= LOCAL_ConsultLow + 6) {
expand_consult(); expand_consult();
} }
--LOCAL_ConsultSp; --LOCAL_ConsultSp;
LOCAL_ConsultSp->p = p0; LOCAL_ConsultSp->p = p0;
if (LOCAL_ConsultBase[1].mode && if (LOCAL_ConsultBase[1].mode &&
@ -2001,6 +2001,9 @@ static void init_consult(int mode, const unsigned char *file) {
if (!LOCAL_ConsultSp) { if (!LOCAL_ConsultSp) {
InitConsultStack(); InitConsultStack();
} }
if (LOCAL_ConsultSp >= LOCAL_ConsultLow + 6) {
expand_consult();
}
LOCAL_ConsultSp--; LOCAL_ConsultSp--;
LOCAL_ConsultSp->filename = file; LOCAL_ConsultSp->filename = file;
LOCAL_ConsultSp--; LOCAL_ConsultSp--;