Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common/GrowableMemoryByteStream: Add helper methods

Browse source
This commit is contained in:
Connor McLaughlin 2020-11-27 23:09:10 +10:00
parent a902d9b409
commit feadc83050
2 changed files with 55 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/common/byte_stream.cpp
View file

@ -700,6 +700,54 @@ GrowableMemoryByteStream::~GrowableMemoryByteStream()
std::free(m_pPrivateMemory); std::free(m_pPrivateMemory);
} }
void GrowableMemoryByteStream::Resize(u32 new_size)
{
if (new_size > m_iMemorySize)
ResizeMemory(new_size);
m_iSize = new_size;
}
void GrowableMemoryByteStream::ResizeMemory(u32 new_size)
{
if (new_size == m_iMemorySize)
return;
if (m_pPrivateMemory == nullptr)
{
m_pPrivateMemory = (u8*)std::malloc(new_size);
std::memcpy(m_pPrivateMemory, m_pMemory, m_iSize);
m_pMemory = m_pPrivateMemory;
m_iMemorySize = new_size;
}
else
{
m_pPrivateMemory = m_pMemory = (u8*)std::realloc(m_pPrivateMemory, new_size);
m_iMemorySize = new_size;
}
}
void GrowableMemoryByteStream::EnsureSpace(u32 space)
{
if ((m_iSize + space) >= m_iMemorySize)
return;
Grow((m_iSize + space) - m_iMemorySize);
}
void GrowableMemoryByteStream::ShrinkToFit()
{
if (!m_pPrivateMemory || m_iSize == m_iMemorySize)
return;
u8* new_ptr = static_cast<u8*>(std::realloc(m_pPrivateMemory, m_iSize));
if (new_ptr)
{
m_pPrivateMemory = new_ptr;
m_iMemorySize = m_iSize;
}
}
bool GrowableMemoryByteStream::ReadByte(u8* pDestByte) bool GrowableMemoryByteStream::ReadByte(u8* pDestByte)
{ {
if (m_iPosition < m_iSize) if (m_iPosition < m_iSize)
@ -819,18 +867,7 @@ bool GrowableMemoryByteStream::Discard()
void GrowableMemoryByteStream::Grow(u32 MinimumGrowth) void GrowableMemoryByteStream::Grow(u32 MinimumGrowth)
{ {
u32 NewSize = std::max(m_iMemorySize + MinimumGrowth, m_iMemorySize * 2); u32 NewSize = std::max(m_iMemorySize + MinimumGrowth, m_iMemorySize * 2);
if (m_pPrivateMemory == nullptr) ResizeMemory(NewSize);
{
m_pPrivateMemory = (u8*)std::malloc(NewSize);
std::memcpy(m_pPrivateMemory, m_pMemory, m_iSize);
m_pMemory = m_pPrivateMemory;
m_iMemorySize = NewSize;
}
else
{
m_pPrivateMemory = m_pMemory = (u8*)std::realloc(m_pPrivateMemory, NewSize);
m_iMemorySize = NewSize;
}
} }
#if defined(_MSC_VER) #if defined(_MSC_VER)

7
src/common/byte_stream.h
View file

@ -168,7 +168,12 @@ public:
virtual ~GrowableMemoryByteStream(); virtual ~GrowableMemoryByteStream();
u8* GetMemoryPointer() const { return m_pMemory; } u8* GetMemoryPointer() const { return m_pMemory; }
u32 GetMemorySize() const { return m_iSize; } u32 GetMemorySize() const { return m_iMemorySize; }
void Resize(u32 new_size);
void ResizeMemory(u32 new_size);
void EnsureSpace(u32 space);
void ShrinkToFit();
virtual bool ReadByte(u8* pDestByte) override; virtual bool ReadByte(u8* pDestByte) override;
virtual u32 Read(void* pDestination, u32 ByteCount) override; virtual u32 Read(void* pDestination, u32 ByteCount) override;