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

IopMem: Added FireWire port handling to the new IopHardware handlers (oops!). 

EErec: Removed an instance of duplicated cycle counting for split blocks.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1146 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-05-07 15:56:10 +00:00
parent c64691811a
commit 9c0a978d5c
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/ps2/Iop/IopHwRead.cpp
View File

@ -395,7 +395,7 @@ mem32_t __fastcall iopHwRead32_Page8( u32 addr )
const int parm = (masked_addr-0x240) / 8; const int parm = (masked_addr-0x240) / 8;
ret = (masked_addr & 4) ? sio2_getSend2( parm ) : sio2_getSend1( parm ); ret = (masked_addr & 4) ? sio2_getSend2( parm ) : sio2_getSend1( parm );
} }
else else if( masked_addr <= 0x280 )
{ {
switch( masked_addr ) switch( masked_addr )
{ {
@ -423,6 +423,10 @@ mem32_t __fastcall iopHwRead32_Page8( u32 addr )
break; break;
} }
} }
else if( addr >= pgmsk(HW_FW_START) && addr <= pgmsk(HW_FW_END) )
{
ret = FWread32( addr );
}
} }
else ret = psxHu32(addr); else ret = psxHu32(addr);

6
pcsx2/ps2/Iop/IopHwWrite.cpp
View File

@ -521,7 +521,7 @@ void __fastcall iopHwWrite32_Page8( u32 addr, mem32_t val )
const int parm = (masked_addr-0x240) / 8; const int parm = (masked_addr-0x240) / 8;
if(masked_addr & 4) sio2_setSend2( parm, val ); else sio2_setSend1( parm, val ); if(masked_addr & 4) sio2_setSend2( parm, val ); else sio2_setSend1( parm, val );
} }
else else if( masked_addr <= 0x280 )
{ {
switch( masked_addr ) switch( masked_addr )
{ {
@ -536,6 +536,10 @@ void __fastcall iopHwWrite32_Page8( u32 addr, mem32_t val )
break; break;
} }
} }
else if( addr >= pgmsk(HW_FW_START) && addr <= pgmsk(HW_FW_END) )
{
FWwrite32( addr, val );
}
} }
else psxHu32(addr) = val; else psxHu32(addr) = val;

10
pcsx2/ps2/Iop/IopHw_Internal.h
View File

@ -190,13 +190,13 @@ static __forceinline const char* _log_GetIopHwName( u32 addr )
{ {
return "SPU2"; return "SPU2";
} }
else if( addr >= 0x1f808200 ) else if( addr >= pgmsk(HW_FW_START) && addr <= pgmsk(HW_FW_END) )
{ {
if( addr < 0x1f808240 ) return "FW";
return "SIO2 param";
else if( addr < 0x260 )
return "SIO2 send";
} }
else if( addr >= 0x1f808200 && addr < 0x1f808240 ) { return "SIO2 param"; }
else if( addr >= 0x1f808240 && addr < 0x1f808260 ) { return "SIO2 send"; }
return "Unknown"; return "Unknown";
} }
} }

3
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -1623,11 +1623,8 @@ StartRecomp:
} }
else else
{ {
assert( branch != 3 );
if( branch ) if( branch )
assert( !willbranch3 ); assert( !willbranch3 );
else
ADD32ItoM((int)&cpuRegs.cycle, eeScaleBlockCycles() );
if( willbranch3 || !branch) { if( willbranch3 || !branch) {