diff --git a/pcsx2/R3000AInterpreter.cpp b/pcsx2/R3000AInterpreter.cpp index 3753aa0979..094eb29b72 100644 --- a/pcsx2/R3000AInterpreter.cpp +++ b/pcsx2/R3000AInterpreter.cpp @@ -380,8 +380,9 @@ void psxJALR() { if (_Rd_) { _SetLink(_Rd_); } doBranch(_u32(_rRs_)); } static __forceinline void execI() { psxRegs.code = iopMemRead32(psxRegs.pc); - - PSXCPU_LOG("%s\n", disR3000AF(psxRegs.code, psxRegs.pc)); + + //if( (psxRegs.pc >= 0x1200 && psxRegs.pc <= 0x1400) || (psxRegs.pc >= 0x0b40 && psxRegs.pc <= 0x1000)) + PSXCPU_LOG("%s\n", disR3000AF(psxRegs.code, psxRegs.pc)); psxRegs.pc+= 4; psxRegs.cycle++; @@ -395,6 +396,7 @@ static void doBranch(s32 tar) { branch2 = iopIsDelaySlot = true; branchPC = tar; execI(); + PSXCPU_LOG( "\n" ); iopIsDelaySlot = false; psxRegs.pc = branchPC; diff --git a/pcsx2/R3000AOpcodeTables.cpp b/pcsx2/R3000AOpcodeTables.cpp index ccd5c3c00c..7433bda285 100644 --- a/pcsx2/R3000AOpcodeTables.cpp +++ b/pcsx2/R3000AOpcodeTables.cpp @@ -58,7 +58,7 @@ void psxANDI() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) & _ImmU_; } // Rt = Rs void psxORI() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) | _ImmU_; } // Rt = Rs Or Im void psxXORI() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) ^ _ImmU_; } // Rt = Rs Xor Im void psxSLTI() { if (!_Rt_) return; _rRt_ = _i32(_rRs_) < _Imm_ ; } // Rt = Rs < Im (Signed) -void psxSLTIU() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) < _ImmU_; } // Rt = Rs < Im (Unsigned) +void psxSLTIU() { if (!_Rt_) return; _rRt_ = _u32(_rRs_) < (u32)_Imm_; } // Rt = Rs < Im (Unsigned) /********************************************************* * Register arithmetic * diff --git a/pcsx2/windows/Win32.h b/pcsx2/windows/Win32.h index 737fe1b149..1ad9e1ca58 100644 --- a/pcsx2/windows/Win32.h +++ b/pcsx2/windows/Win32.h @@ -149,7 +149,6 @@ extern AppData gApp; extern HWND hStatusWnd; extern PcsxConfig winConfig; // local storage of the configuration options. -extern bool UseGui; extern bool nDisableSC; // screensaver extern unsigned int langsMax; diff --git a/pcsx2/windows/WinSysExec.cpp b/pcsx2/windows/WinSysExec.cpp index 7ecf2862b8..f797094183 100644 --- a/pcsx2/windows/WinSysExec.cpp +++ b/pcsx2/windows/WinSysExec.cpp @@ -25,7 +25,6 @@ #include "iR5900.h" static bool sinit = false; -bool UseGui = true; bool nDisableSC = false; // screensaver // This instance is not modified by command line overrides so @@ -442,11 +441,6 @@ namespace HostGui } else { - if( !UseGui ) { - // not using GUI and user just quit, so exit - WinClose(); - } - nDisableSC = 0; } diff --git a/pcsx2/x86/iR3000Atables.cpp b/pcsx2/x86/iR3000Atables.cpp index 6fd3885604..2ace926c44 100644 --- a/pcsx2/x86/iR3000Atables.cpp +++ b/pcsx2/x86/iR3000Atables.cpp @@ -97,7 +97,7 @@ PSXRECOMPILE_CONSTCODE1(SLTI); //// SLTIU void rpsxSLTIU_const() { - g_psxConstRegs[_Rt_] = g_psxConstRegs[_Rs_] < _ImmU_; + g_psxConstRegs[_Rt_] = g_psxConstRegs[_Rs_] < (u32)_Imm_; } void rpsxSLTUconst(int info, int dreg, int sreg, int imm)