VC++ changes
use clock in WIN98 fix manual get rid of ISO X/0 git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@347 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
parent
5139d1a8dc
commit
293fdf9061
18
C/absmi.c
18
C/absmi.c
@ -68,12 +68,12 @@ push_live_regs(yamop *pco)
|
|||||||
{
|
{
|
||||||
CELL *lab = (CELL *)(pco->u.l.l);
|
CELL *lab = (CELL *)(pco->u.l.l);
|
||||||
CELL max = lab[0];
|
CELL max = lab[0];
|
||||||
Int curr = lab[1];
|
CELL curr = lab[1];
|
||||||
CELL *start = H;
|
CELL *start = H;
|
||||||
Int tot = 0;
|
Int tot = 0;
|
||||||
|
|
||||||
if (max) {
|
if (max) {
|
||||||
Int i;
|
CELL i;
|
||||||
|
|
||||||
lab += 2;
|
lab += 2;
|
||||||
H++;
|
H++;
|
||||||
@ -10020,7 +10020,7 @@ absmi(int inp)
|
|||||||
FAIL();
|
FAIL();
|
||||||
}
|
}
|
||||||
if ((Int)d0 <= 0 ||
|
if ((Int)d0 <= 0 ||
|
||||||
d0 > ArityOfFunctor((Functor) d1)) {
|
(Int)d0 > ArityOfFunctor((Functor) d1)) {
|
||||||
/* don't complain here for Prolog compatibility
|
/* don't complain here for Prolog compatibility
|
||||||
if ((Int)d0 <= 0) {
|
if ((Int)d0 <= 0) {
|
||||||
saveregs();
|
saveregs();
|
||||||
@ -10108,7 +10108,7 @@ absmi(int inp)
|
|||||||
FAIL();
|
FAIL();
|
||||||
}
|
}
|
||||||
if ((Int)d0 <= 0 ||
|
if ((Int)d0 <= 0 ||
|
||||||
d0 > ArityOfFunctor((Functor) d1)) {
|
(Int)d0 > ArityOfFunctor((Functor) d1)) {
|
||||||
/* don't complain here for Prolog compatibility
|
/* don't complain here for Prolog compatibility
|
||||||
if ((Int)d0 <= 0) {
|
if ((Int)d0 <= 0) {
|
||||||
saveregs();
|
saveregs();
|
||||||
@ -10200,7 +10200,7 @@ absmi(int inp)
|
|||||||
FAIL();
|
FAIL();
|
||||||
}
|
}
|
||||||
if ((Int)d0 <= 0 ||
|
if ((Int)d0 <= 0 ||
|
||||||
d0 > ArityOfFunctor((Functor) d1)) {
|
(Int)d0 > ArityOfFunctor((Functor) d1)) {
|
||||||
/* don't complain here for Prolog compatibility
|
/* don't complain here for Prolog compatibility
|
||||||
if ((Int)d0 <= 0) {
|
if ((Int)d0 <= 0) {
|
||||||
saveregs();
|
saveregs();
|
||||||
@ -10302,7 +10302,7 @@ absmi(int inp)
|
|||||||
FAIL();
|
FAIL();
|
||||||
}
|
}
|
||||||
if ((Int)d0 <= 0 ||
|
if ((Int)d0 <= 0 ||
|
||||||
d0 > ArityOfFunctor((Functor) d1)) {
|
(Int)d0 > ArityOfFunctor((Functor) d1)) {
|
||||||
/* don't complain here for Prolog compatibility
|
/* don't complain here for Prolog compatibility
|
||||||
if ((Int)d0 <= 0) {
|
if ((Int)d0 <= 0) {
|
||||||
saveregs();
|
saveregs();
|
||||||
@ -11460,7 +11460,7 @@ absmi(int inp)
|
|||||||
BOp(p_execute, sla);
|
BOp(p_execute, sla);
|
||||||
{
|
{
|
||||||
PredEntry *pen;
|
PredEntry *pen;
|
||||||
int mod = IntOfTerm(ARG2);
|
SMALLUNSGN mod = IntOfTerm(ARG2);
|
||||||
|
|
||||||
CACHE_Y_AS_ENV(Y);
|
CACHE_Y_AS_ENV(Y);
|
||||||
#ifndef NO_CHECKING
|
#ifndef NO_CHECKING
|
||||||
@ -11577,7 +11577,7 @@ absmi(int inp)
|
|||||||
BOp(p_execute_within, sla);
|
BOp(p_execute_within, sla);
|
||||||
{
|
{
|
||||||
PredEntry *pen;
|
PredEntry *pen;
|
||||||
int mod = CurrentModule;
|
SMALLUNSGN mod = CurrentModule;
|
||||||
|
|
||||||
|
|
||||||
CACHE_Y_AS_ENV(Y);
|
CACHE_Y_AS_ENV(Y);
|
||||||
@ -11720,7 +11720,7 @@ absmi(int inp)
|
|||||||
BOp(p_last_execute_within, sla);
|
BOp(p_last_execute_within, sla);
|
||||||
{
|
{
|
||||||
PredEntry *pen;
|
PredEntry *pen;
|
||||||
int mod = CurrentModule;
|
SMALLUNSGN mod = CurrentModule;
|
||||||
|
|
||||||
CACHE_Y_AS_ENV(Y);
|
CACHE_Y_AS_ENV(Y);
|
||||||
#ifndef NO_CHECKING
|
#ifndef NO_CHECKING
|
||||||
|
|||||||
@ -263,7 +263,7 @@ GetAProp(Atom a, PropFlags kind)
|
|||||||
}
|
}
|
||||||
|
|
||||||
inline static Prop
|
inline static Prop
|
||||||
GetPredPropByAtomHavingLock(AtomEntry* ae, int cur_mod)
|
GetPredPropByAtomHavingLock(AtomEntry* ae, SMALLUNSGN cur_mod)
|
||||||
/* get predicate entry for ap/arity; create it if neccessary. */
|
/* get predicate entry for ap/arity; create it if neccessary. */
|
||||||
{
|
{
|
||||||
Prop p0;
|
Prop p0;
|
||||||
@ -281,7 +281,7 @@ GetPredPropByAtomHavingLock(AtomEntry* ae, int cur_mod)
|
|||||||
}
|
}
|
||||||
|
|
||||||
Prop
|
Prop
|
||||||
GetPredPropByAtom(Atom at, int cur_mod)
|
GetPredPropByAtom(Atom at, SMALLUNSGN cur_mod)
|
||||||
/* get predicate entry for ap/arity; create it if neccessary. */
|
/* get predicate entry for ap/arity; create it if neccessary. */
|
||||||
{
|
{
|
||||||
Prop p0;
|
Prop p0;
|
||||||
@ -314,7 +314,7 @@ GetPredPropByFuncHavingLock(Functor f, SMALLUNSGN cur_mod)
|
|||||||
}
|
}
|
||||||
|
|
||||||
Prop
|
Prop
|
||||||
GetPredPropByFunc(Functor f, int cur_mod)
|
GetPredPropByFunc(Functor f, SMALLUNSGN cur_mod)
|
||||||
/* get predicate entry for ap/arity; */
|
/* get predicate entry for ap/arity; */
|
||||||
{
|
{
|
||||||
Prop p0;
|
Prop p0;
|
||||||
|
|||||||
@ -282,7 +282,7 @@ p_access_array(void)
|
|||||||
Term t = Deref(ARG1);
|
Term t = Deref(ARG1);
|
||||||
Term ti = Deref(ARG2);
|
Term ti = Deref(ARG2);
|
||||||
Term tf;
|
Term tf;
|
||||||
UInt indx;
|
Int indx;
|
||||||
|
|
||||||
if (IsNonVarTerm(ti)) {
|
if (IsNonVarTerm(ti)) {
|
||||||
union arith_ret v;
|
union arith_ret v;
|
||||||
@ -1344,7 +1344,7 @@ p_assign_static(void)
|
|||||||
Error(TYPE_ERROR_ARRAY,t1,"update_array");
|
Error(TYPE_ERROR_ARRAY,t1,"update_array");
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
}
|
}
|
||||||
if (indx > 0 && (UInt)indx > ArityOfFunctor(f)) {
|
if (indx > 0 && indx > ArityOfFunctor(f)) {
|
||||||
Error(DOMAIN_ERROR_ARRAY_OVERFLOW,t2,"update_array");
|
Error(DOMAIN_ERROR_ARRAY_OVERFLOW,t2,"update_array");
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
#define YAP_BOOT_FROM_SAVED_STACKS 2
|
#define YAP_BOOT_FROM_SAVED_STACKS 2
|
||||||
#define YAP_BOOT_FROM_SAVED_ERROR -1
|
#define YAP_BOOT_FROM_SAVED_ERROR -1
|
||||||
|
|
||||||
#if defined(_MSC_VER) && defined(YAPDLL_EXPORTS)
|
#if defined(_MSC_VER) && defined(YAP_EXPORTS)
|
||||||
#define X_API __declspec(dllexport)
|
#define X_API __declspec(dllexport)
|
||||||
#else
|
#else
|
||||||
#define X_API
|
#define X_API
|
||||||
|
|||||||
@ -331,7 +331,7 @@ Error (yap_error_number type, Term where, char *format,...)
|
|||||||
fprintf(stderr,"[ ERROR WITHIN ERROR: %s ]\n", p);
|
fprintf(stderr,"[ ERROR WITHIN ERROR: %s ]\n", p);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
if (P == FAILCODE)
|
if (P == (yamop *)(FAILCODE))
|
||||||
return(P);
|
return(P);
|
||||||
/* PURE_ABORT may not have set where correctly */
|
/* PURE_ABORT may not have set where correctly */
|
||||||
if (type == PURE_ABORT)
|
if (type == PURE_ABORT)
|
||||||
|
|||||||
233
C/evalis.c
233
C/evalis.c
@ -1,233 +0,0 @@
|
|||||||
/*************************************************************************
|
|
||||||
* *
|
|
||||||
* YAP Prolog *
|
|
||||||
* *
|
|
||||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
|
||||||
* *
|
|
||||||
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 *
|
|
||||||
* *
|
|
||||||
**************************************************************************
|
|
||||||
* *
|
|
||||||
* File: evalis.c *
|
|
||||||
* Last rev: *
|
|
||||||
* mods: *
|
|
||||||
* comments: is/3 predicate *
|
|
||||||
* *
|
|
||||||
*************************************************************************/
|
|
||||||
#ifdef SCCS
|
|
||||||
static char SccsId[] = "%W% %G%";
|
|
||||||
#endif /* SCCS */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This predicates had to be developed here because of a bug in the MPW
|
|
||||||
* compiler, which was not able to compile the original eval.c
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Yap.h"
|
|
||||||
#include "Yatom.h"
|
|
||||||
#include "Heap.h"
|
|
||||||
#include "eval.h"
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
UnEvalInt(BITS16 op, Int i1)
|
|
||||||
{
|
|
||||||
switch(op) {
|
|
||||||
case e_uminus:
|
|
||||||
REvalInt(-i1);
|
|
||||||
case e_abs:
|
|
||||||
#if SHORT_INTS
|
|
||||||
#if HAVE_LABS
|
|
||||||
REvalInt((Int)labs((long int)i1));
|
|
||||||
#else
|
|
||||||
REvalInt((i1 >= 0 ? i1 : -i1));
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
REvalInt(abs(i1));
|
|
||||||
#endif
|
|
||||||
case e_msb:
|
|
||||||
REvalInt(msb(i1));
|
|
||||||
case e_uplus:
|
|
||||||
REvalInt(i1);
|
|
||||||
case e_not:
|
|
||||||
REvalInt(~i1);
|
|
||||||
case e_exp:
|
|
||||||
REvalFl(exp(FL(i1)));
|
|
||||||
case e_log:
|
|
||||||
REvalFl(log(FL(i1)));
|
|
||||||
case e_log10:
|
|
||||||
REvalFl(log10(FL(i1)));
|
|
||||||
case e_sqrt:
|
|
||||||
REvalFl(sqrt(FL(i1)));
|
|
||||||
case e_sin:
|
|
||||||
REvalFl(sin(FL(i1)));
|
|
||||||
case e_cos:
|
|
||||||
REvalFl(cos(FL(i1)));
|
|
||||||
case e_tan:
|
|
||||||
REvalFl(tan(FL(i1)));
|
|
||||||
case e_sinh:
|
|
||||||
REvalFl(sinh(FL(i1)));
|
|
||||||
case e_cosh:
|
|
||||||
REvalFl(cosh(FL(i1)));
|
|
||||||
case e_tanh:
|
|
||||||
REvalFl(tanh(FL(i1)));
|
|
||||||
case e_asin:
|
|
||||||
REvalFl(asin(FL(i1)));
|
|
||||||
case e_acos:
|
|
||||||
REvalFl(acos(FL(i1)));
|
|
||||||
case e_atan:
|
|
||||||
REvalFl(atan(FL(i1)));
|
|
||||||
case e_asinh:
|
|
||||||
REvalFl(asinh(FL(i1)));
|
|
||||||
case e_acosh:
|
|
||||||
REvalFl(acosh(FL(i1)));
|
|
||||||
case e_atanh:
|
|
||||||
REvalFl(atanh(FL(i1)));
|
|
||||||
case e_floor:
|
|
||||||
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */
|
|
||||||
Error(TYPE_ERROR_FLOAT, MkIntegerTerm(i1), "floor/1");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
} else {
|
|
||||||
REvalFl(FL(i1));
|
|
||||||
}
|
|
||||||
case e_round:
|
|
||||||
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */
|
|
||||||
Error(TYPE_ERROR_FLOAT, MkIntegerTerm(i1), "round/1");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
} else {
|
|
||||||
REvalFl(FL(i1));
|
|
||||||
}
|
|
||||||
case e_ceiling:
|
|
||||||
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */
|
|
||||||
Error(TYPE_ERROR_FLOAT, MkIntegerTerm(i1), "floor/1");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
} else {
|
|
||||||
REvalFl(FL(i1));
|
|
||||||
}
|
|
||||||
case e_truncate:
|
|
||||||
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */
|
|
||||||
Error(TYPE_ERROR_FLOAT, MkIntegerTerm(i1), "truncate/1");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
} else {
|
|
||||||
REvalFl(FL(i1));
|
|
||||||
}
|
|
||||||
case e_integer:
|
|
||||||
REvalInt(i1);
|
|
||||||
case e_float:
|
|
||||||
REvalFl(FL(i1));
|
|
||||||
case e_fmodf:
|
|
||||||
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */
|
|
||||||
Error(TYPE_ERROR_FLOAT,MkIntegerTerm(i1),"mod/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
} else {
|
|
||||||
REvalFl(FL(0.0));
|
|
||||||
}
|
|
||||||
case e_imodf:
|
|
||||||
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) { /* iso */
|
|
||||||
/* iso does not allow integer arguments to this procedure */
|
|
||||||
Error(TYPE_ERROR_FLOAT,MkIntegerTerm(i1),"mod/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
} else {
|
|
||||||
REvalFl(FL(i1));
|
|
||||||
}
|
|
||||||
case e_sign:
|
|
||||||
if (i1 < 0) {
|
|
||||||
REvalInt(-1);
|
|
||||||
} else if (i1 == 0) {
|
|
||||||
REvalInt(0);
|
|
||||||
} else {
|
|
||||||
REvalInt(1);
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
Term t, ti[2];
|
|
||||||
|
|
||||||
ti[0] = MkAtomTerm(NameOfFunctor(FunctorOfTerm(current_eval_term)));
|
|
||||||
ti[1] = MkIntegerTerm(1);
|
|
||||||
t = MkApplTerm(MkFunctor(LookupAtom("/"),1), 1, ti);
|
|
||||||
Error(TYPE_ERROR_EVALUABLE, t,
|
|
||||||
"arithmetic expression %s/%d",
|
|
||||||
RepAtom(NameOfFunctor(FunctorOfTerm(current_eval_term)))->StrOfAE,
|
|
||||||
2
|
|
||||||
);
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Int
|
|
||||||
p_unary_is(void)
|
|
||||||
{
|
|
||||||
register BITS16 OpNum;
|
|
||||||
Term t2, t3;
|
|
||||||
int flag;
|
|
||||||
|
|
||||||
current_eval_term = MkIntTerm(1);
|
|
||||||
t2 = Deref(ARG2);
|
|
||||||
if (IsVarTerm(t2)) {
|
|
||||||
Error(INSTANTIATION_ERROR, t2, "operation for is/3");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
if (IsAtomTerm(t2)) {
|
|
||||||
Atom name;
|
|
||||||
Prop p;
|
|
||||||
name = AtomOfTerm(t2);
|
|
||||||
if ((p = GetExpProp(name, 1)) == NIL) {
|
|
||||||
Term t, ti[2];
|
|
||||||
|
|
||||||
ti[0] = MkAtomTerm(name);
|
|
||||||
ti[1] = MkIntegerTerm(1);
|
|
||||||
t = MkApplTerm(MkFunctor(LookupAtom("/"),2), 2, ti);
|
|
||||||
Error(TYPE_ERROR_EVALUABLE, t,
|
|
||||||
"arithmetic expression %s/%d",
|
|
||||||
RepAtom(name)->StrOfAE,
|
|
||||||
1
|
|
||||||
);
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
OpNum = RepExpProp(p)->ENoOfEE;
|
|
||||||
} else if (IsIntTerm(t2))
|
|
||||||
OpNum = IntOfTerm(t2);
|
|
||||||
else
|
|
||||||
return (FALSE);
|
|
||||||
t3 = Deref(ARG3);
|
|
||||||
if (IsVarTerm(t3)) {
|
|
||||||
int op = 0;
|
|
||||||
|
|
||||||
while (InitTab[op].eno != OpNum) op++;
|
|
||||||
Error(INSTANTIATION_ERROR, t3, "arithmetic expression %s/1", InitTab[op].OpName);
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
if (IsIntegerTerm(t3)) {
|
|
||||||
flag = UnEvalInt(OpNum, IntegerOfTerm(t3));
|
|
||||||
} else if (IsFloatTerm(t3)) {
|
|
||||||
flag = UnEvalFl(OpNum, FloatOfTerm(t3));
|
|
||||||
} else {
|
|
||||||
int aflag = Eval(t3);
|
|
||||||
if (aflag == FError) {
|
|
||||||
return(FALSE);
|
|
||||||
} else if (aflag == FInt) {
|
|
||||||
flag = UnEvalInt(OpNum, eval_int);
|
|
||||||
} else {
|
|
||||||
flag = UnEvalFl(OpNum, eval_flt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flag == FError) {
|
|
||||||
return(FALSE);
|
|
||||||
} else if (flag == FInt) {
|
|
||||||
return(unify_constant(ARG1,MkIntegerTerm(eval_int)));
|
|
||||||
} else {
|
|
||||||
return(unify_constant(ARG1,MkFloatTerm(eval_flt)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
301
C/evaltwo.c
301
C/evaltwo.c
@ -1,301 +0,0 @@
|
|||||||
/*************************************************************************
|
|
||||||
* *
|
|
||||||
* YAP Prolog *
|
|
||||||
* *
|
|
||||||
* Yap Prolog was developed at NCCUP - Universidade do Porto *
|
|
||||||
* *
|
|
||||||
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 *
|
|
||||||
* *
|
|
||||||
**************************************************************************
|
|
||||||
* *
|
|
||||||
* File: evaltwo.c *
|
|
||||||
* Last rev: *
|
|
||||||
* mods: *
|
|
||||||
* comments: is/4 predicate *
|
|
||||||
* *
|
|
||||||
*************************************************************************/
|
|
||||||
#ifdef SCCS
|
|
||||||
static char SccsId[] = "%W% %G%";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This predicates had to be developed here because of a bug in the MPW
|
|
||||||
* compiler, which was not able to compile the original eval.c
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Yap.h"
|
|
||||||
#include "Yatom.h"
|
|
||||||
#include "Heap.h"
|
|
||||||
#include "eval.h"
|
|
||||||
|
|
||||||
#define IntRes(X) return(unify_constant(ARG1,MkIntegerTerm(X)))
|
|
||||||
#define FloatRes(X) return(unify_constant(ARG1,MkEvalFl(X)))
|
|
||||||
|
|
||||||
int
|
|
||||||
BinEvalInt(BITS16 op, Int i1, Int i2)
|
|
||||||
{
|
|
||||||
switch(op) {
|
|
||||||
case e_plus:
|
|
||||||
REvalInt(i1 + i2);
|
|
||||||
case e_dif:
|
|
||||||
REvalInt(i1 - i2);
|
|
||||||
case e_times:
|
|
||||||
REvalInt(i1 * i2);
|
|
||||||
case e_div:
|
|
||||||
#ifdef TRY_TO_CONVERT_FLOATS_TO_INTS
|
|
||||||
if (i1 % i2 == 0)
|
|
||||||
REvalInt(i1 / i2);
|
|
||||||
#endif
|
|
||||||
REvalFl(FL(i1) / FL(i2));
|
|
||||||
case e_and:
|
|
||||||
REvalInt(i1 & i2);
|
|
||||||
case e_xor:
|
|
||||||
REvalInt(i1 ^ i2);
|
|
||||||
case e_or:
|
|
||||||
REvalInt(i1 | i2);
|
|
||||||
case e_lshift:
|
|
||||||
REvalInt(i1 << i2);
|
|
||||||
case e_rshift:
|
|
||||||
REvalInt(i1 >> i2);
|
|
||||||
case e_mod:
|
|
||||||
REvalInt(i1 % i2);
|
|
||||||
case e_idiv:
|
|
||||||
REvalInt(i1 / i2);
|
|
||||||
case e_gcd:
|
|
||||||
REvalInt(gcd(abs(i1),abs(i2)));
|
|
||||||
case e_gcdmult:
|
|
||||||
{
|
|
||||||
Int i;
|
|
||||||
REvalInt(gcdmult(abs(i1),abs(i2), &i));
|
|
||||||
}
|
|
||||||
case e_min:
|
|
||||||
REvalInt((i1 < i2 ? i1 : i2));
|
|
||||||
case e_max:
|
|
||||||
REvalInt((i1 > i2 ? i1 : i2));
|
|
||||||
case e_power:
|
|
||||||
REvalFl(pow(FL(i1), FL(i2)));
|
|
||||||
case e_atan2:
|
|
||||||
REvalFl(atan2(FL(i1), FL(i2)));
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
Term t, ti[2];
|
|
||||||
|
|
||||||
ti[0] = MkAtomTerm(NameOfFunctor(FunctorOfTerm(current_eval_term)));
|
|
||||||
ti[1] = MkIntegerTerm(2);
|
|
||||||
t = MkApplTerm(MkFunctor(LookupAtom("/"),2), 2, ti);
|
|
||||||
Error(TYPE_ERROR_EVALUABLE, t,
|
|
||||||
"in arithmetic expression %s(%d,%d)",
|
|
||||||
RepAtom(NameOfFunctor(FunctorOfTerm(current_eval_term)))->StrOfAE,
|
|
||||||
i1,
|
|
||||||
i2
|
|
||||||
);
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
BinEvalFl(BITS16 op, Float f1, Float f2, int flts)
|
|
||||||
{
|
|
||||||
switch(op) {
|
|
||||||
case e_plus:
|
|
||||||
REvalFl(f1 + f2);
|
|
||||||
case e_dif:
|
|
||||||
REvalFl(f1 - f2);
|
|
||||||
case e_times:
|
|
||||||
REvalFl(f1 * f2);
|
|
||||||
case e_div:
|
|
||||||
REvalFl(f1 / f2);
|
|
||||||
case e_power:
|
|
||||||
REvalFl(pow(f1, f2));
|
|
||||||
case e_atan2:
|
|
||||||
REvalFl(atan2(f1, f2));
|
|
||||||
case e_min:
|
|
||||||
REvalFl((f1 < f2 ? f1 : f2));
|
|
||||||
case e_max:
|
|
||||||
REvalFl((f1 > f2 ? f1 : f2));
|
|
||||||
case e_lshift:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "<</2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "<</2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_rshift:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), ">>/2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), ">>/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_and:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "/\\/2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "/\\/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_xor:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "#/2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "#/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_or:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "\\/ /2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "\\/ /2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_mod:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "mod/2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "mod/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_idiv:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "/ /2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "/ /2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_gcd:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "gcd/2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "gcd/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
case e_gcdmult:
|
|
||||||
if (flts & 1)
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f1), "gcdmult/2");
|
|
||||||
else
|
|
||||||
Error(TYPE_ERROR_INTEGER, MkFloatTerm(f2), "gcdmult/2");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
REvalError();
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
Term t, ti[2];
|
|
||||||
|
|
||||||
ti[0] = MkAtomTerm(NameOfFunctor(FunctorOfTerm(current_eval_term)));
|
|
||||||
ti[1] = MkIntegerTerm(2);
|
|
||||||
t = MkApplTerm(MkFunctor(LookupAtom("/"),2), 2, ti);
|
|
||||||
Error(TYPE_ERROR_EVALUABLE, t,
|
|
||||||
"in arithmetic expression %s(%d,%d)",
|
|
||||||
RepAtom(NameOfFunctor(FunctorOfTerm(current_eval_term)))->StrOfAE,
|
|
||||||
f1,
|
|
||||||
f2
|
|
||||||
);
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
}
|
|
||||||
REvalError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Int
|
|
||||||
p_binary_is(void)
|
|
||||||
{
|
|
||||||
register BITS16 OpNum;
|
|
||||||
Term t2,t3,t4;
|
|
||||||
Int i1;
|
|
||||||
Float f1;
|
|
||||||
int flag;
|
|
||||||
|
|
||||||
current_eval_term = MkIntTerm(2);
|
|
||||||
t2 = Deref(ARG2);
|
|
||||||
if (IsVarTerm(t2)) {
|
|
||||||
Error(INSTANTIATION_ERROR, t2, "operation for is/4");
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
if (IsIntTerm(t2))
|
|
||||||
OpNum = IntOfTerm(t2);
|
|
||||||
else if (IsAtomTerm(t2)) {
|
|
||||||
Atom name = AtomOfTerm(t2);
|
|
||||||
Prop p;
|
|
||||||
if ((p = GetExpProp(name, 2)) == NIL) {
|
|
||||||
Term t, ti[2];
|
|
||||||
|
|
||||||
ti[0] = MkIntegerTerm(2);
|
|
||||||
ti[0] = MkAtomTerm(name);
|
|
||||||
t = MkApplTerm(MkFunctor(LookupAtom("/"),2), 2, ti);
|
|
||||||
Error(TYPE_ERROR_EVALUABLE, t,
|
|
||||||
"arithmetic expression %s/%d",
|
|
||||||
RepAtom(name)->StrOfAE,
|
|
||||||
2
|
|
||||||
);
|
|
||||||
P = (yamop *)FAILCODE;
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
OpNum = RepExpProp(p)->ENoOfEE;
|
|
||||||
} else
|
|
||||||
return (FALSE);
|
|
||||||
t3 = Deref(ARG3);
|
|
||||||
t4 = Deref(ARG4);
|
|
||||||
if (IsVarTerm(t3) || IsVarTerm(t4)) {
|
|
||||||
int op = 0;
|
|
||||||
|
|
||||||
while (InitTab[op].eno != OpNum) op++;
|
|
||||||
Error(INSTANTIATION_ERROR, (IsVarTerm(t3) ? t3 : t4),
|
|
||||||
"arithmetic expression %s/2", InitTab[op].OpName);
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
if (IsIntegerTerm(t3)) {
|
|
||||||
i1 = IntegerOfTerm(t3);
|
|
||||||
t3_int:
|
|
||||||
if (IsIntegerTerm(t4)) {
|
|
||||||
flag = BinEvalInt(OpNum, i1, IntegerOfTerm(t4));
|
|
||||||
} else if (IsFloatTerm(t4)) {
|
|
||||||
flag = BinEvalFl(OpNum, FL(i1), FloatOfTerm(t4), 2);
|
|
||||||
} else {
|
|
||||||
int aflag = Eval(t4);
|
|
||||||
if (aflag == FError) {
|
|
||||||
return(FALSE);
|
|
||||||
} else if (aflag == FInt) {
|
|
||||||
flag = BinEvalInt(OpNum, i1, eval_int);
|
|
||||||
} else {
|
|
||||||
flag = BinEvalFl(OpNum, FL(i1), eval_flt, 2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (IsFloatTerm(t3)) {
|
|
||||||
f1 = FloatOfTerm(t3);
|
|
||||||
t3_flt:
|
|
||||||
if (IsIntegerTerm(t4)) {
|
|
||||||
flag = BinEvalFl(OpNum, f1, FL(IntegerOfTerm(t4)), 1);
|
|
||||||
} else if (IsFloatTerm(t4)) {
|
|
||||||
flag = BinEvalFl(OpNum, f1, FloatOfTerm(t4), 3);
|
|
||||||
} else {
|
|
||||||
int aflag = Eval(t4);
|
|
||||||
if (aflag == FError) {
|
|
||||||
return(FALSE);
|
|
||||||
} else if (aflag == FInt) {
|
|
||||||
flag = BinEvalFl(OpNum, f1, eval_int, 1);
|
|
||||||
} else {
|
|
||||||
flag = BinEvalFl(OpNum, f1, eval_flt, 3);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
int aflag = Eval(t3);
|
|
||||||
if (aflag == FError) {
|
|
||||||
return(FALSE);
|
|
||||||
} else if (aflag == FInt) {
|
|
||||||
i1 = eval_int;
|
|
||||||
goto t3_int;
|
|
||||||
} else {
|
|
||||||
f1 = eval_flt;
|
|
||||||
goto t3_flt;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flag == FError) {
|
|
||||||
return(FALSE);
|
|
||||||
} else if (flag == FInt) {
|
|
||||||
return(unify_constant(ARG1,MkIntegerTerm(eval_int)));
|
|
||||||
} else {
|
|
||||||
return(unify_constant(ARG1,MkFloatTerm(eval_flt)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
4
C/exec.c
4
C/exec.c
@ -200,7 +200,7 @@ EnterCreepMode(SMALLUNSGN mod) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
inline static Int
|
inline static Int
|
||||||
do_execute(Term t, int mod)
|
do_execute(Term t, SMALLUNSGN mod)
|
||||||
{
|
{
|
||||||
if (yap_flags[SPY_CREEP_FLAG]) {
|
if (yap_flags[SPY_CREEP_FLAG]) {
|
||||||
return(EnterCreepMode(mod));
|
return(EnterCreepMode(mod));
|
||||||
@ -1278,7 +1278,7 @@ JumpToEnv(Term t) {
|
|||||||
/* I could backtrack here, but it is easier to leave the unwinding
|
/* I could backtrack here, but it is easier to leave the unwinding
|
||||||
to the emulator */
|
to the emulator */
|
||||||
B->cp_a3 = t;
|
B->cp_a3 = t;
|
||||||
P = FAILCODE;
|
P = (yamop *)FAILCODE;
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
10
C/heapgc.c
10
C/heapgc.c
@ -40,7 +40,7 @@ static Int tot_gc_time = 0; /* total time spent in GC */
|
|||||||
static Int tot_gc_recovered = 0; /* number of heap objects in all garbage collections */
|
static Int tot_gc_recovered = 0; /* number of heap objects in all garbage collections */
|
||||||
|
|
||||||
/* in a single gc */
|
/* in a single gc */
|
||||||
UInt total_marked; /* number of heap objects marked */
|
Int total_marked; /* number of heap objects marked */
|
||||||
|
|
||||||
struct gc_ma_h_entry *live_list;
|
struct gc_ma_h_entry *live_list;
|
||||||
|
|
||||||
@ -202,11 +202,11 @@ partition(CELL *a[], Int p, Int r)
|
|||||||
static void
|
static void
|
||||||
insort(CELL *a[], Int p, Int q)
|
insort(CELL *a[], Int p, Int q)
|
||||||
{
|
{
|
||||||
UInt j;
|
Int j;
|
||||||
|
|
||||||
for (j = p+1; j <= q; j ++) {
|
for (j = p+1; j <= q; j ++) {
|
||||||
CELL *key;
|
CELL *key;
|
||||||
UInt i;
|
Int i;
|
||||||
|
|
||||||
key = a[j];
|
key = a[j];
|
||||||
i = j;
|
i = j;
|
||||||
@ -223,7 +223,7 @@ insort(CELL *a[], Int p, Int q)
|
|||||||
static void
|
static void
|
||||||
quicksort(CELL *a[], Int p, Int r)
|
quicksort(CELL *a[], Int p, Int r)
|
||||||
{
|
{
|
||||||
UInt q;
|
Int q;
|
||||||
if (p < r) {
|
if (p < r) {
|
||||||
if (r - p < 100) {
|
if (r - p < 100) {
|
||||||
insort(a, p, r);
|
insort(a, p, r);
|
||||||
@ -2807,7 +2807,7 @@ gc(Int predarity, CELL *current_env, yamop *nextop)
|
|||||||
}
|
}
|
||||||
/* expand the stack if effectiveness is less than 20 % */
|
/* expand the stack if effectiveness is less than 20 % */
|
||||||
if (ASP - H < gc_margin || !gc_on || effectiveness < 20) {
|
if (ASP - H < gc_margin || !gc_on || effectiveness < 20) {
|
||||||
UInt gap = CalculateStackGap();
|
Int gap = CalculateStackGap();
|
||||||
if (ASP-H > gc_margin)
|
if (ASP-H > gc_margin)
|
||||||
gc_margin = (ASP-H)+gap;
|
gc_margin = (ASP-H)+gap;
|
||||||
else
|
else
|
||||||
|
|||||||
@ -68,6 +68,9 @@ static char SccsId[] = "%W% %G%";
|
|||||||
#if !HAVE_STRNCPY
|
#if !HAVE_STRNCPY
|
||||||
#define strncpy(X,Y,Z) strcpy(X,Y)
|
#define strncpy(X,Y,Z) strcpy(X,Y)
|
||||||
#endif
|
#endif
|
||||||
|
#if _MSC_VER
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
#if _MSC_VER || defined(__MINGW32__)
|
#if _MSC_VER || defined(__MINGW32__)
|
||||||
#if USE_SOCKET
|
#if USE_SOCKET
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
@ -4812,8 +4815,10 @@ StreamToFileNo(Term t)
|
|||||||
#else
|
#else
|
||||||
return(Stream[sno].u.pipe.fd);
|
return(Stream[sno].u.pipe.fd);
|
||||||
#endif
|
#endif
|
||||||
|
#if USE_SOCKET
|
||||||
} else if (Stream[sno].status & Socket_Stream_f) {
|
} else if (Stream[sno].status & Socket_Stream_f) {
|
||||||
return(Stream[sno].u.socket.fd);
|
return(Stream[sno].u.socket.fd);
|
||||||
|
#endif
|
||||||
} else if (Stream[sno].status & (Null_Stream_f|InMemory_Stream_f)) {
|
} else if (Stream[sno].status & (Null_Stream_f|InMemory_Stream_f)) {
|
||||||
return(-1);
|
return(-1);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -46,7 +46,7 @@ Module_Name(CODEADDR cap)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
SMALLUNSGN
|
||||||
LookupModule(Term a)
|
LookupModule(Term a)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|||||||
@ -397,6 +397,7 @@ ParseTerm(int prio)
|
|||||||
}
|
}
|
||||||
} else if (tokptr->Tok == Name_tok) {
|
} else if (tokptr->Tok == Name_tok) {
|
||||||
Atom at = (Atom)tokptr->TokInfo;
|
Atom at = (Atom)tokptr->TokInfo;
|
||||||
|
#ifndef _MSC_VER
|
||||||
if ((Atom)t == AtomPlus) {
|
if ((Atom)t == AtomPlus) {
|
||||||
if (at == AtomInf) {
|
if (at == AtomInf) {
|
||||||
t = MkFloatTerm(INFINITY);
|
t = MkFloatTerm(INFINITY);
|
||||||
@ -418,6 +419,7 @@ ParseTerm(int prio)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (opprio <= prio) {
|
if (opprio <= prio) {
|
||||||
/* try to parse as a prefix operator */
|
/* try to parse as a prefix operator */
|
||||||
|
|||||||
@ -2009,10 +2009,8 @@ p_set_yap_flags(void)
|
|||||||
return(FALSE);
|
return(FALSE);
|
||||||
if (value == 1) {
|
if (value == 1) {
|
||||||
heap_regs->pred_meta_call = RepPredProp(PredPropByFunc(MkFunctor(AtomMetaCall,4),0));
|
heap_regs->pred_meta_call = RepPredProp(PredPropByFunc(MkFunctor(AtomMetaCall,4),0));
|
||||||
set_fpu_exceptions(TRUE);
|
|
||||||
} else {
|
} else {
|
||||||
heap_regs->pred_meta_call = RepPredProp(PredPropByFunc(MkFunctor(AtomMetaCall,4),0));
|
heap_regs->pred_meta_call = RepPredProp(PredPropByFunc(MkFunctor(AtomMetaCall,4),0));
|
||||||
set_fpu_exceptions(FALSE);
|
|
||||||
}
|
}
|
||||||
yap_flags[LANGUAGE_MODE_FLAG] = value;
|
yap_flags[LANGUAGE_MODE_FLAG] = value;
|
||||||
break;
|
break;
|
||||||
|
|||||||
84
C/sysbits.c
84
C/sysbits.c
@ -294,29 +294,38 @@ void cputime_interval(Int *now,Int *interval)
|
|||||||
|
|
||||||
static FILETIME StartOfTimes, last_time;
|
static FILETIME StartOfTimes, last_time;
|
||||||
|
|
||||||
|
static clock_t TimesStartOfTimes, Times_last_time;
|
||||||
|
|
||||||
/* store user time in this variable */
|
/* store user time in this variable */
|
||||||
static void
|
static void
|
||||||
InitTime (void)
|
InitTime (void)
|
||||||
{
|
{
|
||||||
HANDLE hProcess = GetCurrentProcess();
|
HANDLE hProcess = GetCurrentProcess();
|
||||||
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
||||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime))
|
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime)) {
|
||||||
WinError("could not query cputime");
|
/* WIN98 */
|
||||||
|
clock_t t;
|
||||||
|
t = clock ();
|
||||||
|
Times_last_time = TimesStartOfTimes = t;
|
||||||
|
} else {
|
||||||
last_time.dwLowDateTime = UserTime.dwLowDateTime;
|
last_time.dwLowDateTime = UserTime.dwLowDateTime;
|
||||||
last_time.dwHighDateTime = UserTime.dwHighDateTime;
|
last_time.dwHighDateTime = UserTime.dwHighDateTime;
|
||||||
StartOfTimes.dwLowDateTime = UserTime.dwLowDateTime;
|
StartOfTimes.dwLowDateTime = UserTime.dwLowDateTime;
|
||||||
StartOfTimes.dwHighDateTime = UserTime.dwHighDateTime;
|
StartOfTimes.dwHighDateTime = UserTime.dwHighDateTime;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Int
|
Int
|
||||||
cputime (void)
|
cputime (void)
|
||||||
{
|
{
|
||||||
HANDLE hProcess = GetCurrentProcess();
|
HANDLE hProcess = GetCurrentProcess();
|
||||||
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
||||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime))
|
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime)) {
|
||||||
WinError("could not query cputime");
|
clock_t t;
|
||||||
|
t = clock ();
|
||||||
|
return(((t - TimesStartOfTimes)*1000) / CLOCKS_PER_SEC);
|
||||||
|
} else {
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
{
|
|
||||||
unsigned long long int t =
|
unsigned long long int t =
|
||||||
*(unsigned long long int *)&UserTime -
|
*(unsigned long long int *)&UserTime -
|
||||||
*(unsigned long long int *)&StartOfTimes;
|
*(unsigned long long int *)&StartOfTimes;
|
||||||
@ -324,7 +333,7 @@ cputime (void)
|
|||||||
return((Int)t);
|
return((Int)t);
|
||||||
#endif
|
#endif
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
LONG_INTEGER t = *(LONG_INTEGER *)&UserTime - *(LONG_INTEGER *)&StartOfTimes;
|
__int64 t = *(__int64 *)&UserTime - *(__int64 *)&StartOfTimes;
|
||||||
return((Int)(t/10000));
|
return((Int)(t/10000));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -334,9 +343,13 @@ void cputime_interval(Int *now,Int *interval)
|
|||||||
{
|
{
|
||||||
HANDLE hProcess = GetCurrentProcess();
|
HANDLE hProcess = GetCurrentProcess();
|
||||||
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
||||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime))
|
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime)) {
|
||||||
WinError("could not query cputime");
|
clock_t t;
|
||||||
{
|
t = clock ();
|
||||||
|
*now = ((t - TimesStartOfTimes)*1000) / CLOCKS_PER_SEC;
|
||||||
|
*interval = (t - Times_last_time) * 1000 / CLOCKS_PER_SEC;
|
||||||
|
Times_last_time = t;
|
||||||
|
} else {
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
unsigned long long int t1 =
|
unsigned long long int t1 =
|
||||||
*(unsigned long long int *)&UserTime -
|
*(unsigned long long int *)&UserTime -
|
||||||
@ -350,8 +363,8 @@ void cputime_interval(Int *now,Int *interval)
|
|||||||
*interval = (Int)t2;
|
*interval = (Int)t2;
|
||||||
#endif
|
#endif
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
LONG_INTEGER t1 = *(LONG_INTEGER *)&UserTime - *(LONG_INTEGER *)&StartOfTimes;
|
__int64 t1 = *(__int64 *)&UserTime - *(__int64 *)&StartOfTimes;
|
||||||
LONG_INTEGER t2 = *(LONG_INTEGER *)&UserTime - *(LONG_INTEGER *)&last_time;
|
__int64 t2 = *(__int64 *)&UserTime - *(__int64 *)&last_time;
|
||||||
*now = (Int)(t1/10000);
|
*now = (Int)(t1/10000);
|
||||||
*interval = (Int)(t2/10000);
|
*interval = (Int)(t2/10000);
|
||||||
#endif
|
#endif
|
||||||
@ -882,8 +895,8 @@ HandleMatherr(int sig, siginfo_t *sip, ucontext_t *uap)
|
|||||||
default:
|
default:
|
||||||
error_no = EVALUATION_ERROR_UNDEFINED;
|
error_no = EVALUATION_ERROR_UNDEFINED;
|
||||||
}
|
}
|
||||||
YAP_matherror = error_no;
|
set_fpu_exceptions(0);
|
||||||
siglongjmp(RestartEnv, 2);
|
Error(error_no, TermNil, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -950,11 +963,6 @@ STATIC_PROTO (void my_signal, (int, void (*)(int)));
|
|||||||
#include <fenv.h>
|
#include <fenv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __linux__
|
|
||||||
/* fetestexcept does not seem to work in linux :-( :-( */
|
|
||||||
#undef HAVE_FETESTEXCEPT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static RETSIGTYPE
|
static RETSIGTYPE
|
||||||
HandleMatherr(int sig)
|
HandleMatherr(int sig)
|
||||||
{
|
{
|
||||||
@ -964,7 +972,6 @@ HandleMatherr(int sig)
|
|||||||
|
|
||||||
int raised = fetestexcept(FE_ALL_EXCEPT);
|
int raised = fetestexcept(FE_ALL_EXCEPT);
|
||||||
|
|
||||||
feclearexcept(FE_ALL_EXCEPT);
|
|
||||||
if (raised & FE_OVERFLOW) {
|
if (raised & FE_OVERFLOW) {
|
||||||
YAP_matherror = EVALUATION_ERROR_FLOAT_OVERFLOW;
|
YAP_matherror = EVALUATION_ERROR_FLOAT_OVERFLOW;
|
||||||
} else if (raised & (FE_INVALID|FE_INEXACT)) {
|
} else if (raised & (FE_INVALID|FE_INEXACT)) {
|
||||||
@ -973,18 +980,12 @@ HandleMatherr(int sig)
|
|||||||
YAP_matherror = EVALUATION_ERROR_ZERO_DIVISOR;
|
YAP_matherror = EVALUATION_ERROR_ZERO_DIVISOR;
|
||||||
} else if (raised & FE_UNDERFLOW) {
|
} else if (raised & FE_UNDERFLOW) {
|
||||||
YAP_matherror = EVALUATION_ERROR_FLOAT_UNDERFLOW;
|
YAP_matherror = EVALUATION_ERROR_FLOAT_UNDERFLOW;
|
||||||
} else {
|
} else
|
||||||
YAP_matherror = EVALUATION_ERROR_UNDEFINED;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
#endif
|
||||||
YAP_matherror = EVALUATION_ERROR_UNDEFINED;
|
YAP_matherror = EVALUATION_ERROR_UNDEFINED;
|
||||||
/* something very bad happened on the way to the forum */
|
/* something very bad happened on the way to the forum */
|
||||||
my_signal (SIGFPE, HandleMatherr);
|
set_fpu_exceptions(FALSE);
|
||||||
/* do a longjmp because Linux is an idiot, and it makes our life
|
Error(YAP_matherror, TermNil, "");
|
||||||
easier anyway, but not an abort!!
|
|
||||||
*/
|
|
||||||
siglongjmp(RestartEnv, 2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -1064,7 +1065,7 @@ void (*handler)(int);
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
InteractSIGINT(char ch) {
|
InteractSIGINT(int ch) {
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 'a':
|
case 'a':
|
||||||
/* abort computation */
|
/* abort computation */
|
||||||
@ -1278,7 +1279,7 @@ ReceiveSignal (int s)
|
|||||||
{
|
{
|
||||||
#ifndef MPW
|
#ifndef MPW
|
||||||
case SIGFPE:
|
case SIGFPE:
|
||||||
my_signal (SIGFPE, HandleMatherr);
|
set_fpu_exceptions(FALSE);
|
||||||
Error (SYSTEM_ERROR, TermNil, "floating point exception ]");
|
Error (SYSTEM_ERROR, TermNil, "floating point exception ]");
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
@ -1948,7 +1949,8 @@ DoTimerThread(LPVOID targ)
|
|||||||
LARGE_INTEGER liDueTime;
|
LARGE_INTEGER liDueTime;
|
||||||
|
|
||||||
htimer = CreateWaitableTimer(NULL,FALSE,NULL);
|
htimer = CreateWaitableTimer(NULL,FALSE,NULL);
|
||||||
liDueTime.QuadPart = -10000000LL*time;
|
liDueTime.QuadPart = -10000000;
|
||||||
|
liDueTime.QuadPart *= time;
|
||||||
/* Copy the relative time into a LARGE_INTEGER. */
|
/* Copy the relative time into a LARGE_INTEGER. */
|
||||||
if (SetWaitableTimer(htimer, &liDueTime,0,NULL,NULL,0) == 0) {
|
if (SetWaitableTimer(htimer, &liDueTime,0,NULL,NULL,0) == 0) {
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
@ -1959,6 +1961,9 @@ DoTimerThread(LPVOID targ)
|
|||||||
/* now, say what is going on */
|
/* now, say what is going on */
|
||||||
PutValue(AtomAlarm, MkAtomTerm(AtomTrue));
|
PutValue(AtomAlarm, MkAtomTerm(AtomTrue));
|
||||||
ExitThread(1);
|
ExitThread(1);
|
||||||
|
#if _MSC_VER
|
||||||
|
return(0L);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@ -2028,7 +2033,7 @@ set_fpu_exceptions(int flag)
|
|||||||
#if defined(__hpux)
|
#if defined(__hpux)
|
||||||
fpsetmask(FP_X_INV|FP_X_DZ|FP_X_OFL|FP_X_UFL);
|
fpsetmask(FP_X_INV|FP_X_DZ|FP_X_OFL|FP_X_UFL);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_FPU_CONTROL_H && i386 && FIX_CONFIGURE
|
#if HAVE_FPU_CONTROL_H && i386
|
||||||
/* I shall ignore denormalization and precision errors */
|
/* I shall ignore denormalization and precision errors */
|
||||||
int v = _FPU_IEEE & ~(_FPU_MASK_IM|_FPU_MASK_ZM|_FPU_MASK_OM|_FPU_MASK_UM);
|
int v = _FPU_IEEE & ~(_FPU_MASK_IM|_FPU_MASK_ZM|_FPU_MASK_OM|_FPU_MASK_UM);
|
||||||
_FPU_SETCW(v);
|
_FPU_SETCW(v);
|
||||||
@ -2036,19 +2041,31 @@ set_fpu_exceptions(int flag)
|
|||||||
#if HAVE_FETESTEXCEPT
|
#if HAVE_FETESTEXCEPT
|
||||||
feclearexcept(FE_ALL_EXCEPT);
|
feclearexcept(FE_ALL_EXCEPT);
|
||||||
#endif
|
#endif
|
||||||
|
my_signal (SIGFPE, HandleMatherr);
|
||||||
} else {
|
} else {
|
||||||
/* do IEEE arithmetic in the way the big boys do */
|
/* do IEEE arithmetic in the way the big boys do */
|
||||||
#if defined(__hpux)
|
#if defined(__hpux)
|
||||||
fpsetmask(FP_X_CLEAR);
|
fpsetmask(FP_X_CLEAR);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_FPU_CONTROL_H && i386 && FIX_CONFIGURE
|
#if HAVE_FPU_CONTROL_H && i386
|
||||||
/* this will probably not work in older releases of Linux */
|
/* this will probably not work in older releases of Linux */
|
||||||
int v = _FPU_IEEE;
|
int v = _FPU_IEEE;
|
||||||
_FPU_SETCW(v);
|
_FPU_SETCW(v);
|
||||||
#endif
|
#endif
|
||||||
|
my_signal (SIGFPE, SIG_IGN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Int
|
||||||
|
p_set_fpu_exceptions(void) {
|
||||||
|
if (yap_flags[LANGUAGE_MODE_FLAG] == 1) {
|
||||||
|
set_fpu_exceptions(FALSE); /* can't make it work right */
|
||||||
|
} else {
|
||||||
|
set_fpu_exceptions(FALSE);
|
||||||
|
}
|
||||||
|
return(TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is responsable for the initialization of all machine dependant
|
* This is responsable for the initialization of all machine dependant
|
||||||
* predicates
|
* predicates
|
||||||
@ -2096,6 +2113,7 @@ InitSysPreds(void)
|
|||||||
InitCPred ("$getenv", 2, p_getenv, SafePredFlag);
|
InitCPred ("$getenv", 2, p_getenv, SafePredFlag);
|
||||||
InitCPred ("$putenv", 2, p_putenv, SafePredFlag|SyncPredFlag);
|
InitCPred ("$putenv", 2, p_putenv, SafePredFlag|SyncPredFlag);
|
||||||
InitCPred ("$file_age", 2, p_file_age, SafePredFlag|SyncPredFlag);
|
InitCPred ("$file_age", 2, p_file_age, SafePredFlag|SyncPredFlag);
|
||||||
|
InitCPred ("$set_fpu_exceptions", 0, p_set_fpu_exceptions, SafePredFlag|SyncPredFlag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1413,7 +1413,7 @@ p_arg(void)
|
|||||||
}
|
}
|
||||||
save_hb();
|
save_hb();
|
||||||
if ((Int)d0 <= 0 ||
|
if ((Int)d0 <= 0 ||
|
||||||
d0 > ArityOfFunctor((Functor) d1) ||
|
(Int)d0 > ArityOfFunctor((Functor) d1) ||
|
||||||
IUnify((CELL)(pt0+d0), ARG3) == FALSE) {
|
IUnify((CELL)(pt0+d0), ARG3) == FALSE) {
|
||||||
/* don't complain here for Prolog compatibility
|
/* don't complain here for Prolog compatibility
|
||||||
if ((Int)d0 <= 0) {
|
if ((Int)d0 <= 0) {
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
* File: Yap.proto *
|
* File: Yap.proto *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: Function declarations for YAP *
|
* comments: Function declarations for YAP *
|
||||||
* version: $Id: Yapproto.h,v 1.8 2002-01-29 05:37:31 vsc Exp $ *
|
* version: $Id: Yapproto.h,v 1.9 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
/* prototype file for Yap */
|
/* prototype file for Yap */
|
||||||
@ -52,9 +52,9 @@ Term STD_PROTO(MkSFTerm,(Functor,int,Term *,Term));
|
|||||||
CELL STD_PROTO(*ArgsOfSFTerm,(Term));
|
CELL STD_PROTO(*ArgsOfSFTerm,(Term));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int STD_PROTO(LookupModule,(Term));
|
SMALLUNSGN STD_PROTO(LookupModule,(Term));
|
||||||
Prop STD_PROTO(GetPredPropByAtom,(Atom, int));
|
Prop STD_PROTO(GetPredPropByAtom,(Atom, SMALLUNSGN));
|
||||||
Prop STD_PROTO(GetPredPropByFunc,(Functor, int));
|
Prop STD_PROTO(GetPredPropByFunc,(Functor, SMALLUNSGN));
|
||||||
Prop STD_PROTO(GetPredPropHavingLock,(Atom,unsigned int,SMALLUNSGN));
|
Prop STD_PROTO(GetPredPropHavingLock,(Atom,unsigned int,SMALLUNSGN));
|
||||||
Prop STD_PROTO(GetExpProp,(Atom,unsigned int));
|
Prop STD_PROTO(GetExpProp,(Atom,unsigned int));
|
||||||
Prop STD_PROTO(GetExpPropHavingLock,(AtomEntry *,unsigned int));
|
Prop STD_PROTO(GetExpPropHavingLock,(AtomEntry *,unsigned int));
|
||||||
|
|||||||
@ -138,7 +138,7 @@ typedef CELL *CELL_PTR;
|
|||||||
|
|
||||||
#define ENVSIZE(E) EnvSize(((CELL *)E)[E_CP])
|
#define ENVSIZE(E) EnvSize(((CELL *)E)[E_CP])
|
||||||
|
|
||||||
extern UInt total_marked;
|
extern Int total_marked;
|
||||||
|
|
||||||
void STD_PROTO(mark_variable, (CELL *));
|
void STD_PROTO(mark_variable, (CELL *));
|
||||||
void STD_PROTO(mark_external_reference, (CELL *));
|
void STD_PROTO(mark_external_reference, (CELL *));
|
||||||
|
|||||||
12
H/yapio.h
12
H/yapio.h
@ -229,12 +229,6 @@ typedef enum{ /* we accept two domains for the moment, IPV6 may follow */
|
|||||||
af_unix /* or AF_FILE */
|
af_unix /* or AF_FILE */
|
||||||
} socket_domain;
|
} socket_domain;
|
||||||
|
|
||||||
/* info on aliases */
|
|
||||||
typedef struct AliasDescS {
|
|
||||||
Atom name;
|
|
||||||
int alias_stream;
|
|
||||||
} * AliasDesc;
|
|
||||||
|
|
||||||
Term STD_PROTO(InitSocketStream,(int, socket_info, socket_domain));
|
Term STD_PROTO(InitSocketStream,(int, socket_info, socket_domain));
|
||||||
int STD_PROTO(CheckSocketStream,(Term, char *));
|
int STD_PROTO(CheckSocketStream,(Term, char *));
|
||||||
socket_domain STD_PROTO(GetSocketDomain,(int));
|
socket_domain STD_PROTO(GetSocketDomain,(int));
|
||||||
@ -246,6 +240,12 @@ Int CloseSocket(int, socket_info, socket_domain);
|
|||||||
|
|
||||||
#endif /* USE_SOCKET */
|
#endif /* USE_SOCKET */
|
||||||
|
|
||||||
|
/* info on aliases */
|
||||||
|
typedef struct AliasDescS {
|
||||||
|
Atom name;
|
||||||
|
int alias_stream;
|
||||||
|
} * AliasDesc;
|
||||||
|
|
||||||
/****************** character definition table **************************/
|
/****************** character definition table **************************/
|
||||||
#define NUMBER_OF_CHARS 256
|
#define NUMBER_OF_CHARS 256
|
||||||
extern char *chtype;
|
extern char *chtype;
|
||||||
|
|||||||
@ -46,7 +46,8 @@ typedef struct PropEntryStruct *Prop;
|
|||||||
/* I can only define the structure after I define the actual atoms */
|
/* I can only define the structure after I define the actual atoms */
|
||||||
|
|
||||||
/* atom structure */
|
/* atom structure */
|
||||||
typedef struct AtomEntryStruct {
|
typedef struct AtomEntryStruct
|
||||||
|
{
|
||||||
Atom NextOfAE; /* used to build hash chains */
|
Atom NextOfAE; /* used to build hash chains */
|
||||||
Prop PropsOfAE; /* property list for this atom */
|
Prop PropsOfAE; /* property list for this atom */
|
||||||
#if defined(YAPOR) || defined(THREADS)
|
#if defined(YAPOR) || defined(THREADS)
|
||||||
@ -78,10 +79,12 @@ AtomEntry;
|
|||||||
typedef SFLAGS PropFlags;
|
typedef SFLAGS PropFlags;
|
||||||
|
|
||||||
/* basic property entry structure */
|
/* basic property entry structure */
|
||||||
typedef struct PropEntryStruct {
|
typedef struct PropEntryStruct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
} PropEntry;
|
}
|
||||||
|
PropEntry;
|
||||||
|
|
||||||
/* ************************* Functors **********************************/
|
/* ************************* Functors **********************************/
|
||||||
|
|
||||||
@ -97,7 +100,8 @@ typedef struct PropEntryStruct {
|
|||||||
#define FunctorProperty ((PropFlags)(0xbb00))
|
#define FunctorProperty ((PropFlags)(0xbb00))
|
||||||
|
|
||||||
/* functor property */
|
/* functor property */
|
||||||
typedef struct FunctorEntryStruct {
|
typedef struct FunctorEntryStruct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
unsigned int ArityOfFE; /* arity of functor */
|
unsigned int ArityOfFE; /* arity of functor */
|
||||||
@ -106,7 +110,7 @@ typedef struct FunctorEntryStruct {
|
|||||||
#if defined(YAPOR) || defined(THREADS)
|
#if defined(YAPOR) || defined(THREADS)
|
||||||
rwlock_t FRWLock;
|
rwlock_t FRWLock;
|
||||||
#endif
|
#endif
|
||||||
} FunctorEntry;
|
}
|
||||||
|
FunctorEntry;
|
||||||
|
|
||||||
typedef FunctorEntry *Functor;
|
typedef FunctorEntry *Functor;
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
* Last rev: December 90 *
|
* Last rev: December 90 *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: Tag Scheme for machines with 24 bits adresses (m68000) *
|
* comments: Tag Scheme for machines with 24 bits adresses (m68000) *
|
||||||
* version: $Id: Tags_24bits.h,v 1.7 2002-01-05 04:04:14 vsc Exp $ *
|
* version: $Id: Tags_24bits.h,v 1.8 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
/* Version for 24 bit addresses (68000)
|
/* Version for 24 bit addresses (68000)
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
* Last rev: December 90 *
|
* Last rev: December 90 *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
||||||
* version: $Id: Tags_32LowTag.h,v 1.7 2002-01-05 04:04:14 vsc Exp $ *
|
* version: $Id: Tags_32LowTag.h,v 1.8 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#define TAG_LOW_BITS_32 1
|
#define TAG_LOW_BITS_32 1
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
* Last rev: December 90 *
|
* Last rev: December 90 *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
||||||
* version: $Id: Tags_32Ops.h,v 1.7 2002-01-05 04:04:14 vsc Exp $ *
|
* version: $Id: Tags_32Ops.h,v 1.8 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
* Last rev: December 90 *
|
* Last rev: December 90 *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
||||||
* version: $Id: Tags_32bits.h,v 1.7 2002-01-05 04:04:14 vsc Exp $ *
|
* version: $Id: Tags_32bits.h,v 1.8 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
/* Original version for 32 bit addresses machines,
|
/* Original version for 32 bit addresses machines,
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
* Last rev: December 90 *
|
* Last rev: December 90 *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
* comments: Original Tag Scheme for machines with 32 bits adresses *
|
||||||
* version: $Id: Tags_64bits.h,v 1.7 2002-01-05 04:04:14 vsc Exp $ *
|
* version: $Id: Tags_64bits.h,v 1.8 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#define TAG_64BITS 1
|
#define TAG_64BITS 1
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
* File: TermExt.h *
|
* File: TermExt.h *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: Extensions to standard terms for YAP *
|
* comments: Extensions to standard terms for YAP *
|
||||||
* version: $Id: TermExt.h,v 1.7 2002-01-05 04:04:14 vsc Exp $ *
|
* version: $Id: TermExt.h,v 1.8 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#if USE_OFFSETS
|
#if USE_OFFSETS
|
||||||
|
|||||||
144
VC/include/Yap.h
144
VC/include/Yap.h
@ -17,7 +17,7 @@
|
|||||||
* File: Yap.h.m4 *
|
* File: Yap.h.m4 *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: main header file for YAP *
|
* comments: main header file for YAP *
|
||||||
* version: $Id: Yap.h,v 1.7 2002-01-05 04:04:14 vsc Exp $ *
|
* version: $Id: Yap.h,v 1.8 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
@ -109,9 +109,10 @@
|
|||||||
#undef USE_THREADED_CODE
|
#undef USE_THREADED_CODE
|
||||||
#endif
|
#endif
|
||||||
#define inline __inline
|
#define inline __inline
|
||||||
#define YAP_VERSION "Yap-4.3.17"
|
#define YAP_VERSION "Yap-4.3.21"
|
||||||
#define BIN_DIR "c:\\Program Files\\Yap\\bin"
|
#define BIN_DIR "c:\\Program Files\\Yap\\bin"
|
||||||
#define LIB_DIR "c:\\Program Files\\Yap\\bin"
|
#define LIB_DIR "c:\\Program Files\\Yap\\lib\\Yap"
|
||||||
|
#define SHARE_DIR "c:\\Program Files\\Yap\\share\\Yap"
|
||||||
#ifdef HOST_ALIAS
|
#ifdef HOST_ALIAS
|
||||||
#undef HOST_ALIAS
|
#undef HOST_ALIAS
|
||||||
#endif
|
#endif
|
||||||
@ -392,7 +393,8 @@ extern sigjmp_buf RestartEnv; /* used to restart after an abort */
|
|||||||
/************ variables concerned with Error Handling *************/
|
/************ variables concerned with Error Handling *************/
|
||||||
|
|
||||||
/* Types of Errors */
|
/* Types of Errors */
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
NO_ERROR,
|
NO_ERROR,
|
||||||
FATAL_ERROR,
|
FATAL_ERROR,
|
||||||
INTERNAL_ERROR,
|
INTERNAL_ERROR,
|
||||||
@ -467,13 +469,15 @@ typedef enum {
|
|||||||
TYPE_ERROR_UBYTE,
|
TYPE_ERROR_UBYTE,
|
||||||
TYPE_ERROR_VARIABLE,
|
TYPE_ERROR_VARIABLE,
|
||||||
UNKNOWN_ERROR
|
UNKNOWN_ERROR
|
||||||
} yap_error_number;
|
}
|
||||||
|
yap_error_number;
|
||||||
|
|
||||||
extern char *ErrorMessage; /* used to pass error messages */
|
extern char *ErrorMessage; /* used to pass error messages */
|
||||||
extern Term Error_Term; /* used to pass error terms */
|
extern Term Error_Term; /* used to pass error terms */
|
||||||
extern yap_error_number Error_TYPE; /* used to pass the error */
|
extern yap_error_number Error_TYPE; /* used to pass the error */
|
||||||
|
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
YAP_INT_BOUNDED_FLAG = 0,
|
YAP_INT_BOUNDED_FLAG = 0,
|
||||||
MAX_ARITY_FLAG = 1,
|
MAX_ARITY_FLAG = 1,
|
||||||
INTEGER_ROUNDING_FLAG = 2,
|
INTEGER_ROUNDING_FLAG = 2,
|
||||||
@ -489,8 +493,10 @@ typedef enum {
|
|||||||
CHARACTER_ESCAPE_FLAG = 12,
|
CHARACTER_ESCAPE_FLAG = 12,
|
||||||
WRITE_QUOTED_STRING_FLAG = 13,
|
WRITE_QUOTED_STRING_FLAG = 13,
|
||||||
ALLOW_ASSERTING_STATIC_FLAG = 14,
|
ALLOW_ASSERTING_STATIC_FLAG = 14,
|
||||||
HALT_AFTER_CONSULT_FLAG = 15
|
HALT_AFTER_CONSULT_FLAG = 15,
|
||||||
} yap_flags;
|
FAST_BOOT_FLAG = 16
|
||||||
|
}
|
||||||
|
yap_flags;
|
||||||
|
|
||||||
#define STRING_AS_CHARS 0
|
#define STRING_AS_CHARS 0
|
||||||
#define STRING_AS_ATOM 2
|
#define STRING_AS_ATOM 2
|
||||||
@ -502,7 +508,7 @@ typedef enum {
|
|||||||
#define ISO_CHARACTER_ESCAPES 1
|
#define ISO_CHARACTER_ESCAPES 1
|
||||||
#define SICSTUS_CHARACTER_ESCAPES 2
|
#define SICSTUS_CHARACTER_ESCAPES 2
|
||||||
|
|
||||||
#define NUMBER_OF_YAP_FLAGS HALT_AFTER_CONSULT_FLAG+1
|
#define NUMBER_OF_YAP_FLAGS FAST_BOOT_FLAG+1
|
||||||
|
|
||||||
/************************ prototypes **********************************/
|
/************************ prototypes **********************************/
|
||||||
|
|
||||||
@ -626,7 +632,8 @@ and RefOfTerm(t) : Term -> DBRef = ...
|
|||||||
|
|
||||||
inline EXTERN Term *VarOfTerm (Term t);
|
inline EXTERN Term *VarOfTerm (Term t);
|
||||||
|
|
||||||
inline EXTERN Term * VarOfTerm(Term t)
|
inline EXTERN Term *
|
||||||
|
VarOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (Term *) (t);
|
return (Term *) (t);
|
||||||
}
|
}
|
||||||
@ -636,7 +643,8 @@ inline EXTERN Term * VarOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term MkVarTerm (void);
|
inline EXTERN Term MkVarTerm (void);
|
||||||
|
|
||||||
inline EXTERN Term MkVarTerm()
|
inline EXTERN Term
|
||||||
|
MkVarTerm ()
|
||||||
{
|
{
|
||||||
return (Term) ((*H = 0, H++));
|
return (Term) ((*H = 0, H++));
|
||||||
}
|
}
|
||||||
@ -645,7 +653,8 @@ inline EXTERN Term MkVarTerm()
|
|||||||
|
|
||||||
inline EXTERN int IsUnboundVar (Term);
|
inline EXTERN int IsUnboundVar (Term);
|
||||||
|
|
||||||
inline EXTERN int IsUnboundVar(Term t)
|
inline EXTERN int
|
||||||
|
IsUnboundVar (Term t)
|
||||||
{
|
{
|
||||||
return (int) (t == 0);
|
return (int) (t == 0);
|
||||||
}
|
}
|
||||||
@ -655,7 +664,8 @@ inline EXTERN int IsUnboundVar(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term MkVarTerm (void);
|
inline EXTERN Term MkVarTerm (void);
|
||||||
|
|
||||||
inline EXTERN Term MkVarTerm()
|
inline EXTERN Term
|
||||||
|
MkVarTerm ()
|
||||||
{
|
{
|
||||||
return (Term) ((*H = (CELL) H, H++));
|
return (Term) ((*H = (CELL) H, H++));
|
||||||
}
|
}
|
||||||
@ -664,7 +674,8 @@ inline EXTERN Term MkVarTerm()
|
|||||||
|
|
||||||
inline EXTERN int IsUnboundVar (Term);
|
inline EXTERN int IsUnboundVar (Term);
|
||||||
|
|
||||||
inline EXTERN int IsUnboundVar(Term t)
|
inline EXTERN int
|
||||||
|
IsUnboundVar (Term t)
|
||||||
{
|
{
|
||||||
return (int) (*VarOfTerm (t) == (t));
|
return (int) (*VarOfTerm (t) == (t));
|
||||||
}
|
}
|
||||||
@ -674,7 +685,8 @@ inline EXTERN int IsUnboundVar(Term t)
|
|||||||
|
|
||||||
inline EXTERN CELL *PtrOfTerm (Term);
|
inline EXTERN CELL *PtrOfTerm (Term);
|
||||||
|
|
||||||
inline EXTERN CELL * PtrOfTerm(Term t)
|
inline EXTERN CELL *
|
||||||
|
PtrOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (CELL *) (*(CELL *) (t));
|
return (CELL *) (*(CELL *) (t));
|
||||||
}
|
}
|
||||||
@ -684,7 +696,8 @@ inline EXTERN CELL * PtrOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Functor FunctorOfTerm (Term);
|
inline EXTERN Functor FunctorOfTerm (Term);
|
||||||
|
|
||||||
inline EXTERN Functor FunctorOfTerm(Term t)
|
inline EXTERN Functor
|
||||||
|
FunctorOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (Functor) (*RepAppl (t));
|
return (Functor) (*RepAppl (t));
|
||||||
}
|
}
|
||||||
@ -694,7 +707,8 @@ inline EXTERN Functor FunctorOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term MkAtomTerm (Atom);
|
inline EXTERN Term MkAtomTerm (Atom);
|
||||||
|
|
||||||
inline EXTERN Term MkAtomTerm(Atom a)
|
inline EXTERN Term
|
||||||
|
MkAtomTerm (Atom a)
|
||||||
{
|
{
|
||||||
return (Term) (TAGGEDA (AtomTag, (CELL *) (a) - (CELL *) HEAP_INIT_BASE));
|
return (Term) (TAGGEDA (AtomTag, (CELL *) (a) - (CELL *) HEAP_INIT_BASE));
|
||||||
}
|
}
|
||||||
@ -703,7 +717,8 @@ inline EXTERN Term MkAtomTerm(Atom a)
|
|||||||
|
|
||||||
inline EXTERN Atom AtomOfTerm (Term t);
|
inline EXTERN Atom AtomOfTerm (Term t);
|
||||||
|
|
||||||
inline EXTERN Atom AtomOfTerm(Term t)
|
inline EXTERN Atom
|
||||||
|
AtomOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (Atom) ((CELL *) HEAP_INIT_BASE + NonTagPart (t));
|
return (Atom) ((CELL *) HEAP_INIT_BASE + NonTagPart (t));
|
||||||
}
|
}
|
||||||
@ -713,7 +728,8 @@ inline EXTERN Atom AtomOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term MkAtomTerm (Atom);
|
inline EXTERN Term MkAtomTerm (Atom);
|
||||||
|
|
||||||
inline EXTERN Term MkAtomTerm(Atom a)
|
inline EXTERN Term
|
||||||
|
MkAtomTerm (Atom a)
|
||||||
{
|
{
|
||||||
return (Term) (TAGGEDA (AtomTag, (a)));
|
return (Term) (TAGGEDA (AtomTag, (a)));
|
||||||
}
|
}
|
||||||
@ -722,7 +738,8 @@ inline EXTERN Term MkAtomTerm(Atom a)
|
|||||||
|
|
||||||
inline EXTERN Atom AtomOfTerm (Term t);
|
inline EXTERN Atom AtomOfTerm (Term t);
|
||||||
|
|
||||||
inline EXTERN Atom AtomOfTerm(Term t)
|
inline EXTERN Atom
|
||||||
|
AtomOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (Atom) (NonTagPart (t));
|
return (Atom) (NonTagPart (t));
|
||||||
}
|
}
|
||||||
@ -732,7 +749,8 @@ inline EXTERN Atom AtomOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN int IsAtomTerm (Term);
|
inline EXTERN int IsAtomTerm (Term);
|
||||||
|
|
||||||
inline EXTERN int IsAtomTerm(Term t)
|
inline EXTERN int
|
||||||
|
IsAtomTerm (Term t)
|
||||||
{
|
{
|
||||||
return (int) (CHKTAG ((t), AtomTag));
|
return (int) (CHKTAG ((t), AtomTag));
|
||||||
}
|
}
|
||||||
@ -742,7 +760,8 @@ inline EXTERN int IsAtomTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term MkIntTerm (Int);
|
inline EXTERN Term MkIntTerm (Int);
|
||||||
|
|
||||||
inline EXTERN Term MkIntTerm(Int n)
|
inline EXTERN Term
|
||||||
|
MkIntTerm (Int n)
|
||||||
{
|
{
|
||||||
return (Term) (TAGGED (NumberTag, (n)));
|
return (Term) (TAGGED (NumberTag, (n)));
|
||||||
}
|
}
|
||||||
@ -755,7 +774,8 @@ inline EXTERN Term MkIntTerm(Int n)
|
|||||||
|
|
||||||
inline EXTERN Term MkIntConstant (Int);
|
inline EXTERN Term MkIntConstant (Int);
|
||||||
|
|
||||||
inline EXTERN Term MkIntConstant(Int n)
|
inline EXTERN Term
|
||||||
|
MkIntConstant (Int n)
|
||||||
{
|
{
|
||||||
return (Term) (NONTAGGED (NumberTag, (n)));
|
return (Term) (NONTAGGED (NumberTag, (n)));
|
||||||
}
|
}
|
||||||
@ -764,7 +784,8 @@ inline EXTERN Term MkIntConstant(Int n)
|
|||||||
|
|
||||||
inline EXTERN int IsIntTerm (Term);
|
inline EXTERN int IsIntTerm (Term);
|
||||||
|
|
||||||
inline EXTERN int IsIntTerm(Term t)
|
inline EXTERN int
|
||||||
|
IsIntTerm (Term t)
|
||||||
{
|
{
|
||||||
return (int) (CHKTAG ((t), NumberTag));
|
return (int) (CHKTAG ((t), NumberTag));
|
||||||
}
|
}
|
||||||
@ -796,8 +817,7 @@ inline EXTERN int IsIntTerm(Term t)
|
|||||||
extern ADDR HeapBase,
|
extern ADDR HeapBase,
|
||||||
LocalBase,
|
LocalBase,
|
||||||
GlobalBase,
|
GlobalBase,
|
||||||
TrailBase, TrailTop,
|
TrailBase, TrailTop, ForeignCodeBase, ForeignCodeTop, ForeignCodeMax;
|
||||||
ForeignCodeBase, ForeignCodeTop, ForeignCodeMax;
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -817,7 +837,8 @@ extern ADDR HeapBase,
|
|||||||
|
|
||||||
inline EXTERN Term MkIntegerTerm (Int);
|
inline EXTERN Term MkIntegerTerm (Int);
|
||||||
|
|
||||||
inline EXTERN Term MkIntegerTerm(Int n)
|
inline EXTERN Term
|
||||||
|
MkIntegerTerm (Int n)
|
||||||
{
|
{
|
||||||
return (Term) (IntInBnd (n) ? MkIntTerm (n) : MkLongIntTerm (n));
|
return (Term) (IntInBnd (n) ? MkIntTerm (n) : MkLongIntTerm (n));
|
||||||
}
|
}
|
||||||
@ -826,7 +847,8 @@ inline EXTERN Term MkIntegerTerm(Int n)
|
|||||||
|
|
||||||
inline EXTERN int IsIntegerTerm (Term);
|
inline EXTERN int IsIntegerTerm (Term);
|
||||||
|
|
||||||
inline EXTERN int IsIntegerTerm(Term t)
|
inline EXTERN int
|
||||||
|
IsIntegerTerm (Term t)
|
||||||
{
|
{
|
||||||
return (int) (IsIntTerm (t) || IsLongIntTerm (t));
|
return (int) (IsIntTerm (t) || IsLongIntTerm (t));
|
||||||
}
|
}
|
||||||
@ -835,7 +857,8 @@ inline EXTERN int IsIntegerTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Int IntegerOfTerm (Term);
|
inline EXTERN Int IntegerOfTerm (Term);
|
||||||
|
|
||||||
inline EXTERN Int IntegerOfTerm(Term t)
|
inline EXTERN Int
|
||||||
|
IntegerOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (Int) (IsIntTerm (t) ? IntOfTerm (t) : LongIntOfTerm (t));
|
return (Int) (IsIntTerm (t) ? IntOfTerm (t) : LongIntOfTerm (t));
|
||||||
}
|
}
|
||||||
@ -856,7 +879,8 @@ inline EXTERN Int IntegerOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term ArgOfTerm (int i, Term t);
|
inline EXTERN Term ArgOfTerm (int i, Term t);
|
||||||
|
|
||||||
inline EXTERN Term ArgOfTerm(int i, Term t)
|
inline EXTERN Term
|
||||||
|
ArgOfTerm (int i, Term t)
|
||||||
{
|
{
|
||||||
return (Term) (Derefa (RepAppl (t) + (i)));
|
return (Term) (Derefa (RepAppl (t) + (i)));
|
||||||
}
|
}
|
||||||
@ -865,7 +889,8 @@ inline EXTERN Term ArgOfTerm(int i, Term t)
|
|||||||
|
|
||||||
inline EXTERN Term HeadOfTerm (Term);
|
inline EXTERN Term HeadOfTerm (Term);
|
||||||
|
|
||||||
inline EXTERN Term HeadOfTerm(Term t)
|
inline EXTERN Term
|
||||||
|
HeadOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (Term) (Derefa (RepPair (t)));
|
return (Term) (Derefa (RepPair (t)));
|
||||||
}
|
}
|
||||||
@ -874,7 +899,8 @@ inline EXTERN Term HeadOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term TailOfTerm (Term);
|
inline EXTERN Term TailOfTerm (Term);
|
||||||
|
|
||||||
inline EXTERN Term TailOfTerm(Term t)
|
inline EXTERN Term
|
||||||
|
TailOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (Term) (Derefa (RepPair (t) + 1));
|
return (Term) (Derefa (RepPair (t) + 1));
|
||||||
}
|
}
|
||||||
@ -884,7 +910,8 @@ inline EXTERN Term TailOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term ArgOfTermCell (int i, Term t);
|
inline EXTERN Term ArgOfTermCell (int i, Term t);
|
||||||
|
|
||||||
inline EXTERN Term ArgOfTermCell(int i, Term t)
|
inline EXTERN Term
|
||||||
|
ArgOfTermCell (int i, Term t)
|
||||||
{
|
{
|
||||||
return (Term) ((CELL) (RepAppl (t) + (i)));
|
return (Term) ((CELL) (RepAppl (t) + (i)));
|
||||||
}
|
}
|
||||||
@ -893,7 +920,8 @@ inline EXTERN Term ArgOfTermCell(int i, Term t)
|
|||||||
|
|
||||||
inline EXTERN Term HeadOfTermCell (Term);
|
inline EXTERN Term HeadOfTermCell (Term);
|
||||||
|
|
||||||
inline EXTERN Term HeadOfTermCell(Term t)
|
inline EXTERN Term
|
||||||
|
HeadOfTermCell (Term t)
|
||||||
{
|
{
|
||||||
return (Term) ((CELL) (RepPair (t)));
|
return (Term) ((CELL) (RepPair (t)));
|
||||||
}
|
}
|
||||||
@ -902,7 +930,8 @@ inline EXTERN Term HeadOfTermCell(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term TailOfTermCell (Term);
|
inline EXTERN Term TailOfTermCell (Term);
|
||||||
|
|
||||||
inline EXTERN Term TailOfTermCell(Term t)
|
inline EXTERN Term
|
||||||
|
TailOfTermCell (Term t)
|
||||||
{
|
{
|
||||||
return (Term) ((CELL) (RepPair (t) + 1));
|
return (Term) ((CELL) (RepPair (t) + 1));
|
||||||
}
|
}
|
||||||
@ -939,10 +968,12 @@ extern char version_number[];
|
|||||||
#if USE_THREADED_CODE
|
#if USE_THREADED_CODE
|
||||||
|
|
||||||
/************ reverse lookup of instructions *****************/
|
/************ reverse lookup of instructions *****************/
|
||||||
typedef struct opcode_tab_entry {
|
typedef struct opcode_tab_entry
|
||||||
|
{
|
||||||
OPCODE opc;
|
OPCODE opc;
|
||||||
op_numbers opnum;
|
op_numbers opnum;
|
||||||
} opentry;
|
}
|
||||||
|
opentry;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -958,44 +989,20 @@ extern int CurFileNo;
|
|||||||
|
|
||||||
/********* Prolog may be in several modes *******************************/
|
/********* Prolog may be in several modes *******************************/
|
||||||
|
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
BootMode = 1, /* if booting or restoring */
|
BootMode = 1, /* if booting or restoring */
|
||||||
UserMode = 2, /* Normal mode */
|
UserMode = 2, /* Normal mode */
|
||||||
CritMode = 4, /* If we are meddling with the heap */
|
CritMode = 4, /* If we are meddling with the heap */
|
||||||
AbortMode = 8, /* expecting to abort */
|
AbortMode = 8, /* expecting to abort */
|
||||||
InterruptMode = 16, /* under an interrupt */
|
InterruptMode = 16, /* under an interrupt */
|
||||||
InErrorMode = 32 /* under an interrupt */
|
InErrorMode = 32 /* under an interrupt */
|
||||||
} prolog_exec_mode;
|
}
|
||||||
|
prolog_exec_mode;
|
||||||
|
|
||||||
extern prolog_exec_mode PrologMode;
|
extern prolog_exec_mode PrologMode;
|
||||||
extern int CritLocks;
|
extern int CritLocks;
|
||||||
|
|
||||||
#if SIZEOF_INT_P==4
|
|
||||||
#if defined(YAPOR) || defined(TABLING)
|
|
||||||
#define MinTrailSpace 192
|
|
||||||
#define MinStackSpace 1200
|
|
||||||
#define MinHeapSpace 1200
|
|
||||||
#else
|
|
||||||
#define MinTrailSpace 128
|
|
||||||
#define MinStackSpace 800
|
|
||||||
#define MinHeapSpace 800
|
|
||||||
#endif /* YAPOR || TABLING */
|
|
||||||
#else
|
|
||||||
#if defined(YAPOR) || defined(TABLING)
|
|
||||||
#define MinTrailSpace 384
|
|
||||||
#define MinStackSpace 2400
|
|
||||||
#define MinHeapSpace 2400
|
|
||||||
#else
|
|
||||||
#define MinTrailSpace 256
|
|
||||||
#define MinStackSpace 1600
|
|
||||||
#define MinHeapSpace 1600
|
|
||||||
#endif /* YAPOR || TABLING */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define DefTrailSpace MinTrailSpace
|
|
||||||
#define DefStackSpace MinStackSpace
|
|
||||||
#define DefHeapSpace MinHeapSpace
|
|
||||||
|
|
||||||
/************** Access to yap initial arguments ***************************/
|
/************** Access to yap initial arguments ***************************/
|
||||||
|
|
||||||
extern char **yap_args;
|
extern char **yap_args;
|
||||||
@ -1063,10 +1070,12 @@ extern int compile_arrays;
|
|||||||
|
|
||||||
/* I assume that the size of this structure is a multiple of the size
|
/* I assume that the size of this structure is a multiple of the size
|
||||||
of CELL!!! */
|
of CELL!!! */
|
||||||
typedef struct TIMED_MAVAR{
|
typedef struct TIMED_MAVAR
|
||||||
|
{
|
||||||
CELL value;
|
CELL value;
|
||||||
CELL clock;
|
CELL clock;
|
||||||
} timed_var;
|
}
|
||||||
|
timed_var;
|
||||||
|
|
||||||
/********* while debugging you may need some info ***********************/
|
/********* while debugging you may need some info ***********************/
|
||||||
|
|
||||||
@ -1091,4 +1100,3 @@ extern int snoozing;
|
|||||||
#if SBA
|
#if SBA
|
||||||
#include "sbaunify.h"
|
#include "sbaunify.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,8 @@
|
|||||||
|
|
||||||
inline EXTERN Atom AbsAtom (AtomEntry * p);
|
inline EXTERN Atom AbsAtom (AtomEntry * p);
|
||||||
|
|
||||||
inline EXTERN Atom AbsAtom(AtomEntry * p)
|
inline EXTERN Atom
|
||||||
|
AbsAtom (AtomEntry * p)
|
||||||
{
|
{
|
||||||
return (Atom) (Addr (p) - AtomBase);
|
return (Atom) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -37,7 +38,8 @@ inline EXTERN Atom AbsAtom(AtomEntry * p)
|
|||||||
|
|
||||||
inline EXTERN AtomEntry *RepAtom (Atom a);
|
inline EXTERN AtomEntry *RepAtom (Atom a);
|
||||||
|
|
||||||
inline EXTERN AtomEntry * RepAtom(Atom a)
|
inline EXTERN AtomEntry *
|
||||||
|
RepAtom (Atom a)
|
||||||
{
|
{
|
||||||
return (AtomEntry *) (AtomBase + Unsigned (a));
|
return (AtomEntry *) (AtomBase + Unsigned (a));
|
||||||
}
|
}
|
||||||
@ -47,7 +49,8 @@ inline EXTERN AtomEntry * RepAtom(Atom a)
|
|||||||
|
|
||||||
inline EXTERN Atom AbsAtom (AtomEntry * p);
|
inline EXTERN Atom AbsAtom (AtomEntry * p);
|
||||||
|
|
||||||
inline EXTERN Atom AbsAtom(AtomEntry * p)
|
inline EXTERN Atom
|
||||||
|
AbsAtom (AtomEntry * p)
|
||||||
{
|
{
|
||||||
return (Atom) (p);
|
return (Atom) (p);
|
||||||
}
|
}
|
||||||
@ -56,7 +59,8 @@ inline EXTERN Atom AbsAtom(AtomEntry * p)
|
|||||||
|
|
||||||
inline EXTERN AtomEntry *RepAtom (Atom a);
|
inline EXTERN AtomEntry *RepAtom (Atom a);
|
||||||
|
|
||||||
inline EXTERN AtomEntry * RepAtom(Atom a)
|
inline EXTERN AtomEntry *
|
||||||
|
RepAtom (Atom a)
|
||||||
{
|
{
|
||||||
return (AtomEntry *) (a);
|
return (AtomEntry *) (a);
|
||||||
}
|
}
|
||||||
@ -68,7 +72,8 @@ inline EXTERN AtomEntry * RepAtom(Atom a)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsProp (PropEntry * p);
|
inline EXTERN Prop AbsProp (PropEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsProp(PropEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsProp (PropEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -77,7 +82,8 @@ inline EXTERN Prop AbsProp(PropEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropEntry *RepProp (Prop p);
|
inline EXTERN PropEntry *RepProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN PropEntry * RepProp(Prop p)
|
inline EXTERN PropEntry *
|
||||||
|
RepProp (Prop p)
|
||||||
{
|
{
|
||||||
return (PropEntry *) (AtomBase + Unsigned (p));
|
return (PropEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -87,7 +93,8 @@ inline EXTERN PropEntry * RepProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsProp (PropEntry * p);
|
inline EXTERN Prop AbsProp (PropEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsProp(PropEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsProp (PropEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -96,7 +103,8 @@ inline EXTERN Prop AbsProp(PropEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropEntry *RepProp (Prop p);
|
inline EXTERN PropEntry *RepProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN PropEntry * RepProp(Prop p)
|
inline EXTERN PropEntry *
|
||||||
|
RepProp (Prop p)
|
||||||
{
|
{
|
||||||
return (PropEntry *) (p);
|
return (PropEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -108,7 +116,8 @@ inline EXTERN PropEntry * RepProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN FunctorEntry *RepFunctorProp (Prop p);
|
inline EXTERN FunctorEntry *RepFunctorProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN FunctorEntry * RepFunctorProp(Prop p)
|
inline EXTERN FunctorEntry *
|
||||||
|
RepFunctorProp (Prop p)
|
||||||
{
|
{
|
||||||
return (FunctorEntry *) (AtomBase + Unsigned (p));
|
return (FunctorEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -117,7 +126,8 @@ inline EXTERN FunctorEntry * RepFunctorProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsFunctorProp (FunctorEntry * p);
|
inline EXTERN Prop AbsFunctorProp (FunctorEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsFunctorProp(FunctorEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsFunctorProp (FunctorEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -127,7 +137,8 @@ inline EXTERN Prop AbsFunctorProp(FunctorEntry * p)
|
|||||||
|
|
||||||
inline EXTERN FunctorEntry *RepFunctorProp (Prop p);
|
inline EXTERN FunctorEntry *RepFunctorProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN FunctorEntry * RepFunctorProp(Prop p)
|
inline EXTERN FunctorEntry *
|
||||||
|
RepFunctorProp (Prop p)
|
||||||
{
|
{
|
||||||
return (FunctorEntry *) (p);
|
return (FunctorEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -136,7 +147,8 @@ inline EXTERN FunctorEntry * RepFunctorProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsFunctorProp (FunctorEntry * p);
|
inline EXTERN Prop AbsFunctorProp (FunctorEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsFunctorProp(FunctorEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsFunctorProp (FunctorEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -147,7 +159,8 @@ inline EXTERN Prop AbsFunctorProp(FunctorEntry * p)
|
|||||||
|
|
||||||
inline EXTERN Int ArityOfFunctor (Functor);
|
inline EXTERN Int ArityOfFunctor (Functor);
|
||||||
|
|
||||||
inline EXTERN Int ArityOfFunctor(Functor Fun)
|
inline EXTERN Int
|
||||||
|
ArityOfFunctor (Functor Fun)
|
||||||
{
|
{
|
||||||
return (Int) (((FunctorEntry *) Fun)->ArityOfFE);
|
return (Int) (((FunctorEntry *) Fun)->ArityOfFE);
|
||||||
}
|
}
|
||||||
@ -156,7 +169,8 @@ inline EXTERN Int ArityOfFunctor(Functor Fun)
|
|||||||
|
|
||||||
inline EXTERN Atom NameOfFunctor (Functor);
|
inline EXTERN Atom NameOfFunctor (Functor);
|
||||||
|
|
||||||
inline EXTERN Atom NameOfFunctor(Functor Fun)
|
inline EXTERN Atom
|
||||||
|
NameOfFunctor (Functor Fun)
|
||||||
{
|
{
|
||||||
return (Atom) (((FunctorEntry *) Fun)->NameOfFE);
|
return (Atom) (((FunctorEntry *) Fun)->NameOfFE);
|
||||||
}
|
}
|
||||||
@ -166,7 +180,8 @@ inline EXTERN Atom NameOfFunctor(Functor Fun)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsFunctorProperty (int);
|
inline EXTERN PropFlags IsFunctorProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsFunctorProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsFunctorProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == FunctorProperty));
|
return (PropFlags) ((flags == FunctorProperty));
|
||||||
}
|
}
|
||||||
@ -188,17 +203,20 @@ inline EXTERN PropFlags IsFunctorProperty(int flags)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* Module property */
|
/* Module property */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
SMALLUNSGN IndexOfMod; /* indec in module table */
|
SMALLUNSGN IndexOfMod; /* indec in module table */
|
||||||
} ModEntry;
|
}
|
||||||
|
ModEntry;
|
||||||
|
|
||||||
#if USE_OFFSETS_IN_PROPS
|
#if USE_OFFSETS_IN_PROPS
|
||||||
|
|
||||||
inline EXTERN ModEntry *RepModProp (Prop p);
|
inline EXTERN ModEntry *RepModProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ModEntry * RepModProp(Prop p)
|
inline EXTERN ModEntry *
|
||||||
|
RepModProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ModEntry *) (AtomBase + Unsigned (p));
|
return (ModEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -207,7 +225,8 @@ inline EXTERN ModEntry * RepModProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsModProp (ModEntry * p);
|
inline EXTERN Prop AbsModProp (ModEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsModProp(ModEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsModProp (ModEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -217,7 +236,8 @@ inline EXTERN Prop AbsModProp(ModEntry * p)
|
|||||||
|
|
||||||
inline EXTERN ModEntry *RepModProp (Prop p);
|
inline EXTERN ModEntry *RepModProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ModEntry * RepModProp(Prop p)
|
inline EXTERN ModEntry *
|
||||||
|
RepModProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ModEntry *) (p);
|
return (ModEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -226,7 +246,8 @@ inline EXTERN ModEntry * RepModProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsModProp (ModEntry * p);
|
inline EXTERN Prop AbsModProp (ModEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsModProp(ModEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsModProp (ModEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -239,7 +260,8 @@ inline EXTERN Prop AbsModProp(ModEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsModProperty (int);
|
inline EXTERN PropFlags IsModProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsModProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsModProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == ModProperty));
|
return (PropFlags) ((flags == ModProperty));
|
||||||
}
|
}
|
||||||
@ -247,19 +269,22 @@ inline EXTERN PropFlags IsModProperty(int flags)
|
|||||||
|
|
||||||
|
|
||||||
/* operator property entry structure */
|
/* operator property entry structure */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
#if defined(YAPOR) || defined(THREADS)
|
#if defined(YAPOR) || defined(THREADS)
|
||||||
rwlock_t OpRWLock; /* a read-write lock to protect the entry */
|
rwlock_t OpRWLock; /* a read-write lock to protect the entry */
|
||||||
#endif
|
#endif
|
||||||
BITS16 Prefix, Infix, Posfix; /* precedences */
|
BITS16 Prefix, Infix, Posfix; /* precedences */
|
||||||
} OpEntry;
|
}
|
||||||
|
OpEntry;
|
||||||
#if USE_OFFSETS_IN_PROPS
|
#if USE_OFFSETS_IN_PROPS
|
||||||
|
|
||||||
inline EXTERN OpEntry *RepOpProp (Prop p);
|
inline EXTERN OpEntry *RepOpProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN OpEntry * RepOpProp(Prop p)
|
inline EXTERN OpEntry *
|
||||||
|
RepOpProp (Prop p)
|
||||||
{
|
{
|
||||||
return (OpEntry *) (AtomBase + Unsigned (p));
|
return (OpEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -268,7 +293,8 @@ inline EXTERN OpEntry * RepOpProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsOpProp (OpEntry * p);
|
inline EXTERN Prop AbsOpProp (OpEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsOpProp(OpEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsOpProp (OpEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -278,7 +304,8 @@ inline EXTERN Prop AbsOpProp(OpEntry * p)
|
|||||||
|
|
||||||
inline EXTERN OpEntry *RepOpProp (Prop p);
|
inline EXTERN OpEntry *RepOpProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN OpEntry * RepOpProp(Prop p)
|
inline EXTERN OpEntry *
|
||||||
|
RepOpProp (Prop p)
|
||||||
{
|
{
|
||||||
return (OpEntry *) (p);
|
return (OpEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -287,7 +314,8 @@ inline EXTERN OpEntry * RepOpProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsOpProp (OpEntry * p);
|
inline EXTERN Prop AbsOpProp (OpEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsOpProp(OpEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsOpProp (OpEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -299,7 +327,8 @@ inline EXTERN Prop AbsOpProp(OpEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsOpProperty (int);
|
inline EXTERN PropFlags IsOpProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsOpProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsOpProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == OpProperty));
|
return (PropFlags) ((flags == OpProperty));
|
||||||
}
|
}
|
||||||
@ -314,24 +343,29 @@ inline EXTERN PropFlags IsOpProperty(int flags)
|
|||||||
typedef union arith_ret *eval_ret;
|
typedef union arith_ret *eval_ret;
|
||||||
|
|
||||||
/* expression property entry structure */
|
/* expression property entry structure */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
unsigned int ArityOfEE;
|
unsigned int ArityOfEE;
|
||||||
BITS16 ENoOfEE;
|
BITS16 ENoOfEE;
|
||||||
BITS16 FlagsOfEE;
|
BITS16 FlagsOfEE;
|
||||||
/* operations that implement the expression */
|
/* operations that implement the expression */
|
||||||
union {
|
union
|
||||||
|
{
|
||||||
blob_type (*constant) (eval_ret);
|
blob_type (*constant) (eval_ret);
|
||||||
blob_type (*unary) (Term, eval_ret);
|
blob_type (*unary) (Term, eval_ret);
|
||||||
blob_type (*binary) (Term, Term, eval_ret);
|
blob_type (*binary) (Term, Term, eval_ret);
|
||||||
} FOfEE;
|
}
|
||||||
} ExpEntry;
|
FOfEE;
|
||||||
|
}
|
||||||
|
ExpEntry;
|
||||||
#if USE_OFFSETS_IN_PROPS
|
#if USE_OFFSETS_IN_PROPS
|
||||||
|
|
||||||
inline EXTERN ExpEntry *RepExpProp (Prop p);
|
inline EXTERN ExpEntry *RepExpProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ExpEntry * RepExpProp(Prop p)
|
inline EXTERN ExpEntry *
|
||||||
|
RepExpProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ExpEntry *) (AtomBase + Unsigned (p));
|
return (ExpEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -340,7 +374,8 @@ inline EXTERN ExpEntry * RepExpProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsExpProp (ExpEntry * p);
|
inline EXTERN Prop AbsExpProp (ExpEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsExpProp(ExpEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsExpProp (ExpEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -350,7 +385,8 @@ inline EXTERN Prop AbsExpProp(ExpEntry * p)
|
|||||||
|
|
||||||
inline EXTERN ExpEntry *RepExpProp (Prop p);
|
inline EXTERN ExpEntry *RepExpProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ExpEntry * RepExpProp(Prop p)
|
inline EXTERN ExpEntry *
|
||||||
|
RepExpProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ExpEntry *) (p);
|
return (ExpEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -359,7 +395,8 @@ inline EXTERN ExpEntry * RepExpProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsExpProp (ExpEntry * p);
|
inline EXTERN Prop AbsExpProp (ExpEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsExpProp(ExpEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsExpProp (ExpEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -372,7 +409,8 @@ inline EXTERN Prop AbsExpProp(ExpEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsExpProperty (int);
|
inline EXTERN PropFlags IsExpProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsExpProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsExpProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == ExpProperty));
|
return (PropFlags) ((flags == ExpProperty));
|
||||||
}
|
}
|
||||||
@ -381,19 +419,22 @@ inline EXTERN PropFlags IsExpProperty(int flags)
|
|||||||
|
|
||||||
|
|
||||||
/* value property entry structure */
|
/* value property entry structure */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
#if defined(YAPOR) || defined(THREADS)
|
#if defined(YAPOR) || defined(THREADS)
|
||||||
rwlock_t VRWLock; /* a read-write lock to protect the entry */
|
rwlock_t VRWLock; /* a read-write lock to protect the entry */
|
||||||
#endif
|
#endif
|
||||||
Term ValueOfVE; /* (atomic) value associated with the atom */
|
Term ValueOfVE; /* (atomic) value associated with the atom */
|
||||||
} ValEntry;
|
}
|
||||||
|
ValEntry;
|
||||||
#if USE_OFFSETS_IN_PROPS
|
#if USE_OFFSETS_IN_PROPS
|
||||||
|
|
||||||
inline EXTERN ValEntry *RepValProp (Prop p);
|
inline EXTERN ValEntry *RepValProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ValEntry * RepValProp(Prop p)
|
inline EXTERN ValEntry *
|
||||||
|
RepValProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ValEntry *) (AtomBase + Unsigned (p));
|
return (ValEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -402,7 +443,8 @@ inline EXTERN ValEntry * RepValProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsValProp (ValEntry * p);
|
inline EXTERN Prop AbsValProp (ValEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsValProp(ValEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsValProp (ValEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -412,7 +454,8 @@ inline EXTERN Prop AbsValProp(ValEntry * p)
|
|||||||
|
|
||||||
inline EXTERN ValEntry *RepValProp (Prop p);
|
inline EXTERN ValEntry *RepValProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ValEntry * RepValProp(Prop p)
|
inline EXTERN ValEntry *
|
||||||
|
RepValProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ValEntry *) (p);
|
return (ValEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -421,7 +464,8 @@ inline EXTERN ValEntry * RepValProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsValProp (ValEntry * p);
|
inline EXTERN Prop AbsValProp (ValEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsValProp(ValEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsValProp (ValEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -433,7 +477,8 @@ inline EXTERN Prop AbsValProp(ValEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsValProperty (int);
|
inline EXTERN PropFlags IsValProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsValProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsValProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == ValProperty));
|
return (PropFlags) ((flags == ValProperty));
|
||||||
}
|
}
|
||||||
@ -448,7 +493,8 @@ inline EXTERN PropFlags IsValProperty(int flags)
|
|||||||
C_Preds are things write, read, ... implemented in C. In this case
|
C_Preds are things write, read, ... implemented in C. In this case
|
||||||
CodeOfPred holds the address of the correspondent C-function.
|
CodeOfPred holds the address of the correspondent C-function.
|
||||||
*/
|
*/
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
CutTransparentPredFlag = 0x800000L, /* ! should ! across */
|
CutTransparentPredFlag = 0x800000L, /* ! should ! across */
|
||||||
SourcePredFlag = 0x400000L, /* static predicate with source declaration */
|
SourcePredFlag = 0x400000L, /* static predicate with source declaration */
|
||||||
MetaPredFlag = 0x200000L, /* predicate subject to a meta declaration */
|
MetaPredFlag = 0x200000L, /* predicate subject to a meta declaration */
|
||||||
@ -474,10 +520,12 @@ typedef enum {
|
|||||||
#endif /* YAPOR */
|
#endif /* YAPOR */
|
||||||
ProfiledPredFlag = 0x000010L, /* pred is being profiled */
|
ProfiledPredFlag = 0x000010L, /* pred is being profiled */
|
||||||
LogUpdatePredFlag = 0x000008L /* dynamic predicate with log. upd. sem. */
|
LogUpdatePredFlag = 0x000008L /* dynamic predicate with log. upd. sem. */
|
||||||
} pred_flag;
|
}
|
||||||
|
pred_flag;
|
||||||
|
|
||||||
/* profile data */
|
/* profile data */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
#if defined(YAPOR) || defined(THREADS)
|
#if defined(YAPOR) || defined(THREADS)
|
||||||
lockvar lock; /* a simple lock to protect this entry */
|
lockvar lock; /* a simple lock to protect this entry */
|
||||||
#endif
|
#endif
|
||||||
@ -485,13 +533,14 @@ typedef struct {
|
|||||||
Int NOfHeadSuccesses; /* nbr of times head unification succeeded */
|
Int NOfHeadSuccesses; /* nbr of times head unification succeeded */
|
||||||
Int NOfRetries; /* nbr of times a clause for the pred
|
Int NOfRetries; /* nbr of times a clause for the pred
|
||||||
was retried */
|
was retried */
|
||||||
} profile_data;
|
}
|
||||||
|
profile_data;
|
||||||
|
|
||||||
typedef struct pred_entry {
|
typedef struct pred_entry
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
unsigned int ArityOfPE; /* arity of property */
|
unsigned int ArityOfPE; /* arity of property */
|
||||||
int ModuleOfPred; /* module for this definition */
|
|
||||||
CELL PredFlags;
|
CELL PredFlags;
|
||||||
CODEADDR CodeOfPred; /* code address */
|
CODEADDR CodeOfPred; /* code address */
|
||||||
CODEADDR TrueCodeOfPred; /* if needing to spy or to lock */
|
CODEADDR TrueCodeOfPred; /* if needing to spy or to lock */
|
||||||
@ -505,17 +554,20 @@ typedef struct pred_entry {
|
|||||||
#ifdef TABLING
|
#ifdef TABLING
|
||||||
tab_ent_ptr TableOfPred;
|
tab_ent_ptr TableOfPred;
|
||||||
#endif /* TABLING */
|
#endif /* TABLING */
|
||||||
|
SMALLUNSGN ModuleOfPred; /* module for this definition */
|
||||||
OPCODE OpcodeOfPred; /* undefcode, indexcode, spycode, .... */
|
OPCODE OpcodeOfPred; /* undefcode, indexcode, spycode, .... */
|
||||||
profile_data StatisticsForPred; /* enable profiling for predicate */
|
profile_data StatisticsForPred; /* enable profiling for predicate */
|
||||||
SMALLUNSGN StateOfPred; /* actual state of predicate */
|
SMALLUNSGN StateOfPred; /* actual state of predicate */
|
||||||
} PredEntry;
|
}
|
||||||
|
PredEntry;
|
||||||
#define PEProp ((PropFlags)(0x0000))
|
#define PEProp ((PropFlags)(0x0000))
|
||||||
|
|
||||||
#if USE_OFFSETS_IN_PROPS
|
#if USE_OFFSETS_IN_PROPS
|
||||||
|
|
||||||
inline EXTERN PredEntry *RepPredProp (Prop p);
|
inline EXTERN PredEntry *RepPredProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN PredEntry * RepPredProp(Prop p)
|
inline EXTERN PredEntry *
|
||||||
|
RepPredProp (Prop p)
|
||||||
{
|
{
|
||||||
return (PredEntry *) (AtomBase + Unsigned (p));
|
return (PredEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -524,7 +576,8 @@ inline EXTERN PredEntry * RepPredProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsPredProp (PredEntry * p);
|
inline EXTERN Prop AbsPredProp (PredEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsPredProp(PredEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsPredProp (PredEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -534,7 +587,8 @@ inline EXTERN Prop AbsPredProp(PredEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PredEntry *RepPredProp (Prop p);
|
inline EXTERN PredEntry *RepPredProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN PredEntry * RepPredProp(Prop p)
|
inline EXTERN PredEntry *
|
||||||
|
RepPredProp (Prop p)
|
||||||
{
|
{
|
||||||
return (PredEntry *) (p);
|
return (PredEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -543,7 +597,8 @@ inline EXTERN PredEntry * RepPredProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsPredProp (PredEntry * p);
|
inline EXTERN Prop AbsPredProp (PredEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsPredProp(PredEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsPredProp (PredEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -554,7 +609,8 @@ inline EXTERN Prop AbsPredProp(PredEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsPredProperty (int);
|
inline EXTERN PropFlags IsPredProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsPredProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsPredProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == PEProp));
|
return (PropFlags) ((flags == PEProp));
|
||||||
}
|
}
|
||||||
@ -566,10 +622,12 @@ inline EXTERN PropFlags IsPredProperty(int flags)
|
|||||||
#define MAX_C_PREDS 360
|
#define MAX_C_PREDS 360
|
||||||
#define MAX_CMP_FUNCS 20
|
#define MAX_CMP_FUNCS 20
|
||||||
|
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
PredEntry *p;
|
PredEntry *p;
|
||||||
CmpPredicate f;
|
CmpPredicate f;
|
||||||
} cmp_entry;
|
}
|
||||||
|
cmp_entry;
|
||||||
|
|
||||||
extern CPredicate c_predicates[MAX_C_PREDS];
|
extern CPredicate c_predicates[MAX_C_PREDS];
|
||||||
extern cmp_entry cmp_funcs[MAX_CMP_FUNCS];
|
extern cmp_entry cmp_funcs[MAX_CMP_FUNCS];
|
||||||
@ -577,7 +635,8 @@ extern cmp_entry cmp_funcs[MAX_CMP_FUNCS];
|
|||||||
|
|
||||||
/* Flags for code or dbase entry */
|
/* Flags for code or dbase entry */
|
||||||
/* There are several flags for code and data base entries */
|
/* There are several flags for code and data base entries */
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
GcFoundMask = 0x10000, /* informs this is a dynamic predicate */
|
GcFoundMask = 0x10000, /* informs this is a dynamic predicate */
|
||||||
DynamicMask = 0x8000, /* informs this is a dynamic predicate */
|
DynamicMask = 0x8000, /* informs this is a dynamic predicate */
|
||||||
InUseMask = 0x4000, /* informs this block is being used */
|
InUseMask = 0x4000, /* informs this block is being used */
|
||||||
@ -589,13 +648,15 @@ typedef enum {
|
|||||||
StaticMask = 0x0100, /* dealing with static predicates */
|
StaticMask = 0x0100, /* dealing with static predicates */
|
||||||
SpiedMask = 0x0080 /* this predicate is being spied */
|
SpiedMask = 0x0080 /* this predicate is being spied */
|
||||||
/* other flags belong to DB */
|
/* other flags belong to DB */
|
||||||
} dbentry_flags;
|
}
|
||||||
|
dbentry_flags;
|
||||||
|
|
||||||
/* *********************** DBrefs **************************************/
|
/* *********************** DBrefs **************************************/
|
||||||
|
|
||||||
#define KEEP_ENTRY_AGE 1
|
#define KEEP_ENTRY_AGE 1
|
||||||
|
|
||||||
typedef struct DB_STRUCT {
|
typedef struct DB_STRUCT
|
||||||
|
{
|
||||||
Functor id; /* allow pointers to this struct to id */
|
Functor id; /* allow pointers to this struct to id */
|
||||||
/* as dbref */
|
/* as dbref */
|
||||||
Term EntryTerm; /* cell bound to itself */
|
Term EntryTerm; /* cell bound to itself */
|
||||||
@ -623,7 +684,8 @@ typedef struct DB_STRUCT {
|
|||||||
CELL NOfCells; /* Size of Term */
|
CELL NOfCells; /* Size of Term */
|
||||||
CELL Entry; /* entry point */
|
CELL Entry; /* entry point */
|
||||||
Term Contents[MIN_ARRAY]; /* stored term */
|
Term Contents[MIN_ARRAY]; /* stored term */
|
||||||
} DBStruct;
|
}
|
||||||
|
DBStruct;
|
||||||
|
|
||||||
#define DBStructFlagsToDBStruct(X) ((DBRef)((X) - (CELL) &(((DBRef) NIL)->Flags)))
|
#define DBStructFlagsToDBStruct(X) ((DBRef)((X) - (CELL) &(((DBRef) NIL)->Flags)))
|
||||||
|
|
||||||
@ -645,7 +707,8 @@ typedef DBStruct *DBRef;
|
|||||||
|
|
||||||
inline EXTERN int IsDBRefTerm (Term);
|
inline EXTERN int IsDBRefTerm (Term);
|
||||||
|
|
||||||
inline EXTERN int IsDBRefTerm(Term t)
|
inline EXTERN int
|
||||||
|
IsDBRefTerm (Term t)
|
||||||
{
|
{
|
||||||
return (int) (IsApplTerm (t) && FunctorOfTerm (t) == FunctorDBRef);
|
return (int) (IsApplTerm (t) && FunctorOfTerm (t) == FunctorDBRef);
|
||||||
}
|
}
|
||||||
@ -654,7 +717,8 @@ inline EXTERN int IsDBRefTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN Term MkDBRefTerm (DBRef);
|
inline EXTERN Term MkDBRefTerm (DBRef);
|
||||||
|
|
||||||
inline EXTERN Term MkDBRefTerm(DBRef p)
|
inline EXTERN Term
|
||||||
|
MkDBRefTerm (DBRef p)
|
||||||
{
|
{
|
||||||
return (Term) ((AbsAppl (((CELL *) (p)))));
|
return (Term) ((AbsAppl (((CELL *) (p)))));
|
||||||
}
|
}
|
||||||
@ -663,7 +727,8 @@ inline EXTERN Term MkDBRefTerm(DBRef p)
|
|||||||
|
|
||||||
inline EXTERN DBRef DBRefOfTerm (Term t);
|
inline EXTERN DBRef DBRefOfTerm (Term t);
|
||||||
|
|
||||||
inline EXTERN DBRef DBRefOfTerm(Term t)
|
inline EXTERN DBRef
|
||||||
|
DBRefOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (DBRef) (((DBRef) (RepAppl (t))));
|
return (DBRef) (((DBRef) (RepAppl (t))));
|
||||||
}
|
}
|
||||||
@ -673,7 +738,8 @@ inline EXTERN DBRef DBRefOfTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN int IsRefTerm (Term);
|
inline EXTERN int IsRefTerm (Term);
|
||||||
|
|
||||||
inline EXTERN int IsRefTerm(Term t)
|
inline EXTERN int
|
||||||
|
IsRefTerm (Term t)
|
||||||
{
|
{
|
||||||
return (int) (IsApplTerm (t) && FunctorOfTerm (t) == FunctorDBRef);
|
return (int) (IsApplTerm (t) && FunctorOfTerm (t) == FunctorDBRef);
|
||||||
}
|
}
|
||||||
@ -682,14 +748,16 @@ inline EXTERN int IsRefTerm(Term t)
|
|||||||
|
|
||||||
inline EXTERN CODEADDR RefOfTerm (Term t);
|
inline EXTERN CODEADDR RefOfTerm (Term t);
|
||||||
|
|
||||||
inline EXTERN CODEADDR RefOfTerm(Term t)
|
inline EXTERN CODEADDR
|
||||||
|
RefOfTerm (Term t)
|
||||||
{
|
{
|
||||||
return (CODEADDR) (DBRefOfTerm (t));
|
return (CODEADDR) (DBRefOfTerm (t));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct struct_dbentry {
|
typedef struct struct_dbentry
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
unsigned int ArityOfDB; /* kind of property */
|
unsigned int ArityOfDB; /* kind of property */
|
||||||
@ -705,11 +773,13 @@ typedef struct struct_dbentry {
|
|||||||
#else
|
#else
|
||||||
DBRef FirstNEr; /* first non-erased DBase entry */
|
DBRef FirstNEr; /* first non-erased DBase entry */
|
||||||
#endif /* KEEP_ENTRY_AGE */
|
#endif /* KEEP_ENTRY_AGE */
|
||||||
} DBEntry;
|
}
|
||||||
|
DBEntry;
|
||||||
typedef DBEntry *DBProp;
|
typedef DBEntry *DBProp;
|
||||||
#define DBProperty ((PropFlags)0x8000)
|
#define DBProperty ((PropFlags)0x8000)
|
||||||
|
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
unsigned int ArityOfDB; /* kind of property */
|
unsigned int ArityOfDB; /* kind of property */
|
||||||
@ -722,7 +792,8 @@ typedef struct {
|
|||||||
SMALLUNSGN ModuleOfDB; /* module for this definition */
|
SMALLUNSGN ModuleOfDB; /* module for this definition */
|
||||||
Int NOfEntries; /* age counter */
|
Int NOfEntries; /* age counter */
|
||||||
DBRef Index; /* age counter */
|
DBRef Index; /* age counter */
|
||||||
} LogUpdDBEntry;
|
}
|
||||||
|
LogUpdDBEntry;
|
||||||
typedef LogUpdDBEntry *LogUpdDBProp;
|
typedef LogUpdDBEntry *LogUpdDBProp;
|
||||||
#define LogUpdDBBit 0x1
|
#define LogUpdDBBit 0x1
|
||||||
#define CodeDBBit 0x2
|
#define CodeDBBit 0x2
|
||||||
@ -734,7 +805,8 @@ typedef LogUpdDBEntry *LogUpdDBProp;
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsDBProperty (int);
|
inline EXTERN PropFlags IsDBProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsDBProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsDBProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) (((flags & ~(LogUpdDBBit | CodeDBBit)) == DBProperty));
|
return (PropFlags) (((flags & ~(LogUpdDBBit | CodeDBBit)) == DBProperty));
|
||||||
}
|
}
|
||||||
@ -745,7 +817,8 @@ inline EXTERN PropFlags IsDBProperty(int flags)
|
|||||||
|
|
||||||
inline EXTERN DBProp RepDBProp (Prop p);
|
inline EXTERN DBProp RepDBProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN DBProp RepDBProp(Prop p)
|
inline EXTERN DBProp
|
||||||
|
RepDBProp (Prop p)
|
||||||
{
|
{
|
||||||
return (DBProp) (AtomBase + Unsigned (p));
|
return (DBProp) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -754,7 +827,8 @@ inline EXTERN DBProp RepDBProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsDBProp (DBProp p);
|
inline EXTERN Prop AbsDBProp (DBProp p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsDBProp(DBProp p)
|
inline EXTERN Prop
|
||||||
|
AbsDBProp (DBProp p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -764,7 +838,8 @@ inline EXTERN Prop AbsDBProp(DBProp p)
|
|||||||
|
|
||||||
inline EXTERN DBProp RepDBProp (Prop p);
|
inline EXTERN DBProp RepDBProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN DBProp RepDBProp(Prop p)
|
inline EXTERN DBProp
|
||||||
|
RepDBProp (Prop p)
|
||||||
{
|
{
|
||||||
return (DBProp) (p);
|
return (DBProp) (p);
|
||||||
}
|
}
|
||||||
@ -773,7 +848,8 @@ inline EXTERN DBProp RepDBProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsDBProp (DBProp p);
|
inline EXTERN Prop AbsDBProp (DBProp p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsDBProp(DBProp p)
|
inline EXTERN Prop
|
||||||
|
AbsDBProp (DBProp p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -783,7 +859,8 @@ inline EXTERN Prop AbsDBProp(DBProp p)
|
|||||||
|
|
||||||
|
|
||||||
/* These are the actual flags for DataBase terms */
|
/* These are the actual flags for DataBase terms */
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
DBAtomic = 0x1,
|
DBAtomic = 0x1,
|
||||||
DBVar = 0x2,
|
DBVar = 0x2,
|
||||||
DBNoVars = 0x4,
|
DBNoVars = 0x4,
|
||||||
@ -791,11 +868,13 @@ typedef enum {
|
|||||||
DBCode = 0x10,
|
DBCode = 0x10,
|
||||||
DBNoCode = 0x20,
|
DBNoCode = 0x20,
|
||||||
DBWithRefs = 0x40
|
DBWithRefs = 0x40
|
||||||
} db_term_flags;
|
}
|
||||||
|
db_term_flags;
|
||||||
|
|
||||||
#define MaxModules 255
|
#define MaxModules 255
|
||||||
|
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
Atom KeyOfBB; /* functor for this property */
|
Atom KeyOfBB; /* functor for this property */
|
||||||
@ -804,14 +883,16 @@ typedef struct {
|
|||||||
rwlock_t BBRWLock; /* a read-write lock to protect the entry */
|
rwlock_t BBRWLock; /* a read-write lock to protect the entry */
|
||||||
#endif
|
#endif
|
||||||
SMALLUNSGN ModuleOfBB; /* module for this definition */
|
SMALLUNSGN ModuleOfBB; /* module for this definition */
|
||||||
} BlackBoardEntry;
|
}
|
||||||
|
BlackBoardEntry;
|
||||||
typedef BlackBoardEntry *BBProp;
|
typedef BlackBoardEntry *BBProp;
|
||||||
|
|
||||||
#if USE_OFFSETS_IN_PROPS
|
#if USE_OFFSETS_IN_PROPS
|
||||||
|
|
||||||
inline EXTERN BlackBoardEntry *RepBBProp (Prop p);
|
inline EXTERN BlackBoardEntry *RepBBProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN BlackBoardEntry * RepBBProp(Prop p)
|
inline EXTERN BlackBoardEntry *
|
||||||
|
RepBBProp (Prop p)
|
||||||
{
|
{
|
||||||
return (BlackBoardEntry *) (AtomBase + Unsigned (p));
|
return (BlackBoardEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -820,7 +901,8 @@ inline EXTERN BlackBoardEntry * RepBBProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsBBProp (BlackBoardEntry * p);
|
inline EXTERN Prop AbsBBProp (BlackBoardEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsBBProp(BlackBoardEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsBBProp (BlackBoardEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -830,7 +912,8 @@ inline EXTERN Prop AbsBBProp(BlackBoardEntry * p)
|
|||||||
|
|
||||||
inline EXTERN BlackBoardEntry *RepBBProp (Prop p);
|
inline EXTERN BlackBoardEntry *RepBBProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN BlackBoardEntry * RepBBProp(Prop p)
|
inline EXTERN BlackBoardEntry *
|
||||||
|
RepBBProp (Prop p)
|
||||||
{
|
{
|
||||||
return (BlackBoardEntry *) (p);
|
return (BlackBoardEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -839,7 +922,8 @@ inline EXTERN BlackBoardEntry * RepBBProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsBBProp (BlackBoardEntry * p);
|
inline EXTERN Prop AbsBBProp (BlackBoardEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsBBProp(BlackBoardEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsBBProp (BlackBoardEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -852,7 +936,8 @@ inline EXTERN Prop AbsBBProp(BlackBoardEntry * p)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsBBProperty (int);
|
inline EXTERN PropFlags IsBBProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsBBProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsBBProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == BBProperty));
|
return (PropFlags) ((flags == BBProperty));
|
||||||
}
|
}
|
||||||
@ -862,7 +947,8 @@ inline EXTERN PropFlags IsBBProperty(int flags)
|
|||||||
|
|
||||||
/* array property entry structure */
|
/* array property entry structure */
|
||||||
/* first case is for dynamic arrays */
|
/* first case is for dynamic arrays */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
Int ArrayEArity; /* Arity of Array (positive) */
|
Int ArrayEArity; /* Arity of Array (positive) */
|
||||||
@ -870,12 +956,14 @@ typedef struct {
|
|||||||
rwlock_t ArRWLock; /* a read-write lock to protect the entry */
|
rwlock_t ArRWLock; /* a read-write lock to protect the entry */
|
||||||
#endif
|
#endif
|
||||||
Term ValueOfVE; /* Pointer to the actual array */
|
Term ValueOfVE; /* Pointer to the actual array */
|
||||||
} ArrayEntry;
|
}
|
||||||
|
ArrayEntry;
|
||||||
|
|
||||||
/* second case is for static arrays */
|
/* second case is for static arrays */
|
||||||
|
|
||||||
/* first, the valid types */
|
/* first, the valid types */
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
array_of_ints,
|
array_of_ints,
|
||||||
array_of_chars,
|
array_of_chars,
|
||||||
array_of_uchars,
|
array_of_uchars,
|
||||||
@ -884,9 +972,11 @@ typedef enum {
|
|||||||
array_of_atoms,
|
array_of_atoms,
|
||||||
array_of_dbrefs,
|
array_of_dbrefs,
|
||||||
array_of_terms
|
array_of_terms
|
||||||
} static_array_types;
|
}
|
||||||
|
static_array_types;
|
||||||
|
|
||||||
typedef union {
|
typedef union
|
||||||
|
{
|
||||||
Int *ints;
|
Int *ints;
|
||||||
char *chars;
|
char *chars;
|
||||||
unsigned char *uchars;
|
unsigned char *uchars;
|
||||||
@ -895,10 +985,12 @@ typedef union {
|
|||||||
Term *atoms;
|
Term *atoms;
|
||||||
Term *dbrefs;
|
Term *dbrefs;
|
||||||
DBRef *terms;
|
DBRef *terms;
|
||||||
} statarray_elements;
|
}
|
||||||
|
statarray_elements;
|
||||||
|
|
||||||
/* next, the actual data structure */
|
/* next, the actual data structure */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
Int ArrayEArity; /* Arity of Array (negative) */
|
Int ArrayEArity; /* Arity of Array (negative) */
|
||||||
@ -907,14 +999,16 @@ typedef struct {
|
|||||||
#endif
|
#endif
|
||||||
static_array_types ArrayType; /* Type of Array Elements. */
|
static_array_types ArrayType; /* Type of Array Elements. */
|
||||||
statarray_elements ValueOfVE; /* Pointer to the Array itself */
|
statarray_elements ValueOfVE; /* Pointer to the Array itself */
|
||||||
} StaticArrayEntry;
|
}
|
||||||
|
StaticArrayEntry;
|
||||||
|
|
||||||
|
|
||||||
#if USE_OFFSETS_IN_PROPS
|
#if USE_OFFSETS_IN_PROPS
|
||||||
|
|
||||||
inline EXTERN ArrayEntry *RepArrayProp (Prop p);
|
inline EXTERN ArrayEntry *RepArrayProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ArrayEntry * RepArrayProp(Prop p)
|
inline EXTERN ArrayEntry *
|
||||||
|
RepArrayProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ArrayEntry *) (AtomBase + Unsigned (p));
|
return (ArrayEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -923,7 +1017,8 @@ inline EXTERN ArrayEntry * RepArrayProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsArrayProp (ArrayEntry * p);
|
inline EXTERN Prop AbsArrayProp (ArrayEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsArrayProp(ArrayEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsArrayProp (ArrayEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -932,7 +1027,8 @@ inline EXTERN Prop AbsArrayProp(ArrayEntry * p)
|
|||||||
|
|
||||||
inline EXTERN StaticArrayEntry *RepStaticArrayProp (Prop p);
|
inline EXTERN StaticArrayEntry *RepStaticArrayProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN StaticArrayEntry * RepStaticArrayProp(Prop p)
|
inline EXTERN StaticArrayEntry *
|
||||||
|
RepStaticArrayProp (Prop p)
|
||||||
{
|
{
|
||||||
return (StaticArrayEntry *) (AtomBase + Unsigned (p));
|
return (StaticArrayEntry *) (AtomBase + Unsigned (p));
|
||||||
}
|
}
|
||||||
@ -941,7 +1037,8 @@ inline EXTERN StaticArrayEntry * RepStaticArrayProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsStaticArrayProp (StaticArrayEntry * p);
|
inline EXTERN Prop AbsStaticArrayProp (StaticArrayEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsStaticArrayProp(StaticArrayEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsStaticArrayProp (StaticArrayEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (Addr (p) - AtomBase);
|
return (Prop) (Addr (p) - AtomBase);
|
||||||
}
|
}
|
||||||
@ -951,7 +1048,8 @@ inline EXTERN Prop AbsStaticArrayProp(StaticArrayEntry * p)
|
|||||||
|
|
||||||
inline EXTERN ArrayEntry *RepArrayProp (Prop p);
|
inline EXTERN ArrayEntry *RepArrayProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN ArrayEntry * RepArrayProp(Prop p)
|
inline EXTERN ArrayEntry *
|
||||||
|
RepArrayProp (Prop p)
|
||||||
{
|
{
|
||||||
return (ArrayEntry *) (p);
|
return (ArrayEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -960,7 +1058,8 @@ inline EXTERN ArrayEntry * RepArrayProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsArrayProp (ArrayEntry * p);
|
inline EXTERN Prop AbsArrayProp (ArrayEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsArrayProp(ArrayEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsArrayProp (ArrayEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -969,7 +1068,8 @@ inline EXTERN Prop AbsArrayProp(ArrayEntry * p)
|
|||||||
|
|
||||||
inline EXTERN StaticArrayEntry *RepStaticArrayProp (Prop p);
|
inline EXTERN StaticArrayEntry *RepStaticArrayProp (Prop p);
|
||||||
|
|
||||||
inline EXTERN StaticArrayEntry * RepStaticArrayProp(Prop p)
|
inline EXTERN StaticArrayEntry *
|
||||||
|
RepStaticArrayProp (Prop p)
|
||||||
{
|
{
|
||||||
return (StaticArrayEntry *) (p);
|
return (StaticArrayEntry *) (p);
|
||||||
}
|
}
|
||||||
@ -978,7 +1078,8 @@ inline EXTERN StaticArrayEntry * RepStaticArrayProp(Prop p)
|
|||||||
|
|
||||||
inline EXTERN Prop AbsStaticArrayProp (StaticArrayEntry * p);
|
inline EXTERN Prop AbsStaticArrayProp (StaticArrayEntry * p);
|
||||||
|
|
||||||
inline EXTERN Prop AbsStaticArrayProp(StaticArrayEntry * p)
|
inline EXTERN Prop
|
||||||
|
AbsStaticArrayProp (StaticArrayEntry * p)
|
||||||
{
|
{
|
||||||
return (Prop) (p);
|
return (Prop) (p);
|
||||||
}
|
}
|
||||||
@ -990,7 +1091,8 @@ inline EXTERN Prop AbsStaticArrayProp(StaticArrayEntry * p)
|
|||||||
|
|
||||||
inline EXTERN int ArrayIsDynamic (ArrayEntry *);
|
inline EXTERN int ArrayIsDynamic (ArrayEntry *);
|
||||||
|
|
||||||
inline EXTERN int ArrayIsDynamic(ArrayEntry * are)
|
inline EXTERN int
|
||||||
|
ArrayIsDynamic (ArrayEntry * are)
|
||||||
{
|
{
|
||||||
return (int) (((are)->ArrayEArity > 0));
|
return (int) (((are)->ArrayEArity > 0));
|
||||||
}
|
}
|
||||||
@ -1000,7 +1102,8 @@ inline EXTERN int ArrayIsDynamic(ArrayEntry * are)
|
|||||||
|
|
||||||
inline EXTERN PropFlags IsArrayProperty (int);
|
inline EXTERN PropFlags IsArrayProperty (int);
|
||||||
|
|
||||||
inline EXTERN PropFlags IsArrayProperty(int flags)
|
inline EXTERN PropFlags
|
||||||
|
IsArrayProperty (int flags)
|
||||||
{
|
{
|
||||||
return (PropFlags) ((flags == ArrayProperty));
|
return (PropFlags) ((flags == ArrayProperty));
|
||||||
}
|
}
|
||||||
@ -1037,10 +1140,12 @@ PredPropByFunc(Functor f, SMALLUNSGN cur_mod)
|
|||||||
|
|
||||||
WRITE_LOCK (fe->FRWLock);
|
WRITE_LOCK (fe->FRWLock);
|
||||||
p0 = fe->PropsOfFE;
|
p0 = fe->PropsOfFE;
|
||||||
while (p0) {
|
while (p0)
|
||||||
|
{
|
||||||
PredEntry *p = RepPredProp (p0);
|
PredEntry *p = RepPredProp (p0);
|
||||||
if ( /* p->KindOfPE != 0 || only props */
|
if ( /* p->KindOfPE != 0 || only props */
|
||||||
(p->ModuleOfPred == cur_mod || !(p->ModuleOfPred))) {
|
(p->ModuleOfPred == cur_mod || !(p->ModuleOfPred)))
|
||||||
|
{
|
||||||
WRITE_UNLOCK (f->FRWLock);
|
WRITE_UNLOCK (f->FRWLock);
|
||||||
return (p0);
|
return (p0);
|
||||||
}
|
}
|
||||||
@ -1058,10 +1163,12 @@ PredPropByAtom(Atom at, SMALLUNSGN cur_mod)
|
|||||||
|
|
||||||
WRITE_LOCK (ae->ARWLock);
|
WRITE_LOCK (ae->ARWLock);
|
||||||
p0 = ae->PropsOfAE;
|
p0 = ae->PropsOfAE;
|
||||||
while (p0) {
|
while (p0)
|
||||||
|
{
|
||||||
PredEntry *pe = RepPredProp (p0);
|
PredEntry *pe = RepPredProp (p0);
|
||||||
if (pe->KindOfPE == PEProp &&
|
if (pe->KindOfPE == PEProp &&
|
||||||
(pe->ModuleOfPred == cur_mod || !pe->ModuleOfPred)) {
|
(pe->ModuleOfPred == cur_mod || !pe->ModuleOfPred))
|
||||||
|
{
|
||||||
WRITE_UNLOCK (ae->ARWLock);
|
WRITE_UNLOCK (ae->ARWLock);
|
||||||
return (p0);
|
return (p0);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
/* config.h. Generated automatically by configure. */
|
/* config.h. Generated automatically by configure. */
|
||||||
|
|
||||||
/* are we using gcc */
|
/* are we using gcc */
|
||||||
#define HAVE_GCC 1
|
/* #define HAVE_GCC 1 */
|
||||||
|
|
||||||
/* should we use gcc threaded code (i.e. goto *adrs) */
|
/* should we use gcc threaded code (i.e. goto *adrs) */
|
||||||
#define USE_THREADED_CODE 1
|
/* #define USE_THREADED_CODE 1*/
|
||||||
|
|
||||||
/* Should we use lib readline ? */
|
/* Should we use lib readline ? */
|
||||||
/* #undef HAVE_LIBREADLINE */
|
/* #undef HAVE_LIBREADLINE */
|
||||||
|
|
||||||
/* Should we use gmp ? */
|
/* Should we use gmp ? */
|
||||||
/* #undef HAVE_LIBGMP */
|
/* #define HAVE_LIBGMP 1 */
|
||||||
|
|
||||||
/* does the compiler support inline ? */
|
/* does the compiler support inline ? */
|
||||||
/* #undef inline */
|
/* #undef inline */
|
||||||
@ -19,45 +19,51 @@
|
|||||||
#define STDC_HEADERS 1
|
#define STDC_HEADERS 1
|
||||||
|
|
||||||
/* Host Name ? */
|
/* Host Name ? */
|
||||||
#define HOST_ALIAS "i386-pc-cygwin32"
|
#define HOST_ALIAS ""
|
||||||
|
|
||||||
/* #undef HAVE_SYS_WAIT_H */
|
/* #undef HAVE_SYS_WAIT_H */
|
||||||
#define NO_UNION_WAIT 1
|
#define NO_UNION_WAIT 1
|
||||||
|
|
||||||
#define HAVE_ARPA_INET_H 1
|
/* #undef HAVE_ARPA_INET_H */
|
||||||
#define HAVE_CTYPE_H 1
|
#define HAVE_CTYPE_H 1
|
||||||
#define HAVE_DIRECT_H 1
|
#define HAVE_DIRECT_H 1
|
||||||
|
#define HAVE_DIRENT_H 1
|
||||||
#define HAVE_ERRNO_H 1
|
#define HAVE_ERRNO_H 1
|
||||||
#define HAVE_FCNTL_H 1
|
#define HAVE_FCNTL_H 1
|
||||||
/* #undef HAVE_FENV_H */
|
/* #undef HAVE_FENV_H */
|
||||||
/* #undef HAVE_FPU_CONTROL_H */
|
/* #undef HAVE_FPU_CONTROL_H */
|
||||||
#define HAVE_IEEEFP_H 1
|
/* #undef HAVE_GMP_H */
|
||||||
|
/* #undef HAVE_IEEEFP_H */
|
||||||
|
#define HAVE_IO_H 1
|
||||||
#define HAVE_LIMITS_H 1
|
#define HAVE_LIMITS_H 1
|
||||||
#define HAVE_MEMORY_H 1
|
#define HAVE_MEMORY_H 1
|
||||||
#define HAVE_NETDB_H 1
|
/* #undef HAVE_NETDB_H */
|
||||||
#define HAVE_NETINET_IN_H 1
|
/* #undef HAVE_NETINET_IN_H */
|
||||||
|
/* #undef HAVE_READLINE_READLINE_H */
|
||||||
/* #undef HAVE_REGEX_H */
|
/* #undef HAVE_REGEX_H */
|
||||||
/* #undef HAVE_SIGINFO_H */
|
/* #undef HAVE_SIGINFO_H */
|
||||||
|
#define HAVE_SIGNAL_H 1
|
||||||
#define HAVE_STDARG_H 1
|
#define HAVE_STDARG_H 1
|
||||||
#define HAVE_STRING_H 1
|
#define HAVE_STRING_H 1
|
||||||
|
/* #undef HAVE_STROPTS_H */
|
||||||
|
/* #undef HAVE_SYS_CONF_H */
|
||||||
#define HAVE_SYS_FILE_H 1
|
#define HAVE_SYS_FILE_H 1
|
||||||
#define HAVE_SYS_MMAN_H 1
|
/* #undef HAVE_SYS_MMAN_H */
|
||||||
#define HAVE_SYS_PARAM_H 1
|
/* #undef HAVE_SYS_PARAM_H */
|
||||||
#define HAVE_SYS_RESOURCE_H 1
|
/* #undef HAVE_SYS_RESOURCE_H */
|
||||||
#define HAVE_SYS_SELECT_H 1
|
/* #undef HAVE_SYS_SELECT_H */
|
||||||
/* #undef HAVE_SYS_SHM_H */
|
/* #undef HAVE_SYS_SHM_H */
|
||||||
#define HAVE_SYS_SOCKET_H 1
|
/* #undef HAVE_SYS_SOCKET_H */
|
||||||
#define HAVE_SYS_STAT_H 1
|
#define HAVE_SYS_STAT_H 1
|
||||||
#define HAVE_SYS_TIME_H 1
|
#define HAVE_SYS_TIME_H 1
|
||||||
#define HAVE_SYS_TIMES_H 1
|
/* #undef HAVE_SYS_TIMES_H */
|
||||||
#define HAVE_SYS_TYPES_H 1
|
#define HAVE_SYS_TYPES_H 1
|
||||||
/* #undef HAVE_SYS_UCONTEXT_H */
|
/* #undef HAVE_SYS_UCONTEXT_H */
|
||||||
#define HAVE_SYS_UN_H 1
|
/* #undef HAVE_SYS_UN_H */
|
||||||
#define HAVE_TIME_H 1
|
#define HAVE_TIME_H 1
|
||||||
#define HAVE_UNISTD_H 1
|
#define HAVE_UNISTD_H 1
|
||||||
#define HAVE_WINSOCK_H 1
|
#define HAVE_WINSOCK_H 1
|
||||||
#define HAVE_WINSOCK2_H 1
|
#define HAVE_WINSOCK2_H 1
|
||||||
/* #undef HAVE_GMP_H */
|
|
||||||
|
|
||||||
/* Do we have restartable syscalls */
|
/* Do we have restartable syscalls */
|
||||||
/* #undef HAVE_RESTARTABLE_SYSCALLS */
|
/* #undef HAVE_RESTARTABLE_SYSCALLS */
|
||||||
@ -91,61 +97,109 @@
|
|||||||
/* Define the standard type of a float argument to a function */
|
/* Define the standard type of a float argument to a function */
|
||||||
#define FAFloat double /* manual */
|
#define FAFloat double /* manual */
|
||||||
|
|
||||||
|
/* Set the minimum and default heap, trail and stack size */
|
||||||
|
#define MinTrailSpace ( 32*SIZEOF_INT_P)
|
||||||
|
#define MinStackSpace (200*SIZEOF_INT_P)
|
||||||
|
#define MinHeapSpace (200*SIZEOF_INT_P)
|
||||||
|
|
||||||
|
#define UsrTrailSpace (0)
|
||||||
|
#define UsrStackSpace (0)
|
||||||
|
#define UsrHeapSpace (0)
|
||||||
|
|
||||||
|
#if (UsrTrailSpace > MinTrailSpace)
|
||||||
|
#define DefTrailSpace UsrTrailSpace
|
||||||
|
#else
|
||||||
|
#define DefTrailSpace MinTrailSpace
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if (UsrStackSpace > MinStackSpace)
|
||||||
|
#define DefStackSpace UsrStackSpace
|
||||||
|
#else
|
||||||
|
#define DefStackSpace MinStackSpace
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if (UsrHeapSpace > MinHeapSpace)
|
||||||
|
#define DefHeapSpace UsrHeapSpace
|
||||||
|
#else
|
||||||
|
#define DefHeapSpace MinHeapSpace
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Define return type for signal */
|
/* Define return type for signal */
|
||||||
#define RETSIGTYPE void
|
#define RETSIGTYPE void
|
||||||
|
|
||||||
|
/* #undef HAVE_ACOSH */
|
||||||
/* #undef HAVE_ALARM */
|
/* #undef HAVE_ALARM */
|
||||||
/* #undef HAVE_ASINH */
|
/* #undef HAVE_ASINH */
|
||||||
/* #undef HAVE_ACOSH */
|
|
||||||
/* #undef HAVE_ATANH */
|
/* #undef HAVE_ATANH */
|
||||||
#define HAVE_CHDIR 1
|
#define HAVE_CHDIR 1
|
||||||
#define HAVE_DUP2 1
|
#define HAVE_DUP2 1
|
||||||
/* #undef HAVE_FETESTEXCEPT */
|
/* #undef HAVE_FETESTEXCEPT */
|
||||||
/* #undef HAVE_FINITE */
|
/* #undef HAVE_FINITE */
|
||||||
/* #undef HAVE_GETRUSAGE */
|
|
||||||
#define HAVE_GETCWD 1
|
#define HAVE_GETCWD 1
|
||||||
#define HAVE_GETENV 1
|
#define HAVE_GETENV 1
|
||||||
|
/* #undef HAVE_GETHOSTBYNAME */
|
||||||
|
/* #undef HAVE_GETHOSTID */
|
||||||
|
/* #undef HAVE_GETHOSTNAME */
|
||||||
/* #undef HAVE_GETHRTIME */
|
/* #undef HAVE_GETHRTIME */
|
||||||
/* #undef HAVE_GETPWNAM */
|
/* #undef HAVE_GETPWNAM */
|
||||||
|
/* #undef HAVE_GETRUSAGE */
|
||||||
/* #undef HAVE_GETTIMEOFDAY */
|
/* #undef HAVE_GETTIMEOFDAY */
|
||||||
/* #undef HAVE_GETWD */
|
/* #undef HAVE_GETWD */
|
||||||
#define HAVE_ISATTY 1
|
#define HAVE_ISATTY 1
|
||||||
/* #undef HAVE_ISNAN */
|
/* #undef HAVE_ISNAN */
|
||||||
|
/* #undef HAVE_KILL */
|
||||||
#define HAVE_LABS 1
|
#define HAVE_LABS 1
|
||||||
/* #undef HAVE_LINK */
|
/* #undef HAVE_LINK */
|
||||||
/* #undef HAVE_MMAP */
|
#define HAVE_LOCALTIME 1
|
||||||
|
/* #undef HAVE_LSTAT */
|
||||||
#define HAVE_MEMCPY 1
|
#define HAVE_MEMCPY 1
|
||||||
#define HAVE_MEMMOVE 1
|
#define HAVE_MEMMOVE 1
|
||||||
/* #undef HAVE_MKSTEMP */
|
/* #undef HAVE_MKSTEMP */
|
||||||
|
#define HAVE_MKTEMP 1
|
||||||
|
/* #undef HAVE_MMAP */
|
||||||
|
#define HAVE_OPENDIR 1
|
||||||
|
#define HAVE_POPEN 1
|
||||||
#define HAVE_PUTENV 1
|
#define HAVE_PUTENV 1
|
||||||
#define HAVE_RAND 1
|
#define HAVE_RAND 1
|
||||||
/* #undef HAVE_RANDOM */
|
/* #undef HAVE_RANDOM */
|
||||||
|
#define HAVE_RENAME 1
|
||||||
/* #undef HAVE_RINT */
|
/* #undef HAVE_RINT */
|
||||||
|
/* #undef HAVE_RL_SET_PROMPT */
|
||||||
/* #undef HAVE_SBRK */
|
/* #undef HAVE_SBRK */
|
||||||
#define HAVE_STAT 1
|
|
||||||
/* #undef HAVE_SELECT */
|
/* #undef HAVE_SELECT */
|
||||||
#define HAVE_SETBUF 1
|
#define HAVE_SETBUF 1
|
||||||
|
/* #undef HAVE_SETLINEBUF */
|
||||||
/* #undef HAVE_SHMAT */
|
/* #undef HAVE_SHMAT */
|
||||||
/* #undef HAVE_SIGACTION */
|
/* #undef HAVE_SIGACTION */
|
||||||
/* #undef HAVE_SIGGETMASK */
|
/* #undef HAVE_SIGGETMASK */
|
||||||
|
/* #undef HAVE_SIGINTERRUPT */
|
||||||
#define HAVE_SIGNAL 1
|
#define HAVE_SIGNAL 1
|
||||||
/* #undef HAVE_SIGPROCMASK */
|
/* #undef HAVE_SIGPROCMASK */
|
||||||
#define HAVE_SIGSEGV 1
|
|
||||||
#define HAVE_SIGSETJMP 0
|
#define HAVE_SIGSETJMP 0
|
||||||
|
#define HAVE_SLEEP 1
|
||||||
/* #undef HAVE_SNPRINTF */
|
/* #undef HAVE_SNPRINTF */
|
||||||
/* #undef HAVE_SOCKET */
|
/* #undef HAVE_SOCKET */
|
||||||
|
#define HAVE_STAT 1
|
||||||
|
#define HAVE_STRCHR 1
|
||||||
#define HAVE_STRERROR 1
|
#define HAVE_STRERROR 1
|
||||||
#define HAVE_STRNCAT 1
|
#define HAVE_STRNCAT 1
|
||||||
#define HAVE_STRNCPY 1
|
#define HAVE_STRNCPY 1
|
||||||
#define HAVE_STRCHR 1
|
|
||||||
#define HAVE_STRTOD 1
|
#define HAVE_STRTOD 1
|
||||||
#define HAVE_SYSTEM 1
|
#define HAVE_SYSTEM 1
|
||||||
|
#define HAVE_TIME 1
|
||||||
/* #undef HAVE_TIMES */
|
/* #undef HAVE_TIMES */
|
||||||
#define HAVE_TMPNAM 1
|
#define HAVE_TMPNAM 1
|
||||||
|
/* #undef HAVE_USLEEP */
|
||||||
/* #undef HAVE_VSNPRINTF */
|
/* #undef HAVE_VSNPRINTF */
|
||||||
#define HAVE_ENVIRON 1
|
/* #undef HAVE_WAITPID */
|
||||||
#define HAVE_MPZ_XOR 0
|
#define HAVE_MPZ_XOR 0
|
||||||
|
|
||||||
|
#define HAVE_SIGSEGV 1
|
||||||
|
|
||||||
|
#define HAVE_ENVIRON 1
|
||||||
|
|
||||||
#define SELECT_TYPE_ARG1
|
#define SELECT_TYPE_ARG1
|
||||||
#define SELECT_TYPE_ARG234
|
#define SELECT_TYPE_ARG234
|
||||||
#define SELECT_TYPE_ARG5
|
#define SELECT_TYPE_ARG5
|
||||||
@ -177,3 +231,5 @@
|
|||||||
#define USE_GMP 1
|
#define USE_GMP 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Is fflush(NULL) clobbering input streams? */
|
||||||
|
#define BROKEN_FFLUSH_NULL 1
|
||||||
|
|||||||
@ -132,6 +132,8 @@ do_bootfile (char *bootfilename)
|
|||||||
Term term_true = MkAtomTerm(YapLookupAtom("true"));
|
Term term_true = MkAtomTerm(YapLookupAtom("true"));
|
||||||
Term functor_query = MkFunctor(YapLookupAtom("?-"),1);
|
Term functor_query = MkFunctor(YapLookupAtom("?-"),1);
|
||||||
|
|
||||||
|
|
||||||
|
fprintf(stderr,"Entering Yap\n");
|
||||||
/* consult boot.pl */
|
/* consult boot.pl */
|
||||||
bootfile = fopen (bootfilename, "r");
|
bootfile = fopen (bootfilename, "r");
|
||||||
if (bootfile == NULL)
|
if (bootfile == NULL)
|
||||||
|
|||||||
@ -8226,11 +8226,10 @@ L = [1-[2,3,4,5,6],2-[4,5,6],4-[6]]
|
|||||||
@syindex reachable/3
|
@syindex reachable/3
|
||||||
@cnindex reachable/3
|
@cnindex reachable/3
|
||||||
Unify @var{Vertices} with the set of all vertices in graph
|
Unify @var{Vertices} with the set of all vertices in graph
|
||||||
@var{Graph that are reachable from @var{Node}. In the next example:
|
@var{Graph} that are reachable from @var{Node}. In the next example:
|
||||||
@example
|
@example
|
||||||
?- reachable(1,[1-[3,5],2-[4],3-[],4-[5],5-[]],V).
|
?- reachable(1,[1-[3,5],2-[4],3-[],4-[5],5-[]],V).
|
||||||
|
|
||||||
|
|
||||||
V = [1,3,5]
|
V = [1,3,5]
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
#include "yap_structs.h"
|
#include "yap_structs.h"
|
||||||
|
|
||||||
#if defined(_MSC_VER) && defined(YAPDLL_EXPORTS)
|
#if defined(_MSC_VER) && defined(YAP_EXPORTS)
|
||||||
#define X_API __declspec(dllexport)
|
#define X_API __declspec(dllexport)
|
||||||
#else
|
#else
|
||||||
#define X_API
|
#define X_API
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
* File: Yap.h.m4 *
|
* File: Yap.h.m4 *
|
||||||
* mods: *
|
* mods: *
|
||||||
* comments: main header file for YAP *
|
* comments: main header file for YAP *
|
||||||
* version: $Id: Yap.h.m4,v 1.19 2002-01-29 05:37:31 vsc Exp $ *
|
* version: $Id: Yap.h.m4,v 1.20 2002-02-04 16:12:54 vsc Exp $ *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
@ -102,9 +102,10 @@
|
|||||||
#undef USE_THREADED_CODE
|
#undef USE_THREADED_CODE
|
||||||
#endif
|
#endif
|
||||||
#define inline __inline
|
#define inline __inline
|
||||||
#define YAP_VERSION "Yap-4.3.17"
|
#define YAP_VERSION "Yap-4.3.21"
|
||||||
#define BIN_DIR "c:\\Program Files\\Yap\\bin"
|
#define BIN_DIR "c:\\Program Files\\Yap\\bin"
|
||||||
#define LIB_DIR "c:\\Program Files\\Yap\\bin"
|
#define LIB_DIR "c:\\Program Files\\Yap\\lib\\Yap"
|
||||||
|
#define SHARE_DIR "c:\\Program Files\\Yap\\share\\Yap"
|
||||||
#ifdef HOST_ALIAS
|
#ifdef HOST_ALIAS
|
||||||
#undef HOST_ALIAS
|
#undef HOST_ALIAS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -204,7 +204,6 @@ typedef struct pred_entry {
|
|||||||
Prop NextOfPE; /* used to chain properties */
|
Prop NextOfPE; /* used to chain properties */
|
||||||
PropFlags KindOfPE; /* kind of property */
|
PropFlags KindOfPE; /* kind of property */
|
||||||
unsigned int ArityOfPE; /* arity of property */
|
unsigned int ArityOfPE; /* arity of property */
|
||||||
int ModuleOfPred; /* module for this definition */
|
|
||||||
CELL PredFlags;
|
CELL PredFlags;
|
||||||
CODEADDR CodeOfPred; /* code address */
|
CODEADDR CodeOfPred; /* code address */
|
||||||
CODEADDR TrueCodeOfPred; /* if needing to spy or to lock */
|
CODEADDR TrueCodeOfPred; /* if needing to spy or to lock */
|
||||||
@ -218,6 +217,7 @@ typedef struct pred_entry {
|
|||||||
#ifdef TABLING
|
#ifdef TABLING
|
||||||
tab_ent_ptr TableOfPred;
|
tab_ent_ptr TableOfPred;
|
||||||
#endif /* TABLING */
|
#endif /* TABLING */
|
||||||
|
SMALLUNSGN ModuleOfPred; /* module for this definition */
|
||||||
OPCODE OpcodeOfPred; /* undefcode, indexcode, spycode, .... */
|
OPCODE OpcodeOfPred; /* undefcode, indexcode, spycode, .... */
|
||||||
profile_data StatisticsForPred; /* enable profiling for predicate */
|
profile_data StatisticsForPred; /* enable profiling for predicate */
|
||||||
SMALLUNSGN StateOfPred; /* actual state of predicate */
|
SMALLUNSGN StateOfPred; /* actual state of predicate */
|
||||||
|
|||||||
@ -541,6 +541,7 @@ yap_flag(host_type,X) :-
|
|||||||
'$transl_to_on_off'(Y,off), % disable character escapes.
|
'$transl_to_on_off'(Y,off), % disable character escapes.
|
||||||
'$set_yap_flags'(12,Y),
|
'$set_yap_flags'(12,Y),
|
||||||
'$set_yap_flags'(14,1),
|
'$set_yap_flags'(14,1),
|
||||||
|
'$set_fpu_exceptions',
|
||||||
unknown(_,error).
|
unknown(_,error).
|
||||||
'$adjust_language'(sicstus) :-
|
'$adjust_language'(sicstus) :-
|
||||||
'$switch_log_upd'(1),
|
'$switch_log_upd'(1),
|
||||||
@ -553,6 +554,7 @@ yap_flag(host_type,X) :-
|
|||||||
'$set_yap_flags'(5,X1),
|
'$set_yap_flags'(5,X1),
|
||||||
'$force_char_conversion',
|
'$force_char_conversion',
|
||||||
'$set_yap_flags'(14,0),
|
'$set_yap_flags'(14,0),
|
||||||
|
'$set_fpu_exceptions',
|
||||||
unknown(_,error).
|
unknown(_,error).
|
||||||
'$adjust_language'(iso) :-
|
'$adjust_language'(iso) :-
|
||||||
'$switch_log_upd'(2),
|
'$switch_log_upd'(2),
|
||||||
@ -566,6 +568,7 @@ yap_flag(host_type,X) :-
|
|||||||
'$set_yap_flags'(5,X1),
|
'$set_yap_flags'(5,X1),
|
||||||
'$force_char_conversion',
|
'$force_char_conversion',
|
||||||
'$set_yap_flags'(14,0),
|
'$set_yap_flags'(14,0),
|
||||||
|
'$set_fpu_exceptions',
|
||||||
unknown(_,error).
|
unknown(_,error).
|
||||||
|
|
||||||
'$transl_to_character_escape_modes'(0,off) :- !.
|
'$transl_to_character_escape_modes'(0,off) :- !.
|
||||||
|
|||||||
@ -34,7 +34,8 @@
|
|||||||
write(user_error,'[ Execution Aborted ]'),
|
write(user_error,'[ Execution Aborted ]'),
|
||||||
nl(user_error).
|
nl(user_error).
|
||||||
'$process_error'(error(Msg, Where)) :- !,
|
'$process_error'(error(Msg, Where)) :- !,
|
||||||
print_message(error,error(Msg, Where)).
|
'$set_fpu_exceptions',
|
||||||
|
'$print_message'(error,error(Msg, Where)).
|
||||||
'$process_error'(Throw) :-
|
'$process_error'(Throw) :-
|
||||||
print_message(error,Throw).
|
print_message(error,Throw).
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user