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

The usual batch of Linux fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2885 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-04-22 00:48:06 +00:00
parent 5643a95a0e
commit bf1d011049
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/CDVD/CDVD.cpp
View File

@ -334,12 +334,12 @@ static __forceinline void _reloadElfInfo(wxString elfpath)
if (fname.Matches(L"????_???.??*"))
DiscID = fname(0,4) + L"-" + fname(5,3) + fname(9,2);
Console.WriteLn("Disc ID = %s", DiscID.ToUTF8());
Console.WriteLn("Disc ID = %s", DiscID.ToUTF8().data());
elfptr = loadElf(elfpath);
ElfCRC = elfptr->getCRC();
Console.WriteLn("ELF (%s) CRC = %8.8X", elfpath.ToUTF8(), ElfCRC);
Console.WriteLn("ELF (%s) CRC = %8.8X", elfpath.ToUTF8().data(), ElfCRC);
ElfEntry = elfptr->header.e_entry;
Console.WriteLn("Entry point = 0x%08x", ElfEntry);

3
pcsx2/HwWrite.cpp
View File

@ -190,6 +190,7 @@ static void DmaExec( void (*func)(), u32 mem, u32 value )
cpuClearInt( ChannelNumber(mem) );
}
//Sanity Check for possible future bug fix0rs ;p
//Spams on Persona 4 opening.
if(reg->chcr.TAG != chcr.TAG) DevCon.Warning(L"32bit CHCR Tag on %s changed to %x from %x QWC = %x Channel Active", ChcrName(mem), chcr.TAG, reg->chcr.TAG, reg->qwc);
//Here we update the LOWER CHCR, if a chain is stopped half way through, it can be manipulated in to a different mode
//But we need to preserve the existing tag for now
@ -1232,4 +1233,4 @@ void __fastcall hwWrite128_generic(u32 mem, const mem128_t *srcval)
UnknownHW_LOG("Unknown Hardware write 128 at %x with value %x_%x (status=%x)", mem, srcval[1], srcval[0], cpuRegs.CP0.n.Status.val);
break;
}
}
}

2
pcsx2/Interpreter.cpp
View File

@ -20,7 +20,7 @@
#include "R5900OpcodeTables.h"
#include "System/SysThreads.h"
#include "ElfHeader.h"
#include "Elfheader.h"
#include <float.h>

2
pcsx2/R5900.cpp
View File

@ -27,7 +27,7 @@
#include "Hardware.h"
#include "ElfHeader.h"
#include "Elfheader.h"
#include "CDVD/CDVD.h"
#include "Patch.h"

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

@ -29,7 +29,7 @@
#include "GS.h"
#include "CDVD/CDVD.h"
#include "ElfHeader.h"
#include "Elfheader.h"
#if !PCSX2_SEH
# include <csetjmp>