github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-26 04:01:38 +00:00
Code Releases Activity

ALL: Massive 'const' cleanup

Browse Source 
These changes facilitate more robust parameter type checking and helps
to identify unexpected coding errors.

Most simulators can now also be compiled with a C++ compiler without
warnings.

Additionally, these changes have also been configured to facilitate easier
backporting of simulator and device simulation modules to run under the
simh v3.9+ SCP framework.
This commit is contained in:
Mark Pizzolato
2016-05-15 15:25:33 -07:00
parent 60a8a2d43d
commit 5531ccb175
444 changed files with 4119 additions and 3798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
sim_console.c
View File

@@ -146,15 +146,15 @@ static t_stat sim_os_ttcmd (void);
static t_stat sim_os_ttclose (void);
static t_bool sim_os_ttisatty (void);
static t_stat sim_set_rem_telnet (int32 flag, char *cptr);
static t_stat sim_set_rem_connections (int32 flag, char *cptr);
static t_stat sim_set_rem_timeout (int32 flag, char *cptr);
static t_stat sim_set_rem_master (int32 flag, char *cptr);
static t_stat sim_set_rem_telnet (int32 flag, CONST char *cptr);
static t_stat sim_set_rem_connections (int32 flag, CONST char *cptr);
static t_stat sim_set_rem_timeout (int32 flag, CONST char *cptr);
static t_stat sim_set_rem_master (int32 flag, CONST char *cptr);
/* Deprecated CONSOLE HALT, CONSOLE RESPONSE and CONSOLE DELAY support */
static t_stat sim_set_halt (int32 flag, char *cptr);
static t_stat sim_set_response (int32 flag, char *cptr);
static t_stat sim_set_delay (int32 flag, char *cptr);
static t_stat sim_set_halt (int32 flag, CONST char *cptr);
static t_stat sim_set_response (int32 flag, CONST char *cptr);
static t_stat sim_set_delay (int32 flag, CONST char *cptr);
#define KMAP_WRU 0
@@ -337,7 +337,7 @@ static int32 *cons_kmap[] = {
/* SET CONSOLE command */
t_stat sim_set_console (int32 flag, char *cptr)
t_stat sim_set_console (int32 flag, CONST char *cptr)
{
char *cvptr, gbuf[CBUFSIZE];
CTAB *ctptr;
@@ -362,7 +362,7 @@ return SCPE_OK;
/* SHOW CONSOLE command */
t_stat sim_show_console (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_console (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
char gbuf[CBUFSIZE];
SHTAB *shptr;
@@ -427,7 +427,7 @@ static t_offset sim_rem_cmd_log_start = 0; /* Log File saved position */
/* SET REMOTE CONSOLE command */
t_stat sim_set_remote_console (int32 flag, char *cptr)
t_stat sim_set_remote_console (int32 flag, CONST char *cptr)
{
char *cvptr, gbuf[CBUFSIZE];
CTAB *ctptr;
@@ -452,7 +452,7 @@ return SCPE_OK;
/* SHOW REMOTE CONSOLE command */
t_stat sim_show_remote_console (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_remote_console (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
int32 i, connections;
TMLN *lp;
@@ -529,22 +529,22 @@ if (sim_con_ldsc.conn)
return SCPE_OK;
}
static t_stat x_continue_cmd (int32 flag, char *cptr)
static t_stat x_continue_cmd (int32 flag, CONST char *cptr)
{
return SCPE_IERR; /* This routine should never be called */
}
static t_stat x_step_cmd (int32 flag, char *cptr)
static t_stat x_step_cmd (int32 flag, CONST char *cptr)
{
return SCPE_IERR; /* This routine should never be called */
}
static t_stat x_run_cmd (int32 flag, char *cptr)
static t_stat x_run_cmd (int32 flag, CONST char *cptr)
{
return SCPE_IERR; /* This routine should never be called */
}
static t_stat x_help_cmd (int32 flag, char *cptr);
static t_stat x_help_cmd (int32 flag, CONST char *cptr);
static CTAB allowed_remote_cmds[] = {
{ "EXAMINE", &exdep_cmd, EX_E },
@@ -610,7 +610,7 @@ static CTAB allowed_single_remote_cmds[] = {
{ NULL, NULL }
};
static t_stat x_help_cmd (int32 flag, char *cptr)
static t_stat x_help_cmd (int32 flag, CONST char *cptr)
{
CTAB *cmdp, *cmdph;
@@ -675,7 +675,8 @@ if (sim_log) {
void sim_remote_process_command (void)
{
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *cptr, *argv[1] = {NULL};
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *argv[1] = {NULL};
CONST char *cptr;
int32 saved_switches = sim_switches;
t_stat stat;
@@ -710,7 +711,8 @@ t_bool was_active_command = (sim_rem_cmd_active_line != -1);
t_bool got_command;
t_bool close_session = FALSE;
TMLN *lp;
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *cptr, *argv[1] = {NULL};
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *argv[1] = {NULL};
CONST char *cptr;
CTAB *cmdp = NULL;
CTAB *basecmdp = NULL;
uint32 read_start_time = 0;
@@ -1113,7 +1115,7 @@ if (sim_rem_con_tmxr.lines) {
return SCPE_OK;
}
static t_stat sim_set_rem_telnet (int32 flag, char *cptr)
static t_stat sim_set_rem_telnet (int32 flag, CONST char *cptr)
{
t_stat r;
@@ -1150,7 +1152,7 @@ else {
return SCPE_OK;
}
static t_stat sim_set_rem_connections (int32 flag, char *cptr)
static t_stat sim_set_rem_connections (int32 flag, CONST char *cptr)
{
int32 lines;
t_stat r;
@@ -1183,7 +1185,7 @@ memset (sim_rem_command_buf, 0, 4*CBUFSIZE+1);
return SCPE_OK;
}
static t_stat sim_set_rem_timeout (int32 flag, char *cptr)
static t_stat sim_set_rem_timeout (int32 flag, CONST char *cptr)
{
int32 timeout;
t_stat r;
@@ -1208,7 +1210,7 @@ return SCPE_OK;
mode or the simulator exits
*/
static t_stat sim_set_rem_master (int32 flag, char *cptr)
static t_stat sim_set_rem_master (int32 flag, CONST char *cptr)
{
t_stat stat = SCPE_OK;
@@ -1267,7 +1269,7 @@ return stat;
/* Set keyboard map */
t_stat sim_set_kmap (int32 flag, char *cptr)
t_stat sim_set_kmap (int32 flag, CONST char *cptr)
{
DEVICE *dptr = sim_devices[0];
int32 val, rdx;
@@ -1287,7 +1289,7 @@ return SCPE_OK;
/* Show keyboard map */
t_stat sim_show_kmap (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_kmap (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
if (sim_devices[0]->dradix == 16)
fprintf (st, "%s = %X\n", show_con_tab[flag].name, *(cons_kmap[flag & KMAP_MASK]));
@@ -1297,7 +1299,7 @@ return SCPE_OK;
/* Set printable characters */
t_stat sim_set_pchar (int32 flag, char *cptr)
t_stat sim_set_pchar (int32 flag, CONST char *cptr)
{
DEVICE *dptr = sim_devices[0];
uint32 val, rdx;
@@ -1317,16 +1319,16 @@ return SCPE_OK;
/* Show printable characters */
t_stat sim_show_pchar (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_pchar (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
if (sim_devices[0]->dradix == 16)
fprintf (st, "pchar mask = %X", sim_tt_pchar);
else fprintf (st, "pchar mask = %o", sim_tt_pchar);
if (sim_tt_pchar) {
static char *pchars[] = {"NUL(^@)", "SOH(^A)", "STX(^B)", "ETX(^C)", "EOT(^D)", "ENQ(^E)", "ACK(^F)", "BEL(^G)",
"BS(^H)" , "HT(^I)", "LF(^J)", "VT(^K)", "FF(^L)", "CR(^M)", "SO(^N)", "SI(^O)",
"DLE(^P)", "DC1(^Q)", "DC2(^R)", "DC3(^S)", "DC4(^T)", "NAK(^U)", "SYN(^V)", "ETB(^W)",
"CAN(^X)", "EM(^Y)", "SUB(^Z)", "ESC", "FS", "GS", "RS", "US"};
static const char *pchars[] = {"NUL(^@)", "SOH(^A)", "STX(^B)", "ETX(^C)", "EOT(^D)", "ENQ(^E)", "ACK(^F)", "BEL(^G)",
"BS(^H)" , "HT(^I)", "LF(^J)", "VT(^K)", "FF(^L)", "CR(^M)", "SO(^N)", "SI(^O)",
"DLE(^P)", "DC1(^Q)", "DC2(^R)", "DC3(^S)", "DC4(^T)", "NAK(^U)", "SYN(^V)", "ETB(^W)",
"CAN(^X)", "EM(^Y)", "SUB(^Z)", "ESC", "FS", "GS", "RS", "US"};
int i;
t_bool found = FALSE;
@@ -1344,12 +1346,12 @@ return SCPE_OK;
/* Set input speed (bps) */
t_stat sim_set_cons_speed (int32 flag, char *cptr)
t_stat sim_set_cons_speed (int32 flag, CONST char *cptr)
{
return tmxr_set_line_speed (&sim_con_ldsc, cptr);
}
t_stat sim_show_cons_speed (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_cons_speed (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
if (sim_con_ldsc.rxbps) {
fprintf (st, "Speed = %d", sim_con_ldsc.rxbps);
@@ -1362,7 +1364,7 @@ return SCPE_OK;
/* Set log routine */
t_stat sim_set_logon (int32 flag, char *cptr)
t_stat sim_set_logon (int32 flag, CONST char *cptr)
{
char gbuf[CBUFSIZE];
t_stat r;
@@ -1389,7 +1391,7 @@ return SCPE_OK;
/* Set nolog routine */
t_stat sim_set_logoff (int32 flag, char *cptr)
t_stat sim_set_logoff (int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0)) /* now eol? */
return SCPE_2MARG;
@@ -1405,7 +1407,7 @@ return SCPE_OK;
/* Show log status */
t_stat sim_show_log (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_log (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0))
return SCPE_2MARG;
@@ -1418,7 +1420,7 @@ return SCPE_OK;
/* Set debug routine */
t_stat sim_set_debon (int32 flag, char *cptr)
t_stat sim_set_debon (int32 flag, CONST char *cptr)
{
char gbuf[CBUFSIZE];
t_stat r;
@@ -1488,7 +1490,7 @@ return SCPE_OK;
/* Set nodebug routine */
t_stat sim_set_deboff (int32 flag, char *cptr)
t_stat sim_set_deboff (int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0)) /* now eol? */
return SCPE_2MARG;
@@ -1504,7 +1506,7 @@ return SCPE_OK;
/* Show debug routine */
t_stat sim_show_debug (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_debug (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
int32 i;
@@ -1544,7 +1546,7 @@ return SCPE_OK;
/* Set console to Telnet port (and parameters) */
t_stat sim_set_telnet (int32 flag, char *cptr)
t_stat sim_set_telnet (int32 flag, CONST char *cptr)
{
char *cvptr, gbuf[CBUFSIZE];
CTAB *ctptr;
@@ -1577,7 +1579,7 @@ return SCPE_OK;
/* Close console Telnet port */
t_stat sim_set_notelnet (int32 flag, char *cptr)
t_stat sim_set_notelnet (int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0)) /* too many arguments? */
return SCPE_2MARG;
@@ -1588,7 +1590,7 @@ return tmxr_close_master (&sim_con_tmxr); /* close master socket *
/* Show console Telnet status */
t_stat sim_show_telnet (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, char *cptr)
t_stat sim_show_telnet (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0))
return SCPE_2MARG;
@@ -1615,7 +1617,7 @@ return SCPE_OK;
/* Set console to Buffering */
t_stat sim_set_cons_buff (int32 flg, char *cptr)
t_stat sim_set_cons_buff (int32 flg, CONST char *cptr)
{
char cmdbuf[CBUFSIZE];
@@ -1625,7 +1627,7 @@ return tmxr_open_master (&sim_con_tmxr, cmdbuf); /* open master socket */
/* Set console to NoBuffering */
t_stat sim_set_cons_unbuff (int32 flg, char *cptr)
t_stat sim_set_cons_unbuff (int32 flg, CONST char *cptr)
{
char cmdbuf[CBUFSIZE];
@@ -1635,7 +1637,7 @@ return tmxr_open_master (&sim_con_tmxr, cmdbuf); /* open master socket */
/* Set console to Logging */
t_stat sim_set_cons_log (int32 flg, char *cptr)
t_stat sim_set_cons_log (int32 flg, CONST char *cptr)
{
char cmdbuf[CBUFSIZE];
@@ -1645,7 +1647,7 @@ return tmxr_open_master (&sim_con_tmxr, cmdbuf); /* open master socket */
/* Set console to NoLogging */
t_stat sim_set_cons_nolog (int32 flg, char *cptr)
t_stat sim_set_cons_nolog (int32 flg, CONST char *cptr)
{
char cmdbuf[CBUFSIZE];
@@ -1653,7 +1655,7 @@ sprintf(cmdbuf, "NOLOG%c%s", cptr ? '=' : '\0', cptr ? cptr : "");
return tmxr_open_master (&sim_con_tmxr, cmdbuf); /* open master socket */
}
t_stat sim_show_cons_log (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, char *cptr)
t_stat sim_show_cons_log (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0))
return SCPE_2MARG;
@@ -1664,7 +1666,7 @@ else
return SCPE_OK;
}
t_stat sim_show_cons_buff (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, char *cptr)
t_stat sim_show_cons_buff (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0))
return SCPE_2MARG;
@@ -1677,12 +1679,12 @@ return SCPE_OK;
/* Set console Debug Mode */
t_stat sim_set_cons_debug (int32 flg, char *cptr)
t_stat sim_set_cons_debug (int32 flg, CONST char *cptr)
{
return set_dev_debug (&sim_con_telnet, &sim_con_unit, flg, cptr);
}
t_stat sim_show_cons_debug (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, char *cptr)
t_stat sim_show_cons_debug (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0))
return SCPE_2MARG;
@@ -1691,7 +1693,7 @@ return show_dev_debug (st, &sim_con_telnet, &sim_con_unit, flag, cptr);
/* Set console to Serial port (and parameters) */
t_stat sim_set_serial (int32 flag, char *cptr)
t_stat sim_set_serial (int32 flag, CONST char *cptr)
{
char *cvptr, gbuf[CBUFSIZE], ubuf[CBUFSIZE];
CTAB *ctptr;
@@ -1734,7 +1736,7 @@ return SCPE_OK;
/* Close console Serial port */
t_stat sim_set_noserial (int32 flag, char *cptr)
t_stat sim_set_noserial (int32 flag, CONST char *cptr)
{
if (cptr && (*cptr != 0)) /* too many arguments? */
return SCPE_2MARG;
@@ -1745,7 +1747,7 @@ return tmxr_close_master (&sim_con_tmxr); /* close master socket *
/* Show the console expect rules and state */
t_stat sim_show_cons_expect (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, char *cptr)
t_stat sim_show_cons_expect (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CONST char *cptr)
{
return sim_exp_show (st, &sim_con_expect, cptr);
}
@@ -1754,9 +1756,10 @@ return sim_exp_show (st, &sim_con_expect, cptr);
/* Open log file */
t_stat sim_open_logfile (char *filename, t_bool binary, FILE **pf, FILEREF **pref)
t_stat sim_open_logfile (const char *filename, t_bool binary, FILE **pf, FILEREF **pref)
{
char *tptr, gbuf[CBUFSIZE];
char gbuf[CBUFSIZE];
const char *tptr;
if ((filename == NULL) || (*filename == 0)) /* too few arguments? */
return SCPE_2FARG;
@@ -1938,7 +1941,7 @@ return &sim_con_expect;
/* Display console Queued input data status */
t_stat sim_show_cons_send_input (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
t_stat sim_show_cons_send_input (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
{
return sim_show_send_input (st, &sim_con_send);
}
@@ -2091,7 +2094,7 @@ return c;
Columns with tabs set are non-zero; columns without tabs are 0 */
t_stat sim_tt_settabs (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat sim_tt_settabs (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint8 *temptabs, *tabs = (uint8 *) desc;
int32 i, d;
@@ -2121,9 +2124,9 @@ free (temptabs);
return SCPE_OK;
}
t_stat sim_tt_showtabs (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat sim_tt_showtabs (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
uint8 *tabs = (uint8 *) desc;
const uint8 *tabs = (const uint8 *) desc;
int32 i, any;
if ((st == NULL) || (val == 0) || (desc == NULL))
@@ -3185,7 +3188,7 @@ return;
/* Set console halt */
static t_stat sim_set_halt (int32 flag, char *cptr)
static t_stat sim_set_halt (int32 flag, CONST char *cptr)
{
if (flag == 0) /* no halt? */
sim_exp_clrall (&sim_con_expect); /* disable halt checks */
@@ -3218,7 +3221,7 @@ return SCPE_OK;
/* Set console response */
static t_stat sim_set_response (int32 flag, char *cptr)
static t_stat sim_set_response (int32 flag, CONST char *cptr)
{
if (flag == 0) /* no response? */
sim_send_clear (&sim_con_send);
@@ -3240,7 +3243,7 @@ return SCPE_OK;
/* Set console delay */
static t_stat sim_set_delay (int32 flag, char *cptr)
static t_stat sim_set_delay (int32 flag, CONST char *cptr)
{
int32 val;
t_stat r;