Compare commits

...

1 Commits

Author SHA1 Message Date
coah
8ebe841073 cleanup: rename SaveDataManager title-cache helpers
Rename address-suffixed title-cache helpers to readable names without
changing codegen. DOL sha1 unchanged.
2026-10-01 16:48:23 -05:00
6 changed files with 26 additions and 26 deletions

View File

@@ -2042,8 +2042,8 @@ isEqualChannel__Q33ipl8savedata7ManagerFUxUx = .text:0x813594B0; // type:functio
isDefaultChannel__Q33ipl8savedata7ManagerFUlUl = .text:0x8135954C; // type:function size:0x50
updateVersion__Q33ipl8savedata7ManagerFUlUl = .text:0x8135959C; // type:function size:0xD4
setDefaultSDMenu__Q33ipl8savedata7ManagerFv = .text:0x81359670; // type:function size:0x48 scope:local
iplSavedata_813596B8__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
iplSavedata_813597A0 = .text:0x813597A0; // type:function size:0x40 scope:local
pushTitleCache__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
isTitleCached = .text:0x813597A0; // type:function size:0x40
nand_error_handling__Q33ipl8savedata7ManagerFi = .text:0x813597E0; // type:function size:0xDC
__ct__Q33ipl7channel9RsoThreadFPQ23EGG4Heap = .text:0x813598BC; // type:function size:0x6C
__dt__Q33ipl7channel9RsoThreadFv = .text:0x81359928; // type:function size:0x70

View File

@@ -24,7 +24,7 @@ namespace ipl {
class Manager;
}
namespace savedata {
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
class Manager {
public:
@@ -87,7 +87,7 @@ namespace ipl {
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
void iplSavedata_813596B8(ESTitleId titleId);
void pushTitleCache(ESTitleId titleId);
private:
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
@@ -184,7 +184,7 @@ namespace ipl {
u8 unused_0x504[28];
friend class channel::Manager;
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
};
} // namespace savedata
} // namespace ipl

View File

@@ -2390,7 +2390,7 @@ namespace ipl {
if (sceneID == SCENE_UNLOCKED_TITLE || sceneID == SCENE_LOCKED_TITLE) {
System::getSaveData()->setPrevPage(mChanPage);
System::getSaveData()->iplSavedata_813596B8(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
System::getSaveData()->pushTitleCache(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
mpSaveDataFile = System::getSaveData()->flushAsync(System::getMem2App());
}
}

View File

@@ -1496,7 +1496,7 @@ namespace ipl {
mpNandTitleInfo[usageIndex].curTitleId, &page, &channelIndex) == 0) {
continue;
}
if (iplSavedata_813597A0(System::getSaveData(),
if (isTitleCached(System::getSaveData(),
mpNandTitleInfo[usageIndex].curTitleId) != FALSE) {
continue;
}

View File

@@ -1358,7 +1358,7 @@ extern "C" void iplSDChannelTitle_813E8A20(SDChannelTitle* scene, int nextScene)
int page;
int index;
if (System::getChannelManager()->hasChannel(scene->mTitleId, &page, &index)) {
System::getSaveData()->iplSavedata_813596B8(scene->mTitleId);
System::getSaveData()->pushTitleCache(scene->mTitleId);
}
System::getSaveData()->getSDPrevPage() = scene->mPage;
EGG::Heap* saveHeap = System::getMem2App();

View File

@@ -1132,7 +1132,7 @@ namespace ipl {
}
#ifdef __MWERKS__
asm void Manager::iplSavedata_813596B8(register ESTitleId titleId) {
asm void Manager::pushTitleCache(register ESTitleId titleId) {
nofralloc
lis r7, 0x4841
lis r4, 1
@@ -1146,44 +1146,44 @@ namespace ipl {
xor r0, r5, r8
xor r4, r6, r4
or. r0, r4, r0
bne iplSavedata_813596B8_L1
bne pushTitleCache_L1
blr
iplSavedata_813596B8_L1:
pushTitleCache_L1:
addis r0, r5, -1
cmplwi r0, 1
beq iplSavedata_813596B8_L2
beq pushTitleCache_L2
cmplwi r0, 3
beq iplSavedata_813596B8_L2
beq pushTitleCache_L2
cmplwi r0, 4
beq iplSavedata_813596B8_L2
beq pushTitleCache_L2
cmplwi r0, 6
bnelr
iplSavedata_813596B8_L2:
pushTitleCache_L2:
li r0, 0x30
li r9, 0
li r4, 0
mtctr r0
iplSavedata_813596B8_L3:
pushTitleCache_L3:
add r7, r3, r4
lwz r0, 0x340(r7)
lwz r7, 0x344(r7)
xor r0, r5, r0
xor r7, r6, r7
or. r0, r7, r0
beq iplSavedata_813596B8_L4
beq pushTitleCache_L4
addi r9, r9, 1
addi r4, r4, 8
bdnz iplSavedata_813596B8_L3
iplSavedata_813596B8_L4:
bdnz pushTitleCache_L3
pushTitleCache_L4:
cmpwi r9, 0x30
bne iplSavedata_813596B8_L5
bne pushTitleCache_L5
li r9, 0x2f
iplSavedata_813596B8_L5:
pushTitleCache_L5:
slwi r4, r9, 3
mtctr r9
cmpwi r9, 0
ble iplSavedata_813596B8_L6
iplSavedata_813596B8_L7:
ble pushTitleCache_L6
pushTitleCache_L7:
addi r0, r9, -1
add r7, r3, r4
slwi r0, r0, 3
@@ -1194,14 +1194,14 @@ namespace ipl {
lwz r8, 0x344(r8)
stw r8, 0x344(r7)
stw r0, 0x340(r7)
bdnz iplSavedata_813596B8_L7
iplSavedata_813596B8_L6:
bdnz pushTitleCache_L7
pushTitleCache_L6:
stw r6, 0x344(r3)
stw r5, 0x340(r3)
blr
}
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId) {
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId) {
Manager* savedataManager = static_cast<Manager*>(manager);
for (int index = 0; index < MAX_CHANNEL_TOTAL; index++) {
if (savedataManager->mData.titleCache[0][index] == titleId) {