=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.16 retrieving revision 1.24 diff -u -p -r1.16 -r1.24 --- OpenXM_contrib2/asir2000/parse/glob.c 2001/03/19 00:44:02 1.16 +++ OpenXM_contrib2/asir2000/parse/glob.c 2001/10/09 01:36:24 1.24 @@ -45,11 +45,12 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.15 2001/03/16 01:54:55 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.23 2001/10/05 10:23:07 noro Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" +#include "ox.h" #if PARI #include "genpari.h" #endif @@ -62,7 +63,7 @@ #include #endif -#if defined(SYSV) +#if defined(SYSV) && !defined(_IBMR2) #include #endif @@ -76,8 +77,8 @@ extern int GC_free_space_divisor; extern int GC_free_space_numerator; extern FILE *asir_out; -IN asir_infile; -jmp_buf env,debug_env,timer_env; +INFILE asir_infile; +jmp_buf main_env,debug_env,timer_env,exec_env; int little_endian,debug_mode; char *asir_libdir; char *asir_pager; @@ -132,7 +133,7 @@ F F_FALSE = &oF_FALSE; #if defined(__SVR4) && defined(sun) char cppname[BUFSIZ] = "/usr/ccs/lib/cpp "; #else -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__)) char cppname[BUFSIZ] = "/usr/bin/cpp "; #else #if defined(VISUAL) @@ -163,24 +164,18 @@ void glob_init() { sprintf(asirname,"%s/asir_symtab",asir_libdir); } -void input_init(fp,name) -FILE *fp; -char *name; +void input_init(FILE *fp,char *name) { - asir_infile = (IN)CALLOC(sizeof(struct oIN),1); + asir_infile = (INFILE)CALLOC(sizeof(struct oINFILE),1); asir_infile->name = name; asir_infile->fp = fp; asir_infile->ln = 1; NEXT(asir_infile) = 0; } -void notdef(vl,a,b,c) -VL vl; -Obj a,b,*c; +void notdef(VL vl,Obj a,Obj b,Obj *c) { - *c = 0; error("undefined arithmetic operation."); } -int kernelmode; int do_asirrc; int do_file; int do_message; @@ -203,11 +198,17 @@ void ExitAsir() { * status = 2 normal termination (end(), quit() etc.) */ -void asir_terminate(status) -int status; +void asir_terminate(int status) { + int t; + if ( read_exec_file ) { - read_exec_file = 0; longjmp(env,status); + t = read_exec_file; + read_exec_file = 0; + if ( t == 1 ) + longjmp(main_env,status); + else + longjmp(exec_env,status); } else { tty_reset(); #if MPI @@ -215,10 +216,11 @@ int status; close_allconnections(); mpi_finalize(); #else +#if defined(SIGPIPE) + signal(SIGPIPE,SIG_IGN); +#endif close_allconnections(); #endif - if ( kernelmode ) - fputc(0xff,asir_out); if ( asir_out ) fflush(asir_out); #if FEP @@ -242,21 +244,18 @@ void param_init() { void prompt() { if ( !no_prompt && !do_fep && asir_infile->fp == stdin ) - fprintf(asir_out,"[%d]%c",APVS->n,kernelmode?0xfe:' '); + fprintf(asir_out,"[%d] ",APVS->n); fflush(asir_out); } -void sprompt(ptr) -char *ptr; +void sprompt(char *ptr) { - sprintf(ptr,"[%d]%c",APVS->n,kernelmode?0xfe:' '); + sprintf(ptr,"[%d] ",APVS->n); } FILE *in_fp; -void process_args(ac,av) -int ac; -char **av; +void process_args(int ac,char **av) { do_asirrc = 1; #if !MPI @@ -287,8 +286,6 @@ char **av; } do_file = 1; av += 2; ac -= 2; - } else if ( !strcmp(*av,"-kernel") ) { - kernelmode = 1; av++; ac--; } else if ( !strcmp(*av,"-norc") ) { do_asirrc = 0; av++; ac--; } else if ( !strcmp(*av,"-nomessage") ) { @@ -339,19 +336,21 @@ void sig_init() { #if !defined(VISUAL) signal(SIGINT,int_handler); #else + void register_ctrlc_handler(); + register_ctrlc_handler(); #endif signal(SIGSEGV,segv_handler); -#if defined SIGFPE +#if defined(SIGFPE) signal(SIGFPE,fpe_handler); #endif -#if defined SIGPIPE +#if defined(SIGPIPE) signal(SIGPIPE,pipe_handler); #endif -#if defined SIGILL +#if defined(SIGILL) signal(SIGILL,ill_handler); #endif @@ -375,8 +374,7 @@ void asir_reset_handler() { signal(SIGINT,old_int); } -void resetenv(s) -char *s; +void resetenv(char *s) { extern FILE *outfile; @@ -401,11 +399,10 @@ char *s; #if !defined(VISUAL) reset_timer(); #endif - longjmp(env,1); + longjmp(main_env,1); } -void fatal(n) -int n; +void fatal(int n) { resetenv("return to toplevel"); } @@ -413,8 +410,7 @@ int n; FUNC registered_handler; extern int ox_int_received, critical_when_signal; -void int_handler(sig) -int sig; +void int_handler(int sig) { extern NODE PVSS; @@ -426,11 +422,9 @@ int sig; return; } #if defined(VISUAL) - suspend_timer(); signal(SIGINT,SIG_IGN); + suspend_timer(); #endif -#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) signal(SIGINT,SIG_IGN); -#endif #if !defined(VISUAL) if ( do_server_in_X11 ) { debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0); @@ -451,8 +445,6 @@ int sig; char c; fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr); - if ( kernelmode ) - fputc('\0',stderr); buf[0] = '\n'; while ( buf[0] == '\n' ) fgets(buf,BUFSIZ,stdin); @@ -484,8 +476,6 @@ int sig; } if ( debug_mode ) debug_mode = 0; - if ( kernelmode ) - fputc('\0',stderr); restore_handler(); if ( c == 'u' ) { if ( registered_handler ) { @@ -509,8 +499,6 @@ int sig; restore_handler(); return; case 'c': - if ( kernelmode ) - fputc('\0',stderr); restore_handler(); return; break; case 'w': @@ -526,40 +514,36 @@ int sig; void restore_handler() { #if defined(VISUAL) - resume_timer(); signal(SIGINT,int_handler); + resume_timer(); #endif -#if defined(_PA_RISC1_1) || defined(linux) || defined(__svr4__) +#if defined(SIGINT) signal(SIGINT,int_handler); #endif } -void segv_handler(sig) -int sig; +void segv_handler(int sig) { -#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) +#if defined(SIGSEGV) signal(SIGSEGV,segv_handler); -#endif error("internal error (SEGV)"); +#endif } -void ill_handler(sig) -int sig; +void ill_handler(int sig) { -#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) +#if defined(SIGILL) signal(SIGILL,ill_handler); -#endif error("illegal instruction (ILL)"); +#endif } -void alrm_handler(sig) -int sig; +void alrm_handler(int sig) { fprintf(stderr,"interval timer expired (VTALRM)\n"); longjmp(timer_env,1); } -void bus_handler(sig) -int sig; +void bus_handler(int sig) { #if defined(SIGBUS) signal(SIGBUS,bus_handler); @@ -567,20 +551,19 @@ int sig; #endif } -void fpe_handler(sig) -int sig; +void fpe_handler(int sig) { -#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) +#if defined(SIGFPE) signal(SIGFPE,fpe_handler); -#endif error("internal error (FPE)"); +#endif } -void pipe_handler(sig) -int sig; +void pipe_handler(int sig) { #if defined(SIGPIPE) signal(SIGPIPE,pipe_handler); + end_critical(); error("internal error (BROKEN PIPE)"); #endif } @@ -597,8 +580,7 @@ void tty_reset() { extern int evalstatline; -void set_lasterror(s) -char *s; +void set_lasterror(char *s) { strncpy(LastError,s,BUFSIZ); LastError[BUFSIZ-1] = 0; @@ -606,8 +588,7 @@ char *s; SNODE error_snode; -void error(s) -char *s; +void error(char *s) { SNODE *snp; @@ -647,8 +628,7 @@ char *s; #if !defined(VISUAL) #include -void set_timer(interval) -int interval; +void set_timer(int interval) { struct itimerval it; @@ -679,12 +659,17 @@ unsigned int get_asir_version(); char *get_asir_distribution(); void copyright() { +#if defined(INTERVAL) + printf("This is Risa/Asir + Interval Arithmetic, Version %d (%s Distribution).\n", + get_asir_version(), get_asir_distribution()); +#else printf("This is Risa/Asir, Version %d (%s Distribution).\n", get_asir_version(), get_asir_distribution()); +#endif printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n"); printf("Copyright 2000,2001, Risa/Asir committers, http://www.openxm.org/.\n"); printf("GC 5.3, copyright 1999, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n"); - printf("PARI 2.0.17(beta), copyright (C) 1989-1999,\n"); + printf("PARI 2.2.1(alpha), copyright (C) 2000,\n"); printf(" C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n"); }