From 36838c669a6101e8c2bba2dc48c72bdc0942fdab Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 17 Oct 2024 08:49:51 -0400 Subject: [PATCH] update timings for atmel --- Assets/dll/GBAHawk.dll | Bin 246784 -> 246784 bytes libHawk/GBAHawk/Mappers.h | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/dll/GBAHawk.dll b/Assets/dll/GBAHawk.dll index 43020bc33085af34d581868c67fb3413569245d2..631eac4ba00b411f9b7583626e389ed70a1d8d8d 100644 GIT binary patch delta 13582 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 XwYyWgl4?755 delta 13576 zcma)?d3;UB|NrMblbelfBqWIJ#1ca6BogZlQ9+1ZVyBkS*jjo+Vu>qlI2gN7irPgT zv?O*u(psvP4=P$EYAHpliu--dy_d%4=Z{|=kLP{8=RND0GiPSboMg=L$e81iM?s^% z_87+Oe~(yjU>WXSoedX^^|v|KX+d;{dgr_F=bYMW+>lKVw0VZ&@)@g$<;Lf9ij6uS zx0m(gti(|>Io6{K+D^v`z6S;f)+y)fy_X%CHQs@-c=PuqUuriTE42F@k@1M^>-;v- zh{(xS_kq1Bc6TgeM)R4HRI7XC-aNaTF-N2MbV-N&=1#XAOoMu>vT_PHIXkL~iixq3 z&Ng4(=2E`qHebfpQoiaoU&?lyFT)9W%iDa#drJ8%y#(_}E{yZ=ntA!4v!h4yDVRAW zFypkmvJ0aV5sx;!EVSiestqmdzC(5&I-n%n?mJe>=bb;!Z4&vcNVXR7w5zN2GV*2- zE18r3%KZV+GVPwHKTXYd@fzt!Q?&Gov#6E!PsKDkr;YNR#=GTchbqNu4g7-XwwCNS zjSruvZK)iu1yl;=|CqJbm8Q}(t+3K4^3)@dW-YD~OwBam zpTYOdv1a|=KbR7<$8emUZB6lQ)nMwc-Kd&D*R_;@sg$B!512!jw4s4x_^Wo>#lRqH zt33~#OZ&CVpcHzj-3kh(Mw(M_2LC!!TN9e<+M}ni-pm_qw6bAUG|vz>3ec*COsADv zUPvFhsJ#pcrm9*%Xom8Hj-(S>nXsDVq%{hg&Sz$5YeJ0WDQ>R;gVLDe)2X|yw1b*= zwP1488duBUGfk){P`gqsp0;Zt)oar4+6UFA(`fB%^*;2aRy#Zx?dlvpg{M!`zN_P_ z{T!Y^?poa%$<$GsT_cp{Yg=jzp;}tGn#nX=8(Fg|?bfnu4pSXbGmWRU(DEX}l&jWQ z-z&`pYjxZqirw=}$W9Lpj5l9Y<2OR{terxs+PKW$<7N!PYUwbl03bEApciF(PD zuLaciA!n^&{X80`U92BV-)I%1f=Ou2qQwD7(?LvcC zYM}WvOraC`6B~9T3eo=4s3o<`cWwNN_^%&oUNJSb6)gh%Om*zdEcdpVIh~wJei)^7 zZqwLlF1oI$Bv0Gav=jexBr?VO=0?0X!!4~>v%$QsEzPOg?@i;c1vXFRAC6Gv_!-`x zrq@VSv9l+-yr`s_zxGwr##)~iJ~UMu*P?@Og<9_|c%=42i^2TsVb+2>*L-i9FNRyM zsCQ#kaGG`{x)GiZ&zKH=lWM5+0qowpJ#c!MHT{f6D*X~|XUrwKrDeBl%>##MhuT!v zp0y0-`>SiKT2&x7Ei!hr>C8Z4cc*ddh@ag8BVP66e&rl)bAJ5Bxn4QD*_@-_ICGUV zMme*mRkY@L+Z#k-sW2U zxcX)048r7ZD^nXA7hNXyZTO<5$JO$6wT8`Stx4Qaj!Jx~MAKfxCG+J2alP@>P+Qrm zBF)jhZWZI$y@Fu(YHES;!CK|k!>F^C**b(T9;nT28Kj+R9mIL++b&uWV(lV4D{W%v zTP>$eeTvWu+jQV3f~^si5YfcxTwT@6ck&0ebtH`55$!sYpSG`E01eizw2S3G^m{X2 zeMbkr_ii21rnVo!o!+LSHCjDm1^%pGe!Q_8@x(rF3;50dy~88s3rjqw^9vIC^4y+p z6W6T#-o&5g7bL7TkXakpbs&Z3AM0AV43*8i*-yXOj~)d_I`Df{COCTRX&-dY8^3|~ z+(qYfqj~mTOotwO9LShikO9+@Ue#ky=enUSW!dQz;!^bHPexCtK0J1XzHB;u!6`t- zWKm~ImY-!&JUx(?v#1@_kpVNQ6)l$om3YeaO4`bjnbeNE3mG|!8c>=XGK*T$S$+L1 zx+O@HbLY}BdM?Av)SV9NpO`6u(**rw4!Jt;kuznN1yn))Hs4xa!~zONU5N{*3o2Q= zfCls1D{LvMYN-FR9HP-=?qT;m({L$(gN=Z<6c{^KDjCgH{`V;#WW45m9Dp@`rjnDZ!PuZU%(rzQVNq)t$B~w*2b~)+)CVP`J zRbE>`$#h6>u#$cux3Dyo*=#MyPY+#9J-DgW`qC{g>2?%BTM}GjNvJJW)${g}BatMw zn=$h~7LY3?<+i+&|DzM{Qh%K1e<{1z2i>yI^>4I%Qk4OBg-%=egr+JuIa zF`KZ@GUg#nl`A&dBD~ms6)|sm ziHzAyyD`1UXH`#TkUH94b zkX=vN^&Hf1FR?IC4@84_&>f_L31B)z8p*l%@8%5W6jX(ktx&Wo# zc2${GIN(iK`fn%ya_8IFI*W=A+B*BFp0FKHf4RP`?7i5xz}DFf^us%;9Qn2R27Loe zU@_PVj)JT5!7fS;+kb%AdGH(HC^HyDfF__7NC3%lL_Q6|H1=IS9@}Tqc{gUC^Rm`% z>gck#rMgQC=ik>&yJ;E^n^cI41y?|uL&T1No8azY8wO~s4AQ9|^_M1{u(gu70aGyf zRNjkX3uMe*il*su>Rt+@6uELQ#W~k${@P;B+Lf-~-iry(^T(#IEf{e1@1G)Oo;PEM zY`>q@il`p1QXV(LEy$@}9oLCPq8f1ax z;A>C>LQbGlz#uRiYzAk*6QJs2?&PlKcyW+sge7;jSlXCRW(cgPKg z$t3>lWbc61N63%YdvuzZBOduGpf%_P#)73_J2(b@2Zry6RR+yv&M}Irwi?q%A-D+~ z&k#!i*&q+>0Y#wsIXN<)+Ud2A(+*dPl-JKv9scyTbUR1&$a_P}bHu5E9{U63I8eI& z{UvH7Ob*wH4gZB$=C7EZK+J87OE4D91C0@%0)J2FpP=GTHk41%JAPEcvY2Z^Z z4=e_2Kt4DIE`ht?DX;+7Vv1qMQTdPH7I*^qEn;3E5Yz?DL1!=sOaf*g!53h=Jamwozu}YW712-|tTsWp?-GtD| zC5yArd%6GIAy&Nv*AE{2My%RB%m&~p7=EAFBKW@mJHbhC1N;f-F0ry85Yz&VKu6F6 zq=Hdk64;0`FMJxsZC4{Bd{T4;gIoaYC`ML~tm|l=&9V~#Sc@e z9951-ngSQ8E}a*;MD1N}bVIKW&2@3&>=PHx8kON}9XJIhmE|nljWbtw&i(>L9-Mvc z$yo(2&VB-i%W>8X8}(1XUm)C@vt^*74`)6VIBN|Sg71AfE9b}ATHsoVS7XVQI9me# z1}!RcHn0lRpR*xgEBFQY%DD1;n14Owc|!--ai!=WkCo?*eLRa_Su%^A60%2yMkc72 zQFGSpaOvgE8(?I$^X3kmhU*Q?w4|tP2bqMDaZ!P!B$WJ&Vg&-4)_DS*-ZbtdHO?^3E&ap!i85d<`z|OSrTU*3E^>S zPzuuf1@f!jrY^P6+u$QG9dxP9*-LObg0ugE19doys>|6X@L?opq4hX3f+BDm%&O1X z2T`2mfSq7%1I~VH$XWfyC>KmY#9)sP;*->yY9$nm# zv!G6#wN2#AuM212fR^1j%S__zJ`Mmk59Ms?FwQ)Nb9PCm{@mZQ+{2l#Y+J33A0wkV zYkG!^9K%ywY9Lq}G?4Sh@Bq1Y43BoMh_qOjSLmlV7r_(Y`6=oFMlb}-_>{-6)i4Uc zufWxWYX>brFE9~kU>i6MN`N7QvoO#Rq{$Hzc%WzIr`Acrt2h(Ay>R+eedz@Lgi_~E z$NdI}z!mTqyZ|mUPzz`Zx_}X2Jjenoz-~|kZh;5D0xF{Dx}ZH60EUB)^#_yqOyRO@ z@+*t#^m+OxpYR}ZPM?iC1mudTJlr&84risgfS6yvAK(Sxh<63$?37OXKHCTB{Qv*c z$GlUyDliO0fX1LDXb(DrULX~W0ONqQK{9(95B5x*XzSo5pIJLNRL5O?LNrF-ZsIe! zDL)(c7+65?T-+Kk21u|U`~n=!=s?gFd;6c~vTpmWN zpK{s9tRi^`U6-+v2hvoTDtV|&a;UA?xiW7)_tw`+-i}Ohi!nig*&rWW z0Z&0+`7bkJuL0kIyP)C{Ookv8OarUIF>nXCEyaBT-N7WV5)^=6fzvXK9MBm|0CE{O zu>&x|mUA{AdK>fr9|ALY0tT$Y%nddG3#h!BvuH2~ zECidtLGTms$ioZ{n&z1>ZeeT!KY==HkOAZa!&+Pg*Z@v~2f+OcTscSrm)6;s0{aZO z2U^3|3oHZ)=2Mw3l00Vbz;U?wurbH&n_kwZfR=2rJ_V09VTGGiUFL%~9&3R{^IPX;S^rCZxL38UnBT!IP<N3c6Dr@e!xB`X`a%PfnZl@loPOq91i*L$Oy-6-iA+4>~4$HWkn4 zjQ&A0K}6r_iOt0gj?>4;7;&7c>3_wDencnr?y)G7vh<~K!i&>*eRFGZjA)BKuB~W9 zILO@CPSoN&{*>(1R8-ZU7)2_lld^k9VZm`__XJe&v)-|jI85B*i1g?zrqet*zq63o z{MSen88k|Ml_-L!i(Zr{su8bQs1o_gvR%apzM;St_`Ivg<_-n2Qa7>6l!I>r$@re& zicdW+z+HT_D8v_&wK#pR6D?R@@Ej~`DcHz3!Fsn6Y*t&rrnVF8)AoXuj~6TppG)6h z>>!v0OzkLGzXZV^g0-Cl3;jT_{LX?+=_1(9u7dgCd)l_{qW9a3Zwh#$BYL0$e8Nk| z7fdtQ1a{#|X=ES4)_`r`E|}aG6#&@}h4vS030M!V%lS#7GNtHSlSDYtFnO`N=?O9i@B9eU zl*i0t_&s4*BO`l@;HdGH)prWFL6DN9vW($~vPQ{LOpsZH>4Erw(aIJdrQ+)#{)8bx z&g?DXTn|=aEY5PyVi+yY_7*KELVETQzBRo^Bca4s+qswLvMC0X4nkbwU6lGw{R3=Ca0*vyARQ-oK}|1=QOD;jyPM$Lw$rdjzKT>5re#s z_@R|E3)9^b%*Uh7~Yim@n>mBZ>KvHOVuX+gFV9>{Ah$ z&8ICs9bi~|lB8EZQQl-!-t2@>XPoIa*@pn4T0l^X6P|3wzN>+LS^FUxya^$rxlL#j zW40k1?KS2oJF^gHxduNKHXFt($u|5l(v~t7_8nwBVK@Mfivue>VbEdW%^1EzusSGn zud^!o!$Nfj_NlBV97t9DuixwzHx&Nt1c$&kPBNO^M!j(&qpy6>PgJQaDj=OX|2eWp zS=vSw8gr8H+M;?YNQU;ugZYQ-(_i@4EV5pAoHNdccUn!9cj!n_5xT)>JwYxxZ&9b& zK3C=1{&@V_$WzExYq5_izAe6?wta-oN61`gtf%Y-Han-2uPt0#dJPcGOos-m41Gfr zjeng*Z~UQxnMWi09YICmnJ;L9r!h0yj7GBwjuxNg-neSjB}fx~qzIQ)ZwvyKu(^mp z<8s`B5Wf2mUop_|Fxb{|O8TsOX)$IxhnCz{jm~uD_WYUhKLgPC`||MsafSBF(QWw#94m?q7e-#d}hSTfRFT58u z)MKn+C)#ApJZX92VKRi-ZhRex3M$3bHijHGpwM4aMKv#4@X|72vT=}G0~qMp$Fj;m zv7me%3=lLYu+I_OyKzQzh&(hi%{RX zw%G9hi7k;U2aAu~`wYOd5ca60#lv{Q&{|dqv8F<1FjUc)m5zS%YgPl0rCggIP=9eei`kQP0?O^?#YW*E!{Z;9A5XLLUbSHD1yf;+*>2$BGs_vL9877+1Ks{u*xGok5 z&po5WWD0%s5f(UHmuLFB3YYco4C1BNEYa3^g)Ko}{qATn+lM0cahc*5(frLn9;taE z31qAjEF)L-A!Bdi&;W)p$}S-8!oP9y^Vz~rAd$X#wwUi6-Fk#z1>gcW_Mu=`!SXSJ zeKr=$C%80Duxp^&c)>h}2$tf;*jd;X6n#=o$;Ha#AQ$C|K3>Ixu+XLtnVcRvdJH02 zv84H;JO%1L^Tj>xorX-#8wCsZ!cRrO-2&k&D}w)xPGqw--V(a#d|Ks@gq37 zNw6RsK^oG_TEjIYv9rp@FabZsnsfo9b8s1Ss4IIX4+^)2Wy8gyx=-E)96Ez*8&p=t ztYLgA6(K%p+i`9VGQP4!S;KPEVo})#1BBHBJM2-`u)MNZwDgJHg=1Cl)E;FG%Ls{F zrK9|CO6fSBM_!Qqq^Lfm@EX4BfD5V_>Z+2;Si?Wy9DUSg_?kQ5h}*ynN1d4RJp{SR z&oE}-f7i#}&5O&jmM`y05zxDIRbH+R%(a0RbKT{brfyF77EljALx8t?+5`-NT=laD zKeOIi7q2PbOZ5{xQLvR+wz$K!N>Cx}_%z|_0LVJ(C8^+DKg}p*LbTIzMEXk3T zj`zYR?J~QZiVbNFDI$?asy5wHZF+zor>)oxx+kK-I%(=>1%76|wVc=VV~uz#2kEg? z1VtAH;6(>m`?I_QD{t>R<+~KbnK#N(xBGv?)_ijGQW0W$r-;hVtTNhN0qyoeyA7({ zH8~5c#s9s|cf#+v&eHJ}98s1V$|`HU)vOhc5y9I*eaq0*>X@H|mo?Q^FGuEuQC$|J zT8#nae+Hbl*{X{id2yZA3S{asQPE&Cr!5m9O+B-4d;qdkDb{DnU=4SeiQ^u7 z$tu2d*qTRPSte>llYl^NZcfk!^Q`YK#R*XX;6^AQV=}L#K zdF8Jt#{ZpSR81HqswP{KpcSGsU6A8eV48>=DA)urd55h~YgleYRJ|0;leu8GJ?h;s zCLuK$;a)Rr#jSDDuoA;-B8Ik_?>&bKW&$TMn$_RWupg8P+a6J8=GxUUP31vhtoks) z+JPJPJXK)#2G8x`L9oY^idW&WrQ%&GIm!(yg`1Bm5S`1`Bhoxvu(Fe&^3+NZ^)~9s zXu+n9!T;zXYMSn~N(|$s;;)FsZpN4UjhG=}KZ2$p?70PVFf?~P!k9UCK$V@b4e3B3 zNK~^be8sRC2m~o0V-w<0RwOiUD}10BL?V6e8pMIzJbaE?Lnc-X<18F(9TH>qKKq5O zqO>pntu#_qjJQ~6A~*|F#VOzs@-b*2h(tLVz!Mb0p9|8EF9RBj3(G*7ytTw`?-A^8 z;Hm2q*N7NzQ)muWp$&NPgO>dq-<7fYctV%p1J?@Jc~Ez(RJ)bG)T*UcuQ#ieQn{Si zbEHw4wGw4vduK?B%lp)tGhQ5JSAG#Lzr9e4!0 zn*Z3YEE4K<-ezZ9z^%l-AP_sD(hE2C3MT8KuQmsz7k{-exLQnX9sEk~{ERDut#l7Q z)Src|v;Y*tR(cCOf~|D-9h<)pI{YF2qXi3Z=@nY7?9s3APdZyn!fL3`!7GqR>20hb zTVN|KaKv{S*oDx&Sapk(U20V>z4EFRxmqZ`C}E{jdZPx8*I+9x0fS*Ht%M~s9k$XE z6Mj@g>2+AG$77qIV)&J+4}#yqR$3_zjZm4PPk{25UUy3`nWdLgwalLHi33)wW=b!C zCa_J)xDAX5C{^G6dcsy3HWFW-U}sFg*N7>c#bU&kUTsUSs%mvD09%k=>AqRmRKQl+ zaW+2Vs&cZ?h|g@BjYl}yUX+hR{bEFvUMx#5u4?^NrxRQ|~8rhk{<(o3vbYRmqD^I0TP8Ul)7D@_2` zU@Pqj?!#8<{wo@a^3wjMX*>jA{SZ> zTY$c>)$(t8vma3UH<*VArAgQftb<*8BcL`2rv?jl6n>>=Krw8kKY~ZFA3@#mO6Iu} zKofv!P+#b5yFCYb8Q^urWHlaQtKf|ckDzJ8a3!#nuEA=)4)!|eO`xXCTTtH-wnCNu z1}-4YeQ3XtC=_-EG!Lka^G0aWhj{ehS2_u(_oNk2{X;zeDzF!U$M%S)(C|?j0KBWsLcPtiK18-a>Ydd_a& zg4RwGtjaE%4u`Gox6*ZXTWKQpLA8Qs@T)gdyv4I5*m&D#e*jY~ z0(j-eMjrn?4m%Rs3-sNHdk>vux7AyedUaBMrRrTu*-F)ml(LnomndZ`Rj*abR%*1{ z>di;J?kGRB15+yaP A&j0`b diff --git a/libHawk/GBAHawk/Mappers.h b/libHawk/GBAHawk/Mappers.h index 2ae6fcc..571efe1 100644 --- a/libHawk/GBAHawk/Mappers.h +++ b/libHawk/GBAHawk/Mappers.h @@ -3661,11 +3661,12 @@ namespace GBAHawk // this is important to ex Sonic Advance if (Next_Ready_Cycle != 0xFFFFFFFFFFFFFFFF) { - // according to data sheet, upper bit returns 0 when an operation is in progress + // according to data sheet, upper bit returns complement of last written byte when an operation is in progress // and the 6th bit alternates - // this is important to ex Sonic Advance ret_value &= 0x7F; + ret_value |= ((~Write_Value) & 0x80); + ret_value &= 0xBF; if (Force_Bit_6) @@ -3712,7 +3713,7 @@ namespace GBAHawk if (Write_Count == 128) { - Next_Ready_Cycle = Core_Cycle_Count[0] + 40000 + (uint64_t)Flash_Sector_Erase_Offset; + Next_Ready_Cycle = Core_Cycle_Count[0] + 30000 + (uint64_t)Flash_Sector_Erase_Offset; Chip_Mode = 0; }