summaryrefslogtreecommitdiffstats
path: root/src/rw/MemoryHeap.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-28 16:16:15 +0100
committeraap <aap@papnet.eu>2020-11-28 17:05:57 +0100
commita8035b64662e9b9fe6689ec60e5087ff95bc2672 (patch)
tree31f809fff530c5b7b8ea2a4714766d3284b0caf5 /src/rw/MemoryHeap.cpp
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
downloadre3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.gz
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.bz2
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.lz
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.xz
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.tar.zst
re3-a8035b64662e9b9fe6689ec60e5087ff95bc2672.zip
Diffstat (limited to 'src/rw/MemoryHeap.cpp')
-rw-r--r--src/rw/MemoryHeap.cpp125
1 files changed, 0 insertions, 125 deletions
diff --git a/src/rw/MemoryHeap.cpp b/src/rw/MemoryHeap.cpp
index 2cf173b6..0b333ce1 100644
--- a/src/rw/MemoryHeap.cpp
+++ b/src/rw/MemoryHeap.cpp
@@ -494,129 +494,4 @@ CommonSize::Init(uint32 size)
m_remaining = 0;
}
-
-
-void *pMemoryTop;
-
-void
-InitMemoryMgr(void)
-{
-#ifdef GTA_PS2
-#error "finish this"
-#else
- // randomly allocate 128mb
- gMainHeap.Init(128*1024*1024);
-#endif
-}
-
-
-RwMemoryFunctions memFuncs = {
- MemoryMgrMalloc,
- MemoryMgrFree,
- MemoryMgrRealloc,
- MemoryMgrCalloc
-};
-
-#ifdef USE_CUSTOM_ALLOCATOR
-// game seems to be using heap directly here, but this is nicer
-void *operator new(size_t sz) { return MemoryMgrMalloc(sz); }
-void *operator new[](size_t sz) { return MemoryMgrMalloc(sz); }
-void operator delete(void *ptr) noexcept { MemoryMgrFree(ptr); }
-void operator delete[](void *ptr) noexcept { MemoryMgrFree(ptr); }
-#endif
-#endif
-
-void*
-MemoryMgrMalloc(uint32 size)
-{
-#ifdef USE_CUSTOM_ALLOCATOR
- void *mem = gMainHeap.Malloc(size);
-#else
- void *mem = malloc(size);
-#endif
- if(mem > pMemoryTop)
- pMemoryTop = mem;
- return mem;
-}
-
-void*
-MemoryMgrRealloc(void *ptr, uint32 size)
-{
-#ifdef USE_CUSTOM_ALLOCATOR
- void *mem = gMainHeap.Realloc(ptr, size);
-#else
- void *mem = realloc(ptr, size);
-#endif
- if(mem > pMemoryTop)
- pMemoryTop = mem;
- return mem;
-}
-
-void*
-MemoryMgrCalloc(uint32 num, uint32 size)
-{
-#ifdef USE_CUSTOM_ALLOCATOR
- void *mem = gMainHeap.Malloc(num*size);
-#else
- void *mem = calloc(num, size);
#endif
- if(mem > pMemoryTop)
- pMemoryTop = mem;
-#ifdef FIX_BUGS
- memset(mem, 0, num*size);
-#endif
- return mem;
-}
-
-void
-MemoryMgrFree(void *ptr)
-{
-#ifdef USE_CUSTOM_ALLOCATOR
-#ifdef FIX_BUGS
- // i don't suppose this is handled by RW?
- if(ptr == nil) return;
-#endif
- gMainHeap.Free(ptr);
-#else
- free(ptr);
-#endif
-}
-
-void *
-RwMallocAlign(RwUInt32 size, RwUInt32 align)
-{
-#ifdef FIX_BUGS
- uintptr ptralign = align-1;
- void *mem = (void *)MemoryMgrMalloc(size + sizeof(uintptr) + ptralign);
-
- ASSERT(mem != nil);
-
- void *addr = (void *)((((uintptr)mem) + sizeof(uintptr) + ptralign) & ~ptralign);
-
- ASSERT(addr != nil);
-#else
- void *mem = (void *)MemoryMgrMalloc(size + align);
-
- ASSERT(mem != nil);
-
- void *addr = (void *)((((uintptr)mem) + align) & ~(align - 1));
-
- ASSERT(addr != nil);
-#endif
-
- *(((void **)addr) - 1) = mem;
-
- return addr;
-}
-
-void
-RwFreeAlign(void *mem)
-{
- ASSERT(mem != nil);
-
- void *addr = *(((void **)mem) - 1);
-
- ASSERT(addr != nil);
-
- MemoryMgrFree(addr);
-}