mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-09-25 05:55:47 +02:00
Merge newHostVM branch. Feature overview:
* PCSX2 uses significantly less memory when starting. * Overall memory use reduced (mildly for some games, significantly for most). * EE and IOP main memory are now fixed at 0x20000000 and 0x24000000 -- useful when using external cheat apps. * Properly implemented the 'Shutdown' menu option -- Shutdown now unloads the entire PS2 virtual machine and reduced PCSX2's memory footprint to bare minimums. * Some more meaningful errors for when memory is a problem (out of memory, low virtual memory, etc). * Bugfix for pxsFmt when formatting long/large strings (over 1k) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4029 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
@@ -55,7 +55,7 @@ protected:
|
||||
typedef char CharType;
|
||||
typedef CharBufferType BufferType;
|
||||
|
||||
static const uint BufferCount = 4;
|
||||
static const uint BufferCount = 6;
|
||||
|
||||
BufferType m_buffers[BufferCount];
|
||||
uint m_curslot;
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
|
||||
for (uint i=0; i<BufferCount; ++i)
|
||||
{
|
||||
m_buffers[i].Alloc(1024);
|
||||
m_buffers[i].Alloc(512);
|
||||
}
|
||||
|
||||
m_curslot = 0;
|
||||
@@ -174,7 +174,7 @@ static __ri void format_that_ascii_mess( CharBufferType& buffer, uint writepos,
|
||||
|
||||
len += writepos;
|
||||
if (len < size) break;
|
||||
buffer.Alloc( len + 128 );
|
||||
buffer.Resize( len + 128 );
|
||||
};
|
||||
|
||||
// performing an assertion or log of a truncated string is unsafe, so let's not; even
|
||||
@@ -205,7 +205,7 @@ static __ri uint format_that_unicode_mess( CharBufferType& buffer, uint writepos
|
||||
|
||||
len += writepos;
|
||||
if (len < size) return len;
|
||||
buffer.Alloc( (len + 128) * sizeof(wxChar) );
|
||||
buffer.Resize( (len + 128) * sizeof(wxChar) );
|
||||
};
|
||||
|
||||
// performing an assertion or log of a truncated string is unsafe, so let's not; even
|
||||
|
||||
Reference in New Issue
Block a user