mirror
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rsx: Clean up aligned realloc implementation

This commit is contained in:
kd-11 2025-11-28 23:04:30 +03:00 committed by kd-11
parent 50c9a91942
commit 7b560e5ffa
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/RSX/Common/simple_array.hpp
View File

@ -24,12 +24,12 @@ namespace rsx
template <size_t Align>
void* realloc(void* prev_ptr, [[maybe_unused]] size_t prev_size, size_t new_size)
{
ensure(reinterpret_cast<usz>(prev_ptr) % Align == 0,
"Pointer not aligned to Align");
if (prev_size >= ((new_size + Align - 1) & (0 - Align)))
if (prev_size >= new_size)
{
return prev_ptr;
return prev_ptr;
}
ensure(reinterpret_cast<usz>(prev_ptr) % Align == 0, "Pointer not aligned to Align");
#ifdef _WIN32
return _aligned_realloc(prev_ptr, new_size, Align);
#else

31
rpcs3/tests/test_simple_array.cpp
View File

@ -323,4 +323,35 @@ namespace rsx
EXPECT_EQ(*arr.find_if(FN(x == 8)), 8);
EXPECT_EQ(arr.find_if(FN(x == 99)), nullptr);
}
TEST(AlignedAllocator, Alloc)
{
auto ptr = rsx::aligned_allocator::malloc<256>(16);
const auto ptr_value = reinterpret_cast<uintptr_t>(ptr);
rsx::aligned_allocator::free(ptr);
EXPECT_NE(ptr_value, 0);
EXPECT_EQ(ptr_value % 256, 0);
}
TEST(AlignedAllocator, Realloc)
{
auto ptr = rsx::aligned_allocator::malloc<256>(16);
auto ptr2 = rsx::aligned_allocator::realloc<256>(ptr, 16, 32);
const auto ptr_value = reinterpret_cast<uintptr_t>(ptr2);
rsx::aligned_allocator::free(ptr2);
EXPECT_NE(ptr, ptr2);
EXPECT_NE(ptr_value, 0);
EXPECT_EQ(ptr_value % 256, 0);
}
TEST(AlignedAllocator, Realloc_ReturnsPreviousPointerIfFits)
{
auto ptr = rsx::aligned_allocator::malloc<256>(16);
auto ptr2 = rsx::aligned_allocator::realloc<256>(ptr, 16, 8);
rsx::aligned_allocator::free(ptr2);
EXPECT_EQ(ptr, ptr2);
}
}