From 0f8e6cfe95178db5ddd410ab629d18d6df479e61 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sun, 29 Apr 2012 11:59:44 -0700 Subject: [PATCH] Cleanup for warning messages produced by the clang C compiler. Mostly adding parentheses in conditional assignments and clarification parentheses in complex boolean expressions. --- ALTAIR/altair_cpu.c | 2 +- GRI/gri_cpu.c | 2 +- H316/h316_cpu.c | 46 +++++----- H316/h316_dp.c | 12 +-- H316/h316_mt.c | 8 +- H316/h316_stddev.c | 2 +- H316/h316_sys.c | 4 +- HP2100/hp2100_baci.c | 18 ++-- HP2100/hp2100_cpu.c | 28 +++--- HP2100/hp2100_cpu0.c | 32 +++---- HP2100/hp2100_cpu1.c | 12 +-- HP2100/hp2100_cpu2.c | 6 +- HP2100/hp2100_cpu3.c | 12 +-- HP2100/hp2100_cpu4.c | 4 +- HP2100/hp2100_cpu5.c | 4 +- HP2100/hp2100_cpu6.c | 12 +-- HP2100/hp2100_cpu7.c | 4 +- HP2100/hp2100_di.c | 38 ++++---- HP2100/hp2100_di_da.c | 8 +- HP2100/hp2100_dp.c | 16 ++-- HP2100/hp2100_dq.c | 16 ++-- HP2100/hp2100_ipl.c | 2 +- HP2100/hp2100_mpx.c | 4 +- HP2100/hp2100_ms.c | 16 ++-- HP2100/hp2100_mt.c | 10 +-- HP2100/hp2100_stddev.c | 2 +- HP2100/hp2100_sys.c | 4 +- HP2100/hp_disclib.c | 8 +- I1401/i1401_cd.c | 2 +- I1401/i1401_cpu.c | 24 +++--- I1401/i1401_dp.c | 16 ++-- I1401/i1401_mt.c | 2 +- I1620/i1620_cpu.c | 2 +- I1620/i1620_dp.c | 16 ++-- I1620/i1620_sys.c | 2 +- I1620/i1620_tty.c | 2 +- I7094/i7094_com.c | 2 +- I7094/i7094_cpu.c | 10 +-- I7094/i7094_dsk.c | 12 +-- I7094/i7094_io.c | 22 ++--- I7094/i7094_mt.c | 4 +- Interdata/id16_cpu.c | 2 +- Interdata/id32_cpu.c | 2 +- Interdata/id_dp.c | 4 +- Interdata/id_idc.c | 4 +- Interdata/id_io.c | 6 +- Interdata/id_mt.c | 6 +- Interdata/id_pas.c | 2 +- LGP/lgp_cpu.c | 6 +- LGP/lgp_stddev.c | 6 +- LGP/lgp_sys.c | 4 +- NOVA/eclipse_cpu.c | 2 +- NOVA/nova_dkp.c | 4 +- NOVA/nova_mta.c | 8 +- NOVA/nova_tt1.c | 2 +- PDP1/pdp1_cpu.c | 96 ++++++++++----------- PDP1/pdp1_dcs.c | 2 +- PDP10/pdp10_cpu.c | 6 +- PDP10/pdp10_ksio.c | 4 +- PDP10/pdp10_lp20.c | 4 +- PDP10/pdp10_mdfp.c | 2 +- PDP10/pdp10_rp.c | 2 +- PDP10/pdp10_tu.c | 12 +-- PDP11/pdp11_cis.c | 8 +- PDP11/pdp11_cpu.c | 4 +- PDP11/pdp11_cpumod.c | 2 +- PDP11/pdp11_dl.c | 2 +- PDP11/pdp11_fp.c | 2 +- PDP11/pdp11_hk.c | 8 +- PDP11/pdp11_io.c | 6 +- PDP11/pdp11_ke.c | 4 +- PDP11/pdp11_rk.c | 10 +-- PDP11/pdp11_rq.c | 34 ++++---- PDP11/pdp11_sys.c | 2 +- PDP11/pdp11_ta.c | 8 +- PDP11/pdp11_tm.c | 12 +-- PDP11/pdp11_tq.c | 42 ++++----- PDP11/pdp11_ts.c | 8 +- PDP11/pdp11_tu.c | 12 +-- PDP11/pdp11_xq.c | 2 +- PDP18B/pdp18b_cpu.c | 2 +- PDP18B/pdp18b_fpp.c | 26 +++--- PDP18B/pdp18b_mt.c | 8 +- PDP18B/pdp18b_stddev.c | 2 +- PDP18B/pdp18b_sys.c | 2 +- PDP18B/pdp18b_tt1.c | 2 +- PDP8/pdp8_cpu.c | 2 +- PDP8/pdp8_ct.c | 8 +- PDP8/pdp8_mt.c | 8 +- PDP8/pdp8_ttx.c | 2 +- S3/s3_cd.c | 2 +- S3/s3_cpu.c | 2 +- S3/s3_disk.c | 10 +-- SDS/sds_cpu.c | 186 ++++++++++++++++++++-------------------- SDS/sds_dsk.c | 4 +- SDS/sds_io.c | 4 +- SDS/sds_lp.c | 2 +- SDS/sds_mt.c | 4 +- SDS/sds_mux.c | 2 +- SDS/sds_stddev.c | 2 +- VAX/vax780_sbi.c | 10 +-- VAX/vax_cis.c | 6 +- VAX/vax_cmode.c | 2 +- VAX/vax_cpu.c | 4 +- VAX/vax_io.c | 2 +- VAX/vax_octa.c | 4 +- VAX/vax_sys.c | 2 +- VAX/vax_syscm.c | 2 +- VAX/vax_sysdev.c | 2 +- scp.c | 58 +++++++------ sim_console.c | 14 +-- swtp6800/common/m6800.c | 2 +- 112 files changed, 596 insertions(+), 592 deletions(-) diff --git a/ALTAIR/altair_cpu.c b/ALTAIR/altair_cpu.c index 80fce7d6..196893c4 100644 --- a/ALTAIR/altair_cpu.c +++ b/ALTAIR/altair_cpu.c @@ -313,7 +313,7 @@ int32 sim_instr (void) while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) break; + if ((reason = sim_process_event ())) break; } if (int_req > 0) { /* interrupt? */ diff --git a/GRI/gri_cpu.c b/GRI/gri_cpu.c index 3eb3fa2e..e173f306 100644 --- a/GRI/gri_cpu.c +++ b/GRI/gri_cpu.c @@ -421,7 +421,7 @@ ao_update (); /* update AO */ while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) + if ((reason = sim_process_event ())) break; } diff --git a/H316/h316_cpu.c b/H316/h316_cpu.c index b1ba29bb..d09a0654 100644 --- a/H316/h316_cpu.c +++ b/H316/h316_cpu.c @@ -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; diff --git a/H316/h316_dp.c b/H316/h316_dp.c index 40468675..533c3a86 100644 --- a/H316/h316_dp.c +++ b/H316/h316_dp.c @@ -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]; diff --git a/H316/h316_mt.c b/H316/h316_mt.c index 125945a9..22ceb6b4 100644 --- a/H316/h316_mt.c +++ b/H316/h316_mt.c @@ -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 */ diff --git a/H316/h316_stddev.c b/H316/h316_stddev.c index c358841e..beb3585c 100644 --- a/H316/h316_stddev.c +++ b/H316/h316_stddev.c @@ -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; diff --git a/H316/h316_sys.c b/H316/h316_sys.c index ca4ff61e..c9b6e54e 100644 --- a/H316/h316_sys.c +++ b/H316/h316_sys.c @@ -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 */ diff --git a/HP2100/hp2100_baci.c b/HP2100/hp2100_baci.c index 063705a6..878a6eff 100644 --- a/HP2100/hp2100_baci.c +++ b/HP2100/hp2100_baci.c @@ -1157,11 +1157,11 @@ if (baci_edsiw & (baci_status ^ baci_dsrw) & IN_MODEM) /* device interrupt? */ baci_status = baci_status | IN_DEVINT; /* set flag */ if ((baci_status & IN_STDIRQ) || /* standard interrupt? */ - !(baci_icw & OUT_DCPC) && /* or under program control */ - (baci_status & IN_FIFOIRQ) || /* and FIFO interrupt? */ - (IO_MODE == RECV) && /* or receiving */ + (!(baci_icw & OUT_DCPC) && /* or under program control */ + (baci_status & IN_FIFOIRQ)) || /* and FIFO interrupt? */ + ((IO_MODE == RECV) && /* or receiving */ (baci_edsiw & OUT_ENCM) && /* and char mode */ - (baci_fget != baci_fput)) { /* and FIFO not empty? */ + (baci_fget != baci_fput))) { /* and FIFO not empty? */ if (baci.lockout) { /* interrupt lockout? */ if (DEBUG_PRI (baci_dev, DEB_CMDS)) @@ -1185,8 +1185,8 @@ if ((baci_status & IN_STDIRQ) || /* standard interrupt? * } if ((baci_icw & OUT_DCPC) && /* DCPC enabled? */ - ((IO_MODE == XMIT) && (baci_fcount < 128) || /* and xmit and room in FIFO */ - (IO_MODE == RECV) && (baci_fcount > 0))) { /* or recv and data in FIFO? */ + (((IO_MODE == XMIT) && (baci_fcount < 128)) || /* and xmit and room in FIFO */ + ((IO_MODE == RECV) && (baci_fcount > 0)))) { /* or recv and data in FIFO? */ if (baci.lockout) { /* interrupt lockout? */ if (DEBUG_PRI (baci_dev, DEB_CMDS)) @@ -1472,9 +1472,9 @@ if (baci_uart_clk > 0) { /* transfer in progress? if ((IO_MODE == XMIT) && /* transmit mode? */ ((baci_uart_clk == 0) || /* and end of character? */ - (baci_uart_clk == 8) && /* or last stop bit */ - (baci_cfcw & OUT_STBITS) && /* and extra stop bit requested */ - ((baci_cfcw & OUT_CHARSIZE) == 0))) { /* and 1.5 stop bits used? */ + ((baci_uart_clk == 8) && /* or last stop bit */ + (baci_cfcw & OUT_STBITS) && /* and extra stop bit requested */ + ((baci_cfcw & OUT_CHARSIZE) == 0)))) { /* and 1.5 stop bits used? */ baci_uart_clk = 0; /* clear clock count */ diff --git a/HP2100/hp2100_cpu.c b/HP2100/hp2100_cpu.c index 7ccb3c4e..5fba8699 100644 --- a/HP2100/hp2100_cpu.c +++ b/HP2100/hp2100_cpu.c @@ -1054,7 +1054,7 @@ for (i = OPTDEV; i <= MAXDEV; i++) /* default optional devi dtab [PWR] = &pwrf_dib; /* for now, powerfail is always present */ -for (i = 0; dptr = sim_devices [i]; i++) { /* loop thru dev */ +for (i = 0; (dptr = sim_devices [i]); i++) { /* loop thru dev */ dibptr = (DIB *) dptr->ctxt; /* get DIB */ if (dibptr && !(dptr->flags & DEV_DIS)) { /* handler exists and device is enabled? */ @@ -1464,17 +1464,17 @@ while (reason == SCPE_OK) { /* loop until halted */ */ if ((sim_idle_enab) && (intrq == 0)) /* idle enabled w/o pending irq? */ - if (((PC == err_PC) || /* RTE through RTE-IVB */ - ((PC == (err_PC - 1)) && /* RTE-6/VM */ - ((ReadW (PC) & I_MRG) == I_ISZ))) && /* RTE jump target */ - (mp_fence == CLEAR) && (M [xeqt] == 0) && /* RTE idle indications */ - (M [tbg] == clk_dib.select_code) || /* RTE verification */ + if ((((PC == err_PC) || /* RTE through RTE-IVB */ + ((PC == (err_PC - 1)) && /* RTE-6/VM */ + ((ReadW (PC) & I_MRG) == I_ISZ))) && /* RTE jump target */ + (mp_fence == CLEAR) && (M [xeqt] == 0) && /* RTE idle indications */ + (M [tbg] == clk_dib.select_code)) || /* RTE verification */ - (PC == (err_PC - 3)) && /* DOS through DOS-III */ - (ReadW (PC) == I_STF) && /* DOS jump target */ - (AR == 0177777) && (BR == 0177777) && /* DOS idle indication */ - (M [m64] == 0177700) && /* DOS verification */ - (M [p64] == 0000100)) /* DOS verification */ + ((PC == (err_PC - 3)) && /* DOS through DOS-III */ + (ReadW (PC) == I_STF) && /* DOS jump target */ + (AR == 0177777) && (BR == 0177777) && /* DOS idle indication */ + (M [m64] == 0177700) && /* DOS verification */ + (M [p64] == 0000100))) /* DOS verification */ sim_idle (TMR_POLL, FALSE); /* idle the simulator */ break; @@ -3351,7 +3351,7 @@ t_stat status; uint32 ioresult; IOCYCLE signals; -if (bytes && !even || dma [ch].cw3 != DMASK) { /* normal cycle? */ +if ((bytes && !even) || (dma [ch].cw3 != DMASK)) { /* normal cycle? */ if (input) /* input cycle? */ signals = ioIOI | ioCLF; /* assert IOI and CLF */ else /* output cycle */ @@ -3611,7 +3611,7 @@ uint32 i, j, k; t_bool is_conflict = FALSE; uint32 conflicts[MAXDEV + 1] = { 0 }; -for (i = 0; dptr = sim_devices[i]; i++) { +for (i = 0; (dptr = sim_devices[i]); i++) { dibptr = (DIB *) dptr->ctxt; if (dibptr && !(dptr->flags & DEV_DIS)) if (++conflicts[dibptr->select_code] > 1) @@ -3629,7 +3629,7 @@ if (is_conflict) { if (sim_log) fprintf (sim_log, "Select code %o conflict:", i); - for (j = 0; dptr = sim_devices[j]; j++) { + for (j = 0; (dptr = sim_devices[j]); j++) { dibptr = (DIB *) dptr->ctxt; if (dibptr && !(dptr->flags & DEV_DIS) && (i == dibptr->select_code)) { if (k < conflicts[i]) { diff --git a/HP2100/hp2100_cpu0.c b/HP2100/hp2100_cpu0.c index 838d2883..f2506c97 100644 --- a/HP2100/hp2100_cpu0.c +++ b/HP2100/hp2100_cpu0.c @@ -130,7 +130,7 @@ uint32 entry; entry = IR & 017; /* mask to entry point */ if (op_ds[entry] != OP_N) - if (reason = cpu_ops (op_ds[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_ds[entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<3:0> */ @@ -191,23 +191,23 @@ switch (IR) { switch ((IR >> 4) & 037) { /* decode IR<8:4> */ -/* case 000: /* 105000-105017 */ -/* return cpu_user_00 (IR, intrq); /* uncomment to handle instruction */ +/* case 000: *//* 105000-105017 */ +/* return cpu_user_00 (IR, intrq); *//* uncomment to handle instruction */ -/* case 001: /* 105020-105037 */ -/* return cpu_user_01 (IR, intrq); /* uncomment to handle instruction */ +/* case 001: *//* 105020-105037 */ +/* return cpu_user_01 (IR, intrq); *//* uncomment to handle instruction */ -/* case 0nn: /* other cases as needed */ -/* return cpu_user_nn (IR, intrq); /* uncomment to handle instruction */ +/* case 0nn: *//* other cases as needed */ +/* return cpu_user_nn (IR, intrq); *//* uncomment to handle instruction */ case 020: /* 10x400-10x417 */ return cpu_user_20 (IR, intrq); /* call sample dispatcher */ -/* case 021: /* 10x420-10x437 */ -/* return cpu_user_21 (IR, intrq); /* uncomment to handle instruction */ +/* case 021: *//* 10x420-10x437 */ +/* return cpu_user_21 (IR, intrq); *//* uncomment to handle instruction */ -/* case 0nn: /* other cases as needed */ -/* return cpu_user_nn (IR, intrq); /* uncomment to handle instruction */ +/* case 0nn: *//* other cases as needed */ +/* return cpu_user_nn (IR, intrq); *//* uncomment to handle instruction */ default: /* others undefined */ reason = stop_inst; @@ -244,19 +244,19 @@ uint32 entry; entry = IR & 017; /* mask to entry point */ if (op_user_20 [entry] != OP_N) - if (reason = cpu_ops (op_user_20 [entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_user_20 [entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<4:0> */ case 000: /* 10x400 */ -/* break; /* uncomment to handle instruction */ +/* break; *//* uncomment to handle instruction */ case 001: /* 10x401 */ -/* break; /* uncomment to handle instruction */ +/* break; *//* uncomment to handle instruction */ -/* case 0nn: /* other cases as needed */ -/* break; /* uncomment to handle instruction */ +/* case 0nn: *//* other cases as needed */ +/* break; *//* uncomment to handle instruction */ default: /* others undefined */ reason = stop_inst; diff --git a/HP2100/hp2100_cpu1.c b/HP2100/hp2100_cpu1.c index d176db83..338d1ba9 100644 --- a/HP2100/hp2100_cpu1.c +++ b/HP2100/hp2100_cpu1.c @@ -245,7 +245,7 @@ switch ((IR >> 8) & 0377) { /* decode IR<15:8> */ case 010: /* MPY 100200 (OP_K) */ MPY: - if (reason = cpu_ops (OP_K, op, intrq)) /* get operand */ + if ((reason = cpu_ops (OP_K, op, intrq))) /* get operand */ break; sop1 = SEXT (AR); /* sext AR */ sop2 = SEXT (op[0].word); /* sext mem */ @@ -262,9 +262,9 @@ switch ((IR >> 8) & 0377) { /* decode IR<15:8> */ break; case 0201: /* DIV 100400 (OP_K) */ - if (reason = cpu_ops (OP_K, op, intrq)) /* get operand */ + if ((reason = cpu_ops (OP_K, op, intrq))) /* get operand */ break; - if (rs = qs = BR & SIGN) { /* save divd sign, neg? */ + if ((rs = qs = BR & SIGN)) { /* save divd sign, neg? */ AR = (~AR + 1) & DMASK; /* make B'A pos */ BR = (~BR + (AR == 0)) & DMASK; /* make divd pos */ } @@ -317,14 +317,14 @@ switch ((IR >> 8) & 0377) { /* decode IR<15:8> */ break; case 0210: /* DLD 104200 (OP_D) */ - if (reason = cpu_ops (OP_D, op, intrq)) /* get operand */ + if ((reason = cpu_ops (OP_D, op, intrq))) /* get operand */ break; AR = (op[0].dword >> 16) & DMASK; /* load AR */ BR = op[0].dword & DMASK; /* load BR */ break; case 0211: /* DST 104400 (OP_A) */ - if (reason = cpu_ops (OP_A, op, intrq)) /* get operand */ + if ((reason = cpu_ops (OP_A, op, intrq))) /* get operand */ break; WriteW (op[0].word, AR); /* store AR */ WriteW ((op[0].word + 1) & VAMASK, BR); /* store BR */ @@ -734,7 +734,7 @@ for (i = 0; i < OP_N_F; i++) { flags = pattern & OP_M_FLAGS; /* get operand pattern */ if (flags >= OP_ADR) /* address operand? */ - if (reason = resolve (ReadW (PC), &MA, irq)) /* resolve indirects */ + if ((reason = resolve (ReadW (PC), &MA, irq))) /* resolve indirects */ return reason; switch (flags) { diff --git a/HP2100/hp2100_cpu2.c b/HP2100/hp2100_cpu2.c index e5dac17c..464452ae 100644 --- a/HP2100/hp2100_cpu2.c +++ b/HP2100/hp2100_cpu2.c @@ -244,7 +244,7 @@ absel = (IR & I_AB)? 1: 0; /* get A/B select */ entry = IR & 037; /* mask to entry point */ if (op_dms[entry] != OP_N) - if (reason = cpu_ops (op_dms[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_dms[entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<3:0> */ @@ -610,7 +610,7 @@ absel = (IR & I_AB)? 1: 0; /* get A/B select */ entry = IR & 037; /* mask to entry point */ if (op_eig[entry] != OP_N) - if (reason = cpu_ops (op_eig[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_eig[entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<4:0> */ @@ -989,7 +989,7 @@ else if (entry <= 057) /* IR = 10x440-457? */ entry = entry - 060; /* offset 10x460-477 */ if (op_iop[entry] != OP_N) - if (reason = cpu_ops (op_iop[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_iop[entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<5:0> */ diff --git a/HP2100/hp2100_cpu3.c b/HP2100/hp2100_cpu3.c index 028e6857..036a3d82 100644 --- a/HP2100/hp2100_cpu3.c +++ b/HP2100/hp2100_cpu3.c @@ -186,7 +186,7 @@ entry = IR & 037; /* mask to entry point * if (UNIT_CPU_MODEL != UNIT_1000_F) { /* 2100/M/E-Series? */ if (op_ffp_e[entry] != OP_N) - if (reason = cpu_ops (op_ffp_e[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_ffp_e[entry], op, intrq)))/* get instruction operands */ return reason; } @@ -194,7 +194,7 @@ if (UNIT_CPU_MODEL != UNIT_1000_F) { /* 2100/M/E-Series? */ else { /* F-Series */ if (op_ffp_f[entry] != OP_N) - if (reason = cpu_ops (op_ffp_f[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_ffp_f[entry], op, intrq)))/* get instruction operands */ return reason; switch (entry) { /* decode IR<4:0> */ @@ -417,7 +417,7 @@ switch (entry) { /* decode IR<4:0> */ sa = op[0].word - 1; da = ReadW (sa); /* get jump target */ - if (reason = resolve (da, &MA, intrq)) { /* resolve indirects */ + if ((reason = resolve (da, &MA, intrq))) { /* resolve indirects */ PC = err_PC; /* irq restarts instruction */ break; } @@ -435,7 +435,7 @@ switch (entry) { /* decode IR<4:0> */ op[1].word = op[1].word + /* compute element offset */ (op[2].word - 1) * op[3].word; else { /* 3-dim access */ - if (reason = cpu_ops (OP_KK, op2, intrq)) { /* get 1st, 2nd ranges */ + if ((reason = cpu_ops (OP_KK, op2, intrq))) {/* get 1st, 2nd ranges */ PC = err_PC; /* irq restarts instruction */ break; } @@ -461,7 +461,7 @@ switch (entry) { /* decode IR<4:0> */ for (j = 0; j < sc; j++) { MA = ReadW (sa++); /* get addr of actual */ - if (reason = resolve (MA, &MA, intrq)) { /* resolve indirect */ + if ((reason = resolve (MA, &MA, intrq))) { /* resolve indirect */ PC = err_PC; /* irq restarts instruction */ break; } @@ -644,7 +644,7 @@ t_stat reason = SCPE_OK; entry = IR & 017; /* mask to entry point */ if (op_dbi[entry] != OP_N) - if (reason = cpu_ops (op_dbi[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_dbi[entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<3:0> */ diff --git a/HP2100/hp2100_cpu4.c b/HP2100/hp2100_cpu4.c index 3da7a9d3..2f8cba77 100644 --- a/HP2100/hp2100_cpu4.c +++ b/HP2100/hp2100_cpu4.c @@ -261,7 +261,7 @@ else entry = opcode & 0177; /* map to <6:0> */ if (op_fpp[entry] != OP_N) - if (reason = cpu_ops (op_fpp[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_fpp[entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<6:0> */ @@ -600,7 +600,7 @@ static const OP t_one = { { 0040000, 0000000, 0000000, 0000002 } }; /* DEY 1. entry = IR & 017; /* mask to entry point */ if (op_sis[entry] != OP_N) - if (reason = cpu_ops (op_sis[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_sis[entry], op, intrq))) /* get instruction operands */ return reason; switch (entry) { /* decode IR<3:0> */ diff --git a/HP2100/hp2100_cpu5.c b/HP2100/hp2100_cpu5.c index 9865f47a..3e70d92d 100644 --- a/HP2100/hp2100_cpu5.c +++ b/HP2100/hp2100_cpu5.c @@ -650,7 +650,7 @@ entry = IR & 017; /* mask to entry point */ pattern = op_vma[entry]; /* get operand pattern */ if (pattern != OP_N) - if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */ return reason; if (debug) { /* debugging? */ @@ -1361,7 +1361,7 @@ entry = IR & 017; /* mask to entry point * pattern = op_ema[entry]; /* get operand pattern */ if (pattern != OP_N) - if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */ return reason; if (debug) { /* debugging? */ diff --git a/HP2100/hp2100_cpu6.c b/HP2100/hp2100_cpu6.c index 5606a178..4baa952f 100644 --- a/HP2100/hp2100_cpu6.c +++ b/HP2100/hp2100_cpu6.c @@ -394,10 +394,10 @@ entry = IR & 017; /* mask to entry point * pattern = op_os[entry]; /* get operand pattern */ if (pattern != OP_N) - if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */ return reason; -tbg_tick = tbg_tick || (IR == 0105357) && iotrap; /* set TBG interrupting flag */ +tbg_tick = tbg_tick || ((IR == 0105357) && iotrap); /* set TBG interrupting flag */ debug_print = (DEBUG_PRI (cpu_dev, DEB_OS) && !tbg_tick) || (DEBUG_PRI (cpu_dev, DEB_OSTBG) && tbg_tick); @@ -544,7 +544,7 @@ switch (entry) { /* decode IR<3:0> */ for (i = 0; i < count; i++) { ma = ReadW (PC); /* get operand address */ - if (reason = resolve (ma, &ma, intrq)) { /* resolve indirect */ + if ((reason = resolve (ma, &ma, intrq))) { /* resolve indirect */ PC = err_PC; /* IRQ restarts instruction */ break; } @@ -620,8 +620,8 @@ switch (entry) { /* decode IR<3:0> */ while ((AR != 0) && ((AR & SIGN) == 0)) { /* end of list or bad list? */ key = ReadW ((AR + op[1].word) & VAMASK); /* get key value */ - if ((E == 0) && (key == op[0].word) || /* for E = 0, key = arg? */ - (E != 0) && (key > op[0].word)) /* for E = 1, key > arg? */ + if (((E == 0) && (key == op[0].word)) || /* for E = 0, key = arg? */ + ((E != 0) && (key > op[0].word))) /* for E = 1, key > arg? */ break; /* search is done */ BR = AR; /* B = last link */ @@ -710,7 +710,7 @@ switch (entry) { /* decode IR<3:0> */ ma = ReadW (sa); /* get addr of actual */ sa = (sa + 1) & VAMASK; /* increment address */ - if (reason = resolve (ma, &ma, intrq)) { /* resolve indirect */ + if ((reason = resolve (ma, &ma, intrq))) { /* resolve indirect */ PC = err_PC; /* irq restarts instruction */ break; } diff --git a/HP2100/hp2100_cpu7.c b/HP2100/hp2100_cpu7.c index ada35eab..cf3f2c76 100644 --- a/HP2100/hp2100_cpu7.c +++ b/HP2100/hp2100_cpu7.c @@ -391,7 +391,7 @@ if (pattern != OP_N) rtn = rtn1 = ret.word; /* but save it just in case */ PC = (PC + 1) & VAMASK; /* move to next argument */ } - if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */ return reason; if (debug) { /* debugging? */ @@ -653,7 +653,7 @@ t_bool debug = DEBUG_PRI (cpu_dev, DEB_SIG); entry = IR & 017; /* mask to entry point */ if (op_signal[entry] != OP_N) - if (reason = cpu_ops (op_signal[entry], op, intrq)) /* get instruction operands */ + if ((reason = cpu_ops (op_signal[entry], op, intrq)))/* get instruction operands */ return reason; if (debug) { /* debugging? */ diff --git a/HP2100/hp2100_di.c b/HP2100/hp2100_di.c index 98cc4ef0..2238d356 100644 --- a/HP2100/hp2100_di.c +++ b/HP2100/hp2100_di.c @@ -1466,10 +1466,10 @@ if (assert != deny) /* was there any change previous_state = di_card->srq; /* save the current SRQ state */ -if (di_card->cntl_register & CNTL_LSTN /* if the card is a listener */ - && di_card->status_register & STAT_IRL /* and the input register is loaded, */ - || di_card->cntl_register & CNTL_TALK /* or the card is a talker */ - && ! FIFO_FULL) /* and the FIFO is not full */ +if (((di_card->cntl_register & CNTL_LSTN) && /* if the card is a listener */ + (di_card->status_register & STAT_IRL)) || /* and the input register is loaded, */ + ((di_card->cntl_register & CNTL_TALK) && /* or the card is a talker */ + ! FIFO_FULL)) /* and the FIFO is not full */ di_card->srq = SET; /* then request a DCPC cycle */ else di_card->srq = CLEAR; /* otherwise, DCPC service is not needed */ @@ -1481,21 +1481,21 @@ if (DEBUG_PRJ (dptrs [card], DEB_CMDS) dptrs [card]->name, di_card->srq == SET ? "set" : "cleared"); -if (di_card->status_register & STAT_IRL /* is the input register loaded */ - && di_card->cntl_register & CNTL_IRL /* and notification is wanted? */ - || di_card->status_register & STAT_LBO /* or is the last byte out */ - && di_card->cntl_register & CNTL_LBO /* and notification is wanted? */ - || di_card->eor == SET /* or was the end of record seen */ - && !(di_card->status_register & STAT_IRL) /* and the input register was unloaded? */ - || di_card->bus_cntl & BUS_SRQ /* or is SRQ asserted on the bus */ - && di_card->cntl_register & CNTL_SRQ /* and notification is wanted */ - && di_card->cntl_register & CNTL_CIC /* and the card is not controller? */ - || !SW8_SYSCTL /* or is the card not the system controller */ - && di_card->bus_cntl & BUS_REN /* and REN is asserted on the bus */ - && di_card->cntl_register & CNTL_REN /* and notification is wanted? */ - || !SW8_SYSCTL /* or is the card not the system controller */ - && di_card->status_register & STAT_IFC /* and IFC is asserted on the bus */ - && di_card->cntl_register & CNTL_IFC) { /* and notification is wanted? */ +if (((di_card->status_register & STAT_IRL) && /* is the input register loaded */ + (di_card->cntl_register & CNTL_IRL)) || /* and notification is wanted? */ + ((di_card->status_register & STAT_LBO) && /* or is the last byte out */ + (di_card->cntl_register & CNTL_LBO)) || /* and notification is wanted? */ + ((di_card->eor == SET) && /* or was the end of record seen */ + !(di_card->status_register & STAT_IRL)) || /* and the input register was unloaded? */ + ((di_card->bus_cntl & BUS_SRQ) && /* or is SRQ asserted on the bus */ + (di_card->cntl_register & CNTL_SRQ) && /* and notification is wanted */ + (di_card->cntl_register & CNTL_CIC)) || /* and the card is not controller? */ + (!SW8_SYSCTL && /* or is the card not the system controller */ + (di_card->bus_cntl & BUS_REN) && /* and REN is asserted on the bus */ + (di_card->cntl_register & CNTL_REN)) || /* and notification is wanted? */ + (!SW8_SYSCTL && /* or is the card not the system controller */ + (di_card->status_register & STAT_IFC) && /* and IFC is asserted on the bus */ + (di_card->cntl_register & CNTL_IFC))) { /* and notification is wanted? */ if (DEBUG_PRJ (dptrs [card], DEB_CMDS)) fprintf (sim_deb, ">>%s cmds: Flag set\n", diff --git a/HP2100/hp2100_di_da.c b/HP2100/hp2100_di_da.c index 005a6215..eea57d72 100644 --- a/HP2100/hp2100_di_da.c +++ b/HP2100/hp2100_di_da.c @@ -1594,10 +1594,10 @@ if (di [da].bus_cntl & BUS_ATN) { /* is it a bus comma da_unit [unit].wait = icd_cntlr [unit].cmd_time; /* these are always scheduled and */ initiated = TRUE; /* logged as initiated */ - if (if_state [unit] == read_wait /* if we're waiting for a send data secondary */ - && message_address != 0x00 /* but it's not there */ - || if_state [unit] == status_wait /* or a send status secondary, */ - && message_address != 0x08) /* but it's not there */ + if (((if_state [unit] == read_wait) && /* if we're waiting for a send data secondary */ + (message_address != 0x00)) || /* but it's not there */ + ((if_state [unit] == status_wait) && /* or a send status secondary, */ + (message_address != 0x08))) /* but it's not there */ abort_command (unit, io_program_error, /* then abort the pending command */ idle); /* and process the new command */ diff --git a/HP2100/hp2100_dp.c b/HP2100/hp2100_dp.c index c26d16e6..c6877dca 100644 --- a/HP2100/hp2100_dp.c +++ b/HP2100/hp2100_dp.c @@ -190,7 +190,7 @@ #define STA_PROT 0002000 /* protected (13210) */ #define STA_SKI 0001000 /* incomplete NI (u) */ #define STA_SKE 0000400 /* seek error */ -/* 0000200 /* unused */ +/* 0000200 *//* unused */ #define STA_NRDY 0000100 /* not ready (d) */ #define STA_EOC 0000040 /* end of cylinder */ #define STA_AER 0000020 /* addr error */ @@ -694,7 +694,7 @@ void dp_goc (int32 fnc, int32 drv, int32 time) { int32 t; -if (t = sim_is_active (&dpc_unit[drv])) { /* still seeking? */ +if ((t = sim_is_active (&dpc_unit[drv]))) { /* still seeking? */ sim_cancel (&dpc_unit[drv]); /* stop seek */ dpc_sta[drv] = dpc_sta[drv] & ~STA_BSY; /* clear busy */ time = time + t; /* include seek time */ @@ -906,10 +906,10 @@ switch (uptr->FNC) { /* case function */ dpc_rarh = dpc_rarh ^ 1; /* incr head */ dpc_eoc = ((dpc_rarh & 1) == 0); /* calc eoc */ } - if (err = fseek (uptr->fileref, da * sizeof (int16), - SEEK_SET)) break; + if ((err = fseek (uptr->fileref, da * sizeof (int16), + SEEK_SET))) break; fxread (dpxb, sizeof (int16), DP_NUMWD, uptr->fileref); - if (err = ferror (uptr->fileref)) break; + if ((err = ferror (uptr->fileref))) break; } dpd_ibuf = dpxb[dp_ptr++]; /* get word */ if (dp_ptr >= DP_NUMWD) { /* end of sector? */ @@ -953,10 +953,10 @@ switch (uptr->FNC) { /* case function */ dpc_rarh = dpc_rarh ^ 1; /* incr head */ dpc_eoc = ((dpc_rarh & 1) == 0); /* calc eoc */ } - if (err = fseek (uptr->fileref, da * sizeof (int16), - SEEK_SET)) break; + if ((err = fseek (uptr->fileref, da * sizeof (int16), + SEEK_SET))) break; fxwrite (dpxb, sizeof (int16), DP_NUMWD, uptr->fileref); - if (err = ferror (uptr->fileref)) break; /* error? */ + if ((err = ferror (uptr->fileref))) break; /* error? */ dp_ptr = 0; /* next sector */ } if (dpd.command && dpd_xfer) /* dch on, xfer? */ diff --git a/HP2100/hp2100_dq.c b/HP2100/hp2100_dq.c index 06c92b2b..24b8f303 100644 --- a/HP2100/hp2100_dq.c +++ b/HP2100/hp2100_dq.c @@ -100,7 +100,7 @@ #define CW_V_FNC 12 /* function */ #define CW_M_FNC 017 #define CW_GETFNC(x) (((x) >> CW_V_FNC) & CW_M_FNC) -/* 000 /* unused */ +/* 000 *//* unused */ #define FNC_STA 001 /* status check */ #define FNC_RCL 002 /* recalibrate */ #define FNC_SEEK 003 /* seek */ @@ -530,7 +530,7 @@ void dq_goc (int32 fnc, int32 drv, int32 time) { int32 t; -if (t = sim_is_active (&dqc_unit[drv])) { /* still seeking? */ +if ((t = sim_is_active (&dqc_unit[drv]))) { /* still seeking? */ sim_cancel (&dqc_unit[drv]); /* cancel */ time = time + t; /* include seek time */ } @@ -740,10 +740,10 @@ switch (uptr->FNC) { /* case function */ dqc_rars = (dqc_rars + 1) % DQ_NUMSC; /* incr sector */ if (dqc_rars == 0) /* wrap? incr head */ dqc_uhed[drv] = dqc_rarh = dqc_rarh + 1; - if (err = fseek (uptr->fileref, da * sizeof (int16), - SEEK_SET)) break; + if ((err = fseek (uptr->fileref, da * sizeof (int16), + SEEK_SET))) break; fxread (dqxb, sizeof (int16), DQ_NUMWD, uptr->fileref); - if (err = ferror (uptr->fileref)) break; + if ((err = ferror (uptr->fileref))) break; } dqd_ibuf = dqxb[dq_ptr++]; /* get word */ if (dq_ptr >= DQ_NUMWD) { /* end of sector? */ @@ -786,10 +786,10 @@ switch (uptr->FNC) { /* case function */ dqc_rars = (dqc_rars + 1) % DQ_NUMSC; /* incr sector */ if (dqc_rars == 0) /* wrap? incr head */ dqc_uhed[drv] = dqc_rarh = dqc_rarh + 1; - if (err = fseek (uptr->fileref, da * sizeof (int16), - SEEK_SET)) return TRUE; + if ((err = fseek (uptr->fileref, da * sizeof (int16), + SEEK_SET))) return TRUE; fxwrite (dqxb, sizeof (int16), DQ_NUMWD, uptr->fileref); - if (err = ferror (uptr->fileref)) break; + if ((err = ferror (uptr->fileref))) break; dq_ptr = 0; } if (dqd.command && dqd_xfer) { /* dch on, xfer? */ diff --git a/HP2100/hp2100_ipl.c b/HP2100/hp2100_ipl.c index 595d47e9..a01b4881 100644 --- a/HP2100/hp2100_ipl.c +++ b/HP2100/hp2100_ipl.c @@ -623,7 +623,7 @@ uptr->filename = tptr; /* save */ sim_activate (uptr, POLL_FIRST); /* activate first poll "immediately" */ if (sim_switches & SWMASK ('W')) { /* wait? */ for (i = 0; i < 30; i++) { /* check for 30 sec */ - if (t = ipl_check_conn (uptr)) /* established? */ + if ((t = ipl_check_conn (uptr))) /* established? */ break; if ((i % 10) == 0) /* status every 10 sec */ printf ("Waiting for connnection\n"); diff --git a/HP2100/hp2100_mpx.c b/HP2100/hp2100_mpx.c index a4d91dd9..b61572dd 100644 --- a/HP2100/hp2100_mpx.c +++ b/HP2100/hp2100_mpx.c @@ -1926,8 +1926,8 @@ if (fast_binary_read) { /* fast binary read else { /* normal service */ tmxr_poll_tx (&mpx_desc); /* output any accumulated characters */ - if ((buf_avail (iowrite, port) < 2) && /* more to transmit? */ - !(mpx_flags [port] & (FL_WAITACK | FL_XOFF)) || /* and transmission not suspended */ + if (((buf_avail (iowrite, port) < 2) && /* more to transmit? */ + !(mpx_flags [port] & (FL_WAITACK | FL_XOFF))) || /* and transmission not suspended */ tmxr_rqln (&mpx_ldsc [port])) /* or more to receive? */ sim_activate (uptr, uptr->wait); /* reschedule service */ else diff --git a/HP2100/hp2100_ms.c b/HP2100/hp2100_ms.c index c78c5e0c..bc24f172 100644 --- a/HP2100/hp2100_ms.c +++ b/HP2100/hp2100_ms.c @@ -737,7 +737,7 @@ switch (uptr->FNC) { /* case on function */ fprintf (sim_deb, ">>MSC svc: Unit %d wrote initial gap\n", unum); - if (st = ms_write_gap (uptr)) { /* write initial gap; error? */ + if ((st = ms_write_gap (uptr))) { /* write initial gap; error? */ r = ms_map_err (uptr, st); /* map error */ break; /* terminate operation */ } @@ -747,13 +747,13 @@ switch (uptr->FNC) { /* case on function */ fprintf (sim_deb, ">>MSC svc: Unit %d wrote file mark\n", unum); - if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = ms_map_err (uptr, st); /* map error */ msc_sta = STA_EOF; /* set EOF status */ break; case FNC_FSR: /* space forward */ - if (st = sim_tape_sprecf (uptr, &tbc)) /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) /* space rec fwd, err? */ r = ms_map_err (uptr, st); /* map error */ if (tbc & 1) msc_sta = msc_sta | STA_ODD; @@ -761,7 +761,7 @@ switch (uptr->FNC) { /* case on function */ break; case FNC_BSR: /* space reverse */ - if (st = sim_tape_sprecr (uptr, &tbc)) /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rec rev, err? */ r = ms_map_err (uptr, st); /* map error */ if (tbc & 1) msc_sta = msc_sta | STA_ODD; @@ -831,7 +831,7 @@ switch (uptr->FNC) { /* case on function */ fprintf (sim_deb, ">>MSC svc: Unit %d wrote initial gap\n", unum); - if (st = ms_write_gap (uptr)) { /* write initial gap; error? */ + if ((st = ms_write_gap (uptr))) { /* write initial gap; error? */ r = ms_map_err (uptr, st); /* map error */ break; /* terminate operation */ } @@ -855,7 +855,7 @@ switch (uptr->FNC) { /* case on function */ fprintf (sim_deb, ">>MSC svc: Unit %d wrote %d word record\n", unum, ms_ptr / 2); - if (st = sim_tape_wrrecf (uptr, msxb, ms_ptr)) { /* write, err? */ + if ((st = sim_tape_wrrecf (uptr, msxb, ms_ptr))) { /* write, err? */ r = ms_map_err (uptr, st); /* map error */ break; } @@ -894,7 +894,7 @@ t_stat st; uint32 gap_len = ms_ctype ? GAP_13183 : GAP_13181; /* establish gap length */ uint32 tape_bpi = ms_ctype ? BPI_13183 : BPI_13181; /* establish nominal bpi */ -if (st = sim_tape_wrgap (uptr, gap_len, tape_bpi)) /* write gap */ +if ((st = sim_tape_wrgap (uptr, gap_len, tape_bpi))) /* write gap */ return ms_map_err (uptr, st); /* map error if failure */ else return SCPE_OK; @@ -974,7 +974,7 @@ for (i = 0; i < MS_NUMDR; i++) { /* look for write in pro fprintf (sim_deb, ">>MSC rws: Unit %d wrote %d word partial record\n", i, ms_ptr / 2); - if (st = sim_tape_wrrecf (uptr, msxb, ms_ptr | MTR_ERF)) + if ((st = sim_tape_wrrecf (uptr, msxb, ms_ptr | MTR_ERF))) ms_map_err (uptr, st); /* discard any error */ ms_ptr = 0; /* clear partial */ diff --git a/HP2100/hp2100_mt.c b/HP2100/hp2100_mt.c index 72066de9..ecdfbf80 100644 --- a/HP2100/hp2100_mt.c +++ b/HP2100/hp2100_mt.c @@ -495,7 +495,7 @@ switch (mtc_fnc) { /* case on function */ return sim_tape_detach (uptr); /* don't set cch flg */ case FNC_WFM: /* 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 */ mtc_sta = STA_EOF; /* set EOF status */ break; @@ -504,12 +504,12 @@ switch (mtc_fnc) { /* case on function */ break; case FNC_FSR: /* space forward */ - if (st = sim_tape_sprecf (uptr, &tbc)) /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) /* space rec fwd, err? */ r = mt_map_err (uptr, st); /* map error */ break; case FNC_BSR: /* space reverse */ - if (st = sim_tape_sprecr (uptr, &tbc)) /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rec rev, err? */ r = mt_map_err (uptr, st); /* map error */ break; @@ -558,7 +558,7 @@ switch (mtc_fnc) { /* case on function */ return SCPE_OK; } if (mt_ptr) { /* write buffer */ - 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; /* done */ } @@ -627,7 +627,7 @@ t_stat st; if (sim_is_active (&mtc_unit) && /* write in prog? */ (mtc_fnc == FNC_WC) && (mt_ptr > 0)) { /* yes, bad rec */ - if (st = sim_tape_wrrecf (&mtc_unit, mtxb, mt_ptr | MTR_ERF)) + if ((st = sim_tape_wrrecf (&mtc_unit, mtxb, mt_ptr | MTR_ERF))) mt_map_err (&mtc_unit, st); } diff --git a/HP2100/hp2100_stddev.c b/HP2100/hp2100_stddev.c index 92208b00..9664be58 100644 --- a/HP2100/hp2100_stddev.c +++ b/HP2100/hp2100_stddev.c @@ -942,7 +942,7 @@ t_stat r; if (tty_mode & TM_PRI) { /* printing? */ c = sim_tt_outcvt (c, TT_GET_MODE (tty_unit[TTO].flags)); if (c >= 0) { /* valid? */ - if (r = sim_putchar_s (c)) return r; /* output char */ + if ((r = sim_putchar_s (c))) return r; /* output char */ tty_unit[TTO].pos = tty_unit[TTO].pos + 1; } } diff --git a/HP2100/hp2100_sys.c b/HP2100/hp2100_sys.c index c6cd201c..e47687c0 100644 --- a/HP2100/hp2100_sys.c +++ b/HP2100/hp2100_sys.c @@ -608,11 +608,11 @@ if (opcode[i]) { /* found opcode? */ case I_V_MRF: /* mem ref */ cptr = get_glyph (cptr, gbuf, 0); /* get next field */ - if (k = (strcmp (gbuf, "C") == 0)) { /* C specified? */ + if ((k = (strcmp (gbuf, "C") == 0))) { /* C specified? */ val[0] = val[0] | I_CP; 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, ','); } if ((d = get_addr (gbuf)) < 0) return SCPE_ARG; diff --git a/HP2100/hp_disclib.c b/HP2100/hp_disclib.c index f5218ff6..7f69af4c 100644 --- a/HP2100/hp_disclib.c +++ b/HP2100/hp_disclib.c @@ -761,8 +761,8 @@ else { /* for an ICD controller uptr = units + unit_limit; /* and we use the indicated unit */ } -if (props->unit_check && !uptr /* if the unit number is checked and is invalid */ - || props->seek_wait && (drive_status (uptr) & DL_S2STOPS)) { /* or if we're waiting for an offline drive */ +if ((props->unit_check && !uptr) || /* if the unit number is checked and is invalid */ + (props->seek_wait && (drive_status (uptr) & DL_S2STOPS))) { /* or if we're waiting for an offline drive */ dl_end_command (cvptr, status_2_error); /* then the command ends with a Status-2 error */ uptr = NULL; /* prevent the command from starting */ } @@ -1879,8 +1879,8 @@ static void start_write (CVPTR cvptr, UNIT *uptr) { const t_bool verify = (CNTLR_OPCODE) uptr->OP == write; /* only Write verifies the sector address */ -if ((uptr->flags & UNIT_WPROT) /* is the unit write protected, */ - || !verify && !(uptr->flags & UNIT_FMT)) /* or is formatting required but not enabled? */ +if ((uptr->flags & UNIT_WPROT) || /* is the unit write protected, */ + (!verify && !(uptr->flags & UNIT_FMT))) /* or is formatting required but not enabled? */ dl_end_command (cvptr, status_2_error); /* terminate the write with an error */ else if (position_sector (cvptr, uptr, verify)) { /* writing is permitted; position the sector */ diff --git a/I1401/i1401_cd.c b/I1401/i1401_cd.c index 0c7eaa5b..7bd64b70 100644 --- a/I1401/i1401_cd.c +++ b/I1401/i1401_cd.c @@ -184,7 +184,7 @@ t_stat r; if (sim_is_active (&cdr_unit)) { /* busy? */ sim_cancel (&cdr_unit); /* cancel */ - if (r = cdr_svc (&cdr_unit)) /* process */ + if ((r = cdr_svc (&cdr_unit))) /* process */ return r; } if ((cdr_unit.flags & UNIT_ATT) == 0) /* attached? */ diff --git a/I1401/i1401_cpu.c b/I1401/i1401_cpu.c index 6868556b..fdc787bd 100644 --- a/I1401/i1401_cpu.c +++ b/I1401/i1401_cpu.c @@ -547,7 +547,7 @@ while (reason == 0) { /* loop until halted */ saved_IS = IS; /* commit prev instr */ if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) + if ((reason = sim_process_event ())) break; } @@ -1039,7 +1039,7 @@ CHECK_LENGTH: */ case OP_R: /* read */ - if (reason = iomod (ilnt, D, r_mod)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, r_mod))) /* valid modifier? */ break; reason = read_card (ilnt, D); /* read card */ BS = CDR_BUF + CDR_WIDTH; @@ -1049,7 +1049,7 @@ CHECK_LENGTH: break; case OP_W: /* write */ - if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */ break; reason = write_line (ilnt, D); /* print line */ BS = LPT_BUF + LPT_WIDTH; @@ -1059,7 +1059,7 @@ CHECK_LENGTH: break; case OP_P: /* punch */ - if (reason = iomod (ilnt, D, p_mod)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, p_mod))) /* valid modifier? */ break; reason = punch_card (ilnt, D); /* punch card */ BS = CDP_BUF + CDP_WIDTH; @@ -1069,7 +1069,7 @@ CHECK_LENGTH: break; case OP_WR: /* write and read */ - if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */ break; reason = write_line (ilnt, D); /* print line */ r1 = read_card (ilnt, D); /* read card */ @@ -1082,7 +1082,7 @@ CHECK_LENGTH: break; case OP_WP: /* write and punch */ - if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */ break; reason = write_line (ilnt, D); /* print line */ r1 = punch_card (ilnt, D); /* punch card */ @@ -1095,7 +1095,7 @@ CHECK_LENGTH: break; case OP_RP: /* read and punch */ - if (reason = iomod (ilnt, D, NULL)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, NULL))) /* valid modifier? */ break; reason = read_card (ilnt, D); /* read card */ r1 = punch_card (ilnt, D); /* punch card */ @@ -1108,7 +1108,7 @@ CHECK_LENGTH: break; case OP_WRP: /* write, read, punch */ - if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */ break; reason = write_line (ilnt, D); /* print line */ r1 = read_card (ilnt, D); /* read card */ @@ -1122,9 +1122,9 @@ CHECK_LENGTH: break; case OP_SS: /* select stacker */ - if (reason = iomod (ilnt, D, ss_mod)) /* valid modifier? */ + if ((reason = iomod (ilnt, D, ss_mod))) /* valid modifier? */ break; - if (reason = select_stack (D)) /* sel stack, error? */ + if ((reason = select_stack (D))) /* sel stack, error? */ break; if ((ilnt == 4) || (ilnt == 5)) { /* check for branch */ BRANCH; @@ -1132,7 +1132,7 @@ CHECK_LENGTH: break; case OP_CC: /* carriage control */ - if (reason = carriage_control (D)) /* car ctrl, error? */ + if ((reason = carriage_control (D))) /* car ctrl, error? */ break; if ((ilnt == 4) || (ilnt == 5)) { /* check for branch */ BRANCH; @@ -1154,7 +1154,7 @@ CHECK_LENGTH: reason = STOP_INVL; else if (ioind != BCD_PERCNT) /* valid dev addr? */ reason = STOP_INVA; - else if (reason = iomod (ilnt, D, mtf_mod)) /* valid modifier? */ + else if ((reason = iomod (ilnt, D, mtf_mod))) /* valid modifier? */ break; if (dev == IO_MT) /* BCD? */ reason = mt_func (unit, 0, D); diff --git a/I1401/i1401_dp.c b/I1401/i1401_dp.c index 81739b94..d45c8287 100644 --- a/I1401/i1401_dp.c +++ b/I1401/i1401_dp.c @@ -269,7 +269,7 @@ switch (fnc) { /* case on function */ for (;;) { /* loop */ qzr = (--cnt == 0); /* set zero latch */ dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* redo count */ - if (r = dp_rdsec (uptr, psec, flg, qwc)) /* read sector */ + if ((r = dp_rdsec (uptr, psec, flg, qwc))) /* read sector */ break; cnt = dp_get_cnt (dcf); /* get new count */ if (cnt < 0) /* bad count? */ @@ -278,7 +278,7 @@ switch (fnc) { /* case on function */ break; sec++; psec++; /* next sector */ dp_cvt_bin (dcf + DCF_SEC, DCF_SEC_LEN, sec, flg); /* rewr sec */ - if (r = dp_nexsec (uptr, psec, dcf)) /* find next */ + if ((r = dp_nexsec (uptr, psec, dcf))) /* find next */ break; } break; /* done, clean up */ @@ -289,9 +289,9 @@ switch (fnc) { /* case on function */ for (;;) { /* loop */ qzr = (--cnt == 0); /* set zero latch */ dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* redo count */ - if (r = dp_rdadr (uptr, psec, flg, qwc)) /* read addr */ + if ((r = dp_rdadr (uptr, psec, flg, qwc))) /* read addr */ break; /* error? */ - if (r = dp_rdsec (uptr, psec, flg, qwc)) /* read data */ + if ((r = dp_rdsec (uptr, psec, flg, qwc))) /* read data */ break; /* error? */ cnt = dp_get_cnt (dcf); /* get new count */ if (cnt < 0) /* bad count? */ @@ -312,13 +312,13 @@ switch (fnc) { /* case on function */ for (;;) { /* loop */ qzr = (--cnt == 0); /* set zero latch */ dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* rewr cnt */ - if (r = dp_wrsec (uptr, psec, flg)) /* write data */ + if ((r = dp_wrsec (uptr, psec, flg))) /* write data */ break; if (qzr) /* zero latch? done */ break; sec++; psec++; /* next sector */ dp_cvt_bin (dcf + DCF_SEC, DCF_SEC_LEN, sec, flg); /* rewr sec */ - if (r = dp_nexsec (uptr, psec, dcf)) /* find next */ + if ((r = dp_nexsec (uptr, psec, dcf))) /* find next */ break; } break; /* done, clean up */ @@ -331,9 +331,9 @@ switch (fnc) { /* case on function */ for (;;) { /* loop */ qzr = (--cnt == 0); /* set zero latch */ dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* redo count */ - if (r = dp_wradr (uptr, psec, flg)) /* write addr */ + if ((r = dp_wradr (uptr, psec, flg))) /* write addr */ break; - if (r = dp_wrsec (uptr, psec, flg)) /* write data */ + if ((r = dp_wrsec (uptr, psec, flg))) /* write data */ break; if (qzr) /* zero latch? done */ break; diff --git a/I1401/i1401_mt.c b/I1401/i1401_mt.c index fcd2dea1..df7b8574 100644 --- a/I1401/i1401_mt.c +++ b/I1401/i1401_mt.c @@ -451,7 +451,7 @@ int32 i; UNIT *uptr; for (i = 0; i < MT_NUMDR; i++) { /* per drive resets */ - if (uptr = mt_sel_unit (i)) { + if ((uptr = mt_sel_unit (i))) { MT_CLR_PNU (uptr); /* clear pos flag */ } } diff --git a/I1620/i1620_cpu.c b/I1620/i1620_cpu.c index 4bf36b49..49b02106 100644 --- a/I1620/i1620_cpu.c +++ b/I1620/i1620_cpu.c @@ -476,7 +476,7 @@ while (reason == 0) { /* loop until halted */ saved_PC = PC; /* commit prev instr */ if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) + if ((reason = sim_process_event ())) break; } diff --git a/I1620/i1620_dp.c b/I1620/i1620_dp.c index 1f8390cb..c524eac7 100644 --- a/I1620/i1620_dp.c +++ b/I1620/i1620_dp.c @@ -206,7 +206,7 @@ switch (f1 & ~(FNC_WCH | FNC_NRL)) { /* case on function */ if (psec < 0) /* error? */ CRETIOE (dp_stop, STOP_DACERR); do { /* loop on count */ - if (r = dp_rdsec (uptr, psec, qnr, qwc)) /* read sector */ + if ((r = dp_rdsec (uptr, psec, qnr, qwc))) /* read sector */ break; sec++; psec++; /* next sector */ } while ((--cnt > 0) && @@ -216,9 +216,9 @@ switch (f1 & ~(FNC_WCH | FNC_NRL)) { /* case on function */ case FNC_TRK: /* read track */ psec = dp_trkop (drv, sec); /* start of track */ for (cnt = 0; cnt < DP_NUMSC; cnt++) { /* full track */ - if (r = dp_rdadr (uptr, psec, qnr, qwc)) /* read addr */ + if ((r = dp_rdadr (uptr, psec, qnr, qwc))) /* read addr */ break; /* error? */ - if (r = dp_rdsec (uptr, psec, qnr, qwc)) /* read data */ + if ((r = dp_rdsec (uptr, psec, qnr, qwc))) /* read data */ break; /* error? */ psec = dp_trkop (drv, sec) + ((psec + 1) % DP_NUMSC); } @@ -231,9 +231,9 @@ switch (f1 & ~(FNC_WCH | FNC_NRL)) { /* case on function */ if (psec < 0) /* error? */ CRETIOE (dp_stop, STOP_DACERR); do { /* loop on count */ - if (r = dp_tstgm (M[dp_ba], qnr)) /* start with gm? */ + if ((r = dp_tstgm (M[dp_ba], qnr))) /* start with gm? */ break; - if (r = dp_wrsec (uptr, psec, qnr)) /* write data */ + if ((r = dp_wrsec (uptr, psec, qnr))) /* write data */ break; sec++; psec++; /* next sector */ } while ((--cnt > 0) && @@ -245,11 +245,11 @@ switch (f1 & ~(FNC_WCH | FNC_NRL)) { /* case on function */ return STOP_WRADIS; psec = dp_trkop (drv, sec); /* start of track */ for (cnt = 0; cnt < DP_NUMSC; cnt++) { /* full track */ - if (r = dp_tstgm (M[dp_ba], qnr)) /* start with gm? */ + if ((r = dp_tstgm (M[dp_ba], qnr))) /* start with gm? */ break; - if (r = dp_wradr (uptr, psec, qnr)) /* write addr */ + if ((r = dp_wradr (uptr, psec, qnr))) /* write addr */ break; - if (r = dp_wrsec (uptr, psec, qnr)) /* write data */ + if ((r = dp_wrsec (uptr, psec, qnr))) /* write data */ break; psec = dp_trkop (drv, sec) + ((psec + 1) % DP_NUMSC); } diff --git a/I1620/i1620_sys.c b/I1620/i1620_sys.c index df247342..198d29e7 100644 --- a/I1620/i1620_sys.c +++ b/I1620/i1620_sys.c @@ -552,7 +552,7 @@ if (I_GETQP (opfl) != I_M_QNP) { /* Q field allowed? */ cptr = get_glyph (cptr, fptr = gbuf, ' '); /* get flag field */ last = -1; /* none yet */ -while (t = *fptr++) { /* loop through */ +while ((t = *fptr++)) { /* loop through */ if ((t < '0') || (t > '9')) /* must be digit */ return SCPE_ARG; t = t - '0'; /* convert */ diff --git a/I1620/i1620_tty.c b/I1620/i1620_tty.c index 648beeef..ac4a1021 100644 --- a/I1620/i1620_tty.c +++ b/I1620/i1620_tty.c @@ -260,7 +260,7 @@ do { *c = 0x7F; else if ((raw == '~') || (raw == '`')) /* flag? mark */ flg = FLAG; - else if (cp = strchr (tti_to_num, raw)) /* legal? */ + else if ((cp = strchr (tti_to_num, raw))) /* legal? */ *c = ((int8) (cp - tti_to_num)) | flg; /* assemble char */ else raw = 007; /* beep! */ tto_write (raw); /* echo */ diff --git a/I7094/i7094_com.c b/I7094/i7094_com.c index b5c7b29d..8f0d4e7c 100644 --- a/I7094/i7094_com.c +++ b/I7094/i7094_com.c @@ -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) diff --git a/I7094/i7094_cpu.c b/I7094/i7094_cpu.c index f1d46462..4dbd5882 100644 --- a/I7094/i7094_cpu.c +++ b/I7094/i7094_cpu.c @@ -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); diff --git a/I7094/i7094_dsk.c b/I7094/i7094_dsk.c index 4c605c81..70107ca9 100644 --- a/I7094/i7094_dsk.c +++ b/I7094/i7094_dsk.c @@ -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; } } diff --git a/I7094/i7094_io.c b/I7094/i7094_io.c index e4e81d13..391debfa 100644 --- a/I7094/i7094_io.c +++ b/I7094/i7094_io.c @@ -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; diff --git a/I7094/i7094_mt.c b/I7094/i7094_mt.c index edf1d06b..dddf2531 100644 --- a/I7094/i7094_mt.c +++ b/I7094/i7094_mt.c @@ -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 */ diff --git a/Interdata/id16_cpu.c b/Interdata/id16_cpu.c index f3ec00ad..2a5605c2 100644 --- a/Interdata/id16_cpu.c +++ b/Interdata/id16_cpu.c @@ -604,7 +604,7 @@ while (reason == 0) { /* loop until halted */ int32 sr, st; if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) + if ((reason = sim_process_event ())) break; int_eval (); } diff --git a/Interdata/id32_cpu.c b/Interdata/id32_cpu.c index 7af43c61..6b874df3 100644 --- a/Interdata/id32_cpu.c +++ b/Interdata/id32_cpu.c @@ -664,7 +664,7 @@ while (reason == 0) { /* loop until halted */ int32 sr, st; if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) + if ((reason = sim_process_event ())) break; int_eval (); } diff --git a/Interdata/id_dp.c b/Interdata/id_dp.c index a62bf33f..cf3f82c2 100644 --- a/Interdata/id_dp.c +++ b/Interdata/id_dp.c @@ -419,7 +419,7 @@ switch (dp_cmd & 0x7) { /* case on func */ if (sch_actv (dp_dib.sch, dp_dib.dno)) { /* sch transfer? */ if (dp_dter (uptr, dp_1st)) /* check xfr err */ return SCPE_OK; - if (r = dp_rds (uptr)) /* read sec, err? */ + if ((r = dp_rds (uptr))) /* read sec, err? */ return r; dp_1st = 0; t = sch_wrmem (dp_dib.sch, dpxb, DP_NUMBY); /* write to memory */ @@ -438,7 +438,7 @@ switch (dp_cmd & 0x7) { /* case on func */ return SCPE_OK; dp_bptr = sch_rdmem (dp_dib.sch, dpxb, DP_NUMBY); /* read from mem */ dp_db = dpxb[dp_bptr - 1]; /* last byte */ - if (r = dp_wds (uptr)) /* write sec, err? */ + if ((r = dp_wds (uptr))) /* write sec, err? */ return r; dp_1st = 0; if (sch_actv (dp_dib.sch, dp_dib.dno)) { /* more to do? */ diff --git a/Interdata/id_idc.c b/Interdata/id_idc.c index 67beb2a4..f888ba6a 100644 --- a/Interdata/id_idc.c +++ b/Interdata/id_idc.c @@ -576,7 +576,7 @@ switch (uptr->FNC & CMC_MASK) { /* case on func */ if (sch_actv (idc_dib.sch, idc_dib.dno)) { /* sch transfer? */ if (idc_dter (uptr, idc_1st)) /* dte? done */ return SCPE_OK; - if (r = idc_rds (uptr)) /* read sec, err? */ + if ((r = idc_rds (uptr))) /* read sec, err? */ return r; idc_1st = 0; t = sch_wrmem (idc_dib.sch, idcxb, IDC_NUMBY); /* write mem */ @@ -595,7 +595,7 @@ switch (uptr->FNC & CMC_MASK) { /* case on func */ return SCPE_OK; idc_bptr = sch_rdmem (idc_dib.sch, idcxb, IDC_NUMBY); /* read mem */ idc_db = idcxb[idc_bptr - 1]; /* last byte */ - if (r = idc_wds (uptr)) /* write sec, err? */ + if ((r = idc_wds (uptr))) /* write sec, err? */ return r; idc_1st = 0; if (sch_actv (idc_dib.sch, idc_dib.dno)) { /* more to do? */ diff --git a/Interdata/id_io.c b/Interdata/id_io.c index 86228eda..4ba20a23 100644 --- a/Interdata/id_io.c +++ b/Interdata/id_io.c @@ -358,7 +358,7 @@ if ((r != SCPE_OK) || (newmax == sch_max)) /* err or no chg? */ if (newmax == 0) /* must be > 0 */ return SCPE_ARG; if (newmax < sch_max) { /* reducing? */ - for (i = 0; dptr = sim_devices[i]; i++) { /* loop thru dev */ + for (i = 0; (dptr = sim_devices[i]); i++) { /* loop thru dev */ dibp = (DIB *) dptr->ctxt; /* get DIB */ if (dibp && (dibp->sch >= (int32) newmax)) { /* dev using chan? */ printf ("Device %02X uses channel %d\n", @@ -439,7 +439,7 @@ int32 i, j, t; uint32 r; for (i = t = 0; i < INTSZ; i++) { /* loop thru array */ - if (r = int_req[i] & int_enb[i]) { /* find nz int wd */ + if ((r = int_req[i] & int_enb[i])) { /* find nz int wd */ for (j = 0; j < 32; t++, j++) { if (r & (1u << j)) { int_req[i] = int_req[i] & ~(1u << j); /* clr request */ @@ -630,7 +630,7 @@ for (i = 0; i < (DEVNO / 32); i++) /* Test each device for conflict; add to map; init tables */ -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; diff --git a/Interdata/id_mt.c b/Interdata/id_mt.c index fce949fa..f71a5f18 100644 --- a/Interdata/id_mt.c +++ b/Interdata/id_mt.c @@ -368,13 +368,13 @@ switch (uptr->UCMD) { /* case on function */ } if (mt_bptr) { /* any chars? */ - if (st = sim_tape_wrrecf (uptr, mtxb, mt_bptr)) /* write, err? */ + if ((st = sim_tape_wrrecf (uptr, mtxb, mt_bptr)))/* write, err? */ r = mt_map_err (uptr, st); /* map error */ } break; /* record done */ case MTC_WEOF: /* write eof */ - 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 */ mt_sta = mt_sta | STA_EOF; /* set eof */ if (mt_arm[u]) /* set intr */ @@ -402,7 +402,7 @@ switch (uptr->UCMD) { /* case on function */ break; case MTC_SPCR: /* backspace */ - if (st = sim_tape_sprecr (uptr, &tbc)) /* skip rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) /* skip rec rev, err? */ r = mt_map_err (uptr, st); /* map error */ break; } /* end case */ diff --git a/Interdata/id_pas.c b/Interdata/id_pas.c index dfc27ccf..3e2d105a 100644 --- a/Interdata/id_pas.c +++ b/Interdata/id_pas.c @@ -334,7 +334,7 @@ if (ln >= 0) { /* got one? */ tmxr_poll_rx (&pas_desc); /* poll for input */ for (ln = 0; ln < PAS_ENAB; ln++) { /* loop thru lines */ if (pas_ldsc[ln].conn) { /* connected? */ - if (c = tmxr_getc_ln (&pas_ldsc[ln])) { /* any char? */ + if ((c = tmxr_getc_ln (&pas_ldsc[ln]))) { /* any char? */ pas_sta[ln] = pas_sta[ln] & ~(STA_FR | STA_PF); if (pas_rchp[ln]) pas_sta[ln] = pas_sta[ln] | STA_OVR; diff --git a/LGP/lgp_cpu.c b/LGP/lgp_cpu.c index 6b969306..27f2746c 100644 --- a/LGP/lgp_cpu.c +++ b/LGP/lgp_cpu.c @@ -288,7 +288,7 @@ if (lgp21_sov) { /* stop sense pending? * do { if (sim_interval <= 0) { /* check clock queue */ - if (r = sim_process_event ()) + if ((r = sim_process_event ())) break; } @@ -308,7 +308,7 @@ do { PC = (PC + 1) & AMASK; /* increment PC */ sim_interval = sim_interval - 1; - if (r = cpu_one_inst (oPC, IR)) { /* one instr; error? */ + if ((r = cpu_one_inst (oPC, IR))) { /* one instr; error? */ if (r == STOP_STALL) { /* stall? */ PC = oPC; /* back up PC */ delay = r = 0; /* no delay */ @@ -744,7 +744,7 @@ if (cptr) { else inst = IR; while ((r = cpu_one_inst (PC, inst)) == STOP_STALL) { sim_interval = 0; - if (r = sim_process_event ()) + if ((r = sim_process_event ())) return r; } return r; diff --git a/LGP/lgp_stddev.c b/LGP/lgp_stddev.c index 2dba6cc1..f86ac096 100644 --- a/LGP/lgp_stddev.c +++ b/LGP/lgp_stddev.c @@ -394,7 +394,7 @@ t_stat ttr_svc (UNIT *uptr) { t_stat r; -if (r = read_reader (uptr, ttr_stopioe, (int32 *) &tti_buf)) +if ((r = read_reader (uptr, ttr_stopioe, (int32 *) &tti_buf))) return r; if (!(uptr->flags & UNIT_NOCS) && /* cstop enable? */ (tti_buf == FLEX_CSTOP)) /* cond stop? */ @@ -415,7 +415,7 @@ t_stat ptr_svc (UNIT *uptr) { t_stat r; -if (r = read_reader (uptr, ptr_stopioe, &uptr->buf)) +if ((r = read_reader (uptr, ptr_stopioe, &uptr->buf))) return r; if (uptr->buf == FLEX_CSTOP) /* cond stop? */ inp_done = 1; @@ -548,7 +548,7 @@ else { ch = '\b'; else ch = flex_to_ascii[flex | (tto_uc << 6)]; /* cvt flex to ascii */ if (ch > 0) { /* legit? */ - if (r = sim_putchar_s (ch)) /* write char */ + if ((r = sim_putchar_s (ch))) /* write char */ return r; tto_unit[0].pos = tto_unit[0].pos + 1; if (flex == FLEX_CR) { /* cr? */ diff --git a/LGP/lgp_sys.c b/LGP/lgp_sys.c index f445e202..083a3025 100644 --- a/LGP/lgp_sys.c +++ b/LGP/lgp_sys.c @@ -363,7 +363,7 @@ if ((sw & SWMASK ('L')) || /* LGP hex? */ return SCPE_OK; if (islower (c)) c = toupper (c); - if (tptr = strchr (hex_decode, c)) + if ((tptr = strchr (hex_decode, c))) val[0] = (val[0] << 4) | (tptr - hex_decode); else return SCPE_ARG; } @@ -388,7 +388,7 @@ else sgn = 0; cptr = get_glyph (cptr, gbuf, 0); /* get opcode */ if (gbuf[1] != 0) return SCPE_ARG; -if (tptr = strchr (opcode, gbuf[0])) +if ((tptr = strchr (opcode, gbuf[0]))) val[0] = ((tptr - opcode) << I_V_OP) | sgn; /* merge opcode */ else return SCPE_ARG; cptr = get_glyph (cptr, gbuf, 0); /* get address */ diff --git a/NOVA/eclipse_cpu.c b/NOVA/eclipse_cpu.c index 2e9efc42..c855cc55 100644 --- a/NOVA/eclipse_cpu.c +++ b/NOVA/eclipse_cpu.c @@ -744,7 +744,7 @@ if (MapInit == 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; } diff --git a/NOVA/nova_dkp.c b/NOVA/nova_dkp.c index 7335b4d0..c027022f 100644 --- a/NOVA/nova_dkp.c +++ b/NOVA/nova_dkp.c @@ -908,7 +908,7 @@ do { if (uptr->FUNC == FCCY_READ) { /* read? */ awc = fxread (tbuf, sizeof(uint16), DKP_NUMWD, uptr->fileref); for ( ; awc < DKP_NUMWD; awc++) tbuf[awc] = 0; - if (err = ferror (uptr->fileref)) + if ((err = ferror (uptr->fileref))) break; for (dx = 0; dx < DKP_NUMWD; dx++) { /* loop thru buffer */ pa = MapAddr (dkp_map, (dkp_ma & AMASK)); @@ -924,7 +924,7 @@ do { dkp_ma = (dkp_ma + 1) & AMASK; } fxwrite (tbuf, sizeof(int16), DKP_NUMWD, uptr->fileref); - if (err = ferror (uptr->fileref)) + if ((err = ferror (uptr->fileref))) break; } diff --git a/NOVA/nova_mta.c b/NOVA/nova_mta.c index 5ad56bf5..25a9ec1e 100644 --- a/NOVA/nova_mta.c +++ b/NOVA/nova_mta.c @@ -412,7 +412,7 @@ else switch (c) { /* case on command */ mtxb[p++] = M[pa] & 0377; mta_ma = (mta_ma + 1) & AMASK; } - if (st = sim_tape_wrrecf (uptr, mtxb, tbc)) { /* write rec, err? */ + if ((st = sim_tape_wrrecf (uptr, mtxb, tbc))) { /* write rec, err? */ r = mta_map_err (uptr, st); /* map error */ mta_ma = (mta_ma - wc) & AMASK; /* restore wc */ } @@ -421,7 +421,7 @@ else switch (c) { /* case on command */ break; case CU_WREOF: /* write eof */ - if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = mta_map_err (uptr, st); /* map error */ else mta_upddsta (uptr, uptr->USTAT | STA_EOF | STA_RDY); break; @@ -435,7 +435,7 @@ else switch (c) { /* case on command */ case CU_SPACEF: /* space forward */ do { mta_wc = (mta_wc + 1) & DMASK; /* incr wc */ - if (st = sim_tape_sprecf (uptr, &tbc)) { /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) { /* space rec fwd, err? */ r = mta_map_err (uptr, st); /* map error */ break; } @@ -447,7 +447,7 @@ else switch (c) { /* case on command */ case CU_SPACER: /* space reverse */ do { mta_wc = (mta_wc + 1) & DMASK; /* incr wc */ - if (st = sim_tape_sprecr (uptr, &tbc)) { /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) { /* space rec rev, err? */ r = mta_map_err (uptr, st); /* map error */ break; } diff --git a/NOVA/nova_tt1.c b/NOVA/nova_tt1.c index 0b495651..cffad5e9 100644 --- a/NOVA/nova_tt1.c +++ b/NOVA/nova_tt1.c @@ -184,7 +184,7 @@ int32 temp, newln; if (tt1_ldsc.conn) { /* connected? */ tmxr_poll_rx (&tt_desc); /* poll for input */ - if (temp = tmxr_getc_ln (&tt1_ldsc)) { /* get char */ + if ((temp = tmxr_getc_ln (&tt1_ldsc))) { /* get char */ uptr->buf = temp & 0177; if ((uptr->flags & UNIT_DASHER) && (uptr->buf == '\r')) diff --git a/PDP1/pdp1_cpu.c b/PDP1/pdp1_cpu.c index 7be63f73..d52a6a31 100644 --- a/PDP1/pdp1_cpu.c +++ b/PDP1/pdp1_cpu.c @@ -546,7 +546,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; sbs_lvl = sbs_eval (); /* eval sbs system */ } @@ -610,25 +610,25 @@ while (reason == 0) { /* loop until halted */ /* Logical, load, store instructions */ case 001: /* AND */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = AC & MB; break; case 002: /* IOR */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = AC | MB; break; case 003: /* XOR */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = AC ^ MB; break; @@ -638,9 +638,9 @@ while (reason == 0) { /* loop until halted */ reason = STOP_XCT; break; } - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; xct_count = xct_count + 1; /* count XCT's */ IR = MB; /* get instruction */ @@ -648,9 +648,9 @@ while (reason == 0) { /* loop until halted */ case 005: /* LCH */ if (cpu_unit.flags & UNIT_1D) { /* PDP-1D? */ - if (reason = Ea_ch (IR, &byno)) /* MA <- eff addr */ + if ((reason = Ea_ch (IR, &byno))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = (MB << byt_shf[byno]) & 0770000; /* extract byte */ } @@ -659,9 +659,9 @@ while (reason == 0) { /* loop until halted */ case 006: /* DCH */ if (cpu_unit.flags & UNIT_1D) { /* PDP-1D? */ - if (reason = Ea_ch (IR, &byno)) /* MA <- eff addr */ + if ((reason = Ea_ch (IR, &byno))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; MB = (MB & ~(0770000 >> byt_shf[byno])) | /* insert byte */ ((AC & 0770000) >> byt_shf[byno]); @@ -683,55 +683,55 @@ while (reason == 0) { /* loop until halted */ break; case 010: /* LAC */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = MB; break; case 011: /* LIO */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; IO = MB; break; case 012: /* DAC */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; MB = AC; reason = Write (); break; case 013: /* DAP */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; MB = (AC & DAMASK) | (MB & ~DAMASK); reason = Write (); break; case 014: /* DIP */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; MB = (AC & ~DAMASK) | (MB & DAMASK); reason = Write (); break; case 015: /* DIO */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; MB = IO; reason = Write (); break; case 016: /* DZM */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; MB = 0; reason = Write (); @@ -755,9 +755,9 @@ while (reason == 0) { /* loop until halted */ case 017: /* TAD */ if (cpu_unit.flags & UNIT_1D) { /* PDP-1D? */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = AC + MB + ((PF & PF_L)? 1: 0); /* AC + opnd + L */ if (AC > DMASK) /* carry? set L */ @@ -769,9 +769,9 @@ while (reason == 0) { /* loop until halted */ break; case 020: /* ADD */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; t = AC; AC = AC + MB; @@ -784,9 +784,9 @@ while (reason == 0) { /* loop until halted */ break; case 021: /* SUB */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; t = AC ^ DMASK; /* complement AC */ AC = t + MB; /* -AC + MB */ @@ -798,9 +798,9 @@ while (reason == 0) { /* loop until halted */ break; case 022: /* IDX */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = MB + 1; if (AC >= DMASK) @@ -810,9 +810,9 @@ while (reason == 0) { /* loop until halted */ break; case 023: /* ISP */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; AC = MB + 1; if (AC >= DMASK) @@ -824,18 +824,18 @@ while (reason == 0) { /* loop until halted */ break; case 024: /* SAD */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; if (AC != MB) PC = INCR_ADDR (PC); break; case 025: /* SAS */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; if (AC == MB) PC = INCR_ADDR (PC); @@ -863,7 +863,7 @@ while (reason == 0) { /* loop until halted */ hst[hst_p].ea = PC; } else { /* normal JMP */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; PCQ_ENTRY; PC = MA; @@ -871,7 +871,7 @@ while (reason == 0) { /* loop until halted */ break; case 031: /* JSP */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; AC = EPC_WORD; PCQ_ENTRY; @@ -889,9 +889,9 @@ while (reason == 0) { /* loop until halted */ */ case 026: /* MUL */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; if (cpu_unit.flags & UNIT_MDV) { /* hardware? */ sign = AC ^ MB; /* result sign */ @@ -919,9 +919,9 @@ while (reason == 0) { /* loop until halted */ break; case 027: /* DIV */ - if (reason = Ea (IR)) /* MA <- eff addr */ + if ((reason = Ea (IR))) /* MA <- eff addr */ break; - if (reason = Read ()) /* MB <- data */ + if ((reason = Read ())) /* MB <- data */ break; if (cpu_unit.flags & UNIT_MDV) { /* hardware */ sign = AC ^ MB; /* result sign */ @@ -1362,13 +1362,13 @@ t_stat r; MA = (PC & EPCMASK) | (IR & DAMASK); /* direct address */ if (IR & IA) { /* indirect addr? */ if (extm) { /* extend? */ - if (r = Read ()) /* read; err? */ + if ((r = Read ())) /* read; err? */ return r; MA = MB & AMASK; /* one level */ } else { /* multi-level */ for (i = 0; i < ind_max; i++) { /* count indirects */ - if (r = Read ()) /* get ind word */ + if ((r = Read ())) /* get ind word */ return r; MA = (PC & EPCMASK) | (MB & DAMASK); if ((MB & IA) == 0) @@ -1392,12 +1392,12 @@ t_stat r; MA = (PC & EPCMASK) | (IR & DAMASK); /* direct address */ if (extm) { /* extend? */ - if (r = Read ()) /* read; err? */ + if ((r = Read ())) /* read; err? */ return r; } else { /* multi-level */ for (i = 0; i < ind_max; i++) { /* count indirects */ - if (r = Read ()) /* get ind word */ + if ((r = Read ())) /* get ind word */ return r; if ((MB & IA) == 0) break; diff --git a/PDP1/pdp1_dcs.c b/PDP1/pdp1_dcs.c index dd54ce18..93c9eefc 100644 --- a/PDP1/pdp1_dcs.c +++ b/PDP1/pdp1_dcs.c @@ -251,7 +251,7 @@ if (ln >= 0) { /* got one? */ tmxr_poll_rx (&dcs_desc); /* poll for input */ for (ln = 0; ln < DCS_NUMLIN; ln++) { /* loop thru lines */ if (dcs_ldsc[ln].conn) { /* connected? */ - if (c = tmxr_getc_ln (&dcs_ldsc[ln])) { /* get char */ + if ((c = tmxr_getc_ln (&dcs_ldsc[ln]))) { /* get char */ if (c & SCPE_BREAK) /* break? */ c = 0; else c = sim_tt_inpcvt (c, TT_GET_MODE (dcsl_unit[ln].flags)|TTUF_KSR); diff --git a/PDP10/pdp10_cpu.c b/PDP10/pdp10_cpu.c index 85e3e298..37cf218b 100644 --- a/PDP10/pdp10_cpu.c +++ b/PDP10/pdp10_cpu.c @@ -705,7 +705,7 @@ pager_tc = FALSE; /* not in trap cycle */ pflgs = 0; /* not in PXCT */ xct_cnt = 0; /* count XCT's */ if (sim_interval <= 0) { /* check clock queue */ - if (i = sim_process_event ()) /* error? stop sim */ + if ((i = sim_process_event ())) /* error? stop sim */ ABORT (i); pi_eval (); /* eval pi system */ } @@ -719,7 +719,7 @@ if (sim_interval <= 0) { /* check clock queue */ if (qintr) { int32 vec, uba; pager_pi = TRUE; /* flag in pi seq */ - if (vec = pi_ub_vec (qintr, &uba)) { /* Unibus interrupt? */ + if ((vec = pi_ub_vec (qintr, &uba))) { /* Unibus interrupt? */ mb = ReadP (epta + EPT_UBIT + uba); /* get dispatch table */ if (mb == 0) /* invalid? stop */ ABORT (STOP_ZERINT); @@ -2019,7 +2019,7 @@ int32 test_int (void) int32 t; if (sim_interval <= 0) { /* check queue */ - if (t = sim_process_event ()) /* IO event? */ + if ((t = sim_process_event ())) /* IO event? */ return t; if (pi_eval ()) /* interrupt? */ return (INTERRUPT); diff --git a/PDP10/pdp10_ksio.c b/PDP10/pdp10_ksio.c index b37e8039..e71f773c 100644 --- a/PDP10/pdp10_ksio.c +++ b/PDP10/pdp10_ksio.c @@ -401,7 +401,7 @@ uint32 pa = (uint32) ea; int32 i, n, val; DIB *dibp; -for (i = 0; dibp = dib_tab[i]; i++ ) { +for (i = 0; (dibp = dib_tab[i]); i++ ) { if ((pa >= dibp->ba) && (pa < (dibp->ba + dibp->lnt))) { dibp->rd (&val, pa, READ); @@ -418,7 +418,7 @@ uint32 pa = (uint32) ea; int32 i, n; DIB *dibp; -for (i = 0; dibp = dib_tab[i]; i++ ) { +for (i = 0; (dibp = dib_tab[i]); i++ ) { if ((pa >= dibp->ba) && (pa < (dibp->ba + dibp->lnt))) { dibp->wr ((int32) val, pa, mode); diff --git a/PDP10/pdp10_lp20.c b/PDP10/pdp10_lp20.c index 0de1cd9e..fec1cda6 100644 --- a/PDP10/pdp10_lp20.c +++ b/PDP10/pdp10_lp20.c @@ -563,7 +563,7 @@ lp20_unit.pos = ftell (lp20_unit.fileref); /* print 'n' newlines */ if (dvuadv) /* update DAVFU ptr */ dvptr = (dvptr + cnt) % dvlnt; if (davfu[dvptr] & (1 << DV_TOF)) { /* at top of form? */ - if (lppagc = (lppagc - 1) & PAGC_MASK) { /* decr page cntr */ + if ((lppagc = (lppagc - 1) & PAGC_MASK)) { /* decr page cntr */ lpcsa = lpcsa & ~CSA_PZRO; /* update status */ return TRUE; } @@ -592,7 +592,7 @@ for (i = 0; i < dvlnt; i++) { /* search DAVFU */ lp20_adv (1, FALSE); fputc ('\f', lp20_unit.fileref); /* print form feed */ lp20_unit.pos = ftell (lp20_unit.fileref); - if (lppagc = (lppagc - 1) & PAGC_MASK) { /* decr page cntr */ + if ((lppagc = (lppagc - 1) & PAGC_MASK)) { /* decr page cntr */ lpcsa = lpcsa & ~CSA_PZRO; /* update status */ return TRUE; } diff --git a/PDP10/pdp10_mdfp.c b/PDP10/pdp10_mdfp.c index 2aab8688..bf986e9d 100644 --- a/PDP10/pdp10_mdfp.c +++ b/PDP10/pdp10_mdfp.c @@ -493,7 +493,7 @@ if (a.fhi >= 2 * b.fhi) { /* will divide work? */ SETF (F_AOV | F_DCK | F_FOV | F_T1); return FALSE; } -if (savhi = a.fhi) { /* dvd = 0? quo = 0 */ +if ((savhi = a.fhi)) { /* dvd = 0? quo = 0 */ a.sign = a.sign ^ b.sign; /* result sign */ a.exp = a.exp - b.exp + FP_BIAS + 1; /* result exponent */ a.fhi = a.fhi / (b.fhi >> (FP_N_FHI + 1)); /* do divide */ diff --git a/PDP10/pdp10_rp.c b/PDP10/pdp10_rp.c index ad55f313..a5997728 100644 --- a/PDP10/pdp10_rp.c +++ b/PDP10/pdp10_rp.c @@ -951,7 +951,7 @@ switch (uptr->FUNC) { /* case on function */ if ((rpcs2 & CS2_UAI) == 0) ba = ba + 4; } - if (fc10 = twc10 & (RP_NUMWD - 1)) { /* fill? */ + if ((fc10 = twc10 & (RP_NUMWD - 1))) { /* fill? */ fc10 = RP_NUMWD - fc10; for (i = 0; i < fc10; i++) dbuf[twc10 + i] = 0; diff --git a/PDP10/pdp10_tu.c b/PDP10/pdp10_tu.c index 0e73ec13..6be277b8 100644 --- a/PDP10/pdp10_tu.c +++ b/PDP10/pdp10_tu.c @@ -833,7 +833,7 @@ switch (fnc) { /* case on function */ case FNC_SPACEF: /* space forward */ do { tufc = (tufc + 1) & 0177777; /* incr fc */ - if (st = sim_tape_sprecf (uptr, &tbc)) { /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) { /* space rec fwd, err? */ r = tu_map_err (uptr, st, 0); /* map error */ break; } @@ -847,7 +847,7 @@ switch (fnc) { /* case on function */ case FNC_SPACER: /* space reverse */ do { tufc = (tufc + 1) & 0177777; /* incr wc */ - if (st = sim_tape_sprecr (uptr, &tbc)) { /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) { /* space rec rev, err? */ r = tu_map_err (uptr, st, 0); /* map error */ break; } @@ -859,7 +859,7 @@ switch (fnc) { /* case on function */ break; case FNC_WREOF: /* write end of file */ - if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = tu_map_err (uptr, st, 0); /* map error */ tufs = tufs | FS_ATA; break; @@ -889,7 +889,7 @@ switch (fnc) { /* case on function */ if ((uptr->UDENS == TC_1600) && sim_tape_bot (uptr)) tufs = tufs | FS_ID; /* PE BOT? ID burst */ TXFR (ba, wc, 0); /* validate transfer */ - if (st = sim_tape_rdrecf (uptr, xbuf, &tbc, MT_MAXFR)) { /* read fwd */ + if ((st = sim_tape_rdrecf (uptr, xbuf, &tbc, MT_MAXFR))) {/* read fwd */ if (st == MTSE_TMK) /* TMK also sets FCE */ set_tuer (ER_FCE); r = tu_map_err (uptr, st, 1); /* map error */ @@ -936,7 +936,7 @@ switch (fnc) { /* case on function */ } /* end for */ if (j < fc) /* short record? */ fc = j; - if (st = sim_tape_wrrecf (uptr, xbuf, fc)) /* write rec, err? */ + if ((st = sim_tape_wrrecf (uptr, xbuf, fc))) /* write rec, err? */ r = tu_map_err (uptr, st, 1); /* map error */ else { tufc = (tufc + fc) & 0177777; @@ -951,7 +951,7 @@ switch (fnc) { /* case on function */ case FNC_WCHKR: /* wcheck = read */ tufc = 0; /* clear frame count */ TXFR (ba, wc, 1); /* validate xfer rev */ - if (st = sim_tape_rdrecr (uptr, xbuf + 4, &tbc, MT_MAXFR)) { /* read rev */ + if ((st = sim_tape_rdrecr (uptr, xbuf + 4, &tbc, MT_MAXFR))) {/* read rev */ if (st == MTSE_TMK) /* TMK also sets FCE */ set_tuer (ER_FCE); r = tu_map_err (uptr, st, 1); /* map error */ diff --git a/PDP11/pdp11_cis.c b/PDP11/pdp11_cis.c index 24dd0168..9f78f1bd 100644 --- a/PDP11/pdp11_cis.c +++ b/PDP11/pdp11_cis.c @@ -1134,7 +1134,7 @@ switch (op) { /* case on opcode */ result = (A2ADR << 16) | A2LNT; /* op in VAX format */ CVTLx: dst = Dstr0; /* clear result */ - if (dst.sign = GET_SIGN_L (result)) + if ((dst.sign = GET_SIGN_L (result))) result = (~result + 1) & 0xFFFFFFFF; for (i = 1; (i < (DSTRLNT * 8)) && result; i++) { digit = result % 10; @@ -1267,7 +1267,7 @@ for (i = 0; i < DSTRLNT; i++) { /* loop thru value */ mask = 0xFFFFFFFF; if (dst->val[i] & mask) /* test for ovflo */ V = 1; - if (dst->val[i] = dst->val[i] & ~mask) /* test nz */ + if ((dst->val[i] = dst->val[i] & ~mask)) /* test nz */ Z = 0; } dst->sign = dst->sign & ~unsignedtab[type] & ~(Z & ~V); @@ -1523,7 +1523,7 @@ uint32 NibbleRshift (DSTR *dsrc, int32 sc, uint32 cin) { int32 i, s, nc; -if (s = sc * 4) { +if ((s = sc * 4)) { for (i = DSTRMAX; i >= 0; i--) { nc = (dsrc->val[i] << (32 - s)) & 0xFFFFFFFF; dsrc->val[i] = ((dsrc->val[i] >> s) | @@ -1548,7 +1548,7 @@ int32 i, s; uint32 nc, cin; cin = 0; -if (s = sc * 4) { +if ((s = sc * 4)) { for (i = 0; i < DSTRLNT; i++) { nc = dsrc->val[i] >> (32 - s); dsrc->val[i] = ((dsrc->val[i] << s) | cin) & 0xFFFFFFFF; diff --git a/PDP11/pdp11_cpu.c b/PDP11/pdp11_cpu.c index 0ee91143..cc63549f 100644 --- a/PDP11/pdp11_cpu.c +++ b/PDP11/pdp11_cpu.c @@ -731,7 +731,7 @@ while (reason == 0) { if (trap_req) { /* check traps, ints */ trapea = 0; /* assume srch fails */ - if (t = trap_req & TRAP_ALL) { /* if a trap */ + if ((t = trap_req & TRAP_ALL)) { /* if a trap */ for (trapnum = 0; trapnum < TRAP_V_MAX; trapnum++) { if ((t >> trapnum) & 1) { /* trap set? */ trapea = trap_vec[trapnum]; /* get vec, clr */ @@ -1292,7 +1292,7 @@ while (reason == 0) { break; case 070: /* CSM */ - if (CPUT (HAS_CSM) && (MMR3 & MMR3_CSM) || (cm != MD_KER)) { + if ((CPUT (HAS_CSM) && (MMR3 & MMR3_CSM)) || (cm != MD_KER)) { dst = dstreg? R[dstspec]: ReadW (GeteaW (dstspec)); PSW = get_PSW () & ~PSW_CC; /* PSW, cc = 0 */ STACKFILE[cm] = SP; diff --git a/PDP11/pdp11_cpumod.c b/PDP11/pdp11_cpumod.c index 80a52dc4..faf5a2b2 100644 --- a/PDP11/pdp11_cpumod.c +++ b/PDP11/pdp11_cpumod.c @@ -1075,7 +1075,7 @@ t_stat r; for (i = 0; cnf_tab[i].dib != NULL; i++) { /* loop thru config tab */ if (((cnf_tab[i].cpum == 0) || (cpu_type & cnf_tab[i].cpum)) && ((cnf_tab[i].optm == 0) || (cpu_opt & cnf_tab[i].optm))) { - if (r = build_ubus_tab (&cpu_dev, cnf_tab[i].dib)) /* add to dispatch tab */ + if ((r = build_ubus_tab (&cpu_dev, cnf_tab[i].dib)))/* add to dispatch tab */ return r; } } diff --git a/PDP11/pdp11_dl.c b/PDP11/pdp11_dl.c index 2caf6832..ec8cc9ab 100644 --- a/PDP11/pdp11_dl.c +++ b/PDP11/pdp11_dl.c @@ -346,7 +346,7 @@ if (ln >= 0) { /* got one? rcv enb */ tmxr_poll_rx (&dlx_desc); /* poll for input */ for (ln = 0; ln < DLX_LINES; ln++) { /* loop thru lines */ if (dlx_ldsc[ln].conn) { /* connected? */ - if (temp = tmxr_getc_ln (&dlx_ldsc[ln])) { /* get char */ + if ((temp = tmxr_getc_ln (&dlx_ldsc[ln]))) { /* get char */ if (temp & SCPE_BREAK) /* break? */ c = DLIBUF_ERR|DLIBUF_RBRK; else c = sim_tt_inpcvt (temp, TT_GET_MODE (dlo_unit[ln].flags)); diff --git a/PDP11/pdp11_fp.c b/PDP11/pdp11_fp.c index 2d1db393..fe7c9660 100644 --- a/PDP11/pdp11_fp.c +++ b/PDP11/pdp11_fp.c @@ -438,7 +438,7 @@ switch ((IR >> 8) & 017) { /* decode IR<11:8> */ else fac.l = ReadI (GeteaFP (dstspec, leni), dstspec, leni); fac.h = 0; if (fac.l) { - if (sign = GET_SIGN_L (fac.l)) + if ((sign = GET_SIGN_L (fac.l))) fac.l = (fac.l ^ 0xFFFFFFFF) + 1; for (i = 0; GET_SIGN_L (fac.l) == 0; i++) fac.l = fac.l << 1; diff --git a/PDP11/pdp11_hk.c b/PDP11/pdp11_hk.c index 72aa9cfd..7d949d07 100644 --- a/PDP11/pdp11_hk.c +++ b/PDP11/pdp11_hk.c @@ -887,7 +887,7 @@ switch (fnc) { /* case on function */ err = fseek (uptr->fileref, da * sizeof (int16), SEEK_SET); if (uptr->FNC == FNC_WRITE) { /* write? */ if (hkcs2 & CS2_UAI) { /* no addr inc? */ - if (t = Map_ReadW (ba, 2, &comp)) { /* get 1st wd */ + if ((t = Map_ReadW (ba, 2, &comp))) { /* get 1st wd */ wc = 0; /* NXM, no xfr */ hkcs2 = hkcs2 | CS2_NEM; /* set nxm err */ } @@ -895,7 +895,7 @@ switch (fnc) { /* case on function */ hkxb[i] = comp; } else { /* normal */ - if (t = Map_ReadW (ba, wc << 1, hkxb)) { /* get buf */ + if ((t = Map_ReadW (ba, wc << 1, hkxb))) {/* get buf */ wc = wc - (t >> 1); /* NXM, adj wc */ hkcs2 = hkcs2 | CS2_NEM; /* set nxm err */ } @@ -915,13 +915,13 @@ switch (fnc) { /* case on function */ for ( ; i < wc; i++) /* fill buf */ hkxb[i] = 0; if (hkcs2 & CS2_UAI) { /* no addr inc? */ - if (t = Map_WriteW (ba, 2, &hkxb[wc - 1])) { + if ((t = Map_WriteW (ba, 2, &hkxb[wc - 1]))) { wc = 0; /* NXM, no xfr */ hkcs2 = hkcs2 | CS2_NEM; /* set nxm err */ } } else { /* normal */ - if (t = Map_WriteW (ba, wc << 1, hkxb)) { /* put buf */ + if ((t = Map_WriteW (ba, wc << 1, hkxb))) {/* put buf */ wc = wc - (t >> 1); /* NXM, adj wc */ hkcs2 = hkcs2 | CS2_NEM; /* set nxm err */ } diff --git a/PDP11/pdp11_io.c b/PDP11/pdp11_io.c index e5909413..66aca571 100644 --- a/PDP11/pdp11_io.c +++ b/PDP11/pdp11_io.c @@ -372,17 +372,17 @@ init_ubus_tab (); /* init Unibus tables */ init_mbus_tab (); /* init Massbus tables */ for (i = 0; i < 7; i++) /* seed PIRQ intr */ int_vec[i + 1][pirq_bit[i]] = VEC_PIRQ; -if (r = cpu_build_dib ()) /* build CPU entries */ +if ((r = cpu_build_dib ())) /* build CPU entries */ return r; for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { /* loop thru dev */ dibp = (DIB *) dptr->ctxt; /* get DIB */ if (dibp && !(dptr->flags & DEV_DIS)) { /* defined, enabled? */ if (dptr->flags & DEV_MBUS) { /* Massbus? */ - if (r = build_mbus_tab (dptr, dibp)) /* add to Mbus tab */ + if ((r = build_mbus_tab (dptr, dibp))) /* add to Mbus tab */ return r; } else { /* no, Unibus */ - if (r = build_ubus_tab (dptr, dibp)) /* add to Unibus tab */ + if ((r = build_ubus_tab (dptr, dibp))) /* add to Unibus tab */ return r; } } /* end if enabled */ diff --git a/PDP11/pdp11_ke.c b/PDP11/pdp11_ke.c index 711c1c30..c82ddeef 100644 --- a/PDP11/pdp11_ke.c +++ b/PDP11/pdp11_ke.c @@ -252,7 +252,7 @@ switch (PA & 017) { /* decode PA<3:0> */ data = data & 077; /* 6b shift count */ if (data != 0) { t32 = (ke_AC << 16) | ke_MQ; /* 32b operand */ - if (sign = GET_SIGN_W (ke_AC)) /* sext operand */ + if ((sign = GET_SIGN_W (ke_AC))) /* sext operand */ t32 = t32 | ~017777777777; if (data < 32) { /* [1,31] - left */ sout = (t32 >> (32 - data)) | (-sign << data); @@ -282,7 +282,7 @@ switch (PA & 017) { /* decode PA<3:0> */ data = data & 077; /* 6b shift count */ if (data != 0) { t32 = (ke_AC << 16) | ke_MQ; /* 32b operand */ - if (sign = GET_SIGN_W (ke_AC)) /* sext operand */ + if ((sign = GET_SIGN_W (ke_AC))) /* sext operand */ t32 = t32 | ~017777777777; if (data < 32) { /* [1,31] - left */ sout = (t32 >> (31 - data)) | (-sign << data); diff --git a/PDP11/pdp11_rk.c b/PDP11/pdp11_rk.c index 5e37d54d..d870ca8f 100644 --- a/PDP11/pdp11_rk.c +++ b/PDP11/pdp11_rk.c @@ -545,13 +545,13 @@ if (wc && (err == 0)) { /* seek ok? */ rkxb[i] = 0; } if (rkcs & RKCS_INH) { /* incr inhibit? */ - if (t = Map_WriteW (ma, 2, &rkxb[wc - 1])) { /* store last */ + if ((t = Map_WriteW (ma, 2, &rkxb[wc - 1]))) {/* store last */ rker = rker | RKER_NXM; /* NXM? set flag */ wc = 0; /* no transfer */ } } else { /* normal store */ - if (t = Map_WriteW (ma, wc << 1, rkxb)) { /* store buf */ + if ((t = Map_WriteW (ma, wc << 1, rkxb))) { /* store buf */ rker = rker | RKER_NXM; /* NXM? set flag */ wc = wc - t; /* adj wd cnt */ } @@ -560,7 +560,7 @@ if (wc && (err == 0)) { /* seek ok? */ case RKCS_WRITE: /* write */ if (rkcs & RKCS_INH) { /* incr inhibit? */ - if (t = Map_ReadW (ma, 2, &comp)) { /* get 1st word */ + if ((t = Map_ReadW (ma, 2, &comp))) { /* get 1st word */ rker = rker | RKER_NXM; /* NXM? set flag */ wc = 0; /* no transfer */ } @@ -568,7 +568,7 @@ if (wc && (err == 0)) { /* seek ok? */ rkxb[i] = comp; } else { /* normal fetch */ - if (t = Map_ReadW (ma, wc << 1, rkxb)) { /* get buf */ + if ((t = Map_ReadW (ma, wc << 1, rkxb))) { /* get buf */ rker = rker | RKER_NXM; /* NXM? set flg */ wc = wc - t; /* adj wd cnt */ } @@ -584,7 +584,7 @@ if (wc && (err == 0)) { /* seek ok? */ case RKCS_WCHK: /* write check */ i = fxread (rkxb, sizeof (int16), wc, uptr->fileref); - if (err = ferror (uptr->fileref)) { /* read error? */ + if ((err = ferror (uptr->fileref))) { /* read error? */ wc = 0; /* no transfer */ break; } diff --git a/PDP11/pdp11_rq.c b/PDP11/pdp11_rq.c index 8427bcfd..e860a866 100644 --- a/PDP11/pdp11_rq.c +++ b/PDP11/pdp11_rq.c @@ -1442,7 +1442,7 @@ DEVICE *dptr = rq_devmap[cp->cnum]; sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_abo\n"); tpkt = 0; /* set no mtch */ -if (uptr = rq_getucb (cp, lu)) { /* get unit */ +if ((uptr = rq_getucb (cp, lu))) { /* get unit */ if (uptr->cpkt && /* curr pkt? */ (GETP32 (uptr->cpkt, CMD_REFL) == ref)) { /* match ref? */ tpkt = uptr->cpkt; /* save match */ @@ -1455,8 +1455,8 @@ if (uptr = rq_getucb (cp, lu)) { /* get unit */ tpkt = uptr->pktq; /* save match */ uptr->pktq = cp->pak[tpkt].link; /* unlink */ } - else if (prv = uptr->pktq) { /* srch pkt q */ - while (tpkt = cp->pak[prv].link) { /* walk list */ + else if ((prv = uptr->pktq)) { /* srch pkt q */ + while ((tpkt = cp->pak[prv].link)) { /* walk list */ if (GETP32 (tpkt, RSP_REFL) == ref) { /* match? unlink */ cp->pak[prv].link = cp->pak[tpkt].link; break; @@ -1486,7 +1486,7 @@ UNIT *uptr; sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_avl\n"); -if (uptr = rq_getucb (cp, lu)) { /* unit exist? */ +if ((uptr = rq_getucb (cp, lu))) { /* unit exist? */ if (q && uptr->cpkt) { /* need to queue? */ rq_enqt (cp, &uptr->pktq, pkt); /* do later */ return OK; @@ -1546,7 +1546,7 @@ if (cp->pak[pkt].d[CMD_MOD] & MD_NXU) { /* next unit? */ cp->pak[pkt].d[RSP_UN] = lu; } } -if (uptr = rq_getucb (cp, lu)) { /* unit exist? */ +if ((uptr = rq_getucb (cp, lu))) { /* unit exist? */ if ((uptr->flags & UNIT_ATT) == 0) /* not attached? */ sts = ST_OFL | SB_OFL_NV; /* offl no vol */ else if (uptr->flags & UNIT_ONL) /* online */ @@ -1583,7 +1583,7 @@ UNIT *uptr; sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_onl\n"); -if (uptr = rq_getucb (cp, lu)) { /* unit exist? */ +if ((uptr = rq_getucb (cp, lu))) { /* unit exist? */ if (q && uptr->cpkt) { /* need to queue? */ rq_enqt (cp, &uptr->pktq, pkt); /* do later */ return OK; @@ -1626,7 +1626,7 @@ else { cmd = GETP (pkt, CMD_OPC, OPC); /* get opcode */ cp->cflgs = (cp->cflgs & CF_RPL) | /* hack ctrl flgs */ cp->pak[pkt].d[SCC_CFL]; - if (cp->htmo = cp->pak[pkt].d[SCC_TMO]) /* set timeout */ + if ((cp->htmo = cp->pak[pkt].d[SCC_TMO])) /* set timeout */ cp->htmo = cp->htmo + 2; /* if nz, round up */ cp->pak[pkt].d[SCC_CFL] = cp->cflgs; /* return flags */ cp->pak[pkt].d[SCC_TMO] = RQ_DCTMO; /* ctrl timeout */ @@ -1655,7 +1655,7 @@ UNIT *uptr; sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_suc\n"); -if (uptr = rq_getucb (cp, lu)) { /* unit exist? */ +if ((uptr = rq_getucb (cp, lu))) { /* unit exist? */ if (q && uptr->cpkt) { /* need to queue? */ rq_enqt (cp, &uptr->pktq, pkt); /* do later */ return OK; @@ -1686,7 +1686,7 @@ UNIT *uptr; sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_fmt\n"); -if (uptr = rq_getucb (cp, lu)) { /* unit exist? */ +if ((uptr = rq_getucb (cp, lu))) { /* unit exist? */ if (q && uptr->cpkt) { /* need to queue? */ rq_enqt (cp, &uptr->pktq, pkt); /* do later */ return OK; @@ -1722,7 +1722,7 @@ UNIT *uptr; sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_rw(lu=%d, pkt=%d, queue=%s)\n", lu, pkt, q?"yes" : "no"); -if (uptr = rq_getucb (cp, lu)) { /* unit exist? */ +if ((uptr = rq_getucb (cp, lu))) { /* unit exist? */ if (q && uptr->cpkt) { /* need to queue? */ sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_rw - queued\n"); rq_enqt (cp, &uptr->pktq, pkt); /* do later */ @@ -1854,7 +1854,7 @@ if (!uptr->io_complete) { /* Top End (I/O Initiation) Processing */ else if (cmd == OP_WR) { /* write? */ t = Map_ReadW (ba, tbc, uptr->rqxb); /* fetch buffer */ - if (abc = tbc - t) { /* any xfer? */ + if ((abc = tbc - t)) { /* any xfer? */ wwc = ((abc + (RQ_NUMBY - 1)) & ~(RQ_NUMBY - 1)) >> 1; for (i = (abc >> 1); i < wwc; i++) ((uint16 *)(uptr->rqxb))[i] = 0; @@ -1889,7 +1889,7 @@ else { /* Bottom End (After I/O processing) */ else { sim_disk_data_trace(uptr, uptr->rqxb, bl, tbc, "sim_disk_rdsect", DBG_DAT & rq_devmap[cp->cnum]->dctrl, DBG_REQ); if ((cmd == OP_RD) && !err) { /* read? */ - if (t = Map_WriteW (ba, tbc, uptr->rqxb)) { /* store, nxm? */ + if ((t = Map_WriteW (ba, tbc, uptr->rqxb))) {/* store, nxm? */ PUTP32 (pkt, RW_WBCL, bc - (tbc - t)); /* adj bc */ PUTP32 (pkt, RW_WBAL, ba + (tbc - t)); /* adj ba */ if (rq_hbe (cp, uptr)) /* post err log */ @@ -2746,11 +2746,11 @@ if ((uptr->flags & UNIT_ONL) == 0) { if (uptr->cpkt) { fprintf (st, "Unit %d current ", u); rq_show_pkt (st, cp, uptr->cpkt); - if (pkt = uptr->pktq) { + if ((pkt = uptr->pktq)) { do { fprintf (st, "Unit %d queued ", u); rq_show_pkt (st, cp, pkt); - } while (pkt = cp->pak[pkt].link); + } while ((pkt = cp->pak[pkt].link)); } } else fprintf (st, "Unit %d queues are empty\n", u); @@ -2777,7 +2777,7 @@ if (val & RQ_SH_RI) { rq_show_ring (st, &cp->rq); } if (val & RQ_SH_FR) { - if (pkt = cp->freq) { + if ((pkt = cp->freq)) { for (i = 0; pkt != 0; i++, pkt = cp->pak[pkt].link) { if (i == 0) fprintf (st, "Free queue = %d", pkt); @@ -2790,11 +2790,11 @@ if (val & RQ_SH_FR) { else fprintf (st, "Free queue is empty\n"); } if (val & RQ_SH_RS) { - if (pkt = cp->rspq) { + if ((pkt = cp->rspq)) { do { fprintf (st, "Response "); rq_show_pkt (st, cp, pkt); - } while (pkt = cp->pak[pkt].link); + } while ((pkt = cp->pak[pkt].link)); } else fprintf (st, "Response queue is empty\n"); } diff --git a/PDP11/pdp11_sys.c b/PDP11/pdp11_sys.c index 16ca83b4..c663095a 100644 --- a/PDP11/pdp11_sys.c +++ b/PDP11/pdp11_sys.c @@ -992,7 +992,7 @@ switch (j) { /* case on class */ disp = (disp - addr) & 0177777; else return SCPE_ARG; } - if ((disp & 1) || (disp > 0400) && (disp < 0177402)) + if ((disp & 1) || ((disp > 0400) && (disp < 0177402))) return SCPE_ARG; val[0] = val[0] | (((disp - 2) >> 1) & 0377); break; diff --git a/PDP11/pdp11_ta.c b/PDP11/pdp11_ta.c index 822a2a30..f777eff9 100644 --- a/PDP11/pdp11_ta.c +++ b/PDP11/pdp11_ta.c @@ -397,13 +397,13 @@ switch (uptr->FNC) { /* case on function */ case TACS_WRITE|TACS_3RD: /* write CRC */ if (ta_bptr) { /* anything to write? */ - if (st = sim_tape_wrrecf (uptr, ta_xb, ta_bptr)) /* write, err? */ + if ((st = sim_tape_wrrecf (uptr, ta_xb, ta_bptr)))/* write, err? */ r = ta_map_err (uptr, st); /* map error */ } break; /* op done */ case TACS_WFG: /* write file gap */ - if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = ta_map_err (uptr, st); /* map error */ break; @@ -413,7 +413,7 @@ switch (uptr->FNC) { /* case on function */ break; case TACS_SRB: /* space rev blk */ - if (st = sim_tape_sprecr (uptr, &tbc)) /* space rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rev, err? */ r = ta_map_err (uptr, st); /* map error */ break; @@ -425,7 +425,7 @@ switch (uptr->FNC) { /* case on function */ break; case TACS_SFB: /* space fwd blk */ - if (st = sim_tape_sprecf (uptr, &tbc)) /* space rev, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) /* space rev, err? */ r = ta_map_err (uptr, st); /* map error */ ta_cs |= TACS_CRC; /* CRC sets, no err */ break; diff --git a/PDP11/pdp11_tm.c b/PDP11/pdp11_tm.c index 7e50f152..e8430b17 100644 --- a/PDP11/pdp11_tm.c +++ b/PDP11/pdp11_tm.c @@ -439,7 +439,7 @@ switch (f) { /* case on function */ tm_sta = tm_sta | STA_RLE; if (tbc < cbc) /* use smaller */ cbc = tbc; - if (t = Map_WriteB (xma, cbc, tmxb)) { /* copy buf to mem */ + if ((t = Map_WriteB (xma, cbc, tmxb))) { /* copy buf to mem */ tm_sta = tm_sta | STA_NXM; /* NXM, set err */ cbc = cbc - t; /* adj byte cnt */ } @@ -449,13 +449,13 @@ switch (f) { /* case on function */ case MTC_WRITE: /* write */ case MTC_WREXT: /* write ext gap */ - if (t = Map_ReadB (xma, cbc, tmxb)) { /* copy mem to buf */ + if ((t = Map_ReadB (xma, cbc, tmxb))) { /* copy mem to buf */ tm_sta = tm_sta | STA_NXM; /* NXM, set err */ cbc = cbc - t; /* adj byte cnt */ if (cbc == 0) /* no xfr? done */ break; } - if (st = sim_tape_wrrecf (uptr, tmxb, cbc)) /* write rec, err? */ + if ((st = sim_tape_wrrecf (uptr, tmxb, cbc))) /* write rec, err? */ r = tm_map_err (uptr, st); /* map error */ else { xma = (xma + cbc) & 0777777; /* inc bus addr */ @@ -464,14 +464,14 @@ switch (f) { /* case on function */ break; case MTC_WREOF: /* write eof */ - if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = tm_map_err (uptr, st); /* map error */ break; case MTC_SPACEF: /* space forward */ do { tm_bc = (tm_bc + 1) & 0177777; /* incr wc */ - if (st = sim_tape_sprecf (uptr, &tbc)) { /* spc rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) { /* spc rec fwd, err? */ r = tm_map_err (uptr, st); /* map error */ break; } @@ -481,7 +481,7 @@ switch (f) { /* case on function */ case MTC_SPACER: /* space reverse */ do { tm_bc = (tm_bc + 1) & 0177777; /* incr wc */ - if (st = sim_tape_sprecr (uptr, &tbc)) { /* spc rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) { /* spc rec rev, err? */ r = tm_map_err (uptr, st); /* map error */ break; } diff --git a/PDP11/pdp11_tq.c b/PDP11/pdp11_tq.c index d05ad717..95d76ba2 100644 --- a/PDP11/pdp11_tq.c +++ b/PDP11/pdp11_tq.c @@ -828,7 +828,7 @@ else if (mdf & ~tq_cmf[cmd]) { /* invalid mod? */ sts = ST_CMD | I_MODF; /* ill mods */ } else { /* valid cmd */ - if (uptr = tq_getucb (lu)) { /* valid unit? */ + if ((uptr = tq_getucb (lu))) { /* valid unit? */ if (q && (tq_cmf[cmd] & CMF_SEQ) && /* queueing, seq, */ (uptr->cpkt || uptr->pktq)) { /* and active? */ tq_enqt (&uptr->pktq, pkt); /* do later */ @@ -909,7 +909,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_abo\n"); tpkt = 0; /* set no mtch */ -if (uptr = tq_getucb (lu)) { /* get unit */ +if ((uptr = tq_getucb (lu))) { /* get unit */ if (uptr->cpkt && /* curr pkt? */ (GETP32 (uptr->cpkt, CMD_REFL) == ref)) { /* match ref? */ tpkt = uptr->cpkt; /* save match */ @@ -922,8 +922,8 @@ if (uptr = tq_getucb (lu)) { /* get unit */ tpkt = uptr->pktq; /* save match */ uptr->pktq = tq_pkt[tpkt].link; /* unlink */ } - else if (prv = uptr->pktq) { /* srch pkt q */ - while (tpkt = tq_pkt[prv].link) { /* walk list */ + else if ((prv = uptr->pktq)) { /* srch pkt q */ + while ((tpkt = tq_pkt[prv].link)) { /* walk list */ if (GETP32 (tpkt, RSP_REFL) == ref) { /* match ref? */ tq_pkt[prv].link = tq_pkt[tpkt].link; /* unlink */ break; @@ -953,7 +953,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_avl\n"); -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ if (uptr->flags & UNIT_SXC) /* ser exc pending? */ sts = ST_SXC; else { @@ -1012,7 +1012,7 @@ if (tq_pkt[pkt].d[CMD_MOD] & MD_NXU) { /* next unit? */ tq_pkt[pkt].d[RSP_UN] = lu; } } -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ if ((uptr->flags & UNIT_ATT) == 0) /* not attached? */ sts = ST_OFL | SB_OFL_NV; /* offl no vol */ else if (uptr->flags & UNIT_ONL) /* online */ @@ -1039,7 +1039,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_onl\n"); -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ if ((uptr->flags & UNIT_ATT) == 0) /* not attached? */ sts = ST_OFL | SB_OFL_NV; /* offl no vol */ else if (uptr->flags & UNIT_ONL) /* already online? */ @@ -1070,7 +1070,7 @@ if (tq_pkt[pkt].d[SCC_MSV]) /* MSCP ver = 0? */ else { tq_cflgs = (tq_cflgs & CF_RPL) | /* hack ctrl flgs */ tq_pkt[pkt].d[SCC_CFL]; - if (tq_htmo = tq_pkt[pkt].d[SCC_TMO]) /* set timeout */ + if ((tq_htmo = tq_pkt[pkt].d[SCC_TMO])) /* set timeout */ tq_htmo = tq_htmo + 2; /* if nz, round up */ tq_pkt[pkt].d[SCC_CFL] = tq_cflgs; /* return flags */ tq_pkt[pkt].d[SCC_TMO] = TQ_DCTMO; /* ctrl timeout */ @@ -1096,7 +1096,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_suc\n"); -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ if ((uptr->flags & UNIT_ATT) == 0) /* not attached? */ sts = ST_OFL | SB_OFL_NV; /* offl no vol */ else { @@ -1120,7 +1120,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_flu\n"); -if (uptr = tq_getucb (lu)) /* unit exist? */ +if ((uptr = tq_getucb (lu))) /* unit exist? */ sts = tq_mot_valid (uptr, OP_FLU); /* validate req */ else sts = ST_OFL; /* offline */ tq_putr (pkt, OP_FLU | OP_END, tq_efl (uptr), sts, FLU_LNT, UQ_TYP_SEQ); @@ -1138,7 +1138,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_erase\n"); -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ sts = tq_mot_valid (uptr, cmd); /* validity checks */ if (sts == ST_SUC) { /* ok? */ uptr->cpkt = pkt; /* op in progress */ @@ -1162,7 +1162,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_wtm\n"); -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ objp = uptr->objp; /* position op */ sts = tq_mot_valid (uptr, OP_WTM); /* validity checks */ if (sts == ST_SUC) { /* ok? */ @@ -1188,7 +1188,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_pos\n"); -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ objp = uptr->objp; /* position op */ sts = tq_mot_valid (uptr, OP_POS); /* validity checks */ if (sts == ST_SUC) { /* ok? */ @@ -1224,7 +1224,7 @@ UNIT *uptr; sim_debug(DBG_TRC, &tq_dev, "tq_rw\n"); -if (uptr = tq_getucb (lu)) { /* unit exist? */ +if ((uptr = tq_getucb (lu))) { /* unit exist? */ objp = uptr->objp; /* position op */ sts = tq_mot_valid (uptr, cmd); /* validity checks */ if (sts == ST_SUC) { /* ok? */ @@ -1363,7 +1363,7 @@ switch (cmd) { /* case on command */ } else wbc = res->tbc; if (cmd == OP_RD) { /* read? */ - if (t = Map_WriteB (ba, wbc, res->tqxb)) { /* store, nxm? */ + if ((t = Map_WriteB (ba, wbc, res->tqxb))) {/* store, nxm? */ PUTP32 (pkt, RW_BCL, wbc - t); /* adj bc */ if (tq_hbe (uptr, ba + wbc - t)) /* post err log */ tq_mot_end (uptr, EF_LOG, ST_HST | SB_HST_NXM, res->tbc); @@ -1402,7 +1402,7 @@ switch (cmd) { /* case on command */ case OP_WR: /* write */ if (!io_complete) { /* Top half processing */ - if (t = Map_ReadB (ba, bc, res->tqxb)) { /* fetch buf, nxm? */ + if ((t = Map_ReadB (ba, bc, res->tqxb))) { /* fetch buf, nxm? */ PUTP32 (pkt, RW_BCL, 0); /* no bytes xfer'd */ if (tq_hbe (uptr, ba + bc - t)) /* post err log */ tq_mot_end (uptr, EF_LOG, ST_HST | SB_HST_NXM, bc); @@ -2291,11 +2291,11 @@ if ((uptr->flags & UNIT_ONL) == 0) { if (uptr->cpkt) { fprintf (st, "Unit %d current ", u); tq_show_pkt (st, uptr->cpkt); - if (pkt = uptr->pktq) { + if ((pkt = uptr->pktq)) { do { fprintf (st, "Unit %d queued ", u); tq_show_pkt (st, pkt); - } while (pkt = tq_pkt[pkt].link); + } while ((pkt = tq_pkt[pkt].link)); } } else fprintf (st, "Unit %d queues are empty\n", u); @@ -2320,7 +2320,7 @@ if (val & TQ_SH_RI) { tq_show_ring (st, &tq_rq); } if (val & TQ_SH_FR) { - if (pkt = tq_freq) { + if ((pkt = tq_freq)) { for (i = 0; pkt != 0; i++, pkt = tq_pkt[pkt].link) { if (i == 0) fprintf (st, "Free queue = %d", pkt); @@ -2333,11 +2333,11 @@ if (val & TQ_SH_FR) { else fprintf (st, "Free queue is empty\n"); } if (val & TQ_SH_RS) { - if (pkt = tq_rspq) { + if ((pkt = tq_rspq)) { do { fprintf (st, "Response "); tq_show_pkt (st, pkt); - } while (pkt = tq_pkt[pkt].link); + } while ((pkt = tq_pkt[pkt].link)); } else fprintf (st, "Response queue is empty\n"); } diff --git a/PDP11/pdp11_ts.c b/PDP11/pdp11_ts.c index 11ab6f11..5966a062 100644 --- a/PDP11/pdp11_ts.c +++ b/PDP11/pdp11_ts.c @@ -490,7 +490,7 @@ do { fc = (fc - 1) & DMASK; /* decr wc */ if (upd) msgrfc = fc; - if (st = sim_tape_sprecf (uptr, &tbc)) /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) /* space rec fwd, err? */ return ts_map_status (st); /* map status */ msgxs0 = msgxs0 | XS0_MOT; /* tape has moved */ } while (fc != 0); @@ -533,7 +533,7 @@ do { fc = (fc - 1) & DMASK; /* decr wc */ if (upd) msgrfc = fc; - if (st = sim_tape_sprecr (uptr, &tbc)) /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rec rev, err? */ return ts_map_status (st); /* map status */ msgxs0 = msgxs0 | XS0_MOT; /* tape has moved */ } while (fc != 0); @@ -666,7 +666,7 @@ else { return TC5; } } -if (st = sim_tape_wrrecf (uptr, tsxb, fc)) /* write rec, err? */ +if ((st = sim_tape_wrrecf (uptr, tsxb, fc))) /* write rec, err? */ return ts_map_status (st); /* return status */ msgxs0 = msgxs0 | XS0_MOT; /* tape has moved */ msgrfc = 0; @@ -679,7 +679,7 @@ int32 ts_wtmk (UNIT *uptr) { t_stat st; -if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ +if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ return ts_map_status (st); /* return status */ msgxs0 = msgxs0 | XS0_MOT; /* tape has moved */ if (sim_tape_eot (&ts_unit)) /* EOT on write? */ diff --git a/PDP11/pdp11_tu.c b/PDP11/pdp11_tu.c index 9175b996..d0ced0a9 100644 --- a/PDP11/pdp11_tu.c +++ b/PDP11/pdp11_tu.c @@ -647,7 +647,7 @@ switch (fnc) { /* case on function */ case FNC_SPACEF: /* space forward */ do { tufc = (tufc + 1) & 0177777; /* incr fc */ - if (st = sim_tape_sprecf (uptr, &tbc)) { /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) { /* space rec fwd, err? */ r = tu_map_err (drv, st, 0); /* map error */ break; } @@ -660,7 +660,7 @@ switch (fnc) { /* case on function */ case FNC_SPACER: /* space reverse */ do { tufc = (tufc + 1) & 0177777; /* incr wc */ - if (st = sim_tape_sprecr (uptr, &tbc)) { /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) { /* space rec rev, err? */ r = tu_map_err (drv, st, 0); /* map error */ break; } @@ -671,7 +671,7 @@ switch (fnc) { /* case on function */ break; case FNC_WREOF: /* write end of file */ - if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = tu_map_err (drv, st, 0); /* map error */ break; @@ -687,7 +687,7 @@ switch (fnc) { /* case on function */ tufc = 0; /* clear frame count */ if ((uptr->UDENS == TC_1600) && sim_tape_bot (uptr)) tufs = tufs | FS_ID; /* PE BOT? ID burst */ - if (st = sim_tape_rdrecf (uptr, xbuf, &tbc, MT_MAXFR)) { /* read fwd */ + if ((st = sim_tape_rdrecf (uptr, xbuf, &tbc, MT_MAXFR))) {/* read fwd */ if (st == MTSE_TMK) /* tmk also sets FCE */ tu_set_er (ER_FCE); r = tu_map_err (drv, st, 1); /* map error */ @@ -739,7 +739,7 @@ switch (fnc) { /* case on function */ } tbc = xbc; } - if (st = sim_tape_wrrecf (uptr, xbuf, tbc)) /* write rec, err? */ + if ((st = sim_tape_wrrecf (uptr, xbuf, tbc))) /* write rec, err? */ r = tu_map_err (drv, st, 1); /* map error */ else { tufc = (tufc + tbc) & 0177777; @@ -751,7 +751,7 @@ switch (fnc) { /* case on function */ case FNC_READR: /* read reverse */ case FNC_WCHKR: /* wcheck = read */ tufc = 0; /* clear frame count */ - if (st = sim_tape_rdrecr (uptr, xbuf + 4, &tbc, MT_MAXFR)) { /* read rev */ + if ((st = sim_tape_rdrecr (uptr, xbuf + 4, &tbc, MT_MAXFR))) {/* read rev */ if (st == MTSE_TMK) /* tmk also sets FCE */ tu_set_er (ER_FCE); r = tu_map_err (drv, st, 1); /* map error */ diff --git a/PDP11/pdp11_xq.c b/PDP11/pdp11_xq.c index 03f7c563..4937fe4d 100644 --- a/PDP11/pdp11_xq.c +++ b/PDP11/pdp11_xq.c @@ -1187,7 +1187,7 @@ t_stat xq_process_setup(CTLR* xq) xq->var->setup.multicast = (0 != (len & XQ_SETUP_MC)); xq->var->setup.promiscuous = (0 != (len & XQ_SETUP_PM)); - if (led = (len & XQ_SETUP_LD) >> 2) { + if ((led = (len & XQ_SETUP_LD) >> 2)) { switch (led) { case 1: xq->var->setup.l1 = 0; break; case 2: xq->var->setup.l2 = 0; break; diff --git a/PDP18B/pdp18b_cpu.c b/PDP18B/pdp18b_cpu.c index d9473ac3..7bf7ab28 100644 --- a/PDP18B/pdp18b_cpu.c +++ b/PDP18B/pdp18b_cpu.c @@ -604,7 +604,7 @@ while (reason == 0) { /* loop until halted */ int32 link_init, fill; if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) + if ((reason = sim_process_event ())) break; api_int = api_eval (&int_pend); /* eval API */ } diff --git a/PDP18B/pdp18b_fpp.c b/PDP18B/pdp18b_fpp.c index d1a098a6..0f2f8a04 100644 --- a/PDP18B/pdp18b_fpp.c +++ b/PDP18B/pdp18b_fpp.c @@ -253,7 +253,7 @@ switch (fop) { /* case on subop */ break; case FOP_SUB: /* subtract */ - if (sta = fp15_opnd (fir, ar, &fmb)) /* fetch op to FMB */ + if ((sta = fp15_opnd (fir, ar, &fmb))) /* fetch op to FMB */ break; if (fir & FI_FP) /* fp? */ sta = fp15_fadd (fir, &fma, &fmb, 1); /* yes, fp sub */ @@ -262,7 +262,7 @@ switch (fop) { /* case on subop */ case FOP_RSUB: /* reverse sub */ fmb = fma; /* FMB <- FMA */ - if (sta = fp15_opnd (fir, ar, &fma)) /* fetch op to FMA */ + if ((sta = fp15_opnd (fir, ar, &fma))) /* fetch op to FMA */ break; if (fir & FI_FP) /* fp? */ sta = fp15_fadd (fir, &fma, &fmb, 1); /* yes, fp sub */ @@ -270,7 +270,7 @@ switch (fop) { /* case on subop */ break; case FOP_MUL: /* multiply */ - if (sta = fp15_opnd (fir, ar, &fmb)) /* fetch op to FMB */ + if ((sta = fp15_opnd (fir, ar, &fmb))) /* fetch op to FMB */ break; if (fir & FI_FP) /* fp? */ sta = fp15_fmul (fir, &fma, &fmb); /* yes, fp mul */ @@ -278,9 +278,9 @@ switch (fop) { /* case on subop */ break; case FOP_DIV: /* divide */ - if (sta = fp15_opnd (fir, ar, &fmb)) /* fetch op to FMB */ + if ((sta = fp15_opnd (fir, ar, &fmb))) /* fetch op to FMB */ break; - if (sta = fp15_opnd (fir, ar, &fmb)) break; /* fetch op to FMB */ + if ((sta = fp15_opnd (fir, ar, &fmb)))break; /* fetch op to FMB */ if (fir & FI_FP) /* fp? */ sta = fp15_fdiv (fir, &fma, &fmb); /* yes, fp div */ else sta = fp15_idiv (fir, &fma, &fmb); /* no, int div */ @@ -288,7 +288,7 @@ switch (fop) { /* case on subop */ case FOP_RDIV: /* reverse divide */ fmb = fma; /* FMB <- FMA */ - if (sta = fp15_opnd (fir, ar, &fma)) /* fetch op to FMA */ + if ((sta = fp15_opnd (fir, ar, &fma))) /* fetch op to FMA */ break; if (fir & FI_FP) /* fp? */ sta = fp15_fdiv (fir, &fma, &fmb); /* yes, fp div */ @@ -296,7 +296,7 @@ switch (fop) { /* case on subop */ break; case FOP_LD: /* load */ - if (sta = fp15_opnd (fir, ar, &fma)) /* fetch op to FMA */ + if ((sta = fp15_opnd (fir, ar, &fma))) /* fetch op to FMA */ break; fp15_asign (fir, &fma); /* modify A sign */ if (fir & FI_FP) /* fp? */ @@ -309,7 +309,7 @@ switch (fop) { /* case on subop */ break; case FOP_FLT: /* float */ - if (sta = fp15_opnd (fir, ar, &fma)) /* fetch op to FMA */ + if ((sta = fp15_opnd (fir, ar, &fma))) /* fetch op to FMA */ break; fma.exp = 35; fp15_asign (fir, &fma); /* adjust A sign */ @@ -317,13 +317,13 @@ switch (fop) { /* case on subop */ break; case FOP_FIX: /* fix */ - if (sta = fp15_opnd (fir, ar, &fma)) /* fetch op to FMA */ + if ((sta = fp15_opnd (fir, ar, &fma))) /* fetch op to FMA */ break; sta = fp15_fix (fir, &fma); /* fix */ break; case FOP_LFMQ: /* load FMQ */ - if (sta = fp15_opnd (fir, ar, &fma)) /* fetch op to FMA */ + if ((sta = fp15_opnd (fir, ar, &fma))) /* fetch op to FMA */ break; dp_swap (&fma, &fmq); /* swap FMA, FMQ */ fp15_asign (fir, &fma); /* adjust A sign */ @@ -337,7 +337,7 @@ switch (fop) { /* case on subop */ sta = Write (ar, dat, WR); } else { /* no, load */ - if (sta = Read (ar, &dat, RD)) + if ((sta = Read (ar, &dat, RD))) break; fguard = (dat >> JEA_V_GUARD) & 1; jea = dat & JEA_EAMASK; @@ -345,7 +345,7 @@ switch (fop) { /* case on subop */ break; case FOP_ADD: /* add */ - if (sta = fp15_opnd (fir, ar, &fmb)) /* fetch op to FMB */ + if ((sta = fp15_opnd (fir, ar, &fmb))) /* fetch op to FMB */ break; if (fir & FI_FP) /* fp? */ sta = fp15_fadd (fir, &fma, &fmb, 0); /* yes, fp add */ @@ -429,7 +429,7 @@ t_stat sta; fguard = 0; /* clear guard */ if (ir & FI_FP) { /* fp? */ - if (sta = fp15_norm (ir, a, NULL, 0)) /* normalize */ + if ((sta = fp15_norm (ir, a, NULL, 0))) /* normalize */ return sta; if (ir & FI_DP) { /* dp? */ wd[0] = a->exp & DMASK; /* exponent */ diff --git a/PDP18B/pdp18b_mt.c b/PDP18B/pdp18b_mt.c index 22d190cf..db4d598f 100644 --- a/PDP18B/pdp18b_mt.c +++ b/PDP18B/pdp18b_mt.c @@ -353,7 +353,7 @@ switch (f) { /* case on function */ mtxb[p++] = M[xma] & 0377; } } /* end for */ - if (st = sim_tape_wrrecf (uptr, mtxb, tbc)) /* write rec, err? */ + if ((st = sim_tape_wrrecf (uptr, mtxb, tbc))) /* write rec, err? */ r = mt_map_err (uptr, st); /* map error */ else { M[MT_CA] = (M[MT_CA] + wc) & DMASK; /* advance mem addr */ @@ -363,7 +363,7 @@ switch (f) { /* case on function */ break; case FN_WREOF: - 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 */ else uptr->USTAT = STA_EOF; mt_cu = mt_cu & ~CU_ERASE; /* clear erase flag */ @@ -372,7 +372,7 @@ switch (f) { /* case on function */ case FN_SPACEF: /* space forward */ do { M[MT_WC] = (M[MT_WC] + 1) & DMASK; /* inc WC */ - if (st = sim_tape_sprecf (uptr, &tbc)) { /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) { /* space rec fwd, err? */ r = mt_map_err (uptr, st); /* map error */ break; } @@ -382,7 +382,7 @@ switch (f) { /* case on function */ case FN_SPACER: /* space reverse */ do { M[MT_WC] = (M[MT_WC] + 1) & DMASK; /* inc WC */ - if (st = sim_tape_sprecr (uptr, &tbc)) { /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) { /* space rec rev, err? */ r = mt_map_err (uptr, st); /* map error */ break; } diff --git a/PDP18B/pdp18b_stddev.c b/PDP18B/pdp18b_stddev.c index 966b6dd1..78cfeba3 100644 --- a/PDP18B/pdp18b_stddev.c +++ b/PDP18B/pdp18b_stddev.c @@ -594,7 +594,7 @@ if ((temp = getc (ptr_unit.fileref)) == EOF) { /* end of file? */ if (ptr_state == 0) { /* ASCII */ if (ptr_unit.flags & UNIT_RASCII) { /* want parity? */ ptr_unit.buf = temp = temp & 0177; /* parity off */ - while (temp = temp & (temp - 1)) + while ((temp = temp & (temp - 1))) ptr_unit.buf = ptr_unit.buf ^ 0200; /* count bits */ ptr_unit.buf = ptr_unit.buf ^ 0200; /* set even parity */ } diff --git a/PDP18B/pdp18b_sys.c b/PDP18B/pdp18b_sys.c index 97adc3cf..86bedcf5 100644 --- a/PDP18B/pdp18b_sys.c +++ b/PDP18B/pdp18b_sys.c @@ -1009,7 +1009,7 @@ for (i = 0; opc_val[i] >= 0; i++) { /* loop thru ops */ break; case I_V_OPR: /* operate */ - if (sp = (inst & 03730)) + if ((sp = (inst & 03730))) fprintf (of, "%s", opcode[i]); fprint_opr (of, inst & 014047, I_V_OPR, sp); break; diff --git a/PDP18B/pdp18b_tt1.c b/PDP18B/pdp18b_tt1.c index fdc5ac22..d29bde0e 100644 --- a/PDP18B/pdp18b_tt1.c +++ b/PDP18B/pdp18b_tt1.c @@ -222,7 +222,7 @@ if (ln >= 0) /* got one? rcv enab */ tmxr_poll_rx (&ttx_desc); /* poll for input */ for (ln = 0; ln < TTX_MAXL; ln++) { /* loop thru lines */ if (ttx_ldsc[ln].conn) { /* connected? */ - if (temp = tmxr_getc_ln (&ttx_ldsc[ln])) { /* get char */ + if ((temp = tmxr_getc_ln (&ttx_ldsc[ln]))) { /* get char */ if (temp & SCPE_BREAK) /* break? */ c = 0; else c = sim_tt_inpcvt (temp, TT_GET_MODE (ttox_unit[ln].flags) | TTUF_KSR); diff --git a/PDP8/pdp8_cpu.c b/PDP8/pdp8_cpu.c index c327c41a..98ad5846 100644 --- a/PDP8/pdp8_cpu.c +++ b/PDP8/pdp8_cpu.c @@ -344,7 +344,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; } diff --git a/PDP8/pdp8_ct.c b/PDP8/pdp8_ct.c index 9f5f1e27..31ac1e75 100644 --- a/PDP8/pdp8_ct.c +++ b/PDP8/pdp8_ct.c @@ -270,7 +270,7 @@ switch (IR & 07) { /* decode IR<9:11> */ case 6: /* KGOA */ ct_df = 0; /* clear data flag */ - if (uptr = ct_busy ()) /* op in progress? */ + if ((uptr = ct_busy ())) /* op in progress? */ AC = ct_go_cont (uptr, AC); /* yes */ else AC = ct_go_start (AC); /* no, start */ ct_updsta (NULL); @@ -433,7 +433,7 @@ switch (uptr->FNC) { /* case on function */ case SRA_CRC: /* CRC */ if (ct_write) { /* write? */ - if (st = sim_tape_wrrecf (uptr, ct_xb, ct_bptr)) /* write, err? */ + if ((st = sim_tape_wrrecf (uptr, ct_xb, ct_bptr)))/* write, err? */ r = ct_map_err (uptr, st); /* map error */ break; /* write done */ } @@ -452,7 +452,7 @@ switch (uptr->FNC) { /* case on function */ break; /* read done */ case SRA_WFG: /* write file gap */ - if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = ct_map_err (uptr, st); /* map error */ break; @@ -462,7 +462,7 @@ switch (uptr->FNC) { /* case on function */ break; case SRA_SRB: /* space rev blk */ - if (st = sim_tape_sprecr (uptr, &tbc)) /* space rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rev, err? */ r = ct_map_err (uptr, st); /* map error */ break; diff --git a/PDP8/pdp8_mt.c b/PDP8/pdp8_mt.c index 1127489f..844f414c 100644 --- a/PDP8/pdp8_mt.c +++ b/PDP8/pdp8_mt.c @@ -453,7 +453,7 @@ switch (f) { /* case on function */ mtxb[p++] = M[xma] & 077; } } - if (st = sim_tape_wrrecf (uptr, mtxb, tbc)) { /* write rec, err? */ + if ((st = sim_tape_wrrecf (uptr, mtxb, tbc))) { /* write rec, err? */ r = mt_map_err (uptr, st); /* map error */ xma = GET_EMA (mt_cu) + mt_ca; /* restore xma */ } @@ -461,14 +461,14 @@ switch (f) { /* case on function */ break; case FN_WREOF: - 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; case FN_SPACEF: /* space forward */ do { mt_wc = (mt_wc + 1) & 07777; /* incr wc */ - if (st = sim_tape_sprecf (uptr, &tbc)) { /* space rec fwd, err? */ + if ((st = sim_tape_sprecf (uptr, &tbc))) { /* space rec fwd, err? */ r = mt_map_err (uptr, st); /* map error */ break; /* stop */ } @@ -478,7 +478,7 @@ switch (f) { /* case on function */ case FN_SPACER: /* space reverse */ do { mt_wc = (mt_wc + 1) & 07777; /* incr wc */ - if (st = sim_tape_sprecr (uptr, &tbc)) { /* space rec rev, err? */ + if ((st = sim_tape_sprecr (uptr, &tbc))) { /* space rec rev, err? */ r = mt_map_err (uptr, st); /* map error */ break; /* stop */ } diff --git a/PDP8/pdp8_ttx.c b/PDP8/pdp8_ttx.c index 0956178c..5c335a48 100644 --- a/PDP8/pdp8_ttx.c +++ b/PDP8/pdp8_ttx.c @@ -233,7 +233,7 @@ if (ln >= 0) /* got one? rcv enb*/ tmxr_poll_rx (&ttx_desc); /* poll for input */ for (ln = 0; ln < TTX_LINES; ln++) { /* loop thru lines */ if (ttx_ldsc[ln].conn) { /* connected? */ - if (temp = tmxr_getc_ln (&ttx_ldsc[ln])) { /* get char */ + if ((temp = tmxr_getc_ln (&ttx_ldsc[ln]))) { /* get char */ if (temp & SCPE_BREAK) /* break? */ c = 0; else c = sim_tt_inpcvt (temp, TT_GET_MODE (ttox_unit[ln].flags)); diff --git a/S3/s3_cd.c b/S3/s3_cd.c index 7ec0e2ab..d63d783f 100644 --- a/S3/s3_cd.c +++ b/S3/s3_cd.c @@ -280,7 +280,7 @@ t_stat r; if (sim_is_active (&cdr_unit)) { /* busy? */ sim_cancel (&cdr_unit); /* cancel */ - if (r = cdr_svc (&cdr_unit)) return r; /* process */ + if ((r = cdr_svc (&cdr_unit))) return r; /* process */ } if (((cdp_unit.flags & UNIT_ATT) != 0 || diff --git a/S3/s3_cpu.c b/S3/s3_cpu.c index b4696484..e3f06482 100644 --- a/S3/s3_cpu.c +++ b/S3/s3_cpu.c @@ -527,7 +527,7 @@ reason = 0; while (reason == 0) { /* loop until halted */ if (sim_interval <= 0) { /* check clock queue */ - if (reason = sim_process_event ()) break; + if ((reason = sim_process_event ())) break; } if (int_req) { /* interrupt? */ diff --git a/S3/s3_disk.c b/S3/s3_disk.c index d3588cfd..f0a2ed20 100644 --- a/S3/s3_disk.c +++ b/S3/s3_disk.c @@ -298,7 +298,7 @@ int32 dsk (int32 disk, int32 op, int32 m, int32 n, int32 data) addr++; } - if ((sect == 55) ) { /* HJS MODS */ + if (sect == 55) { /* HJS MODS */ S = sect; N = nsects - i - 2; if (N > -1) diskerr[disk] |= 0x0020; /* end of cyl. */ @@ -349,7 +349,7 @@ int32 dsk (int32 disk, int32 op, int32 m, int32 n, int32 data) diskerr[disk] |= 0x0800; break; } - if ((sect == 55) ) { /* HJS MODS */ + if (sect == 55) { /* HJS MODS */ S = sect; N = nsects - i - 2; if (N > -1) diskerr[disk] |= 0x0020; /* end of cyl. */ @@ -392,7 +392,7 @@ int32 dsk (int32 disk, int32 op, int32 m, int32 n, int32 data) diskerr[disk] |= 0x0400; break; } - if ((sect == 55) ) { /* HJS MODS */ + if (sect == 55) { /* HJS MODS */ S = sect; N = nsects - i - 2; if (N > -1) diskerr[disk] |= 0x0020; /* end of cyl. */ @@ -434,7 +434,7 @@ int32 dsk (int32 disk, int32 op, int32 m, int32 n, int32 data) diskerr[disk] |= 0x0400; break; } - if ((sect == 55) ) { + if (sect == 55) { S = sect; N = nsects - i - 2; if (N > 0) diskerr[disk] |= 0x0020; @@ -486,7 +486,7 @@ int32 dsk (int32 disk, int32 op, int32 m, int32 n, int32 data) found[disk] = 1; if (res == data) break; - if ((sect == 55) ) { /* HJS MODS */ + if (sect == 55) { /* HJS MODS */ S = sect; N = nsects - i - 2; if (N > -1) diskerr[disk] |= 0x0020; /* end of cyl. */ diff --git a/SDS/sds_cpu.c b/SDS/sds_cpu.c index a8f87db7..f045b6e7 100644 --- a/SDS/sds_cpu.c +++ b/SDS/sds_cpu.c @@ -385,14 +385,14 @@ while (reason == 0) { /* loop until halted */ } if (sim_interval <= 0) { /* event queue? */ - if (reason = sim_process_event ()) /* process */ + if ((reason = sim_process_event ())) /* process */ break; int_reqhi = api_findreq (); /* recalc int req */ chan_req = chan_testact (); /* recalc chan act */ } if (chan_req) { /* channel request? */ - if (reason = chan_process ()) /* process */ + if ((reason = chan_process ())) /* process */ break; int_reqhi = api_findreq (); /* recalc int req */ chan_req = chan_testact (); /* recalc chan act */ @@ -506,7 +506,7 @@ if (inst & I_POP) { /* POP? */ } else { /* normal POP */ dat = (OV << 23) | dat; /* ov in <0> */ - if (r = Write (0, dat)) + if ((r = Write (0, dat))) return r; } } @@ -525,49 +525,49 @@ switch (op) { /* case on opcode */ /* Loads and stores */ case LDA: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &A)) /* get operand */ + if ((r = Read (va, &A))) /* get operand */ return r; break; case LDB: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &B)) /* get operand */ + if ((r = Read (va, &B))) /* get operand */ return r; break; case LDX: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &X)) /* get operand */ + if ((r = Read (va, &X))) /* get operand */ return r; break; case STA: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Write (va, A)) /* write operand */ + if ((r = Write (va, A))) /* write operand */ return r; break; case STB: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Write (va, B)) /* write operand */ + if ((r = Write (va, B))) /* write operand */ return r; break; case STX: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Write (va, X)) /* write operand */ + if ((r = Write (va, X))) /* write operand */ return r; break; case EAX: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; if (nml_mode || usr_mode) /* normal or user? */ X = (X & ~VA_MASK) | (va & VA_MASK); /* only 14b */ @@ -575,11 +575,11 @@ switch (op) { /* case on opcode */ break; case XMA: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; - if (r = Write (va, A)) /* write A */ + if ((r = Write (va, A))) /* write A */ return r; A = dat; /* load A */ break; @@ -587,95 +587,95 @@ switch (op) { /* case on opcode */ /* Arithmetic and logical */ case ADD: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; A = Add24 (A, dat, 0); /* add */ break; case ADC: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; OV = 0; /* clear overflow */ A = Add24 (A, dat, X >> 23); /* add with carry */ break; case SUB: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; A = Add24 (A, dat ^ DMASK, 1); /* subtract */ break; case SUC: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; OV = 0; /* clear overflow */ A = Add24 (A, dat ^ DMASK, X >> 23); /* sub with carry */ break; case ADM: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; dat = AddM24 (dat, A); /* mem + A */ - if (r = Write (va, dat)) /* rewrite */ + if ((r = Write (va, dat))) /* rewrite */ return r; break; case MIN: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; dat = AddM24 (dat, 1); /* mem + 1 */ - if (r = Write (va, dat)) /* rewrite */ + if ((r = Write (va, dat))) /* rewrite */ return r; break; case MUL: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; Mul48 (A, dat); /* multiply */ break; case DIV: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; Div48 (A, B, dat); /* divide */ break; case ETR: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; A = A & dat; /* and */ break; case MRG: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; A = A | dat; /* or */ break; case EOR: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; A = A ^ dat; /* xor */ break; @@ -683,75 +683,75 @@ switch (op) { /* case on opcode */ /* Skips */ case SKE: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; if (A == dat) /* if A = op, skip */ P = (P + 1) & VA_MASK; break; case SKG: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; if (SXT (A) > SXT (dat)) /* if A > op, skip */ P = (P + 1) & VA_MASK; break; case SKM: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; if (((A ^ dat) & B) == 0) /* if A = op masked */ P = (P + 1) & VA_MASK; break; case SKA: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; if ((A & dat) == 0) /* if !(A & op), skip */ P = (P + 1) & VA_MASK; break; case SKB: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; if ((B & dat) == 0) /* if !(B & op), skip */ P = (P + 1) & VA_MASK; break; case SKN: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; if (dat & SIGN) /* if op < 0, skip */ P = (P + 1) & VA_MASK; break; case SKR: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; dat = AddM24 (dat, DMASK); /* decr operand */ - if (r = Write (va, dat)) /* rewrite */ + if ((r = Write (va, dat))) /* rewrite */ return r; if (dat & SIGN) /* if op < 0, skip */ P = (P + 1) & VA_MASK; break; case SKD: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; if (SXT_EXP (B) < SXT_EXP (dat)) { /* B < dat? */ X = (dat - B) & DMASK; /* X = dat - B */ @@ -774,29 +774,29 @@ switch (op) { /* case on opcode */ exu_cnt = exu_cnt + 1; /* count chained EXU */ if (exu_cnt > exu_lim) /* too many? */ return STOP_EXULIM; - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; inst = dat; goto EXU_LOOP; case BRU: if (nml_mode && (inst & I_IND)) api_dismiss (); /* normal BRU*, dism */ - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; PCQ_ENTRY; P = va & VA_MASK; /* branch */ break; case BRX: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; X = (X + 1) & DMASK; /* incr X */ if (X & I_IND) { /* bit 9 set? */ - if (r = Read (va, &dat)) /* test dest access */ + if ((r = Read (va, &dat))) /* test dest access */ return r; PCQ_ENTRY; P = va & VA_MASK; /* branch */ @@ -804,22 +804,22 @@ switch (op) { /* case on opcode */ break; case BRM: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; dat = (EM3 << 18) | (EM2 << 15) | pc; /* form return word */ if (!nml_mode && !usr_mode) /* monitor mode? */ dat = dat | (mode << 23) | (OV << 21); else dat = dat | (OV << 23); /* normal or user */ - if (r = Write (va, dat)) /* write ret word */ + if ((r = Write (va, dat))) /* write ret word */ return r; PCQ_ENTRY; P = (va + 1) & VA_MASK; /* branch */ break; case BRR: - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; PCQ_ENTRY; P = (dat + 1) & VA_MASK; /* branch */ @@ -837,9 +837,9 @@ switch (op) { /* case on opcode */ case BRI: if (!nml_mode && usr_mode) /* priv inst */ return MM_PRVINS; - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; api_dismiss (); /* dismiss hi api */ PCQ_ENTRY; @@ -909,7 +909,7 @@ switch (op) { /* case on opcode */ /* Shifts */ case RSH: - if (r = EaSh (inst, &va)) /* decode eff addr */ + if ((r = EaSh (inst, &va))) /* decode eff addr */ return r; shf_op = I_GETSHFOP (va); /* get eff op */ sc = va & I_SHFMSK; /* get eff count */ @@ -934,7 +934,7 @@ switch (op) { /* case on opcode */ break; case LSH: - if (r = EaSh (inst, &va)) /* decode eff addr */ + if ((r = EaSh (inst, &va))) /* decode eff addr */ return r; shf_op = I_GETSHFOP (va); /* get eff op */ sc = va & I_SHFMSK; /* get eff count */ @@ -989,11 +989,11 @@ switch (op) { /* case on opcode */ case MIW: case MIY: if (!nml_mode && usr_mode) /* priv inst */ return MM_PRVINS; - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; - if (r = op_miwy (inst, dat)) /* process inst */ + if ((r = op_miwy (inst, dat))) /* process inst */ return r; int_reqhi = api_findreq (); /* recalc int req */ chan_req = chan_testact (); /* recalc chan act */ @@ -1002,11 +1002,11 @@ switch (op) { /* case on opcode */ case WIM: case YIM: if (!nml_mode && usr_mode) /* priv inst */ return MM_PRVINS; - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = op_wyim (inst, &dat)) /* process inst */ + if ((r = op_wyim (inst, &dat))) /* process inst */ return r; - if (r = Write (va, dat)) + if ((r = Write (va, dat))) return r; /* write result */ int_reqhi = api_findreq (); /* recalc int req */ chan_req = chan_testact (); /* recalc chan act */ @@ -1015,7 +1015,7 @@ switch (op) { /* case on opcode */ case EOM: case EOD: if (!nml_mode && usr_mode) /* priv inst */ return MM_PRVINS; - if (r = op_eomd (inst)) /* process inst */ + if ((r = op_eomd (inst))) /* process inst */ return r; int_reqhi = api_findreq (); /* recalc int req */ chan_req = chan_testact (); /* recalc chan act */ @@ -1025,11 +1025,11 @@ switch (op) { /* case on opcode */ case POT: if (!nml_mode && usr_mode) /* priv inst */ return MM_PRVINS; - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = Read (va, &dat)) /* get operand */ + if ((r = Read (va, &dat))) /* get operand */ return r; - if (r = op_pot (dat)) /* process inst */ + if ((r = op_pot (dat))) /* process inst */ return r; int_reqhi = api_findreq (); /* recalc int req */ chan_req = chan_testact (); /* recalc chan act */ @@ -1038,11 +1038,11 @@ switch (op) { /* case on opcode */ case PIN: if (!nml_mode && usr_mode) /* priv inst */ return MM_PRVINS; - if (r = Ea (inst, &va)) /* decode eff addr */ + if ((r = Ea (inst, &va))) /* decode eff addr */ return r; - if (r = op_pin (&dat)) /* process inst */ + if ((r = op_pin (&dat))) /* process inst */ return r; - if (r = Write (va, dat)) /* write result */ + if ((r = Write (va, dat))) /* write result */ return r; int_reqhi = api_findreq (); /* recalc int req */ chan_req = chan_testact (); /* recalc chan act */ @@ -1051,7 +1051,7 @@ switch (op) { /* case on opcode */ case SKS: if (!nml_mode && usr_mode) /* priv inst */ return MM_PRVINS; - if (r = op_sks (inst, &dat)) /* process inst */ + if ((r = op_sks (inst, &dat))) /* process inst */ return r; if (dat) P = (P + 1) & VA_MASK; @@ -1085,7 +1085,7 @@ for (i = 0; i < ind_lim; i++) { /* count indirects */ hst[hst_p].ea = *addr; return SCPE_OK; } - if (r = Read (va, &wd)) /* read ind; fails? */ + if ((r = Read (va, &wd))) /* read ind; fails? */ return r; va = (va & VA_USR) | (wd & XVA_MASK); } @@ -1112,7 +1112,7 @@ for (i = 0; i < ind_lim; i++) { /* count indirects */ } if (wd & I_IDX) va = (va & VA_USR) | ((va + X) & VA_MASK); - if (r = Read (va, &wd)) /* read ind; fails? */ + if ((r = Read (va, &wd))) /* read ind; fails? */ return r; va = (va & VA_USR) | (wd & XVA_MASK); } @@ -1569,12 +1569,12 @@ if (op == MIN) /* incr */ else if (op == SKR) /* decr */ val = DMASK; else return STOP_RTCINS; /* can't do it */ -if (r = Ea (inst, &va)) /* decode eff addr */ +if ((r = Ea (inst, &va))) /* decode eff addr */ return r; -if (r = Read (va, &dat)) /* get operand */ +if ((r = Read (va, &dat))) /* get operand */ return r; dat = AddM24 (dat, val); /* mem +/- 1 */ -if (r = Write (va, dat)) /* rewrite */ +if ((r = Write (va, dat))) /* rewrite */ return r; if (dat == 0) /* set clk sync int */ int_req = int_req | INT_RTCS; diff --git a/SDS/sds_dsk.c b/SDS/sds_dsk.c index cf9d41ea..22d0a7a3 100644 --- a/SDS/sds_dsk.c +++ b/SDS/sds_dsk.c @@ -204,7 +204,7 @@ switch (fnc) { /* case on function */ case IO_READ: xfr_req = xfr_req & ~XFR_DSK; /* clr xfr req */ if (dsk_bptr >= dsk_blnt) { /* no more data? */ - if (r = dsk_read_buf (inst)) /* read sector */ + if ((r = dsk_read_buf (inst))) /* read sector */ return r; } dsk_wptr = dsk_bptr >> 2; /* word pointer */ @@ -219,7 +219,7 @@ switch (fnc) { /* case on function */ case IO_WRITE: xfr_req = xfr_req & ~XFR_DSK; /* clr xfr req */ if (dsk_bptr >= (DSK_NUMWD * 4)) { /* full? */ - if (r = dsk_write_buf (inst)) /* write sector */ + if ((r = dsk_write_buf (inst))) /* write sector */ return r; } dsk_wptr = dsk_bptr >> 2; /* word pointer */ diff --git a/SDS/sds_io.c b/SDS/sds_io.c index 4e4dd22b..bd0b01f4 100644 --- a/SDS/sds_io.c +++ b/SDS/sds_io.c @@ -336,7 +336,7 @@ switch (mod) { chan_mode[ch] = chan_uar[ch] = 0; if (ch >= CHAN_E) chan_mode[ch] = CHM_CE; - if (r = dev_dsp[dev][ch] (IO_CONN, inst, NULL)) /* connect */ + if ((r = dev_dsp[dev][ch] (IO_CONN, inst, NULL)))/* connect */ return r; if ((inst & I_IND) || (ch >= CHAN_C)) { /* C-H? alert ilc */ alert = POT_ILCY + ch; @@ -958,7 +958,7 @@ for (i = 0; i < NUM_CHAN; i++) { /* Test each device for conflict; add to map; init tables */ -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; diff --git a/SDS/sds_lp.c b/SDS/sds_lp.c index 0de82e70..cbef5249 100644 --- a/SDS/sds_lp.c +++ b/SDS/sds_lp.c @@ -177,7 +177,7 @@ switch (fnc) { /* case function */ t = I_GETSKCND (inst); /* sks cond */ if (((t == 020) && (!CHP (7, lpt_cct[lpt_ccp]))) || /* 14062: !ch 7 */ ((t == 010) && (lpt_unit.flags & UNIT_ATT)) || /* 12062: !online */ - (t == 004) && !lpt_err) /* 11062: !err */ + ((t == 004) && !lpt_err)) /* 11062: !err */ *dat = 1; break; diff --git a/SDS/sds_mt.c b/SDS/sds_mt.c index 163d7d23..3e398ac5 100644 --- a/SDS/sds_mt.c +++ b/SDS/sds_mt.c @@ -235,14 +235,14 @@ switch (fnc) { /* case function */ case IO_DISC: /* disconnect */ sim_cancel (uptr); /* no more xfr's */ if (inst & DEV_OUT) { /* write? */ - if (r = mt_wrend (inst)) /* end record */ + if ((r = mt_wrend (inst))) /* end record */ return r; } break; case IO_WREOR: /* write eor */ chan_set_flag (mt_dib.chan, CHF_EOR); /* set eor flg */ - if (r = mt_wrend (inst)) /* end record */ + if ((r = mt_wrend (inst))) /* end record */ return r; mt_gap = 1; /* in gap */ sim_activate (uptr, mt_gtime); /* start timer */ diff --git a/SDS/sds_mux.c b/SDS/sds_mux.c index ef6203fd..8cc7023a 100644 --- a/SDS/sds_mux.c +++ b/SDS/sds_mux.c @@ -363,7 +363,7 @@ if (ln >= 0) { /* got one? */ tmxr_poll_rx (&mux_desc); /* poll for input */ for (ln = 0; ln < MUX_NUMLIN; ln++) { /* loop thru lines */ if (mux_ldsc[ln].conn) { /* connected? */ - if (c = tmxr_getc_ln (&mux_ldsc[ln])) { /* get char */ + if ((c = tmxr_getc_ln (&mux_ldsc[ln]))) { /* get char */ if (mux_sta[ln] & MUX_SCHP) /* already got one? */ mux_sta[ln] = mux_sta[ln] | MUX_SOVR; /* overrun */ else mux_sta[ln] = mux_sta[ln] | MUX_SCHP; /* char pending */ diff --git a/SDS/sds_stddev.c b/SDS/sds_stddev.c index 7899228b..13877418 100644 --- a/SDS/sds_stddev.c +++ b/SDS/sds_stddev.c @@ -395,7 +395,7 @@ t_stat r = SCPE_OK; if (ptp_ldr) { /* need leader? */ for (i = 0; i < 12; i++) { /* punch leader */ - if (r = ptp_out (0)) + if ((r = ptp_out (0))) break; } } diff --git a/VAX/vax780_sbi.c b/VAX/vax780_sbi.c index a51dd370..54ac86aa 100644 --- a/VAX/vax780_sbi.c +++ b/VAX/vax780_sbi.c @@ -646,7 +646,7 @@ DIB *dibp; t_stat r; regptr = get_glyph (ptr, gbuf, 0); /* get glyph */ -if (slptr = strchr (gbuf, '/')) { /* found slash? */ +if ((slptr = strchr (gbuf, '/'))) { /* found slash? */ regptr = strchr (ptr, '/'); /* locate orig */ *slptr = 0; /* zero in string */ } @@ -702,7 +702,7 @@ if (r != SCPE_OK) { #ifndef DONT_USE_INTERNAL_ROM FILE *f; - if (f = sim_fopen ("vmb.exe", "wb")) { + if ((f = sim_fopen ("vmb.exe", "wb"))) { printf ("Saving boot code to vmb.exe\n"); if (sim_log) fprintf (sim_log, "Saving boot code to vmb.exe\n"); @@ -810,15 +810,15 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { /* loop thru dev */ dibp = (DIB *) dptr->ctxt; /* get DIB */ if (dibp && !(dptr->flags & DEV_DIS)) { /* defined, enabled? */ if (dptr->flags & DEV_NEXUS) { /* Nexus? */ - if (r = build_nexus_tab (dptr, dibp)) /* add to dispatch table */ + if ((r = build_nexus_tab (dptr, dibp))) /* add to dispatch table */ return r; } else if (dptr->flags & DEV_MBUS) { /* Massbus? */ - if (r = build_mbus_tab (dptr, dibp)) + if ((r = build_mbus_tab (dptr, dibp))) return r; } else { /* no, Unibus device */ - if (r = build_ubus_tab (dptr, dibp)) /* add to dispatch tab */ + if ((r = build_ubus_tab (dptr, dibp))) /* add to dispatch tab */ return r; } /* end else */ } /* end if enabled */ diff --git a/VAX/vax_cis.c b/VAX/vax_cis.c index d8321ffe..3eec163e 100644 --- a/VAX/vax_cis.c +++ b/VAX/vax_cis.c @@ -331,7 +331,7 @@ switch (opc) { /* case on opcode */ R[3] = (R[3] + 1) & LMASK; /* next string char */ if (i >= sim_interval) { /* done with interval? */ sim_interval = 0; - if (r = sim_process_event ()) { /* presumably WRU */ + if ((r = sim_process_event ())) { /* presumably WRU */ PC = fault_PC; /* backup up PC */ ABORT (r); /* abort flushes IB */ } @@ -1550,7 +1550,7 @@ uint32 NibbleRshift (DSTR *dsrc, int32 sc, uint32 cin) { int32 i, s, nc; -if (s = sc * 4) { +if ((s = sc * 4)) { for (i = DSTRMAX; i >= 0; i--) { nc = (dsrc->val[i] << (32 - s)) & LMASK; dsrc->val[i] = ((dsrc->val[i] >> s) | @@ -1574,7 +1574,7 @@ uint32 NibbleLshift (DSTR *dsrc, int32 sc, uint32 cin) { int32 i, s, nc; -if (s = sc * 4) { +if ((s = sc * 4)) { for (i = 0; i < DSTRLNT; i++) { nc = dsrc->val[i] >> (32 - s); dsrc->val[i] = ((dsrc->val[i] << s) | diff --git a/VAX/vax_cmode.c b/VAX/vax_cmode.c index 24c7f8ac..dbf6d4cf 100644 --- a/VAX/vax_cmode.c +++ b/VAX/vax_cmode.c @@ -621,7 +621,7 @@ switch ((IR >> 12) & 017) { /* decode IR<15:12> */ else src2 = RdMemW (GeteaW (dstspec)); src2 = src2 & 077; src = RdRegW (srcspec); /* get src */ - if (sign = ((src & WSIGN)? 1: 0)) + if ((sign = ((src & WSIGN)? 1: 0))) src = src | ~WMASK; if (src2 == 0) { /* [0] */ dst = src; /* result */ diff --git a/VAX/vax_cpu.c b/VAX/vax_cpu.c index 7614cd00..b751e352 100644 --- a/VAX/vax_cpu.c +++ b/VAX/vax_cpu.c @@ -640,7 +640,7 @@ for ( ;; ) { */ if (trpirq) { /* trap or interrupt? */ - if (temp = GET_TRAP (trpirq)) { /* trap? */ + if ((temp = GET_TRAP (trpirq))) { /* trap? */ cc = intexc (SCB_ARITH, cc, 0, IE_EXC); /* take, clear trap */ GET_CUR; /* set cur mode */ in_ie = 1; @@ -648,7 +648,7 @@ for ( ;; ) { SP = SP - 4; in_ie = 0; } - else if (temp = GET_IRQL (trpirq)) { /* interrupt? */ + else if ((temp = GET_IRQL (trpirq))) { /* interrupt? */ int32 vec; if (temp == IPL_HLTPIN) { /* console halt? */ hlt_pin = 0; /* clear intr */ diff --git a/VAX/vax_io.c b/VAX/vax_io.c index 8d6baab0..95b46073 100644 --- a/VAX/vax_io.c +++ b/VAX/vax_io.c @@ -792,7 +792,7 @@ init_ubus_tab (); /* init bus tables */ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { /* loop thru dev */ dibp = (DIB *) dptr->ctxt; /* get DIB */ if (dibp && !(dptr->flags & DEV_DIS)) { /* defined, enabled? */ - if (r = build_ubus_tab (dptr, dibp)) /* add to bus tab */ + if ((r = build_ubus_tab (dptr, dibp))) /* add to bus tab */ return r; } /* end if enabled */ } /* end for */ diff --git a/VAX/vax_octa.c b/VAX/vax_octa.c index efb1a99c..c46b2718 100644 --- a/VAX/vax_octa.c +++ b/VAX/vax_octa.c @@ -187,7 +187,7 @@ switch (opc) { break; case MOVH: - if (r = op_tsth (opnd[0])) { /* test for 0 */ + if ((r = op_tsth (opnd[0]))) { /* test for 0 */ h_write_o (spec, va, opnd, acc); /* nz, write result */ CC_IIZP_FP (r); /* set cc's */ } @@ -198,7 +198,7 @@ switch (opc) { break; case MNEGH: - if (r = op_tsth (opnd[0])) { /* test for 0 */ + if ((r = op_tsth (opnd[0]))) { /* test for 0 */ opnd[0] = opnd[0] ^ FPSIGN; /* nz, invert sign */ h_write_o (spec, va, opnd, acc); /* write result */ CC_IIZZ_FP (opnd[0]); /* set cc's */ diff --git a/VAX/vax_sys.c b/VAX/vax_sys.c index f33b2edd..0cf2f482 100644 --- a/VAX/vax_sys.c +++ b/VAX/vax_sys.c @@ -1173,7 +1173,7 @@ const char *force[] = { "S^", "I^", "B^", "W^", "L^", NULL }; *r = SCPE_OK; /* assume ok */ M1C ('@', SP_IND); /* look for @ */ -if (tptr = parse_rnum (cptr, &rn)) { /* look for Rn */ +if ((tptr = parse_rnum (cptr, &rn))) { /* look for Rn */ if (*cptr == '[') { /* look for [Rx] */ cptr = parse_rnum (++cptr, &index); if ((cptr == NULL) || (*cptr++ != ']')) diff --git a/VAX/vax_syscm.c b/VAX/vax_syscm.c index 40cec63b..de658624 100644 --- a/VAX/vax_syscm.c +++ b/VAX/vax_syscm.c @@ -610,7 +610,7 @@ switch (j) { /* case on class */ return SCPE_ARG; if ((pflag & A_REL) == 0) disp = (disp - ad32) & 0177777; - if ((disp & 1) || (disp > 0400) && (disp < 0177402)) + if ((disp & 1) || ((disp > 0400) && (disp < 0177402))) return SCPE_ARG; val[0] = val[0] | (((disp - 2) >> 1) & 0377); break; diff --git a/VAX/vax_sysdev.c b/VAX/vax_sysdev.c index 00fe816b..03c62937 100644 --- a/VAX/vax_sysdev.c +++ b/VAX/vax_sysdev.c @@ -1564,7 +1564,7 @@ if (*rom == 0) { /* no boot? */ #ifndef DONT_USE_INTERNAL_ROM FILE *f; - if (f = sim_fopen ("ka655x.bin", "wb")) { + if ((f = sim_fopen ("ka655x.bin", "wb"))) { printf ("Saving boot code to ka655x.bin\n"); if (sim_log) fprintf (sim_log, "Saving boot code to ka655x.bin\n"); diff --git a/scp.c b/scp.c index 930124a1..4531d8a0 100644 --- a/scp.c +++ b/scp.c @@ -748,7 +748,7 @@ int setenv(const char *envname, const char *envval, int overwrite) int main (int argc, char *argv[]) { -char cbuf[CBUFSIZE], gbuf[CBUFSIZE], *cptr; +char cbuf[CBUFSIZE], gbuf[CBUFSIZE], *cptr, *cptr2; char nbuf[PATH_MAX + 7]; int32 i, sw; t_bool lookswitch; @@ -828,10 +828,14 @@ if (sim_dflt_dev == NULL) /* if no default */ sim_dflt_dev = sim_devices[0]; cptr = getenv("HOME"); -if (cptr == NULL) +if (cptr == NULL) { cptr = getenv("HOMEPATH"); + cptr2 = getenv("HOMEDRIVE"); + } +else + cptr2 = NULL; if (cptr && sizeof (nbuf) > strlen (cptr) + strlen ("/simh.ini") + 1) { - sprintf(nbuf, "%s%ssimh.ini", cptr, strchr (cptr, '/') ? "/" : "\\"); + sprintf(nbuf, "\"%s%s%ssimh.ini\"", cptr2 ? cptr2 : "", cptr, strchr (cptr, '/') ? "/" : "\\"); stat = do_cmd (-1, nbuf) & ~SCPE_NOMESSAGE; /* simh.ini proc cmd file */ } if (stat == SCPE_OPENERR) @@ -842,7 +846,7 @@ else if (*argv[0]) { /* sim name arg? */ char *np; /* "path.ini" */ nbuf[0] = '"'; /* starting " */ strncpy (nbuf + 1, argv[0], PATH_MAX + 1); /* copy sim name */ - if (np = match_ext (nbuf, "EXE")) /* remove .exe */ + if ((np = match_ext (nbuf, "EXE"))) /* remove .exe */ *np = 0; strcat (nbuf, ".ini\""); /* add .ini" */ stat = do_cmd (-1, nbuf); /* proc cmd file */ @@ -851,7 +855,7 @@ else if (*argv[0]) { /* sim name arg? */ stat = SCPE_BARE_STATUS(stat); /* remove possible flag */ while (stat != SCPE_EXIT) { /* in case exit */ - if (cptr = sim_brk_getact (cbuf, CBUFSIZE)) /* pending action? */ + if ((cptr = sim_brk_getact (cbuf, CBUFSIZE))) /* pending action? */ printf ("sim> %s\n", cptr); /* echo */ else if (sim_vm_read != NULL) { /* sim routine? */ printf ("sim> "); /* prompt */ @@ -868,7 +872,7 @@ while (stat != SCPE_EXIT) { /* in case exit */ fprintf (sim_log, "sim> %s\n", cptr); cptr = get_glyph (cptr, gbuf, 0); /* get command glyph */ sim_switches = 0; /* init switches */ - if (cmdp = find_cmd (gbuf)) /* lookup command */ + if ((cmdp = find_cmd (gbuf))) /* lookup command */ stat = cmdp->action (cmdp->arg, cptr); /* if found, exec */ else stat = SCPE_UNK; stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */ @@ -944,7 +948,7 @@ if (*cptr) { cptr = get_glyph (cptr, gbuf, 0); if (*cptr) return SCPE_2MARG; - if (cmdp = find_cmd (gbuf)) { + if ((cmdp = find_cmd (gbuf))) { fputs (cmdp->help, stdout); if (sim_log) fputs (cmdp->help, sim_log); @@ -1148,7 +1152,7 @@ do { sim_switches = 0; /* init switches */ sim_gotofile = fpin; sim_do_echo = echo; - if (cmdp = find_cmd (gbuf)) { /* lookup command */ + if ((cmdp = find_cmd (gbuf))) { /* lookup command */ if (cmdp->action == &return_cmd) /* RETURN command? */ break; /* done! */ if (cmdp->action == &do_cmd) { /* DO command? */ @@ -1798,18 +1802,18 @@ if (*cptr == 0) /* must be more */ return SCPE_2FARG; cptr = get_glyph (cptr, gbuf, 0); /* get glob/dev/unit */ -if (dptr = find_dev (gbuf)) { /* device match? */ +if ((dptr = find_dev (gbuf))) { /* device match? */ uptr = dptr->units; /* first unit */ ctbr = set_dev_tab; /* global table */ lvl = MTAB_VDV; /* device match */ } -else if (dptr = find_unit (gbuf, &uptr)) { /* unit match? */ +else if ((dptr = find_unit (gbuf, &uptr))) { /* unit match? */ if (uptr == NULL) /* invalid unit */ return SCPE_NXUN; ctbr = set_unit_tab; /* global table */ lvl = MTAB_VUN; /* unit match */ } -else if (gcmdp = find_ctab (set_glob_tab, gbuf)) /* global? */ +else if ((gcmdp = find_ctab (set_glob_tab, gbuf))) /* global? */ return gcmdp->action (gcmdp->arg, cptr); /* do the rest */ else return SCPE_NXDEV; /* no match */ if (*cptr == 0) /* must be more */ @@ -1817,7 +1821,7 @@ if (*cptr == 0) /* must be more */ while (*cptr != 0) { /* do all mods */ cptr = get_glyph (svptr = cptr, gbuf, ','); /* get modifier */ - if (cvptr = strchr (gbuf, '=')) /* = value? */ + if ((cvptr = strchr (gbuf, '='))) /* = value? */ *cvptr++ = 0; for (mptr = dptr->modifiers; mptr && (mptr->mask != 0); mptr++) { if ((mptr->mstring) && /* match string */ @@ -1830,7 +1834,7 @@ while (*cptr != 0) { /* do all mods */ if (mptr->valid) { /* validation rtn? */ if (cvptr && (mptr->mask & MTAB_NC)) { get_glyph_nc (svptr, gbuf, ','); - if (cvptr = strchr (gbuf, '=')) + if ((cvptr = strchr (gbuf, '='))) *cvptr++ = 0; } r = mptr->valid (uptr, mptr->match, cvptr, mptr->desc); @@ -1863,7 +1867,7 @@ while (*cptr != 0) { /* do all mods */ } /* end if match */ } /* end for */ if (!mptr || (mptr->mask == 0)) { /* no match? */ - if (glbr = find_c1tab (ctbr, gbuf)) { /* global match? */ + if ((glbr = find_c1tab (ctbr, gbuf))) { /* global match? */ r = glbr->action (dptr, uptr, glbr->arg, cvptr); /* do global */ if (r != SCPE_OK) return r; @@ -2059,15 +2063,15 @@ GET_SWITCHES (cptr); /* get switches */ if (*cptr == 0) /* must be more */ return SCPE_2FARG; cptr = get_glyph (cptr, gbuf, 0); /* get next glyph */ -if (shptr = find_shtab (show_glob_tab, gbuf)) /* global? */ +if ((shptr = find_shtab (show_glob_tab, gbuf))) /* global? */ return shptr->action (ofile, NULL, NULL, shptr->arg, cptr); -if (dptr = find_dev (gbuf)) { /* device match? */ +if ((dptr = find_dev (gbuf))) { /* device match? */ uptr = dptr->units; /* first unit */ shtb = show_dev_tab; /* global table */ lvl = MTAB_VDV; /* device match */ } -else if (dptr = find_unit (gbuf, &uptr)) { /* unit match? */ +else if ((dptr = find_unit (gbuf, &uptr))) { /* unit match? */ if (uptr == NULL) /* invalid unit */ return SCPE_NXUN; if (uptr->flags & UNIT_DIS) /* disabled? */ @@ -2087,7 +2091,7 @@ if (dptr->modifiers == NULL) /* any modifiers? */ while (*cptr != 0) { /* do all mods */ cptr = get_glyph (cptr, gbuf, ','); /* get modifier */ - if (cvptr = strchr (gbuf, '=')) /* = value? */ + if ((cvptr = strchr (gbuf, '='))) /* = value? */ *cvptr++ = 0; for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { if (((mptr->mask & MTAB_XTD)? /* right level? */ @@ -2106,7 +2110,7 @@ while (*cptr != 0) { /* do all mods */ } /* end if */ } /* end for */ if (mptr->mask == 0) { /* no match? */ - if (shptr = find_shtab (shtb, gbuf)) /* global match? */ + if ((shptr = find_shtab (shtb, gbuf))) /* global match? */ shptr->action (ofile, dptr, uptr, shptr->arg, cptr); else return SCPE_ARG; } /* end if */ @@ -2557,7 +2561,7 @@ if (sim_brk_types == 0) return SCPE_NOFNC; if ((dptr == NULL) || (uptr == NULL)) return SCPE_IERR; -if (aptr = strchr (cptr, ';')) { /* ;action? */ +if ((aptr = strchr (cptr, ';'))) { /* ;action? */ if (flg != SSH_ST) /* only on SET */ return SCPE_ARG; *aptr++ = 0; /* separate strings */ @@ -4582,7 +4586,7 @@ if ((cptr == NULL) || (*cptr == 0)) return SCPE_ARG; strncpy (gbuf, cptr, CBUFSIZE); addrp = gbuf; /* default addr */ -if (portp = strchr (gbuf, ':')) /* x:y? split */ +if ((portp = strchr (gbuf, ':'))) /* x:y? split */ *portp++ = 0; else if (strchr (gbuf, '.')) /* x.y...? */ portp = NULL; @@ -4665,7 +4669,7 @@ DEVICE *dptr; if (uptr == NULL) /* arg error? */ return NULL; -if (dptr = find_dev (cptr)) { /* exact match? */ +if ((dptr = find_dev (cptr))) { /* exact match? */ if (qdisable (dptr)) /* disabled? */ return NULL; *uptr = dptr->units; /* unit 0 */ @@ -4745,7 +4749,7 @@ REG *rptr, *srptr = NULL; for (i = 0; (dptr = sim_devices[i]) != 0; i++) { /* all dev */ if (dptr->flags & DEV_DIS) /* skip disabled */ continue; - if (rptr = find_reg (cptr, optr, dptr)) { /* found? */ + if ((rptr = find_reg (cptr, optr, dptr))) { /* found? */ if (srptr) /* ambig? err */ return NULL; srptr = rptr; /* save reg */ @@ -4963,15 +4967,15 @@ const char logstr[] = "|&^", cmpstr[] = "=!><"; logval = cmpval = 0; if (*cptr == 0) /* check for clause */ return NULL; -for (logop = cmpop = -1; c = *cptr++; ) { /* loop thru clauses */ - if (sptr = strchr (logstr, c)) { /* check for mask */ +for (logop = cmpop = -1; (c = *cptr++); ) { /* loop thru clauses */ + if ((sptr = strchr (logstr, c))) { /* check for mask */ logop = (int32)(sptr - logstr); logval = strtotv (cptr, &tptr, radix); if (cptr == tptr) return NULL; cptr = tptr; } - else if (sptr = strchr (cmpstr, c)) { /* check for boolop */ + else if ((sptr = strchr (cmpstr, c))) { /* check for boolop */ cmpop = (int32)(sptr - cmpstr); if (*cptr == '=') { cmpop = cmpop + strlen (cmpstr); @@ -5663,7 +5667,7 @@ while (isspace (*sim_brk_act[sim_do_depth])) /* skip spaces */ sim_brk_act[sim_do_depth]++; if (*sim_brk_act[sim_do_depth] == 0) /* now empty? */ return (sim_brk_act[sim_do_depth] = NULL); -if (ep = strchr (sim_brk_act[sim_do_depth], ';')) { /* cmd delimiter? */ +if ((ep = strchr (sim_brk_act[sim_do_depth], ';'))) { /* cmd delimiter? */ lnt = ep - sim_brk_act[sim_do_depth]; /* cmd length */ memcpy (buf, sim_brk_act[sim_do_depth], lnt + 1); /* copy with ; */ buf[lnt] = 0; /* erase ; */ diff --git a/sim_console.c b/sim_console.c index c9b2ebe0..956c8cbd 100644 --- a/sim_console.c +++ b/sim_console.c @@ -208,10 +208,10 @@ if ((cptr == NULL) || (*cptr == 0)) return SCPE_2FARG; while (*cptr != 0) { /* do all mods */ cptr = get_glyph_nc (cptr, gbuf, ','); /* get modifier */ - if (cvptr = strchr (gbuf, '=')) /* = value? */ + if ((cvptr = strchr (gbuf, '='))) /* = value? */ *cvptr++ = 0; get_glyph (gbuf, gbuf, 0); /* modifier to UC */ - if (ctptr = find_ctab (set_con_tab, gbuf)) { /* match? */ + if ((ctptr = find_ctab (set_con_tab, gbuf))) { /* match? */ r = ctptr->action (ctptr->arg, cvptr); /* do the rest */ if (r != SCPE_OK) return r; @@ -236,7 +236,7 @@ if (*cptr == 0) { /* show all */ } while (*cptr != 0) { cptr = get_glyph (cptr, gbuf, ','); /* get modifier */ - if (shptr = find_shtab (show_con_tab, gbuf)) + if ((shptr = find_shtab (show_con_tab, gbuf))) shptr->action (st, dptr, uptr, shptr->arg, cptr); else return SCPE_NOPARAM; } @@ -425,7 +425,7 @@ if ((cptr == NULL) || (*cptr == 0)) return SCPE_2FARG; while (*cptr != 0) { /* do all mods */ cptr = get_glyph_nc (cptr, gbuf, ','); /* get modifier */ - if (cvptr = strchr (gbuf, '=')) /* = value? */ + if ((cvptr = strchr (gbuf, '='))) /* = value? */ *cvptr++ = 0; get_glyph (gbuf, gbuf, 0); /* modifier to UC */ if (isdigit (*gbuf)) { @@ -434,8 +434,8 @@ while (*cptr != 0) { /* do all mods */ return tmxr_open_master (&sim_con_tmxr, gbuf); /* open master socket */ } else - if (ctptr = find_ctab (set_con_telnet_tab, gbuf)) { /* match? */ - r = ctptr->action (ctptr->arg, cvptr); /* do the rest */ + if ((ctptr = find_ctab (set_con_telnet_tab, gbuf))) { /* match? */ + r = ctptr->action (ctptr->arg, cvptr); /* do the rest */ if (r != SCPE_OK) return r; } @@ -696,7 +696,7 @@ if (sim_con_ldsc.conn == 0) { /* no Telnet conn? */ return SCPE_OK; /* unconnected and buffered - nothing to receive */ } tmxr_poll_rx (&sim_con_tmxr); /* poll for input */ -if (c = tmxr_getc_ln (&sim_con_ldsc)) /* any char? */ +if ((c = tmxr_getc_ln (&sim_con_ldsc))) /* any char? */ return (c & (SCPE_BREAK | 0377)) | SCPE_KFLAG; return SCPE_OK; } diff --git a/swtp6800/common/m6800.c b/swtp6800/common/m6800.c index c7f8bf02..c78a5bbb 100644 --- a/swtp6800/common/m6800.c +++ b/swtp6800/common/m6800.c @@ -316,7 +316,7 @@ int32 sim_instr (void) while (reason == 0) { /* loop until halted */ // dump_regs1(); if (sim_interval <= 0) /* check clock queue */ - if (reason = sim_process_event ()) + if ((reason = sim_process_event ())) break; if (mem_fault) { /* memory fault? */ mem_fault = 0; /* reset fault flag */