mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-03 16:52:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed up typedef for u32 and s32 from mistake long ago

Browse Source
This commit is contained in:
elijah-thomas774
2024-05-12 16:04:01 -04:00
parent 94ec354dde
commit 62e0778390
34 changed files with 337 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m/m_heap.cpp
+55 -75
View File
@@ -3,20 +3,24 @@
#include <egg/core/eggFrmHeap.h>
#include <m/m_heap.h>
namespace mHeap {
u8 g_DefaultGameHeapId = 1;
u8 mHeap::g_DefaultGameHeapId = 1;
#define MIN_ALIGN 0x20
EGG::ExpHeap *g_gameHeaps[4];
EGG::ExpHeap *s_SavedCurrentHeap;
EGG::ExpHeap *g_archiveHeap;
EGG::ExpHeap *g_commandHeap;
EGG::ExpHeap *g_dylinkHeap;
EGG::AssertHeap *g_assertHeap;
EGG::Heap *mHeap::g_gameHeaps[4];
EGG::Heap *mHeap::s_SavedCurrentHeap;
EGG::Heap *mHeap::g_archiveHeap;
EGG::Heap *mHeap::g_commandHeap;
EGG::Heap *mHeap::g_dylinkHeap;
EGG::AssertHeap *mHeap::g_assertHeap;
const char *const mHeap::s_GameHeapNames[4] = {
0,
"ゲーム用汎用ヒープ1(mHeap::gameHeaps[1])",
"ゲーム用汎用ヒープ2(mHeap::gameHeaps[2])",
0,
};
u16 copyAttribute(u32 arg) {
u16 mHeap::copyAttribute(u32 arg) {
u16 result = 0;
if ((arg & 1) != 0) {
@@ -31,13 +35,12 @@ u16 copyAttribute(u32 arg) {
return result;
}
EGG::Heap *setCurrentHeap(EGG::Heap *heap) {
EGG::Heap *mHeap::setCurrentHeap(EGG::Heap *heap) {
return heap->becomeCurrentHeap();
}
EGG::ExpHeap *createExpHeap(size_t size, EGG::Heap *parent, const char *name, unsigned long align,
unsigned long attrs) {
if (parent == nullptr) {
parent = EGG::Heap::sCurrentHeap;
EGG::Heap *mHeap::createExpHeap(size_t size, EGG::Heap *parentHeap, const char *name, u32 align, u32 attrs) {
if (parentHeap == nullptr) {
parentHeap = EGG::Heap::sCurrentHeap;
}
if (align < MIN_ALIGN) {
@@ -47,15 +50,15 @@ EGG::ExpHeap *createExpHeap(size_t size, EGG::Heap *parent, const char *name, un
if (size != 0xFFFFFFFF) {
size = expHeapCost(size, align);
} else {
size = parent->getAllocatableSize(align);
size = parentHeap->getAllocatableSize(align);
}
void *mem = parent->alloc(size, align);
void *mem = parentHeap->alloc(size, align);
EGG::ExpHeap *heap = nullptr;
if (mem != nullptr) {
heap = EGG::ExpHeap::create(mem, size, copyAttribute(attrs));
if (heap == nullptr) {
parent->free(mem);
parentHeap->free(mem);
} else if (name != nullptr) {
heap->mName = name;
}
@@ -63,7 +66,7 @@ EGG::ExpHeap *createExpHeap(size_t size, EGG::Heap *parent, const char *name, un
return heap;
}
size_t adjustExpHeap(EGG::ExpHeap *heap) {
size_t mHeap::adjustExpHeap(EGG::ExpHeap *heap) {
int ret = 0;
if (heap != nullptr) {
size_t ad = heap->adjust();
@@ -74,14 +77,14 @@ size_t adjustExpHeap(EGG::ExpHeap *heap) {
}
return ret;
}
size_t expHeapCost(size_t size, s32 align) {
size_t mHeap::expHeapCost(size_t size, u32 align) {
int a = align - 1;
long b = (0x84 + a);
return size + (~(a) & b);
s32 b = (0x84 + a);
return size + (~(a)&b);
}
EGG::FrmHeap *createFrmHeap(size_t size, EGG::Heap *parent, const char *name, size_t align, size_t attrs) {
EGG::FrmHeap *mHeap::createFrmHeap(size_t size, EGG::Heap *parent, const char *name, size_t align, size_t attrs) {
if (parent == nullptr) {
parent = EGG::Heap::sCurrentHeap;
}
@@ -108,13 +111,13 @@ EGG::FrmHeap *createFrmHeap(size_t size, EGG::Heap *parent, const char *name, si
}
return heap;
}
void destroyFrmHeap(EGG::FrmHeap *heap) {
void mHeap::destroyFrmHeap(EGG::FrmHeap *heap) {
if (heap != nullptr) {
heap->destroy();
}
}
size_t adjustFrmHeap(EGG::FrmHeap *heap) {
size_t mHeap::adjustFrmHeap(EGG::FrmHeap *heap) {
int ret = 0;
if (heap != nullptr) {
size_t ad = heap->adjust();
@@ -126,28 +129,22 @@ size_t adjustFrmHeap(EGG::FrmHeap *heap) {
return ret;
}
size_t frmHeapCost(size_t size, s32 align) {
size_t mHeap::frmHeapCost(size_t size, u32 align) {
int a = align - 1;
long b = (0x7C + a);
return size + (~(a) & b);
s32 b = (0x7C + a);
return size + (~(a)&b);
}
EGG::Heap **setTempHeap(EGG::Heap **prevHeap, EGG::Heap *tempNewHeap) {
*prevHeap = tempNewHeap->becomeCurrentHeap();
return prevHeap;
}
EGG::Heap **restoreTempHeap(EGG::Heap **prevHeap, s32 size) {
if (prevHeap != nullptr) {
(*prevHeap)->becomeCurrentHeap();
if (size > 0) {
delete prevHeap;
}
}
return prevHeap;
mHeap::mHeap(EGG::Heap *heap) {
this->heap = heap->becomeCurrentHeap();
}
EGG::ExpHeap *createHeap(size_t size, EGG::Heap *block, const char *name) {
mHeap::~mHeap() {
heap->becomeCurrentHeap();
}
EGG::Heap *mHeap::createHeap(size_t size, EGG::Heap *block, const char *name) {
EGG::ExpHeap *heap = EGG::ExpHeap::create(size, block, 4);
if (heap != nullptr) {
heap->setGroupID(0);
@@ -160,73 +157,56 @@ EGG::ExpHeap *createHeap(size_t size, EGG::Heap *block, const char *name) {
return heap;
}
void saveCurrentHeap() {
s_SavedCurrentHeap = (EGG::ExpHeap *)EGG::Heap::sCurrentHeap;
void mHeap::saveCurrentHeap() {
s_SavedCurrentHeap = EGG::Heap::sCurrentHeap;
}
void restoreCurrentHeap() {
void mHeap::restoreCurrentHeap() {
s_SavedCurrentHeap->becomeCurrentHeap();
s_SavedCurrentHeap = nullptr;
}
EGG::FrmHeap *makeFrmHeapAndUpdate(size_t size, EGG::Heap *parentHeap, const char *name, s32 align, u32 unk) {
EGG::FrmHeap *mHeap::makeFrmHeapAndUpdate(size_t size, EGG::Heap *parentHeap, const char *name, u32 align, u32 unk) {
EGG::FrmHeap *heap = createFrmHeap(size, parentHeap, name, align, unk);
if (heap != nullptr) {
EGG::Heap *heap2 = setCurrentHeap(heap);
s_SavedCurrentHeap = (EGG::ExpHeap *)heap2;
s_SavedCurrentHeap = setCurrentHeap(heap);
}
return heap;
}
int getDefaultGameHeapId() {
int mHeap::getDefaultGameHeapId() {
return g_DefaultGameHeapId;
}
inline bool isValidHeapId(u32 id) {
return id >= 1 && id <= 2;
}
const char *const s_GameHeapNames[4] = {
0,
"ゲーム用汎用ヒープ1(mHeap::gameHeaps[1])",
"ゲーム用汎用ヒープ2(mHeap::gameHeaps[2])",
0,
};
EGG::ExpHeap *createGameHeap(int heapId, size_t size, EGG::Heap *parent) {
EGG::Heap *mHeap::createGameHeap(int heapId, size_t size, EGG::Heap *parent) {
if (!isValidHeapId(heapId)) {
return nullptr;
}
g_gameHeaps[heapId] = createHeap(size, parent, s_GameHeapNames[heapId]);
g_gameHeaps[heapId] = mHeap::createHeap(size, parent, s_GameHeapNames[heapId]);
if (heapId == g_DefaultGameHeapId) {
g_gameHeaps[0] = g_gameHeaps[heapId];
}
return g_gameHeaps[heapId];
}
EGG::ExpHeap *createGameHeap1(size_t size, EGG::Heap *parent) {
return createGameHeap(getDefaultGameHeapId(), size, parent);
void mHeap::createGameHeap1(size_t size, EGG::Heap *parentHeap) {
createGameHeap(getDefaultGameHeapId(), size, parentHeap);
}
EGG::ExpHeap *createArchiveHeap(size_t size, EGG::Heap *parent) {
void mHeap::createArchiveHeap(size_t size, EGG::Heap *parent) {
g_archiveHeap = createHeap(size, parent, "汎用ファイル読み込み用ヒープ(mHeap::archiveHeap)");
return g_archiveHeap;
}
EGG::ExpHeap *createCommandHeap(size_t size, EGG::Heap *parent) {
void mHeap::createCommandHeap(size_t size, EGG::Heap *parent) {
g_commandHeap = createHeap(size, parent, "DVD読み込みコマンド用ヒープ(mHeap::commandHeap)");
return g_commandHeap;
}
EGG::ExpHeap *createDylinkHeap(size_t size, EGG::Heap *parent) {
void mHeap::createDylinkHeap(size_t size, EGG::Heap *parent) {
g_dylinkHeap = createHeap(size, parent, "ダイナミックリンク用ヒープ(mHeap::dylinkHeap)");
return g_dylinkHeap;
}
EGG::AssertHeap *createAssertHeap(EGG::Heap *parent) {
EGG::AssertHeap *mHeap::createAssertHeap(EGG::Heap *parent) {
const char *name = "アサートヒープ(mHeap::assertHeap)";
g_assertHeap = EGG::AssertHeap::create(EGG::AssertHeap::getSize(), parent);
g_assertHeap->mName = name;
return g_assertHeap;
}
EGG::Heap *makeHeapOnCurrentGameHeap(size_t size, char *name, s32 align, u32 flags) {
EGG::Heap *mHeap::makeHeapOnCurrentGameHeap(size_t size, const char *name, u32 align, u32 flags) {
return makeFrmHeapAndUpdate(size, g_gameHeaps[0], name, align, flags);
}
} // namespace mHeap