folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Compile cleanups.

Browse source 
i1620_sys.c - fixed printf calls without a format argument.
ibm1130_cr.c - fixed printf calls without a format argument.
scp.c - corrected argument types
vax780_sbi.c - corrected argument types
vax_sysdev.c - corrected argument types
pdp11_tu.c - Fixed t_addr printouts for 64b big-endian systems
sim_console.c - fixed formats to consistently print file names
This commit is contained in:
Mark Pizzolato 2011-04-19 16:18:26 -07:00
parent d8f55a652b
commit d81365b7af
7 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
I1620/i1620_sys.c
View file

@ -390,7 +390,7 @@ if (opcode[i].str == NULL)
if (I_GETQP (opfl) == I_M_QNP) /* Q no print? */ if (I_GETQP (opfl) == I_M_QNP) /* Q no print? */
qmp = 0; 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? */ if (I_GETPP (opfl) == I_M_PP) /* P required? */
fprint_addr (of, ' ', &val[I_P], I_M_QX); fprint_addr (of, ' ', &val[I_P], I_M_QX);
else if ((I_GETPP (opfl) == I_M_PCP) && (pmp || qmp)) /* P opt & needed? */ else if ((I_GETPP (opfl) == I_M_PCP) && (pmp || qmp)) /* P opt & needed? */

2
Ibm1130/ibm1130_cr.c
View file

@ -944,7 +944,7 @@ t_stat load_cr_boot (int drvno, int switches)
#ifdef GUI_SUPPORT #ifdef GUI_SUPPORT
remark_cmd(msg); remark_cmd(msg);
#else #else
printf(msg); printf("", msg);
#endif #endif
} }

18
PDP11/pdp11_tu.c
View file

@ -25,6 +25,7 @@
tu TM02/TM03 magtape 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 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) 29-Apr-07 RMS Fixed bug in setting FCE on TMK (found by Naoki Hamada)
16-Feb-06 RMS Added tape capacity checking 16-Feb-06 RMS Added tape capacity checking
@ -466,10 +467,12 @@ UNIT *uptr;
fnc = GET_FNC (tucs1); /* get function */ fnc = GET_FNC (tucs1); /* get function */
den = GET_DEN (tutc); /* get density */ den = GET_DEN (tutc); /* get density */
uptr = tu_dev.units + drv; /* get unit */ uptr = tu_dev.units + drv; /* get unit */
if (DEBUG_PRS (tu_dev)) if (DEBUG_PRS (tu_dev)) {
fprintf (sim_deb, ">>TU%d STRT: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=%d\n", fprintf (sim_deb, ">>TU%d STRT: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=",
drv, tu_fname[fnc], tufc, tufs, tuer, uptr->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 */ if ((fnc != FNC_FCLR) && /* not clear & err */
((tufs & FS_ERR) || sim_is_active (uptr))) { /* or in motion? */ ((tufs & FS_ERR) || sim_is_active (uptr))) { /* or in motion? */
tu_set_er (ER_ILF); /* set err */ tu_set_er (ER_ILF); /* set err */
@ -786,9 +789,12 @@ if (fnc >= FNC_XFER) { /* data xfer? */
tu_update_fs (0, drv); /* update fs */ tu_update_fs (0, drv); /* update fs */
} }
else tu_update_fs (FS_ATA, drv); /* no, set attn */ else tu_update_fs (FS_ATA, drv); /* no, set attn */
if (DEBUG_PRS (tu_dev)) if (DEBUG_PRS (tu_dev)) {
fprintf (sim_deb, ">>TU%d DONE: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=%d\n", fprintf (sim_deb, ">>TU%d DONE: fnc=%s, fc=%06o, fs=%06o, er=%06o, pos=",
drv, tu_fname[fnc], tufc, tufs, tuer, uptr->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; return SCPE_OK;
} }

2
VAX/vax780_sbi.c
View file

@ -141,7 +141,7 @@ t_stat vax780_boot (int32 flag, char *ptr);
t_stat vax780_boot_parse (int32 flag, char *ptr); t_stat vax780_boot_parse (int32 flag, char *ptr);
t_stat cpu_boot (int32 unitno, DEVICE *dptr); 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 intexc (int32 vec, int32 cc, int32 ipl, int ei);
extern int32 iccs_rd (void); extern int32 iccs_rd (void);
extern int32 nicr_rd (void); extern int32 nicr_rd (void);

2
VAX/vax_sysdev.c
View file

@ -920,7 +920,7 @@ return;
struct reglink { /* register linkage */ struct reglink { /* register linkage */
uint32 low; /* low addr */ uint32 low; /* low addr */
uint32 high; /* high 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 */ void (*write)(int32 pa, int32 val, int32 lnt); /* write routine */
}; };

2
scp.c
View file

@ -1200,7 +1200,7 @@ return SCPE_UNK; /* only valid inside of
t_stat on_cmd (int32 flag, char *cptr) t_stat on_cmd (int32 flag, char *cptr)
{ {
char gbuf[CBUFSIZE]; char gbuf[CBUFSIZE];
int32 cond; t_stat cond;
cptr = get_glyph (cptr, gbuf, 0); cptr = get_glyph (cptr, gbuf, 0);
if ('\0' == gbuf[0]) return SCPE_ARG; /* unspecified condition */ if ('\0' == gbuf[0]) return SCPE_ARG; /* unspecified condition */

6
sim_console.c
View file

@ -343,7 +343,8 @@ t_stat sim_show_log (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
if (cptr && (*cptr != 0)) if (cptr && (*cptr != 0))
return SCPE_2MARG; return SCPE_2MARG;
if (sim_log) 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"); else fprintf (st, "Logging disabled\n");
return SCPE_OK; 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)) if (cptr && (*cptr != 0))
return SCPE_2MARG; return SCPE_2MARG;
if (sim_deb) 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"); else fprintf (st, "Debug output disabled\n");
return SCPE_OK; return SCPE_OK;
} }