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

avoid compilation issues with lack of gmp (Remko Troncon)

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1528 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2006-01-26 19:13:24 +00:00
parent 1fcc25ff3b
commit 7fa3e86284
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
C/absmi.c
View File

@ -10,8 +10,11 @@
* * * *
* File: absmi.c * * File: absmi.c *
* comments: Portable abstract machine interpreter * * comments: Portable abstract machine interpreter *
* Last rev: $Date: 2006-01-18 15:34:53 $,$Author: vsc $ * * Last rev: $Date: 2006-01-26 19:13:24 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.193 2006/01/18 15:34:53 vsc
* avoid sideffects from MkBigInt
*
* Revision 1.192 2006/01/17 14:10:40 vsc * Revision 1.192 2006/01/17 14:10:40 vsc
* YENV may be an HW register (breaks some tabling code) * YENV may be an HW register (breaks some tabling code)
* All YAAM instructions are now brackedted, so Op introduced an { and EndOp introduces an }. This is because Ricardo assumes that. * All YAAM instructions are now brackedted, so Op introduced an { and EndOp introduces an }. This is because Ricardo assumes that.
@ -334,6 +337,8 @@ AritFunctorOfTerm(Term t) {
#define TMP_BIG(v) Yap_BigTmp #define TMP_BIG(v) Yap_BigTmp
#define RINT(v) return(MkIntegerTerm(v)) #define RINT(v) return(MkIntegerTerm(v))
#define RFLOAT(v) return(MkFloatTerm(v)) #define RFLOAT(v) return(MkFloatTerm(v))
#if USE_GMP
#define RBIG(v) return(rbig(v)) #define RBIG(v) return(rbig(v))
static inline Term rbig(MP_INT *big) static inline Term rbig(MP_INT *big)
@ -342,6 +347,7 @@ static inline Term rbig(MP_INT *big)
mpz_clear(big); mpz_clear(big);
return t; return t;
} }
#endif
#define RERROR() return(TermNil) #define RERROR() return(TermNil)
@ -1556,6 +1562,10 @@ Yap_absmi(int inp)
ipc = NEXTOP(ipc,l); ipc = NEXTOP(ipc,l);
go_on = TRUE; go_on = TRUE;
break; break;
case _jump:
ipc = ipc->u.l.l;
go_on = TRUE;
break;
case _retry_c: case _retry_c:
case _retry_userc: case _retry_userc:
low_level_trace(retry_pred, ipc->u.lds.p, B->cp_args); low_level_trace(retry_pred, ipc->u.lds.p, B->cp_args);

2
C/scanner.c
View File

@ -425,7 +425,7 @@ get_num(int *chp, int *chbuffp, int inp_stream, int (*Nxtch) (int), int (*Quoted
{ {
char *sp = s; char *sp = s;
int ch = *chp; int ch = *chp;
Int val = 0, base = ch - '0'; Int val = 0L, base = ch - '0';
int might_be_float = TRUE, has_overflow = FALSE; int might_be_float = TRUE, has_overflow = FALSE;
*sp++ = ch; *sp++ = ch;

1
changes-5.1.html
View File

@ -16,6 +16,7 @@
<h2>Yap-5.1.0:</h2> <h2>Yap-5.1.0:</h2>
<ul> <ul>
<li> FIXED: make syntax error report the line where the bug was (Jude Shavlik).</li>
<li> FIXED: ok, MkBigInt shouldn't free the bigint.</li> <li> FIXED: ok, MkBigInt shouldn't free the bigint.</li>
<li> FIXED: MkBigInt already frees bigint.</li> <li> FIXED: MkBigInt already frees bigint.</li>
<li> FIXED: don't pass a pointer to a mpz_t. (Nuno Fonseca)</li> <li> FIXED: don't pass a pointer to a mpz_t. (Nuno Fonseca)</li>

4
configure.in
View File

@ -468,12 +468,12 @@ case "$target_os" in
if test "$have_dl" = "yes" if test "$have_dl" = "yes"
then then
SHLIB_SUFFIX=".so" SHLIB_SUFFIX=".so"
SHLIB_LD="ld -shared" SHLIB_LD="ld -shared -export-dynamic"
DO_SECOND_LD="" DO_SECOND_LD=""
LIBS="$LIBS -ldl" LIBS="$LIBS -ldl"
case "$host_cpu" in case "$host_cpu" in
alpha*) alpha*)
LDFLAGS="-export-dynamic $LDFLAGS" LDFLAGS="-dynamic $LDFLAGS"
;; ;;
*) *)
if test "$CC" != "lcc" if test "$CC" != "lcc"