From 9d4093f5415ed14aa4a07b32b068e3cd1576ecdd Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rcornwell@github.com>
Date: Sat, 11 Jul 2020 15:04:51 -0400
Subject: [PATCH] IBM360: Minor code cleanup. Fixed Coverity errors.

---
 IBM360/ibm360_cdr.c  |  2 +-
 IBM360/ibm360_cpu.c  | 22 +++++++---------------
 IBM360/ibm360_dasd.c |  5 ++---
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/IBM360/ibm360_cdr.c b/IBM360/ibm360_cdr.c
index a3a4d2c..d678bf3 100644
--- a/IBM360/ibm360_cdr.c
+++ b/IBM360/ibm360_cdr.c
@@ -225,7 +225,7 @@ cdr_srv(UNIT *uptr) {
             }
             break;
        }
-       sim_activate(uptr, 80000);       /* Start unit off */
+       sim_activate(uptr, 10000);       /* Start unit off */
        return SCPE_OK;
     }
 
diff --git a/IBM360/ibm360_cpu.c b/IBM360/ibm360_cpu.c
index 6b7bba6..4a1fe28 100644
--- a/IBM360/ibm360_cpu.c
+++ b/IBM360/ibm360_cpu.c
@@ -807,12 +807,6 @@ int WriteFull(uint32 addr, uint32 data) {
      }
      key[pa >> 11] |= 0x6;
 
-     /* Put data in correct locations */
-     if (offset == 0) {
-        M[pa >> 2] = data;
-        return 0;
-     }
-
      pa2 = pa + 4;
      /* Check if we handle unaligned access */
      if (offset != 0 && (pa2 & 0x7FC) == 0) {
@@ -1043,8 +1037,6 @@ int WriteHalf(uint32 addr, uint32 data) {
           M[pa] &= ~mask;
           M[pa] |= data;
           break;
-     case 3:
-          break;
      }
      return 0;
 }
@@ -2899,8 +2891,8 @@ save_dbl:
                             if(ReadByte(addr1, &src1))
                                goto supress;
                             addr1++;
-                            temp = 0xff << j;
-                            dest = (dest & ~temp) | (src1 << j);
+                            src2 = 0xff << j;
+                            dest = (dest & ~src2) | (src1 << j);
                             if (src1) {
                                 if ((src1 & fill) != 0) {
                                     cc = 1;
@@ -2940,7 +2932,7 @@ save_dbl:
         case OP_CLM:
                 if ((cpu_unit[0].flags & FEAT_370) != 0) {
                     uint32  rval[4];
-                    int i, j, k;
+                    int i, k = 0;
 
                     if (R2(reg) == 0) {
                        if(ReadByte(addr1, &src1))
@@ -2948,10 +2940,10 @@ save_dbl:
                        break;
                     }
                     dest = regs[reg1];
-                    for (i = 0x8, j=24, k=0; i != 0; i >>= 1, j-=8) {
-                        if ((R2(reg) & i) != 0)
-                            rval[k++] = (dest >> j) & 0xff;
-                    }
+                    if ((R2(reg) & 0x8) != 0) rval[k++] = (dest >> 24) & 0xff;
+                    if ((R2(reg) & 0x4) != 0) rval[k++] = (dest >> 16) & 0xff;
+                    if ((R2(reg) & 0x2) != 0) rval[k++] = (dest >> 8) & 0xff;
+                    if ((R2(reg) & 0x1) != 0) rval[k++] = dest & 0xff;
                     cc = 0;
                     for (i = 0; i < k; i++) {
                         if (ReadByte(addr1, &src1))
diff --git a/IBM360/ibm360_dasd.c b/IBM360/ibm360_dasd.c
index 7233499..72eaeaa 100644
--- a/IBM360/ibm360_dasd.c
+++ b/IBM360/ibm360_dasd.c
@@ -1052,9 +1052,6 @@ sense_end:
          chan_end(addr, SNS_CHNEND|SNS_DEVEND);
          break;
 
-    case DK_SPACE:           /* Space record */
-         /* Not implemented yet */
-         break;
 
     case DK_SRCH_HAEQ:       /* Search HA equal */
 
@@ -1744,6 +1741,8 @@ wrckd:
          chan_end(addr, SNS_CHNEND|SNS_DEVEND);
          break;
 
+    case DK_SPACE:           /* Space record */
+         /* Not implemented yet */
     default:
          sim_debug(DEBUG_DETAIL, dptr, "invalid command=%d %x\n", unit, cmd);
          uptr->SNS |= SNS_CMDREJ;