diff --git a/I1620/i1620_sys.c b/I1620/i1620_sys.c index 40ec70d3..aba91488 100644 --- a/I1620/i1620_sys.c +++ b/I1620/i1620_sys.c @@ -390,7 +390,7 @@ if (opcode[i].str == NULL) if (I_GETQP (opfl) == I_M_QNP) /* Q no print? */ qmp = 0; -fprintf (of, opcode[i].str); /* print opcode */ +fprintf (of, "%s", opcode[i].str); /* print opcode */ if (I_GETPP (opfl) == I_M_PP) /* P required? */ fprint_addr (of, ' ', &val[I_P], I_M_QX); else if ((I_GETPP (opfl) == I_M_PCP) && (pmp || qmp)) /* P opt & needed? */ diff --git a/Ibm1130/ibm1130_cr.c b/Ibm1130/ibm1130_cr.c index c45205a8..6d262da4 100644 --- a/Ibm1130/ibm1130_cr.c +++ b/Ibm1130/ibm1130_cr.c @@ -944,7 +944,7 @@ t_stat load_cr_boot (int drvno, int switches) #ifdef GUI_SUPPORT remark_cmd(msg); #else - printf(msg); + printf("", msg); #endif } diff --git a/PDP11/pdp11_tu.c b/PDP11/pdp11_tu.c index f933a7c0..bec28535 100644 --- a/PDP11/pdp11_tu.c +++ b/PDP11/pdp11_tu.c @@ -25,6 +25,7 @@ tu TM02/TM03 magtape + 18-Apr-11 MP Fixed t_addr printouts for 64b big-endian systems 17-May-07 RMS CS1 DVA resides in device, not MBA 29-Apr-07 RMS Fixed bug in setting FCE on TMK (found by Naoki Hamada) 16-Feb-06 RMS Added tape capacity checking @@ -466,10 +467,12 @@ UNIT *uptr; fnc = GET_FNC (tucs1); /* get function */ den = GET_DEN (tutc); /* get density */ uptr = tu_dev.units + drv; /* get unit */ -if (DEBUG_PRS (tu_dev)) - fprintf (sim_deb, ">>TU%d STRT: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=%d\n", +if (DEBUG_PRS (tu_dev)) { + fprintf (sim_deb, ">>TU%d STRT: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=", drv, tu_fname[fnc], tufc, tufs, tuer, uptr->pos); - + fprint_val (sim_deb, uptr->pos, 10, T_ADDR_W, PV_LEFT); + fprintf (sim_deb, "\n"); + } if ((fnc != FNC_FCLR) && /* not clear & err */ ((tufs & FS_ERR) || sim_is_active (uptr))) { /* or in motion? */ tu_set_er (ER_ILF); /* set err */ @@ -786,9 +789,12 @@ if (fnc >= FNC_XFER) { /* data xfer? */ tu_update_fs (0, drv); /* update fs */ } else tu_update_fs (FS_ATA, drv); /* no, set attn */ -if (DEBUG_PRS (tu_dev)) - fprintf (sim_deb, ">>TU%d DONE: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=%d\n", - drv, tu_fname[fnc], tufc, tufs, tuer, uptr->pos); +if (DEBUG_PRS (tu_dev)) { + fprintf (sim_deb, ">>TU%d DONE: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=", + drv, tu_fname[fnc], tufc, tufs, tuer); + fprint_val (sim_deb, uptr->pos, 10, T_ADDR_W, PV_LEFT); + fprintf (sim_deb, "\n"); + } return SCPE_OK; } diff --git a/VAX/vax780_sbi.c b/VAX/vax780_sbi.c index e7f4bf23..b89ff22d 100644 --- a/VAX/vax780_sbi.c +++ b/VAX/vax780_sbi.c @@ -141,7 +141,7 @@ t_stat vax780_boot (int32 flag, char *ptr); t_stat vax780_boot_parse (int32 flag, char *ptr); t_stat cpu_boot (int32 unitno, DEVICE *dptr); -extern t_stat vax780_fload (int flag, char *cptr); +extern t_stat vax780_fload (int32 flag, char *cptr); extern int32 intexc (int32 vec, int32 cc, int32 ipl, int ei); extern int32 iccs_rd (void); extern int32 nicr_rd (void); diff --git a/VAX/vax_sysdev.c b/VAX/vax_sysdev.c index 169456d9..58aaa27e 100644 --- a/VAX/vax_sysdev.c +++ b/VAX/vax_sysdev.c @@ -920,7 +920,7 @@ return; struct reglink { /* register linkage */ uint32 low; /* low addr */ uint32 high; /* high addr */ - t_stat (*read)(int32 pa); /* read routine */ + int32 (*read)(int32 pa); /* read routine */ void (*write)(int32 pa, int32 val, int32 lnt); /* write routine */ }; diff --git a/scp.c b/scp.c index 76ffd840..b0f14ff3 100644 --- a/scp.c +++ b/scp.c @@ -1200,7 +1200,7 @@ return SCPE_UNK; /* only valid inside of t_stat on_cmd (int32 flag, char *cptr) { char gbuf[CBUFSIZE]; -int32 cond; +t_stat cond; cptr = get_glyph (cptr, gbuf, 0); if ('\0' == gbuf[0]) return SCPE_ARG; /* unspecified condition */ diff --git a/sim_console.c b/sim_console.c index acfdbd12..60a69b07 100644 --- a/sim_console.c +++ b/sim_console.c @@ -343,7 +343,8 @@ t_stat sim_show_log (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr) if (cptr && (*cptr != 0)) return SCPE_2MARG; if (sim_log) - fprintf (st, "Logging enabled to %s\n", sim_logfile_name (sim_log, sim_log_ref)); + fprintf (st, "Logging enabled to \"%s\"\n", + sim_logfile_name (sim_log, sim_log_ref)); else fprintf (st, "Logging disabled\n"); return SCPE_OK; } @@ -399,7 +400,8 @@ t_stat sim_show_debug (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cpt if (cptr && (*cptr != 0)) return SCPE_2MARG; if (sim_deb) - fprintf (st, "Debug output enabled\n", sim_logfile_name (sim_deb, sim_deb_ref)); + fprintf (st, "Debug output enabled to \"%s\"\n", + sim_logfile_name (sim_deb, sim_deb_ref)); else fprintf (st, "Debug output disabled\n"); return SCPE_OK; }