=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v retrieving revision 1.88 retrieving revision 1.101 diff -u -p -r1.88 -r1.101 --- OpenXM_contrib2/asir2000/include/ca.h 2015/03/15 19:30:46 1.88 +++ OpenXM_contrib2/asir2000/include/ca.h 2017/08/30 09:40:30 1.101 @@ -45,18 +45,31 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.87 2014/08/19 06:35:01 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.100 2017/02/28 07:06:28 noro Exp $ */ #include #include #include +#include +#include +/* from mpfr-impl.h */ +#define MPFR_PREC(x) ((x)->_mpfr_prec) +#define MPFR_EXP(x) ((x)->_mpfr_exp) +#define MPFR_MANT(x) ((x)->_mpfr_d) +#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS) +#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1) + +#define RAT_CEIL(nm,dn) (((nm)+(dn)-1)/((dn))) +#define MPFR_LIMB_SIZE_REAL(x) (RAT_CEIL(MPFR_PREC((x)),sizeof(mp_limb_t)*CHAR_BIT) * (sizeof(mp_limb_t)/sizeof(int)) ) +#define MPFR_LIMB_SIZE_BODY(x) (RAT_CEIL(MPFR_PREC((x)),sizeof(unsigned int)*CHAR_BIT)) + #if defined(hpux) #include # define setbuffer(FP,buf,siz) setvbuf(FP,buf,_IOFBF,siz) #endif -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) #include #include #endif @@ -69,7 +82,7 @@ #define alloca(x) __builtin_alloca(x) #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include #include #endif @@ -86,7 +99,7 @@ typedef void * pointer; #include #else #include -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #define index(s,c) strchr(s,c) #define bzero(s,len) memset(s,0,len) #define bcopy(x,y,len) memcpy(y,x,len) @@ -160,6 +173,7 @@ typedef void * pointer; #define N_DA (N_BASE+8) #define N_GZ (N_BASE+9) #define N_GQ (N_BASE+10) +#define N_PARIB (N_BASE+11) #define ORD_REVGRADLEX 0 #define ORD_GRADLEX 1 @@ -241,7 +255,7 @@ typedef struct oBF { short id; char nid; char pad; - long body[1]; + mpfr_t body; } *BF; typedef struct oC { @@ -654,6 +668,9 @@ struct order_spec { int nv; int ispot; /* 1 means Position over Term (Pos then Term) */ int pot_nelim; /* size of positions for pot-elimination order */ + int *top_weight; + int module_rank; + int *module_top_weight; union { int simple; struct { @@ -763,14 +780,27 @@ typedef unsigned int ModNum; #define GCFREE(p) Risa_GC_free(p) #define CALLOC(d,e) MALLOC((d)*(e)) -#if !defined(__CYGWIN__) && (defined(__GNUC__) || defined(vax) || defined(apollo) || defined(alloca) || defined(VISUAL)) +#if 0 +#if !defined(__CYGWIN__) && (defined(__GNUC__) || defined(vax) || defined(apollo) || defined(alloca) || defined(VISUAL) || defined(__MINGW32__)) #define ALLOCA(d) alloca(d) #else #define ALLOCA(d) MALLOC(d) #endif +#endif +#define ALLOCA(d) MALLOC(d) + +/* for handling signals */ +#if defined(HAVE_SIGACTION) /* POSIX */ +void (*set_signal(int sig, void (*handler)(int)))(int); +#define set_signal_for_restart(x,y) (0) +#else +#define set_signal(x,y) (signal(x,y)) +#define set_signal_for_restart(x,y) (signal(x,y)) +#endif + /* for setjmp/longjmp compatibility */ -#if defined(__CYGWIN__) || defined(__x86_64) +#if defined(__CYGWIN__) || defined(HAVE_SIGACTION) || (defined(__x86_64) && !defined(__MINGW32__)) #define JMP_BUF sigjmp_buf #define SETJMP(x) sigsetjmp(x,~0) #define LONGJMP(x,y) siglongjmp(x,y) @@ -875,7 +905,8 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int))) #define NEWReal(q) ((q)=(Real)MALLOC_ATOMIC(sizeof(struct oReal)),OID(q)=O_N,NID(q)=N_R) #define NEWAlg(r) ((r)=(Alg)MALLOC(sizeof(struct oAlg)),OID(r)=O_N,NID(r)=N_A) #define NEWDAlg(r) ((r)=(DAlg)MALLOC(sizeof(struct oDAlg)),OID(r)=O_N,NID(r)=N_DA) -#define NEWBF(q,l) ((q)=(BF)MALLOC_ATOMIC(TRUESIZE(oBF,(l)-1,long)),OID(q)=O_N,NID(q)=N_B) +#define NEWBF(q) ((q)=(BF)MALLOC(sizeof(struct oBF)),OID(q)=O_N,NID(q)=N_B) +#define NEWPARIBF(q,l) ((q)=(BF)MALLOC_ATOMIC(TRUESIZE(oBF,(l)-1,long)),OID(q)=O_N,NID(q)=N_PARIB) #define NEWC(r) ((r)=(C)MALLOC(sizeof(struct oC)),OID(r)=O_N,NID(r)=N_C) #define NEWLM(r) ((r)=(LM)MALLOC(sizeof(struct oLM)),OID(r)=O_N,NID(r)=N_LM) #define NEWGF2N(r) ((r)=(GF2N)MALLOC(sizeof(struct oGF2N)),OID(r)=O_N,NID(r)=N_GF2N) @@ -975,11 +1006,7 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q) #define SL(n) ((n)->p) #define ZALLOC(d) ((Z)MALLOC_ATOMIC(TRUESIZE(oZ,(d)-1,int))) -#if defined(PARI) -#define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):BIGFLOAT(a)?rtodbl(BDY((BF)a)):0) -#else -#define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):0.0) -#endif +#define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):BIGFLOAT(a)?mpfrtodbl(BDY((BF)a)):0) /* predicates */ #define NUM(p) (OID(p)==O_N) @@ -994,6 +1021,7 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q) #define UNIMQ(q) ((q)&&NUM(q)&&SFF(q)&&(CONT((MQ)q)==1)) #define MUNIQ(q) ((q)&&NUM(q)&&RATN(q)&&(SGN((Q)q)==-1)&&UNIN(NM((Q)q))&&(!DN((Q)q))) #define MUNIMQ(q) ((q)&&NUM(q)&&SFF(q)&&(CONT((MQ)q)==-1)) +#define UNILM(n) ((n)&&UNIN(BDY(n))) #define UNIN(n) ((n)&&(PL(n)==1)&&(BD(n)[0]==1)) #define EVENN(n) ((!(n))||(!(BD(n)[0]%2))) @@ -1251,7 +1279,7 @@ void rtime_init(void); void setmod_gf2n(P); void mt_sgenrand(unsigned long); unsigned long mt_genrand(void); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) void srandom(unsigned int); unsigned int random(void); #endif @@ -1467,6 +1495,7 @@ double NatToReal(N,int *); double RatnToReal(Q); double pwrreal0(double,int); double rtodbl(); /* XXX */ +double mpfrtodbl(mpfr_t a); int **almat(int,int); pointer **almat_pointer(int,int); int berlecnt(register int,UM); @@ -1806,7 +1835,7 @@ void pwrreal(Num,Num,Real *); void pwrmi(MQ,Q,MQ *); void pwrlm(LM,Q,LM *); void pwrum(int,UM,int,UM); -void reallocarray(char **,int *,int *,int); +void asir_reallocarray(char **,int *,int *,int); void reductr(VL,Obj,Obj *); void reimtocplx(Num,Num,Num *); void rem2q(Q,Q,Q,Q *); @@ -2661,7 +2690,7 @@ void mkwcz(int k,int l,Z *t); int remzi(Z n,int m); -#if 0 && !defined(VISUAL) +#if 0 && !defined(VISUAL) && !defined(__MINGW32__) void bzero(const void *,int); void bcopy(const void *,void *,int); char *index(char *,int); @@ -2696,6 +2725,9 @@ int compnbp(VL vl,NBP p1,NBP p2); #define MPZTOMPQ(z,q) \ (mpq_init(q),mpq_numref(q)[0] = (z)[0],mpz_set_ui(mpq_denref(q),1)) +#define MPFRTOBF(g,q) \ +(NEWBF(q),BDY(q)[0]=(g)[0],(q)) + extern mpz_t ONEMPZ; extern GZ ONEGZ; @@ -2839,3 +2871,13 @@ int poly_is_dependent(P p,V v); int setsecureflag(char *name,int value); int sfdegtest(int dy,int bound,UM *d1c,int k,int *in); int sgnz(Z n); + +#if defined(VISUAL) || defined(__MINGW32__) +void check_intr(); +void enter_signal_cs(); +void leave_signal_cs(); +void leave_signal_cs_all(); +#define LEAVE_SIGNAL_CS_ALL leave_signal_cs_all() +#else +#define LEAVE_SIGNAL_CS_ALL +#endif