mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-03 01:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix up align type (Ui -> i)

Browse Source
This commit is contained in:
elijah-thomas774
2024-05-05 12:27:34 -04:00
parent bfc5a33125
commit af59a51db3
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/egg/core/eggHeap.cpp
+3 -4
View File
@@ -54,8 +54,7 @@ namespace EGG {
// TODO small instshuffle here, related to regshuffle problems
OSReport("cannot allocate from heap %x(%s) : allocatable heap is %x(%s)\n", heap, heap->getName(),
sAllocatableHeap, sAllocatableHeap->getName());
OSReport("\tthread heap=%x(%s)\n", threadHeap,
threadHeap != nullptr ? threadHeap->getName() : "none");
OSReport("\tthread heap=%x(%s)\n", threadHeap, threadHeap != nullptr ? threadHeap->getName() : "none");
if (sErrorCallback != nullptr) {
HeapErrorArg arg;
arg.msg = "disable_but";
@@ -192,14 +191,14 @@ extern "C" void MEMInitAllocatorForHeap(Allocator *alloc, s32 align, Heap *heap)
/* 80495a60 */ void *operator new(size_t, void *p) {
return p;
}
/* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, u32 align) {
/* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, int align) {
return EGG::Heap::alloc(size, align, heap);
}
/* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc) {
return MEMAllocFromAllocator(alloc->getHandle(), size);
}
/* 80495a90 */ void *operator new[](size_t size, u32 align) {
/* 80495a90 */ void *operator new[](size_t size, int align) {
return EGG::Heap::alloc(size, align, nullptr);
}
/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align) {