ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcsx2: sign compare mismatch 3/3

This commit is contained in:
Gregory Hainaut 2014-04-14 21:02:36 +02:00
parent 27a4bc5a39
commit dd8666036c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Hw.cpp
View File

@ -157,7 +157,7 @@ __ri bool hwMFIFOWrite(u32 addr, const u128* data, uint qwc)
pxAssert((dmacRegs.rbor.ADDR & 15) == 0); pxAssert((dmacRegs.rbor.ADDR & 15) == 0);
pxAssert((addr & 15) == 0); pxAssert((addr & 15) == 0);
if(qwc > ((dmacRegs.rbsr.RMSK + 16) >> 4)) DevCon.Warning("MFIFO Write bigger than MFIFO! QWC=%x FifoSize=%x", qwc, ((dmacRegs.rbsr.RMSK + 16) >> 4)); if(qwc > ((dmacRegs.rbsr.RMSK + 16u) >> 4u)) DevCon.Warning("MFIFO Write bigger than MFIFO! QWC=%x FifoSize=%x", qwc, ((dmacRegs.rbsr.RMSK + 16) >> 4));
// DMAC Address resolution: FIFO can be placed anywhere in the *physical* memory map // DMAC Address resolution: FIFO can be placed anywhere in the *physical* memory map
// for the PS2. Its probably a serious error for a PS2 app to have the buffer cross // for the PS2. Its probably a serious error for a PS2 app to have the buffer cross
// valid/invalid page areas of ram, so realistically we only need to test the base address // valid/invalid page areas of ram, so realistically we only need to test the base address

2
pcsx2/Interpreter.cpp
View File

@ -395,7 +395,7 @@ static void intExecute()
while (cpuRegs.pc != EELOAD_START); while (cpuRegs.pc != EELOAD_START);
eeloadReplaceOSDSYS(); eeloadReplaceOSDSYS();
} }
if (ElfEntry != -1) { if (ElfEntry != 0xFFFFFFFF) {
do do
execI(); execI();
while (cpuRegs.pc != ElfEntry); while (cpuRegs.pc != ElfEntry);

2
pcsx2/x86/ix86-32/iR5900LoadStore.cpp
View File

@ -71,7 +71,7 @@ REC_FUNC(SQC2);
__aligned16 u64 retValues[2]; __aligned16 u64 retValues[2];
void _eeOnLoadWrite(int reg) void _eeOnLoadWrite(u32 reg)
{ {
int regt; int regt;

2
pcsx2/x86/ix86-32/iR5900Templates.cpp
View File

@ -106,7 +106,7 @@ void eeRecompileCode0(R5900FNPTR constcode, R5900FNPTR_INFO constscode, R5900FNP
_addNeededGPRtoXMMreg(_Rt_); _addNeededGPRtoXMMreg(_Rt_);
if( GPR_IS_CONST1(_Rs_) || GPR_IS_CONST1(_Rt_) ) { if( GPR_IS_CONST1(_Rs_) || GPR_IS_CONST1(_Rt_) ) {
int creg = GPR_IS_CONST1(_Rs_) ? _Rs_ : _Rt_; u32 creg = GPR_IS_CONST1(_Rs_) ? _Rs_ : _Rt_;
int vreg = creg == _Rs_ ? _Rt_ : _Rs_; int vreg = creg == _Rs_ ? _Rt_ : _Rs_;
// if(g_pCurInstInfo->regs[vreg]&EEINST_XMM) { // if(g_pCurInstInfo->regs[vreg]&EEINST_XMM) {

4
plugins/zzogl-pg/opengl/ZZoglShaders.cpp
View File

@ -602,7 +602,7 @@ bool ZZshLoadExtraEffects()
SHADERHEADER* header; SHADERHEADER* header;
bool bLoadSuccess = true; bool bLoadSuccess = true;
const int vsshaders[4] = { SH_REGULARVS, SH_TEXTUREVS, SH_REGULARFOGVS, SH_TEXTUREFOGVS }; const u32 vsshaders[4] = { SH_REGULARVS, SH_TEXTUREVS, SH_REGULARFOGVS, SH_TEXTUREFOGVS };
for(int i = 0; i < 4; ++i) { for(int i = 0; i < 4; ++i) {
LOAD_VS(vsshaders[i], pvs[2*i]); LOAD_VS(vsshaders[i], pvs[2*i]);
@ -690,7 +690,7 @@ FRAGMENTSHADER* ZZshLoadShadeEffect(int type, int texfilter, int fog, int testae
else else
texwrap = TEXWRAP_REPEAT_CLAMP; texwrap = TEXWRAP_REPEAT_CLAMP;
int index = GET_SHADER_INDEX(type, texfilter, texwrap, fog, s_bWriteDepth, testaem, exactcolor, context, 0); u32 index = GET_SHADER_INDEX(type, texfilter, texwrap, fog, s_bWriteDepth, testaem, exactcolor, context, 0);
assert( index < ArraySize(ppsTexture) ); assert( index < ArraySize(ppsTexture) );
FRAGMENTSHADER* pf = ppsTexture+index; FRAGMENTSHADER* pf = ppsTexture+index;