Attachment #177583 for bug #214990

View | Details | Raw Unified | Return to bug 214990
Collapse All | Expand All

Lines 3-8 Link Here

(-)./Makefile (-1 / +4 lines)
3		3
4	PORTNAME= simh	4	PORTNAME= simh
5	PORTVERSION= 3.9.0	5	PORTVERSION= 3.9.0
		6	PORTREVISION= 1
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7	MASTER_SITES= http://simh.trailing-edge.com/sources/	8	MASTER_SITES= http://simh.trailing-edge.com/sources/
8	DISTNAME= ${PORTNAME}v${PORTVERSION:R:S/.//}-${PORTVERSION:E}	9	DISTNAME= ${PORTNAME}v${PORTVERSION:R:S/.//}-${PORTVERSION:E}
Lines 10-19 Link Here
10	MAINTAINER= bob@eager.cx	11	MAINTAINER= bob@eager.cx
11	COMMENT= Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others	12	COMMENT= Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others
12		13
		14	LICENSE= BSD3CLAUSE
		15
13	NO_WRKSUBDIR= yes	16	NO_WRKSUBDIR= yes
14		17
15	USES= gmake dos2unix zip	18	USES= gmake dos2unix zip
16	DOS2UNIX_FILES= makefile VAX/vax_sysdev.c	19	CFLAGS+= -Wno-format-extra-args -Wno-comment -Wno-logical-op-parentheses -Wno-bitwise-op-parentheses
17	MAKE_ENV= GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1	20	MAKE_ENV= GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1
18	MAKEFILE= makefile	21	MAKEFILE= makefile
19		22




--- ALTAIR/altair_cpu.c.orig	2016-12-01 22:43:42 UTC
+++ 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? */
@@ -366,7 +366,7 @@ int32 sim_instr (void)
         if ((OP & 0xCF) == 0x01) {                      /* LXI */
             DAR = M[PC] & 0x00ff;
             PC++;
-            DAR = DAR | (M[PC] <<8) & 0xFF00;;
+            DAR = DAR | ((M[PC] <<8) & 0xFF00);
             putpair((OP >> 4) & 0x03, DAR);
             PC++;
             continue;

Line 0 Link Here

(-)./files/patch-GRI_gri__cpu.c (+11 lines)
	1	--- GRI/gri_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ GRI/gri_cpu.c
	3	@@ -421,7 +421,7 @@ ao_update ();
	4	while (reason == 0) { /* loop until halted */
	5
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ())
	8	+ if ((reason = sim_process_event ()))
	9	break;
	10	}
	11

Line 0 Link Here

(-)./files/patch-H316_h316__cpu.c (+203 lines)
		1	--- H316/h316_cpu.c.orig 2016-12-01 22:43:42 UTC
		2	+++ H316/h316_cpu.c
		3	@@ -424,7 +424,7 @@ reason = 0;
		4	while (reason == 0) { /* loop until halted */
		5
		6	if (sim_interval <= 0) { /* check clock queue */
		7	- if (reason = sim_process_event ())
		8	+ if ((reason = sim_process_event ()))
		9	break;
		10	}
		11
		12	@@ -458,7 +458,7 @@ if (chan_req) {
		13	t = iotab[dev] (ioOTA, 0, Read (ad), dev); /* output word */
		14	if ((t & IOT_SKIP) == 0)
		15	return STOP_DMAER;
		16	- if (r = (t >> IOT_V_REASON))
		17	+ if ((r = (t >> IOT_V_REASON)))
		18	return r;
		19	}
		20	if (Q_DMA (i)) { /* DMA? */
		21	@@ -528,7 +528,7 @@ if (hst_lnt) {
		22	switch (I_GETOP (MB)) { /* case on <1:6> */
		23
		24	case 001: case 021: case 041: case 061: /* JMP */
		25	- if (reason = Ea (MB, &Y)) /* eff addr */
		26	+ if ((reason = Ea (MB, &Y))) /* eff addr */
		27	break;
		28	PCQ_ENTRY; /* save PC */
		29	PC = NEWA (PC, Y); /* set new PC */
		30	@@ -537,7 +537,7 @@ switch (I_GETOP (MB)) {
		31	break;
		32
		33	case 002: case 022: case 042: case 062: /* LDA */
		34	- if (reason = Ea (MB, &Y)) /* eff addr */
		35	+ if ((reason = Ea (MB, &Y))) /* eff addr */
		36	break;
		37	if (dp) { /* double prec? */
		38	AR = Read (Y & ~1); /* get doubleword */
		39	@@ -548,13 +548,13 @@ switch (I_GETOP (MB)) {
		40	break;
		41
		42	case 003: case 023: case 043: case 063: /* ANA */
		43	- if (reason = Ea (MB, &Y)) /* eff addr */
		44	+ if ((reason = Ea (MB, &Y))) /* eff addr */
		45	break;
		46	AR = AR & Read (Y);
		47	break;
		48
		49	case 004: case 024: case 044: case 064: /* STA */
		50	- if (reason = Ea (MB, &Y)) /* eff addr */
		51	+ if ((reason = Ea (MB, &Y))) /* eff addr */
		52	break;
		53	Write (Y, AR); /* store A */
		54	if (dp) { /* double prec? */
		55	@@ -564,13 +564,13 @@ switch (I_GETOP (MB)) {
		56	break;
		57
		58	case 005: case 025: case 045: case 065: /* ERA */
		59	- if (reason = Ea (MB, &Y)) /* eff addr */
		60	+ if ((reason = Ea (MB, &Y))) /* eff addr */
		61	break;
		62	AR = AR ^ Read (Y);
		63	break;
		64
65	case 006: case 026: case 046: case 066: /* ADD */
66	- if (reason = Ea (MB, &Y)) /* eff addr */
67	+ if ((reason = Ea (MB, &Y))) /* eff addr */
68	break;
69	if (dp) { /* double prec? */
70	t1 = GETDBL_S (AR, BR); /* get A'B */
71	@@ -583,7 +583,7 @@ switch (I_GETOP (MB)) {
72	break;
73
74	case 007: case 027: case 047: case 067: /* SUB */
75	- if (reason = Ea (MB, &Y)) /* eff addr */
76	+ if ((reason = Ea (MB, &Y))) /* eff addr */
77	break;
78	if (dp) { /* double prec? */
79	t1 = GETDBL_S (AR, BR); /* get A'B */
80	@@ -596,7 +596,7 @@ switch (I_GETOP (MB)) {
81	break;
82
83	case 010: case 030: case 050: case 070: /* JST */
84	- if (reason = Ea (MB, &Y)) /* eff addr */
85	+ if ((reason = Ea (MB, &Y))) /* eff addr */
86	break;
87	MB = NEWA (Read (Y), PC); /* merge old PC */
88	Write (Y, MB);
89	@@ -605,7 +605,7 @@ switch (I_GETOP (MB)) {
90	break;
91
92	case 011: case 031: case 051: case 071: /* CAS */
93	- if (reason = Ea (MB, &Y)) /* eff addr */
94	+ if ((reason = Ea (MB, &Y))) /* eff addr */
95	break;
96	MB = Read (Y);
97	if (AR == MB)
98	@@ -615,7 +615,7 @@ switch (I_GETOP (MB)) {
99	break;
100
101	case 012: case 032: case 052: case 072: /* IRS */
102	- if (reason = Ea (MB, &Y)) /* eff addr */
103	+ if ((reason = Ea (MB, &Y))) /* eff addr */
104	break;
105	MB = (Read (Y) + 1) & DMASK; /* incr, rewrite */
106	Write (Y, MB);
107	@@ -624,7 +624,7 @@ switch (I_GETOP (MB)) {
108	break;
109
110	case 013: case 033: case 053: case 073: /* IMA */
111	- if (reason = Ea (MB, &Y)) /* eff addr */
112	+ if ((reason = Ea (MB, &Y))) /* eff addr */
113	break;
114	MB = Read (Y);
115	Write (Y, AR); /* A to mem */
116	@@ -632,13 +632,13 @@ switch (I_GETOP (MB)) {
117	break;
118
119	case 015: case 055: /* STX */
120	- if (reason = Ea (MB & ~IDX, &Y)) /* eff addr */
121	+ if ((reason = Ea (MB & ~IDX, &Y))) /* eff addr */
122	break;
123	Write (Y, XR); /* store XR */
124	break;
125
126	case 035: case 075: /* LDX */
127	- if (reason = Ea (MB & ~IDX, &Y)) /* eff addr */
128	+ if ((reason = Ea (MB & ~IDX, &Y))) /* eff addr */
129	break;
130	XR = Read (Y); /* load XR */
131	M[M_XR] = XR; /* update mem too */
132	@@ -646,7 +646,7 @@ switch (I_GETOP (MB)) {
133
134	case 016: case 036: case 056: case 076: /* MPY */
135	if (cpu_unit.flags & UNIT_HSA) { /* installed? */
136	- if (reason = Ea (MB, &Y)) /* eff addr */
137	+ if ((reason = Ea (MB, &Y))) /* eff addr */
138	break;
139	t1 = SEXT (AR) * SEXT (Read (Y));
140	PUTDBL_Z (t1);
141	@@ -657,7 +657,7 @@ switch (I_GETOP (MB)) {
142
143	case 017: case 037: case 057: case 077: /* DIV */
144	if (cpu_unit.flags & UNIT_HSA) { /* installed? */
145	- if (reason = Ea (MB, &Y)) /* eff addr */
146	+ if ((reason = Ea (MB, &Y))) /* eff addr */
147	break;
148	t2 = SEXT (Read (Y)); /* divr */
149	if (t2) { /* divr != 0? */
150	@@ -826,7 +826,7 @@ switch (I_GETOP (MB)) {
151	break;
152
153	case 003: /* "long right arot" */
154	- if (reason = stop_inst) /* stop on undef? */
155	+ if ((reason = stop_inst)) /* stop on undef? */
156	break;
157	for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
158	C = BR & 1; /* C = last out */
159	@@ -859,7 +859,7 @@ switch (I_GETOP (MB)) {
160	break;
161
162	case 007: /* "short right arot" */
163	- if (reason = stop_inst) /* stop on undef? */
164	+ if ((reason = stop_inst)) /* stop on undef? */
165	break;
166	for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
167	C = AR & 1; /* C = last out */
168	@@ -899,7 +899,7 @@ switch (I_GETOP (MB)) {
169	break;
170
171	case 013: /* "long left arot" */
172	- if (reason = stop_inst) /* stop on undef? */
173	+ if ((reason = stop_inst)) /* stop on undef? */
174	break;
175	for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
176	AR = (AR << 1) \| ((BR >> 14) & 1);
177	@@ -935,7 +935,7 @@ switch (I_GETOP (MB)) {
178	break;
179
180	case 017: /* "short left arot" */
181	- if (reason = stop_inst) /* stop on undef? */
182	+ if ((reason = stop_inst)) /* stop on undef? */
183	break;
184	for (t2 = 0; t2 < t1; t2++) { /* bit by bit */
185	if ((AR & SIGN) != ((AR << 1) & SIGN)) C = 1;
186	@@ -1003,7 +1003,7 @@ switch (I_GETOP (MB)) {
187	AR = (AR << 8) & DMASK;
188	else if (MB == 0141340) /* ICA */
189	AR = ((AR << 8) \| (AR >> 8)) & DMASK;
190	- else if (reason = stop_inst)
191	+ else if ((reason = stop_inst))
192	break;
193	else AR = Operate (MB, AR); /* undefined */
194	break;
195	@@ -1500,7 +1500,7 @@ for (i = 0; i < DEV_MAX; i++)
196	iotab[i] = NULL;
197	for (i = 0; i < (DMA_MAX + DMC_MAX); i++)
198	chan_map[i] = 0;
199	-for (i = 0; dptr = sim_devices[i]; i++) { /* loop thru devices */
200	+for (i = 0; (dptr = sim_devices[i]); i++) { /* loop thru devices */
201	dibp = (DIB ) dptr->ctxt; / get DIB */
202	if ((dibp == NULL) \|\| (dptr->flags & DEV_DIS)) /* exist, enabled? */
203	continue;




--- H316/h316_dp.c.orig	2016-12-01 22:43:42 UTC
+++ H316/h316_dp.c
@@ -617,7 +617,7 @@ switch (uptr->FNC) {                    
     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 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) {                    
         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].
             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];




--- H316/h316_mt.c.orig	2016-12-01 22:43:42 UTC
+++ H316/h316_mt.c
@@ -371,17 +371,17 @@ switch (uptr->FNC) {                    
         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) {                    
                 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 */

Line 0 Link Here

(-)./files/patch-H316_h316__stddev.c (+11 lines)
	1	--- H316/h316_stddev.c.orig 2016-12-01 22:43:42 UTC
	2	+++ H316/h316_stddev.c
	3	@@ -390,7 +390,7 @@ t_stat r;
	4
	5	if (!(uptr->flags & UNIT_ATTABLE))
	6	return SCPE_NOFNC;
	7	-if (r = attach_unit (uptr, cptr))
	8	+if ((r = attach_unit (uptr, cptr)))
	9	return r;
	10	if (sim_switches & SWMASK ('A')) /* -a? ASCII */
	11	uptr->flags \|= UNIT_ASC;




--- H316/h316_sys.c.orig	2016-12-01 22:43:42 UTC
+++ H316/h316_sys.c
@@ -364,11 +364,11 @@ switch (j) {                            
 
     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 */




--- HP2100/hp2100_baci.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_baci.c
@@ -670,7 +670,7 @@ while (working_set) {
                     if ((baci_icw ^ baci_obuf) & OUT_BAUDRATE) {    /* baud rate change? */
                         baci_term.wait = service_time (baci_obuf);  /* set service time to match rate */
 
-                        if (baci_term.flags & UNIT_DIAG)        /* diagnostic mode? */
+                        if (baci_term.flags & UNIT_DIAG) {      /* diagnostic mode? */
                             if (baci_obuf & OUT_BAUDRATE) {     /* internal baud rate requested? */
                                 sim_activate (&baci_term,       /* activate I/O service */
                                               baci_term.wait);
@@ -687,6 +687,7 @@ while (working_set) {
                                     fprintf (sim_deb, ">>BACI cmds: [OTx%s] Terminal service stopped\n",
                                                       hold_or_clear);
                                 }
+                            }
                         }
 
                     baci_icw = baci_obuf;                   /* load new reference word */
@@ -1381,13 +1382,14 @@ else {                                  
 
 baci_fcount = baci_fcount + 1;                          /* increment occupancy counter */
 
-if (DEBUG_PRI (baci_dev, DEB_BUF))
+if (DEBUG_PRI (baci_dev, DEB_BUF)) {
     if (pass_thru)
         fprintf (sim_deb, ">>BACI buf:  Character %s put to UART transmitter holding register, "
                           "character counter = 1\n", fmt_char (ch));
     else
         fprintf (sim_deb, ">>BACI buf:  Character %s put to FIFO [%d], "
                           "character counter = %d\n", fmt_char (ch), index, baci_fcount);
+}
 
 if ((IO_MODE == RECV) && (baci_spchar [ch]))            /* receive mode and special character? */
     baci_status = baci_status | IN_SPCHAR;              /* set special char seen flag */
@@ -1447,12 +1449,13 @@ uint32 uart_bits, data_bits, data_mask, 
 if (baci_uart_clk > 0) {                                /* transfer in progress? */
     bit_low = (baci_icw & OUT_CD);                      /* get current receive bit */
 
-    if ((baci_uart_clk & 017) == 0)                     /* end of a bit? */
+    if ((baci_uart_clk & 017) == 0) {                   /* end of a bit? */
         if (IO_MODE == XMIT)                            /* transmit? */
             baci_uart_tr = baci_uart_tr >> 1;           /* shift new bit onto line */
         else                                            /* receive? */
             baci_uart_rr = (baci_uart_rr >> 1) &        /* shift new bit in */
                            (bit_low ? ~SIGN : -1);      /* (inverted sense) */
+    }
 
     if (bit_low) {                                      /* another low bit? */
         baci_bcount = baci_bcount + 1;                  /* update break counter */




--- HP2100/hp2100_cpu.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_cpu.c
@@ -1054,7 +1054,7 @@ for (i = OPTDEV; i <= MAXDEV; i++)      
 
 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? */
@@ -2153,13 +2153,13 @@ if (req_grant [0])                      
         else                                            /* not this one */
             req_grant [0] = req_grant [0] >> 1;         /* position next request */
 
-else if (req_grant [1])                                 /* device in upper half */
+else if (req_grant [1]) {                                /* device in upper half */
     for (sc = 32; sc <= 63; sc++)                       /* determine interrupting select code */
         if (req_grant [1] & 1)                          /* grant this request? */
             return sc;                                  /* return this select code */
         else                                            /* not this one */
             req_grant [1] = req_grant [1] >> 1;         /* position next request */
-
+  }
 return 0;                                               /* no interrupt granted */
 }
 
@@ -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]) {
@@ -3791,12 +3791,12 @@ else
 
 result = cpu_set_size (uptr, new_memsize, NULL, NULL);  /* set memory size */
 
-if (result == SCPE_OK)                                  /* memory change OK? */
+if (result == SCPE_OK) {                                /* memory change OK? */
     if (new_family == UNIT_FAMILY_21XX)                 /* 21xx CPU? */
         fwanxm = MEMSIZE - IBL_LNT;                     /* reserve memory for loader */
     else
         fwanxm = MEMSIZE;                               /* loader reserved only for 21xx */
-
+  }
 return result;
 }
 
@@ -3810,11 +3810,12 @@ t_stat cpu_show_model (FILE *st, UNIT *u
 {
 fputs ((char *) desc, st);                              /* write model name */
 
-if (UNIT_CPU_FAMILY == UNIT_FAMILY_21XX)                /* valid only for 21xx */
+if (UNIT_CPU_FAMILY == UNIT_FAMILY_21XX) {              /* valid only for 21xx */
     if (fwanxm < MEMSIZE)                               /* loader area non-existent? */
         fputs (", loader disabled", st);                /* yes, so access disabled */
     else
         fputs (", loader enabled", st);                 /* no, so access enabled */
+  }
 return SCPE_OK;
 }
 
@@ -3846,12 +3847,12 @@ if (UNIT_CPU_TYPE == UNIT_TYPE_2100) {
         uptr->flags = uptr->flags | UNIT_FP;
     }
 
-else if (UNIT_CPU_MODEL == UNIT_1000_F)
+else if (UNIT_CPU_MODEL == UNIT_1000_F) {
     if (option == UNIT_VIS)                             /* 1000-F IOP and VIS options */
         uptr->flags = uptr->flags & ~UNIT_IOP;          /* are mutually exclusive */
     else if (option == UNIT_IOP)
         uptr->flags = uptr->flags & ~UNIT_VIS;
-
+  }
 return SCPE_OK;
 }
 




--- HP2100/hp2100_cpu0.c.orig	2016-12-01 22:43:42 UTC
+++ 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> */
@@ -244,7 +244,7 @@ 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> */




--- HP2100/hp2100_cpu1.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_cpu1.c
@@ -193,11 +193,12 @@ OPS op;
 uint32 rs, qs, sc, v1, v2, t;
 int32 sop1, sop2;
 
-if ((cpu_unit.flags & UNIT_EAU) == 0)                   /* option installed? */
+if ((cpu_unit.flags & UNIT_EAU) == 0) {                 /* option installed? */
     if ((UNIT_CPU_MODEL == UNIT_2114) && (IR == 0101100))   /* 2114 and RRR 16? */
         return SCPE_OK;                                 /* allowed as NOP */
     else
         return stop_inst;                               /* fail */
+}
 
 switch ((IR >> 8) & 0377) {                             /* decode IR<15:8> */
 
@@ -245,7 +246,7 @@ switch ((IR >> 8) & 0377) {             
 
         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 +263,9 @@ switch ((IR >> 8) & 0377) {             
         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 +318,14 @@ switch ((IR >> 8) & 0377) {             
         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 +735,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) {




--- HP2100/hp2100_cpu2.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_cpu2.c
@@ -244,7 +244,7 @@ absel = (IR & I_AB)? 1: 0;              
 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;              
 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)                  
 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> */




--- HP2100/hp2100_cpu3.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_cpu3.c
@@ -186,7 +186,7 @@ entry = IR & 037;                       
 
 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) {    
 
 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) {                        
             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) {                        
             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) {                        
 
         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> */




--- HP2100/hp2100_cpu4.c.orig	2016-12-01 22:43:42 UTC
+++ 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, 00
 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> */




--- HP2100/hp2100_cpu5.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_cpu5.c
@@ -650,7 +650,7 @@ entry = IR & 017;                       
 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;                       
 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? */




--- HP2100/hp2100_cpu6.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_cpu6.c
@@ -394,7 +394,7 @@ entry = IR & 017;                       
 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 */
@@ -544,7 +544,7 @@ switch (entry) {                        
         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;
                 }
@@ -710,7 +710,7 @@ switch (entry) {                        
                 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;
                     }




--- HP2100/hp2100_cpu7.c.orig	2016-12-01 22:43:42 UTC
+++ 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_S
 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? */




--- HP2100/hp2100_di.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_di.c
@@ -607,13 +607,13 @@ while (working_set) {
                 else if (di_card->cntl_register & CNTL_NRFD)    /* NRFD was set but is not now? */
                     deny |= BUS_NRFD;                           /* deny NRFD on the bus */
 
-                if (FIFO_FULL)                                  /* is the FIFO full? */
+                if (FIFO_FULL) {                                /* is the FIFO full? */
                     if (data & CNTL_LSTN)                       /* is card now listening? */
                         assert |= BUS_NRFD;                     /* listener and a full FIFO asserts NRFD */
 
                     else if (di_card->cntl_register & CNTL_LSTN)    /* was card a listener but is not now? */
                         deny |= BUS_NRFD;                           /* deny NRFD on the bus */
-
+                }
 
                 if (SW8_SYSCTL) {                           /* system controller drives REN and IFC */
                     if (data & CNTL_REN)                    /* REN control */
@@ -1452,14 +1452,14 @@ if (di_card->bus_cntl & BUS_IFC         
     }
 
 
-if (di_card->cntl_register & CNTL_LSTN)                 /* is the card a listener? */
+if (di_card->cntl_register & CNTL_LSTN) {               /* is the card a listener? */
     if (di_card->cntl_register & CNTL_NRFD              /* if explicitly requested */
       || di_card->status_register & STAT_LBI            /*   or the last byte is in */
       || FIFO_FULL)                                     /*   or the FIFO is full */
         assert = BUS_NRFD;                              /*   then assert NRFD */
     else                                                /* otherwise the card is ready for data */
         deny |= BUS_NRFD;                               /*   so deny NRFD */
-
+  }
 if (assert != deny)                                     /* was there any change in bus state? */
     di_bus_control (card, CONTROLLER, assert, deny);    /* update the bus control */
 
@@ -1813,7 +1813,7 @@ if (tag & TAG_EDT                       
 
 if (access == cpu_access) {                             /* is this a cpu access? */
     if (!(di_card->cntl_register & CNTL_PACK))          /*   in unpacked mode? */
-        data = data & ~(DATA_ATN | DATA_EOI)            /* substitute the ATN/EOI tag values */
+        data = (data & ~(DATA_ATN | DATA_EOI))          /* substitute the ATN/EOI tag values */
           | (tag & (TAG_ATN | TAG_EOI)) >> DATA_SHIFT;  /*   into the data word */
 
     if (tag & TAG_LBR)                                  /* is this the last byte? */
@@ -1856,25 +1856,25 @@ if (DEBUG_PRJ (dptrs [card], DEB_BUF)) {
     }
 
 
-if (di_card->cntl_register & CNTL_TALK)                 /* is the card talking? */
-    if (di_card->cntl_register & CNTL_PACK)             /* is it in the packed mode? */
+if (di_card->cntl_register & CNTL_TALK) {                 /* is the card talking? */
+    if (di_card->cntl_register & CNTL_PACK) {           /* is it in the packed mode? */
         if (di_card->status_register & STAT_LBO         /* yes, is the last byte out? */
           && di_card->cntl_register & CNTL_EOI)         /*   and is EOI control enabled? */
             di_card->bus_cntl |= BUS_EOI;               /* assert EOI on the bus */
         else
             di_card->bus_cntl &= ~BUS_EOI;              /* deny EOI on the bus */
-
+         }
     else {                                              /* the card is in the unpacked mode */
         if (di_card->cntl_register & CNTL_CIC)          /* is the card the controller in charge? */
             di_card->bus_cntl =                         /* assert or deny the ATN bus line */
-              di_card->bus_cntl & ~BUS_ATN              /*   from the ATN tag value */
+              (di_card->bus_cntl & ~BUS_ATN)             /*   from the ATN tag value */
               | (tag & TAG_ATN) >> BUS_SHIFT;
 
         di_card->bus_cntl =                             /* assert or deny the EOI bus line */
-          di_card->bus_cntl & ~BUS_EOI                  /*   from the EOI tag value */
+          (di_card->bus_cntl & ~BUS_EOI)                /*   from the EOI tag value */
           | (tag & TAG_EOI) >> BUS_SHIFT;
         }
-
+   }
 return (uint16) data;                                   /* return the data value */
 }
 




--- HP2100/hp2100_di_da.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_di_da.c
@@ -1215,7 +1215,7 @@ if (GET_BUSADR (da_unit [unitno].flags) 
 if (ibl_copy (da_rom, da_dib.select_code))                  /* copy the boot ROM to memory and configure */
     return SCPE_IERR;                                       /* return an internal error if the copy failed */
 
-SR = SR & (IBL_OPT | IBL_DS_HEAD)                           /* set S to a reasonable value */
+SR = (SR & (IBL_OPT | IBL_DS_HEAD))                         /* set S to a reasonable value */
   | IBL_DS | IBL_MAN | (da_dib.select_code << IBL_V_DEV);   /*   before boot execution */
 
 return SCPE_OK;
@@ -1594,10 +1594,10 @@ if (di [da].bus_cntl & BUS_ATN) {       
                 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 */
 
@@ -1738,7 +1738,7 @@ else {                                  
 
             put_buffer_byte (&icd_cntlr [unit], data);      /* add the byte to the buffer */
 
-            if (icd_cntlr [unit].length == 0)               /* is this the last parameter? */
+            if (icd_cntlr [unit].length == 0) {             /* is this the last parameter? */
                 if (di [da].bus_cntl & BUS_EOI)             /* does the host agree? */
                     initiated = start_command (unit);       /* start the command and log the initiation */
 
@@ -1747,6 +1747,7 @@ else {                                  
                                    error_sink);             /*   any additional parameter bytes */
                     initiated = TRUE;                       /* log the abort initiation */
                     }
+            }
             break;
 
 
@@ -1787,14 +1788,14 @@ if (accepted && DEBUG_PRI (da_dev, DEB_X
 if (da_unit [unit].wait > 0)                            /* was service requested? */
     activate_unit (&da_unit [unit]);                    /* schedule the unit */
 
-if (initiated && DEBUG_PRI (da_dev, DEB_RWSC))
+if (initiated && DEBUG_PRI (da_dev, DEB_RWSC)) {
     if (if_command [unit] == disc_command)
         fprintf (sim_deb, ">>DA rwsc: Unit %d position %d %s disc command initiated\n",
                  unit, da_unit [unit].pos, dl_opcode_name (ICD, icd_cntlr [unit].opcode));
     else
         fprintf (sim_deb, ">>DA rwsc: Unit %d %s command initiated\n",
                  unit, if_command_name [if_command [unit]]);
-
+}
 return accepted;                                        /* indicate the acceptance condition */
 }
 




--- HP2100/hp2100_dp.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_dp.c
@@ -694,7 +694,7 @@ void dp_goc (int32 fnc, int32 drv, int32
 {
 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) {                    
                 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) {                    
                 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? */




--- HP2100/hp2100_dq.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_dq.c
@@ -530,7 +530,7 @@ void dq_goc (int32 fnc, int32 drv, int32
 {
 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) {                    
             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) {                    
             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? */




--- HP2100/hp2100_fp1.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_fp1.c
@@ -1145,12 +1145,12 @@ if (operand_l && operand_r) {           
         *operand_l = fp_a;                              /* first op is accum */
     }
 
-if (result)                                             /* want result precision? */
+if (result) {                                           /* want result precision? */
     if ((opcode & 0120) == 0100)                        /* fix? */
         *result = int_size;                             /* result is integer */
     else                                                /* all others */
         *result = fp_size;                              /* result is fp */
-
+}
 return;
 }
 

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__ipl.c (+11 lines)
	1	--- HP2100/hp2100_ipl.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_ipl.c
	3	@@ -623,7 +623,7 @@ uptr->filename = tptr;
	4	sim_activate (uptr, POLL_FIRST); /* activate first poll "immediately" */
	5	if (sim_switches & SWMASK ('W')) { /* wait? */
	6	for (i = 0; i < 30; i++) { /* check for 30 sec */
	7	- if (t = ipl_check_conn (uptr)) /* established? */
	8	+ if ((t = ipl_check_conn (uptr))) /* established? */
	9	break;
	10	if ((i % 10) == 0) /* status every 10 sec */
	11	printf ("Waiting for connnection\n");




--- HP2100/hp2100_lps.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_lps.c
@@ -372,11 +372,12 @@ while (working_set) {
             if (lps_unit.flags & UNIT_DIAG) {           /* diagnostic? */
                 lps_sta = lps_unit.buf;                 /* loop back data */
 
-                if (!(signal_set & ioCLC))                  /* CLC not asserted simultaneously? */
+                if (!(signal_set & ioCLC)) {               /* CLC not asserted simultaneously? */
                     if (UNIT_CPU_TYPE == UNIT_TYPE_211X)    /* 2114/15/16 CPU? */
                         sim_activate (&lps_unit, 3);        /* schedule flag after two instructions */
                     else                                    /* 2100 or 1000 */
                         sim_activate (&lps_unit, 2);        /* schedule flag after next instruction */
+                    }
                 }
 
             else {                                      /* real lpt, sched */




--- HP2100/hp2100_mpx.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_mpx.c
@@ -1153,7 +1153,7 @@ switch (mpx_cmd) {
     case CMD_REQ_WRITE:                                 /* request write buffer */
         port = key_to_port (mpx_portkey);               /* get port */
 
-        if (port >= 0)                                  /* port defined? */
+        if (port >= 0) {                                /* port defined? */
             if (buf_avail (iowrite, port) > 0)          /* is a buffer available? */
                 mpx_ibuf = WR_BUF_LIMIT;                /* report write buffer limit */
 
@@ -1161,6 +1161,7 @@ switch (mpx_cmd) {
                 mpx_ibuf = 0;                           /* report none available */
                 mpx_flags [port] |= FL_WANTBUF;         /* set buffer request */
                 }
+           }
         break;
 
 
@@ -1251,7 +1252,7 @@ switch (mpx_cmd) {
     case CMD_TERM_BUF:                                  /* terminate active receive buffer */
         port = key_to_port (mpx_portkey);               /* get port */
 
-        if (port >= 0)                                  /* port defined? */
+        if (port >= 0) {                                /* port defined? */
             if (buf_len (ioread, port, put) > 0) {      /* any chars in buffer? */
                 buf_term (ioread, port, 0);             /* terminate buffer and set header */
 
@@ -1263,6 +1264,7 @@ switch (mpx_cmd) {
                 mpx_charcnt [port] = 1;                 /* set to terminate on one char */
                 mpx_flags [port] |= FL_ALERT;           /* set alert flag */
                 }
+           }
         break;
 
 
@@ -1784,7 +1786,7 @@ while (recv_loop &&                     
         }
 
     else {                                                      /* buffer is available */
-        if (rt & RT_ENAB_EDIT)                                  /* editing enabled? */
+        if (rt & RT_ENAB_EDIT) {                                /* editing enabled? */
             if (ch == BS) {                                     /* backspace? */
                 if (buf_len (ioread, port, put) > 0)            /* at least one character in buffer? */
                     buf_remove (ioread, port);                  /* remove last char */
@@ -1814,6 +1816,7 @@ while (recv_loop &&                     
 
                 continue;
                 }
+        }
 
         if (uptr->flags & UNIT_CAPSLOCK)                    /* caps lock mode? */
             ch = toupper (ch);                              /* convert to upper case if lower */
@@ -2473,14 +2476,14 @@ else
 
 buf_incr (mpx_get, port, rw, +1);                       /* increment circular get index */
 
-if (DEBUG_PRI (mpx_dev, DEB_BUF))
+if (DEBUG_PRI (mpx_dev, DEB_BUF)) {
     if (mpx_flags [port] & emptying_flags [rw])
         fprintf (sim_deb, ">>MPX buf:  Port %d character %s get from %s buffer "
                           "[%d]\n", port, fmt_char (ch), io_op [rw], index);
     else
         fprintf (sim_deb, ">>MPX buf:  Port %d header %03o get from %s buffer "
                           "[%d]\n", port, ch, io_op [rw], index);
-
+    }
 if (mpx_get [port] [rw] == mpx_sep [port] [rw])         /* buffer now empty? */
     mpx_flags [port] &= ~emptying_flags [rw];           /* clear "buffer emptying" flag */
 else




--- HP2100/hp2100_ms.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_ms.c
@@ -737,7 +737,7 @@ switch (uptr->FNC) {                    
                 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) {                    
             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) {                    
         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) {                    
                     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) {                    
                 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++) {        
             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 */




--- HP2100/hp2100_mt.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_mt.c
@@ -495,7 +495,7 @@ switch (mtc_fnc) {                      
         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) {                      
         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) {                      
             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);
     }
 




--- HP2100/hp2100_mux.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_mux.c
@@ -650,11 +650,12 @@ while (working_set) {
         case ioIOO:                                     /* I/O data output */
             muxl_obuf = IODATA (stat_data);             /* store data */
 
-            if (DEBUG_PRI (muxu_dev, DEB_CPU))
+            if (DEBUG_PRI (muxu_dev, DEB_CPU)) {
                 if (muxl_obuf & OTL_P)
                     fprintf (sim_deb, ">>MUXl cpu:  [OTx%s] Parameter = %06o\n", hold_or_clear, muxl_obuf);
                 else
                     fprintf (sim_deb, ">>MUXl cpu:  [OTx%s] Data = %06o\n", hold_or_clear, muxl_obuf);
+                }
             break;
 
 
@@ -1107,11 +1108,12 @@ if (c & SCPE_BREAK) {                   
         mux_rbuf[ln] = 0;                               /* break returns NUL */
         mux_sta[ln] = mux_sta[ln] | LIU_BRK;            /* set break status */
 
-        if (DEBUG_PRI (muxu_dev, DEB_XFER))
+        if (DEBUG_PRI (muxu_dev, DEB_XFER)) {
             if (diag)
                 fputs (">>MUXl xfer: Break detected\n", sim_deb);
             else
                 fputs (">>MUXl xfer: Deferred break processed\n", sim_deb);
+            }
         }
 
     else {




--- HP2100/hp2100_stddev.c.orig	2016-12-01 22:43:42 UTC
+++ 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;
         }
     }
@@ -1112,11 +1112,12 @@ while (working_set) {
             if (!sim_is_active (&clk_unit)) {                   /* clock running? */
                 clk_tick = clk_delay (0);                       /* get tick count */
 
-                if ((clk_unit.flags & UNIT_DIAG) == 0)          /* calibrated? */
+                if ((clk_unit.flags & UNIT_DIAG) == 0) {        /* calibrated? */
                     if (clk_select == 2)                        /* 10 msec. interval? */
                         clk_tick = sync_poll (INITIAL);         /* sync  poll */
                     else
                         sim_rtcn_init (clk_tick, TMR_CLK);      /* initialize timer */
+                    }
 
                 sim_activate (&clk_unit, clk_tick);             /* start clock */
                 clk_ctr = clk_delay (1);                        /* set repeat ctr */




--- HP2100/hp2100_sys.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp2100_sys.c
@@ -608,11 +608,11 @@ if (opcode[i]) {                        
 
     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;




--- HP2100/hp_disclib.c.orig	2016-12-01 22:43:42 UTC
+++ HP2100/hp_disclib.c
@@ -761,8 +761,8 @@ else {                                  
     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 */
     }
@@ -1563,7 +1563,7 @@ t_stat dl_load_unload (CVPTR cvptr, UNIT
 if ((uptr->flags & UNIT_ATT) == 0)                      /* the unit must be attached to [un]load */
     return SCPE_UNATT;                                  /* return "Unit not attached" if not */
 
-else if (!(sim_switches & SIM_SW_REST))                 /* modify the flags only if not restoring */
+else if (!(sim_switches & SIM_SW_REST)) {               /* modify the flags only if not restoring */
     if (load) {                                         /* are we loading the heads? */
         uptr->flags = uptr->flags & ~UNIT_UNLOAD;       /* clear the unload flag */
         uptr->STAT = DL_S2FS;                           /*   and set First Status */
@@ -1576,7 +1576,7 @@ else if (!(sim_switches & SIM_SW_REST)) 
         uptr->flags = uptr->flags | UNIT_UNLOAD;        /* set the unload flag */
         uptr->STAT = DL_S2ATN;                          /*   and Attention status */
         }
-
+    }
 return SCPE_OK;
 }
 
@@ -1897,7 +1897,7 @@ static void start_write (CVPTR cvptr, UN
 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? */
+  || (!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 */
@@ -2041,11 +2041,12 @@ if (cvptr->eoc == SET)                  
                    (CNTLR_OPCODE) uptr->OP,                     /*   with the current operation */
                    (CNTLR_PHASE) uptr->PHASE);                  /*     and phase unchanged */
 
-        if (uptr->STAT & DL_S2SC)                               /* did a seek check occur? */
+        if (uptr->STAT & DL_S2SC) {                             /* did a seek check occur? */
             if (cvptr->type == ICD)                             /* is this ICD controller? */
                 dl_end_command (cvptr, end_of_cylinder);        /* report it as an End of Cylinder error */
             else                                                /* it is a MAC controller */
                 dl_end_command (cvptr, status_2_error);         /* report it as a Status-2 error */
+            }
         }
 
     else                                                        /* the file mask does not permit an auto-seek */
@@ -2291,12 +2292,13 @@ return;
 
 static void set_timer (CVPTR cvptr, FLIP_FLOP action)
 {
-if (cvptr->type == MAC)                                 /* is this a MAC controller? */
+if (cvptr->type == MAC) {                               /* is this a MAC controller? */
     if (action == SET)                                  /* should we start the timer? */
         sim_activate_abs (cvptr->aux + timer,           /* activate the auxiliary unit */
                           cvptr->wait_time);
     else                                                /* we stop the timer */
         sim_cancel (cvptr->aux + timer);                /*   by canceling the unit */
+}
 return;
 }
 

Line 0 Link Here

(-)./files/patch-I1401_i1401__cd.c (+11 lines)
	1	--- I1401/i1401_cd.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I1401/i1401_cd.c
	3	@@ -184,7 +184,7 @@ t_stat r;
	4
	5	if (sim_is_active (&cdr_unit)) { /* busy? */
	6	sim_cancel (&cdr_unit); /* cancel */
	7	- if (r = cdr_svc (&cdr_unit)) /* process */
	8	+ if ((r = cdr_svc (&cdr_unit))) /* process */
	9	return r;
	10	}
	11	if ((cdr_unit.flags & UNIT_ATT) == 0) /* attached? */




--- I1401/i1401_cpu.c.orig	2016-12-01 22:43:42 UTC
+++ I1401/i1401_cpu.c
@@ -547,7 +547,7 @@ while (reason == 0) {                   
 
     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);




--- I1401/i1401_dp.c.orig	2016-12-01 22:43:42 UTC
+++ I1401/i1401_dp.c
@@ -269,7 +269,7 @@ switch (fnc) {                          
         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) {                          
                 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) {                          
         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) {                          
         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) {                          
         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;

Line 0 Link Here

(-)./files/patch-I1401_i1401__mt.c (+11 lines)
	1	--- I1401/i1401_mt.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I1401/i1401_mt.c
	3	@@ -451,7 +451,7 @@ int32 i;
	4	UNIT *uptr;
	5
	6	for (i = 0; i < MT_NUMDR; i++) { /* per drive resets */
	7	- if (uptr = mt_sel_unit (i)) {
	8	+ if ((uptr = mt_sel_unit (i))) {
	9	MT_CLR_PNU (uptr); /* clear pos flag */
	10	}
	11	}

Line 0 Link Here

(-)./files/patch-I1620_i1620__cpu.c (+11 lines)
	1	--- I1620/i1620_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I1620/i1620_cpu.c
	3	@@ -476,7 +476,7 @@ while (reason == 0) {
	4
	5	saved_PC = PC; /* commit prev instr */
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ())
	8	+ if ((reason = sim_process_event ()))
	9	break;
	10	}
	11




--- I1620/i1620_dp.c.orig	2016-12-01 22:43:42 UTC
+++ I1620/i1620_dp.c
@@ -206,7 +206,7 @@ switch (f1 & ~(FNC_WCH | FNC_NRL)) {    
         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 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)) {    
         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)) {    
                 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);
             }

Line 0 Link Here

(-)./files/patch-I1620_i1620__sys.c (+11 lines)
	1	--- I1620/i1620_sys.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I1620/i1620_sys.c
	3	@@ -552,7 +552,7 @@ if (I_GETQP (opfl) != I_M_QNP) {
	4
	5	cptr = get_glyph (cptr, fptr = gbuf, ' '); /* get flag field */
	6	last = -1; /* none yet */
	7	-while (t = fptr++) { / loop through */
	8	+while ((t = fptr++)) { / loop through */
	9	if ((t < '0') \|\| (t > '9')) /* must be digit */
	10	return SCPE_ARG;
	11	t = t - '0'; /* convert */

Line 0 Link Here

(-)./files/patch-I1620_i1620__tty.c (+11 lines)
	1	--- I1620/i1620_tty.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I1620/i1620_tty.c
	3	@@ -260,7 +260,7 @@ do {
	4	*c = 0x7F;
	5	else if ((raw == '~') \|\| (raw == '`')) /* flag? mark */
	6	flg = FLAG;
	7	- else if (cp = strchr (tti_to_num, raw)) /* legal? */
	8	+ else if ((cp = strchr (tti_to_num, raw))) /* legal? */
	9	c = ((int8) (cp - tti_to_num)) \| flg; / assemble char */
	10	else raw = 007; /* beep! */
	11	tto_write (raw); /* echo */

Line 0 Link Here

(-)./files/patch-I7094_i7094__com.c (+11 lines)
	1	--- I7094/i7094_com.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I7094/i7094_com.c
	3	@@ -1175,7 +1175,7 @@ char name[20];
	4	ln = uptr - coml_dev.units;
	5	sprintf (name, val? "Output queue %d": "Input queue %d", ln);
	6	lh = val? &com_outq[ln]: &com_inpq[ln];
	7	-if (entc = com_show_qsumm (st, lh, name)) {
	8	+if ((entc = com_show_qsumm (st, lh, name))) {
	9	for (i = 0, next = lh->head; next != 0;
	10	i++, next = com_pkt[next].next) {
	11	if ((i % 8) == 0)




--- I7094/i7094_cpu.c.orig	2016-12-01 22:43:42 UTC
+++ I7094/i7094_cpu.c
@@ -664,14 +664,14 @@ while (reason == SCPE_OK) {             
         }
 
     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) {             
             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) {                     
         }
     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);




--- I7094/i7094_dsk.c.orig	2016-12-01 22:43:42 UTC
+++ I7094/i7094_dsk.c
@@ -693,14 +693,14 @@ trk = uaptr->TRK;                       
 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) {                      
         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) {                      
         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 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) {                      
             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;
                     }
                 }




--- I7094/i7094_io.c.orig	2016-12-01 22:43:42 UTC
+++ I7094/i7094_io.c
@@ -795,7 +795,7 @@ switch (ch_sta[ch]) {                   
         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) {      
         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) {      
             }
         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) {      
         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) {      
             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 {                                  
 
     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 {                                  
     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 {                                  
     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 {                                  
 
     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 {                                  
 
     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;




--- I7094/i7094_mt.c.orig	2016-12-01 22:43:42 UTC
+++ I7094/i7094_mt.c
@@ -564,7 +564,7 @@ switch (uptr->UST) {                    
             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]) {                      
     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 */




--- Ibm1130/ibm1130_cpu.c.orig	2016-12-01 22:43:42 UTC
+++ Ibm1130/ibm1130_cpu.c
@@ -768,7 +768,7 @@ t_stat sim_instr (void)
 								CCC--;
 							}
 							C = (CCC != 0);
-							WriteIndex(TAG, ReadIndex(TAG) & 0xFF00 | CCC);		/* put 6 bits back into low byte of index register */
+							WriteIndex(TAG, (ReadIndex(TAG) & 0xFF00) | CCC);	/* put 6 bits back into low byte of index register */
 							break;
 						}
 						/* if TAG == 0, fall through and treat like normal shift SLT */
@@ -814,8 +814,8 @@ t_stat sim_instr (void)
 						while (CCC > 0) {
 							xbit = (ACC & 0x0001) << 15;
 							abit = (ACC & 0x8000);
-							ACC  = (ACC >> 1) & 0x7FFF | abit;
-							EXT  = (EXT >> 1) & 0x7FFF | xbit;
+							ACC  = ((ACC >> 1) & 0x7FFF) | abit;
+							EXT  = ((EXT >> 1) & 0x7FFF) | xbit;
 							CCC--;
 						}
 						break;
@@ -824,8 +824,8 @@ t_stat sim_instr (void)
 						while (CCC > 0) {
 							abit = (EXT & 0x0001) << 15;
 							xbit = (ACC & 0x0001) << 15;
-							ACC  = (ACC >> 1) & 0x7FFF | abit;
-							EXT  = (EXT >> 1) & 0x7FFF | xbit;
+							ACC  = ((ACC >> 1) & 0x7FFF) | abit;
+							EXT  = ((EXT >> 1) & 0x7FFF) | xbit;
 							CCC--;
 						}
 						break;

Line 0 Link Here

(-)./files/patch-Interdata_id16__cpu.c (+11 lines)
	1	--- Interdata/id16_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ Interdata/id16_cpu.c
	3	@@ -604,7 +604,7 @@ while (reason == 0) {
	4	int32 sr, st;
	5
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ())
	8	+ if ((reason = sim_process_event ()))
	9	break;
	10	int_eval ();
	11	}

Line 0 Link Here

(-)./files/patch-Interdata_id32__cpu.c (+11 lines)
	1	--- Interdata/id32_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ Interdata/id32_cpu.c
	3	@@ -664,7 +664,7 @@ while (reason == 0) {
	4	int32 sr, st;
	5
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ())
	8	+ if ((reason = sim_process_event ()))
	9	break;
	10	int_eval ();
	11	}




--- Interdata/id_dp.c.orig	2016-12-01 22:43:42 UTC
+++ Interdata/id_dp.c
@@ -419,7 +419,7 @@ switch (dp_cmd & 0x7) {                 
         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) {                 
                 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? */       




--- Interdata/id_idc.c.orig	2016-12-01 22:43:42 UTC
+++ Interdata/id_idc.c
@@ -576,7 +576,7 @@ switch (uptr->FNC & CMC_MASK) {         
         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) {         
                 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? */       




--- Interdata/id_io.c.orig	2016-12-01 22:43:42 UTC
+++ Interdata/id_io.c
@@ -358,7 +358,7 @@ if ((r != SCPE_OK) || (newmax == sch_max
 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;




--- Interdata/id_mt.c.orig	2016-12-01 22:43:42 UTC
+++ Interdata/id_mt.c
@@ -368,13 +368,13 @@ switch (uptr->UCMD) {                   
             }
 
         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) {                   
         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 */

Line 0 Link Here

(-)./files/patch-Interdata_id__pas.c (+11 lines)
	1	--- Interdata/id_pas.c.orig 2016-12-01 22:43:42 UTC
	2	+++ Interdata/id_pas.c
	3	@@ -334,7 +334,7 @@ if (ln >= 0) {
	4	tmxr_poll_rx (&pas_desc); /* poll for input */
	5	for (ln = 0; ln < PAS_ENAB; ln++) { /* loop thru lines */
	6	if (pas_ldsc[ln].conn) { /* connected? */
	7	- if (c = tmxr_getc_ln (&pas_ldsc[ln])) { /* any char? */
	8	+ if ((c = tmxr_getc_ln (&pas_ldsc[ln]))) { /* any char? */
	9	pas_sta[ln] = pas_sta[ln] & ~(STA_FR \| STA_PF);
	10	if (pas_rchp[ln])
	11	pas_sta[ln] = pas_sta[ln] \| STA_OVR;




--- LGP/lgp_cpu.c.orig	2016-12-01 22:43:42 UTC
+++ LGP/lgp_cpu.c
@@ -288,7 +288,7 @@ if (lgp21_sov) {                        
 
 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;




--- LGP/lgp_stddev.c.orig	2016-12-01 22:43:42 UTC
+++ 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? */




--- LGP/lgp_sys.c.orig	2016-12-01 22:43:42 UTC
+++ LGP/lgp_sys.c
@@ -363,7 +363,7 @@ if ((sw & SWMASK ('L')) ||              
             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 */

Line 0 Link Here

(-)./files/patch-NOVA_eclipse__cpu.c (+11 lines)
	1	--- NOVA/eclipse_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ NOVA/eclipse_cpu.c
	3	@@ -744,7 +744,7 @@ if (MapInit == 0) {
	4
	5	while (reason == 0) { /* loop until halted */
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ())
	8	+ if ((reason = sim_process_event ()))
	9	break;
	10	}
	11

Line 0 Link Here

(-)./files/patch-NOVA_nova__cpu.c (+16 lines)
	1	--- NOVA/nova_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ NOVA/nova_cpu.c
	3	@@ -243,11 +243,12 @@
	4	#define STK_CHECK(x,y) if (((x) & 0377) < (y)) \
	5	int_req = int_req \| INT_STK
	6	#define IND_STEP(x) M[x] & A_IND; /* return next level indicator */ \
	7	- if ( ((x) <= AUTO_TOP) && ((x) >= AUTO_INC) ) \
	8	+ if ( ((x) <= AUTO_TOP) && ((x) >= AUTO_INC) ) { \
	9	if ( (x) < AUTO_DEC ) \
	10	M[x] = (M[x] + 1) & DMASK; \
	11	else \
	12	M[x] = (M[x] - 1) & DMASK; \
	13	+ } \
	14	x = M[x] & AMASK
	15
	16	#define INCREMENT_PC PC = (PC + 1) & AMASK /* increment PC */




--- NOVA/nova_dkp.c.orig	2016-12-01 22:43:42 UTC
+++ NOVA/nova_dkp.c
@@ -909,7 +909,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));
@@ -925,7 +925,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;
             }
 




--- NOVA/nova_mta.c.orig	2016-12-01 22:43:42 UTC
+++ NOVA/nova_mta.c
@@ -412,7 +412,7 @@ else switch (c) {                       
             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) {                       
         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 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 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;
                 }




--- NOVA/nova_qty.c.orig	2016-12-01 22:43:42 UTC
+++ NOVA/nova_qty.c
@@ -603,11 +603,12 @@ t_stat qty_common_svc( DIB * dibp, UNIT 
 
     ++qty_polls ;                                       /*  another time 'round the track  */
     newln = tmxr_poll_conn( &qty_desc ) ;               /*  anybody knocking at the door?  */
-    if ( (newln >= 0) && qty_mdm )
+    if ( (newln >= 0) && qty_mdm ) {
         if ( newln >= qty_max )
         {
         return SCPE_IERR;                               /*  WTF - sanity check failed, over?  */
         }
+      }
     else
         {
         line = newln ;                                  /*  handle modem control  */
@@ -991,7 +992,7 @@ int32 alm( int32 pulse, int32 code, int3
         break ;
 
     case ioDIC :    /*  get modem or receiver status  */
-        if ( alm_line < qty_max )
+        if ( alm_line < qty_max ) {
             if ( alm_section )
             {
             /*  get modem section status  */
@@ -1000,6 +1001,7 @@ int32 alm( int32 pulse, int32 code, int3
                 iodata = 0035 ;                         /*  set CD, CTS, DSR, MDM flags  */
                 }
             }
+          }
         else
             {
             /*  get receiver section status  */

Line 0 Link Here

(-)./files/patch-NOVA_nova__tt1.c (+11 lines)
	1	--- NOVA/nova_tt1.c.orig 2016-12-01 22:43:42 UTC
	2	+++ NOVA/nova_tt1.c
	3	@@ -184,7 +184,7 @@ int32 temp, newln;
	4
	5	if (tt1_ldsc.conn) { /* connected? */
	6	tmxr_poll_rx (&tt_desc); /* poll for input */
	7	- if (temp = tmxr_getc_ln (&tt1_ldsc)) { /* get char */
	8	+ if ((temp = tmxr_getc_ln (&tt1_ldsc))) { /* get char */
	9	uptr->buf = temp & 0177;
	10	if ((uptr->flags & UNIT_DASHER) &&
	11	(uptr->buf == '\r'))




--- PDP10/pdp10_cpu.c.orig	2016-12-01 22:43:42 UTC
+++ PDP10/pdp10_cpu.c
@@ -705,7 +705,7 @@ pager_tc = FALSE;                       
 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) {                
 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);

Line 0 Link Here

(-)./files/patch-PDP10_pdp10__ksio.c (+20 lines)
	1	--- PDP10/pdp10_ksio.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP10/pdp10_ksio.c
	3	@@ -401,7 +401,7 @@ uint32 pa = (uint32) ea;
	4	int32 i, n, val;
	5	DIB *dibp;
	6
	7	-for (i = 0; dibp = dib_tab[i]; i++ ) {
	8	+for (i = 0; (dibp = dib_tab[i]); i++ ) {
	9	if ((pa >= dibp->ba) &&
	10	(pa < (dibp->ba + dibp->lnt))) {
	11	dibp->rd (&val, pa, READ);
	12	@@ -418,7 +418,7 @@ uint32 pa = (uint32) ea;
	13	int32 i, n;
	14	DIB *dibp;
	15
	16	-for (i = 0; dibp = dib_tab[i]; i++ ) {
	17	+for (i = 0; (dibp = dib_tab[i]); i++ ) {
	18	if ((pa >= dibp->ba) &&
	19	(pa < (dibp->ba + dibp->lnt))) {
	20	dibp->wr ((int32) val, pa, mode);




--- PDP10/pdp10_lp20.c.orig	2016-12-01 22:43:42 UTC
+++ PDP10/pdp10_lp20.c
@@ -563,7 +563,7 @@ lp20_unit.pos = ftell (lp20_unit.fileref
 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++) {           
             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;
             }

Line 0 Link Here

(-)./files/patch-PDP10_pdp10__mdfp.c (+11 lines)
	1	--- PDP10/pdp10_mdfp.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP10/pdp10_mdfp.c
	3	@@ -493,7 +493,7 @@ if (a.fhi >= 2 * b.fhi) {
	4	SETF (F_AOV \| F_DCK \| F_FOV \| F_T1);
	5	return FALSE;
	6	}
	7	-if (savhi = a.fhi) { /* dvd = 0? quo = 0 */
	8	+if ((savhi = a.fhi)) { /* dvd = 0? quo = 0 */
	9	a.sign = a.sign ^ b.sign; /* result sign */
	10	a.exp = a.exp - b.exp + FP_BIAS + 1; /* result exponent */
	11	a.fhi = a.fhi / (b.fhi >> (FP_N_FHI + 1)); /* do divide */

Line 0 Link Here

(-)./files/patch-PDP10_pdp10__rp.c (+11 lines)
	1	--- PDP10/pdp10_rp.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP10/pdp10_rp.c
	3	@@ -951,7 +951,7 @@ switch (uptr->FUNC) {
	4	if ((rpcs2 & CS2_UAI) == 0)
	5	ba = ba + 4;
	6	}
	7	- if (fc10 = twc10 & (RP_NUMWD - 1)) { /* fill? */
	8	+ if ((fc10 = twc10 & (RP_NUMWD - 1))) { /* fill? */
	9	fc10 = RP_NUMWD - fc10;
	10	for (i = 0; i < fc10; i++)
	11	dbuf[twc10 + i] = 0;




--- PDP10/pdp10_tu.c.orig	2016-12-01 22:43:42 UTC
+++ PDP10/pdp10_tu.c
@@ -833,7 +833,7 @@ switch (fnc) {                          
     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 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) {                          
         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) {                          
         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) {                          
             }                                           /* 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 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 */

Line 0 Link Here

(-)./files/patch-PDP11_pdp11__cis.c (+38 lines)
	1	--- PDP11/pdp11_cis.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP11/pdp11_cis.c
	3	@@ -1134,7 +1134,7 @@ switch (op) {
	4	result = (A2ADR << 16) \| A2LNT; /* op in VAX format */
	5	CVTLx:
	6	dst = Dstr0; /* clear result */
	7	- if (dst.sign = GET_SIGN_L (result))
	8	+ if ((dst.sign = GET_SIGN_L (result)))
	9	result = (~result + 1) & 0xFFFFFFFF;
	10	for (i = 1; (i < (DSTRLNT * 8)) && result; i++) {
	11	digit = result % 10;
	12	@@ -1267,7 +1267,7 @@ for (i = 0; i < DSTRLNT; i++) {
	13	mask = 0xFFFFFFFF;
	14	if (dst->val[i] & mask) /* test for ovflo */
	15	V = 1;
	16	- if (dst->val[i] = dst->val[i] & ~mask) /* test nz */
	17	+ if ((dst->val[i] = dst->val[i] & ~mask)) /* test nz */
	18	Z = 0;
	19	}
	20	dst->sign = dst->sign & ~unsignedtab[type] & ~(Z & ~V);
	21	@@ -1523,7 +1523,7 @@ uint32 NibbleRshift (DSTR *dsrc, int32 s
	22	{
	23	int32 i, s, nc;
	24
	25	-if (s = sc * 4) {
	26	+if ((s = sc * 4)) {
	27	for (i = DSTRMAX; i >= 0; i--) {
	28	nc = (dsrc->val[i] << (32 - s)) & 0xFFFFFFFF;
	29	dsrc->val[i] = ((dsrc->val[i] >> s) \|
	30	@@ -1548,7 +1548,7 @@ int32 i, s;
	31	uint32 nc, cin;
	32
	33	cin = 0;
	34	-if (s = sc * 4) {
	35	+if ((s = sc * 4)) {
	36	for (i = 0; i < DSTRLNT; i++) {
	37	nc = dsrc->val[i] >> (32 - s);
	38	dsrc->val[i] = ((dsrc->val[i] << s) \| cin) & 0xFFFFFFFF;

Line 0 Link Here

(-)./files/patch-PDP11_pdp11__cpu.c (+11 lines)
	1	--- PDP11/pdp11_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP11/pdp11_cpu.c
	3	@@ -732,7 +732,7 @@ while (reason == 0) {
	4
	5	if (trap_req) { /* check traps, ints */
	6	trapea = 0; /* assume srch fails */
	7	- if (t = trap_req & TRAP_ALL) { /* if a trap */
	8	+ if ((t = trap_req & TRAP_ALL)) { /* if a trap */
	9	for (trapnum = 0; trapnum < TRAP_V_MAX; trapnum++) {
	10	if ((t >> trapnum) & 1) { /* trap set? */
	11	trapea = trap_vec[trapnum]; /* get vec, clr */

Line 0 Link Here

(-)./files/patch-PDP11_pdp11__cpumod.c (+11 lines)
	1	--- PDP11/pdp11_cpumod.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP11/pdp11_cpumod.c
	3	@@ -1075,7 +1075,7 @@ t_stat r;
	4	for (i = 0; cnf_tab[i].dib != NULL; i++) { /* loop thru config tab */
	5	if (((cnf_tab[i].cpum == 0) \|\| (cpu_type & cnf_tab[i].cpum)) &&
	6	((cnf_tab[i].optm == 0) \|\| (cpu_opt & cnf_tab[i].optm))) {
	7	- if (r = build_ubus_tab (&cpu_dev, cnf_tab[i].dib)) /* add to dispatch tab */
	8	+ if ((r = build_ubus_tab (&cpu_dev, cnf_tab[i].dib))) /* add to dispatch tab */
	9	return r;
	10	}
	11	}

Line 0 Link Here

(-)./files/patch-PDP11_pdp11__dl.c (+11 lines)
	1	--- PDP11/pdp11_dl.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP11/pdp11_dl.c
	3	@@ -346,7 +346,7 @@ if (ln >= 0) {
	4	tmxr_poll_rx (&dlx_desc); /* poll for input */
	5	for (ln = 0; ln < DLX_LINES; ln++) { /* loop thru lines */
	6	if (dlx_ldsc[ln].conn) { /* connected? */
	7	- if (temp = tmxr_getc_ln (&dlx_ldsc[ln])) { /* get char */
	8	+ if ((temp = tmxr_getc_ln (&dlx_ldsc[ln]))) { /* get char */
	9	if (temp & SCPE_BREAK) /* break? */
	10	c = DLIBUF_ERR\|DLIBUF_RBRK;
	11	else c = sim_tt_inpcvt (temp, TT_GET_MODE (dlo_unit[ln].flags));

Line 0 Link Here

(-)./files/patch-PDP11_pdp11__fp.c (+11 lines)
	1	--- PDP11/pdp11_fp.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP11/pdp11_fp.c
	3	@@ -438,7 +438,7 @@ switch ((IR >> 8) & 017) {
	4	else fac.l = ReadI (GeteaFP (dstspec, leni), dstspec, leni);
	5	fac.h = 0;
	6	if (fac.l) {
	7	- if (sign = GET_SIGN_L (fac.l))
	8	+ if ((sign = GET_SIGN_L (fac.l)))
	9	fac.l = (fac.l ^ 0xFFFFFFFF) + 1;
	10	for (i = 0; GET_SIGN_L (fac.l) == 0; i++)
	11	fac.l = fac.l << 1;

Line 0 Link Here

(-)./files/patch-PDP11_pdp11__hk.c (+36 lines)
	1	--- PDP11/pdp11_hk.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP11/pdp11_hk.c
	3	@@ -887,7 +887,7 @@ switch (fnc) {
	4	err = fseek (uptr->fileref, da * sizeof (int16), SEEK_SET);
	5	if (uptr->FNC == FNC_WRITE) { /* write? */
	6	if (hkcs2 & CS2_UAI) { /* no addr inc? */
	7	- if (t = Map_ReadW (ba, 2, &comp)) { /* get 1st wd */
	8	+ if ((t = Map_ReadW (ba, 2, &comp))) { /* get 1st wd */
	9	wc = 0; /* NXM, no xfr */
	10	hkcs2 = hkcs2 \| CS2_NEM; /* set nxm err */
	11	}
	12	@@ -895,7 +895,7 @@ switch (fnc) {
	13	hkxb[i] = comp;
	14	}
	15	else { /* normal */
	16	- if (t = Map_ReadW (ba, wc << 1, hkxb)) { /* get buf */
	17	+ if ((t = Map_ReadW (ba, wc << 1, hkxb))) { /* get buf */
	18	wc = wc - (t >> 1); /* NXM, adj wc */
	19	hkcs2 = hkcs2 \| CS2_NEM; /* set nxm err */
	20	}
	21	@@ -915,13 +915,13 @@ switch (fnc) {
	22	for ( ; i < wc; i++) /* fill buf */
	23	hkxb[i] = 0;
	24	if (hkcs2 & CS2_UAI) { /* no addr inc? */
	25	- if (t = Map_WriteW (ba, 2, &hkxb[wc - 1])) {
	26	+ if ((t = Map_WriteW (ba, 2, &hkxb[wc - 1]))) {
	27	wc = 0; /* NXM, no xfr */
	28	hkcs2 = hkcs2 \| CS2_NEM; /* set nxm err */
	29	}
	30	}
	31	else { /* normal */
	32	- if (t = Map_WriteW (ba, wc << 1, hkxb)) { /* put buf */
	33	+ if ((t = Map_WriteW (ba, wc << 1, hkxb))) { /* put buf */
	34	wc = wc - (t >> 1); /* NXM, adj wc */
	35	hkcs2 = hkcs2 \| CS2_NEM; /* set nxm err */
	36	}




--- PDP11/pdp11_io.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_io.c
@@ -373,17 +373,17 @@ init_ubus_tab ();                       
 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 */




--- PDP11/pdp11_ke.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_ke.c
@@ -252,7 +252,7 @@ switch (PA & 017) {                     
         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) {                     
         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);




--- PDP11/pdp11_rk.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_rk.c
@@ -545,13 +545,13 @@ if (wc && (err == 0)) {                 
                 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)) {                 
 
     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)) {                 
                 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)) {                 
 
     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;
             }




--- PDP11/pdp11_rq.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_rq.c
@@ -1352,7 +1352,7 @@ UNIT *uptr;
 DEVICE *dptr = rq_devmap[cp->cnum];
 
 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 */
@@ -1365,8 +1365,8 @@ if (uptr = rq_getucb (cp, lu)) {        
         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;
@@ -1393,7 +1393,7 @@ uint32 cmd = GETP (pkt, CMD_OPC, OPC);  
 uint32 sts;
 UNIT *uptr;
 
-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;
@@ -1447,7 +1447,7 @@ if (cp->pak[pkt].d[CMD_MOD] & MD_NXU) { 
         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 */
@@ -1482,7 +1482,7 @@ uint32 cmd = GETP (pkt, CMD_OPC, OPC);  
 uint32 sts;
 UNIT *uptr;
 
-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;
@@ -1520,7 +1520,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 */
@@ -1547,7 +1547,7 @@ uint32 cmd = GETP (pkt, CMD_OPC, OPC);  
 uint32 sts;
 UNIT *uptr;
 
-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;
@@ -1576,7 +1576,7 @@ uint32 cmd = GETP (pkt, CMD_OPC, OPC);  
 uint32 sts;
 UNIT *uptr;
 
-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;
@@ -1610,7 +1610,7 @@ uint32 cmd = GETP (pkt, CMD_OPC, OPC);  
 uint32 sts;
 UNIT *uptr;
 
-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;
@@ -1725,7 +1725,7 @@ if (cmd == OP_ERS) {                    
 
 else if (cmd == OP_WR) {                                /* write? */
     t = Map_ReadW (ba, tbc, 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++)
             rqxb[i] = 0;
@@ -1752,7 +1752,7 @@ else {
         err = ferror (uptr->fileref);
         }
     if ((cmd == OP_RD) && !err) {                       /* read? */
-        if (t = Map_WriteW (ba, tbc, rqxb)) {           /* store, nxm? */
+        if ((t = Map_WriteW (ba, tbc, 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 */
@@ -2586,11 +2586,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);
@@ -2617,7 +2617,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);
@@ -2630,11 +2630,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");
     }




--- PDP11/pdp11_sys.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_sys.c
@@ -1071,7 +1071,8 @@ switch (j) {                            
         for (cptr = get_glyph (cptr, gbuf, 0); gbuf[0] != 0;
             cptr = get_glyph (cptr, gbuf, 0)) {
             for (i = 0; (opcode[i] != NULL) &&
-                (strcmp (opcode[i], gbuf) != 0) ; i++) ;
+                (strcmp (opcode[i], gbuf) != 0) ; i++)
+			;
              if ((((opc_val[i] >> I_V_CL) & I_M_CL) != j) ||
                 (opcode[i] == NULL))
                 return SCPE_ARG;




--- PDP11/pdp11_ta.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_ta.c
@@ -397,13 +397,13 @@ switch (uptr->FNC) {                    
 
     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) {                    
         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) {                    
         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;




--- PDP11/pdp11_tm.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_tm.c
@@ -439,7 +439,7 @@ switch (f) {                            
             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 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) {                            
         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 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;
                 }




--- PDP11/pdp11_tq.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_tq.c
@@ -780,7 +780,7 @@ else if (mdf & ~tq_cmf[cmd]) {          
     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 */
@@ -858,7 +858,7 @@ int32 tpkt, prv;
 UNIT *uptr;
 
 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 */
@@ -871,8 +871,8 @@ if (uptr = tq_getucb (lu)) {            
         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;
@@ -900,7 +900,7 @@ uint32 mdf = tq_pkt[pkt].d[CMD_MOD];    
 uint32 sts;
 UNIT *uptr;
 
-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 {
@@ -955,7 +955,7 @@ if (tq_pkt[pkt].d[CMD_MOD] & MD_NXU) {  
         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 */
@@ -980,7 +980,7 @@ uint32 lu = tq_pkt[pkt].d[CMD_UN];      
 uint32 sts;
 UNIT *uptr;
 
-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? */
@@ -1009,7 +1009,7 @@ if (tq_pkt[pkt].d[SCC_MSV])             
 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 */
@@ -1033,7 +1033,7 @@ uint32 lu = tq_pkt[pkt].d[CMD_UN];      
 uint32 sts;
 UNIT *uptr;
 
-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 {
@@ -1055,7 +1055,7 @@ uint32 lu = tq_pkt[pkt].d[CMD_UN];      
 uint32 sts;
 UNIT *uptr;
 
-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);
@@ -1071,7 +1071,7 @@ uint32 cmd = GETP (pkt, CMD_OPC, OPC);  
 uint32 sts;
 UNIT *uptr;
 
-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 */
@@ -1092,7 +1092,7 @@ uint32 lu = tq_pkt[pkt].d[CMD_UN];      
 uint32 sts, objp = 0;
 UNIT *uptr;
 
-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? */
@@ -1115,7 +1115,7 @@ uint32 lu = tq_pkt[pkt].d[CMD_UN];      
 uint32 sts, objp = 0;
 UNIT *uptr;
 
-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? */
@@ -1147,7 +1147,7 @@ uint32 bc = GETP32 (pkt, RW_BCL);       
 uint32 sts, objp = 0;
 UNIT *uptr;
 
-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? */
@@ -1251,7 +1251,7 @@ switch (cmd) {                          
             }
         else wbc = tbc;
         if (cmd == OP_RD) {                             /* read? */
-            if (t = Map_WriteB (ba, wbc, tqxb)) {       /* store, nxm? */
+            if ((t = Map_WriteB (ba, wbc, 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, tbc);        
@@ -1288,7 +1288,7 @@ switch (cmd) {                          
         break;
 
     case OP_WR:                                         /* write */
-        if (t = Map_ReadB (ba, bc, tqxb)) {             /* fetch buf, nxm? */
+        if ((t = Map_ReadB (ba, bc, 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);     
@@ -2233,11 +2233,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);
@@ -2262,7 +2262,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);
@@ -2275,11 +2275,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");
     }




--- PDP11/pdp11_ts.c.orig	2016-12-01 22:43:42 UTC
+++ 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? */




--- PDP11/pdp11_tu.c.orig	2016-12-01 22:43:42 UTC
+++ PDP11/pdp11_tu.c
@@ -647,7 +647,7 @@ switch (fnc) {                          
     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 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) {                          
         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) {                          
         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) {                          
 				}
             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 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 */




--- PDP11/pdp11_xq.c.orig	2016-12-01 22:43:42 UTC
+++ 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;
@@ -2073,6 +2073,10 @@ t_stat xq_process_bootrom (CTLR* xq)
       /* set to next bdl (implicit chain) */
       xq->var->rbdl_ba += 12;
       break;
+
+    case XQ_T_DELQA:
+    case XQ_T_DELQA_PLUS:
+      break;
   } /* switch */
 
   /* --------------------------- Done, finish up -----------------------------*/
@@ -2531,7 +2535,7 @@ t_stat xq_tmrsvc(UNIT* uptr)
 
   /* has sanity timer expired? if so, reboot */
   if (xq->var->sanity.enabled)
-    if (--xq->var->sanity.timer <= 0)
+    if (--xq->var->sanity.timer <= 0) {
       if (xq->var->mode != XQ_T_DELQA_PLUS)
         return xq_boot_host(xq);
       else { /* DELQA-T Host Inactivity Timer expiration means switch out of DELQA-T mode */
@@ -2540,6 +2544,7 @@ t_stat xq_tmrsvc(UNIT* uptr)
         xq->var->iba = xq->var->srr = 0;
         xq->var->var = XQ_VEC_MS | XQ_VEC_OS;
       }
+  }
 
   /* has system id timer expired? if so, do system id */
   if (--xq->var->idtmr <= 0) {

Line 0 Link Here

(-)./files/patch-PDP18B_pdp18b__cpu.c (+11 lines)
	1	--- PDP18B/pdp18b_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP18B/pdp18b_cpu.c
	3	@@ -604,7 +604,7 @@ while (reason == 0) {
	4	int32 link_init, fill;
	5
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ())
	8	+ if ((reason = sim_process_event ()))
	9	break;
	10	api_int = api_eval (&int_pend); /* eval API */
	11	}




--- PDP18B/pdp18b_fpp.c.orig	2016-12-01 22:43:42 UTC
+++ PDP18B/pdp18b_fpp.c
@@ -253,7 +253,7 @@ switch (fop) {                          
         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 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) {                          
         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) {                          
         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 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) {                          
         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) {                          
         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) {                          
         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) {                          
             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) {                          
         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 */




--- PDP18B/pdp18b_mt.c.orig	2016-12-01 22:43:42 UTC
+++ PDP18B/pdp18b_mt.c
@@ -353,7 +353,7 @@ switch (f) {                            
                 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) {                            
         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 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 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;
                 }

Line 0 Link Here

(-)./files/patch-PDP18B_pdp18b__stddev.c (+11 lines)
	1	--- PDP18B/pdp18b_stddev.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP18B/pdp18b_stddev.c
	3	@@ -594,7 +594,7 @@ if ((temp = getc (ptr_unit.fileref)) ==
	4	if (ptr_state == 0) { /* ASCII */
	5	if (ptr_unit.flags & UNIT_RASCII) { /* want parity? */
	6	ptr_unit.buf = temp = temp & 0177; /* parity off */
	7	- while (temp = temp & (temp - 1))
	8	+ while ((temp = temp & (temp - 1)))
	9	ptr_unit.buf = ptr_unit.buf ^ 0200; /* count bits */
	10	ptr_unit.buf = ptr_unit.buf ^ 0200; /* set even parity */
	11	}

Line 0 Link Here

(-)./files/patch-PDP18B_pdp18b__sys.c (+11 lines)
	1	--- PDP18B/pdp18b_sys.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP18B/pdp18b_sys.c
	3	@@ -1009,7 +1009,7 @@ for (i = 0; opc_val[i] >= 0; i++) {
	4	break;
	5
	6	case I_V_OPR: /* operate */
	7	- if (sp = (inst & 03730))
	8	+ if ((sp = (inst & 03730)))
	9	fprintf (of, "%s", opcode[i]);
	10	fprint_opr (of, inst & 014047, I_V_OPR, sp);
	11	break;

Line 0 Link Here

(-)./files/patch-PDP18B_pdp18b__tt1.c (+11 lines)
	1	--- PDP18B/pdp18b_tt1.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP18B/pdp18b_tt1.c
	3	@@ -222,7 +222,7 @@ if (ln >= 0)
	4	tmxr_poll_rx (&ttx_desc); /* poll for input */
	5	for (ln = 0; ln < TTX_MAXL; ln++) { /* loop thru lines */
	6	if (ttx_ldsc[ln].conn) { /* connected? */
	7	- if (temp = tmxr_getc_ln (&ttx_ldsc[ln])) { /* get char */
	8	+ if ((temp = tmxr_getc_ln (&ttx_ldsc[ln]))) { /* get char */
	9	if (temp & SCPE_BREAK) /* break? */
	10	c = 0;
	11	else c = sim_tt_inpcvt (temp, TT_GET_MODE (ttox_unit[ln].flags) \| TTUF_KSR);

Line 0 Link Here

(-)./files/patch-PDP1_pdp1__cpu.c (+302 lines)
		1	--- PDP1/pdp1_cpu.c.orig 2016-12-01 22:43:42 UTC
		2	+++ PDP1/pdp1_cpu.c
		3	@@ -546,7 +546,7 @@ reason = 0;
		4	while (reason == 0) { /* loop until halted */
		5
		6	if (sim_interval <= 0) { /* check clock queue */
		7	- if (reason = sim_process_event ())
		8	+ if ((reason = sim_process_event ()))
		9	break;
		10	sbs_lvl = sbs_eval (); /* eval sbs system */
		11	}
		12	@@ -610,25 +610,25 @@ while (reason == 0) {
		13	/* Logical, load, store instructions */
		14
		15	case 001: /* AND */
		16	- if (reason = Ea (IR)) /* MA <- eff addr */
		17	+ if ((reason = Ea (IR))) /* MA <- eff addr */
		18	break;
		19	- if (reason = Read ()) /* MB <- data */
		20	+ if ((reason = Read ())) /* MB <- data */
		21	break;
		22	AC = AC & MB;
		23	break;
		24
		25	case 002: /* IOR */
		26	- if (reason = Ea (IR)) /* MA <- eff addr */
		27	+ if ((reason = Ea (IR))) /* MA <- eff addr */
		28	break;
		29	- if (reason = Read ()) /* MB <- data */
		30	+ if ((reason = Read ())) /* MB <- data */
		31	break;
		32	AC = AC \| MB;
		33	break;
		34
		35	case 003: /* XOR */
		36	- if (reason = Ea (IR)) /* MA <- eff addr */
		37	+ if ((reason = Ea (IR))) /* MA <- eff addr */
		38	break;
		39	- if (reason = Read ()) /* MB <- data */
		40	+ if ((reason = Read ())) /* MB <- data */
		41	break;
		42	AC = AC ^ MB;
		43	break;
		44	@@ -638,9 +638,9 @@ while (reason == 0) {
		45	reason = STOP_XCT;
		46	break;
		47	}
		48	- if (reason = Ea (IR)) /* MA <- eff addr */
		49	+ if ((reason = Ea (IR))) /* MA <- eff addr */
		50	break;
		51	- if (reason = Read ()) /* MB <- data */
		52	+ if ((reason = Read ())) /* MB <- data */
		53	break;
		54	xct_count = xct_count + 1; /* count XCT's */
		55	IR = MB; /* get instruction */
		56	@@ -648,9 +648,9 @@ while (reason == 0) {
		57
		58	case 005: /* LCH */
		59	if (cpu_unit.flags & UNIT_1D) { /* PDP-1D? */
		60	- if (reason = Ea_ch (IR, &byno)) /* MA <- eff addr */
		61	+ if ((reason = Ea_ch (IR, &byno))) /* MA <- eff addr */
		62	break;
		63	- if (reason = Read ()) /* MB <- data */
		64	+ if ((reason = Read ())) /* MB <- data */
65	break;
66	AC = (MB << byt_shf[byno]) & 0770000; /* extract byte */
67	}
68	@@ -659,9 +659,9 @@ while (reason == 0) {
69
70	case 006: /* DCH */
71	if (cpu_unit.flags & UNIT_1D) { /* PDP-1D? */
72	- if (reason = Ea_ch (IR, &byno)) /* MA <- eff addr */
73	+ if ((reason = Ea_ch (IR, &byno))) /* MA <- eff addr */
74	break;
75	- if (reason = Read ()) /* MB <- data */
76	+ if ((reason = Read ())) /* MB <- data */
77	break;
78	MB = (MB & ~(0770000 >> byt_shf[byno])) \| /* insert byte */
79	((AC & 0770000) >> byt_shf[byno]);
80	@@ -683,55 +683,55 @@ while (reason == 0) {
81	break;
82
83	case 010: /* LAC */
84	- if (reason = Ea (IR)) /* MA <- eff addr */
85	+ if ((reason = Ea (IR))) /* MA <- eff addr */
86	break;
87	- if (reason = Read ()) /* MB <- data */
88	+ if ((reason = Read ())) /* MB <- data */
89	break;
90	AC = MB;
91	break;
92
93	case 011: /* LIO */
94	- if (reason = Ea (IR)) /* MA <- eff addr */
95	+ if ((reason = Ea (IR))) /* MA <- eff addr */
96	break;
97	- if (reason = Read ()) /* MB <- data */
98	+ if ((reason = Read ())) /* MB <- data */
99	break;
100	IO = MB;
101	break;
102
103	case 012: /* DAC */
104	- if (reason = Ea (IR)) /* MA <- eff addr */
105	+ if ((reason = Ea (IR))) /* MA <- eff addr */
106	break;
107	MB = AC;
108	reason = Write ();
109	break;
110
111	case 013: /* DAP */
112	- if (reason = Ea (IR)) /* MA <- eff addr */
113	+ if ((reason = Ea (IR))) /* MA <- eff addr */
114	break;
115	- if (reason = Read ()) /* MB <- data */
116	+ if ((reason = Read ())) /* MB <- data */
117	break;
118	MB = (AC & DAMASK) \| (MB & ~DAMASK);
119	reason = Write ();
120	break;
121
122	case 014: /* DIP */
123	- if (reason = Ea (IR)) /* MA <- eff addr */
124	+ if ((reason = Ea (IR))) /* MA <- eff addr */
125	break;
126	- if (reason = Read ()) /* MB <- data */
127	+ if ((reason = Read ())) /* MB <- data */
128	break;
129	MB = (AC & ~DAMASK) \| (MB & DAMASK);
130	reason = Write ();
131	break;
132
133	case 015: /* DIO */
134	- if (reason = Ea (IR)) /* MA <- eff addr */
135	+ if ((reason = Ea (IR))) /* MA <- eff addr */
136	break;
137	MB = IO;
138	reason = Write ();
139	break;
140
141	case 016: /* DZM */
142	- if (reason = Ea (IR)) /* MA <- eff addr */
143	+ if ((reason = Ea (IR))) /* MA <- eff addr */
144	break;
145	MB = 0;
146	reason = Write ();
147	@@ -755,9 +755,9 @@ while (reason == 0) {
148
149	case 017: /* TAD */
150	if (cpu_unit.flags & UNIT_1D) { /* PDP-1D? */
151	- if (reason = Ea (IR)) /* MA <- eff addr */
152	+ if ((reason = Ea (IR))) /* MA <- eff addr */
153	break;
154	- if (reason = Read ()) /* MB <- data */
155	+ if ((reason = Read ())) /* MB <- data */
156	break;
157	AC = AC + MB + ((PF & PF_L)? 1: 0); /* AC + opnd + L */
158	if (AC > DMASK) /* carry? set L */
159	@@ -769,9 +769,9 @@ while (reason == 0) {
160	break;
161
162	case 020: /* ADD */
163	- if (reason = Ea (IR)) /* MA <- eff addr */
164	+ if ((reason = Ea (IR))) /* MA <- eff addr */
165	break;
166	- if (reason = Read ()) /* MB <- data */
167	+ if ((reason = Read ())) /* MB <- data */
168	break;
169	t = AC;
170	AC = AC + MB;
171	@@ -784,9 +784,9 @@ while (reason == 0) {
172	break;
173
174	case 021: /* SUB */
175	- if (reason = Ea (IR)) /* MA <- eff addr */
176	+ if ((reason = Ea (IR))) /* MA <- eff addr */
177	break;
178	- if (reason = Read ()) /* MB <- data */
179	+ if ((reason = Read ())) /* MB <- data */
180	break;
181	t = AC ^ DMASK; /* complement AC */
182	AC = t + MB; /* -AC + MB */
183	@@ -798,9 +798,9 @@ while (reason == 0) {
184	break;
185
186	case 022: /* IDX */
187	- if (reason = Ea (IR)) /* MA <- eff addr */
188	+ if ((reason = Ea (IR))) /* MA <- eff addr */
189	break;
190	- if (reason = Read ()) /* MB <- data */
191	+ if ((reason = Read ())) /* MB <- data */
192	break;
193	AC = MB + 1;
194	if (AC >= DMASK)
195	@@ -810,9 +810,9 @@ while (reason == 0) {
196	break;
197
198	case 023: /* ISP */
199	- if (reason = Ea (IR)) /* MA <- eff addr */
200	+ if ((reason = Ea (IR))) /* MA <- eff addr */
201	break;
202	- if (reason = Read ()) /* MB <- data */
203	+ if ((reason = Read ())) /* MB <- data */
204	break;
205	AC = MB + 1;
206	if (AC >= DMASK)
207	@@ -824,18 +824,18 @@ while (reason == 0) {
208	break;
209
210	case 024: /* SAD */
211	- if (reason = Ea (IR)) /* MA <- eff addr */
212	+ if ((reason = Ea (IR))) /* MA <- eff addr */
213	break;
214	- if (reason = Read ()) /* MB <- data */
215	+ if ((reason = Read ())) /* MB <- data */
216	break;
217	if (AC != MB)
218	PC = INCR_ADDR (PC);
219	break;
220
221	case 025: /* SAS */
222	- if (reason = Ea (IR)) /* MA <- eff addr */
223	+ if ((reason = Ea (IR))) /* MA <- eff addr */
224	break;
225	- if (reason = Read ()) /* MB <- data */
226	+ if ((reason = Read ())) /* MB <- data */
227	break;
228	if (AC == MB)
229	PC = INCR_ADDR (PC);
230	@@ -863,7 +863,7 @@ while (reason == 0) {
231	hst[hst_p].ea = PC;
232	}
233	else { /* normal JMP */
234	- if (reason = Ea (IR)) /* MA <- eff addr */
235	+ if ((reason = Ea (IR))) /* MA <- eff addr */
236	break;
237	PCQ_ENTRY;
238	PC = MA;
239	@@ -871,7 +871,7 @@ while (reason == 0) {
240	break;
241
242	case 031: /* JSP */
243	- if (reason = Ea (IR)) /* MA <- eff addr */
244	+ if ((reason = Ea (IR))) /* MA <- eff addr */
245	break;
246	AC = EPC_WORD;
247	PCQ_ENTRY;
248	@@ -889,9 +889,9 @@ while (reason == 0) {
249	*/
250
251	case 026: /* MUL */
252	- if (reason = Ea (IR)) /* MA <- eff addr */
253	+ if ((reason = Ea (IR))) /* MA <- eff addr */
254	break;
255	- if (reason = Read ()) /* MB <- data */
256	+ if ((reason = Read ())) /* MB <- data */
257	break;
258	if (cpu_unit.flags & UNIT_MDV) { /* hardware? */
259	sign = AC ^ MB; /* result sign */
260	@@ -919,9 +919,9 @@ while (reason == 0) {
261	break;
262
263	case 027: /* DIV */
264	- if (reason = Ea (IR)) /* MA <- eff addr */
265	+ if ((reason = Ea (IR))) /* MA <- eff addr */
266	break;
267	- if (reason = Read ()) /* MB <- data */
268	+ if ((reason = Read ())) /* MB <- data */
269	break;
270	if (cpu_unit.flags & UNIT_MDV) { /* hardware */
271	sign = AC ^ MB; /* result sign */
272	@@ -1362,13 +1362,13 @@ t_stat r;
273	MA = (PC & EPCMASK) \| (IR & DAMASK); /* direct address */
274	if (IR & IA) { /* indirect addr? */
275	if (extm) { /* extend? */
276	- if (r = Read ()) /* read; err? */
277	+ if ((r = Read ())) /* read; err? */
278	return r;
279	MA = MB & AMASK; /* one level */
280	}
281	else { /* multi-level */
282	for (i = 0; i < ind_max; i++) { /* count indirects */
283	- if (r = Read ()) /* get ind word */
284	+ if ((r = Read ())) /* get ind word */
285	return r;
286	MA = (PC & EPCMASK) \| (MB & DAMASK);
287	if ((MB & IA) == 0)
288	@@ -1392,12 +1392,12 @@ t_stat r;
289
290	MA = (PC & EPCMASK) \| (IR & DAMASK); /* direct address */
291	if (extm) { /* extend? */
292	- if (r = Read ()) /* read; err? */
293	+ if ((r = Read ())) /* read; err? */
294	return r;
295	}
296	else { /* multi-level */
297	for (i = 0; i < ind_max; i++) { /* count indirects */
298	- if (r = Read ()) /* get ind word */
299	+ if ((r = Read ())) /* get ind word */
300	return r;
301	if ((MB & IA) == 0)
302	break;

Line 0 Link Here

(-)./files/patch-PDP1_pdp1__dcs.c (+11 lines)
	1	--- PDP1/pdp1_dcs.c.orig 2016-12-01 22:43:42 UTC
	2	+++ PDP1/pdp1_dcs.c
	3	@@ -251,7 +251,7 @@ if (ln >= 0) {
	4	tmxr_poll_rx (&dcs_desc); /* poll for input */
	5	for (ln = 0; ln < DCS_NUMLIN; ln++) { /* loop thru lines */
	6	if (dcs_ldsc[ln].conn) { /* connected? */
	7	- if (c = tmxr_getc_ln (&dcs_ldsc[ln])) { /* get char */
	8	+ if ((c = tmxr_getc_ln (&dcs_ldsc[ln]))) { /* get char */
	9	if (c & SCPE_BREAK) /* break? */
	10	c = 0;
	11	else c = sim_tt_inpcvt (c, TT_GET_MODE (dcsl_unit[ln].flags)\|TTUF_KSR);

Line 0 Link Here

(-)./files/patch-PDP8_pdp8__cpu.c (+11 lines)
	1	--- PDP8/pdp8_cpu.c.orig 2016-12-01 22:43:43 UTC
	2	+++ PDP8/pdp8_cpu.c
	3	@@ -344,7 +344,7 @@ reason = 0;
	4	while (reason == 0) { /* loop until halted */
	5
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ())
	8	+ if ((reason = sim_process_event ()))
	9	break;
	10	}
	11




--- PDP8/pdp8_ct.c.orig	2016-12-01 22:43:43 UTC
+++ PDP8/pdp8_ct.c
@@ -270,7 +270,7 @@ switch (IR & 07) {                      
 
     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 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) {                    
          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) {                    
         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;
 




--- PDP8/pdp8_mt.c.orig	2016-12-01 22:43:43 UTC
+++ PDP8/pdp8_mt.c
@@ -453,7 +453,7 @@ switch (f) {                            
                 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) {                            
         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 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 */
                 }

Line 0 Link Here

(-)./files/patch-PDP8_pdp8__ttx.c (+11 lines)
	1	--- PDP8/pdp8_ttx.c.orig 2016-12-01 22:43:43 UTC
	2	+++ PDP8/pdp8_ttx.c
	3	@@ -233,7 +233,7 @@ if (ln >= 0)
	4	tmxr_poll_rx (&ttx_desc); /* poll for input */
	5	for (ln = 0; ln < TTX_LINES; ln++) { /* loop thru lines */
	6	if (ttx_ldsc[ln].conn) { /* connected? */
	7	- if (temp = tmxr_getc_ln (&ttx_ldsc[ln])) { /* get char */
	8	+ if ((temp = tmxr_getc_ln (&ttx_ldsc[ln]))) { /* get char */
	9	if (temp & SCPE_BREAK) /* break? */
	10	c = 0;
	11	else c = sim_tt_inpcvt (temp, TT_GET_MODE (ttox_unit[ln].flags));

Line 0 Link Here

(-)./files/patch-S3_s3__cd.c (+11 lines)
	1	--- S3/s3_cd.c.orig 2016-12-01 22:43:43 UTC
	2	+++ S3/s3_cd.c
	3	@@ -280,7 +280,7 @@ t_stat r;
	4
	5	if (sim_is_active (&cdr_unit)) { /* busy? */
	6	sim_cancel (&cdr_unit); /* cancel */
	7	- if (r = cdr_svc (&cdr_unit)) return r; /* process */
	8	+ if ((r = cdr_svc (&cdr_unit))) return r; /* process */
	9	}
	10
	11	if (((cdp_unit.flags & UNIT_ATT) != 0 \|\|

Line 0 Link Here

(-)./files/patch-S3_s3__cpu.c (+11 lines)
	1	--- S3/s3_cpu.c.orig 2016-12-01 22:43:43 UTC
	2	+++ S3/s3_cpu.c
	3	@@ -527,7 +527,7 @@ reason = 0;
	4
	5	while (reason == 0) { /* loop until halted */
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ()) break;
	8	+ if ((reason = sim_process_event ())) break;
	9	}
	10
	11	if (int_req) { /* interrupt? */




--- S3/s3_disk.c.orig	2016-12-01 22:43:43 UTC
+++ S3/s3_disk.c
@@ -298,7 +298,7 @@ int32 dsk (int32 disk, int32 op, int32 m
                                     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
                                     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
                                     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
                                     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
                             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. */




--- SDS/sds_cpu.c.orig	2016-12-01 22:43:43 UTC
+++ SDS/sds_cpu.c
@@ -385,14 +385,14 @@ while (reason == 0) {                   
         }
 
     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) {                     
             }
         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) {                           
 /* 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) {                           
         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) {                           
 /* 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) {                           
 /* 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) {                           
         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) {                           
         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 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) {                           
 /* 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) {                           
         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 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 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 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 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 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 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++) {         
             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++) {         
         }
     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);
     }
@@ -1341,7 +1341,7 @@ if (sc >= 24) {
     A = sgn;
     }
 else {
-    B = ((B >> sc) | (A << (24 - sc)) & DMASK);
+    B = ((B >> sc) | (A << (24 - sc))) & DMASK;
     A = ((A >> sc) | (sgn << (24 - sc))) & DMASK;
     }
 return;
@@ -1569,12 +1569,12 @@ if (op == MIN)                          
 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;




--- SDS/sds_dsk.c.orig	2016-12-01 22:43:43 UTC
+++ SDS/sds_dsk.c
@@ -204,7 +204,7 @@ switch (fnc) {                          
     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 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 */




--- SDS/sds_io.c.orig	2016-12-01 22:43:43 UTC
+++ 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;

Line 0 Link Here

(-)./files/patch-SDS_sds__lp.c (+11 lines)
	1	--- SDS/sds_lp.c.orig 2016-12-01 22:43:43 UTC
	2	+++ SDS/sds_lp.c
	3	@@ -177,7 +177,7 @@ switch (fnc) {
	4	t = I_GETSKCND (inst); /* sks cond */
	5	if (((t == 020) && (!CHP (7, lpt_cct[lpt_ccp]))) \|\| /* 14062: !ch 7 */
	6	((t == 010) && (lpt_unit.flags & UNIT_ATT)) \|\| /* 12062: !online */
	7	- (t == 004) && !lpt_err) /* 11062: !err */
	8	+ ((t == 004) && !lpt_err)) /* 11062: !err */
	9	*dat = 1;
	10	break;
	11




--- SDS/sds_mt.c.orig	2016-12-01 22:43:43 UTC
+++ SDS/sds_mt.c
@@ -235,14 +235,14 @@ switch (fnc) {                          
     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 */        

Line 0 Link Here

(-)./files/patch-SDS_sds__mux.c (+11 lines)
	1	--- SDS/sds_mux.c.orig 2016-12-01 22:43:43 UTC
	2	+++ SDS/sds_mux.c
	3	@@ -363,7 +363,7 @@ if (ln >= 0) {
	4	tmxr_poll_rx (&mux_desc); /* poll for input */
	5	for (ln = 0; ln < MUX_NUMLIN; ln++) { /* loop thru lines */
	6	if (mux_ldsc[ln].conn) { /* connected? */
	7	- if (c = tmxr_getc_ln (&mux_ldsc[ln])) { /* get char */
	8	+ if ((c = tmxr_getc_ln (&mux_ldsc[ln]))) { /* get char */
	9	if (mux_sta[ln] & MUX_SCHP) /* already got one? */
	10	mux_sta[ln] = mux_sta[ln] \| MUX_SOVR; /* overrun */
	11	else mux_sta[ln] = mux_sta[ln] \| MUX_SCHP; /* char pending */

Line 0 Link Here

(-)./files/patch-SDS_sds__stddev.c (+11 lines)
	1	--- SDS/sds_stddev.c.orig 2016-12-01 22:43:43 UTC
	2	+++ SDS/sds_stddev.c
	3	@@ -395,7 +395,7 @@ t_stat r = SCPE_OK;
	4
	5	if (ptp_ldr) { /* need leader? */
	6	for (i = 0; i < 12; i++) { /* punch leader */
	7	- if (r = ptp_out (0))
	8	+ if ((r = ptp_out (0)))
	9	break;
	10	}
	11	}




--- VAX/vax_sysdev.c.orig	2012-05-05 22:40:08.000000000 +0900
+++ VAX/vax_sysdev.c	2012-05-05 22:43:28.000000000 +0900
@@ -1556,8 +1556,14 @@
     if (sim_log)
         fprintf (sim_log, "Loading boot code from ka655x.bin\n");
     r = load_cmd (0, "-R ka655x.bin");
-    if (r != SCPE_OK)
-        return r;
+    if (r != SCPE_OK) {
+        printf ("Loading boot code from %%DATADIR%%/ka655x.bin\n");
+        if (sim_log)
+            fprintf (sim_log, "Loading boot code from %%DATADIR%%/ka655x.bin\n");
+        r = load_cmd (0, "-R %%DATADIR%%/ka655x.bin");
+        if (r != SCPE_OK)
+            return r;
+        }
     }
 sysd_powerup ();
 return SCPE_OK;




--- VAX/vax780_sbi.c.orig	2016-12-01 22:43:43 UTC
+++ VAX/vax780_sbi.c
@@ -638,7 +638,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 */
     }
@@ -784,15 +784,15 @@ for (i = 0; (dptr = sim_devices[i]) != N
     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 */

Line 0 Link Here

(-)./files/patch-VAX_vax__cis.c (+29 lines)
	1	--- VAX/vax_cis.c.orig 2016-12-01 22:43:43 UTC
	2	+++ VAX/vax_cis.c
	3	@@ -331,7 +331,7 @@ switch (opc) {
	4	R[3] = (R[3] + 1) & LMASK; /* next string char */
	5	if (i >= sim_interval) { /* done with interval? */
	6	sim_interval = 0;
	7	- if (r = sim_process_event ()) { /* presumably WRU */
	8	+ if ((r = sim_process_event ())) { /* presumably WRU */
	9	PC = fault_PC; /* backup up PC */
	10	ABORT (r); /* abort flushes IB */
	11	}
	12	@@ -1550,7 +1550,7 @@ uint32 NibbleRshift (DSTR *dsrc, int32 s
	13	{
	14	int32 i, s, nc;
	15
	16	-if (s = sc * 4) {
	17	+if ((s = sc * 4)) {
	18	for (i = DSTRMAX; i >= 0; i--) {
	19	nc = (dsrc->val[i] << (32 - s)) & LMASK;
	20	dsrc->val[i] = ((dsrc->val[i] >> s) \|
	21	@@ -1574,7 +1574,7 @@ uint32 NibbleLshift (DSTR *dsrc, int32 s
	22	{
	23	int32 i, s, nc;
	24
	25	-if (s = sc * 4) {
	26	+if ((s = sc * 4)) {
	27	for (i = 0; i < DSTRLNT; i++) {
	28	nc = dsrc->val[i] >> (32 - s);
	29	dsrc->val[i] = ((dsrc->val[i] << s) \|

Line 0 Link Here

(-)./files/patch-VAX_vax__cmode.c (+11 lines)
	1	--- VAX/vax_cmode.c.orig 2016-12-01 22:43:43 UTC
	2	+++ VAX/vax_cmode.c
	3	@@ -621,7 +621,7 @@ switch ((IR >> 12) & 017) {
	4	else src2 = RdMemW (GeteaW (dstspec));
	5	src2 = src2 & 077;
	6	src = RdRegW (srcspec); /* get src */
	7	- if (sign = ((src & WSIGN)? 1: 0))
	8	+ if ((sign = ((src & WSIGN)? 1: 0)))
	9	src = src \| ~WMASK;
	10	if (src2 == 0) { /* [0] */
	11	dst = src; /* result */




--- VAX/vax_cpu.c.orig	2016-12-01 22:43:43 UTC
+++ VAX/vax_cpu.c
@@ -642,7 +642,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;
@@ -650,7 +650,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 */

Line 0 Link Here

(-)./files/patch-VAX_vax__io.c (+11 lines)
	1	--- VAX/vax_io.c.orig 2016-12-01 22:43:43 UTC
	2	+++ VAX/vax_io.c
	3	@@ -792,7 +792,7 @@ init_ubus_tab ();
	4	for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { /* loop thru dev */
	5	dibp = (DIB ) dptr->ctxt; / get DIB */
	6	if (dibp && !(dptr->flags & DEV_DIS)) { /* defined, enabled? */
	7	- if (r = build_ubus_tab (dptr, dibp)) /* add to bus tab */
	8	+ if ((r = build_ubus_tab (dptr, dibp))) /* add to bus tab */
	9	return r;
	10	} /* end if enabled */
	11	} /* end for */




--- VAX/vax_octa.c.orig	2016-12-01 22:43:43 UTC
+++ 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 */

Line 0 Link Here

(-)./files/patch-VAX_vax__sys.c (+11 lines)
	1	--- VAX/vax_sys.c.orig 2016-12-01 22:43:43 UTC
	2	+++ VAX/vax_sys.c
	3	@@ -1173,7 +1173,7 @@ const char *force[] = { "S^", "I^", "B^"
	4
	5	r = SCPE_OK; / assume ok */
	6	M1C ('@', SP_IND); /* look for @ */
	7	-if (tptr = parse_rnum (cptr, &rn)) { /* look for Rn */
	8	+if ((tptr = parse_rnum (cptr, &rn))) { /* look for Rn */
	9	if (cptr == '[') { / look for [Rx] */
	10	cptr = parse_rnum (++cptr, &index);
	11	if ((cptr == NULL) \|\| (*cptr++ != ']'))




--- VAX/vax_sysdev.c.orig	2016-12-01 22:43:43 UTC
+++ VAX/vax_sysdev.c
@@ -1556,8 +1556,14 @@ if (*rom == 0) {                        
     if (sim_log)
         fprintf (sim_log, "Loading boot code from ka655x.bin\n");
     r = load_cmd (0, "-R ka655x.bin");
-    if (r != SCPE_OK)
-        return r;
+    if (r != SCPE_OK) {
+        printf ("Loading boot code from /usr/local/share/simh/ka655x.bin\n");
+        if (sim_log)
+            fprintf (sim_log, "Loading boot code from /usr/local/share/simh/ka655x.bin\n");
+        r = load_cmd (0, "-R /usr/local/share/simh/ka655x.bin");
+        if (r != SCPE_OK)
+            return r;
+        }
     }
 sysd_powerup ();
 return SCPE_OK;




--- makefile.orig	2016-12-01 22:43:43 UTC
+++ makefile
@@ -110,7 +110,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
             PCAPLIB = wpcap
             LIBEXT = a
           else
-            LDSEARCH :=$(shell ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')
+##########            LDSEARCH :=$(shell ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')
             ifneq (,$(LDSEARCH))
               LIBPATH := $(LDSEARCH)
             endif
@@ -300,7 +300,7 @@ ifneq ($(DEBUG),)
   CFLAGS_O = -O0
   BUILD_FEATURES = - debugging support
 else
-  CFLAGS_O = -O2
+  CFLAGS_O ?= -O2
   LDFLAGS_O = 
   GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
   ifneq (3,$(GCC_MAJOR_VERSION))
@@ -309,9 +309,9 @@ else
     endif
     GCC_OPTIMIZERS = $(shell $(GCC_OPTIMIZERS_CMD))
   endif
-  ifneq (,$(findstring $(GCC_VERSION),$(LTO_EXCLUDE_VERSIONS)))
-    NO_LTO = 1
-  endif
+#  ifneq (,$(findstring $(GCC_VERSION),$(LTO_EXCLUDE_VERSIONS)))
+#    NO_LTO = 1
+#  endif
   ifneq (,$(findstring -finline-functions,$(GCC_OPTIMIZERS)))
     CFLAGS_O += -finline-functions
   endif
@@ -330,12 +330,14 @@ else
   ifneq (,$(findstring -fstrict-overflow,$(GCC_OPTIMIZERS)))
     CFLAGS_O += -fno-strict-overflow
   endif
-  ifeq (,$(NO_LTO))
-    ifneq (,$(findstring -flto,$(GCC_OPTIMIZERS)))
-      CFLAGS_O += -flto -fwhole-program
-      LDFLAGS_O += -flto -fwhole-program
-    endif
-  endif
+#  ifeq (,$(NO_LTO))
+#    ifneq (,$(findstring -flto,$(GCC_OPTIMIZERS)))
+#      ifneq (,$(findstring -fwhole-program,$(GCC_OPTIMIZERS)))
+#        CFLAGS_O += -flto -fwhole-program
+#        LDFLAGS_O += -flto -fwhole-program
+#      endif
+#    endif
+#  endif
   BUILD_FEATURES = - compiler optimizations and no debugging support
 endif
 ifneq (3,$(GCC_MAJOR_VERSION))




--- scp.c.orig	2016-12-01 22:43:43 UTC
+++ scp.c
@@ -678,14 +678,14 @@ else if (*argv[0]) {                    
     char nbuf[PATH_MAX + 7], *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 */
     }
 
 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 */
@@ -700,7 +700,7 @@ while (stat != SCPE_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;
     if (stat >= SCPE_BASE) {                            /* error? */
@@ -767,7 +767,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);
@@ -911,7 +911,7 @@ do {
     cptr = get_glyph (cptr, gbuf, 0);                   /* get command glyph */
     sim_switches = 0;                                   /* init switches */
     isdo = FALSE;
-    if (cmdp = find_cmd (gbuf)) {                       /* lookup command */
+    if ((cmdp = find_cmd (gbuf))) {                     /* lookup command */
         isdo = (cmdp->action == &do_cmd);
         if (isdo) {                                     /* DO command? */
             if (flag >= DO_NEST_LVL)                    /* nest too deep? */
@@ -1091,18 +1091,18 @@ if (*cptr == 0)                         
     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 */
@@ -1110,7 +1110,7 @@ if (*cptr == 0)                         
 
 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 */
@@ -1123,7 +1123,7 @@ while (*cptr != 0) {                    
                 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);
@@ -1156,7 +1156,7 @@ while (*cptr != 0) {                    
             }                                           /* 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;
@@ -1349,15 +1349,15 @@ GET_SWITCHES (cptr);                    
 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? */
@@ -1377,7 +1377,7 @@ if (dptr->modifiers == NULL)            
 
 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? */
@@ -1396,7 +1396,7 @@ while (*cptr != 0) {                    
             }                                           /* 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 */
@@ -1800,7 +1800,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 */
@@ -3699,7 +3699,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;
@@ -3782,7 +3782,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 */
@@ -3862,7 +3862,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 */
@@ -4080,15 +4080,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);
@@ -4753,7 +4753,7 @@ while (isspace (*sim_brk_act))          
     sim_brk_act++;
 if (*sim_brk_act == 0)                              /* now empty? */
     return (sim_brk_act = NULL);
-if (ep = strchr (sim_brk_act, ';')) {                   /* cmd delimiter? */
+if ((ep = strchr (sim_brk_act, ';'))) {                 /* cmd delimiter? */
     lnt = ep - sim_brk_act;                             /* cmd length */
     memcpy (buf, sim_brk_act, lnt + 1);                 /* copy with ; */
     buf[lnt] = 0;                                       /* erase ; */




--- sim_console.c.orig	2016-12-01 22:43:43 UTC
+++ sim_console.c
@@ -162,10 +162,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;
@@ -190,7 +190,7 @@ if (*cptr == 0) {                       
     }
 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;
     }
@@ -459,7 +459,7 @@ if ((c == SCPE_STOP) || (sim_con_tmxr.ma
 if (sim_con_ldsc.conn == 0)                              /* no Telnet conn? */
     return SCPE_LOST;
 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;
 }




--- sim_ether.c.orig	2016-12-01 22:43:43 UTC
+++ sim_ether.c
@@ -1333,7 +1333,7 @@ static void eth_get_nic_hw_addr(ETH_DEV*
     for (i=0; patterns[i] && (0 == dev->have_host_nic_phy_addr); ++i) {
       snprintf(command, sizeof(command)-1, "ifconfig %s | %s  >NIC.hwaddr", devname, patterns[i]);
       system(command);
-      if (f = fopen("NIC.hwaddr", "r")) {
+      if ((f = fopen("NIC.hwaddr", "r"))) {
         while (0 == dev->have_host_nic_phy_addr) {
           if (fgets(command, sizeof(command)-1, f)) {
             char *p1, *p2;
@@ -1519,7 +1519,7 @@ sim_debug(dev->dbit, dev->dptr, "Writer 
 pthread_mutex_lock (&dev->writer_lock);
 while (dev->handle) {
   pthread_cond_wait (&dev->writer_cond, &dev->writer_lock);
-  while (request = dev->write_requests) {
+  while ((request = dev->write_requests)) {
     /* Pull buffer off request list */
     dev->write_requests = request->next;
     pthread_mutex_unlock (&dev->writer_lock);
@@ -1827,11 +1827,11 @@ pthread_mutex_destroy (&dev->writer_lock
 pthread_cond_destroy (&dev->writer_cond);
 if (1) {
   struct write_request *buffer;
-   while (buffer = dev->write_buffers) {
+   while ((buffer = dev->write_buffers)) {
     dev->write_buffers = buffer->next;
     free(buffer);
     }
-  while (buffer = dev->write_requests) {
+  while ((buffer = dev->write_requests)) {
     dev->write_requests = buffer->next;
     free(buffer);
     }
@@ -2084,7 +2084,7 @@ if (!dev) return SCPE_UNATT;
 
 /* Get a buffer */
 pthread_mutex_lock (&dev->writer_lock);
-if (request = dev->write_buffers)
+if ((request = dev->write_buffers))
   dev->write_buffers = request->next;
 pthread_mutex_unlock (&dev->writer_lock);
 if (!request)




--- sim_tape.c.orig	2016-12-01 22:43:43 UTC
+++ sim_tape.c
@@ -404,7 +404,7 @@ t_addr opos;
 t_stat st;
 
 opos = uptr->pos;                                       /* old position */
-if (st = sim_tape_rdlntf (uptr, &tbc))                  /* read rec lnt */
+if ((st = sim_tape_rdlntf (uptr, &tbc)))                /* read rec lnt */
     return st;
 *bc = rbc = MTR_L (tbc);                                /* strip error flag */
 if (rbc > max) {                                        /* rec out of range? */
@@ -453,7 +453,7 @@ uint32 f = MT_GET_FMT (uptr);
 t_mtrlnt i, rbc, tbc;
 t_stat st;
 
-if (st = sim_tape_rdlntr (uptr, &tbc))                  /* read rec lnt */
+if ((st = sim_tape_rdlntr (uptr, &tbc)))                /* read rec lnt */
     return st;
 *bc = rbc = MTR_L (tbc);                                /* strip error flag */
 if (rbc > max)                                          /* rec out of range? */

Line 0 Link Here

(-)./files/patch-swtp6800_common_bootrom.c (+11 lines)
	1	--- swtp6800/common/bootrom.c.orig 2016-12-01 22:43:43 UTC
	2	+++ swtp6800/common/bootrom.c
	3	@@ -144,7 +144,7 @@ t_stat BOOTROM_config (UNIT *uptr, int32
	4	if (val == UNIT_NONE)
	5	BOOTROM_unit.capac = 0; /* set EPROM size */
	6	else
	7	- BOOTROM_unit.capac = 0x200 << (val >> UNIT_V_MSIZE) - 1; /* set EPROM size */
	8	+ BOOTROM_unit.capac = 0x200 << ((val >> UNIT_V_MSIZE) - 1); /* set EPROM size */
	9	if (BOOTROM_unit.filebuf) { /* free buffer */
	10	free (BOOTROM_unit.filebuf);
	11	BOOTROM_unit.filebuf = NULL;




--- swtp6800/common/m6800.c.orig	2016-12-01 22:43:43 UTC
+++ 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 */
@@ -1890,18 +1890,20 @@ int32 get_flag(int32 flg)
 
 void condevalVa(int32 op1, int32 op2)
 {
-    if (get_flag(CF))
+    if (get_flag(CF)) {
         COND_SET_FLAG_V(((op1 & 0x80) && (op2 & 0x80)) || (
-            (op1 & 0x80 == 0) && (op2 & 0x80 == 0)));
+            ((op1 & 0x80) == 0) && ((op2 & 0x80) == 0)));
+    } 
 }
 
 /* test and set V for subtraction */
 
 void condevalVs(int32 op1, int32 op2)
 {
-    if (get_flag(CF))
-        COND_SET_FLAG_V(((op1 & 0x80) && (op2 & 0x80 == 0)) || 
-            ((op1 & 0x80 == 0) && (op2 & 0x80)));
+    if (get_flag(CF)) {
+        COND_SET_FLAG_V(((op1 & 0x80) && ((op2 & 0x80) == 0)) || 
+            ((((op1 & 0x80) == 0)) && (op2 & 0x80)));
+    }
 }
 
 /* calls from the simulator */

Return to bug 214990

Line 0 Link Here

(-)./files/patch-ALTAIR_altair__cpu.c (+20 lines)
	1	--- ALTAIR/altair_cpu.c.orig 2016-12-01 22:43:42 UTC
	2	+++ ALTAIR/altair_cpu.c
	3	@@ -313,7 +313,7 @@ int32 sim_instr (void)
	4
	5	while (reason == 0) { /* loop until halted */
	6	if (sim_interval <= 0) { /* check clock queue */
	7	- if (reason = sim_process_event ()) break;
	8	+ if ((reason = sim_process_event ())) break;
	9	}
	10
	11	if (int_req > 0) { /* interrupt? */
	12	@@ -366,7 +366,7 @@ int32 sim_instr (void)
	13	if ((OP & 0xCF) == 0x01) { /* LXI */
	14	DAR = M[PC] & 0x00ff;
	15	PC++;
	16	- DAR = DAR \| (M[PC] <<8) & 0xFF00;;
	17	+ DAR = DAR \| ((M[PC] <<8) & 0xFF00);
	18	putpair((OP >> 4) & 0x03, DAR);
	19	PC++;
	20	continue;

Line 0 Link Here

(-)./files/patch-H316_h316__dp.c (+56 lines)
	1	--- H316/h316_dp.c.orig 2016-12-01 22:43:42 UTC
	2	+++ H316/h316_dp.c
	3	@@ -617,7 +617,7 @@ switch (uptr->FNC) {
	4	case FNC_RCA: /* read current addr */
	5	if (h >= dp_tab[dp_ctype].surf) /* invalid head? */
	6	return dp_done (1, STA_ADRER); /* error */
	7	- if (r = dp_rdtrk (uptr, dpxb, uptr->CYL, h)) /* get track; error? */
	8	+ if ((r = dp_rdtrk (uptr, dpxb, uptr->CYL, h))) /* get track; error? */
	9	return r;
	10	dp_rptr = 0; /* init rec ptr */
	11	if (dpxb[dp_rptr + REC_LNT] == 0) /* unformated? */
	12	@@ -722,7 +722,7 @@ switch (uptr->FNC) {
	13	case FNC_RW: /* read/write */
	14	if (h >= dp_tab[dp_ctype].surf) /* invalid head? */
	15	return dp_done (1, STA_ADRER); /* error */
	16	- if (r = dp_rdtrk (uptr, dpxb, uptr->CYL, h)) /* get track; error? */
	17	+ if ((r = dp_rdtrk (uptr, dpxb, uptr->CYL, h))) /* get track; error? */
	18	return r;
	19	if (!dp_findrec (dp_cw2)) /* find rec; error? */
	20	return dp_done (1, STA_ADRER); /* address error */
	21	@@ -750,7 +750,7 @@ switch (uptr->FNC) {
	22	if (dp_cw1 & CW1_RW) { /* write? */
	23	if (dp_sta & STA_RDY) /* timing failure? */
	24	return dp_wrdone (uptr, STA_DTRER); /* yes, error */
	25	- if (r = dp_wrwd (uptr, dp_buf)) /* wr word, error? */
	26	+ if ((r = dp_wrwd (uptr, dp_buf))) /* wr word, error? */
	27	return r;
	28	if (dp_eor) { /* transfer done? */
	29	dpxb[dp_rptr + REC_DATA + dp_wptr] = dp_csum;
	30	@@ -855,7 +855,7 @@ if (dp_wptr < (lnt + REC_MAXEXT)) {
	31	}
	32	dpxb[dp_rptr + REC_DATA + dp_wptr] = dp_csum; /* write csum */
	33	dpxb[dp_rptr + lnt + REC_OVHD] = 0; /* zap rest of track */
	34	-if (r = dp_wrdone (uptr, STA_UNSER)) /* dump track */
	35	+if ((r = dp_wrdone (uptr, STA_UNSER))) /* dump track */
	36	return r;
	37	return STOP_DPOVR;
	38	}
	39	@@ -1017,7 +1017,7 @@ for (c = cntr = 0; c < dp_tab[dp_ctype].
	40	else tbuf[rptr + REC_ADDR] = (c << 8) + (h << 3) + i;
	41	rptr = rptr + nw + REC_OVHD;
	42	}
	43	- if (r = dp_wrtrk (uptr, tbuf, c, h))
	44	+ if ((r = dp_wrtrk (uptr, tbuf, c, h)))
	45	return r;
	46	}
	47	}
	48	@@ -1043,7 +1043,7 @@ if ((uptr->flags & UNIT_ATT) == 0)
	49	return SCPE_UNATT;
	50	for (c = 0; c < dp_tab[dp_ctype].cyl; c++) {
	51	for (h = 0; h < dp_tab[dp_ctype].surf; h++) {
	52	- if (r = dp_rdtrk (uptr, tbuf, c, h))
	53	+ if ((r = dp_rdtrk (uptr, tbuf, c, h)))
	54	return r;
	55	rptr = 0;
	56	rlnt = tbuf[rptr + REC_LNT];

Line 0 Link Here

(-)./files/patch-H316_h316__mt.c (+32 lines)
	1	--- H316/h316_mt.c.orig 2016-12-01 22:43:42 UTC
	2	+++ H316/h316_mt.c
	3	@@ -371,17 +371,17 @@ switch (uptr->FNC) {
	4	return SCPE_OK;
	5
	6	case FNC_WEOF: /* write file mark */
	7	- if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */
	8	+ if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */
	9	r = mt_map_err (uptr, st); /* map error */
	10	break; /* sched end motion */
	11
	12	case FNC_FSR: /* space fwd rec */
	13	- if (st = sim_tape_sprecf (uptr, &tbc)) /* space fwd, err? */
	14	+ if ((st = sim_tape_sprecf (uptr, &tbc))) /* space fwd, err? */
	15	r = mt_map_err (uptr, st); /* map error */
	16	break; /* sched end motion */
	17
	18	case FNC_BSR: /* space rev rec */
	19	- if (st = sim_tape_sprecr (uptr, &tbc)) /* space rev, err? */
	20	+ if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rev, err? */
	21	r = mt_map_err (uptr, st); /* map error */
	22	break; /* sched end motion */
	23
	24	@@ -455,7 +455,7 @@ switch (uptr->FNC) {
	25	mt_wrwd (uptr, mt_buf);
	26	else mt_rdy = 0; /* rdy must be clr */
	27	if (mt_ptr) { /* any data? */
	28	- if (st = sim_tape_wrrecf (uptr, mtxb, mt_ptr)) /* write, err? */
	29	+ if ((st = sim_tape_wrrecf (uptr, mtxb, mt_ptr))) /* write, err? */
	30	r = mt_map_err (uptr, st); /* map error */
	31	}
	32	break; /* sched end motion */

Line 0 Link Here

(-)./files/patch-H316_h316__sys.c (+16 lines)
	1	--- H316/h316_sys.c.orig 2016-12-01 22:43:42 UTC
	2	+++ H316/h316_sys.c
	3	@@ -364,11 +364,11 @@ switch (j) {
	4
	5	case I_V_MRF: case I_V_MRX: /* mem ref */
	6	cptr = get_glyph (cptr, gbuf, ','); /* get next field */
	7	- if (k = (strcmp (gbuf, "C") == 0)) { /* C specified? */
	8	+ if ((k = (strcmp (gbuf, "C") == 0))) { /* C specified? */
	9	val[0] = val[0] \| SC;
	10	cptr = get_glyph (cptr, gbuf, 0);
	11	}
	12	- else if (k = (strcmp (gbuf, "Z") == 0)) { /* Z specified? */
	13	+ else if ((k = (strcmp (gbuf, "Z") == 0))) { /* Z specified? */
	14	cptr = get_glyph (cptr, gbuf, ',');
	15	}
	16	d = get_uint (gbuf, 8, X_AMASK, &r); /* construe as addr */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__baci.c (+50 lines)
	1	--- HP2100/hp2100_baci.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_baci.c
	3	@@ -670,7 +670,7 @@ while (working_set) {
	4	if ((baci_icw ^ baci_obuf) & OUT_BAUDRATE) { /* baud rate change? */
	5	baci_term.wait = service_time (baci_obuf); /* set service time to match rate */
	6
	7	- if (baci_term.flags & UNIT_DIAG) /* diagnostic mode? */
	8	+ if (baci_term.flags & UNIT_DIAG) { /* diagnostic mode? */
	9	if (baci_obuf & OUT_BAUDRATE) { /* internal baud rate requested? */
	10	sim_activate (&baci_term, /* activate I/O service */
	11	baci_term.wait);
	12	@@ -687,6 +687,7 @@ while (working_set) {
	13	fprintf (sim_deb, ">>BACI cmds: [OTx%s] Terminal service stopped\n",
	14	hold_or_clear);
	15	}
	16	+ }
	17	}
	18
	19	baci_icw = baci_obuf; /* load new reference word */
	20	@@ -1381,13 +1382,14 @@ else {
	21
	22	baci_fcount = baci_fcount + 1; /* increment occupancy counter */
	23
	24	-if (DEBUG_PRI (baci_dev, DEB_BUF))
	25	+if (DEBUG_PRI (baci_dev, DEB_BUF)) {
	26	if (pass_thru)
	27	fprintf (sim_deb, ">>BACI buf: Character %s put to UART transmitter holding register, "
	28	"character counter = 1\n", fmt_char (ch));
	29	else
	30	fprintf (sim_deb, ">>BACI buf: Character %s put to FIFO [%d], "
	31	"character counter = %d\n", fmt_char (ch), index, baci_fcount);
	32	+}
	33
	34	if ((IO_MODE == RECV) && (baci_spchar [ch])) /* receive mode and special character? */
	35	baci_status = baci_status \| IN_SPCHAR; /* set special char seen flag */
	36	@@ -1447,12 +1449,13 @@ uint32 uart_bits, data_bits, data_mask,
	37	if (baci_uart_clk > 0) { /* transfer in progress? */
	38	bit_low = (baci_icw & OUT_CD); /* get current receive bit */
	39
	40	- if ((baci_uart_clk & 017) == 0) /* end of a bit? */
	41	+ if ((baci_uart_clk & 017) == 0) { /* end of a bit? */
	42	if (IO_MODE == XMIT) /* transmit? */
	43	baci_uart_tr = baci_uart_tr >> 1; /* shift new bit onto line */
	44	else /* receive? */
	45	baci_uart_rr = (baci_uart_rr >> 1) & /* shift new bit in */
	46	(bit_low ? ~SIGN : -1); /* (inverted sense) */
	47	+ }
	48
	49	if (bit_low) { /* another low bit? */
	50	baci_bcount = baci_bcount + 1; /* update break counter */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu.c (+89 lines)
		1	--- HP2100/hp2100_cpu.c.orig 2016-12-01 22:43:42 UTC
		2	+++ HP2100/hp2100_cpu.c
		3	@@ -1054,7 +1054,7 @@ for (i = OPTDEV; i <= MAXDEV; i++)
		4
		5	dtab [PWR] = &pwrf_dib; /* for now, powerfail is always present */
		6
		7	-for (i = 0; dptr = sim_devices [i]; i++) { /* loop thru dev */
		8	+for (i = 0; (dptr = sim_devices [i]); i++) { /* loop thru dev */
		9	dibptr = (DIB ) dptr->ctxt; / get DIB */
		10
		11	if (dibptr && !(dptr->flags & DEV_DIS)) { /* handler exists and device is enabled? */
		12	@@ -2153,13 +2153,13 @@ if (req_grant [0])
		13	else /* not this one */
		14	req_grant [0] = req_grant [0] >> 1; /* position next request */
		15
		16	-else if (req_grant [1]) /* device in upper half */
		17	+else if (req_grant [1]) { /* device in upper half */
		18	for (sc = 32; sc <= 63; sc++) /* determine interrupting select code */
		19	if (req_grant [1] & 1) /* grant this request? */
		20	return sc; /* return this select code */
		21	else /* not this one */
		22	req_grant [1] = req_grant [1] >> 1; /* position next request */
		23	-
		24	+ }
		25	return 0; /* no interrupt granted */
		26	}
		27
		28	@@ -3611,7 +3611,7 @@ uint32 i, j, k;
		29	t_bool is_conflict = FALSE;
		30	uint32 conflicts[MAXDEV + 1] = { 0 };
		31
		32	-for (i = 0; dptr = sim_devices[i]; i++) {
		33	+for (i = 0; (dptr = sim_devices[i]); i++) {
		34	dibptr = (DIB *) dptr->ctxt;
		35	if (dibptr && !(dptr->flags & DEV_DIS))
		36	if (++conflicts[dibptr->select_code] > 1)
		37	@@ -3629,7 +3629,7 @@ if (is_conflict) {
		38	if (sim_log)
		39	fprintf (sim_log, "Select code %o conflict:", i);
		40
		41	- for (j = 0; dptr = sim_devices[j]; j++) {
		42	+ for (j = 0; (dptr = sim_devices[j]); j++) {
		43	dibptr = (DIB *) dptr->ctxt;
		44	if (dibptr && !(dptr->flags & DEV_DIS) && (i == dibptr->select_code)) {
		45	if (k < conflicts[i]) {
		46	@@ -3791,12 +3791,12 @@ else
		47
		48	result = cpu_set_size (uptr, new_memsize, NULL, NULL); /* set memory size */
		49
		50	-if (result == SCPE_OK) /* memory change OK? */
		51	+if (result == SCPE_OK) { /* memory change OK? */
		52	if (new_family == UNIT_FAMILY_21XX) /* 21xx CPU? */
		53	fwanxm = MEMSIZE - IBL_LNT; /* reserve memory for loader */
		54	else
		55	fwanxm = MEMSIZE; /* loader reserved only for 21xx */
		56	-
		57	+ }
		58	return result;
		59	}
		60
		61	@@ -3810,11 +3810,12 @@ t_stat cpu_show_model (FILE st, UNIT u
		62	{
		63	fputs ((char ) desc, st); / write model name */
		64
65	-if (UNIT_CPU_FAMILY == UNIT_FAMILY_21XX) /* valid only for 21xx */
66	+if (UNIT_CPU_FAMILY == UNIT_FAMILY_21XX) { /* valid only for 21xx */
67	if (fwanxm < MEMSIZE) /* loader area non-existent? */
68	fputs (", loader disabled", st); /* yes, so access disabled */
69	else
70	fputs (", loader enabled", st); /* no, so access enabled */
71	+ }
72	return SCPE_OK;
73	}
74
75	@@ -3846,12 +3847,12 @@ if (UNIT_CPU_TYPE == UNIT_TYPE_2100) {
76	uptr->flags = uptr->flags \| UNIT_FP;
77	}
78
79	-else if (UNIT_CPU_MODEL == UNIT_1000_F)
80	+else if (UNIT_CPU_MODEL == UNIT_1000_F) {
81	if (option == UNIT_VIS) /* 1000-F IOP and VIS options */
82	uptr->flags = uptr->flags & ~UNIT_IOP; /* are mutually exclusive */
83	else if (option == UNIT_IOP)
84	uptr->flags = uptr->flags & ~UNIT_VIS;
85	-
86	+ }
87	return SCPE_OK;
88	}
89

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu0.c (+20 lines)
	1	--- HP2100/hp2100_cpu0.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu0.c
	3	@@ -130,7 +130,7 @@ uint32 entry;
	4	entry = IR & 017; /* mask to entry point */
	5
	6	if (op_ds[entry] != OP_N)
	7	- if (reason = cpu_ops (op_ds[entry], op, intrq)) /* get instruction operands */
	8	+ if ((reason = cpu_ops (op_ds[entry], op, intrq))) /* get instruction operands */
	9	return reason;
	10
	11	switch (entry) { /* decode IR<3:0> */
	12	@@ -244,7 +244,7 @@ uint32 entry;
	13	entry = IR & 017; /* mask to entry point */
	14
	15	if (op_user_20 [entry] != OP_N)
	16	- if (reason = cpu_ops (op_user_20 [entry], op, intrq)) /* get instruction operands */
	17	+ if ((reason = cpu_ops (op_user_20 [entry], op, intrq))) /* get instruction operands */
	18	return reason;
	19
	20	switch (entry) { /* decode IR<4:0> */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu1.c (+63 lines)
	1	--- HP2100/hp2100_cpu1.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu1.c
	3	@@ -193,11 +193,12 @@ OPS op;
	4	uint32 rs, qs, sc, v1, v2, t;
	5	int32 sop1, sop2;
	6
	7	-if ((cpu_unit.flags & UNIT_EAU) == 0) /* option installed? */
	8	+if ((cpu_unit.flags & UNIT_EAU) == 0) { /* option installed? */
	9	if ((UNIT_CPU_MODEL == UNIT_2114) && (IR == 0101100)) /* 2114 and RRR 16? */
	10	return SCPE_OK; /* allowed as NOP */
	11	else
	12	return stop_inst; /* fail */
	13	+}
	14
	15	switch ((IR >> 8) & 0377) { /* decode IR<15:8> */
	16
	17	@@ -245,7 +246,7 @@ switch ((IR >> 8) & 0377) {
	18
	19	case 010: /* MPY 100200 (OP_K) */
	20	MPY:
	21	- if (reason = cpu_ops (OP_K, op, intrq)) /* get operand */
	22	+ if ((reason = cpu_ops (OP_K, op, intrq))) /* get operand */
	23	break;
	24	sop1 = SEXT (AR); /* sext AR */
	25	sop2 = SEXT (op[0].word); /* sext mem */
	26	@@ -262,9 +263,9 @@ switch ((IR >> 8) & 0377) {
	27	break;
	28
	29	case 0201: /* DIV 100400 (OP_K) */
	30	- if (reason = cpu_ops (OP_K, op, intrq)) /* get operand */
	31	+ if ((reason = cpu_ops (OP_K, op, intrq))) /* get operand */
	32	break;
	33	- if (rs = qs = BR & SIGN) { /* save divd sign, neg? */
	34	+ if ((rs = qs = BR & SIGN)) { /* save divd sign, neg? */
	35	AR = (~AR + 1) & DMASK; /* make B'A pos */
	36	BR = (~BR + (AR == 0)) & DMASK; /* make divd pos */
	37	}
	38	@@ -317,14 +318,14 @@ switch ((IR >> 8) & 0377) {
	39	break;
	40
	41	case 0210: /* DLD 104200 (OP_D) */
	42	- if (reason = cpu_ops (OP_D, op, intrq)) /* get operand */
	43	+ if ((reason = cpu_ops (OP_D, op, intrq))) /* get operand */
	44	break;
	45	AR = (op[0].dword >> 16) & DMASK; /* load AR */
	46	BR = op[0].dword & DMASK; /* load BR */
	47	break;
	48
	49	case 0211: /* DST 104400 (OP_A) */
	50	- if (reason = cpu_ops (OP_A, op, intrq)) /* get operand */
	51	+ if ((reason = cpu_ops (OP_A, op, intrq))) /* get operand */
	52	break;
	53	WriteW (op[0].word, AR); /* store AR */
	54	WriteW ((op[0].word + 1) & VAMASK, BR); /* store BR */
	55	@@ -734,7 +735,7 @@ for (i = 0; i < OP_N_F; i++) {
	56	flags = pattern & OP_M_FLAGS; /* get operand pattern */
	57
	58	if (flags >= OP_ADR) /* address operand? */
	59	- if (reason = resolve (ReadW (PC), &MA, irq)) /* resolve indirects */
	60	+ if ((reason = resolve (ReadW (PC), &MA, irq))) /* resolve indirects */
	61	return reason;
	62
	63	switch (flags) {

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu2.c (+29 lines)
	1	--- HP2100/hp2100_cpu2.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu2.c
	3	@@ -244,7 +244,7 @@ absel = (IR & I_AB)? 1: 0;
	4	entry = IR & 037; /* mask to entry point */
	5
	6	if (op_dms[entry] != OP_N)
	7	- if (reason = cpu_ops (op_dms[entry], op, intrq)) /* get instruction operands */
	8	+ if ((reason = cpu_ops (op_dms[entry], op, intrq))) /* get instruction operands */
	9	return reason;
	10
	11	switch (entry) { /* decode IR<3:0> */
	12	@@ -610,7 +610,7 @@ absel = (IR & I_AB)? 1: 0;
	13	entry = IR & 037; /* mask to entry point */
	14
	15	if (op_eig[entry] != OP_N)
	16	- if (reason = cpu_ops (op_eig[entry], op, intrq)) /* get instruction operands */
	17	+ if ((reason = cpu_ops (op_eig[entry], op, intrq))) /* get instruction operands */
	18	return reason;
	19
	20	switch (entry) { /* decode IR<4:0> */
	21	@@ -989,7 +989,7 @@ else if (entry <= 057)
	22	entry = entry - 060; /* offset 10x460-477 */
	23
	24	if (op_iop[entry] != OP_N)
	25	- if (reason = cpu_ops (op_iop[entry], op, intrq)) /* get instruction operands */
	26	+ if ((reason = cpu_ops (op_iop[entry], op, intrq))) /* get instruction operands */
	27	return reason;
	28
	29	switch (entry) { /* decode IR<5:0> */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu3.c (+56 lines)
	1	--- HP2100/hp2100_cpu3.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu3.c
	3	@@ -186,7 +186,7 @@ entry = IR & 037;
	4
	5	if (UNIT_CPU_MODEL != UNIT_1000_F) { /* 2100/M/E-Series? */
	6	if (op_ffp_e[entry] != OP_N)
	7	- if (reason = cpu_ops (op_ffp_e[entry], op, intrq)) /* get instruction operands */
	8	+ if ((reason = cpu_ops (op_ffp_e[entry], op, intrq))) /* get instruction operands */
	9	return reason;
	10	}
	11
	12	@@ -194,7 +194,7 @@ if (UNIT_CPU_MODEL != UNIT_1000_F) {
	13
	14	else { /* F-Series */
	15	if (op_ffp_f[entry] != OP_N)
	16	- if (reason = cpu_ops (op_ffp_f[entry], op, intrq)) /* get instruction operands */
	17	+ if ((reason = cpu_ops (op_ffp_f[entry], op, intrq))) /* get instruction operands */
	18	return reason;
	19
	20	switch (entry) { /* decode IR<4:0> */
	21	@@ -417,7 +417,7 @@ switch (entry) {
	22	sa = op[0].word - 1;
	23
	24	da = ReadW (sa); /* get jump target */
	25	- if (reason = resolve (da, &MA, intrq)) { /* resolve indirects */
	26	+ if ((reason = resolve (da, &MA, intrq))) { /* resolve indirects */
	27	PC = err_PC; /* irq restarts instruction */
	28	break;
	29	}
	30	@@ -435,7 +435,7 @@ switch (entry) {
	31	op[1].word = op[1].word + /* compute element offset */
	32	(op[2].word - 1) * op[3].word;
	33	else { /* 3-dim access */
	34	- if (reason = cpu_ops (OP_KK, op2, intrq)) { /* get 1st, 2nd ranges */
	35	+ if ((reason = cpu_ops (OP_KK, op2, intrq))) { /* get 1st, 2nd ranges */
	36	PC = err_PC; /* irq restarts instruction */
	37	break;
	38	}
	39	@@ -461,7 +461,7 @@ switch (entry) {
	40
	41	for (j = 0; j < sc; j++) {
	42	MA = ReadW (sa++); /* get addr of actual */
	43	- if (reason = resolve (MA, &MA, intrq)) { /* resolve indirect */
	44	+ if ((reason = resolve (MA, &MA, intrq))) { /* resolve indirect */
	45	PC = err_PC; /* irq restarts instruction */
	46	break;
	47	}
	48	@@ -644,7 +644,7 @@ t_stat reason = SCPE_OK;
	49	entry = IR & 017; /* mask to entry point */
	50
	51	if (op_dbi[entry] != OP_N)
	52	- if (reason = cpu_ops (op_dbi[entry], op, intrq)) /* get instruction operands */
	53	+ if ((reason = cpu_ops (op_dbi[entry], op, intrq))) /* get instruction operands */
	54	return reason;
	55
	56	switch (entry) { /* decode IR<3:0> */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu4.c (+20 lines)
	1	--- HP2100/hp2100_cpu4.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu4.c
	3	@@ -261,7 +261,7 @@ else
	4	entry = opcode & 0177; /* map to <6:0> */
	5
	6	if (op_fpp[entry] != OP_N)
	7	- if (reason = cpu_ops (op_fpp[entry], op, intrq)) /* get instruction operands */
	8	+ if ((reason = cpu_ops (op_fpp[entry], op, intrq))) /* get instruction operands */
	9	return reason;
	10
	11	switch (entry) { /* decode IR<6:0> */
	12	@@ -600,7 +600,7 @@ static const OP t_one = { { 0040000, 00
	13	entry = IR & 017; /* mask to entry point */
	14
	15	if (op_sis[entry] != OP_N)
	16	- if (reason = cpu_ops (op_sis[entry], op, intrq)) /* get instruction operands */
	17	+ if ((reason = cpu_ops (op_sis[entry], op, intrq))) /* get instruction operands */
	18	return reason;
	19
	20	switch (entry) { /* decode IR<3:0> */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu5.c (+20 lines)
	1	--- HP2100/hp2100_cpu5.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu5.c
	3	@@ -650,7 +650,7 @@ entry = IR & 017;
	4	pattern = op_vma[entry]; /* get operand pattern */
	5
	6	if (pattern != OP_N)
	7	- if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */
	8	+ if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */
	9	return reason;
	10
	11	if (debug) { /* debugging? */
	12	@@ -1361,7 +1361,7 @@ entry = IR & 017;
	13	pattern = op_ema[entry]; /* get operand pattern */
	14
	15	if (pattern != OP_N)
	16	- if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */
	17	+ if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */
	18	return reason;
	19
	20	if (debug) { /* debugging? */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu6.c (+29 lines)
	1	--- HP2100/hp2100_cpu6.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu6.c
	3	@@ -394,7 +394,7 @@ entry = IR & 017;
	4	pattern = op_os[entry]; /* get operand pattern */
	5
	6	if (pattern != OP_N)
	7	- if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */
	8	+ if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */
	9	return reason;
	10
	11	tbg_tick = tbg_tick \|\| (IR == 0105357) && iotrap; /* set TBG interrupting flag */
	12	@@ -544,7 +544,7 @@ switch (entry) {
	13	for (i = 0; i < count; i++) {
	14	ma = ReadW (PC); /* get operand address */
	15
	16	- if (reason = resolve (ma, &ma, intrq)) { /* resolve indirect */
	17	+ if ((reason = resolve (ma, &ma, intrq))) { /* resolve indirect */
	18	PC = err_PC; /* IRQ restarts instruction */
	19	break;
	20	}
	21	@@ -710,7 +710,7 @@ switch (entry) {
	22	ma = ReadW (sa); /* get addr of actual */
	23	sa = (sa + 1) & VAMASK; /* increment address */
	24
	25	- if (reason = resolve (ma, &ma, intrq)) { /* resolve indirect */
	26	+ if ((reason = resolve (ma, &ma, intrq))) { /* resolve indirect */
	27	PC = err_PC; /* irq restarts instruction */
	28	break;
	29	}

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__cpu7.c (+20 lines)
	1	--- HP2100/hp2100_cpu7.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_cpu7.c
	3	@@ -391,7 +391,7 @@ if (pattern != OP_N)
	4	rtn = rtn1 = ret.word; /* but save it just in case */
	5	PC = (PC + 1) & VAMASK; /* move to next argument */
	6	}
	7	- if (reason = cpu_ops (pattern, op, intrq)) /* get instruction operands */
	8	+ if ((reason = cpu_ops (pattern, op, intrq))) /* get instruction operands */
	9	return reason;
	10
	11	if (debug) { /* debugging? */
	12	@@ -653,7 +653,7 @@ t_bool debug = DEBUG_PRI (cpu_dev, DEB_S
	13	entry = IR & 017; /* mask to entry point */
	14
	15	if (op_signal[entry] != OP_N)
	16	- if (reason = cpu_ops (op_signal[entry], op, intrq)) /* get instruction operands */
	17	+ if ((reason = cpu_ops (op_signal[entry], op, intrq))) /* get instruction operands */
	18	return reason;
	19
	20	if (debug) { /* debugging? */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__di.c (+76 lines)
		1	--- HP2100/hp2100_di.c.orig 2016-12-01 22:43:42 UTC
		2	+++ HP2100/hp2100_di.c
		3	@@ -607,13 +607,13 @@ while (working_set) {
		4	else if (di_card->cntl_register & CNTL_NRFD) /* NRFD was set but is not now? */
		5	deny \|= BUS_NRFD; /* deny NRFD on the bus */
		6
		7	- if (FIFO_FULL) /* is the FIFO full? */
		8	+ if (FIFO_FULL) { /* is the FIFO full? */
		9	if (data & CNTL_LSTN) /* is card now listening? */
		10	assert \|= BUS_NRFD; /* listener and a full FIFO asserts NRFD */
		11
		12	else if (di_card->cntl_register & CNTL_LSTN) /* was card a listener but is not now? */
		13	deny \|= BUS_NRFD; /* deny NRFD on the bus */
		14	-
		15	+ }
		16
		17	if (SW8_SYSCTL) { /* system controller drives REN and IFC */
		18	if (data & CNTL_REN) /* REN control */
		19	@@ -1452,14 +1452,14 @@ if (di_card->bus_cntl & BUS_IFC
		20	}
		21
		22
		23	-if (di_card->cntl_register & CNTL_LSTN) /* is the card a listener? */
		24	+if (di_card->cntl_register & CNTL_LSTN) { /* is the card a listener? */
		25	if (di_card->cntl_register & CNTL_NRFD /* if explicitly requested */
		26	\|\| di_card->status_register & STAT_LBI /* or the last byte is in */
		27	\|\| FIFO_FULL) /* or the FIFO is full */
		28	assert = BUS_NRFD; /* then assert NRFD */
		29	else /* otherwise the card is ready for data */
		30	deny \|= BUS_NRFD; /* so deny NRFD */
		31	-
		32	+ }
		33	if (assert != deny) /* was there any change in bus state? */
		34	di_bus_control (card, CONTROLLER, assert, deny); /* update the bus control */
		35
		36	@@ -1813,7 +1813,7 @@ if (tag & TAG_EDT
		37
		38	if (access == cpu_access) { /* is this a cpu access? */
		39	if (!(di_card->cntl_register & CNTL_PACK)) /* in unpacked mode? */
		40	- data = data & ~(DATA_ATN \| DATA_EOI) /* substitute the ATN/EOI tag values */
		41	+ data = (data & ~(DATA_ATN \| DATA_EOI)) /* substitute the ATN/EOI tag values */
		42	\| (tag & (TAG_ATN \| TAG_EOI)) >> DATA_SHIFT; /* into the data word */
		43
		44	if (tag & TAG_LBR) /* is this the last byte? */
		45	@@ -1856,25 +1856,25 @@ if (DEBUG_PRJ (dptrs [card], DEB_BUF)) {
		46	}
		47
		48
		49	-if (di_card->cntl_register & CNTL_TALK) /* is the card talking? */
		50	- if (di_card->cntl_register & CNTL_PACK) /* is it in the packed mode? */
		51	+if (di_card->cntl_register & CNTL_TALK) { /* is the card talking? */
		52	+ if (di_card->cntl_register & CNTL_PACK) { /* is it in the packed mode? */
		53	if (di_card->status_register & STAT_LBO /* yes, is the last byte out? */
		54	&& di_card->cntl_register & CNTL_EOI) /* and is EOI control enabled? */
		55	di_card->bus_cntl \|= BUS_EOI; /* assert EOI on the bus */
		56	else
		57	di_card->bus_cntl &= ~BUS_EOI; /* deny EOI on the bus */
		58	-
		59	+ }
		60	else { /* the card is in the unpacked mode */
		61	if (di_card->cntl_register & CNTL_CIC) /* is the card the controller in charge? */
		62	di_card->bus_cntl = /* assert or deny the ATN bus line */
		63	- di_card->bus_cntl & ~BUS_ATN /* from the ATN tag value */
		64	+ (di_card->bus_cntl & ~BUS_ATN) /* from the ATN tag value */
65	\| (tag & TAG_ATN) >> BUS_SHIFT;
66
67	di_card->bus_cntl = /* assert or deny the EOI bus line */
68	- di_card->bus_cntl & ~BUS_EOI /* from the EOI tag value */
69	+ (di_card->bus_cntl & ~BUS_EOI) /* from the EOI tag value */
70	\| (tag & TAG_EOI) >> BUS_SHIFT;
71	}
72	-
73	+ }
74	return (uint16) data; /* return the data value */
75	}
76

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__di__da.c (+60 lines)
	1	--- HP2100/hp2100_di_da.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_di_da.c
	3	@@ -1215,7 +1215,7 @@ if (GET_BUSADR (da_unit [unitno].flags)
	4	if (ibl_copy (da_rom, da_dib.select_code)) /* copy the boot ROM to memory and configure */
	5	return SCPE_IERR; /* return an internal error if the copy failed */
	6
	7	-SR = SR & (IBL_OPT \| IBL_DS_HEAD) /* set S to a reasonable value */
	8	+SR = (SR & (IBL_OPT \| IBL_DS_HEAD)) /* set S to a reasonable value */
	9	\| IBL_DS \| IBL_MAN \| (da_dib.select_code << IBL_V_DEV); /* before boot execution */
	10
	11	return SCPE_OK;
	12	@@ -1594,10 +1594,10 @@ if (di [da].bus_cntl & BUS_ATN) {
	13	da_unit [unit].wait = icd_cntlr [unit].cmd_time; /* these are always scheduled and */
	14	initiated = TRUE; /* logged as initiated */
	15
	16	- if (if_state [unit] == read_wait /* if we're waiting for a send data secondary */
	17	- && message_address != 0x00 /* but it's not there */
	18	- \|\| if_state [unit] == status_wait /* or a send status secondary, */
	19	- && message_address != 0x08) /* but it's not there */
	20	+ if ((if_state [unit] == read_wait /* if we're waiting for a send data secondary */
	21	+ && message_address != 0x00) /* but it's not there */
	22	+ \|\| (if_state [unit] == status_wait /* or a send status secondary, */
	23	+ && message_address != 0x08)) /* but it's not there */
	24	abort_command (unit, io_program_error, /* then abort the pending command */
	25	idle); /* and process the new command */
	26
	27	@@ -1738,7 +1738,7 @@ else {
	28
	29	put_buffer_byte (&icd_cntlr [unit], data); /* add the byte to the buffer */
	30
	31	- if (icd_cntlr [unit].length == 0) /* is this the last parameter? */
	32	+ if (icd_cntlr [unit].length == 0) { /* is this the last parameter? */
	33	if (di [da].bus_cntl & BUS_EOI) /* does the host agree? */
	34	initiated = start_command (unit); /* start the command and log the initiation */
	35
	36	@@ -1747,6 +1747,7 @@ else {
	37	error_sink); /* any additional parameter bytes */
	38	initiated = TRUE; /* log the abort initiation */
	39	}
	40	+ }
	41	break;
	42
	43
	44	@@ -1787,14 +1788,14 @@ if (accepted && DEBUG_PRI (da_dev, DEB_X
	45	if (da_unit [unit].wait > 0) /* was service requested? */
	46	activate_unit (&da_unit [unit]); /* schedule the unit */
	47
	48	-if (initiated && DEBUG_PRI (da_dev, DEB_RWSC))
	49	+if (initiated && DEBUG_PRI (da_dev, DEB_RWSC)) {
	50	if (if_command [unit] == disc_command)
	51	fprintf (sim_deb, ">>DA rwsc: Unit %d position %d %s disc command initiated\n",
	52	unit, da_unit [unit].pos, dl_opcode_name (ICD, icd_cntlr [unit].opcode));
	53	else
	54	fprintf (sim_deb, ">>DA rwsc: Unit %d %s command initiated\n",
	55	unit, if_command_name [if_command [unit]]);
	56	-
	57	+}
	58	return accepted; /* indicate the acceptance condition */
	59	}
	60

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__dp.c (+39 lines)
	1	--- HP2100/hp2100_dp.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_dp.c
	3	@@ -694,7 +694,7 @@ void dp_goc (int32 fnc, int32 drv, int32
	4	{
	5	int32 t;
	6
	7	-if (t = sim_is_active (&dpc_unit[drv])) { /* still seeking? */
	8	+if ((t = sim_is_active (&dpc_unit[drv]))) { /* still seeking? */
	9	sim_cancel (&dpc_unit[drv]); /* stop seek */
	10	dpc_sta[drv] = dpc_sta[drv] & ~STA_BSY; /* clear busy */
	11	time = time + t; /* include seek time */
	12	@@ -906,10 +906,10 @@ switch (uptr->FNC) {
	13	dpc_rarh = dpc_rarh ^ 1; /* incr head */
	14	dpc_eoc = ((dpc_rarh & 1) == 0); /* calc eoc */
	15	}
	16	- if (err = fseek (uptr->fileref, da * sizeof (int16),
	17	- SEEK_SET)) break;
	18	+ if ((err = fseek (uptr->fileref, da * sizeof (int16),
	19	+ SEEK_SET))) break;
	20	fxread (dpxb, sizeof (int16), DP_NUMWD, uptr->fileref);
	21	- if (err = ferror (uptr->fileref)) break;
	22	+ if ((err = ferror (uptr->fileref))) break;
	23	}
	24	dpd_ibuf = dpxb[dp_ptr++]; /* get word */
	25	if (dp_ptr >= DP_NUMWD) { /* end of sector? */
	26	@@ -953,10 +953,10 @@ switch (uptr->FNC) {
	27	dpc_rarh = dpc_rarh ^ 1; /* incr head */
	28	dpc_eoc = ((dpc_rarh & 1) == 0); /* calc eoc */
	29	}
	30	- if (err = fseek (uptr->fileref, da * sizeof (int16),
	31	- SEEK_SET)) break;
	32	+ if ((err = fseek (uptr->fileref, da * sizeof (int16),
	33	+ SEEK_SET))) break;
	34	fxwrite (dpxb, sizeof (int16), DP_NUMWD, uptr->fileref);
	35	- if (err = ferror (uptr->fileref)) break; /* error? */
	36	+ if ((err = ferror (uptr->fileref))) break; /* error? */
	37	dp_ptr = 0; /* next sector */
	38	}
	39	if (dpd.command && dpd_xfer) /* dch on, xfer? */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__dq.c (+39 lines)
	1	--- HP2100/hp2100_dq.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_dq.c
	3	@@ -530,7 +530,7 @@ void dq_goc (int32 fnc, int32 drv, int32
	4	{
	5	int32 t;
	6
	7	-if (t = sim_is_active (&dqc_unit[drv])) { /* still seeking? */
	8	+if ((t = sim_is_active (&dqc_unit[drv]))) { /* still seeking? */
	9	sim_cancel (&dqc_unit[drv]); /* cancel */
	10	time = time + t; /* include seek time */
	11	}
	12	@@ -740,10 +740,10 @@ switch (uptr->FNC) {
	13	dqc_rars = (dqc_rars + 1) % DQ_NUMSC; /* incr sector */
	14	if (dqc_rars == 0) /* wrap? incr head */
	15	dqc_uhed[drv] = dqc_rarh = dqc_rarh + 1;
	16	- if (err = fseek (uptr->fileref, da * sizeof (int16),
	17	- SEEK_SET)) break;
	18	+ if ((err = fseek (uptr->fileref, da * sizeof (int16),
	19	+ SEEK_SET))) break;
	20	fxread (dqxb, sizeof (int16), DQ_NUMWD, uptr->fileref);
	21	- if (err = ferror (uptr->fileref)) break;
	22	+ if ((err = ferror (uptr->fileref))) break;
	23	}
	24	dqd_ibuf = dqxb[dq_ptr++]; /* get word */
	25	if (dq_ptr >= DQ_NUMWD) { /* end of sector? */
	26	@@ -786,10 +786,10 @@ switch (uptr->FNC) {
	27	dqc_rars = (dqc_rars + 1) % DQ_NUMSC; /* incr sector */
	28	if (dqc_rars == 0) /* wrap? incr head */
	29	dqc_uhed[drv] = dqc_rarh = dqc_rarh + 1;
	30	- if (err = fseek (uptr->fileref, da * sizeof (int16),
	31	- SEEK_SET)) return TRUE;
	32	+ if ((err = fseek (uptr->fileref, da * sizeof (int16),
	33	+ SEEK_SET))) return TRUE;
	34	fxwrite (dqxb, sizeof (int16), DQ_NUMWD, uptr->fileref);
	35	- if (err = ferror (uptr->fileref)) break;
	36	+ if ((err = ferror (uptr->fileref))) break;
	37	dq_ptr = 0;
	38	}
	39	if (dqd.command && dqd_xfer) { /* dch on, xfer? */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__fp1.c (+17 lines)
	1	--- HP2100/hp2100_fp1.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_fp1.c
	3	@@ -1145,12 +1145,12 @@ if (operand_l && operand_r) {
	4	operand_l = fp_a; / first op is accum */
	5	}
	6
	7	-if (result) /* want result precision? */
	8	+if (result) { /* want result precision? */
	9	if ((opcode & 0120) == 0100) /* fix? */
	10	result = int_size; / result is integer */
	11	else /* all others */
	12	result = fp_size; / result is fp */
	13	-
	14	+}
	15	return;
	16	}
	17

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__lps.c (+16 lines)
	1	--- HP2100/hp2100_lps.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_lps.c
	3	@@ -372,11 +372,12 @@ while (working_set) {
	4	if (lps_unit.flags & UNIT_DIAG) { /* diagnostic? */
	5	lps_sta = lps_unit.buf; /* loop back data */
	6
	7	- if (!(signal_set & ioCLC)) /* CLC not asserted simultaneously? */
	8	+ if (!(signal_set & ioCLC)) { /* CLC not asserted simultaneously? */
	9	if (UNIT_CPU_TYPE == UNIT_TYPE_211X) /* 2114/15/16 CPU? */
	10	sim_activate (&lps_unit, 3); /* schedule flag after two instructions */
	11	else /* 2100 or 1000 */
	12	sim_activate (&lps_unit, 2); /* schedule flag after next instruction */
	13	+ }
	14	}
	15
	16	else { /* real lpt, sched */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__mpx.c (+70 lines)
		1	--- HP2100/hp2100_mpx.c.orig 2016-12-01 22:43:42 UTC
		2	+++ HP2100/hp2100_mpx.c
		3	@@ -1153,7 +1153,7 @@ switch (mpx_cmd) {
		4	case CMD_REQ_WRITE: /* request write buffer */
		5	port = key_to_port (mpx_portkey); /* get port */
		6
		7	- if (port >= 0) /* port defined? */
		8	+ if (port >= 0) { /* port defined? */
		9	if (buf_avail (iowrite, port) > 0) /* is a buffer available? */
		10	mpx_ibuf = WR_BUF_LIMIT; /* report write buffer limit */
		11
		12	@@ -1161,6 +1161,7 @@ switch (mpx_cmd) {
		13	mpx_ibuf = 0; /* report none available */
		14	mpx_flags [port] \|= FL_WANTBUF; /* set buffer request */
		15	}
		16	+ }
		17	break;
		18
		19
		20	@@ -1251,7 +1252,7 @@ switch (mpx_cmd) {
		21	case CMD_TERM_BUF: /* terminate active receive buffer */
		22	port = key_to_port (mpx_portkey); /* get port */
		23
		24	- if (port >= 0) /* port defined? */
		25	+ if (port >= 0) { /* port defined? */
		26	if (buf_len (ioread, port, put) > 0) { /* any chars in buffer? */
		27	buf_term (ioread, port, 0); /* terminate buffer and set header */
		28
		29	@@ -1263,6 +1264,7 @@ switch (mpx_cmd) {
		30	mpx_charcnt [port] = 1; /* set to terminate on one char */
		31	mpx_flags [port] \|= FL_ALERT; /* set alert flag */
		32	}
		33	+ }
		34	break;
		35
		36
		37	@@ -1784,7 +1786,7 @@ while (recv_loop &&
		38	}
		39
		40	else { /* buffer is available */
		41	- if (rt & RT_ENAB_EDIT) /* editing enabled? */
		42	+ if (rt & RT_ENAB_EDIT) { /* editing enabled? */
		43	if (ch == BS) { /* backspace? */
		44	if (buf_len (ioread, port, put) > 0) /* at least one character in buffer? */
		45	buf_remove (ioread, port); /* remove last char */
		46	@@ -1814,6 +1816,7 @@ while (recv_loop &&
		47
		48	continue;
		49	}
		50	+ }
		51
		52	if (uptr->flags & UNIT_CAPSLOCK) /* caps lock mode? */
		53	ch = toupper (ch); /* convert to upper case if lower */
		54	@@ -2473,14 +2476,14 @@ else
		55
		56	buf_incr (mpx_get, port, rw, +1); /* increment circular get index */
		57
		58	-if (DEBUG_PRI (mpx_dev, DEB_BUF))
		59	+if (DEBUG_PRI (mpx_dev, DEB_BUF)) {
		60	if (mpx_flags [port] & emptying_flags [rw])
		61	fprintf (sim_deb, ">>MPX buf: Port %d character %s get from %s buffer "
		62	"[%d]\n", port, fmt_char (ch), io_op [rw], index);
		63	else
		64	fprintf (sim_deb, ">>MPX buf: Port %d header %03o get from %s buffer "
65	"[%d]\n", port, ch, io_op [rw], index);
66	-
67	+ }
68	if (mpx_get [port] [rw] == mpx_sep [port] [rw]) /* buffer now empty? */
69	mpx_flags [port] &= ~emptying_flags [rw]; /* clear "buffer emptying" flag */
70	else

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__ms.c (+72 lines)
		1	--- HP2100/hp2100_ms.c.orig 2016-12-01 22:43:42 UTC
		2	+++ HP2100/hp2100_ms.c
		3	@@ -737,7 +737,7 @@ switch (uptr->FNC) {
		4	fprintf (sim_deb,
		5	">>MSC svc: Unit %d wrote initial gap\n",
		6	unum);
		7	- if (st = ms_write_gap (uptr)) { /* write initial gap; error? */
		8	+ if ((st = ms_write_gap (uptr))) { /* write initial gap; error? */
		9	r = ms_map_err (uptr, st); /* map error */
		10	break; /* terminate operation */
		11	}
		12	@@ -747,13 +747,13 @@ switch (uptr->FNC) {
		13	fprintf (sim_deb,
		14	">>MSC svc: Unit %d wrote file mark\n",
		15	unum);
		16	- if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */
		17	+ if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */
		18	r = ms_map_err (uptr, st); /* map error */
		19	msc_sta = STA_EOF; /* set EOF status */
		20	break;
		21
		22	case FNC_FSR: /* space forward */
		23	- if (st = sim_tape_sprecf (uptr, &tbc)) /* space rec fwd, err? */
		24	+ if ((st = sim_tape_sprecf (uptr, &tbc))) /* space rec fwd, err? */
		25	r = ms_map_err (uptr, st); /* map error */
		26	if (tbc & 1)
		27	msc_sta = msc_sta \| STA_ODD;
		28	@@ -761,7 +761,7 @@ switch (uptr->FNC) {
		29	break;
		30
		31	case FNC_BSR: /* space reverse */
		32	- if (st = sim_tape_sprecr (uptr, &tbc)) /* space rec rev, err? */
		33	+ if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rec rev, err? */
		34	r = ms_map_err (uptr, st); /* map error */
		35	if (tbc & 1)
		36	msc_sta = msc_sta \| STA_ODD;
		37	@@ -831,7 +831,7 @@ switch (uptr->FNC) {
		38	fprintf (sim_deb,
		39	">>MSC svc: Unit %d wrote initial gap\n",
		40	unum);
		41	- if (st = ms_write_gap (uptr)) { /* write initial gap; error? */
		42	+ if ((st = ms_write_gap (uptr))) { /* write initial gap; error? */
		43	r = ms_map_err (uptr, st); /* map error */
		44	break; /* terminate operation */
		45	}
		46	@@ -855,7 +855,7 @@ switch (uptr->FNC) {
		47	fprintf (sim_deb,
		48	">>MSC svc: Unit %d wrote %d word record\n",
		49	unum, ms_ptr / 2);
		50	- if (st = sim_tape_wrrecf (uptr, msxb, ms_ptr)) { /* write, err? */
		51	+ if ((st = sim_tape_wrrecf (uptr, msxb, ms_ptr))) { /* write, err? */
		52	r = ms_map_err (uptr, st); /* map error */
		53	break;
		54	}
		55	@@ -894,7 +894,7 @@ t_stat st;
		56	uint32 gap_len = ms_ctype ? GAP_13183 : GAP_13181; /* establish gap length */
		57	uint32 tape_bpi = ms_ctype ? BPI_13183 : BPI_13181; /* establish nominal bpi */
		58
		59	-if (st = sim_tape_wrgap (uptr, gap_len, tape_bpi)) /* write gap */
		60	+if ((st = sim_tape_wrgap (uptr, gap_len, tape_bpi))) /* write gap */
		61	return ms_map_err (uptr, st); /* map error if failure */
		62	else
		63	return SCPE_OK;
		64	@@ -974,7 +974,7 @@ for (i = 0; i < MS_NUMDR; i++) {
65	fprintf (sim_deb,
66	">>MSC rws: Unit %d wrote %d word partial record\n", i, ms_ptr / 2);
67
68	- if (st = sim_tape_wrrecf (uptr, msxb, ms_ptr \| MTR_ERF))
69	+ if ((st = sim_tape_wrrecf (uptr, msxb, ms_ptr \| MTR_ERF)))
70	ms_map_err (uptr, st); /* discard any error */
71
72	ms_ptr = 0; /* clear partial */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__mt.c (+44 lines)
	1	--- HP2100/hp2100_mt.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_mt.c
	3	@@ -495,7 +495,7 @@ switch (mtc_fnc) {
	4	return sim_tape_detach (uptr); /* don't set cch flg */
	5
	6	case FNC_WFM: /* write file mark */
	7	- if (st = sim_tape_wrtmk (uptr)) /* write tmk, err? */
	8	+ if ((st = sim_tape_wrtmk (uptr))) /* write tmk, err? */
	9	r = mt_map_err (uptr, st); /* map error */
	10	mtc_sta = STA_EOF; /* set EOF status */
	11	break;
	12	@@ -504,12 +504,12 @@ switch (mtc_fnc) {
	13	break;
	14
	15	case FNC_FSR: /* space forward */
	16	- if (st = sim_tape_sprecf (uptr, &tbc)) /* space rec fwd, err? */
	17	+ if ((st = sim_tape_sprecf (uptr, &tbc))) /* space rec fwd, err? */
	18	r = mt_map_err (uptr, st); /* map error */
	19	break;
	20
	21	case FNC_BSR: /* space reverse */
	22	- if (st = sim_tape_sprecr (uptr, &tbc)) /* space rec rev, err? */
	23	+ if ((st = sim_tape_sprecr (uptr, &tbc))) /* space rec rev, err? */
	24	r = mt_map_err (uptr, st); /* map error */
	25	break;
	26
	27	@@ -558,7 +558,7 @@ switch (mtc_fnc) {
	28	return SCPE_OK;
	29	}
	30	if (mt_ptr) { /* write buffer */
	31	- if (st = sim_tape_wrrecf (uptr, mtxb, mt_ptr)) { /* write, err? */
	32	+ if ((st = sim_tape_wrrecf (uptr, mtxb, mt_ptr))) { /* write, err? */
	33	r = mt_map_err (uptr, st); /* map error */
	34	break; /* done */
	35	}
	36	@@ -627,7 +627,7 @@ t_stat st;
	37
	38	if (sim_is_active (&mtc_unit) && /* write in prog? */
	39	(mtc_fnc == FNC_WC) && (mt_ptr > 0)) { /* yes, bad rec */
	40	- if (st = sim_tape_wrrecf (&mtc_unit, mtxb, mt_ptr \| MTR_ERF))
	41	+ if ((st = sim_tape_wrrecf (&mtc_unit, mtxb, mt_ptr \| MTR_ERF)))
	42	mt_map_err (&mtc_unit, st);
	43	}
	44

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__mux.c (+30 lines)
	1	--- HP2100/hp2100_mux.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_mux.c
	3	@@ -650,11 +650,12 @@ while (working_set) {
	4	case ioIOO: /* I/O data output */
	5	muxl_obuf = IODATA (stat_data); /* store data */
	6
	7	- if (DEBUG_PRI (muxu_dev, DEB_CPU))
	8	+ if (DEBUG_PRI (muxu_dev, DEB_CPU)) {
	9	if (muxl_obuf & OTL_P)
	10	fprintf (sim_deb, ">>MUXl cpu: [OTx%s] Parameter = %06o\n", hold_or_clear, muxl_obuf);
	11	else
	12	fprintf (sim_deb, ">>MUXl cpu: [OTx%s] Data = %06o\n", hold_or_clear, muxl_obuf);
	13	+ }
	14	break;
	15
	16
	17	@@ -1107,11 +1108,12 @@ if (c & SCPE_BREAK) {
	18	mux_rbuf[ln] = 0; /* break returns NUL */
	19	mux_sta[ln] = mux_sta[ln] \| LIU_BRK; /* set break status */
	20
	21	- if (DEBUG_PRI (muxu_dev, DEB_XFER))
	22	+ if (DEBUG_PRI (muxu_dev, DEB_XFER)) {
	23	if (diag)
	24	fputs (">>MUXl xfer: Break detected\n", sim_deb);
	25	else
	26	fputs (">>MUXl xfer: Deferred break processed\n", sim_deb);
	27	+ }
	28	}
	29
	30	else {

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__stddev.c (+25 lines)
	1	--- HP2100/hp2100_stddev.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_stddev.c
	3	@@ -942,7 +942,7 @@ t_stat r;
	4	if (tty_mode & TM_PRI) { /* printing? */
	5	c = sim_tt_outcvt (c, TT_GET_MODE (tty_unit[TTO].flags));
	6	if (c >= 0) { /* valid? */
	7	- if (r = sim_putchar_s (c)) return r; /* output char */
	8	+ if ((r = sim_putchar_s (c))) return r; /* output char */
	9	tty_unit[TTO].pos = tty_unit[TTO].pos + 1;
	10	}
	11	}
	12	@@ -1112,11 +1112,12 @@ while (working_set) {
	13	if (!sim_is_active (&clk_unit)) { /* clock running? */
	14	clk_tick = clk_delay (0); /* get tick count */
	15
	16	- if ((clk_unit.flags & UNIT_DIAG) == 0) /* calibrated? */
	17	+ if ((clk_unit.flags & UNIT_DIAG) == 0) { /* calibrated? */
	18	if (clk_select == 2) /* 10 msec. interval? */
	19	clk_tick = sync_poll (INITIAL); /* sync poll */
	20	else
	21	sim_rtcn_init (clk_tick, TMR_CLK); /* initialize timer */
	22	+ }
	23
	24	sim_activate (&clk_unit, clk_tick); /* start clock */
	25	clk_ctr = clk_delay (1); /* set repeat ctr */

Line 0 Link Here

(-)./files/patch-HP2100_hp2100__sys.c (+16 lines)
	1	--- HP2100/hp2100_sys.c.orig 2016-12-01 22:43:42 UTC
	2	+++ HP2100/hp2100_sys.c
	3	@@ -608,11 +608,11 @@ if (opcode[i]) {
	4
	5	case I_V_MRF: /* mem ref */
	6	cptr = get_glyph (cptr, gbuf, 0); /* get next field */
	7	- if (k = (strcmp (gbuf, "C") == 0)) { /* C specified? */
	8	+ if ((k = (strcmp (gbuf, "C") == 0))) { /* C specified? */
	9	val[0] = val[0] \| I_CP;
	10	cptr = get_glyph (cptr, gbuf, 0);
	11	}
	12	- else if (k = (strcmp (gbuf, "Z") == 0)) { /* Z specified? */
	13	+ else if ((k = (strcmp (gbuf, "Z") == 0))) { /* Z specified? */
	14	cptr = get_glyph (cptr, gbuf, ',');
	15	}
	16	if ((d = get_addr (gbuf)) < 0) return SCPE_ARG;

Line 0 Link Here

(-)./files/patch-HP2100_hp__disclib.c (+69 lines)
		1	--- HP2100/hp_disclib.c.orig 2016-12-01 22:43:42 UTC
		2	+++ HP2100/hp_disclib.c
		3	@@ -761,8 +761,8 @@ else {
		4	uptr = units + unit_limit; /* and we use the indicated unit */
		5	}
		6
		7	-if (props->unit_check && !uptr /* if the unit number is checked and is invalid */
		8	- \|\| props->seek_wait && (drive_status (uptr) & DL_S2STOPS)) { /* or if we're waiting for an offline drive */
		9	+if ((props->unit_check && !uptr) /* if the unit number is checked and is invalid */
		10	+ \|\| (props->seek_wait && (drive_status (uptr) & DL_S2STOPS))) {/* or if we're waiting for an offline drive */
		11	dl_end_command (cvptr, status_2_error); /* then the command ends with a Status-2 error */
		12	uptr = NULL; /* prevent the command from starting */
		13	}
		14	@@ -1563,7 +1563,7 @@ t_stat dl_load_unload (CVPTR cvptr, UNIT
		15	if ((uptr->flags & UNIT_ATT) == 0) /* the unit must be attached to [un]load */
		16	return SCPE_UNATT; /* return "Unit not attached" if not */
		17
		18	-else if (!(sim_switches & SIM_SW_REST)) /* modify the flags only if not restoring */
		19	+else if (!(sim_switches & SIM_SW_REST)) { /* modify the flags only if not restoring */
		20	if (load) { /* are we loading the heads? */
		21	uptr->flags = uptr->flags & ~UNIT_UNLOAD; /* clear the unload flag */
		22	uptr->STAT = DL_S2FS; /* and set First Status */
		23	@@ -1576,7 +1576,7 @@ else if (!(sim_switches & SIM_SW_REST))
		24	uptr->flags = uptr->flags \| UNIT_UNLOAD; /* set the unload flag */
		25	uptr->STAT = DL_S2ATN; /* and Attention status */
		26	}
		27	-
		28	+ }
		29	return SCPE_OK;
		30	}
		31
		32	@@ -1897,7 +1897,7 @@ static void start_write (CVPTR cvptr, UN
		33	const t_bool verify = (CNTLR_OPCODE) uptr->OP == write; /* only Write verifies the sector address */
		34
		35	if ((uptr->flags & UNIT_WPROT) /* is the unit write protected, */
		36	- \|\| !verify && !(uptr->flags & UNIT_FMT)) /* or is formatting required but not enabled? */
		37	+ \|\| (!verify && !(uptr->flags & UNIT_FMT))) /* or is formatting required but not enabled? */
		38	dl_end_command (cvptr, status_2_error); /* terminate the write with an error */
		39
		40	else if (position_sector (cvptr, uptr, verify)) { /* writing is permitted; position the sector */
		41	@@ -2041,11 +2041,12 @@ if (cvptr->eoc == SET)
		42	(CNTLR_OPCODE) uptr->OP, /* with the current operation */
		43	(CNTLR_PHASE) uptr->PHASE); /* and phase unchanged */
		44
		45	- if (uptr->STAT & DL_S2SC) /* did a seek check occur? */
		46	+ if (uptr->STAT & DL_S2SC) { /* did a seek check occur? */
		47	if (cvptr->type == ICD) /* is this ICD controller? */
		48	dl_end_command (cvptr, end_of_cylinder); /* report it as an End of Cylinder error */
		49	else /* it is a MAC controller */
		50	dl_end_command (cvptr, status_2_error); /* report it as a Status-2 error */
		51	+ }
		52	}
		53
		54	else /* the file mask does not permit an auto-seek */
		55	@@ -2291,12 +2292,13 @@ return;
		56
		57	static void set_timer (CVPTR cvptr, FLIP_FLOP action)
		58	{
		59	-if (cvptr->type == MAC) /* is this a MAC controller? */
		60	+if (cvptr->type == MAC) { /* is this a MAC controller? */
		61	if (action == SET) /* should we start the timer? */
		62	sim_activate_abs (cvptr->aux + timer, /* activate the auxiliary unit */
		63	cvptr->wait_time);
		64	else /* we stop the timer */
65	sim_cancel (cvptr->aux + timer); /* by canceling the unit */
66	+}
67	return;
68	}
69

Line 0 Link Here

(-)./files/patch-I1401_i1401__cpu.c (+104 lines)
		1	--- I1401/i1401_cpu.c.orig 2016-12-01 22:43:42 UTC
		2	+++ I1401/i1401_cpu.c
		3	@@ -547,7 +547,7 @@ while (reason == 0) {
		4
		5	saved_IS = IS; /* commit prev instr */
		6	if (sim_interval <= 0) { /* check clock queue */
		7	- if (reason = sim_process_event ())
		8	+ if ((reason = sim_process_event ()))
		9	break;
		10	}
		11
		12	@@ -1039,7 +1039,7 @@ CHECK_LENGTH:
		13	*/
		14
		15	case OP_R: /* read */
		16	- if (reason = iomod (ilnt, D, r_mod)) /* valid modifier? */
		17	+ if ((reason = iomod (ilnt, D, r_mod))) /* valid modifier? */
		18	break;
		19	reason = read_card (ilnt, D); /* read card */
		20	BS = CDR_BUF + CDR_WIDTH;
		21	@@ -1049,7 +1049,7 @@ CHECK_LENGTH:
		22	break;
		23
		24	case OP_W: /* write */
		25	- if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */
		26	+ if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */
		27	break;
		28	reason = write_line (ilnt, D); /* print line */
		29	BS = LPT_BUF + LPT_WIDTH;
		30	@@ -1059,7 +1059,7 @@ CHECK_LENGTH:
		31	break;
		32
		33	case OP_P: /* punch */
		34	- if (reason = iomod (ilnt, D, p_mod)) /* valid modifier? */
		35	+ if ((reason = iomod (ilnt, D, p_mod))) /* valid modifier? */
		36	break;
		37	reason = punch_card (ilnt, D); /* punch card */
		38	BS = CDP_BUF + CDP_WIDTH;
		39	@@ -1069,7 +1069,7 @@ CHECK_LENGTH:
		40	break;
		41
		42	case OP_WR: /* write and read */
		43	- if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */
		44	+ if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */
		45	break;
		46	reason = write_line (ilnt, D); /* print line */
		47	r1 = read_card (ilnt, D); /* read card */
		48	@@ -1082,7 +1082,7 @@ CHECK_LENGTH:
		49	break;
		50
		51	case OP_WP: /* write and punch */
		52	- if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */
		53	+ if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */
		54	break;
		55	reason = write_line (ilnt, D); /* print line */
		56	r1 = punch_card (ilnt, D); /* punch card */
		57	@@ -1095,7 +1095,7 @@ CHECK_LENGTH:
		58	break;
		59
		60	case OP_RP: /* read and punch */
		61	- if (reason = iomod (ilnt, D, NULL)) /* valid modifier? */
		62	+ if ((reason = iomod (ilnt, D, NULL))) /* valid modifier? */
		63	break;
		64	reason = read_card (ilnt, D); /* read card */
65	r1 = punch_card (ilnt, D); /* punch card */
66	@@ -1108,7 +1108,7 @@ CHECK_LENGTH:
67	break;
68
69	case OP_WRP: /* write, read, punch */
70	- if (reason = iomod (ilnt, D, w_mod)) /* valid modifier? */
71	+ if ((reason = iomod (ilnt, D, w_mod))) /* valid modifier? */
72	break;
73	reason = write_line (ilnt, D); /* print line */
74	r1 = read_card (ilnt, D); /* read card */
75	@@ -1122,9 +1122,9 @@ CHECK_LENGTH:
76	break;
77
78	case OP_SS: /* select stacker */
79	- if (reason = iomod (ilnt, D, ss_mod)) /* valid modifier? */
80	+ if ((reason = iomod (ilnt, D, ss_mod))) /* valid modifier? */
81	break;
82	- if (reason = select_stack (D)) /* sel stack, error? */
83	+ if ((reason = select_stack (D))) /* sel stack, error? */
84	break;
85	if ((ilnt == 4) \|\| (ilnt == 5)) { /* check for branch */
86	BRANCH;
87	@@ -1132,7 +1132,7 @@ CHECK_LENGTH:
88	break;
89
90	case OP_CC: /* carriage control */
91	- if (reason = carriage_control (D)) /* car ctrl, error? */
92	+ if ((reason = carriage_control (D))) /* car ctrl, error? */
93	break;
94	if ((ilnt == 4) \|\| (ilnt == 5)) { /* check for branch */
95	BRANCH;
96	@@ -1154,7 +1154,7 @@ CHECK_LENGTH:
97	reason = STOP_INVL;
98	else if (ioind != BCD_PERCNT) /* valid dev addr? */
99	reason = STOP_INVA;
100	- else if (reason = iomod (ilnt, D, mtf_mod)) /* valid modifier? */
101	+ else if ((reason = iomod (ilnt, D, mtf_mod))) /* valid modifier? */
102	break;
103	if (dev == IO_MT) /* BCD? */
104	reason = mt_func (unit, 0, D);

Line 0 Link Here

(-)./files/patch-I1401_i1401__dp.c (+60 lines)
	1	--- I1401/i1401_dp.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I1401/i1401_dp.c
	3	@@ -269,7 +269,7 @@ switch (fnc) {
	4	for (;;) { /* loop */
	5	qzr = (--cnt == 0); /* set zero latch */
	6	dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* redo count */
	7	- if (r = dp_rdsec (uptr, psec, flg, qwc)) /* read sector */
	8	+ if ((r = dp_rdsec (uptr, psec, flg, qwc))) /* read sector */
	9	break;
	10	cnt = dp_get_cnt (dcf); /* get new count */
	11	if (cnt < 0) /* bad count? */
	12	@@ -278,7 +278,7 @@ switch (fnc) {
	13	break;
	14	sec++; psec++; /* next sector */
	15	dp_cvt_bin (dcf + DCF_SEC, DCF_SEC_LEN, sec, flg); /* rewr sec */
	16	- if (r = dp_nexsec (uptr, psec, dcf)) /* find next */
	17	+ if ((r = dp_nexsec (uptr, psec, dcf))) /* find next */
	18	break;
	19	}
	20	break; /* done, clean up */
	21	@@ -289,9 +289,9 @@ switch (fnc) {
	22	for (;;) { /* loop */
	23	qzr = (--cnt == 0); /* set zero latch */
	24	dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* redo count */
	25	- if (r = dp_rdadr (uptr, psec, flg, qwc)) /* read addr */
	26	+ if ((r = dp_rdadr (uptr, psec, flg, qwc))) /* read addr */
	27	break; /* error? */
	28	- if (r = dp_rdsec (uptr, psec, flg, qwc)) /* read data */
	29	+ if ((r = dp_rdsec (uptr, psec, flg, qwc))) /* read data */
	30	break; /* error? */
	31	cnt = dp_get_cnt (dcf); /* get new count */
	32	if (cnt < 0) /* bad count? */
	33	@@ -312,13 +312,13 @@ switch (fnc) {
	34	for (;;) { /* loop */
	35	qzr = (--cnt == 0); /* set zero latch */
	36	dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* rewr cnt */
	37	- if (r = dp_wrsec (uptr, psec, flg)) /* write data */
	38	+ if ((r = dp_wrsec (uptr, psec, flg))) /* write data */
	39	break;
	40	if (qzr) /* zero latch? done */
	41	break;
	42	sec++; psec++; /* next sector */
	43	dp_cvt_bin (dcf + DCF_SEC, DCF_SEC_LEN, sec, flg); /* rewr sec */
	44	- if (r = dp_nexsec (uptr, psec, dcf)) /* find next */
	45	+ if ((r = dp_nexsec (uptr, psec, dcf))) /* find next */
	46	break;
	47	}
	48	break; /* done, clean up */
	49	@@ -331,9 +331,9 @@ switch (fnc) {
	50	for (;;) { /* loop */
	51	qzr = (--cnt == 0); /* set zero latch */
	52	dp_cvt_bin (dcf + DCF_CNT, DCF_CNT_LEN, cnt, MD_WM); /* redo count */
	53	- if (r = dp_wradr (uptr, psec, flg)) /* write addr */
	54	+ if ((r = dp_wradr (uptr, psec, flg))) /* write addr */
	55	break;
	56	- if (r = dp_wrsec (uptr, psec, flg)) /* write data */
	57	+ if ((r = dp_wrsec (uptr, psec, flg))) /* write data */
	58	break;
	59	if (qzr) /* zero latch? done */
	60	break;

Line 0 Link Here

(-)./files/patch-I1620_i1620__dp.c (+50 lines)
	1	--- I1620/i1620_dp.c.orig 2016-12-01 22:43:42 UTC
	2	+++ I1620/i1620_dp.c
	3	@@ -206,7 +206,7 @@ switch (f1 & ~(FNC_WCH \| FNC_NRL)) {
	4	if (psec < 0) /* error? */
	5	CRETIOE (dp_stop, STOP_DACERR);
	6	do { /* loop on count */
	7	- if (r = dp_rdsec (uptr, psec, qnr, qwc)) /* read sector */
	8	+ if ((r = dp_rdsec (uptr, psec, qnr, qwc))) /* read sector */
	9	break;
	10	sec++; psec++; /* next sector */
	11	} while ((--cnt > 0) &&
	12	@@ -216,9 +216,9 @@ switch (f1 & ~(FNC_WCH \| FNC_NRL)) {
	13	case FNC_TRK: /* read track */
	14	psec = dp_trkop (drv, sec); /* start of track */
	15	for (cnt = 0; cnt < DP_NUMSC; cnt++) { /* full track */
	16	- if (r = dp_rdadr (uptr, psec, qnr, qwc)) /* read addr */
	17	+ if ((r = dp_rdadr (uptr, psec, qnr, qwc))) /* read addr */
	18	break; /* error? */
	19	- if (r = dp_rdsec (uptr, psec, qnr, qwc)) /* read data */
	20	+ if ((r = dp_rdsec (uptr, psec, qnr, qwc))) /* read data */
	21	break; /* error? */
	22	psec = dp_trkop (drv, sec) + ((psec + 1) % DP_NUMSC);
	23	}
	24	@@ -231,9 +231,9 @@ switch (f1 & ~(FNC_WCH \| FNC_NRL)) {
	25	if (psec < 0) /* error? */
	26	CRETIOE (dp_stop, STOP_DACERR);
	27	do { /* loop on count */
	28	- if (r = dp_tstgm (M[dp_ba], qnr)) /* start with gm? */
	29	+ if ((r = dp_tstgm (M[dp_ba], qnr))) /* start with gm? */
	30	break;
	31	- if (r = dp_wrsec (uptr, psec, qnr)) /* write data */
	32	+ if ((r = dp_wrsec (uptr, psec, qnr))) /* write data */
	33	break;
	34	sec++; psec++; /* next sector */
	35	} while ((--cnt > 0) &&
	36	@@ -245,11 +245,11 @@ switch (f1 & ~(FNC_WCH \| FNC_NRL)) {
	37	return STOP_WRADIS;
	38	psec = dp_trkop (drv, sec); /* start of track */
	39	for (cnt = 0; cnt < DP_NUMSC; cnt++) { /* full track */
	40	- if (r = dp_tstgm (M[dp_ba], qnr)) /* start with gm? */
	41	+ if ((r = dp_tstgm (M[dp_ba], qnr))) /* start with gm? */
	42	break;
	43	- if (r = dp_wradr (uptr, psec, qnr)) /* write addr */
	44	+ if ((r = dp_wradr (uptr, psec, qnr))) /* write addr */
	45	break;
	46	- if (r = dp_wrsec (uptr, psec, qnr)) /* write data */
	47	+ if ((r = dp_wrsec (uptr, psec, qnr))) /* write data */
	48	break;
	49	psec = dp_trkop (drv, sec) + ((psec + 1) % DP_NUMSC);
	50	}