github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-02-16 12:44:09 +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

20
B5500/b5500_cpu.c
View File

@@ -195,13 +195,13 @@ t_stat cpu_ex(t_value * vptr, t_addr addr, UNIT * uptr,
t_stat cpu_dep(t_value val, t_addr addr, UNIT * uptr,
int32 sw);
t_stat cpu_reset(DEVICE * dptr);
t_stat cpu_set_size(UNIT * uptr, int32 val, char *cptr,
t_stat cpu_set_size(UNIT * uptr, int32 val, CONST char *cptr,
void *desc);
t_stat cpu_show_size(FILE * st, UNIT * uptr, int32 val,
void *desc);
CONST void *desc);
t_stat cpu_show_hist(FILE * st, UNIT * uptr, int32 val,
void *desc);
t_stat cpu_set_hist(UNIT * uptr, int32 val, char *cptr,
CONST void *desc);
t_stat cpu_set_hist(UNIT * uptr, int32 val, CONST char *cptr,
void *desc);
t_stat cpu_help(FILE *, DEVICE *, UNIT *, int32, const char *);
/* Interval timer */
@@ -3818,14 +3818,14 @@ cpu_dep(t_value val, t_addr addr, UNIT * uptr, int32 sw)
}
t_stat
cpu_show_size(FILE *st, UNIT *uptr, int32 val, void *desc)
cpu_show_size(FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
fprintf(st, "%dK", MEMSIZE/1024);
return SCPE_OK;
}
t_stat
cpu_set_size(UNIT * uptr, int32 val, char *cptr, void *desc)
cpu_set_size(UNIT * uptr, int32 val, CONST char *cptr, void *desc)
{
t_uint64 mc = 0;
uint32 i;
@@ -3852,7 +3852,7 @@ cpu_set_size(UNIT * uptr, int32 val, char *cptr, void *desc)
/* Set history */
t_stat
cpu_set_hist(UNIT * uptr, int32 val, char *cptr, void *desc)
cpu_set_hist(UNIT * uptr, int32 val, CONST char *cptr, void *desc)
{
int32 i, lnt;
t_stat r;
@@ -3873,7 +3873,7 @@ cpu_set_hist(UNIT * uptr, int32 val, char *cptr, void *desc)
hst = NULL;
}
if (lnt) {
hst = calloc(sizeof(struct InstHistory), lnt);
hst = (struct InstHistory *)calloc(sizeof(struct InstHistory), lnt);
if (hst == NULL)
return SCPE_MEM;
@@ -3885,10 +3885,10 @@ cpu_set_hist(UNIT * uptr, int32 val, char *cptr, void *desc)
/* Show history */
t_stat
cpu_show_hist(FILE * st, UNIT * uptr, int32 val, void *desc)
cpu_show_hist(FILE * st, UNIT * uptr, int32 val, CONST void *desc)
{
int32 k, di, lnt;
char *cptr = (char *) desc;
const char *cptr = (const char *) desc;
t_stat r;
t_value sim_eval;
struct InstHistory *h;

2
B5500/b5500_defs.h
View File

@@ -73,7 +73,7 @@ typedef struct _opcode
{
uint16 op;
uint8 type;
char *name;
const char *name;
}
t_opcode;

8
B5500/b5500_dk.c
View File

@@ -64,13 +64,13 @@ t_stat dsk_boot(int32, DEVICE *);
t_stat dsk_help (FILE *, DEVICE *, UNIT *, int32, const char *);
const char *dsk_description (DEVICE *);
t_stat esu_srv(UNIT *);
t_stat esu_attach(UNIT *, char *);
t_stat esu_attach(UNIT *, CONST char *);
t_stat esu_detach(UNIT *);
t_stat esu_help (FILE *, DEVICE *, UNIT *, int32, const char *);
const char *esu_description (DEVICE *);
uint8 dsk_buffer[NUM_DEVS_DSK][DK_SEC_SIZE];
t_stat set_mod(UNIT *uptr, int32 val, char *cptr,
t_stat set_mod(UNIT *uptr, int32 val, CONST char *cptr,
void *desc);
#define ESU_TYPE UDATA(&esu_srv, UNIT_ATTABLE+UNIT_DISABLE+ \
@@ -437,7 +437,7 @@ t_stat esu_srv(UNIT * uptr)
}
t_stat
set_mod(UNIT *uptr, int32 val, char *cptr, void *desc) {
set_mod(UNIT *uptr, int32 val, CONST char *cptr, void *desc) {
if (uptr == NULL) return SCPE_IERR;
if (val == MODIB)
uptr->wait = DK_MAXSEGS2;
@@ -465,7 +465,7 @@ dsk_boot(int32 unit_num, DEVICE * dptr)
t_stat
esu_attach(UNIT * uptr, char *file)
esu_attach(UNIT * uptr, CONST char *file)
{
t_stat r;
int u = uptr-esu_unit;

16
B5500/b5500_dr.c
View File

@@ -41,19 +41,19 @@
t_stat drm_srv(UNIT *);
t_stat drm_boot(int32, DEVICE *);
t_stat drm_attach(UNIT *, char *);
t_stat drm_attach(UNIT *, CONST char *);
t_stat drm_detach(UNIT *);
t_stat set_drum(UNIT * uptr, int32 val, char *cptr,
t_stat set_drum(UNIT * uptr, int32 val, CONST char *cptr,
void *desc);
t_stat set_auxmem(UNIT * uptr, int32 val, char *cptr,
t_stat set_auxmem(UNIT * uptr, int32 val, CONST char *cptr,
void *desc);
t_stat drm_help (FILE *, DEVICE *, UNIT *, int32, const char *);
const char *drm_description (DEVICE *);
MTAB drm_mod[] = {
{AUXMEM, 0, "DRUM", "DRUM", &set_drum, NULL, "Device is drum"},
{AUXMEM, AUXMEM, "AUXMEM", "AUXMEM", &set_auxmem, NULL, "Device is memory unit"},
{AUXMEM, 0, "DRUM", "DRUM", &set_drum, NULL, NULL, "Device is drum"},
{AUXMEM, AUXMEM, "AUXMEM", "AUXMEM", &set_auxmem, NULL, NULL, "Device is memory unit"},
{0}
};
@@ -171,7 +171,7 @@ drm_boot(int32 unit_num, DEVICE * dptr)
t_stat
drm_attach(UNIT * uptr, char *file)
drm_attach(UNIT * uptr, CONST char *file)
{
t_stat r;
int u = uptr - drm_unit;
@@ -203,7 +203,7 @@ drm_detach(UNIT * uptr)
}
t_stat
set_drum(UNIT * uptr, int32 val, char *cptr, void *desc) {
set_drum(UNIT * uptr, int32 val, CONST char *cptr, void *desc) {
if ((uptr->flags & AUXMEM) == 0)
return SCPE_OK;
if (uptr->flags & UNIT_ATT)
@@ -213,7 +213,7 @@ set_drum(UNIT * uptr, int32 val, char *cptr, void *desc) {
}
t_stat
set_auxmem(UNIT * uptr, int32 val, char *cptr, void *desc) {
set_auxmem(UNIT * uptr, int32 val, CONST char *cptr, void *desc) {
int u = uptr - drm_unit;
if (uptr->flags & AUXMEM)

35
B5500/b5500_dtc.c
View File

@@ -141,13 +141,13 @@
t_stat dtc_srv(UNIT *);
t_stat dtco_srv(UNIT *);
t_stat dtc_attach(UNIT *, char *);
t_stat dtc_attach(UNIT *, CONST char *);
t_stat dtc_detach(UNIT *);
t_stat dtc_reset(DEVICE *);
t_stat dtc_setnl (UNIT *, int32, char *, void *);
t_stat dtc_set_log (UNIT *, int32, char *, void *);
t_stat dtc_set_nolog (UNIT *, int32, char *, void *);
t_stat dtc_show_log (FILE *, UNIT *, int32, void *);
t_stat dtc_setnl (UNIT *, int32, CONST char *, void *);
t_stat dtc_set_log (UNIT *, int32, CONST char *, void *);
t_stat dtc_set_nolog (UNIT *, int32, CONST char *, void *);
t_stat dtc_show_log (FILE *, UNIT *, int32, CONST void *);
t_stat dtc_help(FILE *, DEVICE *, UNIT *, int32, const char *);
t_stat dtc_help_attach (FILE *, DEVICE *, UNIT *, int32, const char *);
const char *dtc_description(DEVICE *);
@@ -695,7 +695,7 @@ dtc_reset(DEVICE *dptr) {
/* Attach master unit */
t_stat
dtc_attach(UNIT * uptr, char *cptr)
dtc_attach(UNIT * uptr, CONST char *cptr)
{
int i;
t_stat r;
@@ -731,7 +731,7 @@ dtc_detach(UNIT * uptr)
/* SET LINES processor */
t_stat dtc_setnl (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat dtc_setnl (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int32 newln, i, t;
t_stat r;
@@ -764,27 +764,26 @@ t_stat dtc_setnl (UNIT *uptr, int32 val, char *cptr, void *desc)
/* SET LOG processor */
t_stat dtc_set_log (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat dtc_set_log (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
char *tptr;
t_stat r;
char gbuf[CBUFSIZE];
int32 ln;
if (cptr == NULL)
return SCPE_ARG;
tptr = strchr (cptr, '=');
if ((tptr == NULL) || (*tptr == 0))
cptr = get_glyph (cptr, gbuf, '=');
if ((cptr == NULL) || (*cptr == 0) || (gbuf[0] == 0))
return SCPE_ARG;
*tptr++ = 0;
ln = (int32) get_uint (cptr, 10, dtc_desc.lines, &r);
ln = (int32) get_uint (gbuf, 10, dtc_desc.lines, &r);
if ((r != SCPE_OK) || (ln >= dtc_desc.lines))
return SCPE_ARG;
return tmxr_set_log (NULL, ln, tptr, desc);
return tmxr_set_log (NULL, ln, cptr, desc);
}
/* SET NOLOG processor */
t_stat dtc_set_nolog (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat dtc_set_nolog (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
t_stat r;
int32 ln;
@@ -799,7 +798,7 @@ t_stat dtc_set_nolog (UNIT *uptr, int32 val, char *cptr, void *desc)
/* SHOW LOG processor */
t_stat dtc_show_log (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat dtc_show_log (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
int32 i;
@@ -814,7 +813,7 @@ t_stat dtc_show_log (FILE *st, UNIT *uptr, int32 val, void *desc)
/* Show summary processor */
t_stat
dtc_summ(FILE * st, UNIT * uptr, int32 val, void *desc)
dtc_summ(FILE * st, UNIT * uptr, int32 val, CONST void *desc)
{
uint32 i, t;
@@ -831,7 +830,7 @@ dtc_summ(FILE * st, UNIT * uptr, int32 val, void *desc)
/* SHOW CONN/STAT processor */
t_stat
dtc_show(FILE * st, UNIT * uptr, int32 val, void *desc)
dtc_show(FILE * st, UNIT * uptr, int32 val, CONST void *desc)
{
int32 i, cc;

8
B5500/b5500_mt.c
View File

@@ -80,7 +80,7 @@
#define CLR_BUF(u) u->hwmark = 0xFFFFFFFF
t_stat mt_srv(UNIT *);
t_stat mt_attach(UNIT *, char *);
t_stat mt_attach(UNIT *, CONST char *);
t_stat mt_detach(UNIT *);
t_stat mt_reset(DEVICE *);
t_stat mt_help(FILE *, DEVICE *, UNIT *, int32, const char *);
@@ -123,9 +123,9 @@ UNIT mt_unit[] = {
};
MTAB mt_mod[] = {
{MTUF_WLK, 0, "write enabled", "WRITEENABLED", NULL, NULL,
{MTUF_WLK, 0, "write enabled", "WRITEENABLED", NULL, NULL, NULL,
"Write ring in place"},
{MTUF_WLK, MTUF_WLK, "write locked", "LOCKED", NULL, NULL,
{MTUF_WLK, MTUF_WLK, "write locked", "LOCKED", NULL, NULL, NULL,
"no Write ring in place"},
{MTAB_XTD | MTAB_VUN, 0, "FORMAT", "FORMAT",
&sim_tape_set_fmt, &sim_tape_show_fmt, NULL,
@@ -566,7 +566,7 @@ t_stat mt_srv(UNIT * uptr)
t_stat
mt_attach(UNIT * uptr, char *file)
mt_attach(UNIT * uptr, CONST char *file)
{
t_stat r;

6
B5500/b5500_sys.c
View File

@@ -26,7 +26,7 @@
#include "sim_card.h"
#include <ctype.h>
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);
/* SCP data structures and interface routines
@@ -165,7 +165,7 @@ const char ascii_to_con[128] = {
/* Load a card image file into memory. */
t_stat
sim_load(FILE * fileref, char *cptr, char *fnam, int flag)
sim_load(FILE * fileref, CONST char *cptr, CONST char *fnam, int flag)
{
/* Currently not implimented until I know format of load files */
return SCPE_NOFNC;
@@ -459,7 +459,7 @@ find_opcode(char *op, t_opcode * tab)
*/
t_stat
parse_sym(char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
{
int i;
t_value d;

24
B5500/b5500_urec.c
View File

@@ -85,7 +85,7 @@ DEBTAB cdr_debug[] = {
#if NUM_DEVS_CDR > 0
t_stat cdr_boot(int32, DEVICE *);
t_stat cdr_srv(UNIT *);
t_stat cdr_attach(UNIT *, char *);
t_stat cdr_attach(UNIT *, CONST char *);
t_stat cdr_detach(UNIT *);
t_stat cdr_help(FILE *, DEVICE *, UNIT *, int32, const char *);
const char *cdr_description(DEVICE *dptr);
@@ -93,7 +93,7 @@ const char *cdr_description(DEVICE *dptr);
#if NUM_DEVS_CDP > 0
t_stat cdp_srv(UNIT *);
t_stat cdp_attach(UNIT *, char *);
t_stat cdp_attach(UNIT *, CONST char *);
t_stat cdp_detach(UNIT *);
t_stat cdp_help(FILE *, DEVICE *, UNIT *, int32, const char *);
const char *cdp_description(DEVICE *dptr);
@@ -107,10 +107,10 @@ struct _lpr_data
lpr_data[NUM_DEVS_LPR];
t_stat lpr_srv(UNIT *);
t_stat lpr_attach(UNIT *, char *);
t_stat lpr_attach(UNIT *, CONST char *);
t_stat lpr_detach(UNIT *);
t_stat lpr_setlpp(UNIT *, int32, char *, void *);
t_stat lpr_getlpp(FILE *, UNIT *, int32, void *);
t_stat lpr_setlpp(UNIT *, int32, CONST char *, void *);
t_stat lpr_getlpp(FILE *, UNIT *, int32, CONST void *);
t_stat lpr_help(FILE *, DEVICE *, UNIT *, int32, const char *);
const char *lpr_description(DEVICE *dptr);
#endif
@@ -126,7 +126,7 @@ con_data[NUM_DEVS_CON];
t_stat con_ini(DEVICE *);
t_stat con_srv(UNIT *);
t_stat con_attach(UNIT *, char *);
t_stat con_attach(UNIT *, CONST char *);
t_stat con_detach(UNIT *);
t_stat con_help(FILE *, DEVICE *, UNIT *, int32, const char *);
const char *con_description(DEVICE *dptr);
@@ -146,7 +146,7 @@ MTAB cdr_mod[] = {
{MTAB_XTD | MTAB_VUN, 0, "FORMAT", "FORMAT",
&sim_card_set_fmt, &sim_card_show_fmt, NULL,
"Sets card format"},
{MODE_EOF, MODE_EOF, "EOF", "EOF", NULL, NULL,
{MODE_EOF, MODE_EOF, "EOF", "EOF", NULL, NULL, NULL,
"Causes EOF to be set when reader empty"},
{0}
};
@@ -420,7 +420,7 @@ cdr_boot(int32 unit_num, DEVICE * dptr)
}
t_stat
cdr_attach(UNIT * uptr, char *file)
cdr_attach(UNIT * uptr, CONST char *file)
{
t_stat r;
int u = uptr-cdr_unit;
@@ -523,7 +523,7 @@ cdp_srv(UNIT *uptr) {
t_stat
cdp_attach(UNIT * uptr, char *file)
cdp_attach(UNIT * uptr, CONST char *file)
{
t_stat r;
@@ -568,7 +568,7 @@ cdp_description(DEVICE *dptr)
#if NUM_DEVS_LPR > 0
t_stat
lpr_setlpp(UNIT *uptr, int32 val, char *cptr, void *desc)
lpr_setlpp(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int i;
if (cptr == NULL)
@@ -589,7 +589,7 @@ lpr_setlpp(UNIT *uptr, int32 val, char *cptr, void *desc)
}
t_stat
lpr_getlpp(FILE *st, UNIT *uptr, int32 v, void *desc)
lpr_getlpp(FILE *st, UNIT *uptr, int32 v, CONST void *desc)
{
if (uptr == NULL)
return SCPE_IERR;
@@ -791,7 +791,7 @@ lpr_srv(UNIT *uptr) {
}
t_stat
lpr_attach(UNIT * uptr, char *file)
lpr_attach(UNIT * uptr, CONST char *file)
{
t_stat r;
int u = (uptr - lpr_unit);

10
B5500/sim_card.c
View File

@@ -332,7 +332,7 @@ const uint8 sim_parity_table[64] = {
struct card_formats {
uint32 mode;
char *name;
const char *name;
};
static struct card_formats fmts[] = {
@@ -459,7 +459,7 @@ sim_hol_to_ebcdic(uint16 hol) {
static int cmpcard(char *p, char *s) {
static int cmpcard(const char *p, const char *s) {
int i;
if (p[0] != '~')
return 0;
@@ -904,7 +904,7 @@ sim_punch_card(UNIT * uptr, UNIT *stkuptr)
}
/* Set card format */
t_stat sim_card_set_fmt (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat sim_card_set_fmt (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int f;
@@ -921,7 +921,7 @@ t_stat sim_card_set_fmt (UNIT *uptr, int32 val, char *cptr, void *desc)
/* Show card format */
t_stat sim_card_show_fmt (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat sim_card_show_fmt (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
int f;
@@ -937,7 +937,7 @@ t_stat sim_card_show_fmt (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat
sim_card_attach(UNIT * uptr, char *cptr)
sim_card_attach(UNIT * uptr, CONST char *cptr)
{
t_stat r;
struct _card_data *data;

12
B5500/sim_card.h
View File

@@ -91,7 +91,7 @@ struct _card_data
t_stat sim_read_card(UNIT * uptr);
int sim_card_eof(UNIT * uptr);
t_stat sim_punch_card(UNIT * uptr, UNIT *stkptr);
t_stat sim_card_attach(UNIT * uptr, char *file);
t_stat sim_card_attach(UNIT * uptr, CONST char *file);
t_stat sim_card_detach(UNIT *uptr);
/* Conversion routines to save code */
@@ -101,13 +101,13 @@ uint8 sim_hol_to_bcd(uint16 hol);
uint8 sim_hol_to_ebbcd(uint16 hol);
/* Format control routines. */
t_stat sim_card_set_fmt (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat sim_card_show_fmt (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat sim_card_set_fmt (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat sim_card_show_fmt (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
/* Help information */
t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
/* Translation tables */
const char sim_six_to_ascii[64];
const char sim_ascii_to_six[128];
const uint8 sim_parity_table[64];
extern const char sim_six_to_ascii[64];
extern const char sim_ascii_to_six[128];
extern const uint8 sim_parity_table[64];