Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 21:38:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rsx: Fix static ringbuffer allocator logic

Browse source
This commit is contained in:
kd-11 2025-04-24 01:28:03 +03:00 • committed by kd-11
parent 1960b5a605
commit 417cefa059
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rpcs3/Emu/RSX/Common/ring_buffer_helper.h
View file

@ -15,15 +15,12 @@ class data_heap
{ {
protected: protected:
/** /**
* Does alloc cross get position ? * Internal implementation of allocation test
* Does alloc cross get position?
*/ */
template<int Alignment> bool can_alloc_impl(usz aligned_put_pos, usz aligned_alloc_size) const
bool can_alloc(usz size) const
{ {
const usz alloc_size = utils::align(size, Alignment); const usz alloc_end = aligned_put_pos + aligned_alloc_size;
const usz aligned_put_pos = utils::align(m_put_pos, Alignment);
const usz alloc_end = aligned_put_pos + alloc_size;
if (alloc_end < m_size) [[ likely ]] if (alloc_end < m_size) [[ likely ]]
{ {
// Range before get // Range before get
@ -43,12 +40,23 @@ protected:
// ..get..]...[... // ..get..]...[...
// Actually all resources extending beyond heap space starts at 0 // Actually all resources extending beyond heap space starts at 0
if (alloc_size > m_get_pos) if (aligned_alloc_size > m_get_pos)
return false; return false;
return true; return true;
} }
/**
* Does alloc cross get position?
*/
template<int Alignment>
bool can_alloc(usz size) const
{
const usz alloc_size = utils::align(size, Alignment);
const usz aligned_put_pos = utils::align(m_put_pos, Alignment);
return can_alloc_impl(aligned_put_pos, alloc_size);
}
// Grow the buffer to hold at least size bytes // Grow the buffer to hold at least size bytes
virtual bool grow(usz /*size*/) virtual bool grow(usz /*size*/)
{ {
@ -112,17 +120,18 @@ public:
static_assert((Size & (Alignment - 1)) == 0); static_assert((Size & (Alignment - 1)) == 0);
ensure((m_put_pos & (Alignment - 1)) == 0); ensure((m_put_pos & (Alignment - 1)) == 0);
if (!can_alloc<Alignment>(Size) && !grow(Size)) if (!can_alloc_impl(m_put_pos, Size) && !grow(Size))
{ {
fmt::throw_exception("[%s] Working buffer not big enough, buffer_length=%d requested=%d guard=%d", fmt::throw_exception("[%s] Working buffer not big enough, buffer_length=%d requested=%d guard=%d",
m_name, m_size, Size, m_min_guard_size); m_name, m_size, Size, m_min_guard_size);
} }
const usz alloc_end = m_put_pos + Size; const usz alloc_end = m_put_pos + Size;
if (m_put_pos + Size < m_size) if (alloc_end < m_size)
{ {
const auto ret_pos = m_put_pos;
m_put_pos = alloc_end; m_put_pos = alloc_end;
return m_put_pos; return ret_pos;
} }
m_put_pos = Size; m_put_pos = Size;