From ece22f70f6c331ec27b75778131d4731599b6c73 Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rcornwell@github.com>
Date: Tue, 6 Oct 2020 21:55:19 -0400
Subject: [PATCH] IBM360: Removed some compiler warnings.

---
 IBM360/ibm360_chan.c | 3 +++
 IBM360/ibm360_com.c  | 1 -
 IBM360/ibm360_cpu.c  | 4 ++--
 IBM360/ibm360_dasd.c | 4 ----
 IBM360/ibm360_mt.c   | 1 -
 IBM360/ibm360_scom.c | 2 --
 IBM360/ibm360_sys.c  | 2 +-
 7 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/IBM360/ibm360_chan.c b/IBM360/ibm360_chan.c
index 74d05a2..08060d3 100644
--- a/IBM360/ibm360_chan.c
+++ b/IBM360/ibm360_chan.c
@@ -190,6 +190,7 @@ int
 readfull(int chan, uint32 addr, uint32 *word) {
     if ((addr & AMASK) > MEMSIZE) {
         chan_status[chan] |= STATUS_PCHK;
+        *word = 0;
         irq_pend = 1;
         return 1;
     }
@@ -198,12 +199,14 @@ readfull(int chan, uint32 addr, uint32 *word) {
         int k;
         if ((cpu_unit[0].flags & FEAT_PROT) == 0) {
             chan_status[chan] |= STATUS_PROT;
+            *word = 0;
             irq_pend = 1;
             return 1;
         }
         k = key[addr >> 9];
         if ((k & 0x8) != 0 && (k & 0xf0) != ccw_key[chan]) {
             chan_status[chan] |= STATUS_PROT;
+            *word = 0;
             irq_pend = 1;
             return 1;
         }
diff --git a/IBM360/ibm360_com.c b/IBM360/ibm360_com.c
index bbe857e..79da78b 100644
--- a/IBM360/ibm360_com.c
+++ b/IBM360/ibm360_com.c
@@ -260,7 +260,6 @@ static const uint8 com_2741_out[256] = {
  * Issue a command to the 2701 controller.
  */
 uint8  coml_startcmd(UNIT *uptr, uint16 chan,  uint8 cmd) {
-    uint16         addr = GET_UADDR(uptr->CMD);
     DEVICE         *dptr = find_dev_from_unit(uptr);
     int            unit = (uptr - dptr->units);
 
diff --git a/IBM360/ibm360_cpu.c b/IBM360/ibm360_cpu.c
index de968fa..12caf22 100644
--- a/IBM360/ibm360_cpu.c
+++ b/IBM360/ibm360_cpu.c
@@ -1375,7 +1375,7 @@ opr:
         } else if ((op & 0xe0) == 0x40) {
                 dest = src1 = regs[reg1];
                 /* Read half word if 010010xx or 01001100 */
-                if ((op & 0x1c) == 0x08 || op == OP_MH)  {
+                if ((op & 0xfc) == 0x48 || op == OP_MH)  {
                      if (ReadHalf(addr1, &src2))
                         goto supress;
                 /* Read full word if 0101xxx and not xxxx00xx (ST) */
@@ -4858,7 +4858,7 @@ fpnorm:
                             src1L &= UMASKL;
                         }
                     }
-                } else if (temp < 0) {
+                } else {
                     /* Flip operands around */
                     src1L = (((t_uint64)(src1)) << 36) | (((t_uint64)src1h) << 4);
                     src2L = (((t_uint64)(fpregs[reg1|2] & MMASK) << 36)) |
diff --git a/IBM360/ibm360_dasd.c b/IBM360/ibm360_dasd.c
index 7b2a266..463f0b5 100644
--- a/IBM360/ibm360_dasd.c
+++ b/IBM360/ibm360_dasd.c
@@ -366,7 +366,6 @@ DEVICE              ddd_dev = {
 #endif
 
 uint8  dasd_startio(UNIT *uptr, uint16 chan) {
-    uint16         addr = GET_UADDR(uptr->CMD);
     DEVICE         *dptr = find_dev_from_unit(uptr);
     int            unit = (uptr - dptr->units);
 
@@ -385,7 +384,6 @@ uint8  dasd_startio(UNIT *uptr, uint16 chan) {
 uint8  dasd_startcmd(UNIT *uptr, uint16 chan,  uint8 cmd) {
     uint16         addr = GET_UADDR(uptr->CMD);
     DEVICE         *dptr = find_dev_from_unit(uptr);
-    struct dasd_t      *data = (struct dasd_t *)(uptr->up7);
     int            unit = (uptr - dptr->units);
     uint8          ch;
 
@@ -494,7 +492,6 @@ sense_end:
 /* Compute position on new track. */
 void dasd_adjpos(UNIT * uptr)
 {
-    uint16              addr = GET_UADDR(uptr->CMD);
     struct dasd_t      *data = (struct dasd_t *)(uptr->up7);
     uint8               *rec;
     int                 pos;
@@ -1785,7 +1782,6 @@ wrckd:
 void
 dasd_ini(UNIT * uptr, t_bool f)
 {
-    DEVICE             *dptr = find_dev_from_unit(uptr);
     int                i = GET_TYPE(uptr->flags);
     uptr->capac = disk_type[i].bpt * disk_type[i].heads * disk_type[i].cyl;
     if ((uptr->flags & UNIT_ATT) != 0)
diff --git a/IBM360/ibm360_mt.c b/IBM360/ibm360_mt.c
index e712636..9bb09b4 100644
--- a/IBM360/ibm360_mt.c
+++ b/IBM360/ibm360_mt.c
@@ -235,7 +235,6 @@ uint8                  bcd_to_ebcdic[64] = {
 
 
 uint8  mt_startcmd(UNIT *uptr, uint16 chan,  uint8 cmd) {
-    uint16         addr = GET_UADDR(uptr->CMD);
     DEVICE         *dptr = find_dev_from_unit(uptr);
     int            unit = (uptr - dptr->units);
 
diff --git a/IBM360/ibm360_scom.c b/IBM360/ibm360_scom.c
index e7fd577..873dfc1 100644
--- a/IBM360/ibm360_scom.c
+++ b/IBM360/ibm360_scom.c
@@ -189,7 +189,6 @@ DEVICE              scoml_dev = {
  * Issue a scommand to the 2701 controller.
  */
 uint8  scoml_startcmd(UNIT *uptr, uint16 chan,  uint8 cmd) {
-    uint16         addr = GET_UADDR(uptr->CMD);
     DEVICE         *dptr = find_dev_from_unit(uptr);
     int            unit = (uptr - dptr->units);
 
@@ -442,7 +441,6 @@ scom_readinput(UNIT *uptr)
     DEVICE             *dptr = find_dev_from_unit(uptr);
     uint16              addr = GET_UADDR(uptr->CMD);
     int                 unit = (uptr - dptr->units);
-    int                 cmd = uptr->CMD & 0xff;
     int32               r;
     struct _line        *data = (struct _line *)(uptr->up7);
     uint8               ch;
diff --git a/IBM360/ibm360_sys.c b/IBM360/ibm360_sys.c
index ddce562..2f3d94b 100644
--- a/IBM360/ibm360_sys.c
+++ b/IBM360/ibm360_sys.c
@@ -699,7 +699,7 @@ if (sw & SWMASK('F')) {
 if (sw & SWMASK ('C')) {
    cptr = get_glyph_quoted(cptr, gbuf, 0);   /* Get string */
    for(i = 0; gbuf[i] != 0; i++) {
-      val[i] = ascii_to_ebcdic[gbuf[i]];
+      val[i] = ascii_to_ebcdic[(int)gbuf[i]];
    }
    return -(i - 1);
 }