From 4dbac410dabd75c36717770b27dc7bca3776e24c Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sun, 26 Oct 2014 14:52:22 -0700
Subject: [PATCH] SCP: Added const declarations to various APIs to reflect the
 appropriate usage.  Moved parameter values for run_cmd and exdep_cmd to scp.h

---
 Interdata/id32_cpu.c |  1 -
 PDP10/pdp10_cpu.c    |  1 -
 scp.c                | 27 ++++++++++++---------------
 scp.h                | 26 +++++++++++++++++++-------
 sigma/sigma_cpu.c    |  1 -
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/Interdata/id32_cpu.c b/Interdata/id32_cpu.c
index c1d89b10..3f3e356d 100644
--- a/Interdata/id32_cpu.c
+++ b/Interdata/id32_cpu.c
@@ -2331,7 +2331,6 @@ return SCPE_OK;
 
 void set_r_display (uint32 *rbase)
 {
-extern REG *find_reg (char *cptr, char **optr, DEVICE *dptr);
 REG *rptr;
 int32 i;
 
diff --git a/PDP10/pdp10_cpu.c b/PDP10/pdp10_cpu.c
index ec5305ff..96f9e5ae 100644
--- a/PDP10/pdp10_cpu.c
+++ b/PDP10/pdp10_cpu.c
@@ -2464,7 +2464,6 @@ return SCPE_OK;
 
 void set_ac_display (d10 *acbase)
 {
-extern REG *find_reg (char *cptr, char **optr, DEVICE *dptr);
 REG *rptr;
 int i;
 
diff --git a/scp.c b/scp.c
index f612e377..9a3e9eb1 100644
--- a/scp.c
+++ b/scp.c
@@ -244,9 +244,8 @@
 
 #define MAX(a,b)  (((a) >= (b)) ? (a) : (b))
 
-#define EX_D            0                               /* deposit */
-#define EX_E            1                               /* examine */
-#define EX_I            2                               /* interactive */
+/* search logical and boolean ops */
+
 #define SCH_OR          0                               /* search logicals */
 #define SCH_AND         1
 #define SCH_XOR         2
@@ -258,9 +257,6 @@
 #define SCH_NE          5
 #define SCH_GE          6
 #define SCH_LE          7
-#define SSH_ST          0                               /* set */
-#define SSH_SH          1                               /* show */
-#define SSH_CL          2                               /* clear */
 
 #define MAX_DO_NEST_LVL 20                              /* DO cmd nesting level */
 #define SRBSIZ          1024                            /* save/restore buffer */
@@ -1997,7 +1993,7 @@ return SCPE_OK;
 
 /* Find command routine */
 
-CTAB *find_cmd (char *gbuf)
+CTAB *find_cmd (const char *gbuf)
 {
 CTAB *cmdp = NULL;
 
@@ -3766,7 +3762,7 @@ return SCPE_OK;                                         /* done all */
 
 /* Match CTAB/CTAB1 name */
 
-CTAB *find_ctab (CTAB *tab, char *gbuf)
+CTAB *find_ctab (CTAB *tab, const char *gbuf)
 {
 for (; tab->name != NULL; tab++) {
     if (MATCH_CMD (gbuf, tab->name) == 0)
@@ -3775,7 +3771,7 @@ for (; tab->name != NULL; tab++) {
 return NULL;
 }
 
-C1TAB *find_c1tab (C1TAB *tab, char *gbuf)
+C1TAB *find_c1tab (C1TAB *tab, const char *gbuf)
 {
 for (; tab->name != NULL; tab++) {
     if (MATCH_CMD (gbuf, tab->name) == 0)
@@ -3989,7 +3985,7 @@ while (*cptr != 0) {                                    /* do all mods */
 return SCPE_OK;
 }
 
-SHTAB *find_shtab (SHTAB *tab, char *gbuf)
+SHTAB *find_shtab (SHTAB *tab, const char *gbuf)
 {
 for (; tab->name != NULL; tab++) {
     if (MATCH_CMD (gbuf, tab->name) == 0)
@@ -7207,7 +7203,7 @@ free (string);
         result  =       pointer to device
 */
 
-DEVICE *find_dev (char *cptr)
+DEVICE *find_dev (const char *cptr)
 {
 int32 i;
 DEVICE *dptr;
@@ -7238,10 +7234,11 @@ return NULL;
 
 */
 
-DEVICE *find_unit (char *cptr, UNIT **uptr)
+DEVICE *find_unit (const char *cptr, UNIT **uptr)
 {
 uint32 i, u;
-char *nptr, *tptr;
+char *nptr;
+const char *tptr;
 t_stat r;
 DEVICE *dptr;
 
@@ -7380,9 +7377,9 @@ return srptr;
         *optr   =       pointer to next character in input string
 */
 
-REG *find_reg (char *cptr, char **optr, DEVICE *dptr)
+REG *find_reg (const char *cptr, const char **optr, DEVICE *dptr)
 {
-char *tptr;
+const char *tptr;
 REG *rptr;
 size_t slnt;
 
diff --git a/scp.h b/scp.h
index b6fdb614..137ba95b 100644
--- a/scp.h
+++ b/scp.h
@@ -46,6 +46,18 @@
 #define RU_CONT         4                               /* continue */
 #define RU_BOOT         5                               /* boot */
 
+/* exdep_cmd parameters */
+
+#define EX_D            0                               /* deposit */
+#define EX_E            1                               /* examine */
+#define EX_I            2                               /* interactive */
+
+/* brk_cmd parameters */
+
+#define SSH_ST          0                               /* set */
+#define SSH_SH          1                               /* show */
+#define SSH_CL          2                               /* clear */
+
 /* get_sim_opt parameters */
 
 #define CMD_OPT_SW      001                             /* switches */
@@ -130,16 +142,16 @@ char *read_line (char *cptr, int32 size, FILE *stream);
 void fprint_reg_help (FILE *st, DEVICE *dptr);
 void fprint_set_help (FILE *st, DEVICE *dptr);
 void fprint_show_help (FILE *st, DEVICE *dptr);
-CTAB *find_cmd (char *gbuf);
-DEVICE *find_dev (char *ptr);
-DEVICE *find_unit (char *ptr, UNIT **uptr);
+CTAB *find_cmd (const char *gbuf);
+DEVICE *find_dev (const char *ptr);
+DEVICE *find_unit (const char *ptr, UNIT **uptr);
 DEVICE *find_dev_from_unit (UNIT *uptr);
 t_stat sim_register_internal_device (DEVICE *dptr);
 void sim_sub_args (char *in_str, size_t in_str_size, char *do_arg[]);
-REG *find_reg (char *ptr, char **optr, DEVICE *dptr);
-CTAB *find_ctab (CTAB *tab, char *gbuf);
-C1TAB *find_c1tab (C1TAB *tab, char *gbuf);
-SHTAB *find_shtab (SHTAB *tab, char *gbuf);
+REG *find_reg (const char *ptr, const char **optr, DEVICE *dptr);
+CTAB *find_ctab (CTAB *tab, const char *gbuf);
+C1TAB *find_c1tab (C1TAB *tab, const char *gbuf);
+SHTAB *find_shtab (SHTAB *tab, const char *gbuf);
 t_stat get_aval (t_addr addr, DEVICE *dptr, UNIT *uptr);
 BRKTAB *sim_brk_fnd (t_addr loc);
 uint32 sim_brk_test (t_addr bloc, uint32 btyp);
diff --git a/sigma/sigma_cpu.c b/sigma/sigma_cpu.c
index c985f5c3..a68547b9 100644
--- a/sigma/sigma_cpu.c
+++ b/sigma/sigma_cpu.c
@@ -2661,7 +2661,6 @@ return SCPE_OK;
 
 void set_rf_display (uint32 *rfbase)
 {
-extern REG *find_reg (char *cptr, char **optr, DEVICE *dptr);
 REG *rptr;
 uint32 i;