From df54c87bf76638181d75284947b1569ecd7b9568 Mon Sep 17 00:00:00 2001
From: Seth Morabito <web@loomcom.com>
Date: Fri, 24 Nov 2017 18:59:30 -0800
Subject: [PATCH] 3b2: Coverity issue cleanup

---
 3B2/3b2_cpu.c    | 6 +++---
 3B2/3b2_dmac.c   | 5 -----
 3B2/3b2_sysdev.c | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/3B2/3b2_cpu.c b/3B2/3b2_cpu.c
index 29bb2f90..c0860220 100644
--- a/3B2/3b2_cpu.c
+++ b/3B2/3b2_cpu.c
@@ -1559,7 +1559,7 @@ t_stat sim_instr(void)
         case ALSW3:
             a = cpu_read_op(src2);
             b = cpu_read_op(src1);
-            result = a << (b & 0x1f);
+            result = (t_uint64)a << (b & 0x1f);
             cpu_write_op(dst, result);
             cpu_set_nz_flags(result, dst);
             cpu_set_c_flag(0);
@@ -2295,7 +2295,7 @@ t_stat sim_instr(void)
             cpu_set_v_flag_op(result, dst);
             break;
         case MULW2:
-            result = cpu_read_op(src1) * cpu_read_op(dst);
+            result = (t_uint64)cpu_read_op(src1) * (t_uint64)cpu_read_op(dst);
             cpu_write_op(dst, (uint32)(result & WORD_MASK));
             cpu_set_nz_flags((uint32)(result & WORD_MASK), dst);
             cpu_set_c_flag(0);
@@ -2316,7 +2316,7 @@ t_stat sim_instr(void)
             cpu_set_v_flag_op(result, src1);
             break;
         case MULW3:
-            result = cpu_read_op(src1) * cpu_read_op(src2);
+            result = (t_uint64)cpu_read_op(src1) * (t_uint64)cpu_read_op(src2);
             cpu_write_op(dst, (uint32)(result & WORD_MASK));
             cpu_set_nz_flags((uint32)(result & WORD_MASK), dst);
             cpu_set_c_flag(0);
diff --git a/3B2/3b2_dmac.c b/3B2/3b2_dmac.c
index c752c469..00832c05 100644
--- a/3B2/3b2_dmac.c
+++ b/3B2/3b2_dmac.c
@@ -196,11 +196,6 @@ void dmac_program(uint8 reg, uint8 val)
 
         channel = &dma_state.channels[chan_num];
 
-        if (channel == NULL) {
-            /* This should never happen */
-            return;
-        }
-
         switch (reg & 1) {
         case 0: /* Address */
             channel->addr &= ~(0xff << dma_state.bff * 8);
diff --git a/3B2/3b2_sysdev.c b/3B2/3b2_sysdev.c
index c01997a7..3070398f 100644
--- a/3B2/3b2_sysdev.c
+++ b/3B2/3b2_sysdev.c
@@ -334,7 +334,7 @@ t_stat nvram_detach(UNIT *uptr)
 uint32 nvram_read(uint32 pa, size_t size)
 {
     uint32 offset = pa - NVRAMBASE;
-    uint32 data;
+    uint32 data = 0;
     uint32 sc = (~(offset & 3) << 3) & 0x1f;
 
     switch(size) {