--- freem/src/xecline.c 2025/04/13 04:22:43 1.14 +++ freem/src/xecline.c 2025/05/20 18:07:41 1.31 @@ -1,5 +1,5 @@ /* - * $Id: xecline.c,v 1.14 2025/04/13 04:22:43 snw Exp $ + * $Id: xecline.c,v 1.31 2025/05/20 18:07:41 snw Exp $ * freem interpreter proper * * @@ -24,6 +24,57 @@ * along with FreeM. If not, see . * * $Log: xecline.c,v $ + * Revision 1.31 2025/05/20 18:07:41 snw + * Add completion to debugger + * + * Revision 1.30 2025/05/20 16:20:42 snw + * Update ROUTINE SSVN after ZEDIT and ZSAVE + * + * Revision 1.29 2025/05/20 14:56:56 snw + * Fix direct-mode interface to online help + * + * Revision 1.28 2025/05/20 14:36:06 snw + * Documentation updates; raise ZCMMND instead of NOSTAND for restricted_mode restrictions + * + * Revision 1.27 2025/05/19 21:29:29 snw + * Add basic tab completion to direct mode + * + * Revision 1.26 2025/05/19 02:03:31 snw + * Reverse-engineer and document argumented ZPRINT (thanks to D. Wicksell) + * + * Revision 1.25 2025/05/18 18:15:38 snw + * Add ZEDIT command for editing routines + * + * Revision 1.24 2025/05/14 12:22:04 snw + * Further work on shared memory + * + * Revision 1.23 2025/05/06 16:10:06 snw + * Add extra blank before readline call on NetBSD + * + * Revision 1.22 2025/05/05 14:53:17 snw + * Modify rpm spec to include documentation TODO + * + * Revision 1.21 2025/05/01 17:02:30 snw + * Further debugging improvements + * + * 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 * @@ -147,6 +198,162 @@ void rbuf_dump(void); short rbuf_slot_from_name(char *); short is_standard(void); +#ifdef HAVE_LIBREADLINE +char *m_commands[] = { + "?", + "@", + "!<", + "!>", + "!!", + "ablock", + "astart", + "astop", + "aunblock", + "break", + "close", + "do", + "else", + "events", + "for", + "goto", + "halt", + "hang", + "history", + "if", + "job", + "jobtab", + "kill", + "ksubscripts", + "kvalue", + "lock", + "locktab", + "merge", + "new", + "open", + "quit", + "rbuf", + "rcl", + "read", + "set", + "shmpages", + "shmstat", + "tcommit", + "then", + "trantab", + "trollback", + "tstart", + "use", + "view", + "wh", + "write", + "xecute", + "zassert", + "zbreak", + "zconst", + "zedit", + "zgoto", + "zhalt", + "zinsert", + "zjob", + "zload", + "zmap", + "znew", + "zprint", + "zquit", + "zremove", + "zsave", + "zthrow", + "ztrap", + "zunmap", + "zwatch", + "zwith", + "zwrite", + "ABLOCK", + "ASTART", + "ASTOP", + "AUNBLOCK", + "BREAK", + "CLOSE", + "DO", + "ELSE", + "FOR", + "GOTO", + "HALT", + "HANG", + "IF", + "JOB", + "KILL", + "KSUBSCRIPTS", + "KVALUE", + "LOCK", + "MERGE", + "NEW", + "OPEN", + "QUIT", + "READ", + "SET", + "TCOMMIT", + "THEN", + "TROLLBACK", + "TSTART", + "USE", + "VIEW", + "WRITE", + "XECUTE", + "ZASSERT", + "ZBREAK", + "ZCONST", + "ZEDIT", + "ZGOTO", + "ZHALT", + "ZINSERT", + "ZJOB", + "ZLOAD", + "ZMAP", + "ZNEW", + "ZPRINT", + "ZQUIT", + "ZREMOVE", + "ZSAVE", + "ZTHROW", + "ZTRAP", + "ZUNMAP", + "ZWATCH", + "ZWITH", + "ZWRITE", + NULL +}; + +char **command_completion(const char *, int, int); +char *command_generator(const char *, int); + +char **command_completion(const char *text, int start, int end) +{ + if (start > 0) return NULL; + rl_attempted_completion_over = 1; + return rl_completion_matches (text, command_generator); +} + +char *command_generator(const char *text, int state) +{ + static int list_index, len; + char *name; + + if (!state) { + list_index = 0; + len = strlen (text); + } + + while ((name = m_commands[list_index++])) { + if (strncmp (name, text, len) == 0) { + return strdup (name); + } + } + + return NULL; +} +#endif + /* * xecline(): * typ (where to go on function entry): 1 = restart @@ -159,13 +366,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; @@ -180,6 +388,7 @@ int xecline(int typ) char *reeval_codptr; char reeval_code[512]; + char entryref[256]; int i; int j; @@ -229,7 +438,10 @@ int xecline(int typ) next_line: /* entry point for next command line */ - + if (debug_mode) { + debug_mode = debugger (DEBENTRY_LINE, entryref); + } + job_set_status (pid, JSTAT_INTERPRETER); if (then_ctr > 0) { @@ -277,6 +489,11 @@ next_line: /* entry point for n codptr = code; next_cmnd: /* continue line entry point */ + getraddress (entryref, nstx); + if (debug_mode) { + debug_mode = debugger (DEBENTRY_CMD, entryref); + } + if (sigint_in_for) goto for_quit; if (forsw && (forpost[forx][0] != '\0')) { @@ -497,7 +714,7 @@ next0: if (ch == '!') { /* UNIXCALL */ if (restricted_mode) { - merr_raise (NOSTAND); + merr_raise (CMMND); goto err; } @@ -848,6 +1065,8 @@ again: } } + if (trace_mode) tracestr[0] = '\0'; + switch (mcmnd) { case MAP: @@ -970,10 +1189,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); @@ -2356,6 +2580,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; @@ -2385,6 +2613,10 @@ 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 @@ -2414,6 +2646,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) { @@ -2580,7 +2816,6 @@ quit0: printf ("CHECK 03 (Stack PUSH)\r\n"); #endif - if (++nstx > NESTLEVLS) { nstx--; merr_raise (STKOV); @@ -2606,7 +2841,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 */ @@ -3050,6 +3285,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; @@ -3084,6 +3334,14 @@ do_goto: stcpy (label, varnam); + if (trace_mode) { + char ttt[256]; + stcpy (ttt, label); + stcnv_m2c (ttt); + + strcat (tracestr, ttt); + } + ch = *++codptr; } @@ -3099,7 +3357,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 */ @@ -3109,12 +3372,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) { @@ -4440,7 +4717,7 @@ use_socket: if (k > MAXSEQ) goto open_socket; if (restricted_mode) { - merr_raise (NOSTAND); + merr_raise (CMMND); goto err; } @@ -4872,7 +5149,8 @@ open_socket: if (merr () > OK) break; } else { - halt:i = 0; +halt: + i = 0; } cleanup (); @@ -5071,24 +5349,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: @@ -5178,6 +5469,11 @@ open_socket: break; /* Z-COMMANDS */ + case ZEDIT: + merr_raise (cmd_zedit (&ra)); + MRESCHECK(ra); + break; + case ZGO: /* ZGO with arguments: same as GOTO but with BREAK on */ @@ -5317,7 +5613,7 @@ zgo: merr_raise (NOPGM); break; - } /*error */ + } /* error */ stcpy (varnam, rou_name); } @@ -5335,6 +5631,7 @@ zgo: } zsave (varnam); + ssvn_routine_update (); break; @@ -5453,11 +5750,11 @@ zgo: if (*codptr == EOL || *codptr == SP) { merr_raise (ARGLIST); break; - } /*error */ + } /* error */ dosave[0] = EOL; - /* parse stringlit */ + /* parse strlit */ expr (STRING); if (merr () > OK) break; @@ -5566,7 +5863,7 @@ zgo: } if ((*(beg + 1)) == EOL) break; - + write_m (beg + 1); if (merr () > OK) break; } @@ -6653,8 +6950,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); @@ -6696,6 +6992,7 @@ err: } } + if (merr () > OK ) { char er_buf[ERRLEN]; @@ -6705,8 +7002,9 @@ err: stcpy (er_buf, errmes[merr ()]); stcnv_m2c (er_buf); + #if !defined(MSDOS) - m_log (LOG_ERR, er_buf); + logprintf (FM_LOG_DEBUG, "xecline: interpreter error %d [%s]", ierr, er_buf); #endif } @@ -7077,6 +7375,7 @@ restart: free (t_nsn); + } @@ -7138,9 +7437,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 (); @@ -7169,6 +7465,8 @@ direct_mode: int hist_idx; HIST_ENTRY *hist_ent; + rl_attempted_completion_function = command_completion; + if (quiet_mode == FALSE) { if (tp_level == 0) { snprintf (fmrl_prompt, sizeof (fmrl_prompt) - 1, "\r\n%s.%s> ", shm_env, nsname); @@ -7180,7 +7478,11 @@ direct_mode: set_io (UNIX); job_set_status (pid, JSTAT_DIRECTMODE); - + +#if defined(__NetBSD__) + printf ("\r\n"); +#endif + /* readline() does its own malloc() */ fmrl_buf = readline (fmrl_prompt); @@ -7191,6 +7493,7 @@ direct_mode: goto halt; } + if (strlen (fmrl_buf) > 0) { add_history (fmrl_buf); @@ -7201,7 +7504,7 @@ direct_mode: char kb[20]; char db[STRLEN]; - snprintf (kb, sizeof (kb) - 1, "%%SYS.HLP\201"); + snprintf (kb, sizeof (kb) - 1, "%%SYSHLP\201"); snprintf (db, STRLEN - 1, "\201"); symtab (kill_sym, kb, db); @@ -7217,13 +7520,6 @@ direct_mode: } } - 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 (); }