=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/init.c,v retrieving revision 1.25 retrieving revision 1.32 diff -u -p -r1.25 -r1.32 --- OpenXM_contrib2/asir2000/engine/init.c 2006/02/13 11:41:11 1.25 +++ OpenXM_contrib2/asir2000/engine/init.c 2014/09/19 01:26:00 1.32 @@ -45,9 +45,10 @@ * 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.24 2006/02/08 02:11:19 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.31 2013/12/20 02:02:24 noro Exp $ */ #include "ca.h" +#include "parse.h" #include "version.h" #include "prime.h" @@ -81,10 +82,12 @@ C IU = &oIU; USINT VOIDobj = &oVOID; int bigfloat; +int evalef = 0; int nez = 1; int current_mod = 0; int StrassenSize = 0; int outputstyle = 0; +int Itvplot = 33; static int *lprime; static int lprime_size; @@ -187,14 +190,16 @@ void nglob_init() { init_up2_tab(); init_lprime(); + init_gmpq(); } -extern double gctime; +extern double GC_get_gctime(); double suspend_start; double suspended_time=0; void get_eg(struct oEGT *p) { + double gctime = GC_get_gctime(); p->exectime = get_clock() - gctime - suspended_time; p->gctime = gctime; } @@ -277,7 +282,7 @@ void create_error(ERR *err,unsigned int serial,char *m MKSTR(errmsg,msg1); if ( !trace ) MKLIST(trace,0); - n = mknode(3,ui,notsupp,errmsg,trace); MKLIST(list,n); + n = mknode(4,ui,notsupp,errmsg,trace); MKLIST(list,n); MKERR(*err,list); } @@ -286,7 +291,7 @@ void init_lprime() int s,i; s = sizeof(lprime_init); - lprime = (int *)GC_malloc_atomic(s); + lprime = (int *)MALLOC_ATOMIC(s); lprime_size = s/sizeof(int); for ( i = 0; i < lprime_size; i++ ) lprime[i] = lprime_init[lprime_size-i-1];