From 4dec10976d1ee220987d3f287f31bcd74bd2ef6f Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Wed, 27 Oct 2010 23:22:19 +0000 Subject: [PATCH] newHostVM: Working on linux side now ... (WIP) git-svn-id: http://pcsx2.googlecode.com/svn/branches/newHostVM@3976 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/Utilities/VirtualMemory.cpp | 28 +++++++++++++++++++++ common/src/Utilities/Windows/WinHostSys.cpp | 14 ----------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/common/src/Utilities/VirtualMemory.cpp b/common/src/Utilities/VirtualMemory.cpp index 8eab5a1edc..6e6915b677 100644 --- a/common/src/Utilities/VirtualMemory.cpp +++ b/common/src/Utilities/VirtualMemory.cpp @@ -201,3 +201,31 @@ void* SpatialArrayReserve::Reserve( uint size, uptr base, uptr upper_bounds ) { return __parent::Reserve( size, base, upper_bounds ); } + +void SpatialArrayReserve::OnCommittedBlock( void* block ) +{ + +} + +void SpatialArrayReserve::OnOutOfMemory( const Exception::OutOfMemory& ex, void* blockptr, bool& handled ) +{ + +} + + +// -------------------------------------------------------------------------------------- +// PageProtectionMode (implementations) +// -------------------------------------------------------------------------------------- +wxString PageProtectionMode::ToString() const +{ + wxString modeStr; + + if (m_read) modeStr += L"Read"; + if (m_write) modeStr += L"Write"; + if (m_exec) modeStr += L"Exec"; + + if (modeStr.IsEmpty()) return L"NoAccess"; + if (modeStr.Length() <= 5) modeStr += L"Only"; + + return modeStr; +} diff --git a/common/src/Utilities/Windows/WinHostSys.cpp b/common/src/Utilities/Windows/WinHostSys.cpp index 5a63dad085..22237ba0a4 100644 --- a/common/src/Utilities/Windows/WinHostSys.cpp +++ b/common/src/Utilities/Windows/WinHostSys.cpp @@ -82,17 +82,3 @@ void HostSys::MemProtect( void* baseaddr, size_t size, const PageProtectionMode& )); } } - -wxString PageProtectionMode::ToString() const -{ - wxString modeStr; - - if (m_read) modeStr += L"Read"; - if (m_write) modeStr += L"Write"; - if (m_exec) modeStr += L"Exec"; - - if (modeStr.IsEmpty()) return L"NoAccess"; - if (modeStr.Length() <= 5) modeStr += L"Only"; - - return modeStr; -}