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

ALL: Massive 'const' cleanup

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

View File

@@ -150,13 +150,13 @@ REG *pcq_r = NULL; /* PC queue reg ptr */
t_stat cpu_ex (t_value *vptr, t_addr addr, UNIT *uptr, int32 sw);
t_stat cpu_dep (t_value val, t_addr addr, UNIT *uptr, int32 sw);
t_stat cpu_reset (DEVICE *dptr);
t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_show_model (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat cpu_set_30opt (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_30opt_i (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_30opt_o (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_fill (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_exec (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_model (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_show_model (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat cpu_set_30opt (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_30opt_i (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_30opt_o (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_fill (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_exec (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_one_inst (uint32 opc, uint32 ir);
uint32 Mul64 (uint32 a, uint32 b, uint32 *low);
t_bool Div32 (uint32 dvd, uint32 dvr, uint32 *q);
@@ -641,7 +641,7 @@ return SCPE_OK;
/* Validate option, must be LGP30 */
t_stat cpu_set_30opt (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_30opt (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (Q_LGP21)
return SCPE_ARG;
@@ -650,7 +650,7 @@ return SCPE_OK;
/* Validate input option, must be LGP30 */
t_stat cpu_set_30opt_i (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_30opt_i (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (Q_LGP21 || (cptr == NULL))
return SCPE_ARG;
@@ -664,7 +664,7 @@ return SCPE_OK;
/* Validate output option, must be LGP30 */
t_stat cpu_set_30opt_o (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_30opt_o (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (Q_LGP21 || (cptr == NULL))
return SCPE_ARG;
@@ -678,7 +678,7 @@ return SCPE_OK;
/* Set CPU to LGP21 or LPG30 */
t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_model (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (val)
uptr->flags = uptr->flags & ~(UNIT_IN4B|UNIT_INPT|UNIT_OUTPT);
@@ -687,7 +687,7 @@ return reset_all (0);
/* Show CPU type and all options */
t_stat cpu_show_model (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat cpu_show_model (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
fputs (Q_LGP21? "LGP-21": "LGP-30", st);
if (uptr->flags & UNIT_TTSS_D)
@@ -726,7 +726,7 @@ return SCPE_OK;
/* Execute */
t_stat cpu_set_exec (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_exec (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint32 inst;
t_stat r;
@@ -747,7 +747,7 @@ return r;
/* Fill */
t_stat cpu_set_fill (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_fill (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint32 inst;
t_stat r;

View File

@@ -138,4 +138,9 @@ enum opcodes {
uint32 Read (uint32 ea);
void Write (uint32 ea, uint32 dat);
/* Translation Tables */
extern const int32 flex_to_ascii[128];
extern const int32 ascii_to_flex[128];
#endif

View File

@@ -58,14 +58,14 @@ t_stat ptr_svc (UNIT *uptr);
t_stat ptp_svc (UNIT *uptr);
t_stat ptr_reset (DEVICE *uptr);
t_stat ptp_reset (DEVICE *uptr);
t_stat tap_attach (UNIT *uptr, char *cptr);
t_stat tap_attable (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat tap_attach (UNIT *uptr, CONST char *cptr);
t_stat tap_attable (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat read_reader (UNIT *uptr, int32 stop, int32 *c);
t_stat write_tto (int32 flex);
t_stat write_punch (UNIT *uptr, int32 flex);
t_stat tti_rdrss (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat punch_feed (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat send_start (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat tti_rdrss (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat punch_feed (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat send_start (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
extern uint32 shift_in (uint32 a, uint32 dat, uint32 sh4);
@@ -614,7 +614,7 @@ return SCPE_OK;
/* Attach paper tape unit */
t_stat tap_attach (UNIT *uptr, char *cptr)
t_stat tap_attach (UNIT *uptr, CONST char *cptr)
{
t_stat r;
@@ -629,7 +629,7 @@ return SCPE_OK;
/* Validate unit is attachable */
t_stat tap_attable (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat tap_attable (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (uptr->flags & UNIT_ATTABLE)
return SCPE_OK;
@@ -638,7 +638,7 @@ return SCPE_NOFNC;
/* Typewriter reader start/stop */
t_stat tti_rdrss (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat tti_rdrss (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (val) {
if ((tti_unit[1].flags & UNIT_ATT) == 0)
@@ -651,7 +651,7 @@ return SCPE_OK;
/* Punch feed routine */
t_stat punch_feed (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat punch_feed (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int32 cnt;
t_stat r;
@@ -674,7 +674,7 @@ return SCPE_OK;
/* Send start signal */
t_stat send_start (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat send_start (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (inp_strt)
inp_done = 1;

View File

@@ -29,7 +29,7 @@
#include "lgp_defs.h"
#include <ctype.h>
t_stat parse_sym_m (char *cptr, t_value *val, int32 sw);
t_stat parse_sym_m (CONST char *cptr, t_value *val, int32 sw);
void lgp_init (void);
extern DEVICE cpu_dev;
@@ -40,7 +40,6 @@ extern REG cpu_reg[];
extern uint32 M[];
extern uint32 PC;
extern uint32 ts_flag;
extern int32 flex_to_ascii[128], ascii_to_flex[128];
/* SCP data structures and interface routines
@@ -135,7 +134,7 @@ return SCPE_OK;
/* Loader proper */
t_stat sim_load (FILE *fi, char *cptr, char *fnam, int flag)
t_stat sim_load (FILE *fi, CONST char *cptr, CONST char *fnam, int flag)
{
uint32 wd, origin, amod, csum, cnt, tr, sc, ad, cmd;
@@ -237,7 +236,7 @@ else fprint_val (st, addr, dptr->aradix, dptr->awidth, PV_LEFT);
return;
}
t_addr lgp_parse_addr (DEVICE *dptr, const char *cptr, const char **tptr)
t_addr lgp_parse_addr (DEVICE *dptr, CONST char *cptr, CONST char **tptr)
{
t_addr ad, ea;
@@ -330,10 +329,10 @@ return SCPE_ARG;
status = error status
*/
t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
{
int32 i, c;
char *tptr;
const char *tptr;
while (isspace (*cptr)) /* absorb spaces */
cptr++;
@@ -376,10 +375,10 @@ return SCPE_ARG;
/* Instruction parse */
t_stat parse_sym_m (char *cptr, t_value *val, int32 sw)
t_stat parse_sym_m (CONST char *cptr, t_value *val, int32 sw)
{
uint32 ea, sgn;
const char *tptr;
CONST char *tptr;
char gbuf[CBUFSIZE];
if (*cptr == '-') {