From 8cd082bdde097dc3199b154d16a1d9e29259be6a Mon Sep 17 00:00:00 2001 From: rogerman Date: Mon, 15 Apr 2013 23:44:21 +0000 Subject: [PATCH] Cocoa Port: - Add support for changing the JIT max block size in Emulation Settings. --- desmume/src/cocoa/DefaultUserPrefs.plist | Bin 5008 -> 5046 bytes desmume/src/cocoa/cocoa_core.h | 1 + desmume/src/cocoa/cocoa_core.mm | 17 + .../English.lproj/MainMenu.strings | Bin 280734 -> 283858 bytes .../translations/English.lproj/MainMenu.xib | 636 +++++++++++++++++- .../userinterface/EmuControllerDelegate.mm | 1 + .../src/cocoa/userinterface/appDelegate.mm | 1 + 7 files changed, 621 insertions(+), 35 deletions(-) diff --git a/desmume/src/cocoa/DefaultUserPrefs.plist b/desmume/src/cocoa/DefaultUserPrefs.plist index 5e0a1c8fb69458332e9a7f31108634192cc54d82..8ee5db23a712dd4d3a073922281071999f4bf5ed 100644 GIT binary patch delta 1564 zcmX}qc~DnX6bJC{`7QS?_br#_1|ph9B9&;0ivBdA$i#ibu~B9s*K$Nf!Lv=H4^!e9n1u{&@4k3d4B+WJ}644(Boo9g0=XSt)V z+e0rVJNmSX@4aWDsNQqX@PUIyHIGf~IyxzJ{?qL>r$Y4U>?L$(Vwv zzH)#W;k_*fTGMUJz)Z}-7nqGX$naCF(!iQ)V;<&X0lZjRx9CGl zPPO0h2mVAQ{=yyKPjDCasx036+r|St#3THJzIco$FTWX3qty!hXX7b>h#cf37rCo6 z!W(XcTCz zC0MW7)R4lc5rxz1^aj1@pU5_YtO%Q$P*Zw~no)C#q!xa1i@G&il~NS7rZ(iEw$u(W z)E<{9+S^)Wrrq_e7VfLY(Ev)LCA5uB&=q>@Xy|C;=;KIn%y48mwmZ%_?l?7PBd5pt zfiuZD#ks(l?L6eXmkY!O?+ma#Q#T^d`@Hn42Ak>#*lwu$Aj0=9(}vaM`8+rf6SU2Heo z!-`mmhX9Og<@JmT${x4-}_jC_-tVgeqZ5loG3SR}z%L zO0qIpnXb%IvXs?Ip0ZmhQBEsYm21jP<*_QMmReU0S6is>tDV(uYN9$+9ivWGGt{~2 z3U#HrTHUG^t0&Y8YK2fFl1KB-yf07U$vh>EPv!IYBEE*_^UeGq zKg^HuGJb>K)1Yz9)aq-YT9_84#cJKP1Z}XEqD|9gYO}S)+FGqZE7Fc=7qxQjs`gNK z=|T_I!}Ml)q#mVr(!1*Y_2K#ieVRUBU#u_HH|Yg>p?*j|tC#CH_4|foD28UFg&5&R zq!Dd&HhLSM7)i!3BiTqdGK@@Pm62=Y8O6o{qr^CGR2Y@U6H_u3GuW(a)-xNJ&CT{^ zC$qQN&m3dUG-sQ0%(>=rGuzy17Mmx`Q|1-3!n|%i5^fNk<(G+id|x#C>Hz00dY_q5+&lWI3kXUW8%0tB~FVo;;gVmDXJca<9Vj|=lR7g GD*p%5YN%iU delta 1532 zcmX|;dvHxx6vn@G?>+mx&)H6hgi4DLsaFtMqJ1P9FEuY+vEF!DW4!7p zdhLwy(pc~N<9J@b-|%t6h9`CE5&zNTF_T7495U7;(r3jf)Kc&iu;$MG7~nb1B04AI zE2LsM)*;`!>}3?A6h}~rv$%wR@Dw{pAj6vjytf&(rf}>i?kYAS{|Qz297&jnNtlc& z-o;;FDyDfxO9|F=8#6Eyv*5;;NWpAxJH=@4G3AEV92;{n5A(4A3$X}`>rgvSqTI|% zvyqM^Sc(iRg9n*DR4zBQR@hjHEUdz6tif7j`%tJ7Y<+EGJ#w%Cx!8zJ$n)(=R~lNI zZ4{soTd)<|P=xJ1SGCg8`qsuS>_!Rp;5+QaJ|F6>hFJS;9KiQDh(kDxGW_5hSgZzE zM{OKKIetV1j^ii%>~pDFW9x*CllTRva2htMaK?ucwP5R48|QEy7w{Vr@H;O0P=)3n za2dC%a0OR!4cAeP8>qn_xak!<(mwV36Sr{(wYZCW-jDtZf7kW9db0HZ>%NT#_!kfH z2m|pLPu|S*YY>rxXEvVWKfE9ik%OE*+S>@Wm`x%{B$GlaX{6Vo7|XPYQ$4cCkLptc z@~>;R_ef@-6=+iPVe@t`HvN-?@t3qX_CkkrYK;5l!82k-B>Z@htaUV%~XOs3*nKOv<7nI!qTF z%+bgZ>FDnm;YfC@a+EkuIc_^8XJcoCvyU^undD4$<~xr&uQ>0!3|Bi>oNJ6L-L=8B z-&Ntd;(9Iw3SmMoVX!b>$P{vg{laPCj_{C~tRstNLs&AK&So+JTpEoP}K zjis|CEQ5JiCR@%{vMjcWt!8W3T9(c7#6U4vY$di6JBSftq}W}I7e|Zp#7uF8m@O8F zTf|*riC8LDiYLW0;sf!qq)NKvCk09!q;RR1^obNNjgqEFDN?GmPRfxArESsysY0rf zu1N0NQmqWxAq%p<+)QpON6J0qzVcvsm^?zBD$kLZ$ZO<0dAoc_J|dUP=j3Ynp8QM^ z6+fkg5~{ROx+%Ss0m@)yv@%w4D=EqxWx0~0Y*qFsWlE)TS-GxMD>sxH<(BeP6;(?O zQbW})YOLB z^mIK#&(t^RJM~h%TtBT>>oxi<{iz`uZp#QVLXB`E#)vg~8-0yXpS^TnPbga<|1>snPYA>i_C*& znR(PaYhE*J%_m&o8V}-4c`%RUJ^3J>$dmX?p32ks>K=SO&*2+*F5k#E@jRZ-H}e8s d$hYt!zMb#jJNY-f7 0) ? blockSize : 1; + pthread_mutex_unlock(&threadParam.mutexCoreExecute); +} + +- (NSInteger) maxJITBlockSize +{ + pthread_mutex_lock(&threadParam.mutexCoreExecute); + const NSInteger blockSize = CommonSettings.jit_max_block_size; + pthread_mutex_unlock(&threadParam.mutexCoreExecute); + + return blockSize; +} + - (void) setCoreState:(NSInteger)coreState { pthread_mutex_lock(&threadParam.mutexThreadExecute); diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings index 694d170eb480c4d4f56965694cb7cbae6e0973de..36f9c77e97a0f1dcf667a67ad7ceba8efac1001a 100644 GIT binary patch delta 1349 zcmbO?QSj1A!G;#b7N#xCaqQfg48;rz40#Os3?-A}FN;ra5@$AGR$z#p-e|!h&*(he zkcClw`YsEW8PgvvU{aVqL57)SJ0Ayg0uu>3ixw~iZTI13zQ;j=CWLjjM3}uuwQf4l zI=AUSoidY;eH3Z0kYL_kA;F?%FnwPXv%z#eA11l!O%^Od(-SP2*`|LfWD=;)1O`Ge zLkU9>Ln%Wtkj?}KNggn0k{EJ;tYn64AiEeSTE&nGWTgScihy(pLk5_i!cYlRoyd?2 zRFMo6F9M1t1J&d*6aYnXfV?6GJ)pP`P)!j-I+(A(PzL1X0PRa5F%gCPWJ35HW98+NJ+8Ul??1X`W~qzxGi7!0O2hBGTqzQE4H zXfk=Ckub9XgUNJ79cKAq?BoAF%+Z`qu$Y>B(MB8O|LHC6OhT*{z%VhH9@xqx%?^#p z$&R+kn5soh8O#}!7_5Q8sKubqzy)LjwN5_BB8{Zh(bgF)^-T8Z6BxEBXmV2kBmhmP rH!>lopke82P%2^tXQ9alO%xdoCNC@&W(K8!!a!*rusAqCJ0SYAog;IcY zIYTBx4p5>|f?0fe6FalsbhRjEh3OA?nB}IowKGahU% YES - - + + + YES @@ -3546,7 +3547,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA InputPrefsView - + 268 YES @@ -3555,6 +3556,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 12 {{13, 10}, {463, 401}} + YES @@ -3579,6 +3581,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{72, 44}, {84, 17}} + YES 68288064 @@ -3595,6 +3598,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{44, 16}, {112, 17}} + YES 68288064 @@ -3611,6 +3615,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{158, 38}, {126, 26}} + YES -2076049856 @@ -3691,6 +3696,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{289, 14}, {72, 22}} + YES -1804468671 @@ -3781,6 +3787,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{63, 72}, {93, 17}} + YES 68288064 @@ -3797,6 +3804,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{158, 66}, {126, 26}} + YES -2076049856 @@ -3864,6 +3872,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{158, 11}, {126, 26}} + YES -2076049856 @@ -3965,10 +3974,12 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA {{1, 1}, {429, 100}} + {{6, 206}, {431, 116}} + {0, 0} 67239424 @@ -4012,6 +4023,7 @@ aGVhdHMuZ2JhdGVtcC5uZXQvA 268 {{18, 14}, {100, 38}} + YES 2 1 @@ -4207,10 +4219,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {194, 62}} + {{15, 53}, {196, 78}} + {0, 0} 67239424 @@ -4244,6 +4258,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{18, 14}, {150, 38}} + YES 2 1 @@ -4434,10 +4449,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {194, 62}} + {{218, 53}, {196, 78}} + {0, 0} 67239424 @@ -4461,6 +4478,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 18}, {126, 17}} + YES 68288064 @@ -4477,6 +4495,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{339, 16}, {72, 22}} + YES -1804468671 @@ -4558,6 +4577,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{144, 12}, {189, 26}} + YES -2079981824 @@ -4579,6 +4599,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{305, 38}, {38, 11}} + YES 68288064 @@ -4599,6 +4620,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{263, 38}, {38, 11}} + YES 68288064 @@ -4615,6 +4637,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{220, 38}, {38, 11}} + YES 68288064 @@ -4631,6 +4654,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{178, 38}, {38, 11}} + YES 68288064 @@ -4647,6 +4671,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{137, 38}, {38, 11}} + YES 68288064 @@ -4661,10 +4686,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {429, 141}} + {{6, 45}, {431, 157}} + {0, 0} 67239424 @@ -4686,6 +4713,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{10, 33}, {443, 355}} + Display Views @@ -5647,6 +5675,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {489, 425} + + NSView @@ -6493,7 +6523,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView - + 268 YES @@ -6699,6 +6729,112 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + 268 + {{243, 15}, {72, 17}} + + YES + + 68288064 + 71304192 + Block Size: + + + + + + + + + 268 + {{320, 13}, {50, 22}} + + YES + + -1804468671 + -2076179456 + 100 + + + + YES + + YES + allowsFloats + formatterBehavior + locale + maximum + maximumFractionDigits + minimum + negativeInfinitySymbol + nilSymbol + numberStyle + positiveInfinitySymbol + usesGroupingSeparator + + + YES + + + + + + + -∞ + + + +∞ + + + + #0 + #0 + + + + + + + + NaN + + + + + + 3 + YES + YES + YES + + . + , + NO + NO + NO + + + YES + + + + + + + 268 + {{375, 10}, {19, 27}} + + YES + + 917024 + 0 + + 100 + 1 + YES + + {{1, 1}, {494, 62}} @@ -7303,6 +7439,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {530, 630} + NSView @@ -13321,6 +13458,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{14, 12}, {168, 32}} + YES 67239424 @@ -13341,6 +13479,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{181, 22}, {105, 17}} + YES 68288064 @@ -13357,6 +13496,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 12 {{12, 51}, {616, 5}} + {0, 0} 67239424 @@ -13379,6 +13519,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{288, 22}, {330, 17}} + YES 70385217 @@ -13406,6 +13547,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{18, 14}, {180, 102}} + YES 4 1 @@ -13624,6 +13766,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{85, 15}, {409, 21}} + YES 78773825 @@ -13642,6 +13785,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{496, 8}, {96, 32}} + YES 67239424 @@ -13662,6 +13806,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 124}, {482, 28}} + YES 67239424 @@ -13681,6 +13826,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{496, 120}, {96, 32}} + YES 67239424 @@ -13699,10 +13845,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {604, 162}} + {{17, 140}, {606, 178}} + {0, 0} 67239424 @@ -13748,6 +13896,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{18, 16}, {30, 30}} + YES 130560 @@ -13765,6 +13914,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 265 {{50, 18}, {168, 28}} + YES 69336577 @@ -13782,6 +13932,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{18, 14}, {32, 32}} + 28682 100 @@ -13790,6 +13941,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{220, 17}, {201, 26}} + YES -2076049856 @@ -13895,10 +14047,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {604, 56}} + {{17, 64}, {606, 72}} + {0, 0} 67239424 @@ -13920,6 +14074,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {640, 329} + {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -13927,14 +14082,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 279 2 - {{230, 43}, {280, 498}} + {{230, 19}, {286, 522}} -461896704 Emulation Settings NSPanel {1.79769e+308, 1.79769e+308} - + 256 YES @@ -13995,11 +14150,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{1, 1}, {244, 58}} + {{1, 1}, {250, 58}} - {{17, 404}, {246, 74}} + {{17, 428}, {252, 74}} {0, 0} @@ -14099,11 +14254,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{1, 1}, {244, 78}} + {{1, 1}, {250, 78}} - {{17, 224}, {246, 94}} + {{17, 224}, {252, 94}} {0, 0} @@ -14217,11 +14372,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{1, 1}, {244, 85}} + {{1, 1}, {250, 85}} - {{17, 119}, {246, 101}} + {{17, 119}, {252, 101}} {0, 0} @@ -14244,7 +14399,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{63, 18}, {154, 19}} + {{66, 18}, {154, 19}} YES @@ -14321,11 +14476,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{1, 1}, {244, 58}} + {{1, 1}, {250, 58}} - {{17, 41}, {246, 74}} + {{17, 41}, {252, 74}} {0, 0} @@ -14358,7 +14513,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{18, 14}, {145, 38}} + {{18, 38}, {145, 38}} YES 2 @@ -14547,12 +14702,119 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + 268 + {{198, 11}, {19, 27}} + + YES + + 68025888 + 0 + + + 100 + 100 + 1 + YES + + + + + 268 + {{157, 16}, {40, 19}} + + YES + + -1804468671 + 71435264 + + + + YES + + YES + allowsFloats + formatterBehavior + locale + maximum + maximumFractionDigits + minimum + negativeInfinitySymbol + nilSymbol + numberStyle + positiveInfinitySymbol + usesGroupingSeparator + + + YES + + + + + + + -∞ + + + +∞ + + + + #0 + #0 + + + + + + + + NaN + + + + + + 3 + YES + YES + YES + + . + , + NO + NO + NO + + + YES + + + + + + + 268 + {{74, 18}, {78, 14}} + + YES + + 68288064 + 71435264 + Block Size: + + + + + + - {{1, 1}, {244, 62}} + {{1, 1}, {250, 86}} - {{17, 322}, {246, 78}} + {{17, 322}, {252, 102}} {0, 0} @@ -14573,7 +14835,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO - {280, 498} + {286, 522} + {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -15959,7 +16222,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 256 YES @@ -15978,6 +16241,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 77}, {206, 18}} + YES -2080244224 @@ -16000,6 +16264,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 57}, {134, 18}} + YES -2080244224 @@ -16022,6 +16287,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 37}, {80, 18}} + YES -2080244224 @@ -16044,6 +16310,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{185, 12}, {45, 19}} + YES -1804468671 @@ -16124,6 +16391,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 14}, {165, 14}} + YES 68288064 @@ -16138,10 +16406,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {248, 103}} + {{17, 241}, {250, 119}} + {0, 0} 67239424 @@ -16165,6 +16435,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{65, 18}, {154, 19}} + YES -2080244224 @@ -16195,6 +16466,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{18, 14}, {107, 58}} + YES 3 1 @@ -16399,10 +16671,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {248, 82}} + {{17, 442}, {250, 98}} + {0, 0} 67239424 @@ -16436,6 +16710,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{18, 14}, {120, 98}} + YES 5 1 @@ -16700,10 +16975,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {248, 122}} + {{17, 41}, {250, 138}} + {0, 0} 67239424 @@ -16737,6 +17014,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 32}, {113, 18}} + YES -2080244224 @@ -16759,6 +17037,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 12}, {108, 18}} + YES -2080244224 @@ -16779,10 +17058,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {248, 58}} + {{17, 364}, {250, 74}} + {0, 0} 67239424 @@ -16816,6 +17097,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{16, 12}, {192, 18}} + YES 67239424 @@ -16836,10 +17118,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {248, 38}} + {{17, 183}, {250, 54}} + {0, 0} 67239424 @@ -16860,6 +17144,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {284, 560} + + {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -16874,7 +17160,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 256 YES @@ -16893,6 +17179,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{18, 14}, {61, 58}} + YES 3 1 @@ -17097,10 +17384,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {253, 82}} + {{16, 189}, {255, 98}} + {0, 0} 67239424 @@ -17134,6 +17423,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{18, 80}, {154, 38}} + YES 2 1 @@ -17327,6 +17617,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{53, 14}, {100, 58}} + YES 3 1 @@ -17531,10 +17822,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {253, 128}} + {{16, 41}, {255, 144}} + {0, 0} 67239424 @@ -17568,6 +17861,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 12}, {129, 18}} + YES -2080244224 @@ -17588,10 +17882,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {253, 38}} + {{16, 291}, {255, 54}} + {0, 0} 67239424 @@ -17625,6 +17921,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{47, 13}, {136, 21}} + YES 67501824 @@ -17646,6 +17943,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{186, 17}, {52, 17}} + YES 68288064 @@ -17736,6 +18034,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{18, 14}, {20, 20}} + YES 130560 @@ -17751,10 +18050,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {253, 44}} + {{16, 349}, {255, 60}} + {0, 0} 67239424 @@ -17778,6 +18079,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{66, 18}, {154, 19}} + YES -2080244224 @@ -17808,6 +18110,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{18, 14}, {116, 38}} + YES 2 1 @@ -17999,10 +18302,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {253, 62}} + {{16, 413}, {255, 78}} + {0, 0} 67239424 @@ -18023,6 +18328,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {288, 511} + + {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -21317,6 +21624,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA emuFlagRigorousTiming slot1StatusText slot1DeviceType + maxJITBlockSize CocoaDSCore @@ -21593,6 +21901,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + + YES + Emulation_MaxJITBlockSize + YES @@ -30889,6 +31201,70 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 8042 + + + value: selection.maxJITBlockSize + + + + + + value: selection.maxJITBlockSize + value + selection.maxJITBlockSize + 2 + + + 8062 + + + + value: selection.maxJITBlockSize + + + + + + value: selection.maxJITBlockSize + value + selection.maxJITBlockSize + 2 + + + 8063 + + + + value: values.Emulation_MaxJITBlockSize + + + + + + value: values.Emulation_MaxJITBlockSize + value + values.Emulation_MaxJITBlockSize + 2 + + + 8064 + + + + value: values.Emulation_MaxJITBlockSize + + + + + + value: values.Emulation_MaxJITBlockSize + value + values.Emulation_MaxJITBlockSize + 2 + + + 8065 + @@ -35652,11 +36028,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + - - + @@ -38771,6 +39147,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + + + @@ -38806,6 +39185,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + + + @@ -42283,6 +42665,108 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 8043 + + + YES + + + + + + 8044 + + + + + 8045 + + + YES + + + + + + 8046 + + + YES + + + + + + 8047 + + + + + 8048 + + + YES + + + + + + 8049 + + + + + 8056 + + + YES + + + + + + 8057 + + + + + 8058 + + + YES + + + + + + 8059 + + + YES + + + + + + 8060 + + + YES + + + + + + 8061 + + + + + 8066 + + + @@ -44433,6 +44917,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 8032.IBViewBoundsToFrameTransform 8033.IBPluginDependency 8034.IBPluginDependency + 8043.IBPluginDependency + 8043.IBViewBoundsToFrameTransform + 8044.IBPluginDependency + 8045.IBAttributePlaceholdersKey + 8045.IBPluginDependency + 8045.IBViewBoundsToFrameTransform + 8046.IBPluginDependency + 8047.IBNumberFormatterBehaviorMetadataKey + 8047.IBNumberFormatterLocalizesFormatMetadataKey + 8047.IBPluginDependency + 8048.IBPluginDependency + 8048.IBViewBoundsToFrameTransform + 8049.IBPluginDependency + 8056.IBPluginDependency + 8057.IBPluginDependency + 8058.IBAttributePlaceholdersKey + 8058.IBPluginDependency + 8059.IBPluginDependency + 8060.IBPluginDependency + 8061.IBPluginDependency + 8066.IBNumberFormatterBehaviorMetadataKey + 8066.IBNumberFormatterLocalizesFormatMetadataKey + 8066.IBPluginDependency 81.IBEditorWindowLastContentRect 81.IBPluginDependency 81.ImportedFromIB2 @@ -44840,7 +45347,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{1115, 256}, {489, 425}} + {{1040, 186}, {489, 425}} com.apple.InterfaceBuilder.CocoaPlugin InitialTabViewItem @@ -45081,7 +45588,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Excellent sound quality, producing the best balance between smoothness and sound detail. Neglible CPU usage. Recommended setting. - {{963, 313}, {530, 630}} + {{1060, 447}, {530, 630}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -45815,9 +46322,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AUGIAABDIwAAA com.apple.InterfaceBuilder.CocoaPlugin - {{1289, 580}, {284, 560}} + {{935, 512}, {284, 560}} com.apple.InterfaceBuilder.CocoaPlugin - {{1289, 580}, {284, 560}} + {{935, 512}, {284, 560}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -46203,9 +46710,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AUGIAABEEwAAA - {{1322, 664}, {280, 498}} + {{776, 520}, {286, 522}} com.apple.InterfaceBuilder.CocoaPlugin - {{1322, 664}, {280, 498}} + {{776, 520}, {286, 522}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -46224,7 +46731,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - AUGIAABDYAAAA + AUGIAABDh4AAA ToolTip @@ -46264,7 +46771,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - AUGIAABC7gAAA + AUGIAABDJgAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -46299,7 +46806,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - AUGIAABCJAAAA + AUGIAABCsAAAA ToolTip @@ -47203,7 +47710,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA ToolTip - Sets the dynarec engine to emulate the ARM7 and ARM9 CPUs by default. It features far superior performance to the interpreter engine, but is not compatible with all configurations. Also, some ROMs may not work or may show erratic behavior when using this engine. (This feature requires an Intel-based Mac, and will not work on a PowerPC-based Mac.) + Sets the dynarec engine to emulate the ARM7 and ARM9 CPUs by default. It features far superior performance to the interpreter engine, but is not compatible with all configurations. Also, some ROMs may not work or may show erratic behavior when using this engine. (This feature is not available on a PowerPC-based Mac.) [Changes to the CPU emulation engine will only take effect after a ROM is loaded or after the emulator is reset.] com.apple.InterfaceBuilder.CocoaPlugin @@ -47230,7 +47737,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA ToolTip - Uses the dynarec engine to emulate the ARM7 and ARM9 CPUs. It features far superior performance to the interpreter engine, but is not compatible with all configurations. Also, some ROMs may not work or may show erratic behavior when using this engine. (This feature requires an Intel-based Mac, and will not work on a PowerPC-based Mac.) + Uses the dynarec engine to emulate the ARM7 and ARM9 CPUs. It features far superior performance to the interpreter engine, but is not compatible with all configurations. Also, some ROMs may not work or may show erratic behavior when using this engine. (This feature is not available on a PowerPC-based Mac.) [Changes to the CPU emulation engine will only take effect after a ROM is loaded or after the emulator is reset.] com.apple.InterfaceBuilder.CocoaPlugin @@ -48508,6 +49015,49 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + AUM7AABBsAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Changes the maximum instruction block size for the dynamic recompiler. Larger values improve performance, but may reduce emulation accuracy. (The block size must be between 1 and 100.) + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABC/AAAwjAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCcAAAwiQAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Changes the default maximum instruction block size for the dynamic recompiler. Larger values improve performance, but may reduce emulation accuracy. (The block size must be between 1 and 100.) + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin {{709, 783}, {262, 353}} com.apple.InterfaceBuilder.CocoaPlugin @@ -48817,7 +49367,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 8042 + 8066 @@ -51382,6 +51932,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AppKit.framework/Headers/NSSliderCell.h + + NSStepper + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSStepper.h + + + + NSStepperCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSStepperCell.h + + NSTabView NSView diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm index 712215263..a094db54f 100644 --- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm +++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm @@ -1002,6 +1002,7 @@ [[NSUserDefaults standardUserDefaults] setBool:[cdsCore emuFlagAdvancedBusLevelTiming] forKey:@"Emulation_AdvancedBusLevelTiming"]; [[NSUserDefaults standardUserDefaults] setBool:[cdsCore emuFlagRigorousTiming] forKey:@"Emulation_RigorousTiming"]; [[NSUserDefaults standardUserDefaults] setInteger:[cdsCore cpuEmulationEngine] forKey:@"Emulation_CPUEmulationEngine"]; + [[NSUserDefaults standardUserDefaults] setInteger:[cdsCore maxJITBlockSize] forKey:@"Emulation_MaxJITBlockSize"]; [[NSUserDefaults standardUserDefaults] setBool:[cdsCore emuFlagUseExternalBios] forKey:@"Emulation_UseExternalBIOSImages"]; [[NSUserDefaults standardUserDefaults] setBool:[cdsCore emuFlagEmulateBiosInterrupts] forKey:@"Emulation_BIOSEmulateSWI"]; [[NSUserDefaults standardUserDefaults] setBool:[cdsCore emuFlagPatchDelayLoop] forKey:@"Emulation_BIOSPatchDelayLoopSWI"]; diff --git a/desmume/src/cocoa/userinterface/appDelegate.mm b/desmume/src/cocoa/userinterface/appDelegate.mm index 0fb7ef46b..46a115441 100644 --- a/desmume/src/cocoa/userinterface/appDelegate.mm +++ b/desmume/src/cocoa/userinterface/appDelegate.mm @@ -410,6 +410,7 @@ // Set the CPU emulation engine per user preferences. [cdsCore setCpuEmulationEngine:[[NSUserDefaults standardUserDefaults] integerForKey:@"Emulation_CPUEmulationEngine"]]; + [cdsCore setMaxJITBlockSize:[[NSUserDefaults standardUserDefaults] integerForKey:@"Emulation_MaxJITBlockSize"]]; // Set the SLOT-1 device settings per user preferences. NSString *slot1R4Path = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"EmulationSLOT1_R4StoragePath"];