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

fix restore (Trevor)

Browse Source 
make indexing a bit faster on IDB


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1771 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2007-01-08 08:27:19 +00:00
parent 64e1c56f28
commit 0cef3c5389
7 changed files with 109 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
C/agc.c
View File

@ -116,6 +116,7 @@ AtomAdjust(Atom a)
#define AddrAdjust(P) (P) #define AddrAdjust(P) (P)
#define AtomEntryAdjust(P) (P) #define AtomEntryAdjust(P) (P)
#define GlobalEntryAdjust(P) (P)
#define BlobTermAdjust(P) (P) #define BlobTermAdjust(P) (P)
#define CellPtoHeapAdjust(P) (P) #define CellPtoHeapAdjust(P) (P)
#define CellPtoHeapCellAdjust(P) (P) #define CellPtoHeapCellAdjust(P) (P)

7
C/c_interface.c
View File

@ -10,8 +10,11 @@
* File: c_interface.c * * File: c_interface.c *
* comments: c_interface primitives definition * * comments: c_interface primitives definition *
* * * *
* Last rev: $Date: 2006-12-13 16:10:14 $,$Author: vsc $ * * Last rev: $Date: 2007-01-08 08:27:19 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.87 2006/12/13 16:10:14 vsc
* several debugger and CLP(BN) improvements.
*
* Revision 1.86 2006/11/27 17:42:02 vsc * Revision 1.86 2006/11/27 17:42:02 vsc
* support for UNICODE, and other bug fixes. * support for UNICODE, and other bug fixes.
* *
@ -757,7 +760,7 @@ YAP_Unify(Term t1, Term t2)
out = Yap_unify(t1, t2); out = Yap_unify(t1, t2);
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
return(out); return out;
} }
X_API long X_API long

64
C/index.c
View File

@ -11,8 +11,11 @@
* File: index.c * * File: index.c *
* comments: Indexing a Prolog predicate * * comments: Indexing a Prolog predicate *
* * * *
* Last rev: $Date: 2006-12-27 01:32:37 $,$Author: vsc $ * * Last rev: $Date: 2007-01-08 08:27:19 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.180 2006/12/27 01:32:37 vsc
* diverse fixes
*
* Revision 1.179 2006/11/27 17:42:02 vsc * Revision 1.179 2006/11/27 17:42:02 vsc
* support for UNICODE, and other bug fixes. * support for UNICODE, and other bug fixes.
* *
@ -2804,15 +2807,17 @@ add_head_info(ClauseDef *clause, UInt regno)
break; break;
case _unify_idb_term: case _unify_idb_term:
case _copy_idb_term: case _copy_idb_term:
if (regno == 2) { if (regno != 2) {
clause->Tag = (CELL)NULL;
} else {
LogUpdClause *lcl = ClauseCodeToLogUpdClause(cl); LogUpdClause *lcl = ClauseCodeToLogUpdClause(cl);
Term t = lcl->ClSource->Entry; Term t = lcl->ClSource->Entry;
if (IsVarTerm(t)) { if (IsVarTerm(t)) {
clause->Tag = (CELL)NULL; clause->Tag = (CELL)NULL;
} else if (IsApplTerm(t)) { } else if (IsApplTerm(t)) {
CELL *pt = RepAppl(t); CELL *pt = RepAppl(t);
clause->Tag = AbsAppl((CELL *)pt[0]); clause->Tag = AbsAppl((CELL *)pt[0]);
if (IsExtensionFunctor(FunctorOfTerm(t))) { if (IsExtensionFunctor(FunctorOfTerm(t))) {
clause->u.t_ptr = t; clause->u.t_ptr = t;
@ -2827,8 +2832,6 @@ add_head_info(ClauseDef *clause, UInt regno)
} else { } else {
clause->Tag = t; clause->Tag = t;
} }
} else {
clause->Tag = (CELL)NULL;
} }
return; return;
default: default:
@ -4271,14 +4274,49 @@ cls_info(ClauseDef *min, ClauseDef *max, UInt argno)
} }
static int static int
cls_head_info(ClauseDef *min, ClauseDef *max, UInt argno) cls_head_info(ClauseDef *min, ClauseDef *max, UInt argno, int in_idb)
{ {
ClauseDef *cl=min; ClauseDef *cl=min;
while (cl <= max) { if (in_idb) {
add_head_info(cl, argno); if (argno != 2) {
/* if (IsVarTerm(cl->Tag)) cl->Tag = (CELL)NULL; */ while (cl <= max) {
cl++; cl->Tag = (CELL)NULL;
cl++;
}
} else {
while (cl <= max) {
LogUpdClause *lcl = ClauseCodeToLogUpdClause(cl->CurrentCode);
Term t = lcl->ClSource->Entry;
if (IsVarTerm(t)) {
cl->Tag = (CELL)NULL;
} else if (IsApplTerm(t)) {
CELL *pt = RepAppl(t);
cl->Tag = AbsAppl((CELL *)pt[0]);
if (IsExtensionFunctor(FunctorOfTerm(t))) {
cl->u.t_ptr = t;
} else {
cl->u.c_sreg = pt;
}
} else if (IsPairTerm(t)) {
CELL *pt = RepPair(t);
cl->Tag = AbsPair(NULL);
cl->u.c_sreg = pt-1;
} else {
cl->Tag = t;
}
cl++;
}
}
} else {
while (cl <= max) {
add_head_info(cl, argno);
/* if (IsVarTerm(cl->Tag)) cl->Tag = (CELL)NULL; */
cl++;
}
} }
return FALSE; return FALSE;
} }
@ -4307,7 +4345,7 @@ do_index(ClauseDef *min, ClauseDef* max, struct intermediates *cint, UInt argno,
} }
t = Deref(XREGS[argno]); t = Deref(XREGS[argno]);
if (ap->PredFlags & LogUpdatePredFlag) { if (ap->PredFlags & LogUpdatePredFlag) {
found_pvar = cls_head_info(min, max, argno); found_pvar = cls_head_info(min, max, argno, (ap->ModuleOfPred == IDB_MODULE));
} else { } else {
found_pvar = cls_info(min, max, argno); found_pvar = cls_info(min, max, argno);
} }
@ -4332,7 +4370,7 @@ do_index(ClauseDef *min, ClauseDef* max, struct intermediates *cint, UInt argno,
argno++; argno++;
t = Deref(XREGS[argno]); t = Deref(XREGS[argno]);
if (ap->PredFlags & LogUpdatePredFlag) { if (ap->PredFlags & LogUpdatePredFlag) {
found_pvar = cls_head_info(min, max, argno); found_pvar = cls_head_info(min, max, argno, (ap->ModuleOfPred == IDB_MODULE) );
} else { } else {
found_pvar = cls_info(min, max, argno); found_pvar = cls_info(min, max, argno);
} }

1
C/tracer.c
View File

@ -160,6 +160,7 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
LOCK(Yap_heap_regs->low_level_trace_lock); LOCK(Yap_heap_regs->low_level_trace_lock);
sc = Yap_heap_regs; sc = Yap_heap_regs;
vsc_count++;
#ifdef COMMENTED #ifdef COMMENTED
if (vsc_count > 1388060LL && vsc_count < 1388070LL) { if (vsc_count > 1388060LL && vsc_count < 1388070LL) {
if (vsc_count==1388061LL) if (vsc_count==1388061LL)

40
H/rheap.h
View File

@ -11,8 +11,11 @@
* File: rheap.h * * File: rheap.h *
* comments: walk through heap code * * comments: walk through heap code *
* * * *
* Last rev: $Date: 2006-11-27 17:42:03 $,$Author: vsc $ * * Last rev: $Date: 2007-01-08 08:27:19 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.71 2006/11/27 17:42:03 vsc
* support for UNICODE, and other bug fixes.
*
* Revision 1.70 2006/08/25 19:50:35 vsc * Revision 1.70 2006/08/25 19:50:35 vsc
* global data structures * global data structures
* *
@ -1206,8 +1209,7 @@ RestoreEntries(PropEntry *pp)
{ {
DBEntry *de = (DBEntry *) pp; DBEntry *de = (DBEntry *) pp;
de->NextOfPE = de->NextOfPE =
PropAdjust(de->NextOfPE); PropAdjust(de->NextOfPE); if (HDiff)
if (HDiff)
RestoreDB(de); RestoreDB(de);
} }
break; break;
@ -1220,6 +1222,38 @@ RestoreEntries(PropEntry *pp)
RestoreBB(bb); RestoreBB(bb);
} }
break; break;
case GlobalProperty:
{
GlobalEntry *gb = (GlobalEntry *) pp;
Term gbt = gb->global;
gb->NextOfPE =
PropAdjust(gb->NextOfPE);
gb->AtomOfGE =
AtomEntryAdjust(gb->AtomOfGE);
gb->NextGE =
GlobalEntryAdjust(gb->NextGE);
if (IsVarTerm(gbt)) {
CELL *gbp = VarOfTerm(gbt);
if (IsOldGlobalPtr(gbp))
gbp = PtoGloAdjust(gbp);
else
gbp = CellPtoHeapAdjust(gbp);
gb->global = (CELL)gbp;
} else if (IsPairTerm(gbt)) {
gb->global = AbsPair(PtoGloAdjust(RepPair(gbt)));
} else if (IsApplTerm(gbt)) {
CELL *gbp = RepAppl(gbt);
if (IsOldGlobalPtr(gbp))
gbp = PtoGloAdjust(gbp);
else
gbp = CellPtoHeapAdjust(gbp);
gb->global = AbsAppl(gbp);
} else if (IsAtomTerm(gbt)) {
gb->global = AtomTermAdjust(gbt);
} /* numbers need no adjusting */
}
break;
case OpProperty: case OpProperty:
{ {
OpEntry *opp = (OpEntry *)pp; OpEntry *opp = (OpEntry *)pp;

9
H/sshift.h
View File

@ -340,6 +340,14 @@ AtomEntryAdjust (AtomEntry * at)
return (AtomEntry *) ((AtomEntry *) (CharP (at) + HDiff)); return (AtomEntry *) ((AtomEntry *) (CharP (at) + HDiff));
} }
inline EXTERN GlobalEntry *GlobalEntryAdjust (GlobalEntry *);
inline EXTERN GlobalEntry *
GlobalEntryAdjust (GlobalEntry * at)
{
return (GlobalEntry *) ((GlobalEntry *) (CharP (at) + HDiff));
}
inline EXTERN union CONSULT_OBJ *ConsultObjAdjust (union CONSULT_OBJ *); inline EXTERN union CONSULT_OBJ *ConsultObjAdjust (union CONSULT_OBJ *);
@ -730,6 +738,5 @@ IsGlobal (CELL reg)
} }
void STD_PROTO (Yap_AdjustStacksAndTrail, (void)); void STD_PROTO (Yap_AdjustStacksAndTrail, (void));
void STD_PROTO (Yap_AdjustRegs, (int)); void STD_PROTO (Yap_AdjustRegs, (int));

9
library/matrix/matrix.c
View File

@ -535,7 +535,8 @@ matrix_dec2(int *mat, int *indx)
static int static int
matrix_set(void) matrix_set(void)
{ {
int dims[MAX_DIMS], *mat, tf; int dims[MAX_DIMS], *mat;
YAP_Term tf;
mat = (int *)YAP_BlobOfTerm(YAP_ARG1); mat = (int *)YAP_BlobOfTerm(YAP_ARG1);
if (!mat) { if (!mat) {
@ -606,7 +607,8 @@ matrix_set_all(void)
static int static int
matrix_add(void) matrix_add(void)
{ {
int dims[MAX_DIMS], *mat, tf; int dims[MAX_DIMS], *mat;
YAP_Term tf;
mat = (int *)YAP_BlobOfTerm(YAP_ARG1); mat = (int *)YAP_BlobOfTerm(YAP_ARG1);
if (!mat) { if (!mat) {
@ -643,7 +645,8 @@ matrix_add(void)
static int static int
do_matrix_access(void) do_matrix_access(void)
{ {
int dims[MAX_DIMS], *mat, tf; int dims[MAX_DIMS], *mat;
YAP_Term tf;
mat = (int *)YAP_BlobOfTerm(YAP_ARG1); mat = (int *)YAP_BlobOfTerm(YAP_ARG1);
if (!mat) { if (!mat) {