--- freem/src/xecline.c 2025/03/24 04:13:12 1.9 +++ freem/src/xecline.c 2025/04/30 17:19:16 1.20 @@ -1,5 +1,5 @@ /* - * $Id: xecline.c,v 1.9 2025/03/24 04:13:12 snw Exp $ + * $Id: xecline.c,v 1.20 2025/04/30 17:19:16 snw Exp $ * freem interpreter proper * * @@ -24,6 +24,39 @@ * along with FreeM. If not, see . * * $Log: xecline.c,v $ + * Revision 1.20 2025/04/30 17:19:16 snw + * Improve backtraces in debugger + * + * Revision 1.19 2025/04/30 14:41:03 snw + * Further debugger work + * + * Revision 1.18 2025/04/29 18:46:17 snw + * Begin work on interactive debugger + * + * Revision 1.17 2025/04/28 19:38:55 snw + * Add trace mode + * + * Revision 1.16 2025/04/28 14:52:54 snw + * Temporarily revert global handler refactor and fix reference regression in xecline + * + * Revision 1.15 2025/04/15 16:49:36 snw + * Make use of logprintf throughout codebase + * + * Revision 1.14 2025/04/13 04:22:43 snw + * Fix snprintf calls + * + * Revision 1.13 2025/04/10 01:24:39 snw + * Remove C++ style comments + * + * Revision 1.12 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * + * Revision 1.11 2025/04/02 03:02:42 snw + * Stop requiring users to pass -e to fmadm when -u or -g are passed + * + * Revision 1.10 2025/03/27 03:27:35 snw + * Install init scripts to share/freem/examples/init and fix regression in method dispatch + * * Revision 1.9 2025/03/24 04:13:12 snw * Replace action macro dat with fra_dat to avoid symbol conflict on OS/2 * @@ -144,13 +177,14 @@ int xecline(int typ) short new_and_set = FALSE; short new_object = FALSE; short destructor_run = FALSE; - short debug_mode = FALSE; short libcall = FALSE; char *namold; long rouoldc; unsigned long jobtime; char label[256], routine[256]; + char tracestr[512]; + char *vn; char *an; char *tmp; @@ -214,6 +248,9 @@ int xecline(int typ) next_line: /* entry point for next command line */ + if (debug_mode) { + debug_mode = debugger (DEBENTRY_LINE, codptr); + } job_set_status (pid, JSTAT_INTERPRETER); @@ -262,6 +299,10 @@ next_line: /* entry point for n codptr = code; next_cmnd: /* continue line entry point */ + if (debug_mode) { + debug_mode = debugger (DEBENTRY_CMD, codptr); + } + if (sigint_in_for) goto for_quit; if (forsw && (forpost[forx][0] != '\0')) { @@ -519,14 +560,14 @@ next0: else if (tmp2[0] == '<') { /* call write output to %-array */ FILE *pipdes; - char key[STRLEN + 1 /*was 256 */ ]; - char data[STRLEN + 1 /*was 256 */ ]; + char key[STRLEN]; + char data[STRLEN]; char data_kill[256]; data_kill[255] = EOL; - for (i = 0; i < STRLEN + 1; i++) vn[i] = EOL; + for (i = 0; i < STRLEN - 1; i++) vn[i] = EOL; - snprintf (key, 255, "^$JOB\202%d\202PIPE_GLVN\201", pid); + snprintf (key, STRLEN - 1, "^$JOB\202%d\202PIPE_GLVN\201", pid); ssvn (get_sym, key, vn); if (vn[0] == '^') { @@ -544,7 +585,7 @@ next0: symtab (kill_sym, vn, data); } - snprintf (key, 255, "^$JOB\202%d\202PIPE_GLVN\201", pid); + snprintf (key, STRLEN - 1, "^$JOB\202%d\202PIPE_GLVN\201", pid); ssvn (get_sym, key, vn); data[0] = '0'; @@ -573,7 +614,7 @@ next0: int glvn_len = 0; while (fgets (data, STRLEN, pipdes)) { - snprintf (key, 255, "^$JOB\202%d\202PIPE_GLVN\201", pid); + snprintf (key, STRLEN - 1, "^$JOB\202%d\202PIPE_GLVN\201", pid); ssvn (get_sym, key, vn); glvn_len = stlen (vn); @@ -634,7 +675,7 @@ next0: for (i = 0; i < STRLEN + 1; i++) vn[i] = EOL; - snprintf (key, 255, "^$JOB\202%d\202PIPE_GLVN\201", pid); + snprintf (key, STRLEN - 1, "^$JOB\202%d\202PIPE_GLVN\201", pid); ssvn (get_sym, key, vn); if (vn[0] == '^') { @@ -663,7 +704,7 @@ next0: int glvn_len = 0; for (i = 1; i <= k; i++) { - snprintf (key, 255, "^$JOB\202%d\202PIPE_GLVN\201", pid); + snprintf (key, STRLEN - 1, "^$JOB\202%d\202PIPE_GLVN\201", pid); ssvn (get_sym, key, vn); glvn_len = stlen (vn); @@ -833,6 +874,8 @@ again: } } + if (trace_mode) tracestr[0] = '\0'; + switch (mcmnd) { case MAP: @@ -898,8 +941,7 @@ set0: if (isalpha (vn[0]) && *(codptr + 1) == ':') { char sc_string[255]; - register int sci; - + codptr += 2; expr (NAME); @@ -935,8 +977,7 @@ set0: if (*++codptr != '=') { -/* SET A++ or SET A-- equivalent to SET A+=1 SET A-=1 currently disabled */ -//#ifdef NEVER + /* unary ++/-- */ if ((ch == '+' || ch == '-') && ch == *codptr) { codptr++; setop = ch; @@ -945,7 +986,6 @@ set0: goto set2; } -//#endif /* NEVER */ merr_raise (ASSIGNER); break; @@ -958,10 +998,15 @@ set0: ch = *codptr; - if (ch == '.') { - setref = TRUE; - codptr++; - expr (NAME); + if (ch == '.') { + if (!isdigit (*(codptr + 1))) { + setref = TRUE; + codptr++; + expr (NAME); + } + else { + expr (STRING); + } } else { expr (STRING); @@ -1031,7 +1076,9 @@ set2: if (new_and_set == TRUE) new_and_set = FALSE; if (new_object == TRUE) new_object = FALSE; +/* set1: +*/ if (*codptr != ',') break; if (*++codptr == '@') goto again; @@ -1595,7 +1642,7 @@ set10: } if (stcat (tmp2, &tmp3[arg4]) == 0) { - merr_raise (M56); //JPW + merr_raise (M56); /* snw */ goto err; } @@ -2342,6 +2389,10 @@ s_end: case QUIT: + if (trace_mode) { + fprintf (stderr, ">> TRACE: $STACK = %d QUIT CMD = %c\r\n", nstx, nestc[nstx]); + } + if (tp_level > 0) { merr_raise (M42); goto err; @@ -2371,10 +2422,13 @@ s_end: if (nestc[nstx] == '$') { /* extrinsic function/variable */ + if (trace_mode) { + fprintf (stderr, ">> TRACE: QUIT FROM EXTRINSIC\r\n"); + } + #ifdef DEBUG_NEWSTACK printf ("EXTRINSIC\r\n"); #endif - //printf (" extr_types[%d] = '%d'\r\n", nstx, extr_types[nstx]); if (*codptr == EOL || *codptr == SP) { #ifdef DEBUG_NEWSTACK @@ -2401,6 +2455,10 @@ s_end: else { expr (STRING); + + if (trace_mode) { + fprintf (stderr, ">> TRACE: QUIT FROM SUBROUTINE\r\n"); + } if (ierr != OK - CTRLB && merr () != OK && merr () != INRPT) { @@ -2567,7 +2625,6 @@ quit0: printf ("CHECK 03 (Stack PUSH)\r\n"); #endif - if (++nstx > NESTLEVLS) { nstx--; merr_raise (STKOV); @@ -2593,7 +2650,7 @@ quit0: nestn[nstx] = 0; /* no overring of routine */ nestr[nstx] = roucur - rouptr; /* save roucur: only for $V(26) needed */ ztrap[nstx][0] = EOL; - + forsw = TRUE; ftyp = 0; /* no args is FOREVER */ @@ -3037,6 +3094,21 @@ do_xecute: do_goto: + if (trace_mode) { + char rn[256]; + stcpy (rn, rou_name); + stcnv_m2c (rn); + + switch (mcmnd) { + case DO: + snprintf (tracestr, sizeof (tracestr) - 1, "rtn = %s $stack = %d do ", rn, nstx); + break; + case GOTO: + snprintf (tracestr, sizeof (tracestr) - 1, "rtn = %s $stack = %d goto ", rn, nstx); + break; + } + } + offset = 0; label[0] = routine[0] = EOL; dofram0 = 0; @@ -3071,6 +3143,14 @@ do_goto: stcpy (label, varnam); + if (trace_mode) { + char ttt[256]; + stcpy (ttt, label); + stcnv_m2c (ttt); + + strcat (tracestr, ttt); + } + ch = *++codptr; } @@ -3086,7 +3166,12 @@ do_goto: /* unless argument is numeric, expr returns wrong codptr */ if ((ch = *codptr) != SP && (ch != EOL) && (ch != ',') && (ch != '^')) ch = *++codptr; - + + if (trace_mode) { + char ttt[256]; + snprintf (ttt, 255, "+%d", offset); + strcat (tracestr, ttt); + } } if (ch == '^') { /* parse routine */ @@ -3096,12 +3181,26 @@ do_goto: if (merr () > OK) goto err; stcpy (routine, varnam); + + if (trace_mode) { + char ttt[256]; + char ttx[256]; + + stcpy (ttt, routine); + stcnv_m2c (ttt); + snprintf (ttx, 255, "^%s", ttt); + strcat (tracestr, ttx); + } dosave[0] = EOL; ch = *++codptr; loadsw = TRUE; } + if (trace_mode) { + fprintf (stderr, ">> TRACE: %s\r\n", tracestr); + } + if (ch == '(' && mcmnd == DO) { /* parse parameter */ if (offset) { @@ -3760,7 +3859,7 @@ off3: break; case KILL: - + /* argumentless: KILL all local variables */ if (((ch = *codptr) == SP) || ch == EOL) { symtab (kill_all, "", ""); @@ -3794,8 +3893,10 @@ off3: if (destructor_ct) { for (cd = 0; cd < destructor_ct; cd++) { - strcat (destc, destructors[cd]); - strcat (destc, ","); + if (strlen (destructors[cd]) > 0) { + strcat (destc, destructors[cd]); + strcat (destc, ","); + } } destructor_ct = 0; @@ -3977,6 +4078,7 @@ off3: if (merr () > OK) goto err; + /* TODO: check this snprintf for proper sizing */ snprintf (&tmp3[1], 255, "%s\201", &constructor[1]); goto private; @@ -3997,8 +4099,9 @@ off3: goto set2; } +/* post_new: - +*/ ch = nstx; while (nestc[ch] == FOR) ch--; /* FOR does not define a NEW level */ @@ -5054,24 +5157,37 @@ open_socket: expr (STRING); if (merr () > OK) break; - switch (intexpr (argptr)) { - - case 2: - DSM2err = TRUE; - break; /* enable DSM V 2 error processing */ - - case -2: - DSM2err = FALSE; - break; /* enable normal error processing */ - - case 0: - breakon = FALSE; - break; /* disable CTRL/C */ - - default: - breakon = TRUE; - break; /* enable CTRL/C */ + { + char brkstr[256]; + + stcpy (brkstr, argptr); + stcnv_m2c (brkstr); + + if (strcmp (brkstr, "DEBUG") == 0) { + debug_mode = TRUE; + } + else { + switch (intexpr (argptr)) { + + case 2: + DSM2err = TRUE; + break; /* enable DSM V 2 error processing */ + + case -2: + DSM2err = FALSE; + break; /* enable normal error processing */ + + case 0: + breakon = FALSE; + break; /* disable CTRL/C */ + + default: + breakon = TRUE; + break; /* enable CTRL/C */ + } + } } + break; case VIEW: @@ -5087,15 +5203,11 @@ open_socket: #endif if (nestc[nstx] == BREAK) { -// printf ("nestc[nstx] was BREAK\r\n"); if (repQUIT) continue; merr_raise (OK - CTRLB); goto zgo; /*cont. single step */ } -// else { -// printf ("nestc[nstx] was _not_ BREAK\r\n"); -// } if (nestc[nstx] == FOR) { @@ -5671,9 +5783,6 @@ zgo: } case ZWRITE: - - -zwrite: { short k; char w_tmp[512]; @@ -5797,7 +5906,6 @@ zwritep: expr (NAME); - //if (varnam[0] == '^') merr_raise (GLOBER); if (merr () > OK) goto err; codptr++; @@ -6039,62 +6147,7 @@ zwritep: break; - case ZALLOCATE: - - /* argumentless is not permitted */ - if (*codptr == SP || *codptr == EOL) { - merr_raise (ARGLIST); - break; - } - - expr (NAME); - - if (merr () > OK) goto err; - - tmp[0] = SP; - stcpy (&tmp[1], varnam); - stcat (tmp, "\001\201"); - - frm_timeout = (-1L); /* no timeout */ - - if (*++codptr == ':') { - codptr++; - - expr (STRING); - - frm_timeout = intexpr (argptr); - - if (merr () > OK) goto err; - if (frm_timeout < 0L) frm_timeout = 0L; - } - - lock (tmp, frm_timeout, ZALLOCATE); - break; - - - case ZDEALLOCATE: - - tmp[0] = SP; - - if (*codptr == SP || *codptr == EOL) { - tmp[1] = EOL; - } - else { - expr (NAME); - - if (merr () > OK) goto err; - - stcpy (&tmp[1], varnam); - - codptr++; - } - - lock (tmp, -1L, ZDEALLOCATE); /* -1: no timeout */ - break; - - /* user defined Z-COMMAND */ - - + /* user defined Z-COMMAND */ case PRIVATE: private: /* for in-MUMPS defined commands */ @@ -6633,15 +6686,15 @@ evthandler: /* for event hand /* run the next iteration of GTK's event loop */ - //TODO: replace with libXt event loop - //gtk_main_iteration_do (TRUE); + /* TODO: replace with libXt event loop */ + /* gtk_main_iteration_do (TRUE); */ /* dequeue any events */ evt_count = mwapi_dequeue_events (syn_handlers); if (evt_count) { /* write them out */ - //printf ("event handlers = '%s'\r\n", syn_handlers); + /* printf ("event handlers = '%s'\r\n", syn_handlers); */ syn_event_entry_nstx = nstx; @@ -6699,8 +6752,7 @@ syn_evt_loop_bottom: if (ch != ',' && merr () == OK) { merr_raise (SPACER); } - else if ((ierr <= OK) || (debug_mode == TRUE)) { - if (debug_mode) goto direct_mode; + else if (ierr <= OK) { if (*++codptr != SP && *codptr != EOL) goto again; merr_raise (ARGLIST); @@ -6742,6 +6794,7 @@ err: } } + if (merr () > OK ) { char er_buf[ERRLEN]; @@ -6751,8 +6804,17 @@ err: stcpy (er_buf, errmes[merr ()]); stcnv_m2c (er_buf); + + /* + if (usermode == 1 && ztrap[nstx][0] == EOL && etrap[0] == '\0') { + debug_mode = TRUE; + debugger (DEBENTRY_ERROR, codptr); + } + */ + + #if !defined(MSDOS) - m_log (LOG_ERR, er_buf); + logprintf (FM_LOG_DEBUG, "xecline: interpreter error %d [%s]", ierr, er_buf); #endif } @@ -7086,7 +7148,7 @@ restart: DSW &= ~BIT0; /* enable ECHO */ - // print here + /* print here */ { char *t_rtn; char *t_nsn = (char *) malloc (STRLEN * sizeof (char)); @@ -7123,6 +7185,7 @@ restart: free (t_nsn); + } @@ -7184,9 +7247,6 @@ restore: goto next_cmnd; } - else { - if (debug_mode) goto direct_mode; - } if (libcall == TRUE) { /* library mode: don't go to direct mode, just return */ return merr (); @@ -7217,10 +7277,10 @@ direct_mode: if (quiet_mode == FALSE) { if (tp_level == 0) { - snprintf (fmrl_prompt, 255, "\r\n%s.%s> ", shm_env, nsname); + snprintf (fmrl_prompt, sizeof (fmrl_prompt) - 1, "\r\n%s.%s> ", shm_env, nsname); } else { - snprintf (fmrl_prompt, 255, "\r\nTL%d:%s.%s> ", tp_level, shm_env, nsname); + snprintf (fmrl_prompt, sizeof (fmrl_prompt) - 1 , "\r\nTL%d:%s.%s> ", tp_level, shm_env, nsname); } } set_io (UNIX); @@ -7245,10 +7305,10 @@ direct_mode: if (fmrl_buf[0] == '?') { char kb[20]; - char db[255]; + char db[STRLEN]; - snprintf (kb, 19, "%%SYS.HLP\201"); - snprintf (db, 19, "\201"); + snprintf (kb, sizeof (kb) - 1, "%%SYS.HLP\201"); + snprintf (db, STRLEN - 1, "\201"); symtab (kill_sym, kb, db); @@ -7258,18 +7318,11 @@ direct_mode: stcpy (code, "DO ^%ZHELP\201"); if (strlen (fmrl_buf) > 1) { - snprintf (db, 254, "%s\201", &fmrl_buf[1]); + snprintf (db, STRLEN - 1, "%s\201", &fmrl_buf[1]); symtab (set_sym, kb, db); } } - else if (strcmp (fmrl_buf, "step") == 0) { - debug_mode = TRUE; - goto zgo; - } - else if ((strcmp (fmrl_buf, "cont") == 0) || (strcmp (fmrl_buf, "continue") == 0)) { - debug_mode = FALSE; - } else if (strcmp (fmrl_buf, "rbuf") == 0) { rbuf_dump (); } @@ -7327,7 +7380,7 @@ direct_mode: } else if (isdigit(fmrl_buf[0]) || (fmrl_buf[0] == '(') || (fmrl_buf[0] == '-') || (fmrl_buf[0] == '\'') || (fmrl_buf[0] == '+') || (fmrl_buf[0] == '$') || (fmrl_buf[0] == '^')) { - snprintf (code, 255, "W %s", fmrl_buf); + snprintf (code, STRLEN - 1, "W %s", fmrl_buf); stcnv_c2m (code); set_io (MUMPS); @@ -7409,10 +7462,10 @@ direct_mode: char fmrl_prompt[256]; if (tp_level == 0) { - snprintf (fmrl_prompt, 256, "\r\n%s> \201", nsname); + snprintf (fmrl_prompt, sizeof (fmrl_prompt) - 1, "\r\n%s> \201", nsname); } else { - snprintf (fmrl_prompt, 256, "\r\nTL%d:%s> \201", tp_level, nsname); + snprintf (fmrl_prompt, sizeof (fmrl_prompt) - 1, "\r\nTL%d:%s> \201", tp_level, nsname); } write_m (fmrl_prompt); @@ -7424,17 +7477,12 @@ direct_mode: #endif if (merr () > OK) goto err; - - - // printf ("zbflag = %d\r\n", zbflag); if (code[0] == EOL && zbflag && nestc[nstx] == BREAK) { - //printf ("cont single step\r\n"); debug_mode = TRUE; merr_raise (OK - CTRLB); - //printf ("ierr now '%d'\r\n", ierr); goto zgo; } /* single step */ } @@ -7500,7 +7548,7 @@ void rbuf_dump(void) for (i = 0; i < NO_OF_RBUF; i++) { - sprintf (flgs, ""); + flgs[0] = '\0'; if (ages[i] == 0) { sprintf (rnam, "---------");