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:
@@ -199,10 +199,10 @@ t_stat cpu_reset (DEVICE *dptr);
|
||||
t_stat cpu_boot (int32 unitno, DEVICE *dptr);
|
||||
t_stat cpu_ex (t_value *vptr, t_addr exta, UNIT *uptr, int32 sw);
|
||||
t_stat cpu_dep (t_value val, t_addr exta, UNIT *uptr, int32 sw);
|
||||
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc);
|
||||
t_stat cpu_show_virt (FILE *of, UNIT *uptr, int32 val, void *desc);
|
||||
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
|
||||
t_stat cpu_show_virt (FILE *of, UNIT *uptr, int32 val, CONST void *desc);
|
||||
t_stat cpu_fprint_one_inst (FILE *st, uint32 ir, t_uint64 pc, t_uint64 ra, t_uint64 rb);
|
||||
|
||||
extern t_uint64 op_ldf (t_uint64 op);
|
||||
@@ -221,7 +221,7 @@ extern t_stat pal_1d (uint32 ir);
|
||||
extern t_stat pal_1e (uint32 ir);
|
||||
extern t_stat pal_1f (uint32 ir);
|
||||
extern t_uint64 trans_c (t_uint64 va);
|
||||
extern t_stat cpu_show_tlb (FILE *of, UNIT *uptr, int32 val, void *desc);
|
||||
extern t_stat cpu_show_tlb (FILE *of, UNIT *uptr, int32 val, CONST void *desc);
|
||||
extern uint32 pal_eval_intr (uint32 flag);
|
||||
extern t_stat pal_proc_excp (uint32 type);
|
||||
extern t_stat pal_proc_trap (uint32 type);
|
||||
@@ -1701,7 +1701,7 @@ return SCPE_NXM;
|
||||
|
||||
/* Memory allocation */
|
||||
|
||||
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
t_uint64 mc = 0;
|
||||
uint32 i, clim;
|
||||
@@ -1722,10 +1722,10 @@ return SCPE_OK;
|
||||
|
||||
/* Show virtual address */
|
||||
|
||||
t_stat cpu_show_virt (FILE *of, UNIT *uptr, int32 val, void *desc)
|
||||
t_stat cpu_show_virt (FILE *of, UNIT *uptr, int32 val, CONST void *desc)
|
||||
{
|
||||
t_stat r;
|
||||
char *cptr = (char *) desc;
|
||||
const char *cptr = (const char *) desc;
|
||||
t_uint64 va, pa;
|
||||
|
||||
if (cptr) {
|
||||
@@ -1752,7 +1752,7 @@ return SCPE_OK;
|
||||
|
||||
/* Set history */
|
||||
|
||||
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
uint32 i, lnt;
|
||||
t_stat r;
|
||||
@@ -1832,10 +1832,10 @@ return SCPE_OK;
|
||||
|
||||
/* Show history */
|
||||
|
||||
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc)
|
||||
t_stat 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;
|
||||
InstHistory *h;
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@ extern uint32 pal_type;
|
||||
extern t_uint64 pcq[PCQ_SIZE]; /* PC queue */
|
||||
extern int32 pcq_p; /* PC queue ptr */
|
||||
|
||||
extern int32 parse_reg (char *cptr);
|
||||
extern int32 parse_reg (const char *cptr);
|
||||
|
||||
/* EV5PAL data structures
|
||||
|
||||
@@ -839,7 +839,7 @@ return;
|
||||
|
||||
/* Parse options for hardware PAL instruction */
|
||||
|
||||
char *parse_opt_ev5 (char *cptr, uint32 *val, struct pal_opt opt[])
|
||||
CONST char *parse_opt_ev5 (CONST char *cptr, uint32 *val, struct pal_opt opt[])
|
||||
{
|
||||
uint32 i;
|
||||
char *tptr, gbuf[CBUFSIZE];
|
||||
@@ -900,11 +900,11 @@ return -3;
|
||||
|
||||
/* Parse PAL hardware opcode symbolically */
|
||||
|
||||
t_stat parse_pal_hwre (char *cptr, t_value *inst)
|
||||
t_stat parse_pal_hwre (CONST char *cptr, t_value *inst)
|
||||
{
|
||||
uint32 i, d, val = 0;
|
||||
int32 reg;
|
||||
const char *tptr;
|
||||
CONST char *tptr;
|
||||
char gbuf[CBUFSIZE];
|
||||
t_stat r;
|
||||
|
||||
|
||||
@@ -474,8 +474,8 @@ return;
|
||||
|
||||
int tlb_comp (const void *e1, const void *e2)
|
||||
{
|
||||
TLBENT *t1 = (TLBENT *) e1;
|
||||
TLBENT *t2 = (TLBENT *) e2;
|
||||
const TLBENT *t1 = (const TLBENT *) e1;
|
||||
const TLBENT *t2 = (const TLBENT *) e2;
|
||||
|
||||
if (t1->asn > t2->asn) return +1;
|
||||
if (t1->asn < t2->asn) return -1;
|
||||
@@ -532,13 +532,13 @@ return SCPE_OK;
|
||||
|
||||
/* Show TLB entry or entries */
|
||||
|
||||
t_stat cpu_show_tlb (FILE *of, UNIT *uptr, int32 val, void *desc)
|
||||
t_stat cpu_show_tlb (FILE *of, UNIT *uptr, int32 val, CONST void *desc)
|
||||
{
|
||||
t_addr lo, hi;
|
||||
uint32 lnt;
|
||||
TLBENT *tlbp;
|
||||
DEVICE *dptr;
|
||||
const char *cptr = (char *) desc;
|
||||
CONST char *cptr = (CONST char *) desc;
|
||||
|
||||
lnt = (val)? DTLB_SIZE: ITLB_SIZE;
|
||||
dptr = find_dev_from_unit (uptr);
|
||||
|
||||
@@ -32,11 +32,11 @@ extern REG cpu_reg[];
|
||||
extern uint32 pal_type;
|
||||
|
||||
t_stat fprint_sym_m (FILE *of, t_addr addr, uint32 inst);
|
||||
t_stat parse_sym_m (char *cptr, t_addr addr, t_value *inst);
|
||||
int32 parse_reg (char *cptr);
|
||||
t_stat parse_sym_m (CONST char *cptr, t_addr addr, t_value *inst);
|
||||
int32 parse_reg (const char *cptr);
|
||||
|
||||
extern t_stat fprint_pal_hwre (FILE *of, uint32 inst);
|
||||
extern t_stat parse_pal_hwre (char *cptr, t_value *inst);
|
||||
extern t_stat parse_pal_hwre (CONST char *cptr, t_value *inst);
|
||||
extern t_bool rom_wr (t_uint64 pa, t_uint64 val, uint32 lnt);
|
||||
|
||||
/* SCP data structures and interface routines
|
||||
@@ -71,7 +71,7 @@ const char *sim_stop_messages[] = {
|
||||
-o specify origin
|
||||
*/
|
||||
|
||||
t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
|
||||
t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag)
|
||||
{
|
||||
t_stat r;
|
||||
int32 i;
|
||||
@@ -631,7 +631,7 @@ return SCPE_ARG;
|
||||
<= 0 -number of extra words
|
||||
*/
|
||||
|
||||
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)
|
||||
{
|
||||
t_value num;
|
||||
uint32 i, sc, rdx;
|
||||
@@ -715,13 +715,13 @@ return -7;
|
||||
<= 0 -number of extra words
|
||||
*/
|
||||
|
||||
t_stat parse_sym_m (char *cptr, t_addr addr, t_value *inst)
|
||||
t_stat parse_sym_m (CONST char *cptr, t_addr addr, t_value *inst)
|
||||
{
|
||||
t_uint64 bra, df, db;
|
||||
uint32 i, k, lit8, fl;
|
||||
int32 reg;
|
||||
t_stat r;
|
||||
const char *tptr;
|
||||
CONST char *tptr;
|
||||
char gbuf[CBUFSIZE];
|
||||
|
||||
if ((r = parse_pal_hwre (cptr, inst)) < 0) return r; /* PAL hardware? */
|
||||
@@ -805,7 +805,7 @@ return -3;
|
||||
|
||||
/* Parse a register */
|
||||
|
||||
int32 parse_reg (char *cptr)
|
||||
int32 parse_reg (const char *cptr)
|
||||
{
|
||||
t_stat r;
|
||||
int32 reg;
|
||||
|
||||
Reference in New Issue
Block a user