aboutsummaryrefslogtreecommitdiff
path: root/primedev/core
diff options
context:
space:
mode:
authorJan <sentrycraft123@gmail.com>2024-06-22 20:46:43 +0200
committerGitHub <noreply@github.com>2024-06-22 20:46:43 +0200
commit1c9f39ddde4076b7a0f0b0527d89fc69b47d0602 (patch)
tree371507bb90cf5b4321c619255dacf656caf130ed /primedev/core
parent225eb1849a7b4ef019c04e4aa12b85295e301c28 (diff)
downloadNorthstarLauncher-1c9f39ddde4076b7a0f0b0527d89fc69b47d0602.tar.gz
NorthstarLauncher-1c9f39ddde4076b7a0f0b0527d89fc69b47d0602.zip
Fix memalloc problems (#728)v1.25.3-rc2
alloc declarations to work with CRT implement missing _recalloc_base and _msize
Diffstat (limited to 'primedev/core')
-rw-r--r--primedev/core/memalloc.cpp36
-rw-r--r--primedev/core/memalloc.h16
2 files changed, 41 insertions, 11 deletions
diff --git a/primedev/core/memalloc.cpp b/primedev/core/memalloc.cpp
index 0a75bc2b..51167717 100644
--- a/primedev/core/memalloc.cpp
+++ b/primedev/core/memalloc.cpp
@@ -3,7 +3,7 @@
// TODO: rename to malloc and free after removing statically compiled .libs
-extern "C" void* _malloc_base(size_t n)
+void* _malloc_base(size_t n)
{
// allocate into static buffer if g_pMemAllocSingleton isn't initialised
if (!g_pMemAllocSingleton)
@@ -17,7 +17,7 @@ extern "C" void* _malloc_base(size_t n)
return _malloc_base(n);
}*/
-extern "C" void _free_base(void* p)
+void _free_base(void* p)
{
if (!g_pMemAllocSingleton)
TryCreateGlobalMemAlloc();
@@ -25,7 +25,7 @@ extern "C" void _free_base(void* p)
g_pMemAllocSingleton->m_vtable->Free(g_pMemAllocSingleton, p);
}
-extern "C" void* _realloc_base(void* oldPtr, size_t size)
+void* _realloc_base(void* oldPtr, size_t size)
{
if (!g_pMemAllocSingleton)
TryCreateGlobalMemAlloc();
@@ -33,7 +33,7 @@ extern "C" void* _realloc_base(void* oldPtr, size_t size)
return g_pMemAllocSingleton->m_vtable->Realloc(g_pMemAllocSingleton, oldPtr, size);
}
-extern "C" void* _calloc_base(size_t n, size_t size)
+void* _calloc_base(size_t n, size_t size)
{
size_t bytes = n * size;
void* memory = _malloc_base(bytes);
@@ -44,7 +44,33 @@ extern "C" void* _calloc_base(size_t n, size_t size)
return memory;
}
-extern "C" char* _strdup_base(const char* src)
+void* _recalloc_base(void* const block, size_t const count, size_t const size)
+{
+ if (!block)
+ return _calloc_base(count, size);
+
+ const size_t new_size = count * size;
+ const size_t old_size = _msize(block);
+
+ void* const memory = _realloc_base(block, new_size);
+
+ if (memory && old_size < new_size)
+ {
+ memset(static_cast<char*>(memory) + old_size, 0, new_size - old_size);
+ }
+
+ return memory;
+}
+
+size_t _msize(void* const block)
+{
+ if (!g_pMemAllocSingleton)
+ TryCreateGlobalMemAlloc();
+
+ return g_pMemAllocSingleton->m_vtable->GetSize(g_pMemAllocSingleton, block);
+}
+
+char* _strdup_base(const char* src)
{
char* str;
char* p;
diff --git a/primedev/core/memalloc.h b/primedev/core/memalloc.h
index 2f383335..73e078f5 100644
--- a/primedev/core/memalloc.h
+++ b/primedev/core/memalloc.h
@@ -1,14 +1,18 @@
#pragma once
+#include <malloc.h>
+
#include "rapidjson/document.h"
// #include "include/rapidjson/allocators.h"
-extern "C" void* _malloc_base(size_t size);
-extern "C" void* _calloc_base(size_t const count, size_t const size);
-extern "C" void* _realloc_base(void* block, size_t size);
-extern "C" void* _recalloc_base(void* const block, size_t const count, size_t const size);
-extern "C" void _free_base(void* const block);
-extern "C" char* _strdup_base(const char* src);
+// The prelude is needed for these to be usable by the CRT
+extern "C" __declspec(noinline) void* __cdecl _malloc_base(size_t const size);
+extern "C" __declspec(noinline) void* __cdecl _calloc_base(size_t const count, size_t const size);
+extern "C" __declspec(noinline) void* __cdecl _realloc_base(void* const block, size_t const size);
+extern "C" __declspec(noinline) void* __cdecl _recalloc_base(void* const block, size_t const count, size_t const size);
+extern "C" __declspec(noinline) void __cdecl _free_base(void* const block);
+extern "C" __declspec(noinline) size_t __cdecl _msize(void* const block);
+extern "C" __declspec(noinline) char* __cdecl _strdup_base(const char* src);
void* operator new(size_t n);
void operator delete(void* p) noexcept;