From f472b4802d80d8261925217ea004b7c3e2c98476 Mon Sep 17 00:00:00 2001 From: scrimpeh Date: Sun, 5 Jul 2015 17:12:46 +0200 Subject: [PATCH] Apple II Breakpoints - Fix Write Breakpoints --- ExternalCoreProjects/Virtu/Memory.cs | 2 +- References/Virtu.dll | Bin 173056 -> 173056 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ExternalCoreProjects/Virtu/Memory.cs b/ExternalCoreProjects/Virtu/Memory.cs index 2a4d928b11..1465aac15c 100644 --- a/ExternalCoreProjects/Virtu/Memory.cs +++ b/ExternalCoreProjects/Virtu/Memory.cs @@ -231,7 +231,7 @@ namespace Jellyfish.Virtu { if (WriteCallback != null) { - WriteCallback((uint)(_regionWrite[region][address - RegionBaseAddress[region]])); + WriteCallback((uint)address); } _regionWrite[region][address - RegionBaseAddress[region]] = (byte)data; } diff --git a/References/Virtu.dll b/References/Virtu.dll index b2dac6410bd68ff68d95765fbee9cfe5104b8d35..d4d121b9d9a0512230d4fd53d8a59ba11ce8d36b 100644 GIT binary patch delta 4082 zcmYM%4Nz3q6$kKp4zRm!00AY^NDPP;f)FtfTol6t2`tLjDk>@o#3d11Y8hq9He-Ek zOP1A<4rGb(0~4EUGuR;xQ522DswIS48nJ4EDQR)aBy^(VNBkfWJ3V{vDczafncw`+ zx#!-uJM;F{_nYhc&CPC1%WK&=3tnnDvlBCs0IsqA|g<7Gj~&;{-ia`v`^a zWu-TY08xB26!R|n`3tA##Y-`e;_18el;^`sxxaaEsr$htn2P$?ZC|}h?6y>i9EiN* zlT&yttzd=X@02#iw?ZC7PAEA@%bov z1}iIBRNc2W%tv9^=8K-3h_<$3oKYoTh2TILw(7tqPNNOHh9>jvpH(9EiG%Hl@D zHgL1%lD5MjE0a_Y5s#_L7fHW{3f3=44bV=a`A+dB(FM0S{E*}ZOQ32TAnk;D);FYG z(9iNqZ#4WCLV{G~Q>11nWi2MX0S8%YNUbo&+Cth5Nx{^o)A%Oh9&q?bIz-wBXIP(* z+Q2kbW!Fe=Low?S=^*T3MJ#DFybB|&WRe%+LR4Q7>3yhS{gl)WC!}W8~5ONLpThw5;(N{&>| z<4SsoWXTN04N})xHA)dG+b&i4gwn2zT3WP?wU_i4c);?K2EaH|Rd$j73Nu)}q|YFh zby+7~01I=JGzitKo1}}-&YH+*GW-onBGsZstyWwHFDry}1%_EaB7F|&PpZnXhLQc%@vXZf&->3ujoLlJvVU%)BDQ3D%fYWQ=d1%k)qx zofVwvTc(T^E#+WYq*_^4sSeg!sR35CPdZ#@ZkJ);95t{-DvotPDw}mks*-g~s)5xf z)ycXhHNu*Z5_8pr;4I%E^aN(SWEm?*Y8$Ies*SZps)yy48e(~*CRkpn$RDeL$Ft5F z?n1JZ({wJYkCd)+_*quDxCbHge5EZB>GPNP--B1AToF&8nX;Nm1(UW(^@%9T?n9T# z#F2!}q)}FPf?bTm^aS6UPBAOD6~2cCR$Q)K`~ZQ8eE&<%HH(K(_l(>r4Kx@Zf?G+< zqY;n5!`l6{opg}p&aD#vfiGBZ(4qqU=gU>Zei{gv!g?=vCm>d_4(HAme(0Sq?|&|n zEiTaLhdnAZ9nbaYvXVT#AC7b5AdT?D$|N-+*cxH<$IYxKt!5E`4pxkHmN5WZrFM&F ztg%KT9-35w(S#>SbpLA+izzf?uMAtnGHbH&F+8~7f7ik+g7DO&78!$ZP)V$}YQ|v1 zXa8Rrib0bK7NIy#N_|aXSjqBT(JogrprPOA^@kpvK)BEK28;<8CU1B`n zF2Zq`g#~u;I0i0M%Y>3KmmyM+DYNIfYiB86$9b zkuP)VVmWap4lI@wt4XtPPli$jDH>~*Dpix_p!Wr(I#Mil<|#Qz@t9wr)I>@|i%n@S zDG9SzDgB-fk&OK;{U|X7^H;0zEa^GC#kxRB#W`zK_7!O%ma@JjS#XT?Jt++%OI4+@ z&@L8XF)N(37%#J8Na^TUt11`h#3k6l%pg6FBdh{a2G*=orRzx=MyyxbM9Rc`Rvjq| z>shZCn#EF#D^ryosg106qzy+9MJ`%cGm7k_eAd%N<+`w9B{Q8uD>_(3)R>3OEIVa+=w;PW zwhVh%F3OhSAnQ%amg5+!owDUP!8%1*K2CpGZS*{4dOpT6uTofm8tVpy1z5s@;&M@l z)vT~$JE@)(Ls=2-VI@;mgdMDF@thGzOa4bAZ&{s<1LI|GhaL7WB0`ykGNyA#Bpzwn6n_$l9-a3m6n+GY*uPwN=~LF z)sm8xn*Bn`uipA{3(oA0sltmHK5#2tKwC#fp{LD=)0Mkkoi~q_Amg$IJV7W=9&kgZ85lf)e_2fvL!_+iDOqnW$z!+!yMHD&Ms delta 4113 zcmYM%4Nz3q6~OU(4zRl-5UV`}N)~ z^VqUJ_p(0sYA3Eps5!C#_ST%<2EMfb!EVEyC<1C1Vpwes1Vc%!12k{zdnoiT3w@(- z6Zz-8G4+Ovn>bp#^XB4^bpl_W62jH@2bgIL4`kuXt{_|ujV`6W`tQ1&n%d(xt-l_- z*)et#JW-qaT3@nU9E&Lw>mlqLT@KM4QwJ8v|5j;tXdR?N*kh%GqzzEUxE9^a#!sh=_RnTX2ez)4naL@38@rDSP7&u2$`wo?IgVl#jIbE4nrr2_IHTa ziRBn^DhhFC6f6^7qJ;4C%o$E0c~WW|z>LK|xvsSc)C`$)&Y z>`C)9+P;cd4^Ew=)1*ciV0}P30sc>^c8ByPoVyqG_h`z+F*?JfOHNbeAGPe=PC^CaF7*F zx(MB@R8l9HW~-4uCA|k$CAxlM7u0h+NxBRptanM>5JG>s`kfghU4>%SeNqo}vfSe< z488Cl))G=5xcaGiG4bx=8XRJ+m+F67H7!fBV21RmPXlqOGh3 z(#K$&r&=?qALg*yNuNM4tB3R{M6(7p;&revM@a*4h;^TI13Focf$%tnH*> zaI$uhzJMOqUURMC9}pI(=Iu2%8b)C2LZ$s?yZ9H>N!5rl^IL{d=wvy~Et=s=7-CkN z&l<*Hf+sf6#IFDssb!i;;Tvd|DmQhQ7l}z2 zV0}o^CSja;OGb~y`iAAEF{v=tBdIi&XM(;=5o@88lNBS?%(6&zv2vt_Sw*@uc+4!7 zF(627Un3R6Iw_UKIxSVgx*%1@>Xqtd-I1DLJ(luXqIU31)GtDdV}?o=vDQmfvT~(b zS^K2=Sx%`jR;`rBPt+F8Qemu%iB}AhkR;_WT}|vIrD+^LP0SMyAaJQZvBp1c*;>~J z@C&JO|GDT+t!!GJq)Mq?5lHPJ^r$Azh3zFxvO2=-VhV!7^fet~K}sEb2X(BF6ubBy z0>b(E7n$NN9zn&k^4zqc!T1R3mBdoo;t8B$9ec)3YGXN53dIj_mvxjD73jN6t|H!` z4FQu`r&5jp;z8Egltsb?+n34bU%AN^;$d{beicm@Q*@0g$*XrkQ-oS{fVObK5|*dM z-{^{^toasq;f7AuV#@-f8#YTF6VFLeng_@UyX>R=#GOj)`$(3NaIXw zTmHX$;Vx$3$J1J4oP{GwVu!_S^hBQ({~zg%^QYx0yfIcvy-Yq>!qV@k4>su1=-;G0 zlI=1&#D2O89}J4r7j=lkQk7EWrU6Tu(FaedX1Zgsky=%g_h~i`P0Lfv#+@tW(S&}V ze6dhU9mWr@uF{*tf{9LkJOr_a{AC9vy-7cQSfM~UhH)#&0v4Yawg+Cr*MM#-q z)X0I*JZed+l}72w;g5%<9KxJ#Hu~fE8ofC*v5`0rhhrthR?-4&iC4-eEyS`Ur6N)g zwy#qA~0)<(%W^but1&EF%`;}$#Tv|K`H^CAl(m=?ht3=|a=Auai(Slk(sMY$ zN+-o**>*K_2g!^fJCyd25-^u_fRu>Utk*K!MH0s3s*$x)2Ux$CI>Tzq(Db2$%qucZ zvTjIO^LTrDuP0#QZDP6%sfq4 zu!I>$(SlA^CQVGmCYGIADz>u@P}_k0ta54_aD??bwT(E%YN56fJzh`;y+kbygIL$7 zX=xb4yiGA3t*m<#)3JaB);y7chgd#VJE@wrm|7;bup+5tVizlkniU6GTc}xajJ2DZ zO+&Fuo$V!xHuPmxQQU-KtdrC>p_z4t+GfmVU81%bi&!5~%fiE~+tjkKp7n2PTd<8a zMQsaeJxrr5Pi)0u);yb?G{IVCTO_uj$*vA+wv~_qSTnt0JPJlf$DU z6IO;tMX!zuPgs|j6rPlnl)OA4GJ56mq=;9JU)zWCI%XH*jX(6EKx@k0L`9zb_viaw=JHKN$GIeGK-ZPz0zu8d?KFHTBoZXRl0=uBY^G*ET1&i05PpEtd{{^FJZTkQK