github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-05-02 22:22:48 +00:00
Code Releases 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

46
H316/h316_cpu.c
View File

@@ -424,7 +424,7 @@ reason = 0;
while (reason == 0) { /* loop until halted */
if (sim_interval <= 0) { /* check clock queue */
if (reason = sim_process_event ())
if ((reason = sim_process_event ()))
break;
}
@@ -458,7 +458,7 @@ if (chan_req) { /* channel request? */
t = iotab[dev] (ioOTA, 0, Read (ad), dev); /* output word */
if ((t & IOT_SKIP) == 0)
return STOP_DMAER;
if (r = (t >> IOT_V_REASON))
if ((r = (t >> IOT_V_REASON)))
return r;
}
if (Q_DMA (i)) { /* DMA? */
@@ -528,7 +528,7 @@ if (hst_lnt) { /* instr hist? */
switch (I_GETOP (MB)) { /* case on <1:6> */
case 001: case 021: case 041: case 061: /* JMP */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
PCQ_ENTRY; /* save PC */
PC = NEWA (PC, Y); /* set new PC */
@@ -537,7 +537,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 002: case 022: case 042: case 062: /* LDA */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
if (dp) { /* double prec? */
AR = Read (Y & ~1); /* get doubleword */
@@ -548,13 +548,13 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 003: case 023: case 043: case 063: /* ANA */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
AR = AR & Read (Y);
break;
case 004: case 024: case 044: case 064: /* STA */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
Write (Y, AR); /* store A */
if (dp) { /* double prec? */
@@ -564,13 +564,13 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 005: case 025: case 045: case 065: /* ERA */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
AR = AR ^ Read (Y);
break;
case 006: case 026: case 046: case 066: /* ADD */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
if (dp) { /* double prec? */
t1 = GETDBL_S (AR, BR); /* get A'B */
@@ -583,7 +583,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 007: case 027: case 047: case 067: /* SUB */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
if (dp) { /* double prec? */
t1 = GETDBL_S (AR, BR); /* get A'B */
@@ -596,7 +596,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 010: case 030: case 050: case 070: /* JST */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
MB = NEWA (Read (Y), PC); /* merge old PC */
Write (Y, MB);
@@ -605,7 +605,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 011: case 031: case 051: case 071: /* CAS */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
MB = Read (Y);
if (AR == MB)
@@ -615,7 +615,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 012: case 032: case 052: case 072: /* IRS */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
MB = (Read (Y) + 1) & DMASK; /* incr, rewrite */
Write (Y, MB);
@@ -624,7 +624,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 013: case 033: case 053: case 073: /* IMA */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
MB = Read (Y);
Write (Y, AR); /* A to mem */
@@ -632,13 +632,13 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 015: case 055: /* STX */
if (reason = Ea (MB & ~IDX, &Y)) /* eff addr */
if ((reason = Ea (MB & ~IDX, &Y))) /* eff addr */
break;
Write (Y, XR); /* store XR */
break;
case 035: case 075: /* LDX */
if (reason = Ea (MB & ~IDX, &Y)) /* eff addr */
if ((reason = Ea (MB & ~IDX, &Y))) /* eff addr */
break;
XR = Read (Y); /* load XR */
M[M_XR] = XR; /* update mem too */
@@ -646,7 +646,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
case 016: case 036: case 056: case 076: /* MPY */
if (cpu_unit.flags & UNIT_HSA) { /* installed? */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
t1 = SEXT (AR) * SEXT (Read (Y));
PUTDBL_Z (t1);
@@ -657,7 +657,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
case 017: case 037: case 057: case 077: /* DIV */
if (cpu_unit.flags & UNIT_HSA) { /* installed? */
if (reason = Ea (MB, &Y)) /* eff addr */
if ((reason = Ea (MB, &Y))) /* eff addr */
break;
t2 = SEXT (Read (Y)); /* divr */
if (t2) { /* divr != 0? */
@@ -826,7 +826,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 003: /* "long right arot" */
if (reason = stop_inst) /* stop on undef? */
if ((reason = stop_inst)) /* stop on undef? */
break;
for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
C = BR & 1; /* C = last out */
@@ -859,7 +859,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 007: /* "short right arot" */
if (reason = stop_inst) /* stop on undef? */
if ((reason = stop_inst)) /* stop on undef? */
break;
for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
C = AR & 1; /* C = last out */
@@ -899,7 +899,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 013: /* "long left arot" */
if (reason = stop_inst) /* stop on undef? */
if ((reason = stop_inst)) /* stop on undef? */
break;
for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
AR = (AR << 1) | ((BR >> 14) & 1);
@@ -935,7 +935,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
break;
case 017: /* "short left arot" */
if (reason = stop_inst) /* stop on undef? */
if ((reason = stop_inst)) /* stop on undef? */
break;
for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
if ((AR & SIGN) != ((AR << 1) & SIGN)) C = 1;
@@ -1003,7 +1003,7 @@ switch (I_GETOP (MB)) { /* case on <1:6> */
AR = (AR << 8) & DMASK;
else if (MB == 0141340) /* ICA */
AR = ((AR << 8) | (AR >> 8)) & DMASK;
else if (reason = stop_inst)
else if ((reason = stop_inst))
break;
else AR = Operate (MB, AR); /* undefined */
break;
@@ -1500,7 +1500,7 @@ for (i = 0; i < DEV_MAX; i++)
iotab[i] = NULL;
for (i = 0; i < (DMA_MAX + DMC_MAX); i++)
chan_map[i] = 0;
for (i = 0; dptr = sim_devices[i]; i++) { /* loop thru devices */
for (i = 0; (dptr = sim_devices[i]); i++) { /* loop thru devices */
dibp = (DIB *) dptr->ctxt; /* get DIB */
if ((dibp == NULL) || (dptr->flags & DEV_DIS)) /* exist, enabled? */
continue;

12
H316/h316_dp.c
View File

@@ -617,7 +617,7 @@ switch (uptr->FNC) { /* case on function */
case FNC_RCA: /* read current addr */
if (h >= dp_tab[dp_ctype].surf) /* invalid head? */
return dp_done (1, STA_ADRER); /* error */
if (r = dp_rdtrk (uptr, dpxb, uptr->CYL, h)) /* get track; error? */
if ((r = dp_rdtrk (uptr, dpxb, uptr->CYL, h))) /* get track; error? */
return r;
dp_rptr = 0; /* init rec ptr */
if (dpxb[dp_rptr + REC_LNT] == 0) /* unformated? */
@@ -722,7 +722,7 @@ switch (uptr->FNC) { /* case on function */
case FNC_RW: /* read/write */
if (h >= dp_tab[dp_ctype].surf) /* invalid head? */
return dp_done (1, STA_ADRER); /* error */
if (r = dp_rdtrk (uptr, dpxb, uptr->CYL, h)) /* get track; error? */
if ((r = dp_rdtrk (uptr, dpxb, uptr->CYL, h))) /* get track; error? */
return r;
if (!dp_findrec (dp_cw2)) /* find rec; error? */
return dp_done (1, STA_ADRER); /* address error */
@@ -750,7 +750,7 @@ switch (uptr->FNC) { /* case on function */
if (dp_cw1 & CW1_RW) { /* write? */
if (dp_sta & STA_RDY) /* timing failure? */
return dp_wrdone (uptr, STA_DTRER); /* yes, error */
if (r = dp_wrwd (uptr, dp_buf)) /* wr word, error? */
if ((r = dp_wrwd (uptr, dp_buf))) /* wr word, error? */
return r;
if (dp_eor) { /* transfer done? */
dpxb[dp_rptr + REC_DATA + dp_wptr] = dp_csum;
@@ -855,7 +855,7 @@ if (dp_wptr < (lnt + REC_MAXEXT)) {
}
dpxb[dp_rptr + REC_DATA + dp_wptr] = dp_csum; /* write csum */
dpxb[dp_rptr + lnt + REC_OVHD] = 0; /* zap rest of track */
if (r = dp_wrdone (uptr, STA_UNSER)) /* dump track */
if ((r = dp_wrdone (uptr, STA_UNSER))) /* dump track */
return r;
return STOP_DPOVR;
}
@@ -1017,7 +1017,7 @@ for (c = cntr = 0; c < dp_tab[dp_ctype].cyl; c++) {
else tbuf[rptr + REC_ADDR] = (c << 8) + (h << 3) + i;
rptr = rptr + nw + REC_OVHD;
}
if (r = dp_wrtrk (uptr, tbuf, c, h))
if ((r = dp_wrtrk (uptr, tbuf, c, h)))
return r;
}
}
@@ -1043,7 +1043,7 @@ if ((uptr->flags & UNIT_ATT) == 0)
return SCPE_UNATT;
for (c = 0; c < dp_tab[dp_ctype].cyl; c++) {
for (h = 0; h < dp_tab[dp_ctype].surf; h++) {
if (r = dp_rdtrk (uptr, tbuf, c, h))
if ((r = dp_rdtrk (uptr, tbuf, c, h)))
return r;
rptr = 0;
rlnt = tbuf[rptr + REC_LNT];

8
H316/h316_mt.c
View File

@@ -371,17 +371,17 @@ switch (uptr->FNC) { /* case on function */
return SCPE_OK;
case FNC_WEOF: /* write file mark */
if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */
if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */
r = mt_map_err (uptr, st); /* map error */
break; /* sched end motion */
case FNC_FSR: /* space fwd rec */
if (st = sim_tape_sprecf (uptr, &tbc)) /* space fwd, err? */
if ((st = sim_tape_sprecf (uptr, &tbc))) /* space fwd, err? */
r = mt_map_err (uptr, st); /* map error */
break; /* sched end motion */
case FNC_BSR: /* space rev rec */
if (st = sim_tape_sprecr (uptr, &tbc)) /* space rev, err? */
if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rev, err? */
r = mt_map_err (uptr, st); /* map error */
break; /* sched end motion */
@@ -455,7 +455,7 @@ switch (uptr->FNC) { /* case on function */
mt_wrwd (uptr, mt_buf);
else mt_rdy = 0; /* rdy must be clr */
if (mt_ptr) { /* any data? */
if (st = sim_tape_wrrecf (uptr, mtxb, mt_ptr)) /* write, err? */
if ((st = sim_tape_wrrecf (uptr, mtxb, mt_ptr)))/* write, err? */
r = mt_map_err (uptr, st); /* map error */
}
break; /* sched end motion */

2
H316/h316_stddev.c
View File

@@ -390,7 +390,7 @@ t_stat r;
if (!(uptr->flags & UNIT_ATTABLE))
return SCPE_NOFNC;
if (r = attach_unit (uptr, cptr))
if ((r = attach_unit (uptr, cptr)))
return r;
if (sim_switches & SWMASK ('A')) /* -a? ASCII */
uptr->flags |= UNIT_ASC;

4
H316/h316_sys.c
View File

@@ -364,11 +364,11 @@ switch (j) { /* case on class */
case I_V_MRF: case I_V_MRX: /* mem ref */
cptr = get_glyph (cptr, gbuf, ','); /* get next field */
if (k = (strcmp (gbuf, "C") == 0)) { /* C specified? */
if ((k = (strcmp (gbuf, "C") == 0))) { /* C specified? */
val[0] = val[0] | SC;
cptr = get_glyph (cptr, gbuf, 0);
}
else if (k = (strcmp (gbuf, "Z") == 0)) { /* Z specified? */
else if ((k = (strcmp (gbuf, "Z") == 0))) { /* Z specified? */
cptr = get_glyph (cptr, gbuf, ',');
}
d = get_uint (gbuf, 8, X_AMASK, &r); /* construe as addr */