===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/init.c,v
retrieving revision 1.11
retrieving revision 1.21
diff -u -p -r1.11 -r1.21
--- OpenXM_contrib2/asir2000/engine/init.c	2001/06/07 04:54:40	1.11
+++ OpenXM_contrib2/asir2000/engine/init.c	2003/06/07 16:40:25	1.21
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.10 2001/03/13 01:10:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.20 2003/05/29 16:45:00 saito Exp $ 
 */
 #include "ca.h"
 #include "version.h"
@@ -83,11 +83,13 @@ USINT VOIDobj = &oVOID;
 int bigfloat;
 int nez = 1;
 int current_mod = 0;
+int StrassenSize = 0;
+int outputstyle = 0;
 
 static int *lprime;
 int lprime_size;
 
-#if PARI
+#if defined(PARI)
 int paristack = 1<<16;
 #define ADDBF addbf
 #define SUBBF subbf
@@ -108,21 +110,21 @@ int paristack = 1<<16;
 
 #if defined(INTERVAL)
 int zerorewrite = 0;
-void (*addnumt[])() = { addq, addreal, addalg, ADDBF, additvp, additvd, 0, additvf, addcplx, addmi, addlm, addgf2n, addgfpn, addgfs };
-void (*subnumt[])() = { subq, subreal, subalg, SUBBF, subitvp, subitvd, 0, subitvf, subcplx, submi, sublm, subgf2n, subgfpn, subgfs };
-void (*mulnumt[])() = { mulq, mulreal, mulalg, MULBF, mulitvp, mulitvd, 0, mulitvf, mulcplx, mulmi, mullm, mulgf2n, mulgfpn, mulgfs };
-void (*divnumt[])() = { divq, divreal, divalg, DIVBF, divitvp, divitvd, 0, divitvf, divcplx, divmi, divlm, divgf2n, divgfpn, divgfs };
-void (*pwrnumt[])() = { pwrq, pwrreal, pwralg, PWRBF, pwritvp, pwritvd, 0, pwritvf, pwrcplx, pwrmi, pwrlm, pwrgf2n, pwrgfpn, pwrgfs };
-void (*chsgnnumt[])() = { chsgnq, chsgnreal, chsgnalg, CHSGNBF, chsgnitvp, chsgnitvd, 0, chsgnitvf, chsgncplx, chsgnmi, chsgnlm, chsgngf2n, chsgngfpn, chsgngfs };
-int (*cmpnumt[])() = { cmpq, cmpreal, cmpalg, CMPBF, cmpitvp, cmpitvd, 0, cmpitvf, cmpcplx, cmpmi, cmplm, cmpgf2n, cmpgfpn, cmpgfs };
+void (*addnumt[])() = { addq, addreal, addalg, ADDBF, 0, additvp, additvd, 0, additvf, addcplx, addmi, addlm, addgf2n, addgfpn, addgfs, addgfsn };
+void (*subnumt[])() = { subq, subreal, subalg, SUBBF, 0, subitvp, subitvd, 0, subitvf, subcplx, submi, sublm, subgf2n, subgfpn, subgfs, subgfsn };
+void (*mulnumt[])() = { mulq, mulreal, mulalg, MULBF, 0, mulitvp, mulitvd, 0, mulitvf, mulcplx, mulmi, mullm, mulgf2n, mulgfpn, mulgfs, mulgfsn };
+void (*divnumt[])() = { divq, divreal, divalg, DIVBF, 0, divitvp, divitvd, 0, divitvf, divcplx, divmi, divlm, divgf2n, divgfpn, divgfs, divgfsn };
+void (*pwrnumt[])() = { pwrq, pwrreal, pwralg, PWRBF, 0, pwritvp, pwritvd, 0, pwritvf, pwrcplx, pwrmi, pwrlm, pwrgf2n, pwrgfpn, pwrgfs, pwrgfsn };
+void (*chsgnnumt[])() = { chsgnq, chsgnreal, chsgnalg, CHSGNBF, 0, chsgnitvp, chsgnitvd, 0, chsgnitvf, chsgncplx, chsgnmi, chsgnlm, chsgngf2n, chsgngfpn, chsgngfs , chsgngfsn};
+int (*cmpnumt[])() = { cmpq, cmpreal, cmpalg, CMPBF, 0, cmpitvp, cmpitvd, 0, cmpitvf, cmpcplx, cmpmi, cmplm, cmpgf2n, cmpgfpn, cmpgfs, cmpgfsn };
 #else
-void (*addnumt[])() = { addq, addreal, addalg, ADDBF, addcplx, addmi, addlm, addgf2n, addgfpn, addgfs };
-void (*subnumt[])() = { subq, subreal, subalg, SUBBF, subcplx, submi, sublm, subgf2n, subgfpn, subgfs };
-void (*mulnumt[])() = { mulq, mulreal, mulalg, MULBF, mulcplx, mulmi, mullm, mulgf2n, mulgfpn, mulgfs };
-void (*divnumt[])() = { divq, divreal, divalg, DIVBF, divcplx, divmi, divlm, divgf2n, divgfpn, divgfs };
-void (*pwrnumt[])() = { pwrq, pwrreal, pwralg, PWRBF, pwrcplx, pwrmi, pwrlm, pwrgf2n, pwrgfpn, pwrgfs };
-void (*chsgnnumt[])() = { chsgnq, chsgnreal, chsgnalg, CHSGNBF, chsgncplx, chsgnmi, chsgnlm, chsgngf2n, chsgngfpn, chsgngfs };
-int (*cmpnumt[])() = { cmpq, cmpreal, cmpalg, CMPBF, cmpcplx, cmpmi, cmplm, cmpgf2n, cmpgfpn, cmpgfs };
+void (*addnumt[])() = { addq, addreal, addalg, ADDBF, addcplx, addmi, addlm, addgf2n, addgfpn, addgfs, addgfsn };
+void (*subnumt[])() = { subq, subreal, subalg, SUBBF, subcplx, submi, sublm, subgf2n, subgfpn, subgfs, subgfsn };
+void (*mulnumt[])() = { mulq, mulreal, mulalg, MULBF, mulcplx, mulmi, mullm, mulgf2n, mulgfpn, mulgfs, mulgfsn };
+void (*divnumt[])() = { divq, divreal, divalg, DIVBF, divcplx, divmi, divlm, divgf2n, divgfpn, divgfs, divgfsn };
+void (*pwrnumt[])() = { pwrq, pwrreal, pwralg, PWRBF, pwrcplx, pwrmi, pwrlm, pwrgf2n, pwrgfpn, pwrgfs, pwrgfsn };
+void (*chsgnnumt[])() = { chsgnq, chsgnreal, chsgnalg, CHSGNBF, chsgncplx, chsgnmi, chsgnlm, chsgngf2n, chsgngfpn, chsgngfs, chsgngfsn };
+int (*cmpnumt[])() = { cmpq, cmpreal, cmpalg, CMPBF, cmpcplx, cmpmi, cmplm, cmpgf2n, cmpgfpn, cmpgfs, cmpgfsn };
 #endif
 
 double get_current_time();
@@ -177,7 +179,7 @@ void nglob_init() {
 
 /* moved to parse/main.c */
 #if 0
-#if PARI
+#if defined(PARI)
 	risa_pari_init();
 #endif
 	srandom((int)get_current_time());
@@ -191,34 +193,28 @@ extern double gctime;
 double suspend_start;
 double suspended_time=0;
 
-void get_eg(p)
-struct oEGT *p;
+void get_eg(struct oEGT *p)
 {
 	p->exectime = get_clock() - gctime - suspended_time; p->gctime = gctime;
 }
 
-void init_eg(eg)
-struct oEGT *eg;
+void init_eg(struct oEGT *eg)
 {
 	bzero((char *)eg,sizeof(struct oEGT));
 }
 
-void add_eg(base,start,end)
-struct oEGT *base,*start,*end;
+void add_eg(struct oEGT *base,struct oEGT *start,struct oEGT *end)
 {
 	base->exectime += end->exectime - start->exectime;
 	base->gctime += end->gctime - start->gctime;
 }
 
-void print_eg(item,eg)
-char *item;
-struct oEGT *eg;
+void print_eg(char *item,struct oEGT *eg)
 {
 	printf("%s=(%.4g,%.4g)",item,eg->exectime,eg->gctime);
 }
 
-void print_split_eg(start,end)
-struct oEGT *start,*end;
+void print_split_eg(struct oEGT *start,struct oEGT *end)
 {
 	struct oEGT base;
 
@@ -226,8 +222,7 @@ struct oEGT *start,*end;
 	printf("(%.4g,%.4g)",base.exectime,base.gctime);
 }
 
-void print_split_e(start,end)
-struct oEGT *start,*end;
+void print_split_e(struct oEGT *start,struct oEGT *end)
 {
 	struct oEGT base;
 
@@ -303,8 +298,7 @@ int get_lprime(index)
 	return lprime[index];
 }
 
-void create_new_lprimes(index)
-int index;
+void create_new_lprimes(int index)
 {
 	int count,p,i,j,d;