github.com/open-simh.simh
1
0
Fork 0
mirror of https://github.com/open-simh/simh.git synced 2026-04-30 13:41:55 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup for warning messages produced by the clang C compiler. Mostly adding parentheses in conditional assignments and clarification parentheses in complex boolean expressions.

Browse Source
This commit is contained in:
Mark Pizzolato
2012-04-29 11:59:44 -07:00
parent 3775c17034
commit 0f8e6cfe95
112 changed files with 596 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
I7094/i7094_com.c
View File

@@ -1175,7 +1175,7 @@ char name[20];
ln = uptr - coml_dev.units;
sprintf (name, val? "Output queue %d": "Input queue %d", ln);
lh = val? &com_outq[ln]: &com_inpq[ln];
if (entc = com_show_qsumm (st, lh, name)) {
if ((entc = com_show_qsumm (st, lh, name))) {
for (i = 0, next = lh->head; next != 0;
i++, next = com_pkt[next].next) {
if ((i % 8) == 0)

10
I7094/i7094_cpu.c
View File

@@ -664,14 +664,14 @@ while (reason == SCPE_OK) { /* loop until error */
}
if (sim_interval <= 0) { /* intv cnt expired? */
if (reason = sim_process_event ()) /* process events */
if ((reason = sim_process_event ())) /* process events */
break;
chtr_pend = chtr_eval (NULL); /* eval chan traps */
}
for (i = 0; ch_req && (i < NUM_CHAN); i++) { /* loop thru channels */
if (ch_req & REQ_CH (i)) { /* channel request? */
if (reason = ch_proc (i))
if ((reason = ch_proc (i)))
break;
}
chtr_pend = chtr_eval (NULL);
@@ -1973,13 +1973,13 @@ while (reason == SCPE_OK) { /* loop until error */
t_stat r;
for (i = 0; (i < HALT_IO_LIMIT) && !ch_qidle (); i++) {
sim_interval = 0;
if (r = sim_process_event ()) /* process events */
if ((r = sim_process_event ())) /* process events */
return r;
chtr_pend = chtr_eval (NULL); /* eval chan traps */
while (ch_req) { /* until no ch req */
for (j = 0; j < NUM_CHAN; j++) { /* loop thru channels */
if (ch_req & REQ_CH (j)) { /* channel request? */
if (r = ch_proc (j))
if ((r = ch_proc (j)))
return r;
}
chtr_pend = chtr_eval (NULL);
@@ -2438,7 +2438,7 @@ if (pc & HIST_PC) { /* instruction? */
}
fputc ('\n', st); /* end line */
} /* end if instruction */
else if (ch = HIST_CH (pc)) { /* channel? */
else if ((ch = HIST_CH (pc))) { /* channel? */
fprintf (st, "CH%c ", 'A' + ch - 1);
fprintf (st, "%05o ", pc & AMASK);
fputs (" ", st);

12
I7094/i7094_dsk.c
View File

@@ -693,14 +693,14 @@ trk = uaptr->TRK; /* get access track */
switch (dsk_sta) { /* case on state */
case CHSL_RDS: /* read start */
if (r = dsk_init_trk (udptr, trk)) { /* read track, err? */
if ((r = dsk_init_trk (udptr, trk))) { /* read track, err? */
return ((r == ERR_NRCF)? SCPE_OK: r); /* rec not fnd ok */
}
dsk_sta = CHSL_RDS|CHSL_2ND; /* next state */
break;
case CHSL_RDS|CHSL_2ND: /* read data transmit */
if (r = dsk_xfer_done (uaptr, dtyp)) { /* transfer done? */
if ((r = dsk_xfer_done (uaptr, dtyp))) { /* transfer done? */
if (r != ERR_ENDRC) /* error? */
return r;
dsk_sta = CHSL_RDS|CHSL_3RD; /* next state */
@@ -721,7 +721,7 @@ switch (dsk_sta) { /* case on state */
break;
case CHSL_WRS: /* write start */
if (r = dsk_init_trk (udptr, trk)) { /* read track, err? */
if ((r = dsk_init_trk (udptr, trk))) { /* read track, err? */
return ((r == ERR_NRCF)? SCPE_OK: r); /* rec not fnd ok */
}
ch_req |= REQ_CH (dsk_ch); /* first request */
@@ -742,7 +742,7 @@ switch (dsk_sta) { /* case on state */
else dsk_buf[dsk_rptr++] = dsk_chob; /* write, store word */
if (dsk_rptr == T1STREC) /* if THA, skip after HA */
dsk_rptr++;
if (r = dsk_xfer_done (uaptr, dtyp)) { /* transfer done? */
if ((r = dsk_xfer_done (uaptr, dtyp))) { /* transfer done? */
if (r != ERR_ENDRC) /* error? */
return r;
dsk_sta = CHSL_WRS|CHSL_3RD; /* next state */
@@ -755,7 +755,7 @@ switch (dsk_sta) { /* case on state */
case CHSL_WRS|CHSL_3RD: /* write done */
if (!dsk_wchk) { /* if write */
if (r = dsk_wr_trk (udptr, trk)) /* write track; err? */
if ((r = dsk_wr_trk (udptr, trk))) /* write track; err? */
return r;
}
if (dsk_qdone (dsk_ch)) /* done? exit */
@@ -846,7 +846,7 @@ switch (dsk_sta) { /* case on state */
if (!dsk_wchk) { /* actual write? */
trk = trk - (trk % dsk_tab[dtyp].trkpc); /* cyl start */
for (i = 0; i < dsk_tab[dtyp].trkpc; i++) { /* do all tracks */
if (r = dsk_wr_trk (udptr, trk + i)) /* wr track; err? */
if ((r = dsk_wr_trk (udptr, trk + i))) /* wr track; err? */
return r;
}
}

22
I7094/i7094_io.c
View File

@@ -795,7 +795,7 @@ switch (ch_sta[ch]) { /* case on chan state */
if (ch_dev[ch].flags & DEV_7289) { /* drum channel? */
ir = ReadP (clc); /* read addr */
ch_clc[ch] = CHAINC (clc); /* incr chan pc */
if (r = ch9_wr (ch, ir, 0)) /* write to dev */
if ((r = ch9_wr (ch, ir, 0))) /* write to dev */
return r;
}
else ch_clc[ch] = clc; /* set clc */
@@ -1003,7 +1003,7 @@ if (ch_dev[ch].flags & DEV_7909) { /* 7909 */
return SCPE_OK;
case CH9_SNS: /* sense */
if (r = ch9_sel (ch, CHSL_SNS)) /* send sense to dev */
if ((r = ch9_sel (ch, CHSL_SNS))) /* send sense to dev */
return r;
ch_flags[ch] |= CHF_PRD; /* prepare to read */
break; /* next command */
@@ -1019,13 +1019,13 @@ if (ch_dev[ch].flags & DEV_7909) { /* 7909 */
}
ch_flags[ch] &= ~CHF_EOR; /* clear end */
if (ch_op[ch] == CH9_CTLR) { /* CTLR? */
if (r = ch9_sel (ch, CHSL_RDS)) /* send read sel */
if ((r = ch9_sel (ch, CHSL_RDS))) /* send read sel */
return r;
ch_flags[ch] |= CHF_PRD; /* prep to read */
ch_idf[ch] = 0;
}
else if (ch_op[ch] == CH9_CTLW) { /* CTLW? */
if (r = ch9_sel (ch, CHSL_WRS)) /* end write sel */
if ((r = ch9_sel (ch, CHSL_WRS))) /* end write sel */
return r;
ch_flags[ch] |= CHF_PWR; /* prep to write */
}
@@ -1035,7 +1035,7 @@ if (ch_dev[ch].flags & DEV_7909) { /* 7909 */
if ((ch_wc[ch] == 0) || (ch_flags[ch] & CHF_EOR)) { /* wc == 0 or EOR? */
if (ch_flags[ch] & (CHF_PRD|CHF_PWR|CHF_RDS|CHF_WRS)) {
ch_flags[ch] &= ~(CHF_PRD|CHF_PWR|CHF_RDS|CHF_WRS);
if (r = ch9_wr (ch, 0, CH9DF_STOP)) /* send stop */
if ((r = ch9_wr (ch, 0, CH9DF_STOP))) /* send stop */
return r;
}
if (ch_flags[ch] & CHF_EOR) { /* EOR? */
@@ -1055,7 +1055,7 @@ if (ch_dev[ch].flags & DEV_7909) { /* 7909 */
ch_flags[ch] &= ~CHF_EOR; /* ignore */
else if (ch_flags[ch] & CHF_RDS) /* read? */
ch9_rd_putw (ch);
else if (r = ch9_wr_getw (ch)) /* no, write */
else if ((r = ch9_wr_getw (ch))) /* no, write */
return r;
if (ch_wc[ch] == 0) /* done? get next */
break;
@@ -1164,7 +1164,7 @@ else { /* 7607 write */
case CH6_IOCD: /* IOCD */
if (ch_wc[ch]) { /* wc > 0? */
if (r = ch6_wr_getw (ch, TRUE)) /* send wd to dev; err? */
if ((r = ch6_wr_getw (ch, TRUE))) /* send wd to dev; err? */
return r;
if (ch_wc[ch]) /* more to do? */
return SCPE_OK;
@@ -1174,7 +1174,7 @@ else { /* 7607 write */
case CH6_IOCP: /* IOCP */
case CH6_IOSP: /* IOSP */
if (ch_wc[ch]) { /* wc > 0? */
if (r = ch6_wr_getw (ch, FALSE)) /* send wd to dev; err? */
if ((r = ch6_wr_getw (ch, FALSE))) /* send wd to dev; err? */
return r;
if (ch_wc[ch]) /* more to do? */
return SCPE_OK;
@@ -1184,7 +1184,7 @@ else { /* 7607 write */
case CH6_IOCT: /* IOCT */
case CH6_IOST: /* IOST */
if (ch_wc[ch]) { /* wc > 0? */
if (r = ch6_wr_getw (ch, FALSE)) /* send wd to dev; err? */
if ((r = ch6_wr_getw (ch, FALSE))) /* send wd to dev; err? */
return r;
if (ch_wc[ch]) /* more to do? */
return SCPE_OK;
@@ -1193,7 +1193,7 @@ else { /* 7607 write */
case CH6_IORP: /* IORP */
if (!(ch_flags[ch] & CHF_EOR) && ch_wc[ch]) { /* not EOR? (cdp, lpt) */
if (r = ch6_wr_getw (ch, TRUE)) /* send wd to dev; err? */
if ((r = ch6_wr_getw (ch, TRUE))) /* send wd to dev; err? */
return r;
if (ch_wc[ch]) /* more to do? */
return SCPE_OK;
@@ -1203,7 +1203,7 @@ else { /* 7607 write */
case CH6_IORT: /* IORT */
if (!(ch_flags[ch] & CHF_EOR) && ch_wc[ch]) { /* not EOR? (cdp, lpt) */
if (r = ch6_wr_getw (ch, TRUE)) /* send wd to dev; err? */
if ((r = ch6_wr_getw (ch, TRUE))) /* send wd to dev; err? */
return r;
if (ch_wc[ch]) /* more to do? */
return SCPE_OK;

4
I7094/i7094_mt.c
View File

@@ -564,7 +564,7 @@ switch (uptr->UST) { /* case on state */
bc = chrono_rd (xb, MT_MAXFR); /* read clock */
else { /* real tape */
r = sim_tape_rdrecf (uptr, xb, &bc, MT_MAXFR); /* read record */
if (r = mt_map_err (uptr, r)) /* map status */
if ((r = mt_map_err (uptr, r))) /* map status */
return r;
if (mt_unit[ch] == 0) /* disconnected? */
return SCPE_OK;
@@ -736,7 +736,7 @@ if (mt_bptr[ch]) { /* any data? */
if (xb == NULL)
return SCPE_IERR;
r = sim_tape_wrrecf (uptr, xb, mt_bptr[ch]); /* write record */
if (r = mt_map_err (uptr, r)) /* map error */
if ((r = mt_map_err (uptr, r))) /* map error */
return r;
}
uptr->UST = CHSL_WRS|CHSL_3RD; /* next state */