From d9e7afc92f85c1447918c03acde47a86b7248435 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Tue, 13 Jun 2017 04:32:18 -0700
Subject: [PATCH] SCP: Fix Coverity flagged issues

---
 scp.c       | 2 +-
 scp.h       | 2 +-
 sim_timer.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scp.c b/scp.c
index f62dcd0f..671c2c28 100644
--- a/scp.c
+++ b/scp.c
@@ -10876,7 +10876,7 @@ int32 offset = 0;
 if (dptr->debflags == 0)
     return debtab_none;
 
-dbits &= dptr->dctrl;                           /* Look for just the bits tha matched */
+dbits &= dptr->dctrl;                           /* Look for just the bits that matched */
 
 /* Find matching words for bitmask */
 
diff --git a/scp.h b/scp.h
index ef91c44f..433fe451 100644
--- a/scp.h
+++ b/scp.h
@@ -256,7 +256,7 @@ void sim_debug_bits (uint32 dbits, DEVICE* dptr, BITFIELD* bitdefs,
 void sim_debug (uint32 dbits, void* dptr, const char *fmt, ...) GCC_FMT_ATTR(3, 4);
 #else
 void _sim_debug (uint32 dbits, void* dptr, const char *fmt, ...) GCC_FMT_ATTR(3, 4);
-#define sim_debug(dbits, dptr, ...) do { if (sim_deb && dptr && ((dptr)->dctrl & dbits)) _sim_debug (dbits, dptr, __VA_ARGS__);} while (0)
+#define sim_debug(dbits, dptr, ...) do { if (sim_deb && dptr && ((dptr)->dctrl & (dbits))) _sim_debug (dbits, dptr, __VA_ARGS__);} while (0)
 #endif
 #else
 #ifdef CANT_USE_MACRO_VA_ARGS
diff --git a/sim_timer.c b/sim_timer.c
index 06918adc..bdcd37a3 100644
--- a/sim_timer.c
+++ b/sim_timer.c
@@ -1784,7 +1784,7 @@ switch (sim_throt_state) {
                 }
             else {                                      /* record instruction rate */
                 sim_throt_cps = (int32)a_cps;
-                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Recalibrating Special %d/%d Cycles Per Second of %d\n", 
+                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Recalibrating Special %d/%u Cycles Per Second of %f\n", 
                                                     sim_throt_wait, sim_throt_sleep_time, sim_throt_cps);
                 }
             sim_throt_ms_start = sim_os_msec ();