folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BESM6: Fix error message generation to use sim_error_text

Browse source 
As reported in #500
This commit is contained in:
Mark Pizzolato 2017-12-09 20:54:10 -08:00
parent 1d360efe15
commit 7cd1b27b08
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BESM6/besm6_cpu.c
View file

@ -63,8 +63,6 @@ uint32 PRP, MPRP;
uint32 READY, READY2; /* ready flags of various devices */ uint32 READY, READY2; /* ready flags of various devices */
int32 tmr_poll = CLK_DELAY; /* pgm timer poll */ int32 tmr_poll = CLK_DELAY; /* pgm timer poll */
extern const char *scp_errors[];
/* Wired (non-registered) bits of interrupt registers (GRP and PRP) /* Wired (non-registered) bits of interrupt registers (GRP and PRP)
* cannot be cleared by writing to the GRP and must be cleared by clearing * cannot be cleared by writing to the GRP and must be cleared by clearing
* the registers generating the corresponding interrupts. * the registers generating the corresponding interrupts.
@ -1590,7 +1588,7 @@ t_stat sim_instr (void)
M[017] += corr_stack; M[017] += corr_stack;
if (cpu_dev.dctrl) { if (cpu_dev.dctrl) {
const char *message = (r >= SCPE_BASE) ? const char *message = (r >= SCPE_BASE) ?
scp_errors [r - SCPE_BASE] : sim_error_text (r) :
sim_stop_messages [r]; sim_stop_messages [r];
besm6_debug ("/// %05o%s: %s", PC, besm6_debug ("/// %05o%s: %s", PC,
(RUU & RUU_RIGHT_INSTR) ? "п" : "л", (RUU & RUU_RIGHT_INSTR) ? "п" : "л",

5
BESM6/besm6_tty.c
View file

@ -946,18 +946,17 @@ void vt_cmd_exec (int num)
CONST char *cptr; CONST char *cptr;
CTAB *cmdp; CTAB *cmdp;
t_stat err; t_stat err;
extern char *scp_errors[];
cptr = get_glyph (vt_cbuf [num], gbuf, 0); /* get command glyph */ cptr = get_glyph (vt_cbuf [num], gbuf, 0); /* get command glyph */
cmdp = lookup_cmd (gbuf); /* lookup command */ cmdp = lookup_cmd (gbuf); /* lookup command */
if (! cmdp) { if (! cmdp) {
tmxr_linemsg (t, scp_errors[SCPE_UNK - SCPE_BASE]); tmxr_linemsg (t, sim_error_text (SCPE_UNK));
tmxr_linemsg (t, "\r\n"); tmxr_linemsg (t, "\r\n");
return; return;
} }
err = cmdp->action (num, cptr); /* if found, exec */ err = cmdp->action (num, cptr); /* if found, exec */
if (err >= SCPE_BASE) { /* error? */ if (err >= SCPE_BASE) { /* error? */
tmxr_linemsg (t, scp_errors [err - SCPE_BASE]); tmxr_linemsg (t, sim_error_text (err));
tmxr_linemsg (t, "\r\n"); tmxr_linemsg (t, "\r\n");
} }
if (err == SCPE_EXIT) { /* close telnet session */ if (err == SCPE_EXIT) { /* close telnet session */