From 37f998407b6df905d7be217b739daa88f4dcf373 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 16 Feb 2013 09:49:33 +0100 Subject: [PATCH] Replace "Core" with "Jit" in ini. Don't show Open dialog by default (use Ctrl+A or Ctrl+O to open it). Delete "Slightly Faster Interpreter". --- Core/Config.cpp | 6 +- Core/Config.h | 2 +- Core/CoreParameter.h | 1 - Core/MIPS/MIPS.cpp | 4 -- Core/MIPS/MIPSTables.cpp | 118 ------------------------------------ Core/MIPS/MIPSTables.h | 1 - Core/MemMapFunctions.cpp | 4 +- Windows/EmuThread.cpp | 2 +- Windows/WndMainWindow.cpp | 14 ++--- Windows/main.cpp | 12 ++-- Windows/ppsspp.rc | Bin 55936 -> 56832 bytes android/jni/EmuScreen.cpp | 2 +- android/jni/MenuScreens.cpp | 8 +-- android/jni/NativeApp.cpp | 8 +-- native | 2 +- 15 files changed, 22 insertions(+), 162 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 9b5cfe94b5..ae887f2cba 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -55,8 +55,8 @@ void CConfig::Load(const char *iniFileName) general->Get("ShowDebuggerOnLoad", &bShowDebuggerOnLoad, false); IniFile::Section *cpu = iniFile.GetOrCreateSection("CPU"); - cpu->Get("Core", &iCpuCore, 2); - cpu->Get("FastMemory", &bFastMemory, false); + cpu->Get("Jit", &bJit, true); + cpu->Get("FastMemory", &bFastMemory, true); IniFile::Section *graphics = iniFile.GetOrCreateSection("Graphics"); graphics->Get("ShowFPSCounter", &bShowFPSCounter, false); @@ -117,7 +117,7 @@ void CConfig::Save() general->Set("CurrentDirectory", currentDirectory); general->Set("ShowDebuggerOnLoad", bShowDebuggerOnLoad); IniFile::Section *cpu = iniFile.GetOrCreateSection("CPU"); - cpu->Set("Core", iCpuCore); + cpu->Set("Jit", bJit); cpu->Set("FastMemory", bFastMemory); IniFile::Section *graphics = iniFile.GetOrCreateSection("Graphics"); diff --git a/Core/Config.h b/Core/Config.h index e14cfe06d4..de54372064 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -48,7 +48,7 @@ public: // Core bool bIgnoreBadMemAccess; bool bFastMemory; - int iCpuCore; + bool bJit; // GFX bool bDisplayFramebuffer; diff --git a/Core/CoreParameter.h b/Core/CoreParameter.h index 0ff37be9ed..3357fc027d 100644 --- a/Core/CoreParameter.h +++ b/Core/CoreParameter.h @@ -22,7 +22,6 @@ enum CPUCore { CPU_INTERPRETER, - CPU_FASTINTERPRETER, // unsafe, a bit faster than INTERPRETER CPU_JIT, }; diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp index 7fbaa7c974..478d2c99e5 100644 --- a/Core/MIPS/MIPS.cpp +++ b/Core/MIPS/MIPS.cpp @@ -143,11 +143,7 @@ int MIPSState::RunLoopUntil(u64 globalTicks) MIPSComp::jit->RunLoopUntil(globalTicks); break; - case CPU_FASTINTERPRETER: // For jit-less platforms. Crashier than INTERPRETER. - return MIPSInterpret_RunFastUntil(globalTicks); - case CPU_INTERPRETER: - // INFO_LOG(CPU, "Entering run loop for %i ticks, pc=%08x", (int)globalTicks, mipsr4k.pc); return MIPSInterpret_RunUntil(globalTicks); } return 1; diff --git a/Core/MIPS/MIPSTables.cpp b/Core/MIPS/MIPSTables.cpp index ea58c8de4c..06e30466c3 100644 --- a/Core/MIPS/MIPSTables.cpp +++ b/Core/MIPS/MIPSTables.cpp @@ -1016,124 +1016,6 @@ static inline void DelayBranchTo(MIPSState *curMips, u32 where) curMips->inDelaySlot = true; } -// Optimized interpreter loop that shortcuts the most common instructions. -// For slow platforms without JITs. -#define SIMM16 (s32)(s16)(op & 0xFFFF) -#define UIMM16 (u32)(u16)(op & 0xFFFF) -#define SUIMM16 (u32)(s32)(s16)(op & 0xFFFF) -int MIPSInterpret_RunFastUntil(u64 globalTicks) -{ - MIPSState *curMips = currentMIPS; - while (coreState == CORE_RUNNING) - { - CoreTiming::Advance(); - - while (curMips->downcount >= 0 && coreState == CORE_RUNNING) // TODO: Try to get rid of the latter check - { - again: - bool wasInDelaySlot = curMips->inDelaySlot; - u32 op = Memory::ReadUnchecked_U32(curMips->pc); - switch (op >> 29) - { - case 0x0: - { - int imm = (s16)(op&0xFFFF) << 2; - int rs = _RS; - int rt = _RT; - u32 addr = curMips->pc + imm + 4; - switch (op >> 26) - { - case 4: if (R(rt) == R(rs)) DelayBranchTo(curMips, addr); else curMips->pc += 4; break; //beq - case 5: if (R(rt) != R(rs)) DelayBranchTo(curMips, addr); else curMips->pc += 4; break; //bne - case 6: if ((s32)R(rs) <= 0) DelayBranchTo(curMips, addr); else curMips->pc += 4; break; //blez - case 7: if ((s32)R(rs) > 0) DelayBranchTo(curMips, addr); else curMips->pc += 4; break; //bgtz - default: - goto interpret; - } - } - break; - - case 0x1: - { - int rt = _RT; - int rs = _RS; - switch (op >> 26) - { - case 8: R(rt) = R(rs) + SIMM16; break; //addi - case 9: R(rt) = R(rs) + SIMM16; break; //addiu - case 10: R(rt) = (s32)R(rs) < SIMM16; break; //slti - case 11: R(rt) = R(rs) < SUIMM16; break; //sltiu - case 12: R(rt) = R(rs) & UIMM16; break; //andi - case 13: R(rt) = R(rs) | UIMM16; break; //ori - case 14: R(rt) = R(rs) ^ UIMM16; break; //xori - case 15: R(rt) = UIMM16 << 16; break; //lui - default: - goto interpret; - } - currentMIPS->pc += 4; - } - break; - - case 0x4: - { - int rt = _RT; - int rs = _RS; - int imm = (s16)(op & 0xFFFF); - u32 addr = R(rs) + imm; - switch (op >> 26) - { - case 32: R(rt) = (u32)(s32)(s8) Memory::ReadUnchecked_U8(addr); break; //lb - case 33: R(rt) = (u32)(s32)(s16)Memory::ReadUnchecked_U16(addr); break; //lh - case 35: R(rt) = Memory::ReadUnchecked_U32(addr); break; //lw - case 36: R(rt) = Memory::ReadUnchecked_U8(addr); break; //lbu - case 37: R(rt) = Memory::ReadUnchecked_U16(addr); break; //lhu - default: - goto interpret; - } - currentMIPS->pc += 4; - } - break; - - case 0x5: - { - int rt = _RT; - int rs = _RS; - int imm = (s16)(op & 0xFFFF); - u32 addr = R(rs) + imm; - switch (op >> 26) - { - case 40: Memory::WriteUnchecked_U8(R(rt), addr); break; //sb - case 41: Memory::WriteUnchecked_U16(R(rt), addr); break; //sh - case 43: Memory::WriteUnchecked_U32(R(rt), addr); break; //sw - default: - goto interpret; - } - currentMIPS->pc += 4; - } - break; - - default: - interpret: - MIPSInterpret(op); - } - - if (curMips->inDelaySlot) - { - // The reason we have to check this is the delay slot hack in Int_Syscall. - if (wasInDelaySlot) - { - curMips->pc = curMips->nextPC; - curMips->inDelaySlot = false; - } - curMips->downcount -= 1; - goto again; - } - } - } - return 1; -} - - const char *MIPSGetName(u32 op) { static const char *noname = "unk"; diff --git a/Core/MIPS/MIPSTables.h b/Core/MIPS/MIPSTables.h index 9c15072b53..2d71bc73d1 100644 --- a/Core/MIPS/MIPSTables.h +++ b/Core/MIPS/MIPSTables.h @@ -57,7 +57,6 @@ void MIPSCompileOp(u32 op); void MIPSDisAsm(u32 op, u32 pc, char *out, bool tabsToSpaces = false); u32 MIPSGetInfo(u32 op); void MIPSInterpret(u32 op); //only for those rare ones -int MIPSInterpret_RunFastUntil(u64 globalTicks); int MIPSInterpret_RunUntil(u64 globalTicks); MIPSInterpretFunc MIPSGetInterpretFunc(u32 op); diff --git a/Core/MemMapFunctions.cpp b/Core/MemMapFunctions.cpp index ee2370c0da..d174cdb7e1 100644 --- a/Core/MemMapFunctions.cpp +++ b/Core/MemMapFunctions.cpp @@ -83,7 +83,7 @@ inline void ReadFromHardware(T &var, const u32 address) } else { - if (g_Config.iCpuCore == CPU_JIT) { + if (g_Config.bJit) { WARN_LOG(MEMMAP, "ReadFromHardware: Invalid address %08x", address); } else { WARN_LOG(MEMMAP, "ReadFromHardware: Invalid address %08x PC %08x LR %08x", address, currentMIPS->pc, currentMIPS->r[MIPS_REG_RA]); @@ -115,7 +115,7 @@ inline void WriteToHardware(u32 address, const T data) } else { - if (g_Config.iCpuCore == CPU_JIT) { + if (g_Config.bJit) { WARN_LOG(MEMMAP, "WriteToHardware: Invalid address %08x", address); } else { WARN_LOG(MEMMAP, "WriteToHardware: Invalid address %08x PC %08x LR %08x", address, currentMIPS->pc, currentMIPS->r[MIPS_REG_RA]); diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp index cd38e3ead5..ac7e4fc153 100644 --- a/Windows/EmuThread.cpp +++ b/Windows/EmuThread.cpp @@ -68,7 +68,7 @@ DWORD TheThread(LPVOID x) coreParameter.fileToStart = fileToStart; coreParameter.enableSound = true; coreParameter.gpuCore = GPU_GLES; - coreParameter.cpuCore = (CPUCore)g_Config.iCpuCore; + coreParameter.cpuCore = g_Config.bJit ? CPU_JIT : CPU_INTERPRETER; coreParameter.enableDebugging = true; coreParameter.printfEmuLog = false; coreParameter.headLess = false; diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 8db545ffd4..b99eb0edbd 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -452,15 +452,11 @@ namespace MainWindow break; case ID_CPU_DYNAREC: - g_Config.iCpuCore = CPU_JIT; + g_Config.bJit = true; UpdateMenus(); break; case ID_CPU_INTERPRETER: - g_Config.iCpuCore = CPU_INTERPRETER; - UpdateMenus(); - break; - case ID_CPU_FASTINTERPRETER: - g_Config.iCpuCore = CPU_FASTINTERPRETER; + g_Config.bJit = false; UpdateMenus(); break; @@ -701,9 +697,8 @@ namespace MainWindow // CHECK(ID_OPTIONS_EMULATESYSCALL,g_bEmulateSyscall); CHECKITEM(ID_OPTIONS_DISPLAYRAWFRAMEBUFFER, g_Config.bDisplayFramebuffer); CHECKITEM(ID_OPTIONS_IGNOREILLEGALREADS,g_Config.bIgnoreBadMemAccess); - CHECKITEM(ID_CPU_INTERPRETER,g_Config.iCpuCore == CPU_INTERPRETER); - CHECKITEM(ID_CPU_FASTINTERPRETER,g_Config.iCpuCore == CPU_FASTINTERPRETER); - CHECKITEM(ID_CPU_DYNAREC,g_Config.iCpuCore == CPU_JIT); + CHECKITEM(ID_CPU_INTERPRETER,g_Config.bJit == true); + CHECKITEM(ID_CPU_DYNAREC,g_Config.bJit == false); CHECKITEM(ID_OPTIONS_BUFFEREDRENDERING, g_Config.bBufferedRendering); CHECKITEM(ID_OPTIONS_SHOWDEBUGSTATISTICS, g_Config.bShowDebugStats); CHECKITEM(ID_OPTIONS_WIREFRAME, g_Config.bDrawWireframe); @@ -731,7 +726,6 @@ namespace MainWindow EnableMenuItem(menu,ID_FILE_QUICKLOADSTATE,!enable); EnableMenuItem(menu,ID_CPU_DYNAREC,enable); EnableMenuItem(menu,ID_CPU_INTERPRETER,enable); - EnableMenuItem(menu,ID_CPU_FASTINTERPRETER,enable); EnableMenuItem(menu,ID_DVD_INSERTISO,enable); EnableMenuItem(menu,ID_FILE_BOOTBIOS,enable); EnableMenuItem(menu,ID_EMULATION_STOP,!enable); diff --git a/Windows/main.cpp b/Windows/main.cpp index b568189d07..48fce377a6 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -76,15 +76,11 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin switch (__argv[i][1]) { case 'j': - g_Config.iCpuCore = CPU_JIT; + g_Config.bJit = true; g_Config.bSaveSettings = false; break; case 'i': - g_Config.iCpuCore = CPU_INTERPRETER; - g_Config.bSaveSettings = false; - break; - case 'f': - g_Config.iCpuCore = CPU_FASTINTERPRETER; + g_Config.bJit = false; g_Config.bSaveSettings = false; break; case 'l': @@ -163,8 +159,8 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin EmuThread_Start(fileToStart); } - else - MainWindow::BrowseAndBoot(); + // else + // MainWindow::BrowseAndBoot(); if (fileToStart != NULL && stateToLoad != NULL) SaveState::Load(stateToLoad); diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index ae0ec17aca726288296c2fedbdc44e6521e70732..e0a82cd7f4231adcd17ae6abe95c146ffc5fc198 100644 GIT binary patch delta 1856 zcmZuxTTl~c6yAk2V92H+#gqZWEh26)4FM^alwyd0NF!1Vkp`p-#)uIi+*(Aif!1D> zsmiCtB9l^Nf&)>IMd}49Dqd>^8Ah!S4r3V~e4y5GtPdUA*~MDubav+Z&*eYoJLmj6 z$8o~bG3dG1I*%eGLrg=}{Sg1vOG?N(!#R~qi_R^z!>45w?X_Jq?XfqSy&z6aM@8$ixWA_|F8 zqKc@*^5$4Ps>^_yRv=#<0Naiu2=dh;;}bQk6-pfR-P`0)b4EoA3AZB#-;~J_<(Ce+ zJ`R0;Hni3!z%<{C)_OJA1_>U_?-k_pN)zaM5jS;Uio~>kH217I$^(YLCY)}GfKSjT zupCljAV`ZVhputAnw%t37bc^3{}HHZ295)2xFbSv5> zho1YoEt7;{Ne~>aWO%r&oTDRz`eutT7`{K{&NR3q5}?^B zMPfq;=cl1bF7b0Y$=!8kk=(uS~`z^P>z*aaJ@QW0096f_u3)rsK?LJQfCBj}{&AM%?I8fz~R8e0FUf zI=UG=*0Kmc&f?fREFK{%Pp{< z_=k%XWQ|#jI9(A!ug-A(sVjo{2NuIg76hMUkghkPzYODgBb=jBXim|{SfLPd zI$}g{uE@vpQ!H|ltwMcM$(3Nw%WSR%c=00)uO-3!xif@nwb`;)@J|*Hok9q6$N6X5LDaX@%nw zi%Xd%#9SW6bgmyJ-#3B1!U{cRu1|z4OOB~51^g#w=1Z?N!F9D7(rgJHt<4kalV*qE zpfLmVPYk5lH9|c9J`c0a`0V-sa+2i`uVc~mGlRx;MbO@0k(pBr@hBs3KF!I4bCiWV zR}bBo9vX8orpIa_&*e`QI&$Su-Au%EZaJKzVVKNOq9t#3ovcvbt@ZhEPSBt`rLcE( zA!=J3Zq$@`We_PuHj#{^?Tc{jLk;phqF&*b2L*CjBnmrwAudq*zFa4~hma7Fs4obF z$BqEx6a>A>TT+M&B3bZJs4G~=`vOCVJVHZ+2-aDCLP9Ki8UL(6DrBc$d_oMWZbzUk znufXaBqSUDkNlgjj>$t&1RYE6||z$MsFoLXH1& zB>mS;6`Ohax6Qn_&c>t9 z79PJ9a7po3B!wOUFK(?v@5FgLE0IzBB!nd`%$q8WCn=u1SIw3n-9=`uVm51pgy zE2`({_bb}w=v|eGb98yt+hWbJtAAapC=Op}e8%I|+*KgbV+(?iZuii^=1rvl}CC2EcTe5%IRa E0pB~nh5!Hn delta 3299 zcmbtWYfPKh8Gg+@AA}Hxo4M6E;5d%)<%>rgLWmPCfs_zR2uTR#;$RmTHI8i5SNT*I!g*4P3Q`Bt)tZcwWq#=4sTH|1kKMwxJ0w!{cFp^M-=Z5UWW;#PEJV~fc<>(mI(s62_COq+# zp(T-rO3C9FiFdH2)ZuE9p5b4U%vhh&p+4El=Jm;GSWT{EV_ix)!|9Y7Ci`sK#^$aW zas9=%a-;>8AkVX)IV~O9R3Ex;>#&(xDXm?FYTkl>T(iN)^H|*eD<(giUX{vGEj3XM zal~O#tw72SBlsJ7RDIZjPj?){v???8DA{O;hRMrfs@`s-h^VH@Fq@&1ahSWm7t=l~ z)_oQ5?ySJNPlu;F?+WpnfkGrQS`lq@fs-^+5axi$M!hMJtVZ6T-dqnseQ zJTiWw!&kZWQIt9qW{H*z{7Jz>p7$9Gv;Edh$n$jgB0s?Jy@ClwOGRM?(gHjd3NJ^5 ze`!I1XCLUL@W+KjV(r7+m^PojCZuANrEE4sj!k7Ywv>)A&nIWASy{N|ESOdmMQJIX zpNp_=(%%wG5j`b^$x_*&$85q%i7q1Mo!VVUD=mP}n~7Dm4qIwnqM3|j!Ca{U>!oJQ zm&%c+&Xq7b%S2}4NGbiKgfl%?)k;Z^9$RW2t9Nu*y`z;`FuBKo=SHdnaL7UZXfeAu*eI$3e9Aq z{n7ix*kI~C94{2KNq?&_vVj}uA`Ou<)V#&_eh8PY5i7cJY~7cmvCM(3`=es>?~as> z(fq{Ww;w5xX$UrrP&MkPT#GFt$C5D*TgoQnn(|mvbeohi`1lw9MQPkL z%H(fWc828I4|lV%?W_?cRl#)){!-P6WvkXcNd5E{^^unbX^fOqM?K^rFWJdWN@^gd zGhpJ;A{Tk7pVhaA zRG9Q;G1;$bL}CQO@6-x*HQ?*q0x4Ll8({O^$Y zVDyBIt*tdCfqUJ{R4ht(qOn8zHo*4FPnBcwWD7%clZYz}r^N5)wfN@LAd|V)JQ6FU zZS`cQL2`u!<9nkwz8RQl}9S!fUTiUy7g?O44Ki0Q*bhdk70jtf>~f2obRZ}7{=cptwR zv?b<9D20M9!8bMTc6H{wf=v{6?*gyCDdSN5&S4pc+p>O4^l*^J6=AW*i0SXE;g92F z;)TWQZ%S9$-)*m@2G16bO!${gk);ejF@mSl%%oyh2N_BAGJ(VqF9?*y6d)z3C|Y8_ zAaUfsNw}$loXk$}K8(^6et$@T6xt&LdE-zSCNv4SVm~3?75jo=8puFOI!YJmA}e0u zc6RPCrtH{J1_O?yqo-VA(Yl=o6<+mj+&OyIgYTgq|5cb|1u=TZx)0dbh~=D_AHVzs(n znu&YfB8JbrDNv1QARo3eygXb7)rb-Q9@arM(!tgiMoJidJu=Gh`uAoT+D5A|KiZ1< z(Q@d=bnKDi98206RlCgk>{u?dK3|#%*Kiu1kMa3YJA+Rm@yQ^i{Ga2+A%0{Viim{C zHg}_OqXh1ab74=u=v@tPZ^+TPS&6t!6;?J&!giZ_3!!1#vx=N2@5l9DW4HrRLM$fIkYSW09Zp8R2dScm=W>6_bvrN