From 8448580a3a8f9782f16fe7d51a13fb466760bf56 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sun, 20 Nov 2016 13:19:52 -0800
Subject: [PATCH] SCP: Add support for debug matching multiple bit masks

---
 scp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scp.c b/scp.c
index 06a9888f..f65840e7 100644
--- a/scp.c
+++ b/scp.c
@@ -9093,7 +9093,8 @@ for (cptr = sim_clock_queue; cptr != QUEUE_LIST_END; cptr = cptr->next) {
         if (sim_interval > 0)
             accum = accum + sim_interval;
         }
-    else accum = accum + cptr->time;
+    else
+        accum = accum + cptr->time;
     if (cptr == uptr)
         return accum + 1;
     }
@@ -10295,6 +10296,8 @@ int32 offset = 0;
 if (dptr->debflags == 0)
     return debtab_none;
 
+dbits &= dptr->dctrl;                           /* Look for just the bits tha matched */
+
 /* Find matching words for bitmask */
 
 while (dptr->debflags[offset].name && (offset < 32)) {