From 8ae7d4fbcd15cc391e79c6a003610b251f85e927 Mon Sep 17 00:00:00 2001
From: Leo Broukhis <leob@mailcom.com>
Date: Fri, 11 Mar 2022 19:49:28 -0800
Subject: [PATCH] BESM6: Coverity fixes, added disk type display for SHOW MDn.

---
 BESM6/besm6_disk.c      | 16 +++++++++++-----
 BESM6/besm6_printer.c   |  2 +-
 BESM6/besm6_punch.c     |  2 +-
 BESM6/besm6_punchcard.c |  2 +-
 BESM6/besm6_vu.c        |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/BESM6/besm6_disk.c b/BESM6/besm6_disk.c
index e2c9c006..f6af5afc 100644
--- a/BESM6/besm6_disk.c
+++ b/BESM6/besm6_disk.c
@@ -222,9 +222,15 @@ t_stat disk_set_type (UNIT *up, int32 v, CONST char *cp, void *dp) {
     return SCPE_OK;
 }
 
+t_stat disk_show_type (FILE *f, UNIT *up, int32 v, CONST void *dp) {
+    fprintf(f, IS_29MB(up) ? "EC-5061" : "EC-5052");
+    return SCPE_OK;
+}
+
 
 MTAB disk_mod[] = {
-    { MTAB_VDV, DISK_TYPE_7_25M, NULL, "EC-5052", &disk_set_type, NULL, NULL, "EC-5052 drive (7.25 Mb)"},
+    { MTAB_VDV, DISK_TYPE_7_25M, "", "EC-5052", &disk_set_type, &disk_show_type, NULL,
+      "EC-5052 drive (7.25 Mb)"},
     { MTAB_VDV, DISK_TYPE_29M, NULL, "EC-5061", &disk_set_type, NULL, NULL, "EC-5061 drive (29 Mb)"},
     { MTAB_XTD | MTAB_VDV | MTAB_VALR, 1, NULL,
       "SYSLOG", &disk_setsyslog, NULL, NULL, "file name (always appending) or OFF" },
@@ -543,7 +549,7 @@ void disk_format (UNIT *u)
                          (int) (fmtbuf[2] >> 14 & BITS(30)));
         else
             besm6_debug ("::: формат МД %02o полузона %04o.%d память %05o skip %02o и-а-кса %010o %010o",
-                         c->dev, c->zone, c->track, c->memory, ptr - memory -c ->memory,
+                         c->dev, c->zone, c->track, c->memory, (uint32) (ptr - memory -c ->memory),
                          (int) (fmtbuf[0] >> 8 & BITS(30)),
                          (int) (fmtbuf[2] >> 14 & BITS(30)));
 }
@@ -694,7 +700,7 @@ void disk_io (int ctlr, uint32 cmd)
         c->memory = (cmd & (DISK_PAGE | DISK_HALFPAGE)) >> 2 | (cmd & DISK_BLOCK) >> 8;
     }
     if (md_dev[ctlr * 4].dctrl & DEB_RWR)
-        besm6_debug ("::: КМД %c: задание на %s %016llo RAM @%05o", ctlr + '3',
+        besm6_debug ("::: КМД %c: задание на %s %08o RAM @%05o", ctlr + '3',
                      (c->op & DISK_READ) ? "чтение" : "запись", cmd, c->memory);
     disk_fail &= ~c->mask_fail;
 
@@ -708,7 +714,7 @@ void disk_io (int ctlr, uint32 cmd)
 void disk_ctl (int ctlr, uint32 cmd)
 {
     KMD *c = &controller [ctlr];
-    UNIT *u = &md_unit [c->dev];
+    UNIT *u = c->dev < 0 ? &md_unit[0] : &md_unit [c->dev];
 
     if ((md_dev[ctlr].dctrl & DEB_OPS || c->dev != -1 && u->dptr->dctrl & DEB_OPS) && cmd & BBIT(13)) {
         besm6_debug ("::: КМД %c: bit 13 + %04o",
@@ -893,7 +899,7 @@ void disk_ctl (int ctlr, uint32 cmd)
             break;
         case 031: /* опрос 13÷24 разрядов РС */
             c->status = 0;
-            if (md_unit[c->dev].flags & UNIT_DISABLE)
+            if (c->dev < 0 || md_unit[c->dev].flags & UNIT_DISABLE)
                 c->status |= STATUS_ABSENT;
             else if (md_unit[c->dev].flags & UNIT_ATT)
                 c->status |= STATUS_POWERUP;
diff --git a/BESM6/besm6_printer.c b/BESM6/besm6_printer.c
index 4ffcd712..92c6f82d 100644
--- a/BESM6/besm6_printer.c
+++ b/BESM6/besm6_printer.c
@@ -137,7 +137,7 @@ void printer_control (int num, uint32 cmd)
         besm6_debug(">>> АЦПУ%d команда %o", num, cmd);
     if (READY & (PRN1_NOT_READY >> num)) {
         if (printer_dev.dctrl)
-            besm6_debug(">>> АЦПУ%d не готово", num, cmd);
+            besm6_debug(">>> АЦПУ%d не готово", num);
         return;
     }
     switch (cmd) {
diff --git a/BESM6/besm6_punch.c b/BESM6/besm6_punch.c
index 93744365..1090c85b 100644
--- a/BESM6/besm6_punch.c
+++ b/BESM6/besm6_punch.c
@@ -155,7 +155,7 @@ void fs_control (int num, uint32 cmd)
         besm6_debug("<<< ФС1500-%d команда %o", num, cmd);
     if (! IS_RDY(FS1_READY >> num)) {
         if (fs_dev.dctrl)
-            besm6_debug("<<< ФС1500-%d не готово", num, cmd);
+            besm6_debug("<<< ФС1500-%d не готово", num);
         return;
     }
     switch (cmd) {
diff --git a/BESM6/besm6_punchcard.c b/BESM6/besm6_punchcard.c
index 2e5cac4f..e9a53cff 100644
--- a/BESM6/besm6_punchcard.c
+++ b/BESM6/besm6_punchcard.c
@@ -355,7 +355,7 @@ void pi_control (int num, uint32 cmd)
     cmd &= 011;
     if (! IS_RDY2(pi_ready_mask[num])) {
         if (pi_dev.dctrl)
-            besm6_debug("<<< PI-%d not ready", num, cmd);
+            besm6_debug("<<< PI-%d not ready", num);
         return;
     }
     switch (cmd) {
diff --git a/BESM6/besm6_vu.c b/BESM6/besm6_vu.c
index f88f3e5f..5115e9f1 100644
--- a/BESM6/besm6_vu.c
+++ b/BESM6/besm6_vu.c
@@ -258,7 +258,7 @@ void vu_control (int num, uint32 cmd)
         besm6_debug("<<< VU-%d cmd %o", num, cmd);
     if (ISSET_RDY2(VU1_NOTREADY >> (num*4))) {
         if (vu_dev.dctrl)
-            besm6_debug("<<< VU-%d not ready", num, cmd);
+            besm6_debug("<<< VU-%d not ready", num);
         return;
     }
     if (cmd & 010) {