mirror of https://github.com/PCSX2/pcsx2.git
Minor fixes to the IOP Interpeter and const prop regarding the SLTIU instruction.
Removed the rest of the references to the UseGui global boolean since it wasn't used anymore. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@761 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
cbe108e99d
commit
3821425442
|
@ -381,6 +381,7 @@ static __forceinline void execI()
|
||||||
{
|
{
|
||||||
psxRegs.code = iopMemRead32(psxRegs.pc);
|
psxRegs.code = iopMemRead32(psxRegs.pc);
|
||||||
|
|
||||||
|
//if( (psxRegs.pc >= 0x1200 && psxRegs.pc <= 0x1400) || (psxRegs.pc >= 0x0b40 && psxRegs.pc <= 0x1000))
|
||||||
PSXCPU_LOG("%s\n", disR3000AF(psxRegs.code, psxRegs.pc));
|
PSXCPU_LOG("%s\n", disR3000AF(psxRegs.code, psxRegs.pc));
|
||||||
|
|
||||||
psxRegs.pc+= 4;
|
psxRegs.pc+= 4;
|
||||||
|
@ -395,6 +396,7 @@ static void doBranch(s32 tar) {
|
||||||
branch2 = iopIsDelaySlot = true;
|
branch2 = iopIsDelaySlot = true;
|
||||||
branchPC = tar;
|
branchPC = tar;
|
||||||
execI();
|
execI();
|
||||||
|
PSXCPU_LOG( "\n" );
|
||||||
iopIsDelaySlot = false;
|
iopIsDelaySlot = false;
|
||||||
psxRegs.pc = branchPC;
|
psxRegs.pc = branchPC;
|
||||||
|
|
||||||
|
|
|
@ -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 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 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 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 *
|
* Register arithmetic *
|
||||||
|
|
|
@ -149,7 +149,6 @@ extern AppData gApp;
|
||||||
extern HWND hStatusWnd;
|
extern HWND hStatusWnd;
|
||||||
extern PcsxConfig winConfig; // local storage of the configuration options.
|
extern PcsxConfig winConfig; // local storage of the configuration options.
|
||||||
|
|
||||||
extern bool UseGui;
|
|
||||||
extern bool nDisableSC; // screensaver
|
extern bool nDisableSC; // screensaver
|
||||||
extern unsigned int langsMax;
|
extern unsigned int langsMax;
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include "iR5900.h"
|
#include "iR5900.h"
|
||||||
|
|
||||||
static bool sinit = false;
|
static bool sinit = false;
|
||||||
bool UseGui = true;
|
|
||||||
bool nDisableSC = false; // screensaver
|
bool nDisableSC = false; // screensaver
|
||||||
|
|
||||||
// This instance is not modified by command line overrides so
|
// This instance is not modified by command line overrides so
|
||||||
|
@ -442,11 +441,6 @@ namespace HostGui
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if( !UseGui ) {
|
|
||||||
// not using GUI and user just quit, so exit
|
|
||||||
WinClose();
|
|
||||||
}
|
|
||||||
|
|
||||||
nDisableSC = 0;
|
nDisableSC = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ PSXRECOMPILE_CONSTCODE1(SLTI);
|
||||||
//// SLTIU
|
//// SLTIU
|
||||||
void rpsxSLTIU_const()
|
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)
|
void rpsxSLTUconst(int info, int dreg, int sreg, int imm)
|
||||||
|
|
Loading…
Reference in New Issue