From cc3b62d6c131fd54db75b7dbc76b1fc7659f25ca Mon Sep 17 00:00:00 2001 From: robojumper Date: Wed, 1 May 2024 21:16:43 +0200 Subject: [PATCH 01/25] File manager, plausible setup --- config/SOUE01/splits.txt | 3 ++ config/SOUE01/symbols.txt | 26 +++++------ include/egg/core/eggHeap.h | 2 +- include/m/m_vec.h | 3 +- include/toBeSorted/file_manager.h | 7 +-- include/toBeSorted/save_file.h | 14 +++--- src/toBeSorted/file_manager.cpp | 72 +++++++++++++++++++++++++------ src/toBeSorted/save_file.cpp | 4 +- 8 files changed, 91 insertions(+), 40 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 232dd3e7..cf8cb5fa 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -19,6 +19,9 @@ toBeSorted/save_file.cpp: toBeSorted/file_manager.cpp: .text start:0x80009D30 end:0x80011730 .ctors start:0x804DB648 end:0x804DB64C + .data start:0x80500400 end:0x80500410 + .sbss start:0x80574FF8 end:0x80575000 + .bss start:0x80580070 end:0x80580080 toBeSorted/save_manager.cpp: .text start:0x80011730 end:0x80015310 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 1254741b..f7fe385e 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -155,7 +155,7 @@ fn_800071D0 = .text:0x800071D0; // type:function size:0x8C fn_80007260 = .text:0x80007260; // type:function size:0xE4 OSPanic = .text:0x80007350; // type:function size:0xDC scope:weak fn_80007430 = .text:0x80007430; // type:function size:0x24 -fn_80007460 = .text:0x80007460; // type:function size:0x40 +__dt__7mVec3_cFv = .text:0x80007460; // type:function size:0x40 fn_800074A0 = .text:0x800074A0; // type:function size:0xC8 fn_80007570 = .text:0x80007570; // type:function size:0x58 fn_800075D0 = .text:0x800075D0; // type:function size:0x8C @@ -227,7 +227,7 @@ fn_80009770 = .text:0x80009770; // type:function size:0x74 fn_800097F0 = .text:0x800097F0; // type:function size:0x17C fn_80009970 = .text:0x80009970; // type:function size:0x34 getStoryFlags0__8SaveFileFv = .text:0x800099B0; // type:function size:0x8 -getStoryFlags1__8SaveFileFv = .text:0x800099C0; // type:function size:0x8 +getStoryFlags1__8SaveFileCFv = .text:0x800099C0; // type:function size:0x8 getItemFlags0__8SaveFileFv = .text:0x800099D0; // type:function size:0x8 getItemFlags1__8SaveFileFv = .text:0x800099E0; // type:function size:0x8 getDungeonFlags0__8SaveFileFv = .text:0x800099F0; // type:function size:0x8 @@ -248,8 +248,8 @@ getAreaT1__8SaveFileFv = .text:0x80009BE0; // type:function size:0x8 setAreaT2__8SaveFileFPc = .text:0x80009BF0; // type:function size:0x11C getAreaT2__8SaveFileFv = .text:0x80009D10; // type:function size:0x8 getAreaT3__8SaveFileFv = .text:0x80009D20; // type:function size:0x8 -fn_80009D30 = .text:0x80009D30; // type:function size:0x10 -fn_80009D40 = .text:0x80009D40; // type:function size:0x40 +__ct__8UnkClassFv = .text:0x80009D30; // type:function size:0x10 +__dt__8UnkClassFv = .text:0x80009D40; // type:function size:0x40 fn_80009D80 = .text:0x80009D80; // type:function size:0x4 fn_80009D90 = .text:0x80009D90; // type:function size:0x4 fn_80009DA0 = .text:0x80009DA0; // type:function size:0xC @@ -265,7 +265,7 @@ getFileCurrentHealth__11FileManagerFi = .text:0x8000A2A0; // type:function size: getFileHealthCapacity__11FileManagerFi = .text:0x8000A2C0; // type:function size:0x14 fn_8000A2E0__11FileManagerFv = .text:0x8000A2E0; // type:function size:0x50 getStoryFlagsMut__11FileManagerFv = .text:0x8000A330; // type:function size:0x24 -getStoryFlagsConst__11FileManagerFv = .text:0x8000A360; // type:function size:0x44 +getStoryFlagsConst__11FileManagerCFv = .text:0x8000A360; // type:function size:0x44 getItemFlagsMut__11FileManagerFv = .text:0x8000A3B0; // type:function size:0x24 getItemFlagsConst__11FileManagerFv = .text:0x8000A3E0; // type:function size:0x44 getDungeonFlagsMut__11FileManagerFv = .text:0x8000A430; // type:function size:0x24 @@ -432,11 +432,11 @@ isFileUnk3__11FileManagerFi = .text:0x80011390; // type:function size:0x20 get_0xA84C__11FileManagerFv = .text:0x800113B0; // type:function size:0xC checkRegionCode__11FileManagerFv = .text:0x800113C0; // type:function size:0x78 checkFileCRC__11FileManagerFi = .text:0x80011440; // type:function size:0x50 -isFileInactive__11FileManagerFv = .text:0x80011490; // type:function size:0x6C +isFileInactive__11FileManagerCFv = .text:0x80011490; // type:function size:0x6C setPlayerInfoFileA__11FileManagerFv = .text:0x80011500; // type:function size:0xE0 setT3Info__11FileManagerFP7mVec3_cP7mAng3_c = .text:0x800115E0; // type:function size:0xD8 getRegionVersion__11FileManagerFPc = .text:0x800116C0; // type:function size:0x28 -fn_800116F0 = .text:0x800116F0; // type:function size:0x3C +__sinit_\file_manager_cpp = .text:0x800116F0; // type:function size:0x3C fn_80011730 = .text:0x80011730; // type:function size:0x2C fn_80011760 = .text:0x80011760; // type:function size:0x1D4 fn_80011940 = .text:0x80011940; // type:function size:0x100 @@ -26206,10 +26206,10 @@ becomeCurrentHeap__Q23EGG4HeapFv = .text:0x804959A0; // type:function size:0x58 _becomeCurrentHeapWithoutLock__Q23EGG4HeapFv = .text:0x80495A00; // type:function size:0x3C initAllocator__Q23EGG4HeapFPQ23EGG9Allocatorl = .text:0x80495A40; // type:function size:0x14 __nw__FUlPv = .text:0x80495A60; // type:function size:0x8 -__nw__FUlPQ23EGG4Heapi = .text:0x80495A70; // type:function size:0x10 +__nw__FUlPQ23EGG4HeapUi = .text:0x80495A70; // type:function size:0x10 __nwa__FUl = .text:0x80495A80; // type:function size:0x10 -__nwa__FUli = .text:0x80495A90; // type:function size:0x8 -__nwa__FUlPQ23EGG4Heapi = .text:0x80495AA0; // type:function size:0x10 +__nwa__FUlUi = .text:0x80495A90; // type:function size:0x8 +__nwa__FUlPQ23EGG4HeapUi = .text:0x80495AA0; // type:function size:0x10 __ct__Q23EGG7ExpHeapFP12MEMiHeapHead = .text:0x80495AB0; // type:function size:0x3C __dt__Q23EGG7ExpHeapFv = .text:0x80495AF0; // type:function size:0x74 create__Q23EGG7ExpHeapFPvUlUs = .text:0x80495B70; // type:function size:0xB8 @@ -27388,7 +27388,7 @@ __destroy_global_chain = .text:0x804C65D8; // type:function size:0x48 scope:glob fn_804C6620 = .text:0x804C6620; // type:function size:0x104 fn_804C6724 = .text:0x804C6724; // type:function size:0xBC __construct_array = .text:0x804C67E0; // type:function size:0xF8 -fn_804C68D8 = .text:0x804C68D8; // type:function size:0x78 +__destroy_arr = .text:0x804C68D8; // type:function size:0x78 fn_804C6950 = .text:0x804C6950; // type:function size:0x80 __ptmf_test = .text:0x804C69D0; // type:function size:0x30 fn_804C6A00 = .text:0x804C6A00; // type:function size:0x3C @@ -29842,7 +29842,7 @@ lbl_80500300 = .data:0x80500300; // type:object size:0x10 lbl_80500310 = .data:0x80500310; // type:object size:0x28 lbl_80500338 = .data:0x80500338; // type:object size:0x5C lbl_80500394 = .data:0x80500394; // type:object size:0x6C -lbl_80500400 = .data:0x80500400; // type:object size:0x10 +__vt__8UnkClass = .data:0x80500400; // type:object size:0x10 lbl_80500410 = .data:0x80500410; // type:object size:0xB0 jumptable_805004C0 = .data:0x805004C0; // type:object size:0x58 scope:local jumptable_80500518 = .data:0x80500518; // type:object size:0x80 scope:local @@ -39631,7 +39631,7 @@ lbl_80574FE0 = .sbss:0x80574FE0; // type:object size:0x1 data:byte lbl_80574FE4 = .sbss:0x80574FE4; // type:object size:0x4 data:4byte lbl_80574FE8 = .sbss:0x80574FE8; // type:object size:0x4 data:4byte lbl_80574FEC = .sbss:0x80574FEC; // type:object size:0xC -lbl_80574FF8 = .sbss:0x80574FF8; // type:object size:0x4 +sInstance__8UnkClass = .sbss:0x80574FF8; // type:object size:0x4 sInstance__11FileManager = .sbss:0x80574FFC; // type:object size:0x4 data:4byte lbl_80575000 = .sbss:0x80575000; // type:object size:0x8 data:4byte lbl_80575008 = .sbss:0x80575008; // type:object size:0x8 data:4byte diff --git a/include/egg/core/eggHeap.h b/include/egg/core/eggHeap.h index 10b114e9..db384abd 100644 --- a/include/egg/core/eggHeap.h +++ b/include/egg/core/eggHeap.h @@ -159,6 +159,6 @@ public: /* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, u32 align); /* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc); /* 80495a90 */ void *operator new[](size_t size, u32 align); -/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align); +/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, u32 align); #endif diff --git a/include/m/m_vec.h b/include/m/m_vec.h index 02817ec0..b182642e 100644 --- a/include/m/m_vec.h +++ b/include/m/m_vec.h @@ -8,7 +8,8 @@ class mVec3_c : public EGG::Vector3f { public: /// @brief Constructs an empty vector. - mVec3_c() {} + /* 80009ee0 */ mVec3_c() {} + /* 80007460 */ ~mVec3_c() {} /// @brief Constructs a vector from a float array. mVec3_c(const f32 *p) { diff --git a/include/toBeSorted/file_manager.h b/include/toBeSorted/file_manager.h index 9b588943..0bf79629 100644 --- a/include/toBeSorted/file_manager.h +++ b/include/toBeSorted/file_manager.h @@ -46,7 +46,7 @@ public: /* 80009DB0 */ FileManager(); // /* 80009EE0 */ // mVec3(); - /* 80009EF0 */ static FileManager create(EGG::Heap *); + /* 80009EF0 */ static FileManager *create(EGG::Heap *); /* 80009F30 */ bool loadSaveData(void *out, char *name, bool isSkipData); /* 80009F70 */ void saveSaveData(void *unk, bool isSkipData); /* 8000A000 */ void refreshSaveFileData(); @@ -57,7 +57,7 @@ public: /* 8000A2E0 */ void fn_8000A2E0(); // idk something blank save files /* 8000A330 */ u16 *getStoryFlagsMut(); - /* 8000A360 */ u16 *getStoryFlagsConst(); + /* 8000A360 */ const u16 *getStoryFlagsConst() const; /* 8000A3B0 */ u16 *getItemFlagsMut(); /* 8000A3E0 */ u16 *getItemFlagsConst(); /* 8000A430 */ u16 *getDungeonFlagsMut(); @@ -243,6 +243,7 @@ public: /* 80010440 */ void clearTempFileData(); /* 800104A0 */ void saveAfterCredits(); /* 80011210 */ SaveFile *getCurrentFile(); + inline const SaveFile *getCurrentFile() const { return isFileInactive() ? &mFileB : &mFileA; } /* 80011250 */ u16 *getSkipFlags2(); /* 80011260 */ SaveFile *getFileA(); /* 80011270 */ SaveFile *getFileB(); @@ -254,7 +255,7 @@ public: /* 800113B0 */ u8 get_0xA84C(); /* 800113C0 */ bool checkRegionCode(); /* 80011440 */ bool checkFileCRC(int fileNum); - /* 80011490 */ bool isFileInactive(); + /* 80011490 */ bool isFileInactive() const; /* 80011500 */ void setPlayerInfoFileA(); /* 800115E0 */ void setT3Info(mVec3_c *pos, mAng3_c *rot); /* 800116C0 */ static void getRegionVersion(char *out); diff --git a/include/toBeSorted/save_file.h b/include/toBeSorted/save_file.h index ea8d0b45..1a8fea8d 100644 --- a/include/toBeSorted/save_file.h +++ b/include/toBeSorted/save_file.h @@ -1,20 +1,20 @@ #ifndef SAVE_FILE_H #define SAVE_FILE_H -#include "UnknownTypeBelongings.h" +#include "m/m_vec.h" #include // Ghidra: SaveFile // Size: 0x53c0 // non-offical name -class SaveFile { +struct SaveFile { public: /* 0x 0000 */ char field_0x0000[0x8 - 0x0]; /* 0x 0008 */ s64 savedTime; - /* 0x 0010 */ Vec3f pos_t1; - /* 0x 001c */ Vec3f pos_t2; - /* 0x 0028 */ Vec3f pos_t3; - /* 0x 0034 */ Vec3f beacon_pos[32][5]; + /* 0x 0010 */ mVec3_c pos_t1; + /* 0x 001c */ mVec3_c pos_t2; + /* 0x 0028 */ mVec3_c pos_t3; + /* 0x 0034 */ mVec3_c beacon_pos[32][5]; /* 0x 07b4 */ s32 beedleShopPathSegment; /* 0x 07b8 */ f32 beedlShopPathSegFrac; /* 0x 07bc */ char field_0x07BC[0x7c0 - 0x7bc]; @@ -86,7 +86,7 @@ public: // ---------------------------------------------------------- public: /* 800099b0 */ u16 *getStoryFlags0(); - /* 800099c0 */ u16 *getStoryFlags1(); + /* 800099c0 */ const u16 *getStoryFlags1() const; /* 800099d0 */ u16 *getItemFlags0(); /* 800099e0 */ u16 *getItemFlags1(); /* 800099F0 */ u16 *getDungeonFlags0(); diff --git a/src/toBeSorted/file_manager.cpp b/src/toBeSorted/file_manager.cpp index 3447b05a..436720f2 100644 --- a/src/toBeSorted/file_manager.cpp +++ b/src/toBeSorted/file_manager.cpp @@ -1,18 +1,53 @@ #include "toBeSorted/file_manager.h" #include "f/f_base.h" +#include +#include "libc.h" + +// This class here makes no sense and the name might +// be a total misnomer, but this gets the sinit section correct +class UnkClass { +public: + UnkClass(); + virtual ~UnkClass(); + + static UnkClass sInstance; +}; +// This seems really pointless since the class only has a virtual destructor +// and no members but /shrug +UnkClass UnkClass::sInstance; + +UnkClass::UnkClass() {} +UnkClass::~UnkClass() {} + +FileManager *FileManager::sInstance; extern "C" { - /* 80009D30 */ void fn_80009D30() {} // some ctor - /* 80009D40 */ void fn_80009D40() {} // some dtor /* 80009D80 */ void fn_80009D80() {} // return /* 80009D90 */ void fn_80009D90() {} // return - /* 80009DA0 */ void fn_80009DA0() {} // memset(param_1, 0, 0x20) a 0x24 structure is implied here (0x20 data) a crc is at 0x24 + /* 80009DA0 */ void fn_80009DA0(void *ptr) { + memset(ptr, 0, 0x20); + } // memset(param_1, 0, 0x20) a 0x24 structure is implied here (0x20 data) a crc is at 0x24 } -/* 80009DB0 */ FileManager::FileManager() {} +/* 80009DB0 */ FileManager::FileManager() { + // TODO the assembly code looks really wild + u32 numSaves = (u32)(mHeroName - mHeroNames[0]) / 0x12; + for (int i = 0; i < numSaves; i++) { + mHeroNames[i][0] = '\0'; + } + + mHeroName[0] = '\0'; + mCurrentArea[0] = '\0'; + sInstance = this; + mpSavedSaveFiles = mHeap::g_gameHeaps[0]->alloc(0xfbe0, 0x20); + mpSkipData = mHeap::g_gameHeaps[0]->alloc(0x80, 0x20); + fn_8000A2E0(); +} /* 80009EE0 */ // mVec3(); -/* 80009EF0 */ FileManager FileManager::create(EGG::Heap*){} +/* 80009EF0 */ FileManager *FileManager::create(EGG::Heap* heap) { + return new(heap, 0x04) FileManager(); +} /* 80009F30 */ bool FileManager::loadSaveData(void* out, char* name, bool isSkipData){} /* 80009F70 */ void FileManager::saveSaveData(void* unk, bool isSkipData){} /* 8000A000 */ void FileManager::refreshSaveFileData(){} @@ -20,14 +55,20 @@ extern "C" { /* 8000A280 */ s64 FileManager::getFileSaveTime(int fileNum){} /* 8000A2A0 */ s16 FileManager::getFileCurrentHealth(int fileNum){} /* 8000A2C0 */ s16 FileManager::getFileHealthCapacity(int fileNum){} -/* 8000A2E0 */ void FileManager::fn_8000A2E0(){} +/* 8000A2E0 */ void FileManager::fn_8000A2E0(){ + // maybe call this function "reset" + mIsFileUnk1[0] = true; + initBlankSaveFiles(); + m_0xA84D = 0; + mSelectedFile = 1; +} /* 8000A330 */ u16* FileManager::getStoryFlagsMut() { return getCurrentFile()->getStoryFlags0(); } -/* 8000A360 */ u16* FileManager::getStoryFlagsConst() { - return (isFileInactive() ? mFileB : mFileA).getStoryFlags1(); +/* 8000A360 */ const u16* FileManager::getStoryFlagsConst() const { + return getCurrentFile()->getStoryFlags1(); } /* 8000A3B0 */ u16* FileManager::getItemFlagsMut() {} /* 8000A3E0 */ u16* FileManager::getItemFlagsConst() {} @@ -213,10 +254,16 @@ u16* FileManager::getStoryFlagsMut() { /* 80010440 */ void FileManager::clearTempFileData() {} /* 800104A0 */ void FileManager::saveAfterCredits() {} -/* 80011210 */ SaveFile* FileManager::getCurrentFile() {} +/* 80011210 */ SaveFile* FileManager::getCurrentFile() { + return isFileInactive() ? &mFileB : &mFileA; +} /* 80011250 */ u16* FileManager::getSkipFlags2() {} -/* 80011260 */ SaveFile* FileManager::getFileA() {} -/* 80011270 */ SaveFile* FileManager::getFileB() {} +/* 80011260 */ SaveFile* FileManager::getFileA() { + return &mFileA; +} +/* 80011270 */ SaveFile* FileManager::getFileB() { + return &mFileB; +} /* 80011280 */ void FileManager::calcFileCRC(const SaveFile* file, u32 length) {} /* 80011290 */ void FileManager::updateEmptyFiles() {} /* 800112D0 */ void FileManager::updateEmptyFileFlags() {} @@ -226,7 +273,7 @@ u16* FileManager::getStoryFlagsMut() { /* 800113C0 */ bool FileManager::checkRegionCode() {} /* 80011440 */ bool FileManager::checkFileCRC(int fileNum) {} /* 80011490 */ -bool FileManager::isFileInactive() { +bool FileManager::isFileInactive() const { fBase_c* actor = fManager_c::searchBaseByGroupType(1, nullptr); if (actor) { if (actor->profile_name == fProfile::TITLE && !mAntiCommitFlag) @@ -238,4 +285,3 @@ bool FileManager::isFileInactive() { /* 80011500 */ void FileManager::setPlayerInfoFileA() {} /* 800115E0 */ void FileManager::setT3Info(mVec3_c* pos, mAng3_c* rot) {} /* 800116C0 */ void FileManager::getRegionVersion(char* out) {} - diff --git a/src/toBeSorted/save_file.cpp b/src/toBeSorted/save_file.cpp index c876ccd5..d55d11f3 100644 --- a/src/toBeSorted/save_file.cpp +++ b/src/toBeSorted/save_file.cpp @@ -6,7 +6,7 @@ u16* SaveFile::getStoryFlags0() { return story_flags; } // 0x800099c0 getStoryFlags1__8SaveFileFv -u16* SaveFile::getStoryFlags1() { +const u16* SaveFile::getStoryFlags1() const { return story_flags; } // 0x800099d0 getItemFlags0__8SaveFileFv @@ -105,4 +105,4 @@ s8* SaveFile::getAreaT2() { // 0x80009D20 getAreaT3__8SaveFileFv s8* SaveFile::getAreaT3() { return area_t3; -} \ No newline at end of file +} From 210e350ee02a8d6348fdddf0792ecd772ab7a784 Mon Sep 17 00:00:00 2001 From: robojumper Date: Thu, 2 May 2024 00:10:44 +0200 Subject: [PATCH 02/25] some crc --- config/SOUE01/symbols.txt | 24 +-- include/m/m_heap.h | 2 +- include/toBeSorted/file_manager.h | 33 +++-- include/toBeSorted/save_file.h | 42 +++--- src/toBeSorted/file_manager.cpp | 237 +++++++++++++++++++++++++++--- src/toBeSorted/save_file.cpp | 40 ++--- 6 files changed, 292 insertions(+), 86 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index f7fe385e..81006c4c 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -229,19 +229,19 @@ fn_80009970 = .text:0x80009970; // type:function size:0x34 getStoryFlags0__8SaveFileFv = .text:0x800099B0; // type:function size:0x8 getStoryFlags1__8SaveFileCFv = .text:0x800099C0; // type:function size:0x8 getItemFlags0__8SaveFileFv = .text:0x800099D0; // type:function size:0x8 -getItemFlags1__8SaveFileFv = .text:0x800099E0; // type:function size:0x8 +getItemFlags1__8SaveFileCFv = .text:0x800099E0; // type:function size:0x8 getDungeonFlags0__8SaveFileFv = .text:0x800099F0; // type:function size:0x8 -getDungeonFlags1__8SaveFileFv = .text:0x80009A00; // type:function size:0x8 +getDungeonFlags1__8SaveFileCFv = .text:0x80009A00; // type:function size:0x8 getSceneFlags0__8SaveFileFv = .text:0x80009A10; // type:function size:0x8 -getSceneFlags1__8SaveFileFv = .text:0x80009A20; // type:function size:0x8 +getSceneFlags1__8SaveFileCFv = .text:0x80009A20; // type:function size:0x8 getTboxFlags0__8SaveFileFv = .text:0x80009A30; // type:function size:0x8 -getTboxFlags1__8SaveFileFv = .text:0x80009A40; // type:function size:0x8 +getTboxFlags1__8SaveFileCFv = .text:0x80009A40; // type:function size:0x8 getTempFlags0__8SaveFileFv = .text:0x80009A50; // type:function size:0x8 -getTempFlags1__8SaveFileFv = .text:0x80009A60; // type:function size:0x8 +getTempFlags1__8SaveFileCFv = .text:0x80009A60; // type:function size:0x8 getZoneFlags0__8SaveFileFv = .text:0x80009A70; // type:function size:0x8 -getZoneFlags1__8SaveFileFv = .text:0x80009A80; // type:function size:0x8 -getUnkFlags0__8SaveFileFv = .text:0x80009A90; // type:function size:0x8 -getUnkFlags1__8SaveFileFv = .text:0x80009AA0; // type:function size:0x8 +getZoneFlags1__8SaveFileCFv = .text:0x80009A80; // type:function size:0x8 +getEnemyFlags0__8SaveFileFv = .text:0x80009A90; // type:function size:0x8 +getEnemyFlags1__8SaveFileCFv = .text:0x80009AA0; // type:function size:0x8 getPlayerName__8SaveFileFv = .text:0x80009AB0; // type:function size:0x8 setAreaT1__8SaveFileFPc = .text:0x80009AC0; // type:function size:0x11C getAreaT1__8SaveFileFv = .text:0x80009BE0; // type:function size:0x8 @@ -410,7 +410,7 @@ saveFileAToSelectedFile__11FileManagerFv = .text:0x8000EF80; // type:function si saveFileAToFile__11FileManagerFi = .text:0x8000EF90; // type:function size:0x794 copyCurrentToFileB__11FileManagerFv = .text:0x8000F730; // type:function size:0x6B4 copySelectedFileSkipData__11FileManagerFv = .text:0x8000FDF0; // type:function size:0xC -copySkipData__11FileManagerFi = .text:0x8000FE00; // type:function size:0xA8 +copySkipData__11FileManagerFUc = .text:0x8000FE00; // type:function size:0xA8 setInfo_FileB__11FileManagerFv = .text:0x8000FEB0; // type:function size:0xAC clearFileA__11FileManagerFv = .text:0x8000FF60; // type:function size:0x94 initBlankSaveFiles__11FileManagerFv = .text:0x80010000; // type:function size:0x154 @@ -424,14 +424,14 @@ getCurrentFile__11FileManagerFv = .text:0x80011210; // type:function size:0x40 getSkipFlags2__11FileManagerFv = .text:0x80011250; // type:function size:0xC getFileA__11FileManagerFv = .text:0x80011260; // type:function size:0x8 getFileB__11FileManagerFv = .text:0x80011270; // type:function size:0x8 -calcFileCRC__11FileManagerFPC8SaveFileUi = .text:0x80011280; // type:function size:0xC +calcFileCRC__11FileManagerFPCvUi = .text:0x80011280; // type:function size:0xC updateEmptyFiles__11FileManagerFv = .text:0x80011290; // type:function size:0x34 updateEmptyFileFlags__11FileManagerFv = .text:0x800112D0; // type:function size:0x9C isFileEmpty__11FileManagerFi = .text:0x80011370; // type:function size:0x20 -isFileUnk3__11FileManagerFi = .text:0x80011390; // type:function size:0x20 +isFileDirty__11FileManagerFi = .text:0x80011390; // type:function size:0x20 get_0xA84C__11FileManagerFv = .text:0x800113B0; // type:function size:0xC checkRegionCode__11FileManagerFv = .text:0x800113C0; // type:function size:0x78 -checkFileCRC__11FileManagerFi = .text:0x80011440; // type:function size:0x50 +checkFileCRC__11FileManagerFUc = .text:0x80011440; // type:function size:0x50 isFileInactive__11FileManagerCFv = .text:0x80011490; // type:function size:0x6C setPlayerInfoFileA__11FileManagerFv = .text:0x80011500; // type:function size:0xE0 setT3Info__11FileManagerFP7mVec3_cP7mAng3_c = .text:0x800115E0; // type:function size:0xD8 diff --git a/include/m/m_heap.h b/include/m/m_heap.h index 4ee94d11..65edc4e5 100644 --- a/include/m/m_heap.h +++ b/include/m/m_heap.h @@ -33,7 +33,7 @@ namespace mHeap { u32 unk); /* 802f1450 */ int getGameHeapNum(); /* 802f1460 */ EGG::ExpHeap *createGameHeap(s32 heapNum, size_t size, EGG::Heap *parentHeap); -/* 802f1510 */ EGG::Heap *createGameHeap1(s32 size, EGG::Heap *parentHeap); +/* 802f1510 */ EGG::ExpHeap *createGameHeap1(s32 size, EGG::Heap *parentHeap); /* 802f1560 */ EGG::ExpHeap *createArchiveHeap(size_t size, EGG::Heap *parentHeap); /* 802f1590 */ EGG::ExpHeap *createCommandHeap(size_t size, EGG::Heap *parentHeap); /* 802f15c0 */ EGG::ExpHeap *createDylinkHeap(size_t size, EGG::Heap *parentHeap); diff --git a/include/toBeSorted/file_manager.h b/include/toBeSorted/file_manager.h index 0bf79629..1be099b1 100644 --- a/include/toBeSorted/file_manager.h +++ b/include/toBeSorted/file_manager.h @@ -8,14 +8,29 @@ enum ITEM_ID {}; enum SAVE_ITEM_ID {}; +class SkipData { +public: + /** 0x00 */ u16 data[16]; + /** 0x20 */ u32 crc; +}; + +class SavedSaveFiles { +public: + /** 0x00 */ char regionCode[4]; + /** 0x04 */ u8 unk1[0x1C - 0x04]; + /** 0x1C */ u32 m_0x1C; + /** 0x20 */ SaveFile saveFiles[3]; + /** 0xfb60 */ SkipData skipData[3]; + /** 0xfbcc */ u8 unk2[0xfbe0 - 0xfb60]; +}; + class FileManager { public: - /* 0x0000 */ void *mpSavedSaveFiles; - /* 0x0004 */ void *mpSkipData; // skip data Arrary (3 entries ) + /* 0x0000 */ SavedSaveFiles *mpSavedSaveFiles; + /* 0x0004 */ SkipData *mpSkipData; // skip data Arrary (3 entries ) /* 0x0008 */ SaveFile mFileA; /* 0x53C8 */ SaveFile mFileB; - /* 0xA788 */ u16 mSkipFlags[16]; - /* 0xA7A8 */ u32 mSkipFlagsCRC; + /* 0xA788 */ SkipData mSkipData; /* 0xA7AC */ wchar_t mHeroNames[3][9]; // each name is 9 wchars /* 0xA7E2 */ wchar_t mHeroName[9]; // The current Hero Name /* 0xA7F4 */ char mCurrentArea[32]; @@ -219,7 +234,7 @@ public: /* 8000D040 */ u8 getSkykeepPuzzleTile(u32 spot); /* 8000D0B0 */ void checkFileStatus(); - /* 8000D1D0 */ void checkSkipDataCRCs(); + /* 8000D1D0 */ bool checkSkipDataCRCs(); /* 8000D270 */ void saveOrClearSelectedFileToFileA(); /* 8000D280 */ void saveOrClearToFileA(int fileNum); /* 8000D9C0 */ void copyFileBToCurrentFile(); @@ -230,7 +245,7 @@ public: /* 8000EF90 */ void saveFileAToFile(int fileNum); /* 8000F730 */ void copyCurrentToFileB(); /* 8000FDF0 */ void copySelectedFileSkipData(); - /* 8000FE00 */ void copySkipData(int fileNum); + /* 8000FE00 */ void copySkipData(u8 fileNum); /* 8000FEB0 */ void setInfo_FileB(); /* 8000FF60 */ void clearFileA(); @@ -247,14 +262,14 @@ public: /* 80011250 */ u16 *getSkipFlags2(); /* 80011260 */ SaveFile *getFileA(); /* 80011270 */ SaveFile *getFileB(); - /* 80011280 */ void calcFileCRC(const SaveFile *file, u32 length); + /* 80011280 */ u32 calcFileCRC(const void *data, u32 length); /* 80011290 */ void updateEmptyFiles(); /* 800112D0 */ void updateEmptyFileFlags(); /* 80011370 */ bool isFileEmpty(int fileNum); - /* 80011390 */ bool isFileUnk3(int fileNum); + /* 80011390 */ bool isFileDirty(int fileNum); /* 800113B0 */ u8 get_0xA84C(); /* 800113C0 */ bool checkRegionCode(); - /* 80011440 */ bool checkFileCRC(int fileNum); + /* 80011440 */ bool checkFileCRC(u8 fileNum); /* 80011490 */ bool isFileInactive() const; /* 80011500 */ void setPlayerInfoFileA(); /* 800115E0 */ void setT3Info(mVec3_c *pos, mAng3_c *rot); diff --git a/include/toBeSorted/save_file.h b/include/toBeSorted/save_file.h index 1a8fea8d..22c57de2 100644 --- a/include/toBeSorted/save_file.h +++ b/include/toBeSorted/save_file.h @@ -9,7 +9,7 @@ // non-offical name struct SaveFile { public: - /* 0x 0000 */ char field_0x0000[0x8 - 0x0]; + /* 0x 0000 */ s64 playTime; /* 0x 0008 */ s64 savedTime; /* 0x 0010 */ mVec3_c pos_t1; /* 0x 001c */ mVec3_c pos_t2; @@ -17,11 +17,11 @@ public: /* 0x 0034 */ mVec3_c beacon_pos[32][5]; /* 0x 07b4 */ s32 beedleShopPathSegment; /* 0x 07b8 */ f32 beedlShopPathSegFrac; - /* 0x 07bc */ char field_0x07BC[0x7c0 - 0x7bc]; + /* 0x 07bc */ u32 field_0x07BC; /* 0x 07c0 */ s32 pouch_items[8]; /* 0x 07e0 */ s32 item_check_items[60]; /* 0x 08d0 */ int file_area_index; - /* 0x 08d4 */ s16 player_name[8]; + /* 0x 08d4 */ wchar_t player_name[8]; /* 0x 08e4 */ u16 story_flags[128]; /* 0x 09e4 */ u16 item_flags[64]; /* 0x 0a64 */ u16 dungeon_flags[8][22]; @@ -34,15 +34,15 @@ public: /* 0x 302c */ u16 hitByEnemyCounts[100]; /* 0x 30f4 */ u16 temp_flags[4]; /* 0x 30fc */ u16 zone_flags[252]; - /* 0x 32f4 */ u16 unk_flags[4096]; // size guessed? (saw memset) - /* 0x 52f4 */ s16 air_potion_timer; - /* 0x 52f6 */ s16 air_potion_plus_timer; - /* 0x 52f8 */ s16 stamina_potion_timer; - /* 0x 52fa */ s16 stamina_potion_plus_timer; - /* 0x 52fc */ s16 gaurdian_potion_timer; - /* 0x 52fe */ s16 gaurdian_potion_plus_timer; - /* 0x 5300 */ s16 field_0x5300; - /* 0x 5302 */ s16 health_capacity; + /* 0x 32f4 */ u16 enemy_flags[4096]; + /* 0x 52f4 */ u16 air_potion_timer; + /* 0x 52f6 */ u16 air_potion_plus_timer; + /* 0x 52f8 */ u16 stamina_potion_timer; + /* 0x 52fa */ u16 stamina_potion_plus_timer; + /* 0x 52fc */ u16 gaurdian_potion_timer; + /* 0x 52fe */ u16 gaurdian_potion_plus_timer; + /* 0x 5300 */ u16 field_0x5300; + /* 0x 5302 */ u16 health_capacity; /* 0x 5304 */ u16 unused_heart_related; /* 0x 5306 */ u16 current_health; /* 0x 5308 */ u16 room_id_t1; @@ -88,20 +88,20 @@ public: /* 800099b0 */ u16 *getStoryFlags0(); /* 800099c0 */ const u16 *getStoryFlags1() const; /* 800099d0 */ u16 *getItemFlags0(); - /* 800099e0 */ u16 *getItemFlags1(); + /* 800099e0 */ const u16 *getItemFlags1() const; /* 800099F0 */ u16 *getDungeonFlags0(); - /* 80009A00 */ u16 *getDungeonFlags1(); + /* 80009A00 */ const u16 *getDungeonFlags1() const; /* 80009A10 */ u16 *getSceneFlags0(); - /* 80009A20 */ u16 *getSceneFlags1(); + /* 80009A20 */ const u16 *getSceneFlags1() const; /* 80009A30 */ u16 *getTboxFlags0(); - /* 80009A40 */ u16 *getTboxFlags1(); + /* 80009A40 */ const u16 *getTboxFlags1() const; /* 80009A50 */ u16 *getTempFlags0(); - /* 80009A60 */ u16 *getTempFlags1(); + /* 80009A60 */ const u16 *getTempFlags1() const; /* 80009A70 */ u16 *getZoneFlags0(); - /* 80009A80 */ u16 *getZoneFlags1(); - /* 80009A90 */ u16 *getUnkFlags0(); - /* 80009AA0 */ u16 *getUnkFlags1(); - /* 80009AB0 */ s16 *getPlayerName(); // UTF16-BE + /* 80009A80 */ const u16 *getZoneFlags1() const; + /* 80009A90 */ u16 *getEnemyFlags0(); + /* 80009AA0 */ const u16 *getEnemyFlags1() const; + /* 80009AB0 */ wchar_t *getPlayerName(); // UTF16-BE /* 80009AC0 */ void setAreaT1(char *name); /* 80009BE0 */ char *getAreaT1(); /* 80009BF0 */ void setAreaT2(char *name); diff --git a/src/toBeSorted/file_manager.cpp b/src/toBeSorted/file_manager.cpp index 436720f2..cde98210 100644 --- a/src/toBeSorted/file_manager.cpp +++ b/src/toBeSorted/file_manager.cpp @@ -1,25 +1,27 @@ #include "toBeSorted/file_manager.h" #include "f/f_base.h" #include -#include "libc.h" +// #include "libc.h" +#include // This class here makes no sense and the name might // be a total misnomer, but this gets the sinit section correct class UnkClass { public: UnkClass(); + /* vtable at 80500400 */ virtual ~UnkClass(); static UnkClass sInstance; }; // This seems really pointless since the class only has a virtual destructor // and no members but /shrug -UnkClass UnkClass::sInstance; +/* 80574FF8 */ UnkClass UnkClass::sInstance; -UnkClass::UnkClass() {} -UnkClass::~UnkClass() {} +/* 80009D30 */ UnkClass::UnkClass() {} +/* 80009D40 */ UnkClass::~UnkClass() {} -FileManager *FileManager::sInstance; +/* 80574FFC */ FileManager *FileManager::sInstance; extern "C" { /* 80009D80 */ void fn_80009D80() {} // return @@ -39,8 +41,9 @@ extern "C" { mHeroName[0] = '\0'; mCurrentArea[0] = '\0'; sInstance = this; - mpSavedSaveFiles = mHeap::g_gameHeaps[0]->alloc(0xfbe0, 0x20); - mpSkipData = mHeap::g_gameHeaps[0]->alloc(0x80, 0x20); + // TODO these should probably use the new operators? + mpSavedSaveFiles = (SavedSaveFiles*) mHeap::g_gameHeaps[0]->alloc(sizeof(SavedSaveFiles), 0x20); + mpSkipData = (SkipData*) mHeap::g_gameHeaps[0]->alloc(0x80, 0x20); fn_8000A2E0(); } /* 80009EE0 */ // mVec3(); @@ -96,7 +99,58 @@ u16* FileManager::getStoryFlagsMut() { /* 8000AA30 */ u16* FileManager::getSkipFlags() {} /* 8000AA40 */ void FileManager::setSkipFlagsChecked(u16* flags, u32 offset, u16 count) {} -/* 8000AAA0 */ void FileManager::initFile(int fileNum) {} +inline void strncat(char *dest, const char *src, size_t count) { + if (dest != src) { + dest[0] = '\0'; + if (src != nullptr) { + size_t len = strlen(dest); + size_t count = strlen(src); + count = len + count + 1 >= 0x20 ? 0x1f - len : count; + strncpy(dest + len, src, count)[count] = '\0'; + } + } +} + +/* 8000AAA0 */ void FileManager::initFile(int fileNum) { + SaveFile *file; + char buf[0x20]; + + mIsFileInvalid[1] = 1; + file = getFileA(); + if (fileNum != 0) { + file = &mFileB; + } + file->new_file = 0; + file->health_capacity = 0x18; + file->unused_heart_related = 0x18; + file->current_health = 0x18; + file->shield_pouch_slot = 8; + file->equipped_b_item = 0xb; + file->selectedDowsingSlot = 0x8; + file->lastUsedPouchItemSlot = 0x8; + + buf[0] = '\0'; + strncat(buf, "F405", 0x20); + /* + buf[0] = '\0'; + // TODO looks like an inlined strncat, + // hence the needless comparison to a .data string + // Not sure how we can do this? + // strncat(buf, etc, 0x20); + if (etc != buf) { + buf[0] = '\0'; + if (etc != nullptr) { + size_t len = strlen(buf); + size_t count = strlen(etc); + count = len + count + 1 >= 0x20 ? 0x1f - len : count; + strncpy(buf + len, etc, count)[count] = '\0'; + } + }*/ + file->setAreaT1(buf); + file->room_id_t1 = 0; + file->forced_layer_t1 = 0; + file->entrance_t1_load_flag = 1; +} /* 8000ABD0 */ void FileManager::setCurrentHealthCapacity(s16 health) {} /* 8000AC00 */ s16 FileManager::getCurrentHealthCapacity() {} @@ -229,29 +283,163 @@ u16* FileManager::getStoryFlagsMut() { /* 8000CFE0 */ void FileManager::setSkykeepPuzzle(u32 spot, u8 tile) {} /* 8000D040 */ u8 FileManager::getSkykeepPuzzleTile(u32 spot) {} -/* 8000D0B0 */ void FileManager::checkFileStatus() {} -/* 8000D1D0 */ void FileManager::checkSkipDataCRCs() {} -/* 8000D270 */ void FileManager::saveOrClearSelectedFileToFileA() {} +/* 8000D0B0 */ void FileManager::checkFileStatus() { + mIsFileInvalid[2] = 0; + SkipData *data; + SavedSaveFiles *files = mpSavedSaveFiles; + + if (!checkRegionCode()) { + mIsFileInvalid[2] = 1; + } + if (files->m_0x1C != 0x1d) { + mIsFileInvalid[2] = 1; + } + + for (u8 i = 0; i < 3; i++) { + if (checkFileCRC(i) == 0) { + mIsFileDataDirty[i] = 1; + } else { + mIsFileDataDirty[i] = 0; + } + } + + int i; + for (i = 0, data = files->skipData; i < 3; i++, data++) { + u32 crc = calcFileCRC(data->data, sizeof(data->data)); + if (crc != data->crc) { + fn_80009DA0(data); + data->crc = calcFileCRC(data->data, sizeof(data->data)); + } + } +} +/* 8000D1D0 */ bool FileManager::checkSkipDataCRCs() { + SkipData *data; + bool dirty = false; + int i; + for (data = &mpSkipData[0], i = 0; i < 3; i++, data++) { + u32 crc = calcFileCRC(data->data, sizeof(data->data)); + if (crc == data->crc) { + mIsFileSkipDataDirty[i & 0xff] = 0; + } else { + mIsFileSkipDataDirty[i & 0xff] = 1; + dirty = true; + } + } + return dirty; +} +/* 8000D270 */ void FileManager::saveOrClearSelectedFileToFileA() { + saveOrClearToFileA(mSelectedFile); +} /* 8000D280 */ void FileManager::saveOrClearToFileA(int fileNum) {} /* 8000D9C0 */ void FileManager::copyFileBToCurrentFile() {} -/* 8000E060 */ void FileManager::copyFileAToSelectedFile() {} +/* 8000E060 */ void FileManager::copyFileAToSelectedFile() { + copyFileAToFile(mSelectedFile); +} /* 8000E070 */ void FileManager::copyFileAToFile(int fileNum) {} /* 8000E7C0 */ void FileManager::copyFile(int from, int to) {} -/* 8000EF80 */ void FileManager::saveFileAToSelectedFile() {} +/* 8000EF80 */ void FileManager::saveFileAToSelectedFile() { + saveFileAToFile(mSelectedFile); +} /* 8000EF90 */ void FileManager::saveFileAToFile(int fileNum) {} /* 8000F730 */ void FileManager::copyCurrentToFileB() {} -/* 8000FDF0 */ void FileManager::copySelectedFileSkipData() {} -/* 8000FE00 */ void FileManager::copySkipData(int fileNum) {} +/* 8000FDF0 */ void FileManager::copySelectedFileSkipData() { + copySkipData(mSelectedFile); +} +/* 8000FE00 */ void FileManager::copySkipData(u8 fileNum) { + if (fileNum < 3) { + SkipData *curr = &mSkipData; + SkipData *data = mpSkipData; + curr->crc = calcFileCRC(&curr->data, sizeof(mSkipData.data)); + data[fileNum] = *curr; + } +} /* 8000FEB0 */ void FileManager::setInfo_FileB() {} -/* 8000FF60 */ void FileManager::clearFileA() {} +/* 8000FF60 */ void FileManager::clearFileA() { + SkipData *data; + SaveFile *file = getFileA(); + memset(file, 0, sizeof(SaveFile)); + file->new_file = 1; + file->checksum = calcFileCRC(file, sizeof(SaveFile) - sizeof(u32)); + data = &mSkipData; + memset(&data->data, 0, sizeof(SkipData)); + data->crc = calcFileCRC(data->data, sizeof(mSkipData.data)); +} -/* 80010000 */ void FileManager::initBlankSaveFiles() {} -/* 80010160 */ void FileManager::initSkipData() {} +/* 80010000 */ void FileManager::initBlankSaveFiles() { + memset(mpSavedSaveFiles, 0, 0xfbe0); + mSelectedFile = 0; + memset(mIsFileEmpty, 0, 3); + SkipData *data; + + SaveFile *file; + SavedSaveFiles *saved = mpSavedSaveFiles; + + mHeroNames[0][0] = '\0'; + mPlayTime[0] = 0; + mCurrentHealth[0] = 0; + mCurrentHealthCapacity[0] = 0; + + mHeroNames[1][0] = '\0'; + mPlayTime[1] = 0; + mCurrentHealth[1] = 0; + mCurrentHealthCapacity[1] = 0; + + mHeroNames[2][0] = '\0'; + mPlayTime[2] = 0; + mCurrentHealth[2] = 0; + mCurrentHealthCapacity[2] = 0; + + getRegionVersion(saved->regionCode); + saved->m_0x1C = 0x1d; + + file = &saved->saveFiles[0]; + for (int num = 0; num < 3; num++, file++) { + file->new_file = 1; + u32 crc = calcFileCRC(file, sizeof(SaveFile) - sizeof(u32)); + file->checksum = crc; + } + + int i; + for (i = 0, data = saved->skipData; i < 3; i++, data++) { + u32 crc = calcFileCRC(data->data, sizeof(data->data)); + data->crc = crc; + } + + clearFileA(); + mIsFileUnk1[1] = 0; + mIsFileUnk1[2] = 0; + mIsFileInvalid[0] = 0; + mIsFileInvalid[1] = 0; + m_0xA84C = 0; + mIsFileInvalid[2] = 0; + mIsFileDataDirty[0] = 0; + mIsFileDataDirty[1] = 0; + mIsFileDataDirty[2] = 0; + initSkipData(); +} +/* 80010160 */ void FileManager::initSkipData() { + memset(mpSkipData, 0, 0x80); + SkipData *data; + int i; + for (i = 0, data = &mpSkipData[0]; i < 3; i++, data++) { + u32 crc = calcFileCRC(data->data, sizeof(data->data)); + data->crc = crc; + } + mIsFileSkipDataDirty[0] = 0; + mIsFileSkipDataDirty[1] = 0; + mIsFileSkipDataDirty[2] = 0; +} /* 800101F0 */ void FileManager::unsetFileANewFile() {} /* 80010220 */ void FileManager::saveT1SaveInfo(u8 entranceT1LoadFlag) {} /* 80010350 */ void FileManager::copyFileSkipData(int fileNum) {} -/* 80010440 */ void FileManager::clearTempFileData() {} +extern "C" void fn_800C01F0(); // todo flag managers +/* 80010440 */ void FileManager::clearTempFileData() { + memset(&mFileA, 0, sizeof(SaveFile)); + memset(&mFileB, 0, sizeof(SaveFile)); + memset(&mSkipData, 0, sizeof(SkipData)); + fn_800C01F0(); +} /* 800104A0 */ void FileManager::saveAfterCredits() {} /* 80011210 */ SaveFile* FileManager::getCurrentFile() { @@ -264,14 +452,17 @@ u16* FileManager::getStoryFlagsMut() { /* 80011270 */ SaveFile* FileManager::getFileB() { return &mFileB; } -/* 80011280 */ void FileManager::calcFileCRC(const SaveFile* file, u32 length) {} -/* 80011290 */ void FileManager::updateEmptyFiles() {} +/* 80011280 */ u32 FileManager::calcFileCRC(const void *data, u32 length) {} +/* 80011290 */ void FileManager::updateEmptyFiles() { + updateEmptyFileFlags(); + refreshSaveFileData(); +} /* 800112D0 */ void FileManager::updateEmptyFileFlags() {} /* 80011370 */ bool FileManager::isFileEmpty(int fileNum) {} -/* 80011390 */ bool FileManager::isFileUnk3(int fileNum) {} +/* 80011390 */ bool FileManager::isFileDirty(int fileNum) {} /* 800113B0 */ u8 FileManager::get_0xA84C() {} /* 800113C0 */ bool FileManager::checkRegionCode() {} -/* 80011440 */ bool FileManager::checkFileCRC(int fileNum) {} +/* 80011440 */ bool FileManager::checkFileCRC(u8 fileNum) {} /* 80011490 */ bool FileManager::isFileInactive() const { fBase_c* actor = fManager_c::searchBaseByGroupType(1, nullptr); diff --git a/src/toBeSorted/save_file.cpp b/src/toBeSorted/save_file.cpp index d55d11f3..c41f1fcb 100644 --- a/src/toBeSorted/save_file.cpp +++ b/src/toBeSorted/save_file.cpp @@ -5,7 +5,7 @@ u16* SaveFile::getStoryFlags0() { return story_flags; } -// 0x800099c0 getStoryFlags1__8SaveFileFv +// 0x800099c0 getStoryFlags1__8SaveFileCFv const u16* SaveFile::getStoryFlags1() const { return story_flags; } @@ -13,60 +13,60 @@ const u16* SaveFile::getStoryFlags1() const { u16* SaveFile::getItemFlags0() { return item_flags; } -// 0x800099e0 getItemFlags1__8SaveFileFv -u16* SaveFile::getItemFlags1() { +// 0x800099e0 getItemFlags1__8SaveFileCFv +const u16* SaveFile::getItemFlags1() const { return item_flags; } // 0x800099F0 getDungeonFlags0__8SaveFileFv u16* SaveFile::getDungeonFlags0() { return dungeon_flags[0]; } -// 0x80009A00 getDungeonFlags1__8SaveFileFv -u16* SaveFile::getDungeonFlags1() { +// 0x80009A00 getDungeonFlags1__8SaveFileCFv +const u16* SaveFile::getDungeonFlags1() const { return dungeon_flags[0]; } // 0x80009A10 getSceneFlags0__8SaveFileFv u16* SaveFile::getSceneFlags0() { return scene_flags; } -// 0x80009A20 getSceneFlags1__8SaveFileFv -u16* SaveFile::getSceneFlags1() { +// 0x80009A20 getSceneFlags1__8SaveFileCFv +const u16* SaveFile::getSceneFlags1() const { return scene_flags; } // 0x80009A30 getTboxFlags0__8SaveFileFv u16* SaveFile::getTboxFlags0() { return tbox_flags; } -// 0x80009A40 getTboxFlags1__8SaveFileFv -u16* SaveFile::getTboxFlags1() { +// 0x80009A40 getTboxFlags1__8SaveFileCFv +const u16* SaveFile::getTboxFlags1() const { return tbox_flags; } // 0x80009A50 getTempFlags0__8SaveFileFv u16* SaveFile::getTempFlags0() { return temp_flags; } -// 0x80009A60 getTempFlags1__8SaveFileFv -u16* SaveFile::getTempFlags1() { +// 0x80009A60 getTempFlags1__8SaveFileCFv +const u16* SaveFile::getTempFlags1() const { return temp_flags; } // 0x80009A70 getZoneFlags0__8SaveFileFv u16* SaveFile::getZoneFlags0() { return zone_flags; } -// 0x80009A80 getZoneFlags1__8SaveFileFv -u16* SaveFile::getZoneFlags1() { +// 0x80009A80 getZoneFlags1__8SaveFileCFv +const u16* SaveFile::getZoneFlags1() const { return zone_flags; } -// 0x80009A90 getUnkFlags0__8SaveFileFv -u16* SaveFile::getUnkFlags0() { - return unk_flags; +// 0x80009A90 getEnemyFlags0__8SaveFileFv +u16* SaveFile::getEnemyFlags0() { + return enemy_flags; } -// 0x80009AA0 getUnkFlags1__8SaveFileFv -u16* SaveFile::getUnkFlags1() { - return unk_flags; +// 0x80009AA0 getEnemyFlags1__8SaveFileCFv +const u16* SaveFile::getEnemyFlags1() const { + return enemy_flags; } // 0x80009AB0 getPlayerName__8SaveFileFv -s16* SaveFile::getPlayerName() { +wchar_t* SaveFile::getPlayerName() { return player_name; } From 274675aa64fd7cef283e16fe9c04d7d55ce3d945 Mon Sep 17 00:00:00 2001 From: robojumper Date: Thu, 2 May 2024 00:52:14 +0200 Subject: [PATCH 03/25] tiniest cleanup --- src/toBeSorted/file_manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/toBeSorted/file_manager.cpp b/src/toBeSorted/file_manager.cpp index cde98210..9da73cbb 100644 --- a/src/toBeSorted/file_manager.cpp +++ b/src/toBeSorted/file_manager.cpp @@ -315,13 +315,13 @@ inline void strncat(char *dest, const char *src, size_t count) { /* 8000D1D0 */ bool FileManager::checkSkipDataCRCs() { SkipData *data; bool dirty = false; - int i; + u8 i; for (data = &mpSkipData[0], i = 0; i < 3; i++, data++) { u32 crc = calcFileCRC(data->data, sizeof(data->data)); if (crc == data->crc) { - mIsFileSkipDataDirty[i & 0xff] = 0; + mIsFileSkipDataDirty[i] = 0; } else { - mIsFileSkipDataDirty[i & 0xff] = 1; + mIsFileSkipDataDirty[i] = 1; dirty = true; } } From 1fef0aad286b943e34998b7f8829d4ab3b88c7b4 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Thu, 2 May 2024 15:12:45 -0400 Subject: [PATCH 04/25] The ctor is closer now --- config/SOUE01/symbols.txt | 2 +- include/toBeSorted/file_manager.h | 17 +-- src/toBeSorted/file_manager.cpp | 209 +++++++++++++++--------------- 3 files changed, 116 insertions(+), 112 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 81006c4c..f852a0cb 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -155,7 +155,7 @@ fn_800071D0 = .text:0x800071D0; // type:function size:0x8C fn_80007260 = .text:0x80007260; // type:function size:0xE4 OSPanic = .text:0x80007350; // type:function size:0xDC scope:weak fn_80007430 = .text:0x80007430; // type:function size:0x24 -__dt__7mVec3_cFv = .text:0x80007460; // type:function size:0x40 +__dt__7mVec3_cFv = .text:0x80007460; // type:function size:0x40 scope:weak fn_800074A0 = .text:0x800074A0; // type:function size:0xC8 fn_80007570 = .text:0x80007570; // type:function size:0x58 fn_800075D0 = .text:0x800075D0; // type:function size:0x8C diff --git a/include/toBeSorted/file_manager.h b/include/toBeSorted/file_manager.h index 1be099b1..282cfc4b 100644 --- a/include/toBeSorted/file_manager.h +++ b/include/toBeSorted/file_manager.h @@ -4,7 +4,6 @@ #include "toBeSorted/save_file.h" #include - enum ITEM_ID {}; enum SAVE_ITEM_ID {}; @@ -16,12 +15,12 @@ public: class SavedSaveFiles { public: - /** 0x00 */ char regionCode[4]; - /** 0x04 */ u8 unk1[0x1C - 0x04]; - /** 0x1C */ u32 m_0x1C; - /** 0x20 */ SaveFile saveFiles[3]; - /** 0xfb60 */ SkipData skipData[3]; - /** 0xfbcc */ u8 unk2[0xfbe0 - 0xfb60]; + /* 0x0000 */ char regionCode[4]; + /* 0x0004 */ u8 unk1[0x1C - 0x04]; + /* 0x001C */ u32 m_0x1C; + /* 0x0020 */ SaveFile saveFiles[3]; + /* 0xfb60 */ SkipData skipData[3]; + /* 0xfbcc */ u8 unk2[0xfbe0 - 0xfbcc]; }; class FileManager { @@ -258,7 +257,9 @@ public: /* 80010440 */ void clearTempFileData(); /* 800104A0 */ void saveAfterCredits(); /* 80011210 */ SaveFile *getCurrentFile(); - inline const SaveFile *getCurrentFile() const { return isFileInactive() ? &mFileB : &mFileA; } + inline const SaveFile *getCurrentFile() const { + return isFileInactive() ? &mFileB : &mFileA; + } /* 80011250 */ u16 *getSkipFlags2(); /* 80011260 */ SaveFile *getFileA(); /* 80011270 */ SaveFile *getFileB(); diff --git a/src/toBeSorted/file_manager.cpp b/src/toBeSorted/file_manager.cpp index 9da73cbb..6ffe1132 100644 --- a/src/toBeSorted/file_manager.cpp +++ b/src/toBeSorted/file_manager.cpp @@ -24,41 +24,43 @@ public: /* 80574FFC */ FileManager *FileManager::sInstance; extern "C" { - /* 80009D80 */ void fn_80009D80() {} // return - /* 80009D90 */ void fn_80009D90() {} // return - /* 80009DA0 */ void fn_80009DA0(void *ptr) { - memset(ptr, 0, 0x20); - } // memset(param_1, 0, 0x20) a 0x24 structure is implied here (0x20 data) a crc is at 0x24 +/* 80009D80 */ void fn_80009D80() {} // return +/* 80009D90 */ void fn_80009D90() {} // return +/* 80009DA0 */ void fn_80009DA0(void *ptr) { + memset(ptr, 0, 0x20); +} // memset(param_1, 0, 0x20) a 0x24 structure is implied here (0x20 data) a crc is at 0x24 } /* 80009DB0 */ FileManager::FileManager() { // TODO the assembly code looks really wild - u32 numSaves = (u32)(mHeroName - mHeroNames[0]) / 0x12; - for (int i = 0; i < numSaves; i++) { + mHeroNames[0][0] = '\0'; + u32 num_files = (u32)(mHeroName - mHeroNames[0]); + num_files = num_files / sizeof(mHeroName); + for (int i = 1; mHeroNames[i] < mHeroName && i < num_files; i++) { mHeroNames[i][0] = '\0'; } - mHeroName[0] = '\0'; mCurrentArea[0] = '\0'; sInstance = this; // TODO these should probably use the new operators? - mpSavedSaveFiles = (SavedSaveFiles*) mHeap::g_gameHeaps[0]->alloc(sizeof(SavedSaveFiles), 0x20); - mpSkipData = (SkipData*) mHeap::g_gameHeaps[0]->alloc(0x80, 0x20); + mpSavedSaveFiles = (SavedSaveFiles *)mHeap::g_gameHeaps[0]->alloc(sizeof(SavedSaveFiles), 0x20); + mpSkipData = (SkipData *)mHeap::g_gameHeaps[0]->alloc(0x80, 0x20); + fn_8000A2E0(); } /* 80009EE0 */ // mVec3(); -/* 80009EF0 */ FileManager *FileManager::create(EGG::Heap* heap) { - return new(heap, 0x04) FileManager(); +/* 80009EF0 */ FileManager *FileManager::create(EGG::Heap *heap) { + return new (heap, 0x04) FileManager(); } -/* 80009F30 */ bool FileManager::loadSaveData(void* out, char* name, bool isSkipData){} -/* 80009F70 */ void FileManager::saveSaveData(void* unk, bool isSkipData){} -/* 8000A000 */ void FileManager::refreshSaveFileData(){} -/* 8000A260 */ wchar_t* FileManager::getFileHeroname(int fileNum){} -/* 8000A280 */ s64 FileManager::getFileSaveTime(int fileNum){} -/* 8000A2A0 */ s16 FileManager::getFileCurrentHealth(int fileNum){} -/* 8000A2C0 */ s16 FileManager::getFileHealthCapacity(int fileNum){} -/* 8000A2E0 */ void FileManager::fn_8000A2E0(){ +/* 80009F30 */ bool FileManager::loadSaveData(void *out, char *name, bool isSkipData) {} +/* 80009F70 */ void FileManager::saveSaveData(void *unk, bool isSkipData) {} +/* 8000A000 */ void FileManager::refreshSaveFileData() {} +/* 8000A260 */ wchar_t *FileManager::getFileHeroname(int fileNum) {} +/* 8000A280 */ s64 FileManager::getFileSaveTime(int fileNum) {} +/* 8000A2A0 */ s16 FileManager::getFileCurrentHealth(int fileNum) {} +/* 8000A2C0 */ s16 FileManager::getFileHealthCapacity(int fileNum) {} +/* 8000A2E0 */ void FileManager::fn_8000A2E0() { // maybe call this function "reset" mIsFileUnk1[0] = true; initBlankSaveFiles(); @@ -66,38 +68,38 @@ extern "C" { mSelectedFile = 1; } -/* 8000A330 */ -u16* FileManager::getStoryFlagsMut() { +/* 8000A330 */ +u16 *FileManager::getStoryFlagsMut() { return getCurrentFile()->getStoryFlags0(); } -/* 8000A360 */ const u16* FileManager::getStoryFlagsConst() const { +/* 8000A360 */ const u16 *FileManager::getStoryFlagsConst() const { return getCurrentFile()->getStoryFlags1(); } -/* 8000A3B0 */ u16* FileManager::getItemFlagsMut() {} -/* 8000A3E0 */ u16* FileManager::getItemFlagsConst() {} -/* 8000A430 */ u16* FileManager::getDungeonFlagsMut() {} -/* 8000A460 */ u16* FileManager::getDungeonFlagsConst() {} -/* 8000A4B0 */ u16* FileManager::getSceneFlagsMut() {} -/* 8000A4E0 */ u16* FileManager::getSceneFlagsConst() {} -/* 8000A530 */ u16* FileManager::getTBoxFlagsMut() {} -/* 8000A560 */ u16* FileManager::getTBoxFlagsConst() {} -/* 8000A5B0 */ u16* FileManager::getTempFlagsMut() {} -/* 8000A5E0 */ u16* FileManager::getTempFlagsConst() {} -/* 8000A630 */ u16* FileManager::getZoneFlagsMut() {} -/* 8000A660 */ u16* FileManager::getZoneFlagsConst() {} -/* 8000A6B0 */ u16* FileManager::getEnemyDefeatFlagsMut() {} -/* 8000A6E0 */ u16* FileManager::getEnemyDefeatFlagsConst() {} -/* 8000A730 */ void FileManager::setStoryFlags(u16* flags, u32 offset, u16 count) {} -/* 8000A790 */ void FileManager::setItemFlags(u16* flags, u32 offset, u16 count) {} -/* 8000A7F0 */ void FileManager::setDungeonFlags(u16* flags, u32 offset, u16 count) {} -/* 8000A850 */ void FileManager::setSceneFlags(u16* flags, u32 offset, u16 count) {} -/* 8000A8B0 */ void FileManager::setTBoxFlags(u16* flags, u32 offset, u16 count) {} -/* 8000A910 */ void FileManager::setTempFlags(u16* flags, u32 offset, u16 count) {} -/* 8000A970 */ void FileManager::setZoneFlags(u16* flags, u32 offset, u16 count) {} -/* 8000A9D0 */ void FileManager::setEnemyDefeatFlags(u16* flags, u32 offset, u16 count) {} +/* 8000A3B0 */ u16 *FileManager::getItemFlagsMut() {} +/* 8000A3E0 */ u16 *FileManager::getItemFlagsConst() {} +/* 8000A430 */ u16 *FileManager::getDungeonFlagsMut() {} +/* 8000A460 */ u16 *FileManager::getDungeonFlagsConst() {} +/* 8000A4B0 */ u16 *FileManager::getSceneFlagsMut() {} +/* 8000A4E0 */ u16 *FileManager::getSceneFlagsConst() {} +/* 8000A530 */ u16 *FileManager::getTBoxFlagsMut() {} +/* 8000A560 */ u16 *FileManager::getTBoxFlagsConst() {} +/* 8000A5B0 */ u16 *FileManager::getTempFlagsMut() {} +/* 8000A5E0 */ u16 *FileManager::getTempFlagsConst() {} +/* 8000A630 */ u16 *FileManager::getZoneFlagsMut() {} +/* 8000A660 */ u16 *FileManager::getZoneFlagsConst() {} +/* 8000A6B0 */ u16 *FileManager::getEnemyDefeatFlagsMut() {} +/* 8000A6E0 */ u16 *FileManager::getEnemyDefeatFlagsConst() {} +/* 8000A730 */ void FileManager::setStoryFlags(u16 *flags, u32 offset, u16 count) {} +/* 8000A790 */ void FileManager::setItemFlags(u16 *flags, u32 offset, u16 count) {} +/* 8000A7F0 */ void FileManager::setDungeonFlags(u16 *flags, u32 offset, u16 count) {} +/* 8000A850 */ void FileManager::setSceneFlags(u16 *flags, u32 offset, u16 count) {} +/* 8000A8B0 */ void FileManager::setTBoxFlags(u16 *flags, u32 offset, u16 count) {} +/* 8000A910 */ void FileManager::setTempFlags(u16 *flags, u32 offset, u16 count) {} +/* 8000A970 */ void FileManager::setZoneFlags(u16 *flags, u32 offset, u16 count) {} +/* 8000A9D0 */ void FileManager::setEnemyDefeatFlags(u16 *flags, u32 offset, u16 count) {} -/* 8000AA30 */ u16* FileManager::getSkipFlags() {} -/* 8000AA40 */ void FileManager::setSkipFlagsChecked(u16* flags, u32 offset, u16 count) {} +/* 8000AA30 */ u16 *FileManager::getSkipFlags() {} +/* 8000AA40 */ void FileManager::setSkipFlagsChecked(u16 *flags, u32 offset, u16 count) {} inline void strncat(char *dest, const char *src, size_t count) { if (dest != src) { @@ -157,22 +159,22 @@ inline void strncat(char *dest, const char *src, size_t count) { /* 8000AC50 */ void FileManager::setCurrentHealth(s16 health) {} /* 8000AC80 */ s16 FileManager::getCurrentHealth() {} -/* 8000ACD0 */ u16 FileManager::getLoadRoomT1() {} -/* 8000AD20 */ u16 FileManager::getLoadRoomT2() {} +/* 8000ACD0 */ u16 FileManager::getLoadRoomT1() {} +/* 8000AD20 */ u16 FileManager::getLoadRoomT2() {} /* 8000AD70 */ void FileManager::setLoadRoomT3(s16 room) {} -/* 8000ADA0 */ u16 FileManager::getLoadRoomT3() {} +/* 8000ADA0 */ u16 FileManager::getLoadRoomT3() {} -/* 8000ADF0 */ mVec3_c* FileManager::getPosT1() {} -/* 8000AE40 */ void FileManager::setPosT2(mVec3_c* pos) {} -/* 8000AE90 */ mVec3_c* FileManager::getPosT2() {} -/* 8000AEE0 */ void FileManager::setPosT3(mVec3_c* pos) {} -/* 8000AF30 */ mVec3_c* FileManager::getPosT3() {} +/* 8000ADF0 */ mVec3_c *FileManager::getPosT1() {} +/* 8000AE40 */ void FileManager::setPosT2(mVec3_c *pos) {} +/* 8000AE90 */ mVec3_c *FileManager::getPosT2() {} +/* 8000AEE0 */ void FileManager::setPosT3(mVec3_c *pos) {} +/* 8000AF30 */ mVec3_c *FileManager::getPosT3() {} -/* 8000AF80 */ s16 FileManager::getAngleT1() {} +/* 8000AF80 */ s16 FileManager::getAngleT1() {} /* 8000AFD0 */ void FileManager::setAngleT2(s16 angle) {} -/* 8000B000 */ s16 FileManager::getAngleT2() {} +/* 8000B000 */ s16 FileManager::getAngleT2() {} /* 8000B050 */ void FileManager::setAngleT3(s16 angle) {} -/* 8000B080 */ s16 FileManager::getAngleT3() {} +/* 8000B080 */ s16 FileManager::getAngleT3() {} /* 8000B0D0 */ void FileManager::setPouchData(s32 slot, u32 slotData) {} /* 8000B130 */ u32 FileManager::getPouchData(s32 slot) {} @@ -181,38 +183,38 @@ inline void strncat(char *dest, const char *src, size_t count) { /* 8000B250 */ void FileManager::setPouchUpperData(s32 slot, s32 data) {} /* 8000B2C0 */ u16 FileManager::getPouchUpperData(s32 slot) {} -/* 8000B2F0 */ void FileManager::setItemCheckData(u32 idx, u32 itemData){} -/* 8000B360 */ u32 FileManager::getItemCheckData(u32 idx){} -/* 8000B3F0 */ void FileManager::setItemCheckItem(u32 idx, ITEM_ID item){} -/* 8000B480 */ ITEM_ID FileManager::getItemCheckItem(u32 idx){} -/* 8000B4B0 */ void FileManager::setItemCheckUpperData(u32 idx, u32 itemData){} -/* 8000B540 */ u32 FileManager::getItemCheckUpperData(){} +/* 8000B2F0 */ void FileManager::setItemCheckData(u32 idx, u32 itemData) {} +/* 8000B360 */ u32 FileManager::getItemCheckData(u32 idx) {} +/* 8000B3F0 */ void FileManager::setItemCheckItem(u32 idx, ITEM_ID item) {} +/* 8000B480 */ ITEM_ID FileManager::getItemCheckItem(u32 idx) {} +/* 8000B4B0 */ void FileManager::setItemCheckUpperData(u32 idx, u32 itemData) {} +/* 8000B540 */ u32 FileManager::getItemCheckUpperData() {} -/* 8000B570 */ void FileManager::setEquippedItem(u8 bWheelItem){} -/* 8000B5A0 */ u8 FileManager::getEquippedItem(){} -/* 8000B5F0 */ void FileManager::setSelectedPouchSlot(u8 slot){} -/* 8000B620 */ u8 FileManager::getSelectedPouchSlot(){} -/* 8000B670 */ void FileManager::setShieldPouchSlot(u8 slot){} -/* 8000B6A0 */ u8 FileManager::getShieldPouchSlot(){} +/* 8000B570 */ void FileManager::setEquippedItem(u8 bWheelItem) {} +/* 8000B5A0 */ u8 FileManager::getEquippedItem() {} +/* 8000B5F0 */ void FileManager::setSelectedPouchSlot(u8 slot) {} +/* 8000B620 */ u8 FileManager::getSelectedPouchSlot() {} +/* 8000B670 */ void FileManager::setShieldPouchSlot(u8 slot) {} +/* 8000B6A0 */ u8 FileManager::getShieldPouchSlot() {} -/* 8000B6F0 */ void FileManager::setAirPotionTimer(s16 time){} -/* 8000B720 */ s16 FileManager::getAirPotionTimer(){} -/* 8000B770 */ void FileManager::setAirPotionPlusTimer(s16 time){} -/* 8000B7A0 */ s16 FileManager::getAirPotionPlusTimer(){} -/* 8000B7F0 */ void FileManager::setStaminaPotionTimer(s16 time){} -/* 8000B820 */ s16 FileManager::getStaminaPotionTimer(){} -/* 8000B870 */ void FileManager::setStaminaPotionPlusTimer(s16 time){} -/* 8000B8A0 */ s16 FileManager::getStaminaPotionPlusTimer(){} -/* 8000B8F0 */ void FileManager::setGuardianPotionTimer(s16 time){} -/* 8000B920 */ s16 FileManager::getGuardianPotionTimer(){} -/* 8000B970 */ void FileManager::setGuardianPotionPlusTimer(s16 time){} -/* 8000B9A0 */ s16 FileManager::getGuardianPotionPlusTimer(){} +/* 8000B6F0 */ void FileManager::setAirPotionTimer(s16 time) {} +/* 8000B720 */ s16 FileManager::getAirPotionTimer() {} +/* 8000B770 */ void FileManager::setAirPotionPlusTimer(s16 time) {} +/* 8000B7A0 */ s16 FileManager::getAirPotionPlusTimer() {} +/* 8000B7F0 */ void FileManager::setStaminaPotionTimer(s16 time) {} +/* 8000B820 */ s16 FileManager::getStaminaPotionTimer() {} +/* 8000B870 */ void FileManager::setStaminaPotionPlusTimer(s16 time) {} +/* 8000B8A0 */ s16 FileManager::getStaminaPotionPlusTimer() {} +/* 8000B8F0 */ void FileManager::setGuardianPotionTimer(s16 time) {} +/* 8000B920 */ s16 FileManager::getGuardianPotionTimer() {} +/* 8000B970 */ void FileManager::setGuardianPotionPlusTimer(s16 time) {} +/* 8000B9A0 */ s16 FileManager::getGuardianPotionPlusTimer() {} /* 8000B9F0 */ void FileManager::setDowsingSlotIdx(u8 idx) {} /* 8000BA20 */ u8 FileManager::getDowsingSlotIdx() {} -/* 8000BA70 */ void FileManager::setBeaconPos(u32 beaconArea, u32 beaconNum, mVec3_c* pos) {} -/* 8000BB80 */ mVec3_c* FileManager::getBeaconPos(u32 beaconArea, u32 beaconNum) {} +/* 8000BA70 */ void FileManager::setBeaconPos(u32 beaconArea, u32 beaconNum, mVec3_c *pos) {} +/* 8000BB80 */ mVec3_c *FileManager::getBeaconPos(u32 beaconArea, u32 beaconNum) {} /* 8000BC70 */ void FileManager::setEnemyKillCount(u32 enemy, u16 killCount) {} /* 8000BCE0 */ u16 FileManager::getEnemyKillCount(u32 enemy) {} /* 8000BD60 */ void FileManager::setHitCountFromEnemy(u32 enemy, u16 hitCount) {} @@ -221,9 +223,9 @@ inline void strncat(char *dest, const char *src, size_t count) { /* 8000BE50 */ void FileManager::setLoadRoomT1_FileB(s16 roomId) {} /* 8000BE80 */ s16 FileManager::getLoadRoomT1_FileB() {} /* 8000BE90 */ void FileManager::setEntranceT1_FileB(u8 entrance) {} -/* 8000BEC0 */ u8 FileManager::getEntranceT1_FileB() {} -/* 8000BED0 */ void FileManager::setAreaT1_FileB(const char* name) {} -/* 8000BF80 */ char* FileManager::getAreaT1_FileB() {} +/* 8000BEC0 */ u8 FileManager::getEntranceT1_FileB() {} +/* 8000BED0 */ void FileManager::setAreaT1_FileB(const char *name) {} +/* 8000BF80 */ char *FileManager::getAreaT1_FileB() {} /* 8000C080 */ void FileManager::setNightT1_FileB(bool night) {} /* 8000C0B0 */ bool FileManager::getNightT1_FileB() {} /* 8000C0C0 */ void FileManager::setEntranceT1LoadFlag_FileB(u8 flag) {} @@ -231,13 +233,13 @@ inline void strncat(char *dest, const char *src, size_t count) { /* 8000C120 */ void FileManager::getForcedLayerT1_FileB() {} /* 8000C130 */ void FileManager::setCurrentHealth_FileB(s16 health) {} -/* 8000C160 */ void FileManager::setHeroname(const wchar_t* name) {} -/* 8000C230 */ wchar_t* FileManager::getHeroname() {} +/* 8000C160 */ void FileManager::setHeroname(const wchar_t *name) {} +/* 8000C230 */ wchar_t *FileManager::getHeroname() {} -/* 8000C360 */ char* FileManager::getAreaT1() {} -/* 8000C470 */ char* FileManager::getAreaT2() {} -/* 8000C580 */ void FileManager::setAreaT3(const char* name) {} -/* 8000C630 */ char* FileManager::getAreaT3() {} +/* 8000C360 */ char *FileManager::getAreaT1() {} +/* 8000C470 */ char *FileManager::getAreaT2() {} +/* 8000C580 */ void FileManager::setAreaT3(const char *name) {} +/* 8000C630 */ char *FileManager::getAreaT3() {} /* 8000C740 */ u8 FileManager::getForcedLayerT1() {} /* 8000C790 */ u8 FileManager::getForcedLayerT2() {} @@ -388,7 +390,7 @@ inline void strncat(char *dest, const char *src, size_t count) { mPlayTime[2] = 0; mCurrentHealth[2] = 0; mCurrentHealthCapacity[2] = 0; - + getRegionVersion(saved->regionCode); saved->m_0x1C = 0x1d; @@ -410,7 +412,7 @@ inline void strncat(char *dest, const char *src, size_t count) { mIsFileUnk1[2] = 0; mIsFileInvalid[0] = 0; mIsFileInvalid[1] = 0; - m_0xA84C = 0; + m_0xA84C = 0; mIsFileInvalid[2] = 0; mIsFileDataDirty[0] = 0; mIsFileDataDirty[1] = 0; @@ -442,14 +444,14 @@ extern "C" void fn_800C01F0(); // todo flag managers } /* 800104A0 */ void FileManager::saveAfterCredits() {} -/* 80011210 */ SaveFile* FileManager::getCurrentFile() { +/* 80011210 */ SaveFile *FileManager::getCurrentFile() { return isFileInactive() ? &mFileB : &mFileA; } -/* 80011250 */ u16* FileManager::getSkipFlags2() {} -/* 80011260 */ SaveFile* FileManager::getFileA() { +/* 80011250 */ u16 *FileManager::getSkipFlags2() {} +/* 80011260 */ SaveFile *FileManager::getFileA() { return &mFileA; } -/* 80011270 */ SaveFile* FileManager::getFileB() { +/* 80011270 */ SaveFile *FileManager::getFileB() { return &mFileB; } /* 80011280 */ u32 FileManager::calcFileCRC(const void *data, u32 length) {} @@ -465,14 +467,15 @@ extern "C" void fn_800C01F0(); // todo flag managers /* 80011440 */ bool FileManager::checkFileCRC(u8 fileNum) {} /* 80011490 */ bool FileManager::isFileInactive() const { - fBase_c* actor = fManager_c::searchBaseByGroupType(1, nullptr); + fBase_c *actor = fManager_c::searchBaseByGroupType(1, nullptr); if (actor) { - if (actor->profile_name == fProfile::TITLE && !mAntiCommitFlag) + if (actor->profile_name == fProfile::TITLE && !mAntiCommitFlag) { return true; + } return false; } return false; } /* 80011500 */ void FileManager::setPlayerInfoFileA() {} -/* 800115E0 */ void FileManager::setT3Info(mVec3_c* pos, mAng3_c* rot) {} -/* 800116C0 */ void FileManager::getRegionVersion(char* out) {} +/* 800115E0 */ void FileManager::setT3Info(mVec3_c *pos, mAng3_c *rot) {} +/* 800116C0 */ void FileManager::getRegionVersion(char *out) {} From 792b7e8058d97ad52acf780b4dfa2c838e605271 Mon Sep 17 00:00:00 2001 From: robojumper Date: Thu, 2 May 2024 23:55:01 +0200 Subject: [PATCH 05/25] FileManager::initFile closer --- src/toBeSorted/file_manager.cpp | 46 +++++++++++++++------------------ 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/toBeSorted/file_manager.cpp b/src/toBeSorted/file_manager.cpp index 6ffe1132..75959c7d 100644 --- a/src/toBeSorted/file_manager.cpp +++ b/src/toBeSorted/file_manager.cpp @@ -101,15 +101,26 @@ u16 *FileManager::getStoryFlagsMut() { /* 8000AA30 */ u16 *FileManager::getSkipFlags() {} /* 8000AA40 */ void FileManager::setSkipFlagsChecked(u16 *flags, u32 offset, u16 count) {} -inline void strncat(char *dest, const char *src, size_t count) { - if (dest != src) { +// This does strncat things - append src to dest +inline void strncat(char *dest, const char *src, size_t max_len) { + if (src != nullptr) { + size_t len = strlen(dest); + size_t count = strlen(src); + count = len + count + 1 >= max_len ? max_len - len - 1 : count; + strncpy(dest + len, src, count); + // one instshuffle here - this should be (len + count), + // but then regalloc blows up and uses one more register in initFile + dest[count + len] = '\0'; + } +} + +// A function like this is inlined into in a bunch of area-related code +// It doesn't make a whole lot of sense to use strncat on a string just +// clipped to zero length... +inline void strnsth(char *dest, const char *src, size_t max_len) { + if (src != dest) { dest[0] = '\0'; - if (src != nullptr) { - size_t len = strlen(dest); - size_t count = strlen(src); - count = len + count + 1 >= 0x20 ? 0x1f - len : count; - strncpy(dest + len, src, count)[count] = '\0'; - } + strncat(dest, src, max_len); } } @@ -132,22 +143,7 @@ inline void strncat(char *dest, const char *src, size_t count) { file->lastUsedPouchItemSlot = 0x8; buf[0] = '\0'; - strncat(buf, "F405", 0x20); - /* - buf[0] = '\0'; - // TODO looks like an inlined strncat, - // hence the needless comparison to a .data string - // Not sure how we can do this? - // strncat(buf, etc, 0x20); - if (etc != buf) { - buf[0] = '\0'; - if (etc != nullptr) { - size_t len = strlen(buf); - size_t count = strlen(etc); - count = len + count + 1 >= 0x20 ? 0x1f - len : count; - strncpy(buf + len, etc, count)[count] = '\0'; - } - }*/ + strnsth(buf, "F405", 0x20); file->setAreaT1(buf); file->room_id_t1 = 0; file->forced_layer_t1 = 0; @@ -318,7 +314,7 @@ inline void strncat(char *dest, const char *src, size_t count) { SkipData *data; bool dirty = false; u8 i; - for (data = &mpSkipData[0], i = 0; i < 3; i++, data++) { + for (data = &mpSkipData[0], i = 0; (s32)i < 3; i++, data++) { u32 crc = calcFileCRC(data->data, sizeof(data->data)); if (crc == data->crc) { mIsFileSkipDataDirty[i] = 0; From a9aac2a5ad3badfeaee6ddaaa5c1b9ccc7e4942a Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 3 May 2024 00:23:57 +0200 Subject: [PATCH 06/25] Small cleanups --- config/SOUE01/splits.txt | 1 + src/toBeSorted/file_manager.cpp | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index cf8cb5fa..4937e0e3 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -20,6 +20,7 @@ toBeSorted/file_manager.cpp: .text start:0x80009D30 end:0x80011730 .ctors start:0x804DB648 end:0x804DB64C .data start:0x80500400 end:0x80500410 + .sdata start:0x80571848 end:0x80571850 .sbss start:0x80574FF8 end:0x80575000 .bss start:0x80580070 end:0x80580080 diff --git a/src/toBeSorted/file_manager.cpp b/src/toBeSorted/file_manager.cpp index 75959c7d..84bd84b4 100644 --- a/src/toBeSorted/file_manager.cpp +++ b/src/toBeSorted/file_manager.cpp @@ -102,7 +102,7 @@ u16 *FileManager::getStoryFlagsMut() { /* 8000AA40 */ void FileManager::setSkipFlagsChecked(u16 *flags, u32 offset, u16 count) {} // This does strncat things - append src to dest -inline void strncat(char *dest, const char *src, size_t max_len) { +inline void fake_strncat(char *dest, const char *src, size_t max_len) { if (src != nullptr) { size_t len = strlen(dest); size_t count = strlen(src); @@ -120,16 +120,14 @@ inline void strncat(char *dest, const char *src, size_t max_len) { inline void strnsth(char *dest, const char *src, size_t max_len) { if (src != dest) { dest[0] = '\0'; - strncat(dest, src, max_len); + fake_strncat(dest, src, max_len); } } /* 8000AAA0 */ void FileManager::initFile(int fileNum) { - SaveFile *file; - char buf[0x20]; mIsFileInvalid[1] = 1; - file = getFileA(); + SaveFile *file = getFileA(); if (fileNum != 0) { file = &mFileB; } @@ -142,6 +140,7 @@ inline void strnsth(char *dest, const char *src, size_t max_len) { file->selectedDowsingSlot = 0x8; file->lastUsedPouchItemSlot = 0x8; + char buf[0x20]; buf[0] = '\0'; strnsth(buf, "F405", 0x20); file->setAreaT1(buf); @@ -314,7 +313,7 @@ inline void strnsth(char *dest, const char *src, size_t max_len) { SkipData *data; bool dirty = false; u8 i; - for (data = &mpSkipData[0], i = 0; (s32)i < 3; i++, data++) { + for (data = mpSkipData, i = 0; (s32)i < 3; i++, data++) { u32 crc = calcFileCRC(data->data, sizeof(data->data)); if (crc == data->crc) { mIsFileSkipDataDirty[i] = 0; @@ -390,7 +389,7 @@ inline void strnsth(char *dest, const char *src, size_t max_len) { getRegionVersion(saved->regionCode); saved->m_0x1C = 0x1d; - file = &saved->saveFiles[0]; + file = saved->saveFiles; for (int num = 0; num < 3; num++, file++) { file->new_file = 1; u32 crc = calcFileCRC(file, sizeof(SaveFile) - sizeof(u32)); @@ -419,7 +418,7 @@ inline void strnsth(char *dest, const char *src, size_t max_len) { memset(mpSkipData, 0, 0x80); SkipData *data; int i; - for (i = 0, data = &mpSkipData[0]; i < 3; i++, data++) { + for (i = 0, data = mpSkipData; i < 3; i++, data++) { u32 crc = calcFileCRC(data->data, sizeof(data->data)); data->crc = crc; } @@ -455,7 +454,16 @@ extern "C" void fn_800C01F0(); // todo flag managers updateEmptyFileFlags(); refreshSaveFileData(); } -/* 800112D0 */ void FileManager::updateEmptyFileFlags() {} +/* 800112D0 */ void FileManager::updateEmptyFileFlags() { + SaveFile *saves = mpSavedSaveFiles->saveFiles; + for (int i = 0; i < 3; i++) { + if (saves[i].new_file == 1) { + mIsFileEmpty[i] = 1; + } else { + mIsFileEmpty[i] = 0; + } + } +} /* 80011370 */ bool FileManager::isFileEmpty(int fileNum) {} /* 80011390 */ bool FileManager::isFileDirty(int fileNum) {} /* 800113B0 */ u8 FileManager::get_0xA84C() {} From 37925e4376af619f1e7b66891dd8380b033d71dd Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 28 Apr 2024 02:38:46 +0200 Subject: [PATCH 07/25] Almost matching DungeonflagManager --- config/SOUE01/splits.txt | 5 ++ config/SOUE01/symbols.txt | 24 +++---- configure.py | 1 + src/toBeSorted/dungeonflag_manager.cpp | 98 ++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 12 deletions(-) create mode 100644 src/toBeSorted/dungeonflag_manager.cpp diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 1f79f5f6..66a7b4af 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -122,6 +122,11 @@ toBeSorted/unk_flag_stuff.cpp: toBeSorted/bitwise_flag_helper.cpp: .text start:0x800BF200 end:0x800BF264 +toBeSorted/dungeonflag_manager.cpp: + .text start:0x800BF8D0 end:0x800BFBA0 + .sbss start:0x80575404 end:0x80575408 + .bss start:0x805A9C58 end:0x805A9C68 + toBeSorted/skipflag_manager.cpp: .text start:0x800BFBA0 end:0x800BFE00 .sbss start:0x80575408 end:0x8057540C diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index dfd2e61c..4fe4a163 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -2228,7 +2228,7 @@ fn_80054CF0 = .text:0x80054CF0; // type:function size:0x88 fn_80054D80 = .text:0x80054D80; // type:function size:0x98 fn_80054E20 = .text:0x80054E20; // type:function size:0x88 fn_80054EB0 = .text:0x80054EB0; // type:function size:0x4 -fn_80054EC0 = .text:0x80054EC0; // type:function size:0xC +__nw__FUl = .text:0x80054EC0; // type:function size:0xC fn_80054ED0 = .text:0x80054ED0; // type:function size:0xC __dl__FPv = .text:0x80054EE0; // type:function size:0x8 fn_80054EF0 = .text:0x80054EF0; // type:function size:0x8 @@ -4171,15 +4171,15 @@ fn_800BF820 = .text:0x800BF820; // type:function size:0x3C fn_800BF860 = .text:0x800BF860; // type:function size:0x10 fn_800BF870 = .text:0x800BF870; // type:function size:0x4 fn_800BF880 = .text:0x800BF880; // type:function size:0x4C -fn_800BF8D0 = .text:0x800BF8D0; // type:function size:0x54 -fn_800BF930 = .text:0x800BF930; // type:function size:0xC -fn_800BF940 = .text:0x800BF940; // type:function size:0x3C -fn_800BF980 = .text:0x800BF980; // type:function size:0x54 -fn_800BF9E0 = .text:0x800BF9E0; // type:function size:0xC -fn_800BF9F0 = .text:0x800BF9F0; // type:function size:0x6C -fn_800BFA60 = .text:0x800BFA60; // type:function size:0x60 -fn_800BFAC0 = .text:0x800BFAC0; // type:function size:0x50 -fn_800BFB10 = .text:0x800BFB10; // type:function size:0x8C +copyFromSave__18DungeonflagManagerFUs = .text:0x800BF8D0; // type:function size:0x54 +setCommitFlag__18DungeonflagManagerFUs = .text:0x800BF930; // type:function size:0xC +__ct__18DungeonflagManagerFv = .text:0x800BF940; // type:function size:0x3C +setupFlagStuff__18DungeonflagManagerFv = .text:0x800BF980; // type:function size:0x54 +copyFromSave__18DungeonflagManagerFs = .text:0x800BF9E0; // type:function size:0xC +setToValue__18DungeonflagManagerFUsUi = .text:0x800BF9F0; // type:function size:0x6C +setFlag__18DungeonflagManagerFUs = .text:0x800BFA60; // type:function size:0x60 +getDungeonFlag__18DungeonflagManagerFUs = .text:0x800BFAC0; // type:function size:0x50 +doCommit__18DungeonflagManagerFv = .text:0x800BFB10; // type:function size:0x8C copyFromSave__15SkipflagManagerFv = .text:0x800BFBA0; // type:function size:0x44 setCommitFlag__15SkipflagManagerFUs = .text:0x800BFBF0; // type:function size:0xC __ct__15SkipflagManagerFv = .text:0x800BFC00; // type:function size:0x2C @@ -39848,7 +39848,7 @@ sTBoxFlags__15TBoxFlagManager = .sbss:0x805753F4; // type:object size:0x4 sInstance__18EnemyDefeatManager = .sbss:0x805753F8; // type:object size:0x4 data:4byte lbl_805753FC = .sbss:0x805753FC; // type:object size:0x4 data:4byte lbl_80575400 = .sbss:0x80575400; // type:object size:0x4 data:4byte -lbl_80575404 = .sbss:0x80575404; // type:object size:0x4 data:4byte +sInstance__18DungeonflagManager = .sbss:0x80575404; // type:object size:0x4 data:4byte sInstance__15SkipflagManager = .sbss:0x80575408; // type:object size:0x4 data:4byte lbl_80575410 = .sbss:0x80575410; // type:object size:0x8 data:4byte lbl_80575418 = .sbss:0x80575418; // type:object size:0x8 @@ -48236,7 +48236,7 @@ lbl_805A78E0 = .bss:0x805A78E0; // type:object size:0x1F8 sEnemyDefeatFlags__18EnemyDefeatManager = .bss:0x805A7AD8; // type:object size:0x2000 lbl_805A9AD8 = .bss:0x805A9AD8; // type:object size:0x100 lbl_805A9BD8 = .bss:0x805A9BD8; // type:object size:0x80 -lbl_805A9C58 = .bss:0x805A9C58; // type:object size:0x10 +sDungeonFlags__18DungeonflagManager = .bss:0x805A9C58; // type:object size:0x10 sSkipFlags__15SkipflagManager = .bss:0x805A9C68; // type:object size:0x20 lbl_805A9C88 = .bss:0x805A9C88; // type:object size:0x10 data:4byte lbl_805A9C98 = .bss:0x805A9C98; // type:object size:0x208 diff --git a/configure.py b/configure.py index 87235f4a..0b18234e 100644 --- a/configure.py +++ b/configure.py @@ -274,6 +274,7 @@ config.libs = [ Object(Matching, "toBeSorted/sceneflag_manager.cpp"), Object(NonMatching, "toBeSorted/flag_space.cpp"), Object(NonMatching, "toBeSorted/misc_flag_managers.cpp"), + Object(NonMatching, "toBeSorted/dungeonflag_manager.cpp"), Object(Matching, "toBeSorted/skipflag_manager.cpp"), Object(Matching, "c/c_list.cpp"), Object(Matching, "c/c_tree.cpp"), diff --git a/src/toBeSorted/dungeonflag_manager.cpp b/src/toBeSorted/dungeonflag_manager.cpp new file mode 100644 index 00000000..527a54c5 --- /dev/null +++ b/src/toBeSorted/dungeonflag_manager.cpp @@ -0,0 +1,98 @@ +#include "toBeSorted/bitwise_flag_helper.h" +#include "toBeSorted/file_manager.h" +#include "toBeSorted/flag_space.h" +#include "toBeSorted/unk_flag_stuff.h" +#include + +// TODO move +extern "C" UnkFlagDefinition lbl_80511AF0[]; + +class DungeonflagManager { +public: + bool mShouldCommit; + u16 mFlagIndex; + UnkFlagStuff *mFlagStuff; + FlagSpace mFlagSpace; + + static u16 sDungeonFlags[8]; + static DungeonflagManager *sInstance; + + void copyFromSave(s16 flag); + void copyFromSave(u16 flagIndex); + void setCommitFlag(u16 flag); + DungeonflagManager(); + void setupFlagStuff(); + void setToValue(u16 flag, u32 value); + void setFlag(u16 flag); + u32 getDungeonFlag(u16 flag); + bool doCommit(); +}; + +/** 80575404 */ +DungeonflagManager *DungeonflagManager::sInstance = nullptr; +/** 805a9c58 */ +u16 DungeonflagManager::sDungeonFlags[8] = {}; + +/** 800bf9e0 */ +void DungeonflagManager::copyFromSave(u16 flagIndex) { + u16 *ptr = FileManager::sInstance->getDungeonFlagsConst(); + mFlagSpace.copyFromSaveFile(ptr + (flagIndex & 0x1fff) * 8, 0, 0x8); +} + +/** 800bf930 */ +void DungeonflagManager::setCommitFlag(u16 flag) { + mShouldCommit = true; +} + +/** 0x800bf940 */ +DungeonflagManager::DungeonflagManager() + : mShouldCommit(false), mFlagIndex(-1), mFlagStuff(nullptr), + mFlagSpace(sDungeonFlags, ARRAY_LENGTH(sDungeonFlags)) {} + +/** 800bf980 */ +void DungeonflagManager::setupFlagStuff() { + mFlagStuff = new UnkFlagStuff(0x11, lbl_80511AF0); + mShouldCommit = false; +} + +/** 800bf9e0 */ +void DungeonflagManager::copyFromSave(s16 flag) { + mFlagIndex = flag; + copyFromSave((u16)flag); +} + +/** 800bf9f0 */ +void DungeonflagManager::setToValue(u16 flag, u32 value) { + u16 *data = mFlagSpace.getFlagPtrChecked(); + mFlagStuff->setCounterOrFlag(flag, data, 8, value); + setCommitFlag(flag); +} + +/** 800bfa60 */ +void DungeonflagManager::setFlag(u16 flag) { + u16 *data = mFlagSpace.getFlagPtrChecked(); + mFlagStuff->setCounterOrFlag(flag, data, 8, 1); + setCommitFlag(flag); +} + +/** 800fbac0 */ +u32 DungeonflagManager::getDungeonFlag(u16 flag) { + u16 *data = mFlagSpace.getFlagPtrUnchecked(); + return mFlagStuff->getCounterOrFlag(flag, data, 8); +} + +/** 800fbb10 */ +bool DungeonflagManager::doCommit() { + FileManager *instance; + u16 idx = mFlagIndex; + if (idx == 0xFFFF) { + return false; + } else if (mShouldCommit) { + instance = FileManager::sInstance; + u16 *ptr = mFlagSpace.getFlagPtrUnchecked(); + instance->setDungeonFlags(ptr, (idx & 0x1fff) * 8, 0x08); + mShouldCommit = false; + return true; + } + return false; +} From b9320f5372d8e1e5425be39c7d7ec0243d4c34c6 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 28 Apr 2024 11:13:26 +0200 Subject: [PATCH 08/25] Correct address comment --- src/toBeSorted/dungeonflag_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/toBeSorted/dungeonflag_manager.cpp b/src/toBeSorted/dungeonflag_manager.cpp index 527a54c5..4c463a31 100644 --- a/src/toBeSorted/dungeonflag_manager.cpp +++ b/src/toBeSorted/dungeonflag_manager.cpp @@ -33,7 +33,7 @@ DungeonflagManager *DungeonflagManager::sInstance = nullptr; /** 805a9c58 */ u16 DungeonflagManager::sDungeonFlags[8] = {}; -/** 800bf9e0 */ +/** 800bf8d0 */ void DungeonflagManager::copyFromSave(u16 flagIndex) { u16 *ptr = FileManager::sInstance->getDungeonFlagsConst(); mFlagSpace.copyFromSaveFile(ptr + (flagIndex & 0x1fff) * 8, 0, 0x8); From 4353833983e4d82e607746c6f9ccfc289c5eaf4a Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 28 Apr 2024 11:29:13 +0200 Subject: [PATCH 09/25] inline shenanigans --- config/SOUE01/splits.txt | 2 +- src/toBeSorted/dungeonflag_manager.cpp | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 66a7b4af..79f8f510 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -123,7 +123,7 @@ toBeSorted/bitwise_flag_helper.cpp: .text start:0x800BF200 end:0x800BF264 toBeSorted/dungeonflag_manager.cpp: - .text start:0x800BF8D0 end:0x800BFBA0 + .text start:0x800BF8D0 end:0x800BFB9C .sbss start:0x80575404 end:0x80575408 .bss start:0x805A9C58 end:0x805A9C68 diff --git a/src/toBeSorted/dungeonflag_manager.cpp b/src/toBeSorted/dungeonflag_manager.cpp index 4c463a31..cf4410f5 100644 --- a/src/toBeSorted/dungeonflag_manager.cpp +++ b/src/toBeSorted/dungeonflag_manager.cpp @@ -7,10 +7,16 @@ // TODO move extern "C" UnkFlagDefinition lbl_80511AF0[]; +// TODO what's preventing this from actually matching +// is that we pretend this TU contains the instance, +// which breaks .sbss section alignment. +// It's much more likely that a separate TU contains +// all instance pointers + class DungeonflagManager { public: bool mShouldCommit; - u16 mFlagIndex; + u16 mStageIndex; UnkFlagStuff *mFlagStuff; FlagSpace mFlagSpace; @@ -26,6 +32,12 @@ public: void setFlag(u16 flag); u32 getDungeonFlag(u16 flag); bool doCommit(); + + /** inline shenanigans to get copyFromSave to match */ + static inline u16 *saveFilePtr(u16 flagIndex) { + u32 offset = (flagIndex & 0x1fff) * 8; + return FileManager::sInstance->getDungeonFlagsConst() + offset; + } }; /** 80575404 */ @@ -35,8 +47,7 @@ u16 DungeonflagManager::sDungeonFlags[8] = {}; /** 800bf8d0 */ void DungeonflagManager::copyFromSave(u16 flagIndex) { - u16 *ptr = FileManager::sInstance->getDungeonFlagsConst(); - mFlagSpace.copyFromSaveFile(ptr + (flagIndex & 0x1fff) * 8, 0, 0x8); + mFlagSpace.copyFromSaveFile(saveFilePtr(flagIndex), 0, 0x8); } /** 800bf930 */ @@ -46,7 +57,7 @@ void DungeonflagManager::setCommitFlag(u16 flag) { /** 0x800bf940 */ DungeonflagManager::DungeonflagManager() - : mShouldCommit(false), mFlagIndex(-1), mFlagStuff(nullptr), + : mShouldCommit(false), mStageIndex(-1), mFlagStuff(nullptr), mFlagSpace(sDungeonFlags, ARRAY_LENGTH(sDungeonFlags)) {} /** 800bf980 */ @@ -57,7 +68,7 @@ void DungeonflagManager::setupFlagStuff() { /** 800bf9e0 */ void DungeonflagManager::copyFromSave(s16 flag) { - mFlagIndex = flag; + mStageIndex = flag; copyFromSave((u16)flag); } @@ -84,7 +95,7 @@ u32 DungeonflagManager::getDungeonFlag(u16 flag) { /** 800fbb10 */ bool DungeonflagManager::doCommit() { FileManager *instance; - u16 idx = mFlagIndex; + u16 idx = mStageIndex; if (idx == 0xFFFF) { return false; } else if (mShouldCommit) { From b8b65fdf33db2ad598e868a03318fd53621787ce Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 3 May 2024 09:58:23 +0200 Subject: [PATCH 10/25] Remove instance from dungeon flag mgr TU --- config/SOUE01/splits.txt | 1 - config/SOUE01/symbols.txt | 2 +- configure.py | 2 +- src/toBeSorted/dungeonflag_manager.cpp | 5 +++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 79f8f510..afe56b13 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -124,7 +124,6 @@ toBeSorted/bitwise_flag_helper.cpp: toBeSorted/dungeonflag_manager.cpp: .text start:0x800BF8D0 end:0x800BFB9C - .sbss start:0x80575404 end:0x80575408 .bss start:0x805A9C58 end:0x805A9C68 toBeSorted/skipflag_manager.cpp: diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 4fe4a163..1e503497 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -39848,7 +39848,7 @@ sTBoxFlags__15TBoxFlagManager = .sbss:0x805753F4; // type:object size:0x4 sInstance__18EnemyDefeatManager = .sbss:0x805753F8; // type:object size:0x4 data:4byte lbl_805753FC = .sbss:0x805753FC; // type:object size:0x4 data:4byte lbl_80575400 = .sbss:0x80575400; // type:object size:0x4 data:4byte -sInstance__18DungeonflagManager = .sbss:0x80575404; // type:object size:0x4 data:4byte +lbl_80575404 = .sbss:0x80575404; // type:object size:0x4 data:4byte sInstance__15SkipflagManager = .sbss:0x80575408; // type:object size:0x4 data:4byte lbl_80575410 = .sbss:0x80575410; // type:object size:0x8 data:4byte lbl_80575418 = .sbss:0x80575418; // type:object size:0x8 diff --git a/configure.py b/configure.py index 0b18234e..103ebb33 100644 --- a/configure.py +++ b/configure.py @@ -274,7 +274,7 @@ config.libs = [ Object(Matching, "toBeSorted/sceneflag_manager.cpp"), Object(NonMatching, "toBeSorted/flag_space.cpp"), Object(NonMatching, "toBeSorted/misc_flag_managers.cpp"), - Object(NonMatching, "toBeSorted/dungeonflag_manager.cpp"), + Object(Matching, "toBeSorted/dungeonflag_manager.cpp"), Object(Matching, "toBeSorted/skipflag_manager.cpp"), Object(Matching, "c/c_list.cpp"), Object(Matching, "c/c_tree.cpp"), diff --git a/src/toBeSorted/dungeonflag_manager.cpp b/src/toBeSorted/dungeonflag_manager.cpp index cf4410f5..7c4d083a 100644 --- a/src/toBeSorted/dungeonflag_manager.cpp +++ b/src/toBeSorted/dungeonflag_manager.cpp @@ -21,7 +21,7 @@ public: FlagSpace mFlagSpace; static u16 sDungeonFlags[8]; - static DungeonflagManager *sInstance; + // static DungeonflagManager *sInstance; void copyFromSave(s16 flag); void copyFromSave(u16 flagIndex); @@ -41,7 +41,8 @@ public: }; /** 80575404 */ -DungeonflagManager *DungeonflagManager::sInstance = nullptr; +// DungeonflagManager *DungeonflagManager::sInstance = nullptr; + /** 805a9c58 */ u16 DungeonflagManager::sDungeonFlags[8] = {}; From 85bcf13ade6429c13d50d29b1d3fd6c0aa77f87b Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 3 May 2024 09:58:42 +0200 Subject: [PATCH 11/25] Remove nonmatch comment --- src/toBeSorted/dungeonflag_manager.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/toBeSorted/dungeonflag_manager.cpp b/src/toBeSorted/dungeonflag_manager.cpp index 7c4d083a..fcdd80a5 100644 --- a/src/toBeSorted/dungeonflag_manager.cpp +++ b/src/toBeSorted/dungeonflag_manager.cpp @@ -7,12 +7,6 @@ // TODO move extern "C" UnkFlagDefinition lbl_80511AF0[]; -// TODO what's preventing this from actually matching -// is that we pretend this TU contains the instance, -// which breaks .sbss section alignment. -// It's much more likely that a separate TU contains -// all instance pointers - class DungeonflagManager { public: bool mShouldCommit; From cf42625664a8bed75f0ab65307a355ad07f37e32 Mon Sep 17 00:00:00 2001 From: robojumper Date: Thu, 2 May 2024 13:48:08 +0200 Subject: [PATCH 12/25] Match the single-counter TUs --- config/SOUE01/splits.txt | 43 ++++++++++ config/SOUE01/symbols.txt | 84 +++++++++---------- configure.py | 7 ++ include/toBeSorted/counters/counter.h | 43 ++++++++++ src/toBeSorted/counters/arrow_counter.cpp | 15 ++++ src/toBeSorted/counters/bomb_counter.cpp | 15 ++++ .../counters/extra_wallet_counter.cpp | 16 ++++ src/toBeSorted/counters/key_piece_counter.cpp | 15 ++++ src/toBeSorted/counters/rupee_counter.cpp | 52 ++++++++++++ .../counters/slingshot_seed_counter.cpp | 15 ++++ src/toBeSorted/counters/tear_counter.cpp | 15 ++++ 11 files changed, 278 insertions(+), 42 deletions(-) create mode 100644 include/toBeSorted/counters/counter.h create mode 100644 src/toBeSorted/counters/arrow_counter.cpp create mode 100644 src/toBeSorted/counters/bomb_counter.cpp create mode 100644 src/toBeSorted/counters/extra_wallet_counter.cpp create mode 100644 src/toBeSorted/counters/key_piece_counter.cpp create mode 100644 src/toBeSorted/counters/rupee_counter.cpp create mode 100644 src/toBeSorted/counters/slingshot_seed_counter.cpp create mode 100644 src/toBeSorted/counters/tear_counter.cpp diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index f84fec00..ebd3baeb 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -127,6 +127,49 @@ toBeSorted/skipflag_manager.cpp: .sbss start:0x80575408 end:0x8057540C .bss start:0x805A9C68 end:0x805A9C88 +toBeSorted/counters/rupee_counter.cpp: + .text start:0x8016DE10 end:0x8016DF98 + .ctors start:0x804DB7BC end:0x804DB7C0 + .rodata start:0x804E91B0 end:0x804E91D0 + .data start:0x80527FF0 end:0x80528010 + .sbss start:0x80575610 end:0x80575618 + +toBeSorted/counters/arrow_counter.cpp: + .text start:0x8016DFA0 end:0x8016E018 + .ctors start:0x804DB7C0 end:0x804DB7C4 + .data start:0x80528010 end:0x80528030 + .sbss start:0x80575618 end:0x80575620 + +toBeSorted/counters/bomb_counter.cpp: + .text start:0x8016E020 end:0x8016E098 + .ctors start:0x804DB7C4 end:0x804DB7C8 + .data start:0x80528030 end:0x80528050 + .sbss start:0x80575620 end:0x80575628 + +toBeSorted/counters/tear_counter.cpp: + .text start:0x8016E0A0 end:0x8016E118 + .ctors start:0x804DB7C8 end:0x804DB7CC + .data start:0x80528050 end:0x80528070 + .sbss start:0x80575628 end:0x80575630 + +toBeSorted/counters/slingshot_seed_counter.cpp: + .text start:0x8016E120 end:0x8016E198 + .ctors start:0x804DB7CC end:0x804DB7D0 + .data start:0x80528070 end:0x80528090 + .sbss start:0x80575630 end:0x80575638 + +toBeSorted/counters/key_piece_counter.cpp: + .text start:0x8016E1A0 end:0x8016E218 + .ctors start:0x804DB7D0 end:0x804DB7D4 + .data start:0x80528090 end:0x805280B0 + .sbss start:0x80575638 end:0x80575640 + +toBeSorted/counters/extra_wallet_counter.cpp: + .text start:0x8016E220 end:0x8016E298 + .ctors start:0x804DB7D4 end:0x804DB7D8 + .data start:0x805280B0 end:0x805280D0 + .sbss start:0x80575640 end:0x80575648 + c/c_list.cpp: .text start:0x802E08C0 end:0x802E0A10 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 195dcdc3..73de0c19 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -9354,10 +9354,10 @@ fn_8016CB40 = .text:0x8016CB40; // type:function size:0x1C fn_8016CB60 = .text:0x8016CB60; // type:function size:0x78 fn_8016CBE0 = .text:0x8016CBE0; // type:function size:0x3C fn_8016CC20 = .text:0x8016CC20; // type:function size:0x14 -fn_8016CC40 = .text:0x8016CC40; // type:function size:0xF0 -fn_8016CD30 = .text:0x8016CD30; // type:function size:0x20 -fn_8016CD50 = .text:0x8016CD50; // type:function size:0x20 -fn_8016CD70 = .text:0x8016CD70; // type:function size:0x24 +checkedAdd__7CounterFi = .text:0x8016CC40; // type:function size:0xF0 +getCommittedValue__7CounterFv = .text:0x8016CD30; // type:function size:0x20 +getUncommittedValue__7CounterFv = .text:0x8016CD50; // type:function size:0x20 +setValue__7CounterFUs = .text:0x8016CD70; // type:function size:0x24 fn_8016CDA0 = .text:0x8016CDA0; // type:function size:0x64 fn_8016CE10 = .text:0x8016CE10; // type:function size:0x10 fn_8016CE20 = .text:0x8016CE20; // type:function size:0x14 @@ -9432,36 +9432,36 @@ fn_8016D990 = .text:0x8016D990; // type:function size:0x8 fn_8016D9A0 = .text:0x8016D9A0; // type:function size:0x8 fn_8016D9B0 = .text:0x8016D9B0; // type:function size:0x8 fn_8016D9C0 = .text:0x8016D9C0; // type:function size:0x448 -fn_8016DE10 = .text:0x8016DE10; // type:function size:0xAC -fn_8016DEC0 = .text:0x8016DEC0; // type:function size:0x2C -fn_8016DEF0 = .text:0x8016DEF0; // type:function size:0x40 -fn_8016DF30 = .text:0x8016DF30; // type:function size:0x18 -fn_8016DF50 = .text:0x8016DF50; // type:function size:0x38 -fn_8016DF90 = .text:0x8016DF90; // type:function size:0x8 -fn_8016DFA0 = .text:0x8016DFA0; // type:function size:0x40 -fn_8016DFE0 = .text:0x8016DFE0; // type:function size:0x18 -fn_8016E000 = .text:0x8016E000; // type:function size:0x8 -fn_8016E010 = .text:0x8016E010; // type:function size:0x8 -fn_8016E020 = .text:0x8016E020; // type:function size:0x40 -fn_8016E060 = .text:0x8016E060; // type:function size:0x18 -fn_8016E080 = .text:0x8016E080; // type:function size:0x8 -fn_8016E090 = .text:0x8016E090; // type:function size:0x8 -fn_8016E0A0 = .text:0x8016E0A0; // type:function size:0x40 -fn_8016E0E0 = .text:0x8016E0E0; // type:function size:0x18 -fn_8016E100 = .text:0x8016E100; // type:function size:0x8 -fn_8016E110 = .text:0x8016E110; // type:function size:0x8 -fn_8016E120 = .text:0x8016E120; // type:function size:0x40 -fn_8016E160 = .text:0x8016E160; // type:function size:0x18 -fn_8016E180 = .text:0x8016E180; // type:function size:0x8 -fn_8016E190 = .text:0x8016E190; // type:function size:0x8 -fn_8016E1A0 = .text:0x8016E1A0; // type:function size:0x40 -fn_8016E1E0 = .text:0x8016E1E0; // type:function size:0x18 -fn_8016E200 = .text:0x8016E200; // type:function size:0x8 -fn_8016E210 = .text:0x8016E210; // type:function size:0x8 -fn_8016E220 = .text:0x8016E220; // type:function size:0x40 -fn_8016E260 = .text:0x8016E260; // type:function size:0x18 -fn_8016E280 = .text:0x8016E280; // type:function size:0x8 -fn_8016E290 = .text:0x8016E290; // type:function size:0x8 +getBaseCapacity__Fv = .text:0x8016DE10; // type:function size:0xAC +getExtraWalletCapacity__Fv = .text:0x8016DEC0; // type:function size:0x2C +__dt__12RupeeCounterFv = .text:0x8016DEF0; // type:function size:0x40 +__ct__12RupeeCounterFv = .text:0x8016DF30; // type:function size:0x18 +getMax__12RupeeCounterFv = .text:0x8016DF50; // type:function size:0x38 +__sinit_\rupee_counter_cpp = .text:0x8016DF90; // type:function size:0x8 scope:local +__dt__12ArrowCounterFv = .text:0x8016DFA0; // type:function size:0x40 +__ct__12ArrowCounterFv = .text:0x8016DFE0; // type:function size:0x18 +getMax__12ArrowCounterFv = .text:0x8016E000; // type:function size:0x8 +__sinit_\arrow_counter_cpp = .text:0x8016E010; // type:function size:0x8 scope:local +__dt__11BombCounterFv = .text:0x8016E020; // type:function size:0x40 +__ct__11BombCounterFv = .text:0x8016E060; // type:function size:0x18 +getMax__11BombCounterFv = .text:0x8016E080; // type:function size:0x8 +__sinit_\bomb_counter_cpp = .text:0x8016E090; // type:function size:0x8 scope:local +__dt__11TearCounterFv = .text:0x8016E0A0; // type:function size:0x40 +__ct__11TearCounterFv = .text:0x8016E0E0; // type:function size:0x18 +getMax__11TearCounterFv = .text:0x8016E100; // type:function size:0x8 +__sinit_\tear_counter_cpp = .text:0x8016E110; // type:function size:0x8 scope:local +__dt__20SlingshotSeedCounterFv = .text:0x8016E120; // type:function size:0x40 +__ct__20SlingshotSeedCounterFv = .text:0x8016E160; // type:function size:0x18 +getMax__20SlingshotSeedCounterFv = .text:0x8016E180; // type:function size:0x8 +__sinit_\slingshot_seed_counter_cpp = .text:0x8016E190; // type:function size:0x8 scope:local +__dt__15KeyPieceCounterFv = .text:0x8016E1A0; // type:function size:0x40 +__ct__15KeyPieceCounterFv = .text:0x8016E1E0; // type:function size:0x18 +getMax__15KeyPieceCounterFv = .text:0x8016E200; // type:function size:0x8 +__sinit_\key_piece_counter_cpp = .text:0x8016E210; // type:function size:0x8 scope:local +__dt__18ExtraWalletCounterFv = .text:0x8016E220; // type:function size:0x40 +__ct__18ExtraWalletCounterFv = .text:0x8016E260; // type:function size:0x18 +getMax__18ExtraWalletCounterFv = .text:0x8016E280; // type:function size:0x8 +__sinit_\extra_wallet_counter_cpp = .text:0x8016E290; // type:function size:0x8 scope:local fn_8016E2A0 = .text:0x8016E2A0; // type:function size:0x6C fn_8016E310 = .text:0x8016E310; // type:function size:0x194 fn_8016E4B0 = .text:0x8016E4B0; // type:function size:0x1C @@ -28352,7 +28352,7 @@ lbl_804E8D18 = .rodata:0x804E8D18; // type:object size:0x10 lbl_804E8D28 = .rodata:0x804E8D28; // type:object size:0x48 data:4byte lbl_804E8D70 = .rodata:0x804E8D70; // type:object size:0x40 data:4byte lbl_804E8DB0 = .rodata:0x804E8DB0; // type:object size:0x400 -lbl_804E91B0 = .rodata:0x804E91B0; // type:object size:0x20 data:4byte +wallet_definitions = .rodata:0x804E91B0; // type:object size:0x20 scope:local data:4byte lbl_804E91D0 = .rodata:0x804E91D0; // type:object size:0xA8 lbl_804E9278 = .rodata:0x804E9278; // type:object size:0xA0 lbl_804E9318 = .rodata:0x804E9318; // type:object size:0xA8 @@ -33327,13 +33327,13 @@ lbl_80527F70 = .data:0x80527F70; // type:object size:0x20 lbl_80527F90 = .data:0x80527F90; // type:object size:0x20 lbl_80527FB0 = .data:0x80527FB0; // type:object size:0x20 lbl_80527FD0 = .data:0x80527FD0; // type:object size:0x20 -lbl_80527FF0 = .data:0x80527FF0; // type:object size:0x20 -lbl_80528010 = .data:0x80528010; // type:object size:0x20 -lbl_80528030 = .data:0x80528030; // type:object size:0x20 -lbl_80528050 = .data:0x80528050; // type:object size:0x20 -lbl_80528070 = .data:0x80528070; // type:object size:0x20 -lbl_80528090 = .data:0x80528090; // type:object size:0x20 -lbl_805280B0 = .data:0x805280B0; // type:object size:0x20 +__vt__12RupeeCounter = .data:0x80527FF0; // type:object size:0x20 +__vt__12ArrowCounter = .data:0x80528010; // type:object size:0x20 +__vt__11BombCounter = .data:0x80528030; // type:object size:0x20 +__vt__11TearCounter = .data:0x80528050; // type:object size:0x20 +__vt__20SlingshotSeedCounter = .data:0x80528070; // type:object size:0x20 +__vt__15KeyPieceCounter = .data:0x80528090; // type:object size:0x20 +__vt__18ExtraWalletCounter = .data:0x805280B0; // type:object size:0x20 lbl_805280D0 = .data:0x805280D0; // type:object size:0xC lbl_805280DC = .data:0x805280DC; // type:object size:0xC lbl_805280E8 = .data:0x805280E8; // type:object size:0x10 diff --git a/configure.py b/configure.py index c3cea48b..67462de3 100644 --- a/configure.py +++ b/configure.py @@ -285,6 +285,13 @@ config.libs = [ Object(NonMatching, "d/a/d_a_base.cpp"), Object(NonMatching, "d/a/obj/d_a_obj_base.cpp"), Object(Matching, "toBeSorted/save_file.cpp"), + Object(Matching, "toBeSorted/counters/rupee_counter.cpp"), + Object(Matching, "toBeSorted/counters/arrow_counter.cpp"), + Object(Matching, "toBeSorted/counters/bomb_counter.cpp"), + Object(Matching, "toBeSorted/counters/tear_counter.cpp"), + Object(Matching, "toBeSorted/counters/slingshot_seed_counter.cpp"), + Object(Matching, "toBeSorted/counters/key_piece_counter.cpp"), + Object(Matching, "toBeSorted/counters/extra_wallet_counter.cpp"), Object(NonMatching, "toBeSorted/file_manager.cpp"), Object(NonMatching, "toBeSorted/save_manager.cpp"), Object(NonMatching, "f/f_base.cpp"), diff --git a/include/toBeSorted/counters/counter.h b/include/toBeSorted/counters/counter.h new file mode 100644 index 00000000..9747dd49 --- /dev/null +++ b/include/toBeSorted/counters/counter.h @@ -0,0 +1,43 @@ +#ifndef COUNTER_H +#define COUNTER_H + +#include + +class Counter { +public: + Counter(u16 id): counterId(id) {} + // No vtable, this class appears to be header-only + virtual ~Counter() {}; + /* 8016cc40 */ virtual s32 checkedAdd(s32 num) { + s32 uncommitted = getUncommittedValue(); + s32 max = getMax(); + s32 result = uncommitted + num; + if (result < 0) { + setValue(0); + } else if (result < max) { + setValue(result); + } else { + setValue(max); + } + + if (result < 0) { + return result; + } + + return result <= max ? 0 : (result - max); + } + virtual u16 getCommittedValue() { + return 0; + } + virtual u16 getMax() = 0; + virtual u16 getUncommittedValue() { + return 0; + } + virtual void setValue(u16 num) { + return; + } + + u16 counterId; +}; + +#endif COUNTER_H diff --git a/src/toBeSorted/counters/arrow_counter.cpp b/src/toBeSorted/counters/arrow_counter.cpp new file mode 100644 index 00000000..a7837350 --- /dev/null +++ b/src/toBeSorted/counters/arrow_counter.cpp @@ -0,0 +1,15 @@ +#include + +class ArrowCounter : public Counter { +public: + ArrowCounter(); + /* 8016DFA0 */ ~ArrowCounter() {} + virtual u16 getMax() override; +}; + +/* 80575618 */ ArrowCounter lbl_80575618; + +/* 8016DFE0 */ ArrowCounter::ArrowCounter() : Counter(0x1f2) {} +/* 8016E000 */ u16 ArrowCounter::getMax() { + return 20; +} diff --git a/src/toBeSorted/counters/bomb_counter.cpp b/src/toBeSorted/counters/bomb_counter.cpp new file mode 100644 index 00000000..4511ea56 --- /dev/null +++ b/src/toBeSorted/counters/bomb_counter.cpp @@ -0,0 +1,15 @@ +#include + +class BombCounter : public Counter { +public: + BombCounter(); + /* 8016E020 */ ~BombCounter() {} + virtual u16 getMax() override; +}; + +/* 80575620 */ BombCounter lbl_80575620; + +/* 8016E060 */ BombCounter::BombCounter(): Counter(0x1f3) { } +/* 8016E080 */ u16 BombCounter::getMax() { + return 10; +} diff --git a/src/toBeSorted/counters/extra_wallet_counter.cpp b/src/toBeSorted/counters/extra_wallet_counter.cpp new file mode 100644 index 00000000..0d8a2f52 --- /dev/null +++ b/src/toBeSorted/counters/extra_wallet_counter.cpp @@ -0,0 +1,16 @@ +#include + +class ExtraWalletCounter : public Counter { +public: + ExtraWalletCounter(); + /* 8016E220 */ ~ExtraWalletCounter() {} + virtual u16 getMax() override; +}; + + +/* 80575640 */ ExtraWalletCounter lbl_80575640; + +/* 8016E260 */ ExtraWalletCounter::ExtraWalletCounter(): Counter(0x1fc) { } +/* 8016E280 */ u16 ExtraWalletCounter::getMax() { + return 3; +} diff --git a/src/toBeSorted/counters/key_piece_counter.cpp b/src/toBeSorted/counters/key_piece_counter.cpp new file mode 100644 index 00000000..8a3b6914 --- /dev/null +++ b/src/toBeSorted/counters/key_piece_counter.cpp @@ -0,0 +1,15 @@ +#include + +class KeyPieceCounter : public Counter { +public: + KeyPieceCounter(); + /* 8016E1A0 */ ~KeyPieceCounter() {} + virtual u16 getMax() override; +}; + +/* 80575638 */ KeyPieceCounter lbl_80575638; + +/* 8016E1E0 */ KeyPieceCounter::KeyPieceCounter() : Counter(0x1f9) {} +/* 8016E200 */ u16 KeyPieceCounter::getMax() { + return 5; +} diff --git a/src/toBeSorted/counters/rupee_counter.cpp b/src/toBeSorted/counters/rupee_counter.cpp new file mode 100644 index 00000000..d8b4920c --- /dev/null +++ b/src/toBeSorted/counters/rupee_counter.cpp @@ -0,0 +1,52 @@ +#include + +class RupeeCounter : public Counter { +public: + RupeeCounter(); + /* 8016DEF0 */ ~RupeeCounter() {} + virtual u16 getMax() override; +}; + +struct WalletStruct { + u32 flag; + u16 capacity; +}; + +/* 804E91B0 */ +const struct WalletStruct wallet_definitions[4] = { + {0x6c, 500}, + {0x6d, 1000}, + {0x6e, 5000}, + {0x6f, 9000}, +}; + +// TODO set up item flag manager +extern "C" void *lbl_80575400; +extern "C" u16 fn_800BF5E0(void *data, u16 flag); + +/* 8016DE10 */ u16 getBaseCapacity() { + int i = 0; + WalletStruct tmp[4] = {wallet_definitions[0], wallet_definitions[1], wallet_definitions[2], wallet_definitions[3]}; + const WalletStruct *wallet = &tmp[3]; + for (; i < 4; i++, wallet--) { + if (fn_800BF5E0(lbl_80575400, wallet->flag)) { + return wallet->capacity; + } + } + return 300; +} + +// TODO main counters class +extern "C" u16 fn_8016D730(u16); + +/* 8016DEC0 */ u16 getExtraWalletCapacity() { + return 300 * fn_8016D730(0x27); +} + +/* 80575610 */ RupeeCounter lbl_80575610; + +/* 8016DF30 */ RupeeCounter::RupeeCounter() : Counter(0x1f5) {} + +/* 8016DF50 */ u16 RupeeCounter::getMax() { + return (getBaseCapacity() + getExtraWalletCapacity()); +} diff --git a/src/toBeSorted/counters/slingshot_seed_counter.cpp b/src/toBeSorted/counters/slingshot_seed_counter.cpp new file mode 100644 index 00000000..1af7fb6c --- /dev/null +++ b/src/toBeSorted/counters/slingshot_seed_counter.cpp @@ -0,0 +1,15 @@ +#include + +class SlingshotSeedCounter : public Counter { +public: + SlingshotSeedCounter(); + /* 8016E120 */ ~SlingshotSeedCounter() {} + virtual u16 getMax() override; +}; + +/* 80575630 */ SlingshotSeedCounter lbl_80575630; + +/* 8016E160 */ SlingshotSeedCounter::SlingshotSeedCounter() : Counter(0x1ed) {} +/* 8016E180 */ u16 SlingshotSeedCounter::getMax() { + return 20; +} diff --git a/src/toBeSorted/counters/tear_counter.cpp b/src/toBeSorted/counters/tear_counter.cpp new file mode 100644 index 00000000..edb48276 --- /dev/null +++ b/src/toBeSorted/counters/tear_counter.cpp @@ -0,0 +1,15 @@ +#include + +class TearCounter : public Counter { +public: + TearCounter(); + /* 8016E0A0 */ ~TearCounter() {} + virtual u16 getMax() override; +}; + +/* 80575628 */ TearCounter lbl_80575628; + +/* 8016E0E0 */ TearCounter::TearCounter(): Counter(0x1f4) { } +/* 8016E100 */ u16 TearCounter::getMax() { + return 15; +} From 5f621162a254bd495e5d697451dc43f5c520d272 Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 3 May 2024 09:50:23 +0200 Subject: [PATCH 13/25] Main counters file --- config/SOUE01/splits.txt | 3 ++ configure.py | 1 + include/toBeSorted/counters/counter.h | 32 ++-------------- src/toBeSorted/counters/counter.cpp | 55 +++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 src/toBeSorted/counters/counter.cpp diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index ebd3baeb..523e8e25 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -127,6 +127,9 @@ toBeSorted/skipflag_manager.cpp: .sbss start:0x80575408 end:0x8057540C .bss start:0x805A9C68 end:0x805A9C88 +toBeSorted/counters/counter.cpp: + .text start:0x8016CC40 end:0x8016CD94 + toBeSorted/counters/rupee_counter.cpp: .text start:0x8016DE10 end:0x8016DF98 .ctors start:0x804DB7BC end:0x804DB7C0 diff --git a/configure.py b/configure.py index 67462de3..ae51b22b 100644 --- a/configure.py +++ b/configure.py @@ -285,6 +285,7 @@ config.libs = [ Object(NonMatching, "d/a/d_a_base.cpp"), Object(NonMatching, "d/a/obj/d_a_obj_base.cpp"), Object(Matching, "toBeSorted/save_file.cpp"), + Object(Matching, "toBeSorted/counters/counter.cpp"), Object(Matching, "toBeSorted/counters/rupee_counter.cpp"), Object(Matching, "toBeSorted/counters/arrow_counter.cpp"), Object(Matching, "toBeSorted/counters/bomb_counter.cpp"), diff --git a/include/toBeSorted/counters/counter.h b/include/toBeSorted/counters/counter.h index 9747dd49..0741b0d3 100644 --- a/include/toBeSorted/counters/counter.h +++ b/include/toBeSorted/counters/counter.h @@ -6,36 +6,12 @@ class Counter { public: Counter(u16 id): counterId(id) {} - // No vtable, this class appears to be header-only virtual ~Counter() {}; - /* 8016cc40 */ virtual s32 checkedAdd(s32 num) { - s32 uncommitted = getUncommittedValue(); - s32 max = getMax(); - s32 result = uncommitted + num; - if (result < 0) { - setValue(0); - } else if (result < max) { - setValue(result); - } else { - setValue(max); - } - - if (result < 0) { - return result; - } - - return result <= max ? 0 : (result - max); - } - virtual u16 getCommittedValue() { - return 0; - } + virtual s32 checkedAdd(s32 num); + virtual u16 getCommittedValue(); virtual u16 getMax() = 0; - virtual u16 getUncommittedValue() { - return 0; - } - virtual void setValue(u16 num) { - return; - } + virtual u16 getUncommittedValue(); + virtual void setValue(u16 num); u16 counterId; }; diff --git a/src/toBeSorted/counters/counter.cpp b/src/toBeSorted/counters/counter.cpp new file mode 100644 index 00000000..2c388e44 --- /dev/null +++ b/src/toBeSorted/counters/counter.cpp @@ -0,0 +1,55 @@ +#include + +// TODO use the item flag manager once it exists +class ItemFlagManager { +public: + ItemFlagManager() {} + /** 0x08 */ virtual ~ItemFlagManager(); + /** 0x0C */ virtual void setFlagszptr(); + /** 0x10 */ virtual void onDirty(); + /** 0x14 */ virtual void copyFlagsFromSave() = 0; + /** 0x18 */ virtual void setupUnkFlagsStuff() = 0; + /** 0x1C */ virtual bool doCommit() = 0; + /** 0x20 */ virtual void setFlag(u16 flag); + /** 0x24 */ virtual void unsetFlag(u16 flag); + /** 0x28 */ virtual void setFlagOrCounterToValue(u16 flag, u16 value); + /** 0x2C */ virtual u16 getCounterOrFlag(u16 flag); + /** 0x30 */ virtual u16 getUncommittedValue(u16 flag); + /** 0x34 */ virtual void unk3(); + /** 0x38 */ virtual u16 *getSaveFlagSpace() = 0; +}; + +// TODO set up item flag manager +extern "C" ItemFlagManager *lbl_80575400; + + +/* 8016cc40 */ s32 Counter::checkedAdd(s32 num) { + s32 uncommitted = getUncommittedValue(); + s32 max = getMax(); + s32 result = uncommitted + num; + if (result < 0) { + setValue(0); + } else if (result < max) { + setValue(result); + } else { + setValue(max); + } + + if (result < 0) { + return result; + } + + return result <= max ? 0 : (result - max); +} + +/* 8016cd30 */ u16 Counter::getCommittedValue() { + return lbl_80575400->getCounterOrFlag(counterId | 0x4000); +} + +/* 8016cd50 */ u16 Counter::getUncommittedValue() { + return lbl_80575400->getUncommittedValue(counterId | 0x4000); +} + +/* 8016cd70 */ void Counter::setValue(u16 num) { + lbl_80575400->setFlagOrCounterToValue(counterId | 0x4000, num); +} From d3e39ebc28e85751eaf03c2eca887194dabe6460 Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 3 May 2024 10:01:24 +0200 Subject: [PATCH 14/25] Cleanup --- src/toBeSorted/counters/rupee_counter.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/toBeSorted/counters/rupee_counter.cpp b/src/toBeSorted/counters/rupee_counter.cpp index d8b4920c..cd754fc6 100644 --- a/src/toBeSorted/counters/rupee_counter.cpp +++ b/src/toBeSorted/counters/rupee_counter.cpp @@ -12,22 +12,19 @@ struct WalletStruct { u16 capacity; }; -/* 804E91B0 */ -const struct WalletStruct wallet_definitions[4] = { - {0x6c, 500}, - {0x6d, 1000}, - {0x6e, 5000}, - {0x6f, 9000}, -}; - // TODO set up item flag manager extern "C" void *lbl_80575400; extern "C" u16 fn_800BF5E0(void *data, u16 flag); /* 8016DE10 */ u16 getBaseCapacity() { int i = 0; - WalletStruct tmp[4] = {wallet_definitions[0], wallet_definitions[1], wallet_definitions[2], wallet_definitions[3]}; - const WalletStruct *wallet = &tmp[3]; + /* 804E91B0 */ WalletStruct wallet_definitions[4] = { + {0x6c, 500}, + {0x6d, 1000}, + {0x6e, 5000}, + {0x6f, 9000}, + }; + const WalletStruct *wallet = &wallet_definitions[3]; for (; i < 4; i++, wallet--) { if (fn_800BF5E0(lbl_80575400, wallet->flag)) { return wallet->capacity; From dcb2c48b588405ab01807516bb2ee920f734a1f2 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 4 May 2024 19:57:10 +0200 Subject: [PATCH 15/25] Update counters for ipa file --- src/toBeSorted/counters/arrow_counter.cpp | 7 +++---- src/toBeSorted/counters/bomb_counter.cpp | 7 +++---- src/toBeSorted/counters/extra_wallet_counter.cpp | 7 +++---- src/toBeSorted/counters/key_piece_counter.cpp | 7 +++---- src/toBeSorted/counters/rupee_counter.cpp | 15 ++++++++------- .../counters/slingshot_seed_counter.cpp | 7 +++---- src/toBeSorted/counters/tear_counter.cpp | 7 +++---- 7 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/toBeSorted/counters/arrow_counter.cpp b/src/toBeSorted/counters/arrow_counter.cpp index a7837350..a770d160 100644 --- a/src/toBeSorted/counters/arrow_counter.cpp +++ b/src/toBeSorted/counters/arrow_counter.cpp @@ -4,12 +4,11 @@ class ArrowCounter : public Counter { public: ArrowCounter(); /* 8016DFA0 */ ~ArrowCounter() {} - virtual u16 getMax() override; + /* 8016E000 */ virtual u16 getMax() override { + return 20; + }; }; /* 80575618 */ ArrowCounter lbl_80575618; /* 8016DFE0 */ ArrowCounter::ArrowCounter() : Counter(0x1f2) {} -/* 8016E000 */ u16 ArrowCounter::getMax() { - return 20; -} diff --git a/src/toBeSorted/counters/bomb_counter.cpp b/src/toBeSorted/counters/bomb_counter.cpp index 4511ea56..02d11af0 100644 --- a/src/toBeSorted/counters/bomb_counter.cpp +++ b/src/toBeSorted/counters/bomb_counter.cpp @@ -4,12 +4,11 @@ class BombCounter : public Counter { public: BombCounter(); /* 8016E020 */ ~BombCounter() {} - virtual u16 getMax() override; + /* 8016E080 */ virtual u16 getMax() override { + return 10; + } }; /* 80575620 */ BombCounter lbl_80575620; /* 8016E060 */ BombCounter::BombCounter(): Counter(0x1f3) { } -/* 8016E080 */ u16 BombCounter::getMax() { - return 10; -} diff --git a/src/toBeSorted/counters/extra_wallet_counter.cpp b/src/toBeSorted/counters/extra_wallet_counter.cpp index 0d8a2f52..342f2e81 100644 --- a/src/toBeSorted/counters/extra_wallet_counter.cpp +++ b/src/toBeSorted/counters/extra_wallet_counter.cpp @@ -4,13 +4,12 @@ class ExtraWalletCounter : public Counter { public: ExtraWalletCounter(); /* 8016E220 */ ~ExtraWalletCounter() {} - virtual u16 getMax() override; + /* 8016E280 */ virtual u16 getMax() override { + return 3; + } }; /* 80575640 */ ExtraWalletCounter lbl_80575640; /* 8016E260 */ ExtraWalletCounter::ExtraWalletCounter(): Counter(0x1fc) { } -/* 8016E280 */ u16 ExtraWalletCounter::getMax() { - return 3; -} diff --git a/src/toBeSorted/counters/key_piece_counter.cpp b/src/toBeSorted/counters/key_piece_counter.cpp index 8a3b6914..55ddded7 100644 --- a/src/toBeSorted/counters/key_piece_counter.cpp +++ b/src/toBeSorted/counters/key_piece_counter.cpp @@ -4,12 +4,11 @@ class KeyPieceCounter : public Counter { public: KeyPieceCounter(); /* 8016E1A0 */ ~KeyPieceCounter() {} - virtual u16 getMax() override; + /* 8016E200 */ virtual u16 getMax() override { + return 5; + } }; /* 80575638 */ KeyPieceCounter lbl_80575638; /* 8016E1E0 */ KeyPieceCounter::KeyPieceCounter() : Counter(0x1f9) {} -/* 8016E200 */ u16 KeyPieceCounter::getMax() { - return 5; -} diff --git a/src/toBeSorted/counters/rupee_counter.cpp b/src/toBeSorted/counters/rupee_counter.cpp index cd754fc6..d1264a74 100644 --- a/src/toBeSorted/counters/rupee_counter.cpp +++ b/src/toBeSorted/counters/rupee_counter.cpp @@ -1,10 +1,15 @@ #include +static u16 getBaseCapacity(); +static u16 getExtraWalletCapacity(); + class RupeeCounter : public Counter { public: RupeeCounter(); /* 8016DEF0 */ ~RupeeCounter() {} - virtual u16 getMax() override; + /* 8016DF50 */ virtual u16 getMax() override { + return (getBaseCapacity() + getExtraWalletCapacity()); + } }; struct WalletStruct { @@ -16,7 +21,7 @@ struct WalletStruct { extern "C" void *lbl_80575400; extern "C" u16 fn_800BF5E0(void *data, u16 flag); -/* 8016DE10 */ u16 getBaseCapacity() { +/* 8016DE10 */ static u16 getBaseCapacity() { int i = 0; /* 804E91B0 */ WalletStruct wallet_definitions[4] = { {0x6c, 500}, @@ -36,14 +41,10 @@ extern "C" u16 fn_800BF5E0(void *data, u16 flag); // TODO main counters class extern "C" u16 fn_8016D730(u16); -/* 8016DEC0 */ u16 getExtraWalletCapacity() { +/* 8016DEC0 */ static u16 getExtraWalletCapacity() { return 300 * fn_8016D730(0x27); } /* 80575610 */ RupeeCounter lbl_80575610; /* 8016DF30 */ RupeeCounter::RupeeCounter() : Counter(0x1f5) {} - -/* 8016DF50 */ u16 RupeeCounter::getMax() { - return (getBaseCapacity() + getExtraWalletCapacity()); -} diff --git a/src/toBeSorted/counters/slingshot_seed_counter.cpp b/src/toBeSorted/counters/slingshot_seed_counter.cpp index 1af7fb6c..797018d6 100644 --- a/src/toBeSorted/counters/slingshot_seed_counter.cpp +++ b/src/toBeSorted/counters/slingshot_seed_counter.cpp @@ -4,12 +4,11 @@ class SlingshotSeedCounter : public Counter { public: SlingshotSeedCounter(); /* 8016E120 */ ~SlingshotSeedCounter() {} - virtual u16 getMax() override; + /* 8016E180 */ virtual u16 getMax() override { + return 20; + }; }; /* 80575630 */ SlingshotSeedCounter lbl_80575630; /* 8016E160 */ SlingshotSeedCounter::SlingshotSeedCounter() : Counter(0x1ed) {} -/* 8016E180 */ u16 SlingshotSeedCounter::getMax() { - return 20; -} diff --git a/src/toBeSorted/counters/tear_counter.cpp b/src/toBeSorted/counters/tear_counter.cpp index edb48276..2a8503cd 100644 --- a/src/toBeSorted/counters/tear_counter.cpp +++ b/src/toBeSorted/counters/tear_counter.cpp @@ -4,12 +4,11 @@ class TearCounter : public Counter { public: TearCounter(); /* 8016E0A0 */ ~TearCounter() {} - virtual u16 getMax() override; + /* 8016E100 */ virtual u16 getMax() override { + return 15; + }; }; /* 80575628 */ TearCounter lbl_80575628; /* 8016E0E0 */ TearCounter::TearCounter(): Counter(0x1f4) { } -/* 8016E100 */ u16 TearCounter::getMax() { - return 15; -} From fa4b2862fd54925affe5ce9fa64dc6c37a71fb28 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 4 May 2024 00:39:30 +0200 Subject: [PATCH 16/25] dHeap(Allocator) work --- config/SOUE01/splits.txt | 4 +- config/SOUE01/symbols.txt | 44 ++++++++++---------- include/d/d_heap_alloc.h | 82 ++++++++++++++++++++++++++++++++++++++ include/egg/core/eggHeap.h | 26 ++++++------ src/d/d_heap.cpp | 66 +++++++++++++++++++++++++----- 5 files changed, 178 insertions(+), 44 deletions(-) create mode 100644 include/d/d_heap_alloc.h diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index f84fec00..5e1ad335 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -72,7 +72,9 @@ d/d_heap.cpp: .text start:0x80054B00 end:0x80054F30 .ctors start:0x804DB680 end:0x804DB684 .rodata start:0x804DE008 end:0x804DE188 - .sbss start:0x805751A8 end:0x805751D0 + .data start:0x8050D440 end:0x8050D458 + .sbss start:0x805751A8 end:0x805751CC + .bss start:0x80597740 end:0x80597758 d/d_main.cpp: .text start:0x80054F30 end:0x80055170 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 195dcdc3..b345728e 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -2212,8 +2212,8 @@ fn_80054550 = .text:0x80054550; // type:function size:0x31C fn_80054870 = .text:0x80054870; // type:function size:0x25C fn_80054AD0 = .text:0x80054AD0; // type:function size:0x10 fn_80054AE0 = .text:0x80054AE0; // type:function size:0x14 -fn_80054B00 = .text:0x80054B00; // type:function size:0x40 -fn_80054B40 = .text:0x80054B40; // type:function size:0x20 +__dt__14dHeapAllocatorFv = .text:0x80054B00; // type:function size:0x40 +onAlloc__14dHeapAllocatorFPQ23EGG12HeapAllocArg = .text:0x80054B40; // type:function size:0x20 init__5dHeapFPCcUlPQ23EGG4Heap = .text:0x80054B60; // type:function size:0x64 createWork1Heap__5dHeapFUlPQ23EGG4Heap = .text:0x80054BD0; // type:function size:0x18 createWork2Heap__5dHeapFUlPQ23EGG4Heap = .text:0x80054BF0; // type:function size:0x18 @@ -2224,15 +2224,15 @@ createLayoutEx2Heap__5dHeapFUlPQ23EGG4Heap = .text:0x80054C70; // type:function createLayoutResHeap__5dHeapFUlPQ23EGG4Heap = .text:0x80054C90; // type:function size:0x18 createFontHeap__5dHeapFUlPQ23EGG4Heap = .text:0x80054CB0; // type:function size:0x18 createHBMHeap__5dHeapFUlPQ23EGG4Heap = .text:0x80054CD0; // type:function size:0x18 -fn_80054CF0 = .text:0x80054CF0; // type:function size:0x88 -fn_80054D80 = .text:0x80054D80; // type:function size:0x98 -fn_80054E20 = .text:0x80054E20; // type:function size:0x88 -fn_80054EB0 = .text:0x80054EB0; // type:function size:0x4 -fn_80054EC0 = .text:0x80054EC0; // type:function size:0xC -fn_80054ED0 = .text:0x80054ED0; // type:function size:0xC +initCallbacks__14dHeapAllocatorFv = .text:0x80054CF0; // type:function size:0x88 +allocCallback__18dHeapAllocatorBaseFPQ23EGG12HeapAllocArg = .text:0x80054D80; // type:function size:0x98 +freeCallback__18dHeapAllocatorBaseFPQ23EGG11HeapFreeArg = .text:0x80054E20; // type:function size:0x88 +onFree__18dHeapAllocatorBaseFPQ23EGG11HeapFreeArg = .text:0x80054EB0; // type:function size:0x4 +__nw__FUl = .text:0x80054EC0; // type:function size:0xC +__nwa__FUl = .text:0x80054ED0; // type:function size:0xC __dl__FPv = .text:0x80054EE0; // type:function size:0x8 -fn_80054EF0 = .text:0x80054EF0; // type:function size:0x8 -fn_80054F00 = .text:0x80054F00; // type:function size:0x30 +__dla__FPv = .text:0x80054EF0; // type:function size:0x8 +__sinit_\d_heap_cpp = .text:0x80054F00; // type:function size:0x30 fn_80054F30 = .text:0x80054F30; // type:function size:0x4 fn_80054F40 = .text:0x80054F40; // type:function size:0x4 fn_80054F50 = .text:0x80054F50; // type:function size:0x38 @@ -26205,11 +26205,11 @@ dumpAll__Q23EGG4HeapFv = .text:0x804958B0; // type:function size:0xEC becomeCurrentHeap__Q23EGG4HeapFv = .text:0x804959A0; // type:function size:0x58 _becomeCurrentHeapWithoutLock__Q23EGG4HeapFv = .text:0x80495A00; // type:function size:0x3C initAllocator__Q23EGG4HeapFPQ23EGG9Allocatorl = .text:0x80495A40; // type:function size:0x14 -__nw__FUlPv = .text:0x80495A60; // type:function size:0x8 -__nw__FUlPQ23EGG4Heapi = .text:0x80495A70; // type:function size:0x10 -__nwa__FUl = .text:0x80495A80; // type:function size:0x10 -__nwa__FUli = .text:0x80495A90; // type:function size:0x8 -__nwa__FUlPQ23EGG4Heapi = .text:0x80495AA0; // type:function size:0x10 +0x80495A60 = .text:0x80495A60; // type:function size:0x8 +0x80495A70 = .text:0x80495A70; // type:function size:0x10 +0x80495A80 = .text:0x80495A80; // type:function size:0x10 +0x80495A90 = .text:0x80495A90; // type:function size:0x8 +0x80495AA0 = .text:0x80495AA0; // type:function size:0x10 __ct__Q23EGG7ExpHeapFP12MEMiHeapHead = .text:0x80495AB0; // type:function size:0x3C __dt__Q23EGG7ExpHeapFv = .text:0x80495AF0; // type:function size:0x74 create__Q23EGG7ExpHeapFPvUlUs = .text:0x80495B70; // type:function size:0xB8 @@ -30707,7 +30707,7 @@ lbl_8050D37C = .data:0x8050D37C; // type:object size:0x24 lbl_8050D3A0 = .data:0x8050D3A0; // type:object size:0x10 data:string lbl_8050D3B0 = .data:0x8050D3B0; // type:object size:0x14 lbl_8050D3C4 = .data:0x8050D3C4; // type:object size:0x7C -lbl_8050D440 = .data:0x8050D440; // type:object size:0x18 +__vt__14dHeapAllocator = .data:0x8050D440; // type:object size:0x18 lbl_8050D458 = .data:0x8050D458; // type:object size:0xC data:string lbl_8050D464 = .data:0x8050D464; // type:object size:0x10 lbl_8050D474 = .data:0x8050D474; // type:object size:0x10 @@ -39735,7 +39735,7 @@ layoutExHeap__5dHeap = .sbss:0x805751B8; // type:object size:0x4 data:4byte layoutEx2Heap__5dHeap = .sbss:0x805751BC; // type:object size:0x4 data:4byte layoutResHeap__5dHeap = .sbss:0x805751C0; // type:object size:0x4 data:4byte fontHeap__5dHeap = .sbss:0x805751C4; // type:object size:0x4 data:4byte -HBMHeap__5dHeap = .sbss:0x805751C8; // type:object size:0x8 data:4byte +HBMHeap__5dHeap = .sbss:0x805751C8; // type:object size:0x4 data:4byte lbl_805751D0 = .sbss:0x805751D0; // type:object size:0x8 data:4byte lbl_805751D8 = .sbss:0x805751D8; // type:object size:0x4 data:4byte lbl_805751DC = .sbss:0x805751DC; // type:object size:0x4 data:4byte @@ -40883,11 +40883,11 @@ sCurrentHeap__Q23EGG4Heap = .sbss:0x80576740; // type:object size:0x4 data:4byte lbl_80576744 = .sbss:0x80576744; // type:object size:0x4 data:4byte lbl_80576748 = .sbss:0x80576748; // type:object size:0x4 data:4byte lbl_8057674C = .sbss:0x8057674C; // type:object size:0x4 data:4byte -lbl_80576750 = .sbss:0x80576750; // type:object size:0x4 data:4byte -lbl_80576754 = .sbss:0x80576754; // type:object size:0x4 data:4byte +sAllocCallback__Q23EGG4Heap = .sbss:0x80576750; // type:object size:0x4 data:4byte +sFreeCallback__Q23EGG4Heap = .sbss:0x80576754; // type:object size:0x4 data:4byte lbl_80576758 = .sbss:0x80576758; // type:object size:0x4 data:4byte -lbl_8057675C = .sbss:0x8057675C; // type:object size:0x4 data:4byte -lbl_80576760 = .sbss:0x80576760; // type:object size:0x4 data:4byte +sAllocCallbackArg__Q23EGG4Heap = .sbss:0x8057675C; // type:object size:0x4 data:4byte +sFreeCallbackArg__Q23EGG4Heap = .sbss:0x80576760; // type:object size:0x4 data:4byte lbl_80576764 = .sbss:0x80576764; // type:object size:0x4 data:4byte lbl_80576768 = .sbss:0x80576768; // type:object size:0x8 data:4byte lbl_80576770 = .sbss:0x80576770; // type:object size:0x8 data:4byte @@ -48129,7 +48129,7 @@ lbl_805975C0 = .bss:0x805975C0; // type:object size:0x48 lbl_80597608 = .bss:0x80597608; // type:object size:0x10 lbl_80597618 = .bss:0x80597618; // type:object size:0xA8 lbl_805976C0 = .bss:0x805976C0; // type:object size:0x80 data:byte -lbl_80597740 = .bss:0x80597740; // type:object size:0x18 data:4byte +sAllocator__14dHeapAllocator = .bss:0x80597740; // type:object size:0x18 data:4byte lbl_80597758 = .bss:0x80597758; // type:object size:0x318 lbl_80597A70 = .bss:0x80597A70; // type:object size:0x10 lbl_80597A80 = .bss:0x80597A80; // type:object size:0x8B70 data:float diff --git a/include/d/d_heap_alloc.h b/include/d/d_heap_alloc.h new file mode 100644 index 00000000..726a997d --- /dev/null +++ b/include/d/d_heap_alloc.h @@ -0,0 +1,82 @@ +#ifndef D_HEAP_ALLOC +#define D_HEAP_ALLOC + +#include + +class dHeapAllocatorBase { +public: + /* vtable at 0x00 */ + dHeapAllocatorBase() + : mCallbacksInitialized(0), mPreviousAllocCallback(nullptr), mPreviousAllocCallbackArg(nullptr), + mPreviousFreeCallback(nullptr), mPreviousFreeCallbackArg(nullptr) {} + inline void doInitCallbacks() { + if (!mCallbacksInitialized) { + mCallbacksInitialized = 1; + + void *oldAllocCallbackArg = EGG::Heap::sAllocCallbackArg; + void *oldFreeCallbackArg = EGG::Heap::sFreeCallbackArg; + EGG::HeapAllocCallback oldAllocCallback = EGG::Heap::sAllocCallback; + EGG::HeapFreeCallback oldFreeCallback = EGG::Heap::sFreeCallback; + + EGG::HeapFreeCallback freeThunk = &freeCallback; + EGG::HeapAllocCallback allocThunk = &allocCallback; + + EGG::Heap::sAllocCallback = allocThunk; + EGG::Heap::sAllocCallbackArg = this; + mPreviousAllocCallback = oldAllocCallback; + mPreviousAllocCallbackArg = oldAllocCallbackArg; + + EGG::Heap::sFreeCallback = freeThunk; + EGG::Heap::sFreeCallbackArg = this; + mPreviousFreeCallback = oldFreeCallback; + mPreviousFreeCallbackArg = oldFreeCallbackArg; + } + } + static void allocCallback(EGG::HeapAllocArg *arg) { + dHeapAllocatorBase *allocator = (dHeapAllocatorBase *)(arg->userArg); + allocator->onAlloc(arg); + if (allocator->mPreviousAllocCallback) { + EGG::HeapAllocArg chainArg = *arg; + chainArg.userArg = allocator->mPreviousAllocCallbackArg; + (allocator->mPreviousAllocCallback)(&chainArg); + } + }; + static void freeCallback(EGG::HeapFreeArg *arg) { + dHeapAllocatorBase *allocator = (dHeapAllocatorBase *)(arg->userArg); + EGG::HeapFreeArg chainArg; + allocator->onFree(arg); + if (allocator->mPreviousFreeCallback) { + chainArg = *arg; + chainArg.userArg = allocator->mPreviousFreeCallbackArg; + (allocator->mPreviousFreeCallback)(&chainArg); + } + } + + virtual ~dHeapAllocatorBase() {} + virtual void onAlloc(EGG::HeapAllocArg *arg) {}; + virtual void onFree(EGG::HeapFreeArg *arg) {}; + + /* 0x04 */ bool mCallbacksInitialized; + /* 0x08 */ EGG::HeapAllocCallback mPreviousAllocCallback; + /* 0x0C */ void *mPreviousAllocCallbackArg; + /* 0x10 */ EGG::HeapFreeCallback mPreviousFreeCallback; + /* 0x14 */ void *mPreviousFreeCallbackArg; +}; + +void *operator new(size_t size); +void *operator new[](size_t size); +void operator delete(void *ptr); +void operator delete[](void *ptr); + +class dHeapAllocator : public dHeapAllocatorBase { +public: + dHeapAllocator() {} + virtual ~dHeapAllocator() {} + virtual void onAlloc(EGG::HeapAllocArg *arg); + + static void initCallbacks(); + + static dHeapAllocator sAllocator; +}; + +#endif diff --git a/include/egg/core/eggHeap.h b/include/egg/core/eggHeap.h index 10b114e9..0bd0b508 100644 --- a/include/egg/core/eggHeap.h +++ b/include/egg/core/eggHeap.h @@ -17,14 +17,15 @@ namespace EGG { class Allocator; struct HeapAllocArg { - int userArg; // 00 + void *userArg; // 00 u32 size; // 04 int align; // 08 Heap *heap; // 0C heap to allocate in + int another; // 10 inline HeapAllocArg() : userArg(0), size(0), align(0), heap(nullptr) {} }; -typedef void (*HeapAllocCallback)(HeapAllocArg &arg); +typedef void (*HeapAllocCallback)(HeapAllocArg *arg); struct HeapErrorArg { const char *msg; @@ -32,13 +33,14 @@ struct HeapErrorArg { inline HeapErrorArg() {} }; -typedef void (*ErrorCallback)(void *); +typedef void (*ErrorCallback)(HeapErrorArg *); struct HeapFreeArg { - u32 arg1; // Idk the args - u32 arg2; + void *userArg; + int arg1; + int arg2; }; -typedef void (*HeapFreeCallback)(void *); +typedef void (*HeapFreeCallback)(HeapFreeArg *); typedef void (*HeapCreateCallback)(void *); typedef void (*HeapDestroyCallback)(void *); @@ -151,14 +153,14 @@ public: /* 80576760 */ static void *sFreeCallbackArg; /* 80576764 */ static HeapCreateCallback sCreateCallback; /* 80576764 */ static HeapDestroyCallback sDestroyCallback; + + /* 80495a60 */ void *operator new(size_t, void *p); + /* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, u32 align); + /* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc); + /* 80495a90 */ void *operator new[](size_t size, u32 align); + /* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align); }; } // namespace EGG -/* 80495a60 */ void *operator new(size_t, void *p); -/* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, u32 align); -/* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc); -/* 80495a90 */ void *operator new[](size_t size, u32 align); -/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align); - #endif diff --git a/src/d/d_heap.cpp b/src/d/d_heap.cpp index 4bfa5e52..2e9c3198 100644 --- a/src/d/d_heap.cpp +++ b/src/d/d_heap.cpp @@ -1,4 +1,5 @@ #include +#include dHeap dHeap::work1Heap; dHeap dHeap::work2Heap; @@ -9,6 +10,22 @@ dHeap dHeap::layoutEx2Heap; dHeap dHeap::layoutResHeap; dHeap dHeap::fontHeap; dHeap dHeap::HBMHeap; +dHeapAllocator dHeapAllocator::sAllocator; + +extern u8 lbl_80571C58; +extern "C" void fn_802de710(); + +// TODO TU splits? + +void dHeapAllocator::onAlloc(EGG::HeapAllocArg *arg) { + if (arg->heap != nullptr) { + return; + } + if (lbl_80571C58 == 0) { + return; + } + fn_802de710(); +} EGG::ExpHeap *dHeap::init(const char *name, size_t size, EGG::Heap *parent) { heap = EGG::ExpHeap::create(size, parent, 4); @@ -18,30 +35,61 @@ EGG::ExpHeap *dHeap::init(const char *name, size_t size, EGG::Heap *parent) { } return heap; } + void dHeap::createWork1Heap(size_t size, EGG::Heap *parent) { - work1Heap.init("ゲーム用作業用ヒープ(dHeap::work1Heap)", size, parent); + static const char name[] = "ゲーム用作業用ヒープ(dHeap::work1Heap)"; + work1Heap.init(name, size, parent); } void dHeap::createWork2Heap(size_t size, EGG::Heap *parent) { - work2Heap.init("ゲーム用作業用ヒープ(dHeap::work2Heap)", size, parent); + static const char name[] = "ゲーム用作業用ヒープ(dHeap::work2Heap)"; + work2Heap.init(name, size, parent); } void dHeap::createWorkExHeap(size_t size, EGG::Heap *parent) { - workExHeap.init("ゲーム用拡張作業用ヒープ(dHeap::workExHeap)", size, parent); + static const char name[] = "ゲーム用拡張作業用ヒープ(dHeap::workExHeap)"; + workExHeap.init(name, size, parent); } void dHeap::createLayoutHeap(size_t size, EGG::Heap *parent) { - layoutHeap.init("レイアウト作業用ヒープ(dHeap::layoutHeap)", size, parent); + static const char name[] = "レイアウト作業用ヒープ(dHeap::layoutHeap)"; + layoutHeap.init(name, size, parent); } void dHeap::createLayoutExHeap(size_t size, EGG::Heap *parent) { - layoutExHeap.init("レイアウト拡張作業用ヒープ(dHeap::layoutExHeap)", size, parent); + static const char name[] = "レイアウト拡張作業用ヒープ(dHeap::layoutExHeap)"; + layoutExHeap.init(name, size, parent); } void dHeap::createLayoutEx2Heap(size_t size, EGG::Heap *parent) { - layoutEx2Heap.init("レイアウト拡張作業用ヒープ2(dHeap::layoutEx2Heap)", size, parent); + static const char name[] = "レイアウト拡張作業用ヒープ2(dHeap::layoutEx2Heap)"; + layoutEx2Heap.init(name, size, parent); } void dHeap::createLayoutResHeap(size_t size, EGG::Heap *parent) { - layoutResHeap.init("レイアウトリソース用ヒープ(dHeap::layoutResHeap)", size, parent); + static const char name[] = "レイアウトリソース用ヒープ(dHeap::layoutResHeap)"; + layoutResHeap.init(name, size, parent); } void dHeap::createFontHeap(size_t size, EGG::Heap *parent) { - fontHeap.init("フォント用ヒープ(dHeap::fontHeap)", size, parent); + static const char name[] = "フォント用ヒープ(dHeap::fontHeap)"; + fontHeap.init(name, size, parent); } void dHeap::createHBMHeap(size_t size, EGG::Heap *parent) { - HBMHeap.init("HBM用ヒープ(dHeap::HBMHeap)", size, parent); + static const char name[] = "HBM用ヒープ(dHeap::HBMHeap)"; + HBMHeap.init(name, size, parent); +} + +// TODO this doesn't match (many more stack stores) +void dHeapAllocator::initCallbacks() { + sAllocator.doInitCallbacks(); +} + +void *operator new(size_t size) { + return EGG::Heap::alloc(size, 0x04, nullptr); +} + +void *operator new[](size_t size) { + return EGG::Heap::alloc(size, 0x04, nullptr); +} + +void operator delete(void *ptr) { + return EGG::Heap::free(ptr, nullptr); +} + +void operator delete[](void *ptr) { + return EGG::Heap::free(ptr, nullptr); } From 927a2ad4f715ae410246648cf5a0b05c4521cebc Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 4 May 2024 11:57:22 +0200 Subject: [PATCH 17/25] comment --- include/d/d_heap_alloc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d/d_heap_alloc.h b/include/d/d_heap_alloc.h index 726a997d..dec77133 100644 --- a/include/d/d_heap_alloc.h +++ b/include/d/d_heap_alloc.h @@ -18,6 +18,8 @@ public: EGG::HeapAllocCallback oldAllocCallback = EGG::Heap::sAllocCallback; EGG::HeapFreeCallback oldFreeCallback = EGG::Heap::sFreeCallback; + // first mention free, then alloc so that the + //inline thunks are emitted in the right order EGG::HeapFreeCallback freeThunk = &freeCallback; EGG::HeapAllocCallback allocThunk = &allocCallback; From c98342a9d5c0bdb5fb8c9d23bcb15810daf0f219 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 4 May 2024 20:10:59 +0200 Subject: [PATCH 18/25] Update for -ipa file --- include/d/d_heap_alloc.h | 9 ++------- src/d/d_heap.cpp | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/include/d/d_heap_alloc.h b/include/d/d_heap_alloc.h index dec77133..4fd3a47a 100644 --- a/include/d/d_heap_alloc.h +++ b/include/d/d_heap_alloc.h @@ -18,17 +18,12 @@ public: EGG::HeapAllocCallback oldAllocCallback = EGG::Heap::sAllocCallback; EGG::HeapFreeCallback oldFreeCallback = EGG::Heap::sFreeCallback; - // first mention free, then alloc so that the - //inline thunks are emitted in the right order - EGG::HeapFreeCallback freeThunk = &freeCallback; - EGG::HeapAllocCallback allocThunk = &allocCallback; - - EGG::Heap::sAllocCallback = allocThunk; + EGG::Heap::sAllocCallback = &allocCallback; EGG::Heap::sAllocCallbackArg = this; mPreviousAllocCallback = oldAllocCallback; mPreviousAllocCallbackArg = oldAllocCallbackArg; - EGG::Heap::sFreeCallback = freeThunk; + EGG::Heap::sFreeCallback = &freeCallback; EGG::Heap::sFreeCallbackArg = this; mPreviousFreeCallback = oldFreeCallback; mPreviousFreeCallbackArg = oldFreeCallbackArg; diff --git a/src/d/d_heap.cpp b/src/d/d_heap.cpp index 2e9c3198..a29ba328 100644 --- a/src/d/d_heap.cpp +++ b/src/d/d_heap.cpp @@ -13,7 +13,7 @@ dHeap dHeap::HBMHeap; dHeapAllocator dHeapAllocator::sAllocator; extern u8 lbl_80571C58; -extern "C" void fn_802de710(); +extern "C" void fn_802DE710(); // TODO TU splits? @@ -24,7 +24,7 @@ void dHeapAllocator::onAlloc(EGG::HeapAllocArg *arg) { if (lbl_80571C58 == 0) { return; } - fn_802de710(); + fn_802DE710(); } EGG::ExpHeap *dHeap::init(const char *name, size_t size, EGG::Heap *parent) { From 498660cf6bf9420d6cb8054f02e63b945fa35e35 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sat, 4 May 2024 23:29:06 -0400 Subject: [PATCH 19/25] match ut_TagProcessorBase. thanks ogws --- config/SOUE01/config.yml | 4 ++ config/SOUE01/splits.txt | 2 + config/SOUE01/symbols.txt | 6 +- configure.py | 3 +- include/nw4r/ut/ut_TagProcessorBase.h | 20 +++--- src/nw4r/ut/ut_TagProcessorBase.cpp | 88 +++++++++++++++++++++++++++ 6 files changed, 110 insertions(+), 13 deletions(-) diff --git a/config/SOUE01/config.yml b/config/SOUE01/config.yml index 9bd91d28..6b77249c 100644 --- a/config/SOUE01/config.yml +++ b/config/SOUE01/config.yml @@ -6,6 +6,10 @@ mw_comment_version: 8 quick_analysis: true force_active: [ "searchBaseByID__10fManager_cF9fBaseID_e", + "ProcessLinefeed__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut15PrintContext", + "ProcessTab__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut15PrintContext", + "ProcessLinefeed__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut15PrintContext", + "ProcessTab__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut15PrintContext", ] # modules: # - object: orig/SOUE01/rels/d_a_asura_bulletNP.rel diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index bb76869b..fc39b065 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -181,6 +181,8 @@ nw4r/ut/ut_CharStrmReader.cpp: nw4r/ut/ut_TagProcessorBase.cpp: .text start:0x8042AB80 end:0x8042B4D4 + .data start:0x8056BD50 end:0x8056BD78 + .sdata2 start:0x8057EB68 end:0x8057EB70 nw4r/ut/ut_IOStream.cpp: .text start:0x8042B4E0 end:0x8042B55C diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index cea99b0e..bcdb8b36 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -23946,7 +23946,7 @@ ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv = .text:0x8042AB00; // type:fun ReadNextCharSJIS__Q34nw4r2ut14CharStrmReaderFv = .text:0x8042AB20; // type:function size:0x60 __ct__Q34nw4r2ut19TagProcessorBaseFv = .text:0x8042AB80; // type:function size:0x10 __dt__Q34nw4r2ut19TagProcessorBaseFv = .text:0x8042AB90; // type:function size:0x40 -Process__Q34nw4r2ut19TagProcessorBase = .text:0x8042ABD0; // type:function size:0x12C +Process__Q34nw4r2ut19TagProcessorBaseFUsPQ34nw4r2ut15PrintContext = .text:0x8042ABD0; // type:function size:0x12C CalcRect__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext = .text:0x8042AD00; // type:function size:0x1E4 ProcessLinefeed__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut15PrintContext = .text:0x8042AEF0; // type:function size:0x64 ProcessTab__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut15PrintContext = .text:0x8042AF60; // type:function size:0xC4 @@ -36943,8 +36943,8 @@ jumptable_8056BCB8 = .data:0x8056BCB8; // type:object size:0x20 scope:local jumptable_8056BCD8 = .data:0x8056BCD8; // type:object size:0x20 scope:local @1687 = .data:0x8056BCF8; // type:object size:0x21 scope:local data:string lbl_8056BD20 = .data:0x8056BD20; // type:object size:0x30 -lbl_8056BD50 = .data:0x8056BD50; // type:object size:0x14 -lbl_8056BD64 = .data:0x8056BD64; // type:object size:0x14 +__vt__Q34nw4r2ut19TagProcessorBase = .data:0x8056BD50; // type:object size:0x14 scope:weak +__vt__Q34nw4r2ut19TagProcessorBase = .data:0x8056BD64; // type:object size:0x14 scope:weak lbl_8056BD78 = .data:0x8056BD78; // type:object size:0x68 lbl_8056BDE0 = .data:0x8056BDE0; // type:object size:0x68 lbl_8056BE48 = .data:0x8056BE48; // type:object size:0x60 diff --git a/configure.py b/configure.py index 5336a084..f86cf316 100644 --- a/configure.py +++ b/configure.py @@ -201,6 +201,7 @@ cflags_egg = [ cflags_nw4r = [ *cflags_base, "-ipa file", + "-fp_contract off", ] # REL flags @@ -321,7 +322,7 @@ config.libs = [ Object(Matching, "nw4r/ut/ut_LinkList.cpp"), Object(Matching, "nw4r/ut/ut_binaryFileFormat.cpp"), Object(NonMatching, "nw4r/ut/ut_CharStrmReader.cpp"), - Object(NonMatching, "nw4r/ut/ut_TagProcessorBase.cpp"), + Object(Matching, "nw4r/ut/ut_TagProcessorBase.cpp"), Object(NonMatching, "nw4r/ut/ut_IOStream.cpp"), Object(NonMatching, "nw4r/ut/ut_FileStream.cpp"), Object(NonMatching, "nw4r/ut/ut_DvdFileStream.cpp"), diff --git a/include/nw4r/ut/ut_TagProcessorBase.h b/include/nw4r/ut/ut_TagProcessorBase.h index f58ff6d7..3c8f19ea 100644 --- a/include/nw4r/ut/ut_TagProcessorBase.h +++ b/include/nw4r/ut/ut_TagProcessorBase.h @@ -10,9 +10,10 @@ enum PrintFlags { PRINTFLAGS_CHARSPACE = (1 << 0), }; -template struct PrintContext { - TextWriterBase* writer; // at 0x0 - const T* str; // at 0x4 +template +struct PrintContext { + TextWriterBase *writer; // at 0x0 + const T *str; // at 0x4 f32 x; // at 0x8 f32 y; // at 0xC u32 flags; // at 0x10 @@ -26,17 +27,18 @@ enum Operation { OPERATION_END_DRAW }; -template class TagProcessorBase { +template +class TagProcessorBase { public: TagProcessorBase(); virtual ~TagProcessorBase(); // at 0x8 - virtual Operation Process(u16 ch, PrintContext* ctx); // at 0xC - virtual Operation CalcRect(Rect* rect, u16 ch, - PrintContext* ctx); // at 0x10 + virtual Operation Process(u16 ch, PrintContext *ctx); // at 0xC + virtual Operation CalcRect(Rect *rect, u16 ch, + PrintContext *ctx); // at 0x10 - void ProcessTab(PrintContext* ctx); - void ProcessLinefeed(PrintContext* ctx); + void ProcessLinefeed(PrintContext *ctx); + void ProcessTab(PrintContext *ctx); }; } // namespace ut diff --git a/src/nw4r/ut/ut_TagProcessorBase.cpp b/src/nw4r/ut/ut_TagProcessorBase.cpp index e69de29b..dc001042 100644 --- a/src/nw4r/ut/ut_TagProcessorBase.cpp +++ b/src/nw4r/ut/ut_TagProcessorBase.cpp @@ -0,0 +1,88 @@ +#include + +namespace nw4r { +namespace ut { + +template +TagProcessorBase::TagProcessorBase() {} + +template +TagProcessorBase::~TagProcessorBase() {} + +template +Operation TagProcessorBase::Process(u16 ch, PrintContext *ctx) { + switch (ch) { + case '\n': + ProcessLinefeed(ctx); + return OPERATION_NEXT_LINE; + case '\t': + ProcessTab(ctx); + return OPERATION_NO_CHAR_SPACE; + } + + return OPERATION_DEFAULT; +} + +template +Operation TagProcessorBase::CalcRect(Rect *rect, u16 ch, PrintContext *ctx) { + switch (ch) { + case '\n': { + const TextWriterBase &writer = *ctx->writer; + rect->right = writer.GetCursorX(); + rect->top = writer.GetCursorY(); + ProcessLinefeed(ctx); + rect->left = writer.GetCursorX(); + rect->bottom = writer.GetCursorY() + ctx->writer->GetFontHeight(); + rect->Normalize(); + return OPERATION_NEXT_LINE; + } + case '\t': { + const TextWriterBase &writer = *ctx->writer; + rect->left = writer.GetCursorX(); + ProcessTab(ctx); + rect->right = writer.GetCursorX(); + rect->top = writer.GetCursorY(); + rect->bottom = rect->top + writer.GetFontHeight(); + rect->Normalize(); + return OPERATION_NO_CHAR_SPACE; + } + } + + return OPERATION_DEFAULT; +} + +template +void TagProcessorBase::ProcessTab(PrintContext *ctx) { + TextWriterBase &writer = *ctx->writer; + + int tabWidth = writer.GetTabWidth(); + if (tabWidth <= 0) { + return; + } + + f32 charWidth = writer.IsWidthFixed() ? writer.GetFixedWidth() : writer.GetFontWidth(); + + f32 dx = writer.GetCursorX() - ctx->x; + f32 tabPixel = tabWidth * charWidth; + int numTab = static_cast(dx / tabPixel) + 1; + f32 x = ctx->x + (tabPixel * numTab); + + writer.SetCursorX(x); +} + +template +void TagProcessorBase::ProcessLinefeed(PrintContext *ctx) { + TextWriterBase &writer = *ctx->writer; + + f32 x = ctx->x; + f32 y = writer.GetCursorY() + writer.GetLineHeight(); + + writer.SetCursorX(x); + writer.SetCursorY(y); +} + +template class TagProcessorBase; +template class TagProcessorBase; + +} // namespace ut +} // namespace nw4r From 20bedbfc3b007437c5e602500f5f1ca7d0e0da45 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sat, 4 May 2024 23:47:10 -0400 Subject: [PATCH 20/25] ut_IOStream thanks ogws --- config/SOUE01/splits.txt | 1 + config/SOUE01/symbols.txt | 10 ++++----- configure.py | 2 +- include/nw4r/ut/ut_IOStream.h | 40 +++++++++++++++++++++-------------- src/nw4r/ut/ut_IOStream.cpp | 25 ++++++++++++++++++++++ 5 files changed, 56 insertions(+), 22 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index bb76869b..3c3bd3fd 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -185,6 +185,7 @@ nw4r/ut/ut_TagProcessorBase.cpp: nw4r/ut/ut_IOStream.cpp: .text start:0x8042B4E0 end:0x8042B55C .ctors start:0x804DB938 end:0x804DB93C + .sbss start:0x80576590 end:0x80576598 nw4r/ut/ut_FileStream.cpp: .text start:0x8042B560 end:0x8042B6EC diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index cea99b0e..f99c242b 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -23960,10 +23960,10 @@ ReadAsync__Q34nw4r2ut8IOStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv = .text:0x8042B Write__Q34nw4r2ut8IOStreamFPCvUl = .text:0x8042B4F0; // type:function size:0x8 WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv = .text:0x8042B500; // type:function size:0x8 IsBusy__Q34nw4r2ut8IOStreamCFv = .text:0x8042B510; // type:function size:0x8 -GetBufferAlign__Q34nw4r2ut8IOStreamCFv = .text:0x8042B520; // type:function size:0x8 -GetSizeAlign__Q34nw4r2ut8IOStreamCFv = .text:0x8042B530; // type:function size:0x8 -GetOffsetAlign__Q34nw4r2ut8IOStreamCFv = .text:0x8042B540; // type:function size:0x8 -__sinit_\ut_IOStream_cpp = .text:0x8042B550; // type:function size:0xC +GetBufferAlign__Q34nw4r2ut8IOStreamCFv = .text:0x8042B520; // type:function size:0x8 scope:weak +GetSizeAlign__Q34nw4r2ut8IOStreamCFv = .text:0x8042B530; // type:function size:0x8 scope:weak +GetOffsetAlign__Q34nw4r2ut8IOStreamCFv = .text:0x8042B540; // type:function size:0x8 scope:weak +__sinit_\ut_IOStream_cpp = .text:0x8042B550; // type:function size:0xC scope:local Cancel__Q34nw4r2ut10FileStreamFv = .text:0x8042B560; // type:function size:0x4 CancelAsync__Q34nw4r2ut10FileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv = .text:0x8042B570; // type:function size:0x8 Skip__Q44nw4r2ut10FileStream12FilePositionFl = .text:0x8042B580; // type:function size:0x64 @@ -40808,7 +40808,7 @@ lbl_8057657C = .sbss:0x8057657C; // type:object size:0x4 data:4byte lbl_80576580 = .sbss:0x80576580; // type:object size:0x1 data:byte lbl_80576584 = .sbss:0x80576584; // type:object size:0x4 data:4byte lbl_80576588 = .sbss:0x80576588; // type:object size:0x8 data:4byte -lbl_80576590 = .sbss:0x80576590; // type:object size:0x8 data:4byte +typeInfo__Q34nw4r2ut8IOStream = .sbss:0x80576590; // type:object size:0x4 data:4byte lbl_80576598 = .sbss:0x80576598; // type:object size:0x8 data:4byte lbl_805765A0 = .sbss:0x805765A0; // type:object size:0x8 data:4byte lbl_805765A8 = .sbss:0x805765A8; // type:object size:0x8 data:4byte diff --git a/configure.py b/configure.py index 5336a084..67a80f00 100644 --- a/configure.py +++ b/configure.py @@ -322,7 +322,7 @@ config.libs = [ Object(Matching, "nw4r/ut/ut_binaryFileFormat.cpp"), Object(NonMatching, "nw4r/ut/ut_CharStrmReader.cpp"), Object(NonMatching, "nw4r/ut/ut_TagProcessorBase.cpp"), - Object(NonMatching, "nw4r/ut/ut_IOStream.cpp"), + Object(Matching, "nw4r/ut/ut_IOStream.cpp"), Object(NonMatching, "nw4r/ut/ut_FileStream.cpp"), Object(NonMatching, "nw4r/ut/ut_DvdFileStream.cpp"), Object(NonMatching, "nw4r/ut/ut_DvdLockedFileStream.cpp"), diff --git a/include/nw4r/ut/ut_IOStream.h b/include/nw4r/ut/ut_IOStream.h index 13467904..33545909 100644 --- a/include/nw4r/ut/ut_IOStream.h +++ b/include/nw4r/ut/ut_IOStream.h @@ -10,33 +10,41 @@ class IOStream { public: NW4R_UT_RTTI_DECL(IOStream); - typedef void (*AsyncCallback)(s32 result, IOStream* stream, void* arg); + typedef void (*AsyncCallback)(long result, IOStream *stream, void *arg); IOStream() : mIsOpen(false), mCallback(NULL), mCallbackArg(NULL) {} virtual ~IOStream() {} // at 0xC virtual void Close() = 0; // at 0x10 - virtual s32 Read(void* dst, u32 size) = 0; // at 0x14 - virtual bool ReadAsync(void* dst, u32 size, AsyncCallback callback, - void* arg); // at 0x18 - virtual void Write(const void* src, u32 size); // at 0x1C - virtual bool WriteAsync(const void* src, u32 size, AsyncCallback callback, - void* arg); // at 0x20 - virtual bool IsBusy() const; // at 0x24 - virtual bool CanAsync() const = 0; // at 0x28 - virtual bool CanRead() const = 0; // at 0x2C - virtual bool CanWrite() const = 0; // at 0x30 - virtual u32 GetOffsetAlign() const { return 1; } // at 0x34 - virtual u32 GetSizeAlign() const { return 1; } // at 0x38 - virtual u32 GetBufferAlign() const { return 1; } // at 0x3C + virtual s32 Read(void *dst, u32 size) = 0; // at 0x14 + virtual bool ReadAsync(void *dst, unsigned long size, AsyncCallback callback, + void *arg); // at 0x18 + virtual bool Write(const void *src, unsigned long size); // at 0x1C + virtual bool WriteAsync(const void *src, unsigned long size, AsyncCallback callback, + void *arg); // at 0x20 + virtual bool IsBusy() const; // at 0x24 + virtual bool CanAsync() const = 0; // at 0x28 + virtual bool CanRead() const = 0; // at 0x2C + virtual bool CanWrite() const = 0; // at 0x30 + virtual u32 GetOffsetAlign() const { + return 1; + } // at 0x34 + virtual u32 GetSizeAlign() const { + return 1; + } // at 0x38 + virtual u32 GetBufferAlign() const { + return 1; + } // at 0x3C - bool IsAvailable() const { return mIsOpen; } + bool IsAvailable() const { + return mIsOpen; + } protected: bool mIsOpen; // at 0x4 s32 mResult; // at 0x8 AsyncCallback mCallback; // at 0xC - void* mCallbackArg; // at 0x10 + void *mCallbackArg; // at 0x10 }; } // namespace ut diff --git a/src/nw4r/ut/ut_IOStream.cpp b/src/nw4r/ut/ut_IOStream.cpp index e69de29b..dec6c090 100644 --- a/src/nw4r/ut/ut_IOStream.cpp +++ b/src/nw4r/ut/ut_IOStream.cpp @@ -0,0 +1,25 @@ +#include + +namespace nw4r { +namespace ut { + +NW4R_UT_RTTI_DEF_BASE(IOStream); + +bool IOStream::ReadAsync(void *dst, unsigned long size, AsyncCallback callback, void *arg) { + return false; +} + +bool IOStream::Write(const void *src, unsigned long size) { + return false; +} + +bool IOStream::WriteAsync(const void *src, unsigned long size, AsyncCallback callback, void *arg) { + return false; +} + +bool IOStream::IsBusy() const { + return false; +} + +} // namespace ut +} // namespace nw4r From 7d76ab692f4ba75131296a2ddd5e54a0082247fd Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 5 May 2024 00:01:06 -0400 Subject: [PATCH 21/25] ut_FileStream thanks ogws --- config/SOUE01/splits.txt | 1 + config/SOUE01/symbols.txt | 6 ++-- configure.py | 2 +- include/nw4r/ut/ut_FileStream.h | 22 ++++++++----- src/nw4r/ut/ut_FileStream.cpp | 58 +++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 12 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 0a647c7a..7fefadea 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -192,6 +192,7 @@ nw4r/ut/ut_IOStream.cpp: nw4r/ut/ut_FileStream.cpp: .text start:0x8042B560 end:0x8042B6EC .ctors start:0x804DB93C end:0x804DB940 + .sbss start:0x80576598 end:0x805765A0 nw4r/ut/ut_DvdFileStream.cpp: .text start:0x8042B6F0 end:0x8042BDAC diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 7d56a0ca..669414f7 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -23969,8 +23969,8 @@ CancelAsync__Q34nw4r2ut10FileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv = .text:0x8042 Skip__Q44nw4r2ut10FileStream12FilePositionFl = .text:0x8042B580; // type:function size:0x64 Append__Q44nw4r2ut10FileStream12FilePositionFl = .text:0x8042B5F0; // type:function size:0x50 Seek__Q44nw4r2ut10FileStream12FilePositionFlUl = .text:0x8042B640; // type:function size:0x88 -GetRuntimeTypeInfo__Q34nw4r2ut10FileStreamCFv = .text:0x8042B6D0; // type:function size:0x8 -__sinit_\ut_FileStream_cpp = .text:0x8042B6E0; // type:function size:0xC +GetRuntimeTypeInfo__Q34nw4r2ut10FileStreamCFv = .text:0x8042B6D0; // type:function size:0x8 scope:weak +__sinit_\ut_FileStream_cpp = .text:0x8042B6E0; // type:function size:0xC scope:local DvdAsyncCallback___Q34nw4r2ut13DvdFileStreamFlP11DVDFileInfo = .text:0x8042B6F0; // type:function size:0x2C DvdCBAsyncCallback___Q34nw4r2ut13DvdFileStreamFlP15DVDCommandBlock = .text:0x8042B720; // type:function size:0x28 __ct__Q34nw4r2ut13DvdFileStreamFl = .text:0x8042B750; // type:function size:0xBC @@ -40809,7 +40809,7 @@ lbl_80576580 = .sbss:0x80576580; // type:object size:0x1 data:byte lbl_80576584 = .sbss:0x80576584; // type:object size:0x4 data:4byte lbl_80576588 = .sbss:0x80576588; // type:object size:0x8 data:4byte typeInfo__Q34nw4r2ut8IOStream = .sbss:0x80576590; // type:object size:0x4 data:4byte -lbl_80576598 = .sbss:0x80576598; // type:object size:0x8 data:4byte +typeInfo__Q34nw4r2ut10FileStream = .sbss:0x80576598; // type:object size:0x4 data:4byte lbl_805765A0 = .sbss:0x805765A0; // type:object size:0x8 data:4byte lbl_805765A8 = .sbss:0x805765A8; // type:object size:0x8 data:4byte lbl_805765B0 = .sbss:0x805765B0; // type:object size:0x8 diff --git a/configure.py b/configure.py index 07061c3d..830c0c10 100644 --- a/configure.py +++ b/configure.py @@ -324,7 +324,7 @@ config.libs = [ Object(NonMatching, "nw4r/ut/ut_CharStrmReader.cpp"), Object(Matching, "nw4r/ut/ut_IOStream.cpp"), Object(Matching, "nw4r/ut/ut_TagProcessorBase.cpp"), - Object(NonMatching, "nw4r/ut/ut_FileStream.cpp"), + Object(Matching, "nw4r/ut/ut_FileStream.cpp"), Object(NonMatching, "nw4r/ut/ut_DvdFileStream.cpp"), Object(NonMatching, "nw4r/ut/ut_DvdLockedFileStream.cpp"), Object(NonMatching, "nw4r/ut/ut_NandFileStream.cpp"), diff --git a/include/nw4r/ut/ut_FileStream.h b/include/nw4r/ut/ut_FileStream.h index 99e4b336..17328c42 100644 --- a/include/nw4r/ut/ut_FileStream.h +++ b/include/nw4r/ut/ut_FileStream.h @@ -16,14 +16,20 @@ public: public: FilePosition() : mFileSize(0), mFileOffset(0) {} - u32 GetFileSize() const { return mFileSize; } - void SetFileSize(u32 fileSize) { mFileSize = fileSize; } + u32 GetFileSize() const { + return mFileSize; + } + void SetFileSize(unsigned long fileSize) { + mFileSize = fileSize; + } - u32 Tell() const { return mFileOffset; } + u32 Tell() const { + return mFileOffset; + } - u32 Skip(s32 offset); - u32 Append(s32 offset); - void Seek(s32 offset, u32 origin); + u32 Skip(long offset); + u32 Append(long offset); + void Seek(long offset, unsigned long origin); private: u32 mFileSize; // at 0x0 @@ -35,9 +41,9 @@ public: virtual ~FileStream() {} // at 0xC virtual u32 GetSize() const = 0; // at 0x40 - virtual void Seek(s32 offset, u32 origin); // at 0x44 + virtual void Seek(long offset, unsigned long origin); // at 0x44 virtual void Cancel(); // at 0x48 - virtual bool CancelAsync(AsyncCallback callback, void* arg); // at 0x4C + virtual bool CancelAsync(AsyncCallback callback, void *arg); // at 0x4C virtual bool CanSeek() const = 0; // at 0x50 virtual bool CanCancel() const = 0; // at 0x54 virtual u32 Tell() const = 0; // at 0x58 diff --git a/src/nw4r/ut/ut_FileStream.cpp b/src/nw4r/ut/ut_FileStream.cpp index e69de29b..a7b68cd0 100644 --- a/src/nw4r/ut/ut_FileStream.cpp +++ b/src/nw4r/ut/ut_FileStream.cpp @@ -0,0 +1,58 @@ +#include + +namespace nw4r { +namespace ut { + +NW4R_UT_RTTI_DEF_DERIVED(FileStream, IOStream); + +void FileStream::Cancel() {} + +bool FileStream::CancelAsync(AsyncCallback callback, void *arg) { +#pragma unused(callback) +#pragma unused(arg) + return true; +} + +u32 FileStream::FilePosition::Skip(long offset) { + if (offset != 0) { + s64 newOffset = mFileOffset + offset; + mFileOffset = Clamp(newOffset, 0, mFileSize); + } + + return mFileOffset; +} + +u32 FileStream::FilePosition::Append(long offset) { + s64 newOffset = mFileOffset + offset; + + if (newOffset < 0) { + mFileOffset = 0; + } else { + mFileOffset = newOffset; + mFileSize = Max(mFileOffset, mFileSize); + } + + return mFileOffset; +} + +void FileStream::FilePosition::Seek(long offset, unsigned long origin) { + switch (origin) { + case SEEK_BEG: + mFileOffset = 0; + break; + case SEEK_END: + mFileOffset = mFileSize; + break; + case SEEK_CUR: + default: + break; + } + + Skip(offset); +} + +// TODO: This should not be necessary. Because of nw4r::snd? still the case for ss +DECOMP_FORCEACTIVE(ut_FileStream_cpp, FileStream::GetRuntimeTypeInfo); + +} // namespace ut +} // namespace nw4r From 4909f805ba6f533777cabb4a29ad25ff668c0bb2 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 5 May 2024 10:20:28 +0200 Subject: [PATCH 22/25] eggHeap almost matching --- config/SOUE01/splits.txt | 3 +- config/SOUE01/symbols.txt | 50 ++++---- include/egg/core/eggHeap.h | 7 +- include/egg/prim/eggBitFlag.h | 5 +- src/egg/core/eggColorFader.cpp | 2 +- src/egg/core/eggDisplay.cpp | 6 +- src/egg/core/eggHeap.cpp | 207 +++++++++++++++++++++++++++++++++ 7 files changed, 246 insertions(+), 34 deletions(-) create mode 100644 src/egg/core/eggHeap.cpp diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 7fefadea..30a5435f 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -261,7 +261,8 @@ egg/core/eggAllocator.cpp: egg/core/eggHeap.cpp: .text start:0x804953F0 end:0x80495AB0 .data start:0x8056E8E8 end:0x8056E980 - .sbss start:0x80576740 end:0x80576770 + .sdata start:0x80574ED8 end:0x80574EE8 + .sbss start:0x80576740 end:0x8057676C .bss start:0x80673AE8 end:0x80673B10 egg/core/eggExpHeap.cpp: diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 669414f7..b04afa94 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -2212,7 +2212,7 @@ fn_80054550 = .text:0x80054550; // type:function size:0x31C fn_80054870 = .text:0x80054870; // type:function size:0x25C fn_80054AD0 = .text:0x80054AD0; // type:function size:0x10 fn_80054AE0 = .text:0x80054AE0; // type:function size:0x14 -fn_80054B00 = .text:0x80054B00; // type:function size:0x40 +__dt__5dHeapFv = .text:0x80054B00; // type:function size:0x40 fn_80054B40 = .text:0x80054B40; // type:function size:0x20 init__5dHeapFPCcUlPQ23EGG4Heap = .text:0x80054B60; // type:function size:0x64 createWork1Heap__5dHeapFUlPQ23EGG4Heap = .text:0x80054BD0; // type:function size:0x18 @@ -21996,9 +21996,9 @@ fn_803AA830 = .text:0x803AA830; // type:function size:0x18 BATConfig = .text:0x803AA850; // type:function size:0x120 scope:local fn_803AA970 = .text:0x803AA970; // type:function size:0x44 __OSInitMemoryProtection = .text:0x803AA9C0; // type:function size:0xCC scope:global -fn_803AAA90 = .text:0x803AAA90; // type:function size:0x38 -fn_803AAAD0 = .text:0x803AAAD0; // type:function size:0xDC -fn_803AABB0 = .text:0x803AABB0; // type:function size:0xC8 +OSInitMutex = .text:0x803AAA90; // type:function size:0x38 +OSLockMutex = .text:0x803AAAD0; // type:function size:0xDC +OSUnlockMutex = .text:0x803AABB0; // type:function size:0xC8 fn_803AAC80 = .text:0x803AAC80; // type:function size:0x6C fn_803AACF0 = .text:0x803AACF0; // type:function size:0xBC fn_803AADB0 = .text:0x803AADB0; // type:function size:0x6C @@ -22033,7 +22033,7 @@ fn_803AC380 = .text:0x803AC380; // type:function size:0x4 fn_803AC390 = .text:0x803AC390; // type:function size:0x70 __OSThreadInit = .text:0x803AC400; // type:function size:0x284 scope:global OSInitThreadQueue = .text:0x803AC690; // type:function size:0x10 scope:global -fn_803AC6A0 = .text:0x803AC6A0; // type:function size:0xC +OSGetCurrentThread = .text:0x803AC6A0; // type:function size:0xC fn_803AC6B0 = .text:0x803AC6B0; // type:function size:0x2C OSDisableScheduler = .text:0x803AC6E0; // type:function size:0x3C scope:global OSEnableScheduler = .text:0x803AC720; // type:function size:0x3C scope:global @@ -22562,7 +22562,7 @@ fn_803CC1F0 = .text:0x803CC1F0; // type:function size:0x14C fn_803CC340 = .text:0x803CC340; // type:function size:0x1C0 fn_803CC500 = .text:0x803CC500; // type:function size:0x16C fn_803CC670 = .text:0x803CC670; // type:function size:0x140 -fn_803CC7B0 = .text:0x803CC7B0; // type:function size:0x18C +MEMFindContainHeap = .text:0x803CC7B0; // type:function size:0x18C fn_803CC940 = .text:0x803CC940; // type:function size:0x22C fn_803CCB70 = .text:0x803CCB70; // type:function size:0xDC fn_803CCC50 = .text:0x803CCC50; // type:function size:0xC8 @@ -22588,7 +22588,7 @@ fn_803CDA40 = .text:0x803CDA40; // type:function size:0x84 fn_803CDAD0 = .text:0x803CDAD0; // type:function size:0xD0 fn_803CDBA0 = .text:0x803CDBA0; // type:function size:0x10 fn_803CDBB0 = .text:0x803CDBB0; // type:function size:0x8 -fn_803CDBC0 = .text:0x803CDBC0; // type:function size:0x10 +MEMAllocFromAllocator = .text:0x803CDBC0; // type:function size:0x10 fn_803CDBD0 = .text:0x803CDBD0; // type:function size:0x10 fn_803CDBE0 = .text:0x803CDBE0; // type:function size:0x1C fn_803CDC00 = .text:0x803CDC00; // type:function size:0x18 @@ -26204,11 +26204,11 @@ dump__Q23EGG4HeapFv = .text:0x804958A0; // type:function size:0x4 dumpAll__Q23EGG4HeapFv = .text:0x804958B0; // type:function size:0xEC becomeCurrentHeap__Q23EGG4HeapFv = .text:0x804959A0; // type:function size:0x58 _becomeCurrentHeapWithoutLock__Q23EGG4HeapFv = .text:0x80495A00; // type:function size:0x3C -initAllocator__Q23EGG4HeapFPQ23EGG9Allocatorl = .text:0x80495A40; // type:function size:0x14 +initAllocator__Q23EGG4HeapFPQ23EGG9Allocatori = .text:0x80495A40; // type:function size:0x14 __nw__FUlPv = .text:0x80495A60; // type:function size:0x8 -__nw__FUlPQ23EGG4Heapi = .text:0x80495A70; // type:function size:0x10 -__nwa__FUl = .text:0x80495A80; // type:function size:0x10 -__nwa__FUli = .text:0x80495A90; // type:function size:0x8 +__nw__FUlPQ23EGG4HeapUi = .text:0x80495A70; // type:function size:0x10 +__nw__FUlPQ23EGG9Allocator = .text:0x80495A80; // type:function size:0x10 +__nwa__FUlUi = .text:0x80495A90; // type:function size:0x8 __nwa__FUlPQ23EGG4Heapi = .text:0x80495AA0; // type:function size:0x10 __ct__Q23EGG7ExpHeapFP12MEMiHeapHead = .text:0x80495AB0; // type:function size:0x3C __dt__Q23EGG7ExpHeapFv = .text:0x80495AF0; // type:function size:0x74 @@ -37096,7 +37096,7 @@ lbl_8056E8A0 = .data:0x8056E8A0; // type:object size:0x18 lbl_8056E8B8 = .data:0x8056E8B8; // type:object size:0x18 lbl_8056E8D0 = .data:0x8056E8D0; // type:object size:0x18 lbl_8056E8E8 = .data:0x8056E8E8; // type:object size:0x68 -lbl_8056E950 = .data:0x8056E950; // type:object size:0x30 +__vt__Q23EGG4Heap = .data:0x8056E950; // type:object size:0x30 lbl_8056E980 = .data:0x8056E980; // type:object size:0x10 lbl_8056E990 = .data:0x8056E990; // type:object size:0x10 lbl_8056E9A0 = .data:0x8056E9A0; // type:object size:0x30 @@ -39735,7 +39735,7 @@ layoutExHeap__5dHeap = .sbss:0x805751B8; // type:object size:0x4 data:4byte layoutEx2Heap__5dHeap = .sbss:0x805751BC; // type:object size:0x4 data:4byte layoutResHeap__5dHeap = .sbss:0x805751C0; // type:object size:0x4 data:4byte fontHeap__5dHeap = .sbss:0x805751C4; // type:object size:0x4 data:4byte -HBMHeap__5dHeap = .sbss:0x805751C8; // type:object size:0x8 data:4byte +HBMHeap__5dHeap = .sbss:0x805751C8; // type:object size:0x4 data:4byte lbl_805751D0 = .sbss:0x805751D0; // type:object size:0x8 data:4byte lbl_805751D8 = .sbss:0x805751D8; // type:object size:0x4 data:4byte lbl_805751DC = .sbss:0x805751DC; // type:object size:0x4 data:4byte @@ -40880,16 +40880,16 @@ lbl_80576728 = .sbss:0x80576728; // type:object size:0x8 data:byte lbl_80576730 = .sbss:0x80576730; // type:object size:0x8 data:byte lbl_80576738 = .sbss:0x80576738; // type:object size:0x8 data:4byte sCurrentHeap__Q23EGG4Heap = .sbss:0x80576740; // type:object size:0x4 data:4byte -lbl_80576744 = .sbss:0x80576744; // type:object size:0x4 data:4byte -lbl_80576748 = .sbss:0x80576748; // type:object size:0x4 data:4byte -lbl_8057674C = .sbss:0x8057674C; // type:object size:0x4 data:4byte -lbl_80576750 = .sbss:0x80576750; // type:object size:0x4 data:4byte -lbl_80576754 = .sbss:0x80576754; // type:object size:0x4 data:4byte -lbl_80576758 = .sbss:0x80576758; // type:object size:0x4 data:4byte -lbl_8057675C = .sbss:0x8057675C; // type:object size:0x4 data:4byte -lbl_80576760 = .sbss:0x80576760; // type:object size:0x4 data:4byte -lbl_80576764 = .sbss:0x80576764; // type:object size:0x4 data:4byte -lbl_80576768 = .sbss:0x80576768; // type:object size:0x8 data:4byte +sIsHeapListInitialized__Q23EGG4Heap = .sbss:0x80576744; // type:object size:0x4 data:4byte +sAllocatableHeap__Q23EGG4Heap = .sbss:0x80576748; // type:object size:0x4 data:4byte +sErrorCallback__Q23EGG4Heap = .sbss:0x8057674C; // type:object size:0x4 data:4byte +sAllocCallback__Q23EGG4Heap = .sbss:0x80576750; // type:object size:0x4 data:4byte +sFreeCallback__Q23EGG4Heap = .sbss:0x80576754; // type:object size:0x4 data:4byte +sErrorCallbackArg__Q23EGG4Heap = .sbss:0x80576758; // type:object size:0x4 data:4byte +sAllocCallbackArg__Q23EGG4Heap = .sbss:0x8057675C; // type:object size:0x4 data:4byte +sFreeCallbackArg__Q23EGG4Heap = .sbss:0x80576760; // type:object size:0x4 data:4byte +sCreateCallback__Q23EGG4Heap = .sbss:0x80576764; // type:object size:0x4 data:4byte +sDestroyCallback__Q23EGG4Heap = .sbss:0x80576768; // type:object size:0x4 data:4byte lbl_80576770 = .sbss:0x80576770; // type:object size:0x8 data:4byte lbl_80576778 = .sbss:0x80576778; // type:object size:0x8 data:4byte mConfigData__Q23EGG10BaseSystem = .sbss:0x80576780; // type:object size:0x4 data:4byte @@ -49345,8 +49345,8 @@ lbl_80673A8C = .bss:0x80673A8C; // type:object size:0x1C data:byte lbl_80673AA8 = .bss:0x80673AA8; // type:object size:0x20 data:float lbl_80673AC8 = .bss:0x80673AC8; // type:object size:0x10 lbl_80673AD8 = .bss:0x80673AD8; // type:object size:0x10 -lbl_80673AE8 = .bss:0x80673AE8; // type:object size:0x10 -lbl_80673AF8 = .bss:0x80673AF8; // type:object size:0x18 +sHeapList__Q23EGG4Heap = .bss:0x80673AE8; // type:object size:0xC +sRootMutex__Q23EGG4Heap = .bss:0x80673AF8; // type:object size:0x18 lbl_80673B10 = .bss:0x80673B10; // type:object size:0x10 clear_z_tobj__29@unnamed@eggAsyncDisplay_cpp@ = .bss:0x80673B20; // type:object size:0x20 scope:local lbl_80673B40 = .bss:0x80673B40; // type:object size:0x10C0 data:4byte diff --git a/include/egg/core/eggHeap.h b/include/egg/core/eggHeap.h index 10b114e9..4d61a44a 100644 --- a/include/egg/core/eggHeap.h +++ b/include/egg/core/eggHeap.h @@ -101,7 +101,7 @@ public: /* 804957c0 */ static void free(void *memBlock, Heap *heap); /* 80495830 */ void dispose(); /* 804958a0 */ void dump(); - /* 804958b0 */ void dumpAll(); + /* 804958b0 */ static void dumpAll(); /* 804959a0 */ Heap *becomeCurrentHeap(); /* 80495a00 */ Heap *_becomeCurrentHeapWithoutLock(); @@ -138,6 +138,11 @@ public: inline int getArenaEnd() { return (int)mHeapHandle->end; } + + inline const char *getName() { + return mName; + } + /* 80673ae8 */ static nw4r::ut::List sHeapList; /* 80673af8 */ static OSMutex sRootMutex; /* 80576740 */ static Heap *sCurrentHeap; diff --git a/include/egg/prim/eggBitFlag.h b/include/egg/prim/eggBitFlag.h index 13e6c5f9..f9a9a4ae 100644 --- a/include/egg/prim/eggBitFlag.h +++ b/include/egg/prim/eggBitFlag.h @@ -14,9 +14,8 @@ public: inline void makeAllZero() { value = T(); } - inline TBitFlag() { - makeAllZero(); - } + inline TBitFlag() {} + inline TBitFlag(T value): value(value) {} inline T makeMask(u8 bit) const { return 1 << bit; } diff --git a/src/egg/core/eggColorFader.cpp b/src/egg/core/eggColorFader.cpp index f4207cf5..a0f9863b 100644 --- a/src/egg/core/eggColorFader.cpp +++ b/src/egg/core/eggColorFader.cpp @@ -6,7 +6,7 @@ /* 80497930 */ EGG::ColorFader::ColorFader(float startX, float startY, float lengthX, float lengthY, nw4r::ut::Color color, Fader::EStatus initialStatus) - : mStartX(startX), mStartY(startY), mEndX(startX + lengthX), mEndY(startY + lengthY), mFrame(0x14), mFadeTimer(0) { + : mStartX(startX), mStartY(startY), mEndX(startX + lengthX), mEndY(startY + lengthY), mFrame(0x14), mFadeTimer(0), mFlags(0) { setColor(color); setStatus(initialStatus); mFlags.setBit(1); diff --git a/src/egg/core/eggDisplay.cpp b/src/egg/core/eggDisplay.cpp index 16031605..6fb5b0f5 100644 --- a/src/egg/core/eggDisplay.cpp +++ b/src/egg/core/eggDisplay.cpp @@ -16,13 +16,13 @@ u32 Display::sTickPeriod = ((OS_BUS_CLOCK_SPEED >> 2)/125000)*300 >> 3; /* 80497570 */ Display::Display(u8 maxRetrace) : mMaxRetraces(maxRetrace), - mScreenStateFlag(), + mScreenStateFlag(0), mRetraceCount(0), mFrameCount(0), mClearColor(0x808080ff), mClearZ(0xFFFFFF), mBeginTick(0), - mFlag() + mFlag(0) { mFlag.setBit(mFlag_SetClear); mFlag.setBit(mFlag_WaitForRetrace); @@ -99,4 +99,4 @@ void Display::calcFrequency() { mBeginTick = endTick; } -} // namespace EGG \ No newline at end of file +} // namespace EGG diff --git a/src/egg/core/eggHeap.cpp b/src/egg/core/eggHeap.cpp new file mode 100644 index 00000000..620b9e95 --- /dev/null +++ b/src/egg/core/eggHeap.cpp @@ -0,0 +1,207 @@ +#include +#include +#include + +namespace EGG { + +/* 80673ae8 */ nw4r::ut::List Heap::sHeapList; +/* 80673af8 */ OSMutex Heap::sRootMutex; +/* 80576740 */ Heap *Heap::sCurrentHeap; +/* 80576744 */ int Heap::sIsHeapListInitialized; +/* 80576748 */ Heap *Heap::sAllocatableHeap; +/* 8057674c */ ErrorCallback Heap::sErrorCallback; +/* 80576750 */ HeapAllocCallback Heap::sAllocCallback; +/* 80576754 */ HeapFreeCallback Heap::sFreeCallback; +/* 80576758 */ void *Heap::sErrorCallbackArg; +/* 8057675c */ void *Heap::sAllocCallbackArg; +/* 80576760 */ void *Heap::sFreeCallbackArg; +/* 80576764 */ HeapCreateCallback Heap::sCreateCallback; +/* 80576764 */ HeapDestroyCallback Heap::sDestroyCallback; + +/* 804953f0 */ void Heap::initialize() { + nw4r::ut::List_Init(&sHeapList, 0x1c /* todo offsetof() */); + OSInitMutex(&sRootMutex); + sIsHeapListInitialized = true; +} + +/* 80495430 */ Heap::Heap(MEMiHeapHead *head) : mHeapHandle(head), mParentBlock(nullptr), mName("NoName"), mFlag() { + mFlag.value = 0; + nw4r::ut::List_Init(&mChildren, 0x8 /* todo offsetof() */); + OSLockMutex(&sRootMutex); + nw4r::ut::List_Append(&sHeapList, this); + OSUnlockMutex(&sRootMutex); +} + +/* 804954c0 */ Heap::~Heap() { + OSLockMutex(&sRootMutex); + nw4r::ut::List_Remove(&sHeapList, this); + OSUnlockMutex(&sRootMutex); +} + +/* 80495560 */ void *Heap::alloc(size_t size, s32 align, Heap *heap) { + Heap *currentHeap = sCurrentHeap; + Thread *thread = Thread::findThread(OSGetCurrentThread()); + Heap *threadHeap = nullptr; + + if (thread != nullptr && (threadHeap = thread->mAllocatableHeap, threadHeap != nullptr)) { + heap = threadHeap; + } + if (sAllocatableHeap != nullptr) { + if (heap == nullptr) { + heap = currentHeap; + } + if (heap != sAllocatableHeap) { + // 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"); + if (sErrorCallback != nullptr) { + HeapErrorArg arg; + arg.msg = "disable_but"; + arg.userdata = sErrorCallbackArg; + sErrorCallback(&arg); + } + dumpAll(); + return nullptr; + } + } + + if (heap == nullptr) { + heap = currentHeap; + } + void *ptr = nullptr; + if (heap) { + ptr = heap->alloc(size, align); + } + return ptr; +} + +/* 80495690 */ Heap *Heap::findHeap(MEMiHeapHead *head) { + Heap *heap = nullptr; + OSLockMutex(&sRootMutex); + if (sIsHeapListInitialized) { + Heap *heap2 = nullptr; + while ((heap2 = (Heap *)nw4r::ut::List_GetNext(&sHeapList, heap2))) { + if (heap2->mHeapHandle == head) { + heap = heap2; + break; + } + } + } + OSUnlockMutex(&sRootMutex); + return heap; +} + +/* 80495730 */ Heap *Heap::findParentHeap() { + Heap *retHeap = nullptr; + MEMiHeapHead *heap = MEMFindContainHeap(mHeapHandle); + if (heap) { + retHeap = findHeap(heap); + } + + return retHeap; +} + +extern "C" MEMiHeapHead *fn_803CC670(const void *memBlock); + +/* 80495780 */ Heap *Heap::findContainHeap(const void *memBlock) { + Heap *retHeap = nullptr; + MEMiHeapHead *heap = fn_803CC670(memBlock); + if (heap) { + retHeap = findHeap(heap); + } + + return retHeap; +} + +/* 804957c0 */ void Heap::free(void *ptr, Heap *heap) { + if (heap == nullptr) { + MEMiHeapHead *iheap = fn_803CC670(ptr); + if (iheap == nullptr) { + return; + } + heap = findHeap(iheap); + if (heap == nullptr) { + return; + } + } + + heap->free(ptr); +} + +/* 80495830 */ void Heap::dispose() { + mFlag.setBit(1); + Heap *heap; + while ((heap = (Heap *)nw4r::ut::List_GetFirst(&mChildren)) != nullptr) { + heap->~Heap(); + } + mFlag.resetBit(1); +} + +/* 804958a0 */ void Heap::dump() {} + +// TODO: This debugging function with stripped out error reports doesn't match yet +/* 804958b0 */ void Heap::dumpAll() { + u32 mem[2] = {0, 0}; + + OSLockMutex(&sRootMutex); + for (Heap *heap = nullptr; heap != nullptr; heap = (Heap *)nw4r::ut::List_GetNext(&sHeapList, &heap)) { + Heap *childHeap = nullptr; + Heap *parentHeap = heap->findParentHeap(); + if ((u32)heap < 0x90000000) { + mem[0] += heap->getAllocatableSize(4); + } else { + mem[1] += heap->getAllocatableSize(4); + } + + while ((childHeap = (Heap *)nw4r::ut::List_GetNext(&sHeapList, childHeap)) != nullptr) { + if (parentHeap == childHeap) { + break; + } + } + } + OSUnlockMutex(&sRootMutex); +} + +/* 804959a0 */ Heap *Heap::becomeCurrentHeap() { + OSLockMutex(&sRootMutex); + Heap *h = sCurrentHeap; + sCurrentHeap = this; + OSUnlockMutex(&sRootMutex); + return h; +} + +/* 80495a00 */ Heap *Heap::_becomeCurrentHeapWithoutLock() { + Heap *h = sCurrentHeap; + sCurrentHeap = this; + DCStoreRange(&sCurrentHeap, sizeof(sCurrentHeap)); + return h; +} + +// TODO +extern "C" void MEMInitAllocatorForHeap(Allocator *alloc, s32 align, Heap *heap); + +// TODO this could be an inline virtual function +/* 80495a40 */ void Heap::initAllocator(Allocator *alloc, s32 align) { + MEMInitAllocatorForHeap(alloc, align, this); +} + +} // namespace EGG + +/* 80495a60 */ void *operator new(size_t, void *p) { + return p; +} +/* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, u32 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) { + return EGG::Heap::alloc(size, align, nullptr); +} +/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align) { + return EGG::Heap::alloc(size, align, heap); +} From bd4b6b3f9c9c3e9dc968d27df0faa2a615916ddc Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 5 May 2024 14:12:22 +0200 Subject: [PATCH 23/25] eggThread matching --- config/SOUE01/symbols.txt | 24 +++---- configure.py | 2 +- include/egg/core/eggThread.h | 8 ++- include/rvl/OS/OSThread.h | 4 +- src/egg/core/eggThread.cpp | 125 +++++++++++++++++++++++++++++++++++ 5 files changed, 145 insertions(+), 18 deletions(-) create mode 100644 src/egg/core/eggThread.cpp diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 669414f7..81e5f50b 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -4056,8 +4056,8 @@ fn_800BD510 = .text:0x800BD510; // type:function size:0xC fn_800BD520 = .text:0x800BD520; // type:function size:0x5C fn_800BD580 = .text:0x800BD580; // type:function size:0x5C fn_800BD5E0 = .text:0x800BD5E0; // type:function size:0xC -fn_800BD5F0 = .text:0x800BD5F0; // type:function size:0x4 -fn_800BD600 = .text:0x800BD600; // type:function size:0x4 +onExit__Q23EGG6ThreadFv = .text:0x800BD5F0; // type:function size:0x4 +onEnter__Q23EGG6ThreadFv = .text:0x800BD600; // type:function size:0x4 fn_800BD610 = .text:0x800BD610; // type:function size:0x34 fn_800BD650 = .text:0x800BD650; // type:function size:0x8 fn_800BD660 = .text:0x800BD660; // type:function size:0x5C @@ -22030,11 +22030,11 @@ fn_803AC300 = .text:0x803AC300; // type:function size:0x20 __OSSystemCallVectorEnd = .text:0x803AC31C; // type:label scope:global __OSInitSystemCall = .text:0x803AC320; // type:function size:0x60 scope:global fn_803AC380 = .text:0x803AC380; // type:function size:0x4 -fn_803AC390 = .text:0x803AC390; // type:function size:0x70 +OSSetSwitchThreadCallback = .text:0x803AC390; // type:function size:0x70 __OSThreadInit = .text:0x803AC400; // type:function size:0x284 scope:global OSInitThreadQueue = .text:0x803AC690; // type:function size:0x10 scope:global -fn_803AC6A0 = .text:0x803AC6A0; // type:function size:0xC -fn_803AC6B0 = .text:0x803AC6B0; // type:function size:0x2C +OSGetCurrentThread = .text:0x803AC6A0; // type:function size:0xC +OSIsThreadTerminated = .text:0x803AC6B0; // type:function size:0x2C OSDisableScheduler = .text:0x803AC6E0; // type:function size:0x3C scope:global OSEnableScheduler = .text:0x803AC720; // type:function size:0x3C scope:global fn_803AC760 = .text:0x803AC760; // type:function size:0x68 @@ -22044,11 +22044,11 @@ fn_803AC9C0 = .text:0x803AC9C0; // type:function size:0x50 SelectThread = .text:0x803ACA10; // type:function size:0x22C scope:local __OSReschedule = .text:0x803ACC40; // type:function size:0x18 scope:global fn_803ACC60 = .text:0x803ACC60; // type:function size:0x3C -fn_803ACCA0 = .text:0x803ACCA0; // type:function size:0x26C +OSCreateThread = .text:0x803ACCA0; // type:function size:0x26C fn_803ACF10 = .text:0x803ACF10; // type:function size:0xE4 OSCancelThread = .text:0x803AD000; // type:function size:0x1D4 scope:global fn_803AD1E0 = .text:0x803AD1E0; // type:function size:0x144 -fn_803AD330 = .text:0x803AD330; // type:function size:0xA0 +OSDetachThread = .text:0x803AD330; // type:function size:0xA0 fn_803AD3D0 = .text:0x803AD3D0; // type:function size:0x29C fn_803AD670 = .text:0x803AD670; // type:function size:0x18C OSSleepThread = .text:0x803AD800; // type:function size:0xF0 scope:global @@ -26253,7 +26253,7 @@ getSize__Q23EGG10AssertHeapFv = .text:0x80496810; // type:function size:0x8 getHeapKind__Q23EGG10AssertHeapCFv = .text:0x80496820; // type:function size:0x8 __ct__Q23EGG8DisposerFv = .text:0x80496830; // type:function size:0x54 __dt__Q23EGG8DisposerFv = .text:0x80496890; // type:function size:0x74 -__ct__Q23EGG6ThreadFUliiPQ23EGG4Heap = .text:0x80496910; // type:function size:0xD0 +__ct__Q23EGG6ThreadFUiiiPQ23EGG4Heap = .text:0x80496910; // type:function size:0xD0 __ct__Q23EGG6ThreadFP8OSThreadi = .text:0x804969E0; // type:function size:0x74 __dt__Q23EGG6ThreadFv = .text:0x80496A60; // type:function size:0xBC findThread__Q23EGG6ThreadFP8OSThread = .text:0x80496B20; // type:function size:0x64 @@ -26262,7 +26262,7 @@ setThreadCurrentHeap__Q23EGG6ThreadFPQ23EGG4Heap = .text:0x80496BD0; // type:fun switchThreadCallback__Q23EGG6ThreadFP8OSThreadP8OSThread = .text:0x80496C70; // type:function size:0xEC setCommonMesgQueue__Q23EGG6ThreadFiPQ23EGG4Heap = .text:0x80496D60; // type:function size:0x5C start__Q23EGG6ThreadFPv = .text:0x80496DC0; // type:function size:0x10 -run__Q23EGG6ThreadFPv = .text:0x80496DD0; // type:function size:0x8 +run__Q23EGG6ThreadFv = .text:0x80496DD0; // type:function size:0x8 FUN_80496de0 = .text:0x80496DE0; // type:function size:0x44 FUN_80496e30 = .text:0x80496E30; // type:function size:0xD8 FUN_80496f10 = .text:0x80496F10; // type:function size:0x1CC @@ -37103,7 +37103,7 @@ lbl_8056E9A0 = .data:0x8056E9A0; // type:object size:0x30 lbl_8056E9D0 = .data:0x8056E9D0; // type:object size:0x30 lbl_8056EA00 = .data:0x8056EA00; // type:object size:0x30 lbl_8056EA30 = .data:0x8056EA30; // type:object size:0x10 -lbl_8056EA40 = .data:0x8056EA40; // type:object size:0x18 +__vt__Q23EGG6Thread = .data:0x8056EA40; // type:object size:0x18 lbl_8056EA58 = .data:0x8056EA58; // type:object size:0x70 __vt__Q23EGG7Display = .data:0x8056EAC8; // type:object size:0x20 __vt__Q23EGG10ColorFader = .data:0x8056EAE8; // type:object size:0x24 @@ -40890,7 +40890,7 @@ lbl_8057675C = .sbss:0x8057675C; // type:object size:0x4 data:4byte lbl_80576760 = .sbss:0x80576760; // type:object size:0x4 data:4byte lbl_80576764 = .sbss:0x80576764; // type:object size:0x4 data:4byte lbl_80576768 = .sbss:0x80576768; // type:object size:0x8 data:4byte -lbl_80576770 = .sbss:0x80576770; // type:object size:0x8 data:4byte +sOldSwitchThreadCallback__Q23EGG6Thread = .sbss:0x80576770; // type:object size:0x4 data:4byte lbl_80576778 = .sbss:0x80576778; // type:object size:0x8 data:4byte mConfigData__Q23EGG10BaseSystem = .sbss:0x80576780; // type:object size:0x4 data:4byte sTickPeriod__Q23EGG7Display = .sbss:0x80576788; // type:object size:0x4 data:4byte @@ -49347,7 +49347,7 @@ lbl_80673AC8 = .bss:0x80673AC8; // type:object size:0x10 lbl_80673AD8 = .bss:0x80673AD8; // type:object size:0x10 lbl_80673AE8 = .bss:0x80673AE8; // type:object size:0x10 lbl_80673AF8 = .bss:0x80673AF8; // type:object size:0x18 -lbl_80673B10 = .bss:0x80673B10; // type:object size:0x10 +sThreadList__Q23EGG6Thread = .bss:0x80673B10; // type:object size:0xC clear_z_tobj__29@unnamed@eggAsyncDisplay_cpp@ = .bss:0x80673B20; // type:object size:0x20 scope:local lbl_80673B40 = .bss:0x80673B40; // type:object size:0x10C0 data:4byte ident__Q23EGG9Matrix34f = .bss:0x80674C00; // type:object size:0x30 diff --git a/configure.py b/configure.py index 830c0c10..ad9079a4 100644 --- a/configure.py +++ b/configure.py @@ -350,7 +350,7 @@ config.libs = [ Object(NonMatching, "egg/core/eggFrmHeap.cpp"), Object(NonMatching, "egg/core/eggAssertHeap.cpp"), Object(NonMatching, "egg/core/eggDisposer.cpp"), - Object(NonMatching, "egg/core/eggThread.cpp"), + Object(Matching, "egg/core/eggThread.cpp"), Object(NonMatching, "egg/core/eggUnk.cpp"), Object(NonMatching, "egg/core/eggSystem.cpp"), Object(Matching, "egg/core/eggDisplay.cpp"), diff --git a/include/egg/core/eggThread.h b/include/egg/core/eggThread.h index 8895b95d..048cb88e 100644 --- a/include/egg/core/eggThread.h +++ b/include/egg/core/eggThread.h @@ -11,9 +11,9 @@ namespace EGG { class Thread { public: // vtable: 0x00 | 8056ea40 /* 0x08 | 80496a60 */ virtual ~Thread(); - /* 0x0C | 80496dd0 */ virtual void *run(); - /* 0x10 | 800bd600 */ virtual void onEnter(); - /* 0x14 | 800bd5f0 */ virtual void onExit(); + /* 0x0C | 80496dd0 */ virtual void *run() { return nullptr; } + /* 0x10 | 800bd600 */ virtual void onEnter() {} + /* 0x14 | 800bd5f0 */ virtual void onExit() {} public: /* 0x04 */ Heap *mContainingHeap; @@ -24,6 +24,8 @@ public: /* 0x34 */ void *mStackMemory; /* 0x38 */ u32 mStackSize; /* 0x3C */ Heap *mAllocatableHeap; + // TODO from the usage in eggThread this really looks like + // it's stashed thread that's restored when switching threads /* 0x40 */ Heap *mCurrentHeap; /* 0x44 */ nw4r::ut::Node mLink; diff --git a/include/rvl/OS/OSThread.h b/include/rvl/OS/OSThread.h index b81078b3..dfe07d5f 100644 --- a/include/rvl/OS/OSThread.h +++ b/include/rvl/OS/OSThread.h @@ -47,8 +47,8 @@ typedef struct OSThread { OSMutexQueue mutexQueue; // at 0x2F4 struct OSThread *nextActive; // at 0x2FC struct OSThread *prevActive; // at 0x300 - u32 *stackBegin; // at 0x304 - u32 *stackEnd; // at 0x308 + void *stackBegin; // at 0x304 + void *stackEnd; // at 0x308 s32 error; // at 0x30C void *specific[2]; // at 0x310 } OSThread; diff --git a/src/egg/core/eggThread.cpp b/src/egg/core/eggThread.cpp new file mode 100644 index 00000000..36f44d4d --- /dev/null +++ b/src/egg/core/eggThread.cpp @@ -0,0 +1,125 @@ +#include + +namespace EGG { + +/* 80673b10 */ nw4r::ut::List Thread::sThreadList; +/* 80576770 */ void (*Thread::sOldSwitchThreadCallback)(OSThread *, OSThread *); + + +/* 80496910 */ Thread::Thread(u32 stackSize, int msgCount, int priority, Heap *heap) { + if (heap == nullptr) { + heap = Heap::sCurrentHeap; + } + + mContainingHeap = heap; + mStackSize = ROUND_DOWN(stackSize, 0x20); + mStackMemory = Heap::alloc(ROUND_DOWN(stackSize, 0x20), 0x20, heap); + mOSThread = Heap::alloc(mContainingHeap, 0x20); + OSCreateThread(mOSThread, start, this, (char *)mStackMemory + mStackSize, mStackSize, priority, 1); + mAllocatableHeap = nullptr; + mCurrentHeap = nullptr; + setCommonMesgQueue(msgCount, mContainingHeap); +} + +/* 804969e0 */ Thread::Thread(OSThread *osThread, int msgCount) { + mContainingHeap = nullptr; + mOSThread = osThread; + mStackSize = (u8 *)osThread->stackBegin - (u8 *)osThread->stackEnd; + mStackMemory = osThread->stackEnd; + mAllocatableHeap = nullptr; + mCurrentHeap = nullptr; + setCommonMesgQueue(msgCount, Heap::sCurrentHeap); +} + +/* 80496a60 */ Thread::~Thread() { + nw4r::ut::List_Remove(&sThreadList, this); + if (mContainingHeap != nullptr) { + if (!OSIsThreadTerminated(mOSThread)) { + OSDetachThread(mOSThread); + OSCancelThread(mOSThread); + } + Heap::free(mStackMemory, mContainingHeap); + Heap::free(mOSThread, mContainingHeap); + } + Heap::free(mMesgBuffer, nullptr); +} + +/* 80496b20 */ Thread *Thread::findThread(OSThread *thread) { + Thread *ptr = nullptr; + while ((ptr = (Thread *)nw4r::ut::List_GetNext(&sThreadList, ptr)) != nullptr) { + if (ptr->mOSThread == thread) { + return ptr; + } + } + return nullptr; +} + +/* 80496b90 */ void Thread::initialize() { + // TODO offsetof + nw4r::ut::List_Init(&sThreadList, 0x44); + sOldSwitchThreadCallback = OSSetSwitchThreadCallback(switchThreadCallback); +} + +/* 80496bd0 */ void Thread::setThreadCurrentHeap(Heap *heap) { + OSDisableScheduler(); + OSThread *myThread = mOSThread; + OSThread *currentThread = OSGetCurrentThread(); + if (currentThread != myThread) { + mCurrentHeap = heap; + } else { + if (heap != nullptr) { + if (mCurrentHeap == nullptr) { + mCurrentHeap = Heap::sCurrentHeap; + } + heap->_becomeCurrentHeapWithoutLock(); + } else { + if (mCurrentHeap != nullptr) { + mCurrentHeap->_becomeCurrentHeapWithoutLock(); + mCurrentHeap = nullptr; + } + } + } + + OSEnableScheduler(); +} + +/* 80496c70 */ void Thread::switchThreadCallback(OSThread *from, OSThread *to) { + Thread *fromThread = from != nullptr ? findThread(from) : nullptr; + Thread *toThread = to != nullptr ? findThread(to) : nullptr; + + if (fromThread != nullptr) { + fromThread->onExit(); + if (fromThread->mCurrentHeap != nullptr) { + Heap *curr = Heap::sCurrentHeap; + fromThread->mCurrentHeap->_becomeCurrentHeapWithoutLock(); + fromThread->mCurrentHeap = curr; + } + } + + if (toThread != nullptr) { + if (toThread->mCurrentHeap != nullptr) { + Heap *curr = Heap::sCurrentHeap; + toThread->mCurrentHeap->_becomeCurrentHeapWithoutLock(); + toThread->mCurrentHeap = curr; + } + toThread->onEnter(); + } + + if (sOldSwitchThreadCallback != nullptr) { + (sOldSwitchThreadCallback)(from, to); + } +} + +/* 80496d60 */ void Thread::setCommonMesgQueue(int mesgCount, Heap *heap) { + mMesgCount = mesgCount; + mMesgBuffer = Heap::alloc(mesgCount, heap); + OSInitMessageQueue(&mMesgQueue, mMesgBuffer, mMesgCount); + nw4r::ut::List_Append(&sThreadList, this); +} + +/* 80496dc0 */ void *Thread::start(void *arg) { + Thread *thread = static_cast(arg); + return thread->run(); +} + +} // namespace EGG From 759c5b5a94d551ad1b86ddbd2d78de609f4b776a Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 5 May 2024 12:22:37 -0400 Subject: [PATCH 24/25] Prepping merge --- config/SOUE01/symbols.txt | 8 ++++---- include/d/d_heap_alloc.h | 4 ++-- include/egg/core/eggHeap.h | 12 +++++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index a405ceb1..80468d2b 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -26206,10 +26206,10 @@ becomeCurrentHeap__Q23EGG4HeapFv = .text:0x804959A0; // type:function size:0x58 _becomeCurrentHeapWithoutLock__Q23EGG4HeapFv = .text:0x80495A00; // type:function size:0x3C initAllocator__Q23EGG4HeapFPQ23EGG9Allocatorl = .text:0x80495A40; // type:function size:0x14 __nw__FUlPv = .text:0x80495A60; // type:function size:0x8 -__nw__FUlPQ23EGG4HeapUi = .text:0x80495A70; // type:function size:0x10 -__nwa__FUl = .text:0x80495A80; // type:function size:0x10 -__nwa__FUlUi = .text:0x80495A90; // type:function size:0x8 -__nwa__FUlPQ23EGG4HeapUi = .text:0x80495AA0; // type:function size:0x10 +__nw__FUlPQ23EGG4Heapi = .text:0x80495A70; // type:function size:0x10 +__nw__FUlPQ23EGG9Allocator = .text:0x80495A80; // type:function size:0x10 +__nwa__FUli = .text:0x80495A90; // type:function size:0x8 +__nwa__FUlPQ23EGG4Heapi = .text:0x80495AA0; // type:function size:0x10 __ct__Q23EGG7ExpHeapFP12MEMiHeapHead = .text:0x80495AB0; // type:function size:0x3C __dt__Q23EGG7ExpHeapFv = .text:0x80495AF0; // type:function size:0x74 create__Q23EGG7ExpHeapFPvUlUs = .text:0x80495B70; // type:function size:0xB8 diff --git a/include/d/d_heap_alloc.h b/include/d/d_heap_alloc.h index 4fd3a47a..cbf43c5a 100644 --- a/include/d/d_heap_alloc.h +++ b/include/d/d_heap_alloc.h @@ -50,8 +50,8 @@ public: } virtual ~dHeapAllocatorBase() {} - virtual void onAlloc(EGG::HeapAllocArg *arg) {}; - virtual void onFree(EGG::HeapFreeArg *arg) {}; + virtual void onAlloc(EGG::HeapAllocArg *arg){}; + virtual void onFree(EGG::HeapFreeArg *arg){}; /* 0x04 */ bool mCallbacksInitialized; /* 0x08 */ EGG::HeapAllocCallback mPreviousAllocCallback; diff --git a/include/egg/core/eggHeap.h b/include/egg/core/eggHeap.h index 1740a1e4..24faec83 100644 --- a/include/egg/core/eggHeap.h +++ b/include/egg/core/eggHeap.h @@ -153,11 +153,13 @@ public: /* 80576760 */ static void *sFreeCallbackArg; /* 80576764 */ static HeapCreateCallback sCreateCallback; /* 80576764 */ static HeapDestroyCallback sDestroyCallback; +}; +} // namespace EGG - /* 80495a60 */ void *operator new(size_t, void *p); - /* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, u32 align); - /* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc); - /* 80495a90 */ void *operator new[](size_t size, u32 align); - /* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, u32 align); +/* 80495a60 */ void *operator new(size_t, void *p); +/* 80495a70 */ void *operator new(size_t size, EGG::Heap *heap, int align); +/* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc); +/* 80495a90 */ void *operator new[](size_t size, int align); +/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align); #endif From af59a51db3a6959561cc91d90fef4fa27f57956c Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 5 May 2024 12:27:34 -0400 Subject: [PATCH 25/25] fix up align type (Ui -> i) --- config/SOUE01/symbols.txt | 4 ++-- include/egg/core/eggHeap.h | 6 +++--- src/egg/core/eggHeap.cpp | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index a1226acc..d3a1ee7f 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -26206,9 +26206,9 @@ becomeCurrentHeap__Q23EGG4HeapFv = .text:0x804959A0; // type:function size:0x58 _becomeCurrentHeapWithoutLock__Q23EGG4HeapFv = .text:0x80495A00; // type:function size:0x3C initAllocator__Q23EGG4HeapFPQ23EGG9Allocatori = .text:0x80495A40; // type:function size:0x14 __nw__FUlPv = .text:0x80495A60; // type:function size:0x8 -__nw__FUlPQ23EGG4HeapUi = .text:0x80495A70; // type:function size:0x10 +__nw__FUlPQ23EGG4Heapi = .text:0x80495A70; // type:function size:0x10 __nw__FUlPQ23EGG9Allocator = .text:0x80495A80; // type:function size:0x10 -__nwa__FUlUi = .text:0x80495A90; // type:function size:0x8 +__nwa__FUli = .text:0x80495A90; // type:function size:0x8 __nwa__FUlPQ23EGG4Heapi = .text:0x80495AA0; // type:function size:0x10 __ct__Q23EGG7ExpHeapFP12MEMiHeapHead = .text:0x80495AB0; // type:function size:0x3C __dt__Q23EGG7ExpHeapFv = .text:0x80495AF0; // type:function size:0x74 diff --git a/include/egg/core/eggHeap.h b/include/egg/core/eggHeap.h index 6043c60d..2e33d8a7 100644 --- a/include/egg/core/eggHeap.h +++ b/include/egg/core/eggHeap.h @@ -161,9 +161,9 @@ public: } // namespace EGG /* 80495a60 */ void *operator new(size_t, void *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); /* 80495a80 */ void *operator new(size_t size, EGG::Allocator *alloc); -/* 80495a90 */ void *operator new[](size_t size, u32 align); -/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, u32 align); +/* 80495a90 */ void *operator new[](size_t size, int align); +/* 80495aa0 */ void *operator new[](size_t size, EGG::Heap *heap, int align); #endif diff --git a/src/egg/core/eggHeap.cpp b/src/egg/core/eggHeap.cpp index 620b9e95..a7a0dc7a 100644 --- a/src/egg/core/eggHeap.cpp +++ b/src/egg/core/eggHeap.cpp @@ -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) {