=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v retrieving revision 1.93 retrieving revision 1.104 diff -u -p -r1.93 -r1.104 --- OpenXM_contrib2/asir2000/include/ca.h 2015/08/14 13:51:55 1.93 +++ OpenXM_contrib2/asir2000/include/ca.h 2017/09/17 02:34:02 1.104 @@ -45,12 +45,13 @@ * 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.92 2015/08/06 10:39:13 fujimoto Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.103 2017/09/14 01:34:54 noro Exp $ */ #include #include #include -#include +#include +#include /* from mpfr-impl.h */ #define MPFR_PREC(x) ((x)->_mpfr_prec) @@ -59,6 +60,10 @@ #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) @@ -141,6 +146,7 @@ typedef void * pointer; #define O_IMAT 24 /* IMAT */ #define O_NBP 25 +#define O_DPM 26 #define N_Q 0 #define N_R 1 @@ -189,6 +195,13 @@ typedef _int64 L; typedef unsigned _int64 UL; #endif +#if defined(__GNUC__) && SIZEOF_LONG == 8 +typedef __uint64_t U64; +typedef __uint128_t U128; +typedef __int64_t L64; +typedef __int128_t L128; +#endif + typedef struct oN { int p; unsigned int b[1]; @@ -419,6 +432,7 @@ typedef struct oDPV { struct oDP **body; } *DPV; + typedef struct oUSINT { short id; short pad; @@ -520,10 +534,24 @@ typedef struct oDCP { typedef struct oMP { struct oDL *dl; - P c; + Obj c; struct oMP *next; } *MP; +typedef struct oDPM { + short id; + short nv; + int sugar; + struct oDMM *body; +} *DPM; + +typedef struct oDMM { + int pos; + struct oDL *dl; + Obj c; + struct oDMM *next; +} *DMM; + typedef struct oDL { int td; int d[1]; @@ -663,6 +691,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 { @@ -772,14 +803,27 @@ typedef unsigned int ModNum; #define GCFREE(p) Risa_GC_free(p) #define CALLOC(d,e) MALLOC((d)*(e)) +#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) && !defined(__MINGW32__)) +#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) @@ -855,6 +899,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int))) #define NEWCOMP(c,n) ((c)=(COMP)MALLOC(sizeof(struct oCOMP)+((n)-1)*sizeof(Obj)),OID(c)=O_COMP) #define NEWDP(d) ((d)=(DP)MALLOC(sizeof(struct oDP)),OID(d)=O_DP) #define NEWDPV(d) ((d)=(DPV)MALLOC(sizeof(struct oDPV)),OID(d)=O_DPV) +#define NEWDPM(d) ((d)=(DPM)MALLOC(sizeof(struct oDPM)),OID(d)=O_DPM) #define NEWUSINT(u) ((u)=(USINT)MALLOC_ATOMIC(sizeof(struct oUSINT)),OID(u)=O_USINT) #define NEWERR(e) ((e)=(ERR)MALLOC(sizeof(struct oERR)),OID(e)=O_ERR) #define NEWMATHCAP(e) ((e)=(MATHCAP)MALLOC(sizeof(struct oMATHCAP)),OID(e)=O_MATHCAP) @@ -871,6 +916,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int))) #define NEWV(v) ((v)=(V)MALLOC(sizeof(struct oV))) #define NEWVL(vl) ((vl)=(VL)MALLOC(sizeof(struct oVL))) #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP))) +#define NEWDMM(m) ((m)=(DMM)MALLOC(sizeof(struct oDMM))) #define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET))) #define NEWDPP(a) ((a)=(DP_pairs)MALLOC(sizeof(struct dp_pairs))) @@ -917,6 +963,7 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0) #define MKSTR(a,b) (NEWSTR(a),(a)->body=(char *)(b)) #define MKDP(n,m,d) (NEWDP(d),(d)->nv=(n),BDY(d)=(m)) #define MKDPV(len,m,d) (NEWDPV(d),(d)->len=(len),BDY(d)=(m)) +#define MKDPM(n,m,d) (NEWDPM(d),(d)->nv=(n),BDY(d)=(m)) #define MKLM(b,l) (!(b)?(l)=0:(NEWLM(l),(l)->body=(b),(l))) #define MKGF2N(b,l) (!(b)?(l)=0:(NEWGF2N(l),(l)->body=(b),(l))) #define MKGFPN(b,l) (!(b)?(l)=0:(NEWGFPN(l),(l)->body=(b),(l))) @@ -942,6 +989,8 @@ if(!(r)){NEWDLBUCKET(r);(c)=(r);}else{NEWDLBUCKET(NEXT if(!(r)){NEWVL(r);(c)=(r);}else{NEWVL(NEXT(c));(c)=NEXT(c);} #define NEXTDPP(r,c) \ if(!(r)){NEWDPP(r);(c)=(r);}else{NEWDPP(NEXT(c));(c)=NEXT(c);} +#define NEXTDMM(r,c) \ +if(!(r)){NEWDMM(r);(c)=(r);}else{NEWDMM(NEXT(c));(c)=NEXT(c);} /* convertors */ #define NTOQ(n,s,q) \ @@ -1000,6 +1049,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))) @@ -1021,7 +1071,7 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q) #define FTOIF(i) ((int)(((unsigned int)(i)|0x80000000))) struct cdl { - P c; + Obj c; DL d; }; @@ -1129,71 +1179,6 @@ void hybrid_mulup(int,UP,UP,UP *); void getmod_lm(N *); -int maxblenup(UP); -void monicup(UP,UP *); -void simpup(UP,UP *); -void simpnum(Num,Num *); -void decompp(P,Q,P *,P *); -void truncp(P,Q,P *); -void uremp(P,P,P *); -void ugcdp(P,P,P *); -void reversep(P,Q,P *); -void invmodp(P,Q,P *); -void addup(UP,UP,UP *); -void subup(UP,UP,UP *); -void chsgnup(UP,UP *); -void mulup(UP,UP,UP *); -void tmulup(UP,UP,int,UP *); -void squareup(UP,UP *); -void remup(UP,UP,UP *); -void remup_destructive(UP,UP); -void qrup(UP,UP,UP *,UP *); -void qrup_destructive(UP,UP); -void gcdup(UP,UP,UP *); -void reverseup(UP,int,UP *); -void invmodup(UP,int,UP *); -void pwrup(UP,Q,UP *); -void squarep_gf2n(VL,P,P *); -void kmulp(VL,P,P,P *); -void ksquarep(VL,P,P *); -void kmulup(UP,UP,UP *); -void ksquareup(UP,UP *); -void extractup(UP,int,int,UP *); -void copyup(UP,UP); -void c_copyup(UP,int,pointer *); -void kmulupmain(UP,UP,UP *); -void ksquareupmain(UP,UP *); -void rembymulup(UP,UP,UP *); -void rembymulup_special(UP,UP,UP,UP *); -void tkmulup(UP,UP,int,UP *); -void shiftup(UP,int,UP *); -void set_degreeup(UP,int); -void decompup(UP,int,UP *,UP *); -void truncup(UP,int,UP *); -void uptofmarray(int,UP,ModNum *); -void fmarraytoup(ModNum *,int,UP *); -void uiarraytoup(unsigned int **,int,int,UP *); -void adj_coefup(UP,N,N,UP *); -void uptolmup(UP,UP *); -void remcup(UP,N,UP *); -void fft_mulup(UP,UP,UP *); -void fft_squareup(UP,UP *); -void trunc_fft_mulup(UP,UP,int,UP *); -void shoup_fft_mulup(UP,UP,UP *); -void shoup_fft_squareup(UP,UP *); -void shoup_trunc_fft_mulup(UP,UP,int,UP *); -void crup(ModNum **,int,int *,int,N,UP *); -void shoup_crup(ModNum **,int,int *,int,N,N,UP *); -void squareup_gf2n(UP,UP *); -void powermodup_gf2n(UP,UP *); -void generic_powermodup_gf2n(UP,UP,Q,UP *); -void tracemodup_gf2n(UP,UP,Q,UP *); -void tracemodup_gf2n_slow(UP,UP,Q,UP *); -void tracemodup_gf2n_tab(UP,UP,Q,UP *); -void square_rem_tab_up_gf2n(UP,UP *,UP *); -void powertabup_gf2n(UP,UP,UP *); -void find_root_gf2n(UP,GF2N *); - int cmpdl_composite(int,DL,DL); int cmpdl_matrix(int,DL,DL); int cmpdl_order_pair(int,DL,DL); @@ -1208,20 +1193,6 @@ int cmpdl_revgradlex(int,DL,DL); int cmpdl_gradlex(int,DL,DL); int cmpdl_revlex(int,DL,DL); int cmpdl_lex(int,DL,DL); -int compd(VL,DP,DP); -void adddl(int,DL,DL,DL *); -void divsdc(VL,DP,P,DP *); -void muldc(VL,DP,P,DP *); -void muldm(VL,DP,MP,DP *); -void muld(VL,DP,DP,DP *); -void chsgnd(DP,DP *); -void subd(VL,DP,DP,DP *); -void addd(VL,DP,DP,DP *); -int sugard(MP); -void nodetod(NODE,DP *); -void dtop(VL,VL,DP,P *); -void ptod(VL,VL,P,DP *); -void initd(struct order_spec *); void adddv(VL,DPV,DPV,DPV *); void subdv(VL,DPV,DPV,DPV *); @@ -1229,6 +1200,12 @@ void muldv(VL,DP,DPV,DPV *); void chsgndv(DPV,DPV *); int compdv(VL,DPV,DPV); +void adddpm(VL,DPM,DPM,DPM *); +void subdpm(VL,DPM,DPM,DPM *); +void mulobjdpm(VL,Obj,DPM,DPM *); +void chsgndpm(DPM,DPM *); +int compdpm(VL,DPM,DPM); + void _printdp(DP); void _dp_sp_mod(DP,DP,int,DP *); void _dp_mod(DP,int,NODE,DP *); @@ -1813,7 +1790,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 *); @@ -2171,7 +2148,7 @@ int has_fcoef(DP f); int has_fcoef_p(P f); void initd(struct order_spec *spec); void ptod(VL vl,VL dvl,P p,DP *pr); -void dtop(VL vl,VL dvl,DP p,P *pr); +void dtop(VL vl,VL dvl,DP p,Obj *pr); void nodetod(NODE node,DP *dp); int sugard(MP m); void addd(VL vl,DP p1,DP p2,DP *pr); @@ -2187,8 +2164,9 @@ void weyl_muld(VL vl,DP p1,DP p2,DP *pr); void weyl_muldm(VL vl,MP m0,DP p,DP *pr); void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rtab,int rtablen); void comm_muld_tab(VL vl,int nv,struct cdl *t,int n,struct cdl *t1,int n1,struct cdl *rt); -void muldc(VL vl,DP p,P c,DP *pr); +void muldc(VL vl,DP p,Obj c,DP *pr); void divsdc(VL vl,DP p,P c,DP *pr); +void divdc(VL vl,DP p,Obj c,DP *pr); void adddl(int n,DL d1,DL d2,DL *dr); void adddl_destructive(int n,DL d1,DL d2); int compd(VL vl,DP p1,DP p2); @@ -2849,3 +2827,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