diff --git a/src/common/memory_pool.cpp b/src/common/memory_pool.cpp index 32de1236..71c102a2 100644 --- a/src/common/memory_pool.cpp +++ b/src/common/memory_pool.cpp @@ -12,9 +12,7 @@ namespace Dynarmic { namespace Common { Pool::Pool(size_t object_size, size_t initial_pool_size) : object_size(object_size), slab_size(initial_pool_size) { - current_slab = (char*)std::malloc(object_size * slab_size); - current_ptr = current_slab; - remaining = slab_size; + AllocateNewSlab(); } Pool::~Pool() { @@ -28,17 +26,22 @@ Pool::~Pool() { void* Pool::Alloc() { if (remaining == 0) { slabs.emplace_back(current_slab); - current_slab = (char*)std::malloc(object_size * slab_size); - current_ptr = current_slab; - remaining = slab_size; + AllocateNewSlab(); } - void* ret = (void*)current_ptr; + void* ret = static_cast(current_ptr); current_ptr += object_size; remaining--; return ret; } +void Pool::AllocateNewSlab() { + current_slab = static_cast(std::malloc(object_size * slab_size)); + current_ptr = current_slab; + remaining = slab_size; +} + + } // namespace Common } // namespace Dynarmic diff --git a/src/common/memory_pool.h b/src/common/memory_pool.h index fc64958b..1099e62f 100644 --- a/src/common/memory_pool.h +++ b/src/common/memory_pool.h @@ -28,6 +28,11 @@ public: void* Alloc(); private: + // Allocates a completely new memory slab. + // Used when an entirely new slab is needed + // due the current one running out of usable space. + void AllocateNewSlab(); + size_t object_size; size_t slab_size; char* current_slab;