From 2b1c0bc566baf7a42bb3fa74e2943cfee438c5e7 Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rcornwell@github.com>
Date: Sun, 16 Feb 2020 20:28:43 -0500
Subject: [PATCH] KA10: Cleanup some compiler warnings.

---
 PDP10/kl10_fe.c  |  2 +-
 PDP10/kx10_cpu.c | 32 ++++++++++++++++----------------
 PDP10/kx10_tu.c  |  3 +--
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/PDP10/kl10_fe.c b/PDP10/kl10_fe.c
index 348ef00..9a3c2b4 100644
--- a/PDP10/kl10_fe.c
+++ b/PDP10/kl10_fe.c
@@ -209,7 +209,7 @@ t_stat dte_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cpt
 const char *dte_description (DEVICE *dptr);
 extern uint64  SW;                                   /* Switch register */
 
-char *pri_name[] = { "(0)", "EM2EI", "EM2TI", "EMSTR", "EMLNC", "EMRDS", "(6)",
+CONST char *pri_name[] = { "(0)", "EM2EI", "EM2TI", "EMSTR", "EMLNC", "EMRDS", "(6)",
        "EMHDS", "(10)", "EMRDT", "EMHDR", "EMFLO", "EMSNA", "EMDSC", "EMHUD",
        "EMLBE", "EMXOF", "EMXON", "EMHLS", "EMHLA", "EMRBI", "EMAKA", "EMTDO",
        "EMEDR", "EMLDR", "EMLDV" };
diff --git a/PDP10/kx10_cpu.c b/PDP10/kx10_cpu.c
index dfa4ad9..4a2f0c6 100644
--- a/PDP10/kx10_cpu.c
+++ b/PDP10/kx10_cpu.c
@@ -909,7 +909,7 @@ int opflags[] = {
 #endif
 
 #if KL
-struct {
+struct _byte {
     int p;
     int s;
 } _byte_adj[] = {
@@ -2557,7 +2557,7 @@ int Mem_write(int flag, int cur_context) {
 }
 
 /* executive page table lookup */
-int exec_page_lookup(t_addr addr, int wr, int *loc)
+int exec_page_lookup(t_addr addr, int wr, t_addr *loc)
 {
     int      data;
     int      page = (RMASK & addr) >> 9;
@@ -5854,9 +5854,9 @@ unasign:
                                   page_fault = 1;
                                   goto last;
                               }
-                              BR = (MB + adjw) & RMASK | (MB & LMASK);
+                              BR = ((MB + adjw) & RMASK) | (MB & LMASK);
                           } else
-                              BR = (MB + adjw) & (SECTM|RMASK) | (MB & ~(SECTM|RMASK));
+                              BR = ((MB + adjw) & (SECTM|RMASK)) | (MB & ~(SECTM|RMASK));
                           set_reg(AC, AR);
                           set_reg(AC+1, BR);
                           break;
@@ -5887,22 +5887,22 @@ unasign:
                   SCAD = (AR >> 30) & 077;
 #if KL
                   if (QKLB && t20_page && pc_sect != 0 && SCAD > 36) {  /* Extended pointer */
-                      int i = SCAD - 37;
+                      f = SCAD - 37;
                       if (SCAD == 077)
                           goto muuo;
-                      SC = _byte_adj[i].s;
-                      SCAD = (_byte_adj[i].p + (0777 ^ SC) + 1) & 0777;
-                      i++;
+                      SC = _byte_adj[f].s;
+                      SCAD = (_byte_adj[f].p + (0777 ^ SC) + 1) & 0777;
+                      f++;
                       if (SCAD & 0400) {
                           SCAD = ((0777 ^ SC) + 044 + 1) & 0777;
                           AR++;
-                          for(i = 0; i < 28; i++) {
-                             if (_byte_adj[i].s == SC && _byte_adj[i].p == SCAD)
+                          for(f = 0; f < 28; f++) {
+                             if (_byte_adj[f].s == SC && _byte_adj[f].p == SCAD)
                                  break;
                           }
                       }
                       AR &= (SECTM|RMASK);
-                      AR |= ((uint64)(i + 37)) << 30;
+                      AR |= ((uint64)(f + 37)) << 30;
                       MB = AR;
                       if (Mem_write(0, 0))
                           goto last;
@@ -5925,9 +5925,9 @@ unasign:
                                   page_fault = 1;
                                   goto last;
                               }
-                              MB = (MB + 1) & RMASK | (MB & LMASK);
+                              MB = ((MB + 1) & RMASK) | (MB & LMASK);
                           } else
-                              MB = (MB + 1) & (SECTM|RMASK) | (MB & ~(SECTM|RMASK));
+                              MB = ((MB + 1) & (SECTM|RMASK)) | (MB & ~(SECTM|RMASK));
                           if (Mem_write(0,0))
                               goto last;
                           AB = (AB - 1) & RMASK;
@@ -5969,11 +5969,11 @@ unasign:
                   SCAD = (AR >> 30) & 077;
 #if KL
                   if (QKLB && t20_page && pc_sect != 0 && SCAD > 36) {   /* Extended pointer */
-                      int i = SCAD - 37;
+                      f = SCAD - 37;
                       if (SCAD == 077)
                           goto muuo;
-                      SC = _byte_adj[i].s;
-                      SCAD = _byte_adj[i].p;
+                      SC = _byte_adj[f].s;
+                      SCAD = _byte_adj[f].p;
 ld_ptr:
                       glb_sect = 1;
                       sect = (AR >> 18) & 07777;
diff --git a/PDP10/kx10_tu.c b/PDP10/kx10_tu.c
index 86bd00a..87cc20e 100644
--- a/PDP10/kx10_tu.c
+++ b/PDP10/kx10_tu.c
@@ -156,7 +156,6 @@
 #define CPOS          u4
 #define DATAPTR       u6
 
-struct rh_if  tu_rh[NUM_DEVS_TU];
 uint8         tu_buf[NUM_DEVS_TU][TU_NUMFR];
 uint16        tu_frame[NUM_DEVS_TU];
 uint16        tu_tcr[NUM_DEVS_TU];
@@ -188,7 +187,7 @@ UNIT                tu_unit[] = {
     { UDATA (&tu_srv, TU_UNIT+CNTRL_RH(0), 0) },
 };
 
-struct rh_if  tu_rh[] = {
+struct rh_if  tu_rh[NUM_DEVS_TU] = {
      { &tu_write, &tu_read}
 };