From f6654c0549b472f3c4469f91cf4c4ab5b6a1f662 Mon Sep 17 00:00:00 2001 From: Bob Supnik Date: Sun, 3 Jun 2018 18:23:54 -0700 Subject: [PATCH] sigma: New simulator from beta --- doc/sigma_doc.doc | Bin 0 -> 80384 bytes sigma/sigma_cis.c | 16 ++++++++------ sigma/sigma_coc.c | 10 ++++----- sigma/sigma_cpu.c | 50 +++++++++++++++++++++--------------------- sigma/sigma_defs.h | 2 +- sigma/sigma_dp.c | 36 +++++++++++++++--------------- sigma/sigma_io.c | 24 ++++++++++---------- sigma/sigma_io_defs.h | 14 ++++++------ sigma/sigma_lp.c | 18 +++++++-------- sigma/sigma_mt.c | 14 ++++++------ sigma/sigma_pt.c | 16 ++++++++------ sigma/sigma_rad.c | 8 +++---- sigma/sigma_rtc.c | 8 +++---- sigma/sigma_sys.c | 14 ++++++------ sigma/sigma_tt.c | 16 ++++++++------ 15 files changed, 126 insertions(+), 120 deletions(-) create mode 100644 doc/sigma_doc.doc diff --git a/doc/sigma_doc.doc b/doc/sigma_doc.doc new file mode 100644 index 0000000000000000000000000000000000000000..40f24e779f3bfb0295021028bf40c2993bebd0d4 GIT binary patch literal 80384 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 Q{g|; */ else { /* same signs */ - t = CmpDstr (&src1, &src2); /* compare strings */ - if (t < 0) + scmp = CmpDstr (&src1, &src2); /* compare strings */ + if (scmp < 0) CC = (src1.sign? CC3: CC4); - else if (t > 0) + else if (scmp > 0) CC = (src1.sign? CC4: CC3); else CC = 0; } @@ -841,7 +843,7 @@ uint32 NibbleRshift (dstr_t *dsrc, uint32 sc, uint32 cin) int32 i; uint32 s, nc; -if (s = sc * 4) { +if ((s = sc * 4)) { for (i = DSTRLNT - 1; (int32) i >= 0; i--) { nc = (dsrc->val[i] << (32 - s)) & WMASK; dsrc->val[i] = ((dsrc->val[i] >> s) | @@ -865,7 +867,7 @@ uint32 NibbleLshift (dstr_t *dsrc, uint32 sc, uint32 cin) { uint32 i, s, nc; -if (s = sc * 4) { +if ((s = sc * 4)) { for (i = 0; i < DSTRLNT; i++) { nc = dsrc->val[i] >> (32 - s); dsrc->val[i] = ((dsrc->val[i] << s) | diff --git a/sigma/sigma_coc.c b/sigma/sigma_coc.c index 5fdaad53..97f4bf4b 100644 --- a/sigma/sigma_coc.c +++ b/sigma/sigma_coc.c @@ -97,9 +97,9 @@ t_stat muxc_svc (UNIT *uptr); t_stat muxo_svc (UNIT *uptr); t_stat muxi_rtc_svc (UNIT *uptr); t_stat mux_reset (DEVICE *dptr); -t_stat mux_attach (UNIT *uptr, char *cptr); +t_stat mux_attach (UNIT *uptr, CONST char *cptr); t_stat mux_detach (UNIT *uptr); -t_stat mux_vlines (UNIT *uptr, int32 val, char *cptr, void *desc); +t_stat mux_vlines (UNIT *uptr, int32 val, CONST char *cptr, void *desc); void mux_reset_ln (int32 ln); void mux_scan_next (t_bool clr); t_stat muxi_put_char (uint32 c, uint32 ln); @@ -417,7 +417,7 @@ if ((newln >= 0) && (mux_sta[newln] & MUXL_REP)) { /* rcv enb pending? */ tmxr_poll_rx (&mux_desc); /* poll for input */ for (ln = 0; ln < MUX_NUMLIN; ln++) { /* loop thru lines */ if (mux_ldsc[ln].conn) { /* connected? */ - if (c = tmxr_getc_ln (&mux_ldsc[ln])) { /* get char */ + if ((c = tmxr_getc_ln (&mux_ldsc[ln]))) { /* get char */ if (c & SCPE_BREAK) /* break? */ mux_sta[ln] |= MUXL_RBP; /* set rcv brk */ else { /* normal char */ @@ -544,7 +544,7 @@ return SCPE_OK; /* Attach master unit */ -t_stat mux_attach (UNIT *uptr, char *cptr) +t_stat mux_attach (UNIT *uptr, CONST char *cptr) { t_stat r; @@ -572,7 +572,7 @@ return r; /* Change number of lines */ -t_stat mux_vlines (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat mux_vlines (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { int32 newln, i, t; t_stat r; diff --git a/sigma/sigma_cpu.c b/sigma/sigma_cpu.c index 2b14802b..87903d96 100644 --- a/sigma/sigma_cpu.c +++ b/sigma/sigma_cpu.c @@ -190,17 +190,17 @@ t_stat cpu_svc (UNIT *uptr); t_stat cpu_ex (t_value *vptr, t_addr addr, UNIT *uptr, int32 sw); t_stat cpu_dep (t_value val, t_addr addr, UNIT *uptr, int32 sw); t_stat cpu_reset (DEVICE *dptr); -t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat cpu_set_type (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat cpu_set_opt (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat cpu_clr_opt (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat cpu_set_rblks (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat cpu_show_rblks (FILE *st, UNIT *uptr, int32 val, void *desc); -t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc); -t_stat cpu_set_alarm (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat cpu_show_alarm (FILE *st, UNIT *uptr, int32 val, void *desc); -t_stat cpu_show_addr (FILE *st, UNIT *uptr, int32 val, void *desc); +t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat cpu_set_type (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat cpu_set_opt (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat cpu_clr_opt (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat cpu_set_rblks (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat cpu_show_rblks (FILE *st, UNIT *uptr, int32 val, CONST void *desc); +t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc); +t_stat cpu_set_alarm (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat cpu_show_alarm (FILE *st, UNIT *uptr, int32 val, CONST void *desc); +t_stat cpu_show_addr (FILE *st, UNIT *uptr, int32 val, CONST void *desc); void set_rf_display (uint32 *rfbase); void inst_hist (uint32 ir, uint32 pc, uint32 typ); uint32 cpu_one_inst (uint32 real_pc, uint32 IR); @@ -252,8 +252,8 @@ extern uint32 int_reset (DEVICE *dev); extern void io_set_eimax (uint32 lnt); extern void io_sclr_req (uint32 inum, uint32 val); extern void io_sclr_arm (uint32 inum, uint32 val); -extern t_stat io_set_nchan (UNIT *uptr, int32 val, char *cptr, void *desc); -extern t_stat io_show_nchan (FILE *st, UNIT *uptr, int32 val, void *desc); +extern t_stat io_set_nchan (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +extern t_stat io_show_nchan (FILE *st, UNIT *uptr, int32 val, CONST void *desc); /* CPU data structures @@ -436,7 +436,7 @@ while (reason == 0) { /* loop until stop */ } if (sim_interval <= 0) { /* event queue? */ - if (reason = sim_process_event ()) /* process */ + if ((reason = sim_process_event ())) /* process */ break; int_hireq = io_eval_int (); /* re-evaluate intr */ } @@ -2575,7 +2575,7 @@ return SCPE_OK; /* Set CPU type */ -t_stat cpu_set_type (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat cpu_set_type (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { uint32 model = CPUF_GETMOD (val); @@ -2593,7 +2593,7 @@ return SCPE_OK; /* Set memory size */ -t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { uint32 mc = 0; uint32 i; @@ -2614,7 +2614,7 @@ return SCPE_OK; /* Set and clear options */ -t_stat cpu_set_opt (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat cpu_set_opt (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { if ((val & (cpu_tab[cpu_model].std | cpu_tab[cpu_model].opt)) == 0) return SCPE_NOFNC; @@ -2622,7 +2622,7 @@ cpu_unit.flags |= val; return SCPE_OK; } -t_stat cpu_clr_opt (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat cpu_clr_opt (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { if (val & cpu_tab[cpu_model].std) return SCPE_NOFNC; @@ -2632,7 +2632,7 @@ return SCPE_OK; /* Set/show register blocks */ -t_stat cpu_set_rblks (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat cpu_set_rblks (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { int32 invmask, lnt, i, j; t_stat r; @@ -2656,7 +2656,7 @@ for (i = rf_bmax; i < RF_NBLK; i++) { /* zero unused */ return SCPE_OK; } -t_stat cpu_show_rblks (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat cpu_show_rblks (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { fprintf (st, "register blocks=%d", rf_bmax); return SCPE_OK; @@ -2678,13 +2678,13 @@ return; /* Front panael alarm */ -t_stat cpu_set_alarm (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat cpu_set_alarm (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { cons_alarm_enb = val; return SCPE_OK; } -t_stat cpu_show_alarm (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat cpu_show_alarm (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { fputs (cons_alarm_enb? "alarm enabled\n": "alarm disabled\n", st); return SCPE_OK; @@ -2701,7 +2701,7 @@ return SCPE_OK; /* Virtual address translation */ -t_stat cpu_show_addr (FILE *of, UNIT *uptr, int32 val, void *desc) +t_stat cpu_show_addr (FILE *of, UNIT *uptr, int32 val, CONST void *desc) { t_stat r; char *cptr = (char *) desc; @@ -2757,7 +2757,7 @@ return; /* Set history */ -t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { int32 i, lnt; t_stat r; @@ -2820,7 +2820,7 @@ return; /* Show history */ -t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { int32 k, di, lnt; t_stat r; diff --git a/sigma/sigma_defs.h b/sigma/sigma_defs.h index 5cf5925f..e2f85d3b 100644 --- a/sigma/sigma_defs.h +++ b/sigma/sigma_defs.h @@ -319,7 +319,7 @@ typedef struct { #define MMC_M_CNT 0xFF #define MMC_CNT (MMC_M_CNT << MMC_V_CNT) #define MMC_V_CS 9 /* start of page */ -/* /* map 1: 2b locks, per model */ + /* map 1: 2b locks, per model */ #define MMC_M_CS2 0xFC /* map 2: access controls */ #define MMC_M_CS3 0x7FE /* map 3: 4b locks */ #define MMC_M_CS4 0xFF /* map 4: 8b relocation */ diff --git a/sigma/sigma_dp.c b/sigma/sigma_dp.c index 1f56d321..324dbaf0 100644 --- a/sigma/sigma_dp.c +++ b/sigma/sigma_dp.c @@ -158,14 +158,14 @@ type #sectors/ #surfaces/ #cylinders/ surface cylinder drive - 7242 6 20 203 =24MB - 7261 11 20 203 =45MB - 7271 6 20 406 =48MB + 7242 6 20 203 =24MB + 7261 11 20 203 =45MB + 7271 6 20 406 =48MB 3288 17 5 822 =67MB 7276 11 19 411 =86MB 7266 11 20 411 =90MB - 3282 11 19 815 =170MB - 3283 17 19 815 =263MB + 3282 11 19 815 =170MB + 3283 17 19 815 =263MB On the T3281, each drive can be a different type. The size field in each unit selects the drive capacity for each drive and thus @@ -290,11 +290,11 @@ t_bool dp_end_sec (UNIT *uptr, uint32 lnt, uint32 exp, uint32 st); int32 dp_clr_int (uint32 cidx); void dp_set_ski (uint32 cidx, uint32 un); void dp_clr_ski (uint32 cidx, uint32 un); -t_stat dp_attach (UNIT *uptr, char *cptr); -t_stat dp_set_size (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat dp_set_auto (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat dp_set_ctl (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat dp_show_ctl (FILE *st, UNIT *uptr, int32 val, void *desc); +t_stat dp_attach (UNIT *uptr, CONST char *cptr); +t_stat dp_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat dp_set_auto (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat dp_set_ctl (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat dp_show_ctl (FILE *st, UNIT *uptr, int32 val, CONST void *desc); static DP_TYPE dp_tab[] = { { DP_ENT (7242, 7240) }, @@ -776,7 +776,7 @@ switch (uptr->UCMD) { else wd = 0; dp_buf[i] = wd; /* store in buffer */ } - if (r = dp_write (uptr, da)) /* write buf, err? */ + if ((r = dp_write (uptr, da))) /* write buf, err? */ return r; if (dp_end_sec (uptr, DP_WDSC, DP_WDSC, st)) /* transfer done? */ return SCPE_OK; /* err or cont */ @@ -818,7 +818,7 @@ switch (uptr->UCMD) { chan_uen (dva); /* uend */ return SCPE_OK; } - if (r = dp_read (uptr, da)) /* read buf, error? */ + if ((r = dp_read (uptr, da))) /* read buf, error? */ return r; for (i = 0, st = 0; (i < (DP_WDSC * 4)) && (st != CHS_ZBC); i++) { st = chan_RdMemB (dva, &wd); /* read byte */ @@ -843,7 +843,7 @@ switch (uptr->UCMD) { chan_uen (dva); /* uend */ return SCPE_OK; } - if (r = dp_read (uptr, da)) /* read buf, error? */ + if ((r = dp_read (uptr, da))) /* read buf, error? */ return r; for (i = 0, st = 0; (i < DP_WDSC) && (st != CHS_ZBC); i++) { st = chan_WrMemW (dva, dp_buf[i]); /* store in mem */ @@ -1225,7 +1225,7 @@ return SCPE_OK; /* Device attach */ -t_stat dp_attach (UNIT *uptr, char *cptr) +t_stat dp_attach (UNIT *uptr, CONST char *cptr) { uint32 i, p; t_stat r; @@ -1252,7 +1252,7 @@ return SCPE_OK; /* Set drive type command validation routine */ -t_stat dp_set_size (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat dp_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { uint32 dtype = GET_DTYPE (val); uint32 cidx = uptr->UCTX; @@ -1269,7 +1269,7 @@ return SCPE_OK; /* Set unit autosize validation routine */ -t_stat dp_set_auto (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat dp_set_auto (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { uint32 cidx = uptr->UCTX; @@ -1284,7 +1284,7 @@ return SCPE_OK; /* Set controller type command validation routine */ -t_stat dp_set_ctl (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat dp_set_ctl (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { uint32 i, new_dtyp, cidx = uptr->UCTX; DP_CTX *ctx = &dp_ctx[cidx]; @@ -1320,7 +1320,7 @@ for (i = 0; i < DP_NUMDR_16B; i++) { return SCPE_OK; } -t_stat dp_show_ctl (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat dp_show_ctl (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { uint32 cidx = uptr->UCTX; diff --git a/sigma/sigma_io.c b/sigma/sigma_io.c index d7f96d52..4d85a299 100644 --- a/sigma/sigma_io.c +++ b/sigma/sigma_io.c @@ -101,8 +101,8 @@ t_bool io_init_inst (uint32 ad, uint32 rn, uint32 ch, uint32 dev, uint32 r0); uint32 io_set_status (uint32 rn, uint32 ch, uint32 dev, uint32 dvst, t_bool tdv); uint32 io_rwd_m0 (uint32 op, uint32 rn, uint32 ad); uint32 io_rwd_m1 (uint32 op, uint32 rn, uint32 ad); -t_stat io_set_eiblks (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat io_show_eiblks (FILE *st, UNIT *uptr, int32 val, void *desc); +t_stat io_set_eiblks (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat io_show_eiblks (FILE *st, UNIT *uptr, int32 val, CONST void *desc); t_stat int_reset (DEVICE *dptr); t_stat chan_reset (DEVICE *dptr); uint32 chan_new_cmd (uint32 ch, uint32 dev, uint32 clc); @@ -1043,7 +1043,7 @@ if (op == OP_RD) { /* read direct? */ } else if (QCPU_S89 && (fnc == 0x045)) { /* S89 only */ if (rn) - R[rn] = s9_marg & 0x00C00000 | /* <8,9> = margins */ + R[rn] = (s9_marg & 0x00C00000) | /* <8,9> = margins */ (QCPU_S9? 0x00100000: 0x00200000); /* S8 sets 10, S9 11 */ } else if (QCPU_S89 && (fnc == 0x049)) { /* S89 only */ @@ -1307,7 +1307,7 @@ return SCPE_OK; /* Set/show external interrupt blocks */ -t_stat io_set_eiblks (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat io_set_eiblks (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { int32 lnt; t_stat r; @@ -1322,7 +1322,7 @@ io_set_eimax (lnt); return SCPE_OK; } -t_stat io_show_eiblks (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat io_show_eiblks (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { fprintf (st, "eiblks=%d", ei_bmax); return SCPE_OK; @@ -1358,7 +1358,7 @@ return; /* Set or show number of channels */ -t_stat io_set_nchan (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat io_set_nchan (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { int32 i, num; t_stat r; @@ -1378,7 +1378,7 @@ for (i = 0; i < CHAN_N_CHAN; i++) { return SCPE_OK; } -t_stat io_show_nchan (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat io_show_nchan (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { fprintf (st, "channels=%d", chan_num); return SCPE_OK; @@ -1386,7 +1386,7 @@ return SCPE_OK; /* Set or show device channel assignment */ -t_stat io_set_dvc (UNIT* uptr, int32 val, char *cptr, void *desc) +t_stat io_set_dvc (UNIT* uptr, int32 val, CONST char *cptr, void *desc) { int32 num; DEVICE *dptr; @@ -1404,7 +1404,7 @@ dibp->dva = (dibp->dva & ~DVA_CHAN) | (num << DVA_V_CHAN); return SCPE_OK; } -t_stat io_show_dvc (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat io_show_dvc (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { DEVICE *dptr; dib_t *dibp; @@ -1418,7 +1418,7 @@ return SCPE_OK; /* Set or show device address */ -t_stat io_set_dva (UNIT* uptr, int32 val, char *cptr, void *desc) +t_stat io_set_dva (UNIT* uptr, int32 val, CONST char *cptr, void *desc) { int32 num; DEVICE *dptr; @@ -1439,7 +1439,7 @@ else dibp->dva = (dibp->dva & ~DVA_DEVSU) | ((num & DVA_M_DEVSU) << DVA_V_DEVSU) return SCPE_OK; } -t_stat io_show_dva (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat io_show_dva (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { DEVICE *dptr; dib_t *dibp; @@ -1453,7 +1453,7 @@ return SCPE_OK; /* Show channel state */ -t_stat io_show_cst (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat io_show_cst (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { DEVICE *dptr; dib_t *dibp; diff --git a/sigma/sigma_io_defs.h b/sigma/sigma_io_defs.h index f9bdf13e..6dedd093 100644 --- a/sigma/sigma_io_defs.h +++ b/sigma/sigma_io_defs.h @@ -260,17 +260,17 @@ uint32 chan_WrMemW (uint32 dva, uint32 dat); t_stat chan_reset_dev (uint32 dva); void io_sclr_req (uint32 inum, uint32 val); void io_sclr_arm (uint32 inum, uint32 val); -t_stat io_set_dvc (UNIT* uptr, int32 val, char *cptr, void *desc); -t_stat io_show_dvc (FILE *st, UNIT *uptr, int32 val, void *desc); -t_stat io_set_dva (UNIT* uptr, int32 val, char *cptr, void *desc); -t_stat io_show_dva (FILE *st, UNIT *uptr, int32 val, void *desc); -t_stat io_show_cst (FILE *st, UNIT *uptr, int32 val, void *desc); +t_stat io_set_dvc (UNIT* uptr, int32 val, CONST char *cptr, void *desc); +t_stat io_show_dvc (FILE *st, UNIT *uptr, int32 val, CONST void *desc); +t_stat io_set_dva (UNIT* uptr, int32 val, CONST char *cptr, void *desc); +t_stat io_show_dva (FILE *st, UNIT *uptr, int32 val, CONST void *desc); +t_stat io_show_cst (FILE *st, UNIT *uptr, int32 val, CONST void *desc); t_stat io_boot (int32 u, DEVICE *dptr); /* Internal real-time event scheduler */ -t_stat rtc_set_tps (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat rtc_show_tps (FILE *of, UNIT *uptr, int32 val, void *desc); +t_stat rtc_set_tps (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat rtc_show_tps (FILE *of, UNIT *uptr, int32 val, CONST void *desc); t_stat rtc_register (uint32 tm, uint32 idx, UNIT *uptr); #endif \ No newline at end of file diff --git a/sigma/sigma_lp.c b/sigma/sigma_lp.c index ceefb671..6d579adc 100644 --- a/sigma/sigma_lp.c +++ b/sigma/sigma_lp.c @@ -105,10 +105,10 @@ uint32 lp_tdv_status (void); t_stat lp_chan_err (uint32 st); t_stat lp_svc (UNIT *uptr); t_stat lp_reset (DEVICE *dptr); -t_stat lp_attach (UNIT *uptr, char *cptr); -t_stat lp_settype (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat lp_showtype (FILE *st, UNIT *uptr, int32 val, void *desc); -t_stat lp_load_cct (UNIT *uptr, int32 val, char *cptr, void *desc); +t_stat lp_attach (UNIT *uptr, CONST char *cptr); +t_stat lp_settype (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat lp_showtype (FILE *st, UNIT *uptr, int32 val, CONST void *desc); +t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc); t_stat lp_read_cct (FILE *cfile); uint32 lp_fmt (UNIT *uptr); uint32 lp_skip (UNIT *uptr, uint32 ch); @@ -462,7 +462,7 @@ return SCPE_OK; /* Attach routine */ -t_stat lp_attach (UNIT *uptr, char *cptr) +t_stat lp_attach (UNIT *uptr, CONST char *cptr) { lp_cctp = 0; /* clear cct ptr */ lp_pass = 0; @@ -471,7 +471,7 @@ return attach_unit (uptr, cptr); /* Set handler for carriage control tape */ -t_stat lp_load_cct (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { FILE *cfile; t_stat r; @@ -491,7 +491,7 @@ t_stat lp_read_cct (FILE *cfile) { uint32 col, rpt, ptr, mask; uint8 cctbuf[CCT_LNT]; -char *cptr; +CONST char *cptr; t_stat r; char cbuf[CBUFSIZE], gbuf[CBUFSIZE]; @@ -529,7 +529,7 @@ return SCPE_OK; /* Set controller type */ -t_stat lp_settype (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat lp_settype (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { lp_model = val; lp_reset (&lp_dev); @@ -538,7 +538,7 @@ return SCPE_OK; /* Show controller type */ -t_stat lp_showtype (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat lp_showtype (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { fprintf (st, lp_model? "7450": "7440"); return SCPE_OK; diff --git a/sigma/sigma_mt.c b/sigma/sigma_mt.c index 3395b07d..5dfa33c1 100644 --- a/sigma/sigma_mt.c +++ b/sigma/sigma_mt.c @@ -132,7 +132,7 @@ t_stat mt_chan_err (uint32 st); t_stat mtu_svc (UNIT *uptr); t_stat mtr_svc (UNIT *uptr); t_stat mt_reset (DEVICE *dptr); -t_stat mt_attach (UNIT *uptr, char *cptr); +t_stat mt_attach (UNIT *uptr, CONST char *cptr); t_stat mt_detach (UNIT *uptr); t_stat mt_flush_buf (UNIT *uptr); t_stat mt_map_err (UNIT *uptr, t_stat r); @@ -336,12 +336,12 @@ r = SCPE_OK; switch (cmd) { /* case on command */ case MCM_SFWR: /* space forward */ - if (r = sim_tape_sprecf (uptr, &tbc)) /* spc rec fwd, err? */ + if ((r = sim_tape_sprecf (uptr, &tbc))) /* spc rec fwd, err? */ r = mt_map_err (uptr, r); /* map error */ break; case MCM_SBKR: /* space reverse */ - if (r = sim_tape_sprecr (uptr, &tbc)) /* spc rec rev, err? */ + if ((r = sim_tape_sprecr (uptr, &tbc))) /* spc rec rev, err? */ r = mt_map_err (uptr, r); /* map error */ break; @@ -360,7 +360,7 @@ switch (cmd) { /* case on command */ break; case MCM_WTM: /* write eof */ - if (r = sim_tape_wrtmk (uptr)) /* write tmk, err? */ + if ((r = sim_tape_wrtmk (uptr))) /* write tmk, err? */ r = mt_map_err (uptr, r); /* map error */ uptr->UST |= MTDV_EOF; /* set eof */ break; @@ -371,7 +371,7 @@ switch (cmd) { /* case on command */ case MCM_REW: /* rewind */ case MCM_RWI: /* rewind and int */ - if (r = sim_tape_rewind (uptr)) /* rewind */ + if ((r = sim_tape_rewind (uptr))) /* rewind */ r = mt_map_err (uptr, r); /* map error */ mt_unit[un + MT_REW].UCMD = uptr->UCMD; /* copy command */ sim_activate (uptr + MT_REW, mt_rwtime); /* sched compl */ @@ -461,7 +461,7 @@ t_stat st; if (mt_blim == 0) /* any output? */ return SCPE_OK; -if (st = sim_tape_wrrecf (uptr, mt_xb, mt_blim)) /* write, err? */ +if ((st = sim_tape_wrrecf (uptr, mt_xb, mt_blim))) /* write, err? */ return mt_map_err (uptr, st); /* map error */ return SCPE_OK; } @@ -625,7 +625,7 @@ return SCPE_OK; /* Attach routine */ -t_stat mt_attach (UNIT *uptr, char *cptr) +t_stat mt_attach (UNIT *uptr, CONST char *cptr) { t_stat r; diff --git a/sigma/sigma_pt.c b/sigma/sigma_pt.c index f5507f6b..cbda3052 100644 --- a/sigma/sigma_pt.c +++ b/sigma/sigma_pt.c @@ -1,6 +1,6 @@ /* sigma_pt.c: Sigma 7060 paper tape reader/punch - Copyright (c) 2007-2008, Robert M. Supnik + Copyright (c) 2007-2018, Robert M. Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -24,6 +24,8 @@ in this Software without prior written authorization from Robert M Supnik. pt 7060 paper-tape reader/punch + + 02-Jun-2018 RMS Defanged clang signed/unsigned whining (Mark Pizzolato) */ #include "sigma_io_defs.h" @@ -61,7 +63,7 @@ uint32 pt_tdv_status (void); t_stat pt_chan_err (uint32 st); t_stat pt_svc (UNIT *uptr); t_stat pt_reset (DEVICE *dptr); -t_stat pt_attach (UNIT *uptr, char *cptr); +t_stat pt_attach (UNIT *uptr, CONST char *cptr); /* PT data structures @@ -158,7 +160,7 @@ return 0; t_stat pt_svc (UNIT *uptr) { int32 c; -uint32 cmd; +uint32 uc, cmd; uint32 st; switch (pt_cmd) { /* case on state */ @@ -196,7 +198,7 @@ switch (pt_cmd) { /* case on state */ if (c != 0) /* leader done? */ ptr_nzc = 1; /* set flag */ if ((pt_cmd == PTS_READI) || ptr_nzc) { - st = chan_WrMemB (pt_dib.dva, c); /* write to memory */ + st = chan_WrMemB (pt_dib.dva, ((uint32) c));/* write to memory */ if (CHS_IFERR (st)) /* channel error? */ return pt_chan_err (st); if (st == CHS_ZBC) /* bc == 0? */ @@ -208,10 +210,10 @@ switch (pt_cmd) { /* case on state */ sim_activate (uptr, pt_unit[PTP].wait); /* continue thread */ if ((pt_unit[PTP].flags & UNIT_ATT) == 0) /* not attached? */ return ptp_stopioe? SCPE_UNATT: SCPE_OK; - st = chan_RdMemB (pt_dib.dva, &c); /* read from channel */ + st = chan_RdMemB (pt_dib.dva, &uc); /* read from channel */ if (CHS_IFERR (st)) /* channel error? */ return pt_chan_err (st); - if (putc (c, pt_unit[PTP].fileref) == EOF) { + if (putc (((int32) uc), pt_unit[PTP].fileref) == EOF) { perror ("PTP I/O error"); clearerr (pt_unit[PTP].fileref); chan_set_chf (pt_dib.dva, CHF_XMDE); /* data error */ @@ -286,7 +288,7 @@ return SCPE_OK; /* Attach routine */ -t_stat pt_attach (UNIT *uptr, char *cptr) +t_stat pt_attach (UNIT *uptr, CONST char *cptr) { t_stat st; diff --git a/sigma/sigma_rad.c b/sigma/sigma_rad.c index 1b904a44..4c14ad31 100644 --- a/sigma/sigma_rad.c +++ b/sigma/sigma_rad.c @@ -124,8 +124,8 @@ uint32 rad_tdv_status (uint32 un); t_stat rad_chan_err (uint32 st); t_stat rad_svc (UNIT *uptr); t_stat rad_reset (DEVICE *dptr); -t_stat rad_settype (UNIT *uptr, int32 val, char *cptr, void *desc); -t_stat rad_showtype (FILE *st, UNIT *uptr, int32 val, void *desc); +t_stat rad_settype (UNIT *uptr, int32 val, CONST char *cptr, void *desc); +t_stat rad_showtype (FILE *st, UNIT *uptr, int32 val, CONST void *desc); t_bool rad_inv_ad (uint32 *da); t_bool rad_inc_ad (void); t_bool rad_end_sec (UNIT *uptr, uint32 lnt, uint32 exp, uint32 st); @@ -508,7 +508,7 @@ return SCPE_OK; /* Set controller type */ -t_stat rad_settype (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat rad_settype (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { uint32 i; @@ -525,7 +525,7 @@ return SCPE_OK; /* Show controller type */ -t_stat rad_showtype (FILE *st, UNIT *uptr, int32 val, void *desc) +t_stat rad_showtype (FILE *st, UNIT *uptr, int32 val, CONST void *desc) { fprintf (st, (rad_model == RAD_7212)? "7211/7212": "7231/7232"); return SCPE_OK; diff --git a/sigma/sigma_rtc.c b/sigma/sigma_rtc.c index 1a97affc..08c13284 100644 --- a/sigma/sigma_rtc.c +++ b/sigma/sigma_rtc.c @@ -76,7 +76,7 @@ static rtcdef_t rtc_tab[RTC_NUM_HZ] = { t_stat rtc_svc (UNIT *uptr); t_stat rtc_cntr_svc (UNIT *uptr); t_stat rtc_reset (DEVICE *dptr); -t_stat rtc_show_events (FILE *of, UNIT *uptr, int32 val, void *desc); +t_stat rtc_show_events (FILE *of, UNIT *uptr, int32 val, CONST void *desc); /* Clock data structures @@ -186,7 +186,7 @@ return SCPE_OK; /* Set timer ticks */ -t_stat rtc_set_tps (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat rtc_set_tps (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { uint32 newval, i; t_stat r; @@ -214,7 +214,7 @@ return SCPE_ARG; /* Show timer ticks */ -t_stat rtc_show_tps (FILE *of, UNIT *uptr, int32 val, void *desc) +t_stat rtc_show_tps (FILE *of, UNIT *uptr, int32 val, CONST void *desc) { uint32 idx; @@ -255,7 +255,7 @@ return SCPE_OK; /* Show events */ -t_stat rtc_show_events (FILE *of, UNIT *uptr, int32 val, void *desc) +t_stat rtc_show_events (FILE *of, UNIT *uptr, int32 val, CONST void *desc) { uint32 i; diff --git a/sigma/sigma_sys.c b/sigma/sigma_sys.c index 9a856dd8..95f5e8d2 100644 --- a/sigma/sigma_sys.c +++ b/sigma/sigma_sys.c @@ -49,7 +49,7 @@ extern uint32 *M; extern UNIT cpu_unit; t_stat fprint_sym_m (FILE *of, uint32 inst); -t_stat parse_sym_m (char *cptr, t_value *val); +t_stat parse_sym_m (CONST char *cptr, t_value *val); void fprint_ebcdic (FILE *of, uint32 c); extern t_stat lp_read_cct (FILE *cfile); @@ -168,7 +168,7 @@ uint8 ebcdic_to_ascii[256] = { /* Binary loader */ -t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag) +t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag) { return lp_read_cct (fileref); } @@ -375,7 +375,7 @@ if (sw & SWMASK ('C')) { /* char format? */ if (sw & SWMASK ('A')) { /* ASCII? */ sc = 24 - ((addr & 0x3) * 8); /* shift count */ c = (inst >> sc) & 0x7F; - fprintf (of, "%c", FMTASC (c)); + fprintf (of, FMTASC (c)); return 0; } if (sw & SWMASK ('E')) { /* EBCDIC? */ @@ -464,7 +464,7 @@ return; status = error status */ -t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw) +t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw) { t_value num; uint32 i, sc, rdx, c; @@ -539,7 +539,7 @@ if (r != SCPE_OK) return 0; } -t_stat parse_sym_m (char *cptr, t_value *val) +t_stat parse_sym_m (CONST char *cptr, t_value *val) { uint32 i, sgn; t_stat r; @@ -547,7 +547,7 @@ char *sep; char gbuf[CBUFSIZE]; cptr = get_glyph (cptr, gbuf, 0); /* get opcode+reg*/ -if (sep = strchr (gbuf, ',')) /* , in middle? */ +if ((sep = strchr (gbuf, ','))) /* , in middle? */ *sep++ = 0; /* split strings */ for (i = 0; opcode[i] != NULL; i++) { /* loop thru ops */ if (strcmp (opcode[i], gbuf) == 0) { /* string match? */ @@ -583,7 +583,7 @@ for (i = 0; opcode[i] != NULL; i++) { /* loop thru ops */ sgn = 1; else sgn = 0; /* else + */ cptr = get_glyph (cptr, gbuf, 0); /* get rest */ - if (sep = strchr (gbuf, ',')) /* , in middle? */ + if ((sep = strchr (gbuf, ','))) /* , in middle? */ *sep++ = 0; /* split strings */ ad = get_uint (gbuf, 16, mask, &r); if (r != SCPE_OK) diff --git a/sigma/sigma_tt.c b/sigma/sigma_tt.c index 97d32d3c..1c357d2a 100644 --- a/sigma/sigma_tt.c +++ b/sigma/sigma_tt.c @@ -1,6 +1,6 @@ /* sigma_tt.c: Sigma 7012 console teletype - Copyright (c) 2007-2008, Robert M. Supnik + Copyright (c) 2007-2018, Robert M. Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -30,6 +30,8 @@ CR input, mapped to NEWLINE and echoes CR-LF ^H input, mapped to EOM and not echoed HT input or output, simulates tabbing with fixed 8 character stops + + 02-Jun-2018 RMS Defanged clang signed/unsigned whining (Mark Pizzolato) */ #include "sigma_io_defs.h" @@ -71,7 +73,7 @@ t_stat tti_rtc_svc (uint32 tm); t_stat tti_svc (UNIT *uptr); t_stat tto_svc (UNIT *uptr); t_stat tt_reset (DEVICE *dptr); -t_stat tt_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc); +t_stat tt_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc); void tto_echo (int32 c); extern t_stat io_set_pint (void); @@ -214,8 +216,8 @@ return SCPE_OK; t_stat tto_svc (UNIT *uptr) { -int32 c, cmd; -uint32 st; +int32 c; +uint32 uc, cmd, st; switch (tt_cmd) { /* case on state */ @@ -231,10 +233,10 @@ switch (tt_cmd) { /* case on state */ break; case TTS_WRITE: /* char output */ - st = chan_RdMemB (tt_dib.dva, &c); /* get char */ + st = chan_RdMemB (tt_dib.dva, &uc); /* get char */ if (CHS_IFERR (st)) /* channel error? */ return tt_chan_err (st); - c = ebcdic_to_ascii[c & 0xFF]; /* convert to ASCII */ + c = ebcdic_to_ascii[uc & 0xFF]; /* convert to ASCII */ tto_echo (c); /* echo character */ sim_activate (uptr, uptr->wait); /* continue thread */ if (st == CHS_ZBC) /* st = zbc? */ @@ -321,7 +323,7 @@ return SCPE_OK; /* Make mode flags uniform */ -t_stat tt_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc) +t_stat tt_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc) { tt_unit[TTO].flags = (tt_unit[TTO].flags & ~TT_MODE) | val; if (val == TT_MODE_7P)