=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v retrieving revision 1.5 retrieving revision 1.11 diff -u -p -r1.5 -r1.11 --- OpenXM_contrib2/asir2000/parse/debug.c 2000/08/22 05:04:26 1.5 +++ OpenXM_contrib2/asir2000/parse/debug.c 2001/12/25 02:39:06 1.11 @@ -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/parse/debug.c,v 1.4 2000/08/21 08:31:46 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/debug.c,v 1.10 2001/10/09 01:36:23 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -54,24 +54,6 @@ #include "genpari.h" #endif -void show_stack(VS); -void change_stack(int,NODE *); -void showpos(void); -void printvars(char *,VS); -void println(int,char **,int); -void bp(SNODE); -void searchsn(SNODE *,int,SNODE **); -void showbp(int); -void showbps(void); -void delbp(int,char **); -int searchbp(void); -void clearbp(FUNC); -void settp(char *); -void setbp(char *); -void setf(int,char **); -void show_alias(char *); -void add_alias(char *,char *); - extern do_server_in_X11,do_file; typedef enum { @@ -96,7 +78,7 @@ static int curline = 1; extern NODE PVSS; extern unsigned int evalstatline; extern int debug_mode; -extern jmp_buf debug_env; +extern JMP_BUF debug_env; char *debcom[] = { "next", @@ -153,16 +135,12 @@ void debug_init() { for ( n = 0; dckwd[n].id != D_UNKNOWN; n++ ); for ( i = 0; i < n; i++ ) MKNODE(dckwd[i].names,debcom[i],0); -#if defined(THINK_C) - strcpy(buf,"dbxinit"); -#else home = (char *)getenv("HOME"); if ( home ) strcpy(buf,home); else buf[0] = 0; strcat(buf,"/.dbxinit"); -#endif if ( (fp = fopen(".dbxinit","r")) || (fp = fopen(buf,"r")) ) { while ( fgets(buf,BUFSIZ,fp) ) { stoarg(buf,&ac,av); @@ -171,14 +149,15 @@ void debug_init() { } fclose(fp); } +#if 0 #if !defined(VISUAL) if ( do_server_in_X11 ) init_cmdwin(); #endif +#endif } -void add_alias(com,alias) -char *com,*alias; +void add_alias(char *com,char *alias) { int i; NODE tn; @@ -193,8 +172,7 @@ char *com,*alias; } } -void show_alias(alias) -char *alias; +void show_alias(char *alias) { int i; NODE tn; @@ -219,8 +197,7 @@ char *alias; } } -void debug(f) -SNODE f; +void debug(SNODE f) { int ac,i,n; did id; @@ -232,8 +209,11 @@ SNODE f; char buf[BUFSIZ]; char prompt[BUFSIZ]; char *p,*pe; +#if !defined(VISUAL) + char *line; +#endif NODE tn; - extern int kernelmode,do_fep; + extern int do_fep; NODE pvss; #if !MPI && !defined(VISUAL) @@ -243,7 +223,7 @@ SNODE f; else return; #endif -#if defined(VISUAL) || defined(THINK_C) +#if defined(VISUAL) suspend_timer(); #endif pvss = PVSS; debug_mode = 1; @@ -251,15 +231,22 @@ SNODE f; if ( do_server_in_X11 ) #endif show_debug_window(1); - sprintf(prompt,"(debug)%c",kernelmode?0xfe:' '); - if ( kernelmode ) - fputc('\0',stderr); - setjmp(debug_env); + sprintf(prompt,"(debug) "); + SETJMP(debug_env); while ( 1 ) { - if ( !do_server_in_X11 ) - fputs(prompt,stderr); +#if FEP + if ( !do_fep ) +#endif + if ( !do_server_in_X11 ) + fputs(prompt,stderr); bzero(buf,BUFSIZ); while ( 1 ) { +#if FEP + if ( do_fep ) { + line = (char *)readline_console(prompt); + strcpy(buf,line); free(line); + } else +#endif { int len; @@ -355,21 +342,14 @@ SNODE f; } } LAST: - if ( kernelmode ) - fputc('\0',stderr); debug_mode = 0; -#if defined(THINK_C) - show_debug_window(0); - resume_timer(); -#elif !defined(VISUAL) +#if !defined(VISUAL) if ( do_server_in_X11 ) #endif show_debug_window(0); } -void setf(ac,av) -int ac; -char **av; +void setf(int ac,char **av) { FUNC r; @@ -394,8 +374,7 @@ static struct { static int bpindex = 0; -void setbp(p) -char *p; +void setbp(char *p) { int ac; char *av[BUFSIZ]; @@ -477,8 +456,7 @@ char *p; } } -void settp(p) -char *p; +void settp(char *p) { int ac; char *_av[BUFSIZ]; @@ -563,8 +541,7 @@ char *p; } } -void clearbp(f) -FUNC f; +void clearbp(FUNC f) { int i; @@ -589,9 +566,7 @@ int searchbp() return bpindex++; } -void delbp(ac,av) -int ac; -char **av; +void delbp(int ac,char **av) { int n; @@ -612,8 +587,7 @@ void showbps() { showbp(i); } -void showbp(n) -int n; +void showbp(int n) { if ( bpt[n].snp ) if ( bpt[n].texpr ) @@ -648,10 +622,7 @@ int n; } } -void searchsn(fp,n,fpp) -SNODE *fp; -int n; -SNODE **fpp; +void searchsn(SNODE *fp,int n,SNODE **fpp) { NODE tn; SNODE sn; @@ -708,8 +679,7 @@ SNODE **fpp; } } -void bp(f) -SNODE f; +void bp(SNODE f) { int ln; @@ -736,19 +706,13 @@ SNODE f; debug(f); } -void println(ac,av,l) -int ac; -char **av; -int l; +void println(int ac,char **av,int l) { FILE *fp; char buf[BUFSIZ+1]; int i; int ln; FUNC r; -#if defined(THINK_C) - void setDir(short); -#endif if ( !ac ) ln = curline; @@ -766,13 +730,7 @@ int l; } if ( !targetf ) return; -#if defined(THINK_C) - setDir(targetf->f.usrf->vol); -#endif fp = fopen(targetf->f.usrf->fname,"r"); -#if defined(THINK_C) - resetDir(); -#endif if ( !fp ) { fprintf(stderr,"\"%s\" not found\n",targetf->name); return; @@ -789,9 +747,7 @@ int l; fclose(fp); } -void printvars(s,vs) -char *s; -VS vs; +void printvars(char *s,VS vs) { FNODE expr; char *p; @@ -805,7 +761,7 @@ VS vs; } if ( exprparse(vs==GPVS?0:vs->usrf,s,&expr) ) { cpvs = CPVS; CPVS = vs; - if ( !(err = setjmp(debug_env)) ) + if ( !(err = SETJMP(debug_env)) ) val = eval(expr); CPVS = cpvs; if ( !err ) { @@ -859,8 +815,7 @@ void showpos() } } -void showpos_to_string(buf) -char *buf; +void showpos_to_string(char *buf) { NODE n; VS vs; @@ -882,9 +837,7 @@ char *buf; } } -void change_stack(level,pvss) -int level; -NODE *pvss; +void change_stack(int level,NODE *pvss) { extern NODE PVSS; NODE n; @@ -904,8 +857,7 @@ NODE *pvss; targetf = vs->usrf; curline = vs->at; } -void show_stack(vs) -VS vs; +void show_stack(VS vs) { fprintf(stderr,"#%d %s(), line %d in \"%s\"\n", ((VS)BDY(PVSS))->level-vs->level,vs->usrf->name,vs->at,vs->usrf->f.usrf->fname);