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

Reformatted Mpeg.cpp. Reworked mpeg2sliceIDEC a bit, and added a fix which I'm not totally sure of, so it's currently disabled. Did a few other misc cleanups. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1483 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-07-10 18:19:38 +00:00
parent b0861c6d81
commit 4601e4e225
4 changed files with 1144 additions and 994 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2117
pcsx2/IPU/mpeg2lib/Mpeg.cpp
View File

File diff suppressed because it is too large Load Diff

2
pcsx2/VUops.cpp
View File

@ -2048,7 +2048,7 @@ void _vuXITOP(VURegs * VU) {
void _vuXGKICK(VURegs * VU)
{
u32* ptr = (u32*)GET_VU_MEM(VU, (VU->VI[_Is_].US[0]*16) & (VU == &VU1 ? 0x3fff : 0xfff));
// u32* ptr = (u32*)GET_VU_MEM(VU, (VU->VI[_Is_].US[0]*16) & (VU == &VU1 ? 0x3fff : 0xfff));
// int temp = 0x4000 - ((VU->VI[_Is_].US[0]*16) & 0x3fff);
// u32 tempmem[0x8000];

9
pcsx2/VifDma.cpp
View File

@ -464,11 +464,6 @@ static int VIFalign(u32 *data, vifCode *v, unsigned int size, const unsigned int
if (vif->cl != 0 || (size & 0xf)) //Check alignment for SSE unpacks
{
#ifdef PCSX2_DEBUG
static int s_count = 0;
#endif
int incdest;
if (vifRegs->cycle.cl >= vifRegs->cycle.wl) // skipping write
@ -611,10 +606,6 @@ static void VIFunpack(u32 *data, vifCode *v, unsigned int size, const unsigned i
if (vifRegs->cycle.cl >= vifRegs->cycle.wl) // skipping write
{
#ifdef PCSX2_DEBUG
static int s_count = 0;
#endif
if (v->addr >= memlimit)
{
//DevCon::Notice("Overflown at the start");

10
pcsx2/x86/iR3000A.cpp
View File

@ -213,9 +213,9 @@ static void iIopDumpBlock( int startpc, u8 * ptr )
f = fopen( "mydump1", "wb" );
fwrite( ptr, 1, (uptr)x86Ptr - (uptr)ptr, f );
fclose( f );
sprintf( command, "objdump -D --target=binary --architecture=i386 -M intel mydump1 | cat %s - > tempdump", filename );
sprintf( command, "objdump -D --target=binary --architecture=i386 -M intel mydump1 | cat %s - > tempdump", filename.c_str() );
system( command );
sprintf(command, "mv tempdump %s", filename);
sprintf(command, "mv tempdump %s", filename.c_str());
system(command);
f = fopen( filename.c_str(), "a+" );
#endif
@ -702,6 +702,7 @@ static __forceinline u32 psxRecClearMem(u32 pc)
jASSUME(blockidx != -1);
// Variable assignment in the middle of the while statements condition?
while (pexblock = recBlocks[blockidx - 1]) {
if (pexblock->startpc + pexblock->size * 4 <= lowerextent)
break;
@ -710,6 +711,7 @@ static __forceinline u32 psxRecClearMem(u32 pc)
blockidx--;
}
// Same here.
while (pexblock = recBlocks[blockidx]) {
if (pexblock->startpc >= upperextent)
break;
@ -818,6 +820,7 @@ static void iPsxBranchTest(u32 newpc, u32 cpuBranch)
x86SetJ8( j8Ptr[0] );
}
#if 0
//static const int *s_pCode;
#if !defined(_MSC_VER)
@ -833,6 +836,7 @@ static void checkcodefn()
Console::WriteLn("iop code changed! %x", params pctemp);
}
#endif
#endif
void rpsxSYSCALL()
{
@ -878,7 +882,7 @@ void psxRecompileNextInstruction(int delayslot)
static u8 s_bFlushReg = 1;
// pblock isn't used elsewhere in this function.
BASEBLOCK* pblock = PSX_GETBLOCK(psxpc);
//BASEBLOCK* pblock = PSX_GETBLOCK(psxpc);
if( IsDebugBuild )
MOV32ItoR(EAX, psxpc);