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

debugging exo

Browse Source
This commit is contained in:
Vitor Santos Costa 2013-01-08 00:40:51 +00:00
parent 8e8046db73
commit d98862f5ea
2 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
C/absmi.c
View File

@ -968,8 +968,11 @@ Yap_absmi(int inp)
{ {
yamop *pt; yamop *pt;
saveregs(); saveregs();
pt = Yap_ExoLookup(PredFromExpandCode(PREG)); pt = Yap_ExoLookup(PredFromDefCode(PREG));
setregs(); setregs();
#ifdef SHADOW_S
SREG = S;
#endif
PREG = pt; PREG = pt;
} }
JMPNext(); JMPNext();
@ -984,7 +987,10 @@ Yap_absmi(int inp)
* register, but sometimes (X86) not. In this case, have a * register, but sometimes (X86) not. In this case, have a
* new register to point at YREG =*/ * new register to point at YREG =*/
CACHE_Y(YREG); CACHE_Y(YREG);
S_YREG[-1] = (CELL)SREG; {
struct index_t *i = (struct index_t *)(PREG->u.lp.l);
S_YREG[-1] = i->links[(CELL)(SREG-i->cls)/i->arity];
}
S_YREG--; S_YREG--;
/* store arguments for procedure */ /* store arguments for procedure */
store_at_least_one_arg(PREG->u.lp.p->ArityOfPE); store_at_least_one_arg(PREG->u.lp.p->ArityOfPE);
@ -999,7 +1005,7 @@ Yap_absmi(int inp)
#ifdef YAPOR #ifdef YAPOR
SCH_set_load(B_YREG); SCH_set_load(B_YREG);
#endif /* YAPOR */ #endif /* YAPOR */
PREG = NEXTOP(PREG, lp); PREG = NEXTOP(NEXTOP(PREG, lp),lp);
SET_BB(B_YREG); SET_BB(B_YREG);
ENDCACHE_Y(); ENDCACHE_Y();
GONext(); GONext();
@ -1009,7 +1015,12 @@ Yap_absmi(int inp)
Op(retry_exo, lp); Op(retry_exo, lp);
BEGD(d0); BEGD(d0);
CACHE_Y(B); CACHE_Y(B);
saveregs();
d0 = Yap_NextExo(B_YREG, (struct index_t *)PREG->u.lp.l); d0 = Yap_NextExo(B_YREG, (struct index_t *)PREG->u.lp.l);
setregs();
#ifdef SHADOW_S
SREG = S;
#endif
if (d0) { if (d0) {
/* After retry, cut should be pointing at the parent /* After retry, cut should be pointing at the parent
* choicepoint for the current B */ * choicepoint for the current B */
@ -1026,7 +1037,7 @@ Yap_absmi(int inp)
#ifdef YAPOR #ifdef YAPOR
if (SCH_top_shared_cp(B)) { if (SCH_top_shared_cp(B)) {
SCH_last_alternative(PREG, B_YREG); SCH_last_alternative(PREG, B_YREG);
restore_at_least_one_arg(PREG->u.Otapl.s); restore_at_least_one_arg(PREG->u.lp.p->ArityOfPE);
#ifdef FROZEN_STACKS #ifdef FROZEN_STACKS
S_YREG = (CELL *) PROTECT_FROZEN_B(B_YREG); S_YREG = (CELL *) PROTECT_FROZEN_B(B_YREG);
#endif /* FROZEN_STACKS */ #endif /* FROZEN_STACKS */
@ -1035,7 +1046,7 @@ Yap_absmi(int inp)
#endif /* YAPOR */ #endif /* YAPOR */
{ {
pop_yaam_regs(); pop_yaam_regs();
pop_at_least_one_arg(PREG->u.Otapl.s); pop_at_least_one_arg(PREG->u.lp.p->ArityOfPE);
/* After trust, cut should be pointing at the new top /* After trust, cut should be pointing at the new top
* choicepoint */ * choicepoint */
#ifdef FROZEN_STACKS #ifdef FROZEN_STACKS
@ -3566,8 +3577,9 @@ Yap_absmi(int inp)
BEGD(d0); BEGD(d0);
BEGD(d1); BEGD(d1);
/* fetch arguments */ /* fetch arguments */
d0 = XREG(PREG->u.xc.x); d0 = XREG(PREG->u.x.x);
d1 = *SREG++; d1 = *SREG;
SREG++;
BEGP(pt0); BEGP(pt0);
deref_head(d0, gatom_exo_unk); deref_head(d0, gatom_exo_unk);

74
C/exo.c
View File

@ -40,28 +40,29 @@
static UInt static UInt
HASH(UInt j, CELL *cl, struct index_t *it) HASH(UInt j, CELL *cl, struct index_t *it)
{ {
return (cl[j] >> 3) % it->nels + j*(7*it->nels)/11; return ((cl[j] >> 3) + (3*j*it->nels)/2) % (it->nels*2);
} }
/* search for matching elements */ /* search for matching elements */
static int static int
MATCH(CELL *clp,CELL *kvp, UInt j, UInt bnds[]) MATCH(CELL *clp, CELL *kvp, UInt j, UInt bnds[], struct index_t *it)
{ {
if ((kvp - it->cls)%it->arity != j)
return FALSE;
do { do {
if ( bnds[j] && *clp == *kvp) if ( bnds[j] && *clp != *kvp)
return FALSE; return FALSE;
clp--; clp--;
kvp--; kvp--;
j--; } while (j-- != 0);
} while (j != 0);
return TRUE; return TRUE;
} }
static void static void
ADD_TO_TRY_CHAIN(CELL *kvp, CELL *cl, struct index_t *it) ADD_TO_TRY_CHAIN(CELL *kvp, CELL *cl, struct index_t *it)
{ {
UInt new = (kvp-it->cls)/it->arity; UInt old = (kvp-it->cls)/it->arity;
UInt old = (cl-it->cls)/it->arity; UInt new = (cl-it->cls)/it->arity;
UInt *links = it->links; UInt *links = it->links;
UInt tmp = links[old]; /* points to the end of the chain */ UInt tmp = links[old]; /* points to the end of the chain */
@ -77,7 +78,7 @@ ADD_TO_TRY_CHAIN(CELL *kvp, CELL *cl, struct index_t *it)
static UInt static UInt
NEXT(UInt hash, struct index_t *it, UInt j) NEXT(UInt hash, struct index_t *it, UInt j)
{ {
return (j+1) % it->nels; return (hash+3) % (it->nels*2);
} }
/* This is the critical routine, it builds the hash table * /* This is the critical routine, it builds the hash table *
@ -118,24 +119,24 @@ INSERT(CELL *cl, struct index_t *it, UInt arity, UInt base, UInt bnds[])
/* simple case, new entry */ /* simple case, new entry */
it->key[hash] = cl+j; it->key[hash] = cl+j;
return; return;
} else if (MATCH(cl+j, kvp, j, bnds)) { } else if (MATCH(cl+j, kvp, j, bnds, it)) {
/* collision */ /* collision */
UInt k; UInt k;
CELL *target; CELL *target;
for (k =j, target = kvp; k < arity; k++,target++ ) { for (k =j+1, target = kvp+1; k < arity; k++,target++ ) {
if (bnds[k]) { if (bnds[k]) {
if (*target != cl[k]) { if (*target != cl[k]) {
/* found a new forking point */ /* found a new forking point */
INSERT(cl, it, arity, j, bnds); INSERT(cl, it, arity, k, bnds);
return; return;
} }
} }
} }
ADD_TO_TRY_CHAIN(kvp-base, cl, it); ADD_TO_TRY_CHAIN(kvp, cl, it);
return; return;
} else { } else {
j = NEXT(hash, it, j); hash = NEXT(hash, it, j);
goto next; goto next;
} }
} }
@ -161,23 +162,28 @@ LOOKUP(struct index_t *it, UInt arity, UInt bnds[])
if (kvp == NULL) { if (kvp == NULL) {
/* simple case, no element */ /* simple case, no element */
return FAILCODE; return FAILCODE;
} else if (MATCH(XREGS+(j+1), kvp, j, bnds)) { } else if (MATCH(XREGS+(j+1), kvp, j, bnds, it)) {
/* found element */ /* found element */
UInt k; UInt k;
CELL *target; CELL *target;
for (k =j, target = kvp; k < arity; k++,target++ ) { for (k =j+1, target = kvp+1; k < arity; k++ ) {
if (bnds[k]) { if (bnds[k]) {
if (*target != XREGS[k+1]) { if (*target != XREGS[k+1]) {
j = k;
goto hash; goto hash;
} }
} }
target++;
} }
S = target-arity; S = target-arity;
return it->code; if (it->links[(S-it->cls)/arity])
return it->code;
else
return NEXTOP(NEXTOP(it->code,lp),lp);
} else { } else {
/* collision */ /* collision */
j = NEXT(hash, it, j); hash = NEXT(hash, it, j);
goto next; goto next;
} }
} }
@ -197,16 +203,17 @@ fill_hash(UInt bmap, UInt bnds[], struct index_t *it)
if (it->key[i]) { if (it->key[i]) {
UInt offset = (it->key[i]-it->cls)/arity; UInt offset = (it->key[i]-it->cls)/arity;
UInt last = it->links[offset]; UInt last = it->links[offset];
if (last) {
/* the chain used to point straight to the last, and the last back to the origibal first */ /* the chain used to point straight to the last, and the last back to the origibal first */
it->links[offset] = it->links[last]; it->links[offset] = it->links[last];
it->links[last] = 0; it->links[last] = 0;
}
} }
} }
} }
static struct index_t * static struct index_t *
add_index(struct index_t *i0, UInt bmap, UInt bndsf[], PredEntry *ap) add_index(struct index_t **ip, UInt bmap, UInt bndsf[], PredEntry *ap)
{ {
UInt ncls = ap->cs.p_code.NOfClauses, j; UInt ncls = ap->cs.p_code.NOfClauses, j;
CELL *base; CELL *base;
@ -232,8 +239,8 @@ add_index(struct index_t *i0, UInt bmap, UInt bndsf[], PredEntry *ap)
return NULL; return NULL;
} }
bzero(base, 3*sizeof(CELL)*ncls); bzero(base, 3*sizeof(CELL)*ncls);
i->next = i0->next; i->next = *ip;
i->prev = i0; i->prev = NULL;
i->nels = ncls; i->nels = ncls;
i->arity = ap->ArityOfPE; i->arity = ap->ArityOfPE;
i->ap = ap; i->ap = ap;
@ -242,9 +249,9 @@ add_index(struct index_t *i0, UInt bmap, UInt bndsf[], PredEntry *ap)
i->hsize = 2*ncls; i->hsize = 2*ncls;
i->key = (CELL **)base; i->key = (CELL **)base;
i->links = (CELL *)(base+2*ncls); i->links = (CELL *)(base+2*ncls);
i->cls = (CELL *)((ADDR)ap->cs.p_code.FirstClause+2*sizeof(struct index_t *)); i->cls = (CELL *)((ADDR)ap->cs.p_code.FirstClause+2*sizeof(struct index_t *));
i0->next = i; *ip = i;
fill_hash(bmap, base, i); fill_hash(bmap, bndsf, i);
ptr = (yamop *)(i+1); ptr = (yamop *)(i+1);
i->code = ptr; i->code = ptr;
ptr->opc = Yap_opcode(_try_exo); ptr->opc = Yap_opcode(_try_exo);
@ -277,7 +284,8 @@ Yap_ExoLookup(PredEntry *ap)
{ {
UInt arity = ap->ArityOfPE; UInt arity = ap->ArityOfPE;
UInt bmap = 0L, bit = 1, count = 0, j; UInt bmap = 0L, bit = 1, count = 0, j;
struct index_t *i = *(struct index_t **)(ap->cs.p_code.FirstClause); struct index_t **ip = (struct index_t **)(ap->cs.p_code.FirstClause);
struct index_t *i = *ip;
UInt bnds[MAX_ARITY]; UInt bnds[MAX_ARITY];
for (j=0; j< arity; j++, bit<<=1) { for (j=0; j< arity; j++, bit<<=1) {
@ -286,6 +294,8 @@ Yap_ExoLookup(PredEntry *ap)
bmap += bit; bmap += bit;
bnds[j] = TRUE; bnds[j] = TRUE;
count++; count++;
} else {
bnds[j] = FALSE;
} }
XREGS[j+1] = t; XREGS[j+1] = t;
} }
@ -300,9 +310,11 @@ Yap_ExoLookup(PredEntry *ap)
break; break;
} }
} }
ip = &i->next;
i = i->next;
} }
if (!i) { if (!i) {
i = add_index(i, bmap, bnds, ap); i = add_index(ip, bmap, bnds, ap);
} }
return LOOKUP(i, arity, bnds); return LOOKUP(i, arity, bnds);
} }
@ -366,10 +378,6 @@ p_exodb_get_space( USES_REGS1 )
} }
required = ncls*sizeof(CELL)+sizeof(MegaClause)+2*sizeof(struct index_t *); required = ncls*sizeof(CELL)+sizeof(MegaClause)+2*sizeof(struct index_t *);
#ifdef DEBUG
total_megaclause += required;
nof_megaclauses++;
#endif
while (!(mcl = (MegaClause *)Yap_AllocCodeSpace(required))) { while (!(mcl = (MegaClause *)Yap_AllocCodeSpace(required))) {
if (!Yap_growheap(FALSE, required, NULL)) { if (!Yap_growheap(FALSE, required, NULL)) {
/* just fail, the system will keep on going */ /* just fail, the system will keep on going */