mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-08 23:35:08 +01:00
newHostVM branch: (now boots games!)
* EE and IOP recompilers are using the new RecompiledCodeReserve class. * PS2 main memory should typically be located at 0x20000000 (code still need some cleanups) VU0/VU1 recompilers will be implemented soon. git-svn-id: http://pcsx2.googlecode.com/svn/branches/newHostVM@3959 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
1 parent
01541f2c92
commit
bed33749b5
10 files changed
+99
-38
No files matched your search
@@ -68,12 +68,6 @@ wxString DiagnosticOrigin::ToString( const wxChar* msg ) const
|
||||
}
|
||||
|
||||
|
||||
bool pxAssertImpl_LogIt( const DiagnosticOrigin& origin, const wxChar *msg )
|
||||
{
|
||||
wxLogError( L"%s", origin.ToString( msg ).c_str() );
|
||||
return false;
|
||||
}
|
||||
|
||||
// Because wxTrap isn't available on Linux builds of wxWidgets (non-Debug, typically)
|
||||
void pxTrap()
|
||||
{
|
||||
@@ -94,6 +88,16 @@ void pxTrap()
|
||||
#endif // Win/Unix
|
||||
}
|
||||
|
||||
|
||||
bool pxAssertImpl_LogIt( const DiagnosticOrigin& origin, const wxChar *msg )
|
||||
{
|
||||
//wxLogError( L"%s", origin.ToString( msg ).c_str() );
|
||||
wxMessageOutputDebug().Printf( L"%s", origin.ToString( msg ).c_str() );
|
||||
pxTrap();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
DEVASSERT_INLINE void pxOnAssert( const DiagnosticOrigin& origin, const wxChar* msg )
|
||||
{
|
||||
// Recursion guard: Allow at least one recursive call. This is useful because sometimes
|
||||
|
||||
Reference in new issue
Block a user