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

fix bugs in exo clause

Browse Source
This commit is contained in:
Vitor Santos Costa 2013-04-20 20:29:08 -05:00
parent 210dacfe5a
commit 52253e3e9e
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
C/exo_udi.c
View File

@ -36,8 +36,6 @@
#define YAP_Atom Atom #define YAP_Atom Atom
#include <udi.h> #include <udi.h>
#define arg_of_interest() 0
static int static int
compar(const void *ip0, const void *jp0) { compar(const void *ip0, const void *jp0) {
@ -68,7 +66,7 @@ RangeUDIRefitIndex(struct index_t **ip, UInt b[] USES_REGS)
yamop *code; yamop *code;
/* hard-wired implementation for the range case */ /* hard-wired implementation for the range case */
Int i = arg_of_interest(); Int i = it->udi_arg;
/* it is bound, use hash */ /* it is bound, use hash */
if (it->bmap & b[i]) return; if (it->bmap & b[i]) return;
/* no constraints, nothing to gain */ /* no constraints, nothing to gain */
@ -79,6 +77,7 @@ RangeUDIRefitIndex(struct index_t **ip, UInt b[] USES_REGS)
if (!(it->udi_data = malloc(sz))) if (!(it->udi_data = malloc(sz)))
return; return;
sorted0 = sorted = (BITS32 *)it->udi_data; sorted0 = sorted = (BITS32 *)it->udi_data;
sorted++; /* leave an initial hole */
LOCAL_exo_base = it->cls; LOCAL_exo_base = it->cls;
LOCAL_exo_arity = it->arity; LOCAL_exo_arity = it->arity;
LOCAL_exo_arg = i; LOCAL_exo_arg = i;
@ -87,21 +86,21 @@ RangeUDIRefitIndex(struct index_t **ip, UInt b[] USES_REGS)
BITS32 *s0 = sorted; BITS32 *s0 = sorted;
BITS32 offset = it->key[i]/arity, offset0 = offset; BITS32 offset = it->key[i]/arity, offset0 = offset;
if (offset) { *sorted++ = 0;
*sorted++ = 0; do {
while (offset) { *sorted++ = offset;
*sorted++ = offset; offset = it->links[offset];
offset = it->links[offset]; } while (offset);
} // S = it->cls+it->arity*offset0; Yap_DebugPlWrite(S[1]);
if (sorted-s0 == 2) { // fprintf(stderr, " key[i]=%d offset=%d %d\n", it->key[i], offset0, (sorted-s0)-1);
it->links[offset0] = 0; if (sorted-s0 == 2) {
sorted = s0; it->links[offset0] = 0;
} else { sorted = s0;
/* number of elements comes first */ } else {
*s0 = sorted - (s0+1); /* number of elements comes first */
qsort(s0+1, (size_t)*s0, sizeof(BITS32), compar); *s0 = sorted - (s0+1);
it->links[offset0] = s0-sorted0; qsort(s0+1, (size_t)*s0, sizeof(BITS32), compar);
} it->links[offset0] = s0-sorted0;
} }
} }
} }
@ -144,7 +143,7 @@ Gt(struct index_t *it, Int x, BITS32 off USES_REGS)
LOCAL_exo_base = it->cls; LOCAL_exo_base = it->cls;
LOCAL_exo_arity = it->arity; LOCAL_exo_arity = it->arity;
LOCAL_exo_arg = arg_of_interest(); LOCAL_exo_arg = it->udi_arg;
BITS32 *pt = c+(it->links[off]+1); BITS32 *pt = c+(it->links[off]+1);
BITS32 *end = c+(it->links[off]+(n+2)); BITS32 *end = c+(it->links[off]+(n+2));
if (n > 8 && FALSE) { if (n > 8 && FALSE) {
@ -177,7 +176,7 @@ Lt(struct index_t *it, Int x, BITS32 off USES_REGS)
LOCAL_exo_base = it->cls; LOCAL_exo_base = it->cls;
LOCAL_exo_arity = it->arity; LOCAL_exo_arity = it->arity;
LOCAL_exo_arg = arg_of_interest(); LOCAL_exo_arg = it->udi_arg;
BITS32 *start = c+(it->links[off]+1), *pt = start+1; BITS32 *start = c+(it->links[off]+1), *pt = start+1;
BITS32 *end = c+(it->links[off]+(n+2)); BITS32 *end = c+(it->links[off]+(n+2));
if (n > 8 && FALSE) { if (n > 8 && FALSE) {
@ -210,7 +209,7 @@ Eq(struct index_t *it, Int x, BITS32 off USES_REGS)
LOCAL_exo_base = it->cls; LOCAL_exo_base = it->cls;
LOCAL_exo_arity = it->arity; LOCAL_exo_arity = it->arity;
LOCAL_exo_arg = arg_of_interest(); LOCAL_exo_arg = it->udi_arg;
BITS32 *end = c+(it->links[off]+(n+2)); BITS32 *end = c+(it->links[off]+(n+2));
BITS32 *start, *pt = c+(it->links[off]+1); BITS32 *start, *pt = c+(it->links[off]+1);
if (n > 8 && FALSE) { if (n > 8 && FALSE) {
@ -249,7 +248,7 @@ All(struct index_t *it, BITS32 off USES_REGS)
LOCAL_exo_base = it->cls; LOCAL_exo_base = it->cls;
LOCAL_exo_arity = it->arity; LOCAL_exo_arity = it->arity;
LOCAL_exo_arg = arg_of_interest(); LOCAL_exo_arg = it->udi_arg;
BITS32 *start = c+(it->links[off]+1); BITS32 *start = c+(it->links[off]+1);
BITS32 *end = c+(it->links[off]+(n+1)); BITS32 *end = c+(it->links[off]+(n+1));
S = it->cls+it->arity*start[0]; S = it->cls+it->arity*start[0];
@ -266,9 +265,10 @@ All(struct index_t *it, BITS32 off USES_REGS)
static yamop * static yamop *
RangeEnterUDIIndex(struct index_t *it USES_REGS) RangeEnterUDIIndex(struct index_t *it USES_REGS)
{ {
Int i = arg_of_interest(); Int i = it->udi_arg;
Term t = XREGS[i+1], a1; Term t = XREGS[i+1], a1;
BITS32 off = EXO_ADDRESS_TO_OFFSET(it, S)/it->arity; BITS32 off = EXO_ADDRESS_TO_OFFSET(it, S)/it->arity;
// printf("off=%d it=%p %p---%p\n", off, it, it->cls, S);
attvar_record *attv; attvar_record *attv;
Atom at; Atom at;
@ -359,6 +359,7 @@ RangeUdiInsert (void *control,
CACHE_REGS CACHE_REGS
struct index_t **ip = (struct index_t **)term; struct index_t **ip = (struct index_t **)term;
(*ip)->udi_arg = arg-1;
(ExoCB.refit)(ip, LOCAL_ibnds PASS_REGS); (ExoCB.refit)(ip, LOCAL_ibnds PASS_REGS);
(*ip)->udi_first = (void *)RangeEnterUDIIndex; (*ip)->udi_first = (void *)RangeEnterUDIIndex;
(*ip)->udi_next = (void *)RangeRetryUDIIndex; (*ip)->udi_next = (void *)RangeRetryUDIIndex;

1
H/clause.h
View File

@ -177,6 +177,7 @@ typedef struct index_t {
size_t size; size_t size;
yamop *code; yamop *code;
void *udi_data, *udi_first, *udi_next; void *udi_data, *udi_first, *udi_next;
UInt udi_arg;
} Index_t; } Index_t;
INLINE_ONLY EXTERN inline BITS32 EXO_ADDRESS_TO_OFFSET(struct index_t *it, CELL *ptr); INLINE_ONLY EXTERN inline BITS32 EXO_ADDRESS_TO_OFFSET(struct index_t *it, CELL *ptr);