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

fix debugging message that got away

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@492 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-05-24 18:25:25 +00:00
parent 0f471f8810
commit b9aefa0f94
1 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
C/save.c
View File

@ -75,6 +75,8 @@ define DEBUG_RESTORE3 to check if the atom chain is still a working
* Good Luck * Good Luck
*/ */
#define DEBUG_RESTORE2 1
#endif #endif
STATIC_PROTO(void myread, (int, char *, Int)); STATIC_PROTO(void myread, (int, char *, Int));
@ -1262,16 +1264,19 @@ AdjustDBTerm(Term trm)
return (AbsPair(p-1)); return (AbsPair(p-1));
} }
if (IsApplTerm(trm)) { if (IsApplTerm(trm)) {
int Arity, i;
Functor f; Functor f;
Term *p0 = p = PtoHeapCellAdjust(RepAppl(trm)); Term *p0 = p = PtoHeapCellAdjust(RepAppl(trm));
f = FuncAdjust((Functor)(*p)); f = FuncAdjust((Functor)(*p));
*p = (Term)f ; *p = (Term)f ;
Arity = ArityOfFunctor(f); if (!IsExtensionFunctor(f)) {
p++; int Arity, i;
for (i = 0; i < Arity; ++i) {
*p = AdjustDBTerm(*p); Arity = ArityOfFunctor(f);
p++; p++;
for (i = 0; i < Arity; ++i) {
*p = AdjustDBTerm(*p);
p++;
}
} }
return (AbsAppl(p0)); return (AbsAppl(p0));
} }
@ -2489,12 +2494,16 @@ RestoreEntries(PropEntry *pp)
{ {
FunctorEntry *fe = (FunctorEntry *)pp; FunctorEntry *fe = (FunctorEntry *)pp;
Prop p0; Prop p0;
fe->NextOfPE =
PropAdjust(fe->NextOfPE);
fe->NameOfFE = fe->NameOfFE =
AtomAdjust(fe->NameOfFE); AtomAdjust(fe->NameOfFE);
p0 = fe->PropsOfFE; p0 = fe->PropsOfFE =
PropAdjust(fe->PropsOfFE);
while (!EndOfPAEntr(p0)) { while (!EndOfPAEntr(p0)) {
CleanCode(RepPredProp(p0)); CleanCode(RepPredProp(p0));
p0 = RepPredProp(p0)->NextOfPE; p0 = RepPredProp(p0)->NextOfPE =
PropAdjust(RepPredProp(p0)->NextOfPE);
} }
} }
break; break;
@ -2502,6 +2511,8 @@ RestoreEntries(PropEntry *pp)
{ {
ValEntry *ve = (ValEntry *)pp; ValEntry *ve = (ValEntry *)pp;
Term tv = ve->ValueOfVE; Term tv = ve->ValueOfVE;
ve->NextOfPE =
PropAdjust(ve->NextOfPE);
if (IsAtomTerm(tv)) if (IsAtomTerm(tv))
ve->ValueOfVE = AtomTermAdjust(tv); ve->ValueOfVE = AtomTermAdjust(tv);
} }
@ -2509,6 +2520,8 @@ RestoreEntries(PropEntry *pp)
case ArrayProperty: case ArrayProperty:
{ {
ArrayEntry *ae = (ArrayEntry *)pp; ArrayEntry *ae = (ArrayEntry *)pp;
ae->NextOfPE =
PropAdjust(ae->NextOfPE);
if (ae->ArrayEArity < 0) { if (ae->ArrayEArity < 0) {
restore_static_array((StaticArrayEntry *)ae); restore_static_array((StaticArrayEntry *)ae);
} else { } else {
@ -2536,7 +2549,12 @@ RestoreEntries(PropEntry *pp)
} }
break; break;
case PEProp: case PEProp:
CleanCode((PredEntry *) pp); {
PredEntry *pe = (PredEntry *) pp;
pe->NextOfPE =
PropAdjust(pe->NextOfPE);
CleanCode(pe);
}
break; break;
case DBProperty: case DBProperty:
case LogUpdDBProperty: case LogUpdDBProperty:
@ -2545,22 +2563,33 @@ RestoreEntries(PropEntry *pp)
#ifdef DEBUG_RESTORE2 #ifdef DEBUG_RESTORE2
YP_fprintf(errout, "Correcting data base clause at %p\n", pp); YP_fprintf(errout, "Correcting data base clause at %p\n", pp);
#endif #endif
if (HDiff) {
RestoreDB((DBEntry *) pp); DBEntry *de = (DBEntry *) pp;
de->NextOfPE =
PropAdjust(de->NextOfPE);
if (HDiff)
RestoreDB(de);
}
break; break;
case BBProperty: case BBProperty:
if (HDiff) {
RestoreBB((BlackBoardEntry *)pp); BlackBoardEntry *bb = (BlackBoardEntry *) pp;
bb->NextOfPE =
PropAdjust(bb->NextOfPE);
if (HDiff)
RestoreBB(bb);
}
break; break;
case ExpProperty: case ExpProperty:
case OpProperty: case OpProperty:
case ModProperty: case ModProperty:
/* do nothing */ pp->NextOfPE =
PropAdjust(pp->NextOfPE);
break; break;
default: default:
/* OOPS */ /* OOPS */
Error(SYSTEM_ERROR, TermNil, Error(SYSTEM_ERROR, TermNil,
"Invalid Atom Property at %p", pp); "Invalid Atom Property %d at %p", pp->KindOfPE, pp);
return; return;
} }
pp = RepProp(pp->NextOfPE); pp = RepProp(pp->NextOfPE);
@ -2582,6 +2611,7 @@ RestoreInvisibleAtoms(void)
#ifdef DEBUG_RESTORE2 /* useful during debug */ #ifdef DEBUG_RESTORE2 /* useful during debug */
YP_fprintf(errout, "Restoring %s\n", at->StrOfAE); YP_fprintf(errout, "Restoring %s\n", at->StrOfAE);
#endif #endif
at->PropsOfAE = PropAdjust(at->PropsOfAE);
RestoreEntries(RepProp(at->PropsOfAE)); RestoreEntries(RepProp(at->PropsOfAE));
atm = at->NextOfAE; atm = at->NextOfAE;
at->NextOfAE = atm = AtomAdjust(atm); at->NextOfAE = atm = AtomAdjust(atm);
@ -2673,6 +2703,7 @@ restore_heap(void)
#ifdef DEBUG_RESTORE2 /* useful during debug */ #ifdef DEBUG_RESTORE2 /* useful during debug */
YP_fprintf(errout, "Restoring %s\n", at->StrOfAE); YP_fprintf(errout, "Restoring %s\n", at->StrOfAE);
#endif #endif
at->PropsOfAE = PropAdjust(at->PropsOfAE);
RestoreEntries(RepProp(at->PropsOfAE)); RestoreEntries(RepProp(at->PropsOfAE));
atm = at->NextOfAE = AtomAdjust(at->NextOfAE); atm = at->NextOfAE = AtomAdjust(at->NextOfAE);
at = RepAtom(atm); at = RepAtom(atm);