From e06b815d2ae57ccdc9ed64a34315ad8891301d91 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Wed, 31 Aug 2016 11:56:47 -0700
Subject: [PATCH] SCP: Record breakpoint match details in globals

sim_brk_match_type and sim_brk_match_addr can be used to generate
appropriate messages relating to the breakpoint match.
---
 doc/simh_breakpoints.doc | Bin 41984 -> 42496 bytes
 scp.c                    |  10 ++++++----
 scp.h                    |   2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/simh_breakpoints.doc b/doc/simh_breakpoints.doc
index 80b75cde92a165456601e42ffb312fdd41478cba..d210c67e7e5f07a0c1b3155564532163827b3e5a 100644
GIT binary patch
delta 2639
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

delta 2322
zcma*peN2^A9KiA4^W4jeB8t4oJ6^qBP*4YAA&NqZFQ9}pr)6rgY9)cT6)r`)k{P+V
zQcf(l0MVK<H>YxEl4I6<LC{)ig+h5TM;k0(8@e!wz6ZFytp4b*&ppp`o|p4GzvrCi
zVau21mL_v&qAf=TOMpl&n+AUG>+934i{Ki$?}$-uMwzvfRE%l&pC$5Z*rF9$twZgy
z#;8JbzxRzXA`OPJS;ngA7F$j}yCxSuPp!-UsmF0%wO!;>E?g2T@&Ws0TpyzH%pi5b
zl3|po-z+JPO4>$oEI*Q;|ENC?6=_t<toA@1#otSQq`GH)e3Cvvmwz7~Z0E+)+03(v
zOjP;43!SZO>C&P5rI4Qf{3Mn;?Yk_Oje*v`+P8&^)X})vCNk7>kUEEef~o7M6RCC9
zbSblmJVo8fuysj^5Q*omdY|(x(rP2}d8s-MeZA*AeXcI=4#suMCbF7+&j>wrzMA2k
zJ5(oAm$ETDwpf#FP^mUcn0aH2dgOi5?2L6a_}mL}t&Ca{>@ucAdM`c8KpL@^l<dPZ
zQ6kH+9u+u-7F@ybXpxafLN3<fRcymioIxwPqLq;vrQVx1)%C+PtD$PrBGmQNMCT#;
z(f#TB-{ia(V?^FZ8=6OpbfX9UHj&ZTiYm0A1D)uC55r8tVyuA^hp}v|$kUk19Lqxi
zO0XLr+a+Hvv2hLA%*16VK`2k)HCW?BywEgW<U6?0-P!GKb88p*Yt$Otb+vAO+!w2N
z{`toV@3=R(Mb)Gys=L!G)z$Q1b#X>wQ5U298G5uYFiOvece4E!Bhe%DM7?n^pk{~2
zc?>5gPjH*q-iw21z&H37(F7TTE9g;s)52XfX)&IJ`>F3!{8h`$_-uXnD*6yRK_m{x
z<3;N6N`gos)}sV(V;gQw6uFIvNg|Or0A3JA>RA<#8mEeU&z4tOQv!9G+Hr?dAD|b0
zoEio@;xQSucyP1*^35jw<I4A4Zm8GOL)DPv(2%fEFHa0SE|2+^=4P9chZVl1sy#V8
zIB?*Ir+F2JhStsAG2T&2f`UY538jCn`jTW;y$(lrrC$J%>S#eww0;D7{JJ%aR_33u
z_=Gtq(XJm0A`ItMR-79*aTgEK3-1t-VX$EWicyN~sKAH#2vyjR12}~9_zIWNg3~PC
zbEv2P1{@`ZW0=c&%Zn7J6tM9oc0(`3OSpz?f?SHjjKPK5Oq*ZOY-5h1p2>a^*O}8D
zn8p-J!#P~Q9rPlYY=yy&$v6lfGB7}86&0$SBAb(pi0LIV0*yZ02KFJmA~AuFM*=*#
z3S?YiC_oYRL65%<^*Dnjw4xootWP1-JS@Q`!Y#!>D9MCkRf%g8RQg(9_3YYAXB+uy
z<|%fg2ma)3G`6A&7Y4OZccKeP<a9CCz=^~7deBmyc?qes@_zAxoAkA#oAf+@A1To(
z3daG5Sao2o$?NWTg#;3~70fXC3A&6_Q;O$jWjIdv@9D{?$DxaXz6{G2qd$W>i@F&6
zdA2>ZNjCdSt;5w=JkCsR>RIrTZWtyB^jYo2m&Hb~dY%)2B_NafpRJj$=r^7-yesIt
z!ol}rmg|cR8D_cH)VfV84P%O0wK;CusrrWPrbq@COGiLO{M}PV|Mu$7g7t^ZLNh(_
z1sb@yu64H-SJLb`!^?LZ3Dn){Rvm_}D;%y<J5G!kum6P@e5hilog|7*0<R^BgFeoC
zM${*j3$paiOm_5wO-BZvz--KcK0cRv9_C{KvXG61(8qi6q)M$iw`;Yvyt;5m#;~&f
rZ}VbRT<tV$>VCD;n}sfqV%5eyPGgpOxM!o0riyEvMyBh2ji1*a<qqd)

diff --git a/scp.c b/scp.c
index 8ed66d74..dcf6b2b3 100644
--- a/scp.c
+++ b/scp.c
@@ -475,6 +475,8 @@ t_bool sim_processing_event = FALSE;
 uint32 sim_brk_summ = 0;
 uint32 sim_brk_types = 0;
 uint32 sim_brk_dflt = 0;
+uint32 sim_brk_match_type;
+t_addr sim_brk_match_addr;
 char *sim_brk_act[MAX_DO_NEST_LVL];
 char *sim_brk_act_buf[MAX_DO_NEST_LVL];
 BRKTAB **sim_brk_tab = NULL;
@@ -9284,7 +9286,6 @@ uint32 sim_brk_test (t_addr loc, uint32 btyp)
 {
 BRKTAB *bp;
 uint32 spc = (btyp >> SIM_BKPT_V_SPC) & (SIM_BKPT_N_SPC - 1);
-uint32 res = 0;
 
 if (sim_brk_summ & BRK_TYP_DYN_ALL)
     btyp |= BRK_TYP_DYN_ALL;
@@ -9297,12 +9298,13 @@ if ((bp = sim_brk_fnd_ex (loc, btyp, TRUE))) {          /* in table, and type ma
         return 0;
     bp->cnt = 0;                                        /* reset count */
     sim_brk_setact (bp->act);                           /* set up actions */
-    res = btyp & bp->typ;                               /* set return value */
+    sim_brk_match_type = btyp & bp->typ;                               /* set return value */
     if (bp->typ & BRK_TYP_TEMP)
         sim_brk_clr (loc, bp->typ);                     /* delete one-shot breakpoint */
-    return res;
+    sim_brk_match_addr = loc;
+    return sim_brk_match_type;
     }
-return res;
+return 0;
 }
 
 /* Get next pending action, if any */
diff --git a/scp.h b/scp.h
index 5d8e5379..0d4937ac 100644
--- a/scp.h
+++ b/scp.h
@@ -272,6 +272,8 @@ extern volatile int32 stop_cpu;
 extern uint32 sim_brk_types;                            /* breakpoint info */
 extern uint32 sim_brk_dflt;
 extern uint32 sim_brk_summ;
+extern uint32 sim_brk_match_type;
+extern t_addr sim_brk_match_addr;
 extern FILE *stdnul;
 extern t_bool sim_asynch_enabled;