From b2548ba4ce295fcd94a50123fb543fac2ef2bc33 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 14 Nov 2024 14:46:23 -0500 Subject: add pk.h and major pkmem refactor Completely replaces the memory module with pkmem pkmem is a newer implementation of the same bucket memory structure. Also includes replacing pkstr.h with pk.h's pkstr --- src/array.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/array.hpp') diff --git a/src/array.hpp b/src/array.hpp index 7db2252..8878ce4 100644 --- a/src/array.hpp +++ b/src/array.hpp @@ -1,9 +1,7 @@ #ifndef PKE_ARRAY_HPP #define PKE_ARRAY_HPP -#include "macros.hpp" -#include "memory-type-defs.hpp" -#include "memory.hpp" +#include "vendor/pk.h" #include #include @@ -34,7 +32,7 @@ inline void PkeArray_SoftReset(PkeArray_Base *arrIn) { } template -inline void PkeArray_Add(PkeArray_Base *arrIn, const D &val, MemBucket *bkt = nullptr) { +inline void PkeArray_Add(PkeArray_Base *arrIn, const D &val, struct pk_membucket *bkt = nullptr) { auto *arr = static_cast *>(arrIn); if (arr->reserved == arr->next) { long originalCount = arr->reserved; @@ -46,11 +44,11 @@ inline void PkeArray_Add(PkeArray_Base *arrIn, const D &val, MemBucket *bkt = nu arr->reserved *= 2.5; diff = arr->reserved - originalCount; } - auto *newData = Pke_New(arr->reserved, bkt); + auto *newData = pk_new(arr->reserved, bkt); memset(newData + (sizeof(D) * originalCount), 0xFF, sizeof(D) * diff); if (arr->data != nullptr && arr->data != CAFE_BABE(D)) { memcpy(newData, arr->data, sizeof(D) * originalCount); - Pke_Delete(arr->data, originalCount, bkt); + pk_delete(arr->data, originalCount, bkt); } arr->data = newData; } -- cgit v1.2.3