Compare commits

...

1 Commits

Author SHA1 Message Date
coah
c0bfe74e5a match(SaveDataManager): decompile getNumValidChannel
Exact match (23/23, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.

Adds ChannelSlot/ChannelPage overlays (slots at +0x30, page stride 0xC0)
so the loop uses typed .valid/.titleId instead of raw byte loads.
2026-10-01 18:21:09 -05:00
2 changed files with 35 additions and 28 deletions

View File

@@ -26,6 +26,18 @@ namespace ipl {
namespace savedata { namespace savedata {
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId); extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
struct ChannelSlot {
u8 valid; // 0x00 (primaryType)
u8 pad[3]; // 0x01
s32 titleId; // 0x04 (sceneID)
u8 rest[8]; // 0x08
};
struct ChannelPage {
u8 pad[0x30];
ChannelSlot slots[MAX_CHANNEL_INDEX]; // 0x30
};
class Manager { class Manager {
public: public:
Manager(EGG::Heap* heap); Manager(EGG::Heap* heap);

View File

@@ -230,34 +230,29 @@ namespace ipl {
blr blr
} }
asm int Manager::getNumValidChannel() const { int Manager::getNumValidChannel() const {
nofralloc const ChannelSlot* q;
li r9, 0 int dens = 12;
li r10, 0 const ChannelPage* p;
li r4, 0 int slot;
li r0, 0xc int count = 0;
getNumValidChannel_L1: int page;
add r8, r3, r4 u8 flag;
li r5, 0 s32 val;
mtctr r0 for (page = 0; page < 4; page++) {
getNumValidChannel_L2: p = (const ChannelPage*)((const u8*)this + page * 0xc0);
add r7, r8, r5 for (slot = 0; slot < dens; slot++) {
lbz r6, 0x30(r7) q = &p->slots[slot];
cmpwi r6, 0 flag = q->valid;
beq getNumValidChannel_L3 if (flag != 0) {
lwz r6, 0x34(r7) val = q->titleId;
cmpwi r6, 0 if (val != 0) {
beq getNumValidChannel_L3 count++;
addi r9, r9, 1 }
getNumValidChannel_L3: }
addi r5, r5, 0x10 }
bdnz getNumValidChannel_L2 }
addi r10, r10, 1 return count;
addi r4, r4, 0xc0
cmpwi r10, 4
blt getNumValidChannel_L1
mr r3, r9
blr
} }
BOOL Manager::isResetAcceptable() { BOOL Manager::isResetAcceptable() {