From 7cd1b27b0868dd419dc0ff569619b0cd732483cf Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sat, 9 Dec 2017 20:54:10 -0800
Subject: [PATCH] BESM6: Fix error message generation to use sim_error_text

As reported in #500
---
 BESM6/besm6_cpu.c | 4 +---
 BESM6/besm6_tty.c | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/BESM6/besm6_cpu.c b/BESM6/besm6_cpu.c
index a4a82b1d..b6d0a82e 100644
--- a/BESM6/besm6_cpu.c
+++ b/BESM6/besm6_cpu.c
@@ -63,8 +63,6 @@ uint32 PRP, MPRP;
 uint32 READY, READY2;                   /* ready flags of various devices */
 int32 tmr_poll = CLK_DELAY;             /* pgm timer poll */
 
-extern const char *scp_errors[];
-
 /* Wired (non-registered) bits of interrupt registers (GRP and PRP)
  * cannot be cleared by writing to the GRP and must be cleared by clearing
  * the registers generating the corresponding interrupts.
@@ -1590,7 +1588,7 @@ t_stat sim_instr (void)
         M[017] += corr_stack;
         if (cpu_dev.dctrl) {
             const char *message = (r >= SCPE_BASE) ?
-                scp_errors [r - SCPE_BASE] :
+                sim_error_text (r) :
                 sim_stop_messages [r];
             besm6_debug ("/// %05o%s: %s", PC,
                          (RUU & RUU_RIGHT_INSTR) ? "п" : "л",
diff --git a/BESM6/besm6_tty.c b/BESM6/besm6_tty.c
index f9117d95..9f934d8d 100644
--- a/BESM6/besm6_tty.c
+++ b/BESM6/besm6_tty.c
@@ -946,18 +946,17 @@ void vt_cmd_exec (int num)
     CONST char *cptr;
     CTAB *cmdp;
     t_stat err;
-    extern char *scp_errors[];
 
     cptr = get_glyph (vt_cbuf [num], gbuf, 0);      /* get command glyph */
     cmdp = lookup_cmd (gbuf);                       /* lookup command */
     if (! cmdp) {
-        tmxr_linemsg (t, scp_errors[SCPE_UNK - SCPE_BASE]);
+        tmxr_linemsg (t, sim_error_text (SCPE_UNK));
         tmxr_linemsg (t, "\r\n");
         return;
     }
     err = cmdp->action (num, cptr);                 /* if found, exec */
     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");
     }
     if (err == SCPE_EXIT) {                         /* close telnet session */