From a93649baa71a6b7b3870fe86b53fcb818d6523b2 Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Wed, 3 Jul 2019 18:30:59 -0400 Subject: [PATCH] ICL1900: Cleanup compile errors. --- ICL1900/icl1900_cp.c | 4 ++-- ICL1900/icl1900_cpu.c | 6 +++--- ICL1900/icl1900_cr.c | 8 ++++---- ICL1900/icl1900_eds8.c | 15 ++++++++++----- ICL1900/icl1900_lp.c | 18 +++++++++--------- ICL1900/icl1900_sys.c | 4 ++-- ICL1900/icl1900_tp.c | 8 ++++---- ICL1900/icl1900_tr.c | 8 ++++---- 8 files changed, 38 insertions(+), 33 deletions(-) diff --git a/ICL1900/icl1900_cp.c b/ICL1900/icl1900_cp.c index cf00bbb..9f486ba 100644 --- a/ICL1900/icl1900_cp.c +++ b/ICL1900/icl1900_cp.c @@ -76,8 +76,8 @@ UNIT cdp_unit[] = { MTAB cdp_mod[] = { - { UNIT_TYPE, SET_TYPE(T1920_1), "1920/1", "1920/1", NULL, NULL, "ICL 1920/1 NSI card punch."}, - { UNIT_TYPE, SET_TYPE(T1920_2), "1920/2", "1920/2", NULL, NULL, "ICL 1920/2 SI card punch."}, + { UNIT_TYPE, SET_TYPE(T1920_1), "1920/1", "1920/1", NULL, NULL, NULL, "ICL 1920/1 NSI card punch."}, + { UNIT_TYPE, SET_TYPE(T1920_2), "1920/2", "1920/2", NULL, NULL, NULL, "ICL 1920/2 SI card punch."}, {MTAB_XTD | MTAB_VUN, 0, "FORMAT", "FORMAT", &sim_card_set_fmt, &sim_card_show_fmt, NULL}, {MTAB_XTD | MTAB_VUN | MTAB_VALR, 0, "DEV", "DEV", &set_chan, &get_chan, NULL, "Device Number"}, diff --git a/ICL1900/icl1900_cpu.c b/ICL1900/icl1900_cpu.c index fa94e94..eb0293a 100644 --- a/ICL1900/icl1900_cpu.c +++ b/ICL1900/icl1900_cpu.c @@ -2645,7 +2645,7 @@ cpu_show_hist(FILE * st, UNIT * uptr, int32 val, CONST void *desc) int32 k, di, lnt; const char *cptr = (const char *) desc; t_stat r; - t_value v; + t_value v[1]; struct InstHistory *h; if (hst_lnt == 0) @@ -2668,8 +2668,8 @@ cpu_show_hist(FILE * st, UNIT * uptr, int32 val, CONST void *desc) fprintf(st, " %07o %08o %08o %08o %08o %08o %o %o %o %02o ", h->rc & M22 , h->ea, h->xr, h->ra, h->rb, h->rr, h->c, h->v, h->e, h->mode); - v = h->op; - (void)fprint_sym(st, h->rc & M22, &v, &cpu_unit[0], SWMASK('M')); + v[0] = h->op; + (void)fprint_sym(st, h->rc & M22, v, &cpu_unit[0], SWMASK('M')); fputc('\n', st); /* end line */ } /* end else instruction */ } /* end for */ diff --git a/ICL1900/icl1900_cr.c b/ICL1900/icl1900_cr.c index a41a6a3..012f581 100644 --- a/ICL1900/icl1900_cr.c +++ b/ICL1900/icl1900_cr.c @@ -84,10 +84,10 @@ UNIT cdr_unit[] = { MTAB cdr_mod[] = { - { UNIT_TYPE, SET_TYPE(T1911_1), "1911/1", "1911/1", NULL, NULL, "ICL 1911/1 NSI 900CPM reader."}, - { UNIT_TYPE, SET_TYPE(T1911_2), "1911/2", "1911/2", NULL, NULL, "ICL 1911/2 SI 900CPM reader."}, - { UNIT_TYPE, SET_TYPE(T1912_1), "1912/1", "1912/1", NULL, NULL, "ICL 1912/1 NSI 300CPM reader."}, - { UNIT_TYPE, SET_TYPE(T1912_2), "1912/2", "1912/2", NULL, NULL, "ICL 1912/2 SI 900CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1911_1), "1911/1", "1911/1", NULL, NULL, NULL, "ICL 1911/1 NSI 900CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1911_2), "1911/2", "1911/2", NULL, NULL, NULL, "ICL 1911/2 SI 900CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1912_1), "1912/1", "1912/1", NULL, NULL, NULL, "ICL 1912/1 NSI 300CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1912_2), "1912/2", "1912/2", NULL, NULL, NULL, "ICL 1912/2 SI 900CPM reader."}, {MTAB_XTD | MTAB_VUN, 0, "FORMAT", "FORMAT", &sim_card_set_fmt, &sim_card_show_fmt, NULL}, {MTAB_XTD | MTAB_VUN | MTAB_VALR, 0, "DEV", "DEV", &set_chan, &get_chan, NULL, "Device Number"}, diff --git a/ICL1900/icl1900_eds8.c b/ICL1900/icl1900_eds8.c index 9f2d0e8..015b1be 100644 --- a/ICL1900/icl1900_eds8.c +++ b/ICL1900/icl1900_eds8.c @@ -345,7 +345,8 @@ t_stat eds8_svc (UNIT *uptr) break; } } - if (eor = chan_output_word(dev, &word, 0)) { + eor = chan_output_word(dev, &word, 0); + if (eor) { /* Terminate */ uptr->CMD &= ~(EDS8_RUN|EDS8_SK|EDS8_BUSY); uptr->CMD |= EDS8_TERM; @@ -415,7 +416,8 @@ t_stat eds8_svc (UNIT *uptr) ((uptr->CYL & 017) << 12) | (((uptr->HDSEC >> 4) & 017) << 6) | ((uptr->HDSEC << 1) & 016); - if (eor = chan_input_word(dev, &word, 0)) { + eor = chan_input_word(dev, &word, 0); + if (eor) { /* Terminate */ uptr->CMD &= ~(EDS8_RUN|EDS8_SK|EDS8_BUSY); uptr->CMD |= EDS8_TERM; @@ -427,7 +429,8 @@ t_stat eds8_svc (UNIT *uptr) for (i = 0; i < WD_SEC; i++) { sim_debug(DEBUG_DATA, &eds8_dev, "Data: %d <%08o\n", i, eds8_buffer[i]); - if (eor = chan_input_word(dev, &eds8_buffer[i], 0)) { + eor = chan_input_word(dev, &eds8_buffer[i], 0); + if (eor) { /* Terminate */ uptr->CMD &= ~(EDS8_RUN|EDS8_SK|EDS8_BUSY); uptr->CMD |= EDS8_TERM; @@ -449,7 +452,8 @@ t_stat eds8_svc (UNIT *uptr) odd ^= (word >> 18) ^ (word >> 12) ^ (word >> 6) ^ word; } word = ((even & 017) << 12) | (((odd ^ 017) & 017) << 8) | 0100; - if (eor = chan_input_word(dev, &word, 0)) { + eor = chan_input_word(dev, &word, 0); + if (eor) { /* Terminate */ uptr->CMD &= ~(EDS8_RUN|EDS8_SK|EDS8_BUSY); uptr->CMD |= EDS8_TERM; @@ -546,7 +550,8 @@ t_stat eds8_svc (UNIT *uptr) eds8_buffer[wc] = 0; for (i = 0; i < WD_SEC; i++) { - if (eor = chan_output_word(dev, &eds8_buffer[i], 0)) + eor = chan_output_word(dev, &eds8_buffer[i], 0); + if (eor) break; sim_debug(DEBUG_DATA, &eds8_dev, "Data: %d >%08o\n", i, eds8_buffer[i]); } diff --git a/ICL1900/icl1900_lp.c b/ICL1900/icl1900_lp.c index 217a832..464d829 100644 --- a/ICL1900/icl1900_lp.c +++ b/ICL1900/icl1900_lp.c @@ -90,15 +90,15 @@ UNIT lpr_unit[] = { MTAB lpr_mod[] = { - { UNIT_TYPE, SET_TYPE(T1930_1), "1930/1", "1930/1", NULL, NULL, "ICL 1930/1 NSI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1930_2), "1930/2", "1930/2", NULL, NULL, "ICL 1930/2 NSI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1931_1), "1931/1", "1931/1", NULL, NULL, "ICL 1931/1 SI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1931_2), "1931/2", "1931/2", NULL, NULL, "ICL 1931/2 SI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1932_1), "1932/1", "1932/1", NULL, NULL, "ICL 1932/1 SI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1932_2), "1932/2", "1932/2", NULL, NULL, "ICL 1932/2 SI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1933_1), "1933/1", "1933/1", NULL, NULL, "ICL 1933/1 SI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1933_2), "1933/2", "1933/2", NULL, NULL, "ICL 1933/2 SI 1000LPM printer."}, - { UNIT_TYPE, SET_TYPE(T1933_3), "1933/3", "1933/3", NULL, NULL, "ICL 1933/3 SI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1930_1), "1930/1", "1930/1", NULL, NULL, NULL, "ICL 1930/1 NSI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1930_2), "1930/2", "1930/2", NULL, NULL, NULL, "ICL 1930/2 NSI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1931_1), "1931/1", "1931/1", NULL, NULL, NULL, "ICL 1931/1 SI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1931_2), "1931/2", "1931/2", NULL, NULL, NULL, "ICL 1931/2 SI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1932_1), "1932/1", "1932/1", NULL, NULL, NULL, "ICL 1932/1 SI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1932_2), "1932/2", "1932/2", NULL, NULL, NULL, "ICL 1932/2 SI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1933_1), "1933/1", "1933/1", NULL, NULL, NULL, "ICL 1933/1 SI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1933_2), "1933/2", "1933/2", NULL, NULL, NULL, "ICL 1933/2 SI 1000LPM printer."}, + { UNIT_TYPE, SET_TYPE(T1933_3), "1933/3", "1933/3", NULL, NULL, NULL, "ICL 1933/3 SI 1000LPM printer."}, {MTAB_XTD | MTAB_VUN | MTAB_VALR, 0, "DEV", "DEV", &set_chan, &get_chan, NULL, "Device Number"}, { 0 } }; diff --git a/ICL1900/icl1900_sys.c b/ICL1900/icl1900_sys.c index 5979474..f8817f9 100755 --- a/ICL1900/icl1900_sys.c +++ b/ICL1900/icl1900_sys.c @@ -527,7 +527,7 @@ t_opcode ops[] = { "177", TYPE_A, }; -char *type_d[] = { "BRN", "BVS", "BVSR", "BVC", "BVCR", "BCS", "BCC", "BVCI" }; +const char *type_d[] = { "BRN", "BVS", "BVSR", "BVC", "BVCR", "BCS", "BCC", "BVCI" }; char type_c[] = { 'C', 'L', 'A', 'V' }; @@ -589,7 +589,7 @@ print_opcode(FILE * of, t_value val) t_stat fprint_sym(FILE * of, t_addr addr, t_value * val, UNIT * uptr, int32 sw) { - t_value inst = *val; + t_value inst = val[0]; int i; fputc(' ', of); diff --git a/ICL1900/icl1900_tp.c b/ICL1900/icl1900_tp.c index bda0db4..1d53ba9 100644 --- a/ICL1900/icl1900_tp.c +++ b/ICL1900/icl1900_tp.c @@ -127,10 +127,10 @@ MTAB ptp_mod[] = { { PP_M_MODE, PP_MODE_7B << PP_V_MODE, "7b", "7B", NULL }, { PP_M_MODE, PP_MODE_7P << PP_V_MODE, "7p", "7P", NULL }, { PP_M_MODE, PP_MODE_7X << PP_V_MODE, "7x", "7X", NULL }, - { UNIT_TYPE, SET_TYPE(T1925_1), "1925/1", "1925/1", NULL, NULL, "ICL 1925/1 NSI 300CPM punch."}, - { UNIT_TYPE, SET_TYPE(T1925_2), "1925/2", "1925/2", NULL, NULL, "ICL 1922/2 SI 300CPM punch."}, - { UNIT_TYPE, SET_TYPE(T1926_1), "1926/1", "1926/1", NULL, NULL, "ICL 1926/1 NSI 1000CPM punch."}, - { UNIT_TYPE, SET_TYPE(T1926_2), "1926/2", "1926/2", NULL, NULL, "ICL 1926/2 SI 1000CPM punch."}, + { UNIT_TYPE, SET_TYPE(T1925_1), "1925/1", "1925/1", NULL, NULL, NULL, "ICL 1925/1 NSI 300CPM punch."}, + { UNIT_TYPE, SET_TYPE(T1925_2), "1925/2", "1925/2", NULL, NULL, NULL, "ICL 1922/2 SI 300CPM punch."}, + { UNIT_TYPE, SET_TYPE(T1926_1), "1926/1", "1926/1", NULL, NULL, NULL, "ICL 1926/1 NSI 1000CPM punch."}, + { UNIT_TYPE, SET_TYPE(T1926_2), "1926/2", "1926/2", NULL, NULL, NULL, "ICL 1926/2 SI 1000CPM punch."}, {MTAB_XTD | MTAB_VUN | MTAB_VALR, 0, "DEV", "DEV", &set_chan, &get_chan, NULL, "Device Number"}, { 0 } }; diff --git a/ICL1900/icl1900_tr.c b/ICL1900/icl1900_tr.c index a587924..15dec6f 100644 --- a/ICL1900/icl1900_tr.c +++ b/ICL1900/icl1900_tr.c @@ -131,10 +131,10 @@ MTAB ptr_mod[] = { { PP_M_MODE, PP_MODE_7B << PP_V_MODE, "7b", "7B", NULL }, { PP_M_MODE, PP_MODE_7P << PP_V_MODE, "7p", "7P", NULL }, { PP_M_MODE, PP_MODE_7X << PP_V_MODE, "7x", "7X", NULL }, - { UNIT_TYPE, SET_TYPE(T1915_1), "1915/1", "1915/1", NULL, NULL, "ICL 1915/1 NSI 300CPM reader."}, - { UNIT_TYPE, SET_TYPE(T1915_2), "1915/2", "1915/2", NULL, NULL, "ICL 1912/2 SI 300CPM reader."}, - { UNIT_TYPE, SET_TYPE(T1916_1), "1916/1", "1916/1", NULL, NULL, "ICL 1916/1 NSI 1000CPM reader."}, - { UNIT_TYPE, SET_TYPE(T1916_2), "1916/2", "1916/2", NULL, NULL, "ICL 1916/2 SI 1000CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1915_1), "1915/1", "1915/1", NULL, NULL, NULL, "ICL 1915/1 NSI 300CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1915_2), "1915/2", "1915/2", NULL, NULL, NULL, "ICL 1912/2 SI 300CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1916_1), "1916/1", "1916/1", NULL, NULL, NULL, "ICL 1916/1 NSI 1000CPM reader."}, + { UNIT_TYPE, SET_TYPE(T1916_2), "1916/2", "1916/2", NULL, NULL, NULL, "ICL 1916/2 SI 1000CPM reader."}, {MTAB_XTD | MTAB_VUN | MTAB_VALR, 0, "DEV", "DEV", &set_chan, &get_chan, NULL, "Device Number"}, { 0 } };