From 8b4ebfe1fe5cd17d39dfa2bc3ddddc609049beb4 Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rcornwell@github.com>
Date: Fri, 5 Jul 2019 00:37:50 -0400
Subject: [PATCH] KA10: Cleanup compile warnings and coverity errors.

---
 PDP10/ka10_pmp.c  | 4 ++--
 PDP10/kx10_cpu.c  | 5 ++---
 PDP10/kx10_defs.h | 2 +-
 PDP10/kx10_sys.c  | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/PDP10/ka10_pmp.c b/PDP10/ka10_pmp.c
index 6be6c38..ea3e69b 100644
--- a/PDP10/ka10_pmp.c
+++ b/PDP10/ka10_pmp.c
@@ -2160,7 +2160,7 @@ pmp_format(UNIT * uptr, int flag) {
     int                 sector;
     int                 rec;
     int                 hd;
-    int                 pos;
+    uint32              pos;
 
     if (flag || get_yn("Initialize dasd? [Y] ", TRUE)) {
         memset(&hdr, 0, sizeof(struct pmp_header));
@@ -2181,7 +2181,7 @@ pmp_format(UNIT * uptr, int flag) {
         for (cyl = 0; cyl <= disk_type[type].cyl; cyl++) {
             pos = 0;
             for (hd = 0; hd < disk_type[type].heads; hd++) {
-                int cpos = pos;
+                uint32 cpos = pos;
                 rec = 0;
                 data->cbuf[pos++] = 0;            /* HA */
                 data->cbuf[pos++] = (cyl >> 8);
diff --git a/PDP10/kx10_cpu.c b/PDP10/kx10_cpu.c
index eef504d..19b2430 100644
--- a/PDP10/kx10_cpu.c
+++ b/PDP10/kx10_cpu.c
@@ -4635,9 +4635,7 @@ left:
               break;
 
     case 0243:  /* JFFO */
-#if PDP6
-              break;
-#endif
+#if !PDP6
               SC = 0;
               if (AR != 0) {
 #if ITS
@@ -4650,6 +4648,7 @@ left:
                   SC = nlzero(AR);
               }
               set_reg(AC + 1, SC);
+#endif
               break;
 
     case 0244: /* ASHC */
diff --git a/PDP10/kx10_defs.h b/PDP10/kx10_defs.h
index 1c58791..26f2b5e 100644
--- a/PDP10/kx10_defs.h
+++ b/PDP10/kx10_defs.h
@@ -484,7 +484,7 @@ int auxcpu_write (int addr, t_uint64);
 
 extern t_bool sim_idle_enab;
 extern struct rh_dev rh[];
-extern t_uint64   M[];
+extern t_uint64   M[MAXMEMSIZE];
 extern t_uint64   FM[];
 extern uint32   PC;
 extern uint32   FLAGS;
diff --git a/PDP10/kx10_sys.c b/PDP10/kx10_sys.c
index dac5912..b9cae57 100644
--- a/PDP10/kx10_sys.c
+++ b/PDP10/kx10_sys.c
@@ -385,7 +385,7 @@ t_stat load_sblk (FILE *fileref)
        and then comes the data.  Last is a checksum word.  */
     while (get_evac (fileref, &word) == 0 && (word & SMASK)) {
         check = word;
-        count = -((word >> 18) | (-1 << 18));
+        count = (int)((((word >> 18) ^ RMASK) + 1) & RMASK);
         addr = word & RMASK;
         while (count-- > 0) {
             if (get_evac (fileref, &word))