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

newHostVM: Some Linux compilation fixes, warning removals. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/newHostVM@4023 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-11-16 05:32:31 +00:00
parent 9a0a89aa13
commit 2ca8278c65
6 changed files with 84 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/Utilities/Linux/LnxHostSys.cpp
View File

@ -17,6 +17,8 @@
#include "../PrecompiledHeader.h" #include "../PrecompiledHeader.h"
#include "PageFaultSource.h" #include "PageFaultSource.h"
#include <wx/thread.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
@ -169,7 +171,7 @@ void HostSys::MmapResetPtr(void* base, size_t size)
pxAssertRel ((uptr)result != (uptr)base, pxsFmt( pxAssertRel ((uptr)result != (uptr)base, pxsFmt(
"Virtual memory decommit failed: memory at 0x%08X -> 0x%08X could not be remapped. " "Virtual memory decommit failed: memory at 0x%08X -> 0x%08X could not be remapped. "
"This is likely caused by multi-thread memory contention.", base, base+size "This is likely caused by multi-thread memory contention.", base, (uptr)base+size
)); ));
} }

1
pcsx2/CDVD/IsoFileFormats.cpp
View File

@ -78,7 +78,6 @@ bool isoFile::tryIsoType(u32 _size, s32 _offset, s32 _blockofs)
bool isoFile::Detect( bool readType ) bool isoFile::Detect( bool readType )
{ {
char buf[32]; char buf[32];
int len = m_filename.Length();
m_type = ISOTYPE_ILLEGAL; m_type = ISOTYPE_ILLEGAL;

1
pcsx2/Memory.cpp
View File

@ -92,7 +92,6 @@ static vtlbHandler
null_handler, null_handler,
tlb_fallback_0, tlb_fallback_0,
tlb_fallback_1,
tlb_fallback_2, tlb_fallback_2,
tlb_fallback_3, tlb_fallback_3,
tlb_fallback_4, tlb_fallback_4,

2
pcsx2/PluginManager.cpp
View File

@ -1278,7 +1278,7 @@ void SysCorePlugins::Init( PluginsEnum_t pid )
if( !m_info[pid] || m_info[pid]->IsInitialized ) return; if( !m_info[pid] || m_info[pid]->IsInitialized ) return;
Console.Indent().WriteLn( "Init %s", tbl_PluginInfo[pid].shortname ); Console.Indent().WriteLn( "Init %s", tbl_PluginInfo[pid].shortname );
if( NULL != m_info[pid]->CommonBindings.Init() ) if( 0 != m_info[pid]->CommonBindings.Init() )
throw Exception::PluginInitError( pid ); throw Exception::PluginInitError( pid );
m_info[pid]->IsInitialized = true; m_info[pid]->IsInitialized = true;

10
pcsx2/gui/AppAssert.cpp
View File

@ -19,10 +19,6 @@
#include <wx/stackwalk.h> #include <wx/stackwalk.h>
static wxString pxGetStackTrace( const FnChar_t* calledFrom )
{
wxString stackTrace;
class StackDump : public wxStackWalker class StackDump : public wxStackWalker
{ {
protected: protected:
@ -84,14 +80,14 @@ static wxString pxGetStackTrace( const FnChar_t* calledFrom )
//briefName.Printf( L"(%s:%d)", wxfn.GetFullName().c_str(), frame.GetLine() ); //briefName.Printf( L"(%s:%d)", wxfn.GetFullName().c_str(), frame.GetLine() );
wxfn.SetVolume( wxEmptyString ); wxfn.SetVolume( wxEmptyString );
int count = wxfn.GetDirCount(); //int count = wxfn.GetDirCount();
for( int i=0; i<2; ++i ) for( int i=0; i<2; ++i )
wxfn.RemoveDir(0); wxfn.RemoveDir(0);
essenName.Printf( L"%s:%d", wxfn.GetFullPath().c_str(), frame.GetLine() ); essenName.Printf( L"%s:%d", wxfn.GetFullPath().c_str(), frame.GetLine() );
} }
m_stackTrace += wxString::Format( L"[%02d] %-44s %s\n", m_stackTrace += pxsFmt( L"[%02d] %-44s %s\n",
frame.GetLevel()-m_skipped, frame.GetLevel()-m_skipped,
name.c_str(), name.c_str(),
essenName.c_str() essenName.c_str()
@ -99,6 +95,8 @@ static wxString pxGetStackTrace( const FnChar_t* calledFrom )
} }
}; };
static wxString pxGetStackTrace( const FnChar_t* calledFrom )
{
StackDump dump( calledFrom ); StackDump dump( calledFrom );
dump.Walk( 3 ); dump.Walk( 3 );
return dump.GetStackTrace(); return dump.GetStackTrace();

2
pcsx2/vtlb.cpp
View File

@ -35,7 +35,7 @@
#include "COP0.h" #include "COP0.h"
#include "R5900Exceptions.h" #include "R5900Exceptions.h"
#include "Utilities\MemsetFast.inl" #include "Utilities/MemsetFast.inl"
using namespace R5900; using namespace R5900;
using namespace vtlb_private; using namespace vtlb_private;