=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.11 retrieving revision 1.61 diff -u -p -r1.11 -r1.61 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2000/03/16 04:55:21 1.11 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2006/02/13 10:07:19 1.61 @@ -1,111 +1,164 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.10 2000/03/16 01:07:00 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.60 2006/02/11 09:10:16 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "signal.h" #include "ox.h" #include "version.h" -#if PARI +#if defined(PARI) #include "genpari.h" #endif void ox_usr1_handler(); -void asir_ox_init(); +int asir_ox_init(); +/* environement is defined in libpari.a */ +# if !( PARI_VERSION_CODE > 131588) extern jmp_buf environnement; +# endif +extern int myrank_102,nserver_102; extern int do_message; extern int ox_flushing; -extern jmp_buf ox_env; +extern JMP_BUF ox_env; extern MATHCAP my_mathcap; extern int little_endian,ox_sock_id; +extern char LastError[]; +extern LIST LastStackTrace; int ox_sock_id; int lib_ox_need_conv; -static int asir_OperandStackSize; -static Obj *asir_OperandStack; -static int asir_OperandStackPtr = -1; +void create_error(ERR *,unsigned int ,char *,LIST trace); -static void create_error(ERR *,unsigned int ,char *); -static void ox_io_init(); -static void ox_asir_init(int,char **); -static Obj asir_pop_one(); -static void asir_push_one(Obj); -static void asir_end_flush(); +int asir_OperandStackSize; +Obj *asir_OperandStack; +int asir_OperandStackPtr = -1; + +void ox_io_init(); +void ox_asir_init(int,char **,char *); +Obj asir_pop_one(); +Obj asir_peek_one(); +void asir_push_one(Obj); +void asir_end_flush(); +int asir_executeString(); +void asir_evalName(unsigned int); +void asir_setName(unsigned int); +void asir_pops(); +void asir_popString(); +void asir_popCMO(unsigned int); +void asir_popSerializedLocalObject(); +void asir_pushCMOtag(unsigned int); +void asir_set_rank_102(unsigned int); +void asir_tcp_accept_102(unsigned int); +void asir_tcp_connect_102(unsigned int); +void asir_reset_102(unsigned int serial); +void asir_bcast_102(unsigned int serial); +void asir_reduce_102(unsigned int serial); +LIST asir_GetErrorList(); +char *name_of_cmd(int); +char *name_of_id(int); + +static void asir_do_cmd(int,unsigned int); static void asir_executeFunction(int); -static int asir_executeString(); -static void asir_evalName(unsigned int); -static void asir_setName(unsigned int); -static void asir_pops(); -static void asir_popString(); -static void asir_popCMO(unsigned int); -static void asir_popSerializedLocalObject(); -static LIST asir_GetErrorList(); -static char *name_of_cmd(unsigned int); -static char *name_of_id(int); -static void asir_do_cmd(unsigned int,unsigned int); -#if MPI +#if defined(MPI) +/* XXX : currently MPI version supports only a homogeneous cluster. */ + extern int mpi_nprocs,mpi_myid; void ox_mpi_master_init() { - int i,idx,ret; + int i,idx; - for ( i = 1; i < mpi_nprocs; i++ ) { - /* client mode */ + for ( i = 0; i < mpi_nprocs; i++ ) { + /* ordering information is not exchanged */ + /* idx should be equal to i */ idx = get_iofp(i,0,0); - ret = register_server(0,idx,idx); + register_server(0,idx,idx); } } void ox_mpi_slave_init() { + int i,idx; + endian_init(); - /* server mode */ - get_iofp(0,0,1); fclose(stdin); + for ( i = 0; i < mpi_nprocs; i++ ) { + /* ordering information is not exchanged */ + /* idx should be equal to i */ + idx = get_iofp(i,0,0); + register_server(0,idx,idx); + } asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj)); asir_OperandStackPtr = -1; } #endif -static void create_error(ERR *err,unsigned int serial,char *msg) -{ - int len; - USINT ui; - NODE n,n1; - LIST list; - char *msg1; - STRING errmsg; - - MKUSINT(ui,serial); - len = strlen(msg); - msg1 = (char *)MALLOC(len+1); - strcpy(msg1,msg); - MKSTR(errmsg,msg1); - MKNODE(n1,errmsg,0); MKNODE(n,ui,n1); MKLIST(list,n); - MKERR(*err,list); -} - void ox_main(int argc,char **argv) { int id; - unsigned int cmd; + int cmd; Obj obj; - USINT ui; ERR err; - LIST list; - NODE n,n1; unsigned int serial; int ret; - extern char LastError[]; - ox_asir_init(argc,argv); + ox_asir_init(argc,argv,"ox_asir"); if ( do_message ) fprintf(stderr,"I'm an ox_asir, Version %d.\n",ASIR_VERSION); - if ( setjmp(ox_env) ) { + if ( SETJMP(ox_env) ) { while ( NEXT(asir_infile) ) closecurrentinput(); + resetpvs(); + reset_engine(); + reset_io(); ox_send_sync(0); } while ( 1 ) { @@ -132,10 +185,12 @@ void ox_main(int argc,char **argv) { break; if ( do_message ) fprintf(stderr," %s\n",name_of_cmd(cmd)); - if ( ret = setjmp(env) ) { + if ( ret = SETJMP(main_env) ) { if ( ret == 1 ) { - create_error(&err,serial,LastError); + create_error(&err,serial,LastError,LastStackTrace); asir_push_one((Obj)err); + while ( NEXT(asir_infile) ) + closecurrentinput(); } break; } @@ -160,7 +215,7 @@ void ox_main(int argc,char **argv) { } } -static void asir_do_cmd(unsigned int cmd,unsigned int serial) +static void asir_do_cmd(int cmd,unsigned int serial) { MATHCAP client_mathcap; Q q; @@ -215,13 +270,34 @@ static void asir_do_cmd(unsigned int cmd,unsigned int client_mathcap = (MATHCAP)asir_pop_one(); store_remote_mathcap(0,client_mathcap); break; + case SM_pushCMOtag: + asir_pushCMOtag(serial); + break; + case SM_set_rank_102: + asir_set_rank_102(serial); + break; + case SM_tcp_accept_102: + asir_tcp_accept_102(serial); + break; + case SM_tcp_connect_102: + asir_tcp_connect_102(serial); + break; + case SM_reset_102: + asir_reset_102(serial); + break; + case SM_bcast_102: + asir_bcast_102(serial); + break; + case SM_reduce_102: + asir_reduce_102(serial); + break; case SM_nop: default: break; } } -static char *name_of_id(int id) +char *name_of_id(int id) { switch ( id ) { case OX_COMMAND: @@ -242,7 +318,7 @@ static char *name_of_id(int id) } } -static char *name_of_cmd(unsigned cmd) +char *name_of_cmd(int cmd) { switch ( cmd ) { case SM_popSerializedLocalObject: @@ -292,13 +368,32 @@ static char *name_of_cmd(unsigned cmd) break; case SM_nop: return "SM_nop"; + case SM_pushCMOtag: + return "SM_pushCMOtag"; + case SM_set_rank_102: + return "SM_set_rank_102"; + break; + case SM_tcp_accept_102: + return "SM_tcp_accept_102"; + break; + case SM_tcp_connect_102: + return "SM_tcp_connect_102"; + case SM_reset_102: + return "SM_reset_102"; + break; + case SM_bcast_102: + return "SM_bcast_102"; + break; + case SM_reduce_102: + return "SM_reduce_102"; + break; default: return "Unknown cmd"; break; } } -static LIST asir_GetErrorList() +LIST asir_GetErrorList() { int i; NODE n,n0; @@ -315,7 +410,7 @@ static LIST asir_GetErrorList() return err; } -static void asir_popSerializedLocalObject() +void asir_popSerializedLocalObject() { Obj obj; VL t,vl; @@ -331,7 +426,7 @@ static void asir_popSerializedLocalObject() ox_send_cmd(0,SM_endBlock); } -static void asir_popCMO(unsigned int serial) +void asir_popCMO(unsigned int serial) { Obj obj; ERR err; @@ -340,36 +435,188 @@ static void asir_popCMO(unsigned int serial) if ( valid_as_cmo(obj) ) ox_send_data(0,obj); else { - create_error(&err,serial,"cannot convert to CMO object"); + create_error(&err,serial,"cannot convert to CMO object",0); ox_send_data(0,err); asir_push_one(obj); } } -static void asir_popString() +void asir_reduce_102(unsigned int serial) { + Q r; + int root; + Obj data,obj; + ERR err; + STRING op; + char *opname; + void (*func)(); + + func = 0; + op = (STRING)asir_pop_one(); + opname = BDY(op); + r = (Q)asir_pop_one(); + root = QTOS(r); + if ( !strcmp(opname,"+") ) + func = arf_add; + else if ( !strcmp(opname,"*") ) + func = arf_mul; + if ( !func ) { + create_error(&err,serial,"Invalid opration in ox_reduce_102",0); + asir_push_one(obj); + } else + ox_reduce_102(root,func); +} + +void asir_bcast_102(unsigned int serial) +{ + Q r; + int root; + Obj data; + + r = (Q)asir_pop_one(); + root = QTOS(r); + ox_bcast_102(root); +} + +void asir_reset_102(unsigned int serial) +{ + int i,j,id; + Obj obj; + + for ( i = 0; i < myrank_102; i++ ) + do { + ox_recv_102(i,&id,&obj); + } while ( id != OX_SYNC_BALL ); + for ( i = myrank_102+1; i < nserver_102; i++ ) + ox_send_sync_102(i); +} + +void asir_set_rank_102(unsigned int serial) +{ + Obj obj; + Q rank,nserver; + int n,r,stat; + NODE arg; + ERR err; + + rank = (Q)asir_pop_one(); + nserver = (Q)asir_pop_one(); + stat = 0; + if ( !nserver || !INT(nserver) || !INT(rank) ) { + stat = -1; + } else { + n = QTOS(nserver); r = QTOS(rank); + if ( n <= 0 || r < 0 || r >= n ) { + stat = -1; + } + myrank_102 = r; + nserver_102 = n; + } + if ( !stat ) return; + else { + create_error(&err,serial,"Invalid argument(s) in ox_set_rank_102",0); + asir_push_one(obj); + } +} + +void asir_tcp_accept_102(unsigned int serial) +{ + Obj obj; + Q r,p; + ERR err; + char port_str[BUFSIZ]; + int port,s,use_unix,rank; + + r = (Q)asir_pop_one(); + p = (Q)asir_pop_one(); + if ( IS_CYGWIN || !p || NUM(p) ) { + port = QTOS(p); + sprintf(port_str,"%d",port); + use_unix = 0; + } else { + strcpy(port_str,BDY((STRING)p)); + use_unix = 1; + } + s = try_bind_listen(use_unix,port_str); + s = try_accept(use_unix,s); + rank = QTOS((Q)r); + if ( register_102(s,rank,1) < 0 ) { + create_error(&err,serial, + "failed to bind or accept in ox_tcp_accept_102",0); + asir_push_one((Obj)err); + } +} + +void asir_tcp_connect_102(unsigned int serial) +{ + Obj obj; + Q r,p; + STRING h; + ERR err; + char *host; + char port_str[BUFSIZ]; + int port,s,use_unix,rank; + + r = (Q)asir_pop_one(); + p = (Q)asir_pop_one(); + h = (STRING)asir_pop_one(); + if ( IS_CYGWIN || !p || NUM(p) ) { + port = QTOS(p); + sprintf(port_str,"%d",port); + use_unix = 0; + host = BDY((STRING)h); + } else { + strcpy(port_str,BDY((STRING)p)); + use_unix = 1; + host = 0; + } + s = try_connect(use_unix,host,port_str); + rank = QTOS((Q)r); + if ( register_102(s,rank,1) < 0 ) { + create_error(&err,serial, + "failed to connect in ox_tcp_connect_102",0); + asir_push_one((Obj)err); + } +} + +void asir_pushCMOtag(unsigned int serial) +{ + Obj obj; + ERR err; + USINT ui; + int tag; + + obj = asir_peek_one(); + if ( cmo_tag(obj,&tag) ) { + MKUSINT(ui,tag); + asir_push_one((Obj)ui); + } else { + create_error(&err,serial,"cannot convert to CMO object",0); + asir_push_one((Obj)err); + } +} + +void asir_popString() +{ Obj val; - char *buf,*obuf; + char *buf; int l; STRING str; val = asir_pop_one(); if ( !val ) - obuf = 0; + buf = "0"; else { l = estimate_length(CO,val); buf = (char *)ALLOCA(l+1); soutput_init(buf); sprintexpr(CO,val); - l = strlen(buf); - obuf = (char *)MALLOC(l+1); - strcpy(obuf,buf); } - MKSTR(str,obuf); + MKSTR(str,buf); ox_send_data(0,str); } -static void asir_pops() +void asir_pops() { int n; @@ -377,7 +624,7 @@ static void asir_pops() asir_OperandStackPtr = MAX(asir_OperandStackPtr-n,-1); } -static void asir_setName(unsigned int serial) +void asir_setName(unsigned int serial) { char *name; int l,n; @@ -391,7 +638,7 @@ static void asir_setName(unsigned int serial) parse_strp = (char *)ALLOCA(n); sprintf(parse_strp,"%s%s",name,dummy); if ( mainparse(&snode) ) { - create_error(&err,serial,"cannot set to variable"); + create_error(&err,serial,"cannot set to variable",0); asir_push_one((Obj)err); } else { FA1((FNODE)FA0(snode)) = (pointer)mkfnode(1,I_FORMULA,asir_pop_one()); @@ -399,7 +646,7 @@ static void asir_setName(unsigned int serial) } } -static void asir_evalName(unsigned int serial) +void asir_evalName(unsigned int serial) { char *name; int l,n; @@ -413,27 +660,49 @@ static void asir_evalName(unsigned int serial) parse_strp = (char *)ALLOCA(n); sprintf(parse_strp,"%s;",name); if ( mainparse(&snode) ) { - create_error(&err,serial,"no such variable"); + create_error(&err,serial,"no such variable",0); val = (pointer)err; } else val = evalstat(snode); asir_push_one(val); } -static int asir_executeString() +char *augment_backslash(char *s) { + char *p,*r; + int i; + + for ( i = 0, p = s; *p; p++, i++ ) if ( *p == '\\' ) i++; + r = (char *)MALLOC_ATOMIC((i+1)*sizeof(char)); + for ( i = 0, p = s; *p; p++, i++ ) { + if ( *p == '\\' ) r[i++] = '\\'; + r[i] = *p; + } + return r; +} + +int asir_executeString() +{ SNODE snode; pointer val; char *cmd; -#if PARI +#if defined(PARI) recover(0); + /* environement is defined in libpari.a */ +# if !(PARI_VERSION_CODE > 131588 ) if ( setjmp(environnement) ) { avma = top; recover(1); resetenv(""); } +# endif #endif cmd = ((STRING)asir_pop_one())->body; +/* XXX : probably this is useless */ +#if 0 + parse_strp = augment_backslash(cmd); +#else parse_strp = cmd; +#endif if ( mainparse(&snode) ) { return -1; } @@ -458,11 +727,9 @@ static void asir_executeFunction(int serial) int argc; FUNC f; Obj result; - VL vl; NODE n,n1; STRING fname; char *path; - USINT ui; ERR err; Obj arg; static char buf[BUFSIZ]; @@ -488,6 +755,7 @@ static void asir_executeFunction(int serial) if ( n ) NEXT(n1) = 0; +#if 0 if ( !strcmp(func,"load") ) { fname = (STRING)BDY(n); if ( OID(fname) == O_STR ) { @@ -502,6 +770,7 @@ static void asir_executeFunction(int serial) } result = 0; } else { +#endif searchf(noargsysf,func,&f); if ( !f ) searchf(sysf,func,&f); @@ -515,17 +784,19 @@ static void asir_executeFunction(int serial) } else { result = (Obj)bevalf(f,n); } +#if 0 } +#endif asir_push_one(result); return; error: - create_error(&err,serial,buf); + create_error(&err,serial,buf,0); result = (Obj)err; asir_push_one(result); } -static void asir_end_flush() +void asir_end_flush() { ox_flushing = 0; } @@ -537,7 +808,7 @@ static void asir_end_flush() */ -static void asir_push_one(Obj obj) +void asir_push_one(Obj obj) { if ( !obj || OID(obj) != O_VOID ) { asir_OperandStackPtr++; @@ -551,7 +822,7 @@ static void asir_push_one(Obj obj) } } -static Obj asir_pop_one() { +Obj asir_pop_one() { if ( asir_OperandStackPtr < 0 ) { if ( do_message ) fprintf(stderr,"OperandStack underflow"); @@ -563,41 +834,54 @@ static Obj asir_pop_one() { } } -static void ox_asir_init(int argc,char **argv) +Obj asir_peek_one() { + if ( asir_OperandStackPtr < 0 ) { + if ( do_message ) + fprintf(stderr,"OperandStack underflow"); + return 0; + } else { + if ( do_message ) + fprintf(stderr,"peek at %d\n",asir_OperandStackPtr); + return asir_OperandStack[asir_OperandStackPtr]; + } +} + +void ox_asir_init(int argc,char **argv,char *servername) { - int tmp; char ifname[BUFSIZ]; extern int GC_dont_gc; - extern int read_exec_file; extern int do_asirrc; extern int do_server_in_X11; + extern char displayname[]; char *getenv(); static ox_asir_initialized = 0; FILE *ifp; char *homedir; char *ptr; + int do_server_sav; +#if !defined(VISUAL) + int tmp; +#endif -#if !defined(VISUAL) && !MPI + GC_init(); +#if !defined(VISUAL) && !defined(MPI) do_server_in_X11 = 1; /* XXX */ #endif asir_save_handler(); -#if PARI +#if defined(PARI) risa_pari_init(); #endif srandom((int)get_current_time()); -#if defined(THINK_C) - param_init(); -#endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); -#if !defined(VISUAL) && !defined(THINK_C) -/* check_key(); */ -#endif - GC_init(); + cppname_init(); process_args(--argc,++argv); +#if defined(__CYGWIN__) + if ( !displayname[0] ) + do_server_in_X11 = 0; /* XXX */ +#endif output_init(); arf_init(); nglob_init(); @@ -618,9 +902,6 @@ static void ox_asir_init(int argc,char **argv) if ( ptr = getenv("ASIR_CONFIG") ) strcpy(ifname,ptr); else { -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else homedir = getenv("HOME"); if ( !homedir ) { char rootname[BUFSIZ]; @@ -629,27 +910,49 @@ static void ox_asir_init(int argc,char **argv) homedir = rootname; } sprintf(ifname,"%s/.asirrc",homedir); -#endif } + + /* the bottom of the input stack */ + input_init(0,"string"); + if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { - input_init(ifp,ifname); - if ( !setjmp(env) ) { - read_exec_file = 1; - read_eval_loop(); - read_exec_file = 0; - } fclose(ifp); + do_server_sav = do_server_in_X11; + do_server_in_X11 = 0; + if ( !SETJMP(main_env) ) + execasirfile(ifname); + do_server_in_X11 = do_server_sav; } - input_init(0,"string"); -#if !MPI + +/* XXX Windows compatibility */ ox_io_init(); -#endif - create_my_mathcap("ox_asir"); + create_my_mathcap(servername); } -static void ox_io_init() { +void ox_io_init() { unsigned char c,rc; + extern int I_am_server; + /* XXX : ssh forwards stdin to a remote host on PC Unix */ +#if defined(linux) +#include + int i; + + close(0); + for ( i = 5; i < NOFILE; i++ ) + close(i); +#elif defined(__FreeBSD__) +#include + int i; + struct rlimit rl; + + getrlimit(RLIMIT_NOFILE,&rl); + close(0); + for ( i = 5; i < rl.rlim_cur; i++ ) + close(i); +#endif + + I_am_server = 1; endian_init(); #if defined(VISUAL) if ( !ox_sock_id ) @@ -660,8 +963,10 @@ static void ox_io_init() { iofp[0].in = fdopen(3,"r"); iofp[0].out = fdopen(4,"w"); +#if !defined(__CYGWIN__) setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ); setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ); +#endif signal(SIGUSR1,ox_usr1_handler); #endif asir_OperandStackSize = BUFSIZ; @@ -675,8 +980,11 @@ static void ox_io_init() { write_char(iofp[0].out,&c); ox_flush_stream_force(0); read_char(iofp[0].in,&rc); iofp[0].conv = c == rc ? 0 : 1; + /* XXX; for raw I/O */ + register_server(0,0,0); } +#if !defined(VISUAL) /* * Library mode functions */ @@ -697,7 +1005,7 @@ void asir_ox_push_cmo(void *cmo) /* * Pop an object from the stack and converts it - * int a binary encoded CMO. + * into a binary encoded CMO. */ int asir_ox_pop_cmo(void *cmo, int limit) @@ -709,7 +1017,7 @@ int asir_ox_pop_cmo(void *cmo, int limit) obj = asir_pop_one(); if ( !valid_as_cmo(obj) ) { asir_push_one(obj); - create_error(&err,0,"The object at the stack top is invalid as a CMO."); + create_error(&err,0,"The object at the stack top is invalid as a CMO.",0); obj = (Obj)err; } len = count_as_cmo(obj); @@ -721,23 +1029,52 @@ int asir_ox_pop_cmo(void *cmo, int limit) return -1; } +int asir_ox_pop_string(void *string, int limit) +{ + Obj val; + int l; + + val = asir_pop_one(); + if ( !val ) { + if ( limit >= 2 ) { + sprintf(string,"0"); + l = strlen(string); + } else + l = -1; + } else { + l = estimate_length(CO,val); + if ( l+1 <= limit ) { + soutput_init(string); + sprintexpr(CO,val); + l = strlen(string); + } else + l = -1; + } + return l; +} + /* * Executes an SM command. */ -void asir_ox_push_cmd(unsigned int cmd) +void asir_ox_push_cmd(int cmd) { int ret; ERR err; extern char LastError[]; - if ( ret = setjmp(env) ) { + if ( ret = SETJMP(main_env) ) { + asir_reset_handler(); if ( ret == 1 ) { - create_error(&err,0,LastError); /* XXX */ + create_error(&err,0,LastError,LastStackTrace); /* XXX */ asir_push_one((Obj)err); } - } else + } else { + asir_save_handler(); + asir_set_handler(); asir_do_cmd(cmd,0); + asir_reset_handler(); + } } /* @@ -753,13 +1090,18 @@ void asir_ox_execute_string(char *s) MKSTR(str,s); asir_push_one((Obj)str); - if ( ret = setjmp(env) ) { + if ( ret = SETJMP(main_env) ) { + asir_reset_handler(); if ( ret == 1 ) { - create_error(&err,0,LastError); /* XXX */ + create_error(&err,0,LastError,LastStackTrace); /* XXX */ asir_push_one((Obj)err); } - } else + } else { + asir_save_handler(); + asir_set_handler(); asir_executeString(); + asir_reset_handler(); + } } /* @@ -772,8 +1114,7 @@ int asir_ox_peek_cmo_size() Obj obj; int len; - obj = asir_pop_one(); - asir_push_one(obj); + obj = asir_peek_one(); if ( !valid_as_cmo(obj) ) { fprintf(stderr,"The object at the stack top is invalid as a CMO.\n"); return 0; @@ -782,44 +1123,50 @@ int asir_ox_peek_cmo_size() return len; } +int asir_ox_peek_cmo_string_length() +{ + Obj obj; + int len; + + obj = asir_peek_one(); + if ( !valid_as_cmo(obj) ) { + fprintf(stderr,"The object at the stack top is invalid as a CMO.\n"); + return 0; + } + len = estimate_length(CO,obj); + return len+1; +} + /* * Initialization. * byteorder=0 => native * =1 => network byte order */ -void asir_ox_init(int byteorder) +int asir_ox_init(int byteorder) { int tmp; char ifname[BUFSIZ]; extern int GC_dont_gc; - extern int read_exec_file; extern int do_asirrc; extern int do_server_in_X11; char *getenv(); static ox_asir_initialized = 0; FILE *ifp; -#if !defined(VISUAL) && !MPI + GC_init(); +#if !defined(VISUAL) && !defined(MPI) do_server_in_X11 = 0; /* XXX */ #endif asir_save_handler(); -#if PARI +#if defined(PARI) risa_pari_init(); #endif srandom((int)get_current_time()); -#if defined(THINK_C) - param_init(); -#endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); -#if !defined(VISUAL) && !defined(THINK_C) -/* check_key(); */ -#endif - GC_init(); /* process_args(argc,argv); */ output_init(); arf_init(); @@ -837,21 +1184,13 @@ void asir_ox_init(int byteorder) #if defined(UINIT) reg_sysf(); #endif -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else + input_init(0,"string"); sprintf(ifname,"%s/.asirrc",getenv("HOME")); -#endif if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { - input_init(ifp,ifname); - if ( !setjmp(env) ) { - read_exec_file = 1; - read_eval_loop(); - read_exec_file = 0; - } fclose(ifp); + if ( !SETJMP(main_env) ) + execasirfile(ifname); } - input_init(0,"string"); asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj)); @@ -862,4 +1201,7 @@ void asir_ox_init(int byteorder) lib_ox_need_conv = 0; do_message = 0; create_my_mathcap("ox_asir"); + asir_reset_handler(); + return 0; } +#endif