Compare commits
9 Commits
linkgap-ct
...
cleanup/er
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
928026a802 | ||
|
|
00013016df | ||
|
|
3e279ef189 | ||
|
|
32417fe8a2 | ||
|
|
2d9e3ee14a | ||
|
|
23db5e05e1 | ||
|
|
741c9263e3 | ||
|
|
29fe1efaf2 | ||
|
|
45aaeb16b2 |
@@ -5159,7 +5159,7 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
|
||||
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
|
||||
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
|
||||
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFP12RakuProgress = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
|
||||
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
|
||||
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
|
||||
@@ -16150,6 +16150,11 @@ lbl_8164EF14 = .data:0x8164EF14; // type:object size:0x34
|
||||
__vt__Q33ipl5scene27CsChanTtlButtonEventHandler = .data:0x8164EF48; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene24ChannelTitleEventHandler = .data:0x8164EF64; // type:object size:0x18
|
||||
__vt__Q33ipl5scene12ChannelTitle = .data:0x8164EF7C; // type:object size:0x68
|
||||
lbl_8164EFE4 = .data:0x8164EFE4; // type:object size:0x5C
|
||||
lbl_8164F040 = .data:0x8164F040; // type:object size:0x18
|
||||
lbl_8164F058 = .data:0x8164F058; // type:object size:0x20
|
||||
lbl_8164F078 = .data:0x8164F078; // type:object size:0x20
|
||||
lbl_8164F098 = .data:0x8164F098; // type:object size:0x20
|
||||
@10125 = .data:0x8164F0B8; // type:object size:0xD scope:local data:string
|
||||
...data.0 = .data:0x8164F0B8; // type:label scope:local
|
||||
@10126 = .data:0x8164F0C5; // type:object size:0xD scope:local data:string
|
||||
|
||||
@@ -772,7 +772,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("channelTitle", [
|
||||
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("faceSelect", [
|
||||
@@ -877,7 +877,7 @@ config.libs = [
|
||||
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
]
|
||||
|
||||
@@ -34,14 +34,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -145,7 +145,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int unk_0x54;
|
||||
int mAnimWait;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace ipl {
|
||||
|
||||
int mIPLState; // 0x04
|
||||
volatile BS2State mState; // 0x08
|
||||
bool unk_0x0C;
|
||||
bool unk_0x0D;
|
||||
bool unk_0x0E;
|
||||
bool unk_0x0F;
|
||||
bool mbTickEnabled; // 0x0C
|
||||
bool mbUpdateRequested; // 0x0D
|
||||
bool mbAbortRequested; // 0x0E
|
||||
bool mbRestartRequested; // 0x0F
|
||||
bool mbIsDiagDisc; // 0x10
|
||||
bool mbIncludesSeatTitles; // 0x11
|
||||
u8* mpBannerBuffer; // 0x14
|
||||
|
||||
@@ -60,9 +60,9 @@ namespace ipl {
|
||||
|
||||
int mMessageID; // 0x08
|
||||
|
||||
int unk_0x0C;
|
||||
int unk_0x10;
|
||||
char unk_0x14[4];
|
||||
int mArg2;
|
||||
int mArg3;
|
||||
char mArg1[4];
|
||||
|
||||
u8* mpArcData; // 0x18
|
||||
u32 mArcSize; // 0x1C
|
||||
|
||||
@@ -145,6 +145,13 @@ namespace ipl {
|
||||
mpCommonFile = commonFile;
|
||||
mpLangFile = langFile;
|
||||
}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LangFile() {}
|
||||
virtual void read() {}
|
||||
virtual bool isFinished() { return false; }
|
||||
virtual int checkData() { return 0; }
|
||||
virtual bool isFatalError() { return false; }
|
||||
#else
|
||||
virtual ~LangFile(); // 0x08
|
||||
|
||||
virtual void read(); // 0x0C
|
||||
@@ -152,6 +159,7 @@ namespace ipl {
|
||||
virtual bool isFinished(); // 0x14
|
||||
virtual int checkData(); // 0x18
|
||||
virtual bool isFatalError(); // 0x1C
|
||||
#endif
|
||||
|
||||
File* getCmnFile() const { return mpCommonFile; }
|
||||
File* getLangFile() const { return mpLangFile; }
|
||||
@@ -165,7 +173,11 @@ namespace ipl {
|
||||
public:
|
||||
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
|
||||
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LayoutFile() {} // 0x08
|
||||
#else
|
||||
virtual ~LayoutFile(); // 0x08
|
||||
#endif
|
||||
};
|
||||
} // namespace nand
|
||||
} // namespace ipl
|
||||
|
||||
@@ -205,7 +205,7 @@ typedef struct _ziUwdNode {
|
||||
|
||||
struct __zi8_work_data_s {
|
||||
ziU8 unk_0x00;
|
||||
ziU8 unk_0x01;
|
||||
ziU8 countOnly; // 0x01
|
||||
ziU8 unk_0x02[2];
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x17;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 unk_0x1A;
|
||||
ziU16 separator; // 0x1A
|
||||
ziU8 unk_0x1C[3];
|
||||
ziU8 unk_0x1F;
|
||||
ziU16 unk_0x20[0x40];
|
||||
@@ -283,7 +283,7 @@ struct __zi8_work_data_s {
|
||||
ziU16 unk_0x17EA;
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* unk_0x17F0;
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||
ziU16 unk_0x1874;
|
||||
ziU8 unk_0x1876;
|
||||
|
||||
@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
|
||||
}
|
||||
|
||||
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
|
||||
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
|
||||
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
|
||||
++spelling;
|
||||
}
|
||||
if (!*spelling || spelling == end) {
|
||||
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
|
||||
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
|
||||
return 1;
|
||||
}
|
||||
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
|
||||
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
|
||||
break;
|
||||
}
|
||||
if (*spelling != *candidate) {
|
||||
@@ -2868,7 +2868,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
ziU8 count;
|
||||
ziWChar spacedElements[256];
|
||||
struct { ziWChar separator; } savedState;
|
||||
savedState.separator = ZI_WORK->unk_0x1A;
|
||||
savedState.separator = ZI_WORK->separator;
|
||||
if (elementCount <= 1 || !charCount) {
|
||||
return elementCount;
|
||||
}
|
||||
@@ -2881,9 +2881,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
if (spacedIndex == elementCount) {
|
||||
return elementCount;
|
||||
}
|
||||
ZI_WORK->unk_0x1A = 0xF360;
|
||||
ZI_WORK->separator = 0xF360;
|
||||
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
|
||||
ZI_WORK->unk_0x1A = savedState.separator;
|
||||
ZI_WORK->separator = savedState.separator;
|
||||
spacedIndex = elementIndex = count = 0;
|
||||
while (charCount && elementIndex < elementCount) {
|
||||
if (spacedElements[spacedIndex] == 0xF360) {
|
||||
|
||||
@@ -306,7 +306,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
@@ -316,30 +316,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) break;
|
||||
status = 0;
|
||||
if (count <= 1 && language == 0x36) break;
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
}
|
||||
}
|
||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||
mode = 0;
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize != 0) {
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
|
||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEFF2) {
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -21,7 +21,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x0A = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
ZI_WORK->unk_0x1A = 0x20;
|
||||
ZI_WORK->separator = 0x20;
|
||||
ZI_WORK->unk_0x1C[2] = 0;
|
||||
ZI_WORK->unk_0x1B30 = 0;
|
||||
ZI_WORK->unk_0x1B3A = 0;
|
||||
|
||||
@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
|
||||
}
|
||||
if (pdst[k - 1] != 0xF360 &&
|
||||
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
|
||||
pdst[k++] = ZI_WORK->unk_0x1A;
|
||||
pdst[k++] = ZI_WORK->separator;
|
||||
}
|
||||
psrc += i;
|
||||
n -= i;
|
||||
|
||||
@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
|
||||
u32 buffer32[0xFB00];
|
||||
}; // 0x00
|
||||
|
||||
u32 unk_0x3EC00;
|
||||
u32 unk_0x3EC04;
|
||||
u32 size; // 0x3EC00
|
||||
u32 offset; // 0x3EC04
|
||||
BOOL allocated; // 0x3EC08
|
||||
u8 unk_0x3EC0C[0x34];
|
||||
} CDBCryptBuf;
|
||||
|
||||
@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
goto open_result_ready;
|
||||
open_location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
} else {
|
||||
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return err;
|
||||
}
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
goto result_ready;
|
||||
location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
} else {
|
||||
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return result;
|
||||
}
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
|
||||
if (cryptBuf->unk_0x3EC00 < unk) {
|
||||
u32 unk = cryptBuf->size - cryptBuf->offset;
|
||||
if (cryptBuf->size < unk) {
|
||||
unk = 0;
|
||||
}
|
||||
|
||||
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
}
|
||||
|
||||
if (unk != 0) {
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
|
||||
cryptBuf->unk_0x3EC04 += unk;
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
|
||||
cryptBuf->offset += unk;
|
||||
}
|
||||
|
||||
if (readSize != NULL) {
|
||||
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
|
||||
if (cryptBuf != NULL) {
|
||||
switch (seek) {
|
||||
case CDB_SEEK_BEGIN: {
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset += offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_END: {
|
||||
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
|
||||
cryptBuf->offset = (cryptBuf->size - 1) - offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_CUR: {
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
cryptBuf->offset += offset;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
|
||||
return cryptBuf->offset - sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <private/os.h>
|
||||
#include <private/wpad.h>
|
||||
|
||||
#pragma dont_instantiate ipl::math::HermiteIntp<float>
|
||||
|
||||
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(0) {
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
|
||||
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
@@ -114,10 +114,10 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDButton::calc() {
|
||||
if (unk_0x54 == 1) {
|
||||
if (mAnimWait == 1) {
|
||||
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
|
||||
reset_gui();
|
||||
unk_0x54 = 0;
|
||||
mAnimWait = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -347,7 +347,7 @@ namespace ipl {
|
||||
switch (animNo) {
|
||||
case IDANIM_HELP_BTN_CLICK: {
|
||||
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
|
||||
unk_0x54 = 1;
|
||||
mAnimWait = 1;
|
||||
break;
|
||||
}
|
||||
case IDANIM_ARROW_RIGHT_CLICK: {
|
||||
|
||||
@@ -59,8 +59,7 @@ public:
|
||||
virtual ~RakuRakuThread();
|
||||
virtual void* Run();
|
||||
virtual void unk_0x2C() = 0;
|
||||
void syncRakuProgress();
|
||||
static void progressCallback(RakuProgress* progress);
|
||||
static void syncRakuProgress(RakuProgress* progress);
|
||||
void destroy();
|
||||
int start();
|
||||
int getState();
|
||||
@@ -77,19 +76,15 @@ private:
|
||||
MEMHeapHandle mHeap;
|
||||
};
|
||||
|
||||
void RakuRakuThread::syncRakuProgress() {
|
||||
void RakuRakuThread::syncRakuProgress(RakuProgress* progress) {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
sRakuStatus = *(RakuProgress*)this;
|
||||
sRakuStatus = *progress;
|
||||
OSTime time = OSGetTime();
|
||||
startTimeHigh = time >> 32;
|
||||
startTimeLow = time;
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
|
||||
void RakuRakuThread::progressCallback(RakuProgress* progress) {
|
||||
((RakuRakuThread*)progress)->syncRakuProgress();
|
||||
}
|
||||
|
||||
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
|
||||
u32 version = ATERMi_ApConfigGetVersion();
|
||||
if (((version >> 12) & 15) * 10 + ((version >> 8) & 15) != 1) {
|
||||
@@ -153,7 +148,7 @@ int RakuRakuThread::start() {
|
||||
socketConfig.free = RakuSocketFree;
|
||||
SOInit(&socketConfig);
|
||||
ATERMi_ApConfigStart(mPriority, 200,
|
||||
progressCallback,
|
||||
syncRakuProgress,
|
||||
RakuAtermAlloc, RakuAtermFree, 4096);
|
||||
if (!mRunning) {
|
||||
mRunning = 1;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
namespace ipl {
|
||||
namespace bs2 {
|
||||
Manager::Manager(EGG::Heap* pHeap)
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), unk_0x0C(true), unk_0x0D(false), unk_0x0E(false), unk_0x0F(false),
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), mbTickEnabled(true), mbUpdateRequested(false), mbAbortRequested(false), mbRestartRequested(false),
|
||||
mbIsDiagDisc(false), mbIncludesSeatTitles(false), mbHasBanner(FALSE), mUnlockedState(BS2_STT_NO_DISK), mbStartUpdate(false),
|
||||
mEntries(NULL), mEntrySize(1), mEntryOffset(0) {
|
||||
mpBannerBuffer = new (pHeap, DEFAULT_ALIGN) u8[BS2_DEFAULT_BANNER_SIZE];
|
||||
@@ -30,13 +30,13 @@ namespace ipl {
|
||||
return mIPLState;
|
||||
}
|
||||
|
||||
if (unk_0x0F && !System::isNandFull()) {
|
||||
if (mbRestartRequested && !System::isNandFull()) {
|
||||
BS2RestartStateMachine();
|
||||
|
||||
unk_0x0C = true;
|
||||
mbTickEnabled = true;
|
||||
mIPLState = IPL_STATE_NO_DISK;
|
||||
unk_0x0F = false;
|
||||
} else if (unk_0x0C) {
|
||||
mbRestartRequested = false;
|
||||
} else if (mbTickEnabled) {
|
||||
BOOL old = OSDisableInterrupts();
|
||||
|
||||
mState = BS2Tick();
|
||||
@@ -51,7 +51,7 @@ namespace ipl {
|
||||
|
||||
if (mbIsDiagDisc && System::isRsrcLoaded()) {
|
||||
__WPADReconnect(TRUE);
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
bootNewSystem();
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::startUpdate() {
|
||||
unk_0x0D = true;
|
||||
mbUpdateRequested = true;
|
||||
mbStartUpdate = true;
|
||||
mPrevEntry = 0;
|
||||
mPrevFound = 0;
|
||||
@@ -88,11 +88,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::reserveRVLGame() {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
}
|
||||
|
||||
void Manager::reserveGCGame() {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
}
|
||||
|
||||
void Manager::startRVLGame() {
|
||||
@@ -103,13 +103,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::abort() {
|
||||
unk_0x0E = true;
|
||||
unk_0x0F = false;
|
||||
mbAbortRequested = true;
|
||||
mbRestartRequested = false;
|
||||
}
|
||||
|
||||
void Manager::restart() {
|
||||
unk_0x0E = false;
|
||||
unk_0x0F = true;
|
||||
mbAbortRequested = false;
|
||||
mbRestartRequested = true;
|
||||
|
||||
System::checkNandOverFlowFlagAsync();
|
||||
}
|
||||
@@ -195,7 +195,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BS2_STT_64: {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
break;
|
||||
}
|
||||
@@ -216,25 +216,25 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::execTick(BS2State state) {
|
||||
if (unk_0x0D) {
|
||||
if (mbUpdateRequested) {
|
||||
if (state == BS2_STT_UPDATE_DISK) {
|
||||
BS2StartUpdate();
|
||||
} else {
|
||||
mbStartUpdate = false;
|
||||
}
|
||||
} else if (unk_0x0E) {
|
||||
} else if (mbAbortRequested) {
|
||||
if (state == BS2_STT_NO_DISK || state == BS2_STT_COVER_OPEN || state == BS2_STT_55 || state == BS2_STT_WRONG_DISK ||
|
||||
state == BS2_STT_66 || state == BS2_STT_67 || state == BS2_STT_68 || state == BS2_STT_FATAL_ERROR ||
|
||||
state == BS2_STT_UPDATE_FAILED || state == BS2_STT_DIRTY_DISK) {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
} else {
|
||||
BS2AbortStateMachine();
|
||||
}
|
||||
}
|
||||
|
||||
unk_0x0D = false;
|
||||
unk_0x0E = false;
|
||||
mbUpdateRequested = false;
|
||||
mbAbortRequested = false;
|
||||
}
|
||||
|
||||
void Manager::updateTick() {
|
||||
|
||||
@@ -43,13 +43,13 @@ namespace ipl {
|
||||
mMessageID = msgId;
|
||||
|
||||
// Debug related? (seems to be incomplete; unused)
|
||||
unk_0x0C = arg2;
|
||||
unk_0x10 = arg3;
|
||||
mArg2 = arg2;
|
||||
mArg3 = arg3;
|
||||
if (arg1) {
|
||||
strncpy(unk_0x14, arg1, sizeof(unk_0x14));
|
||||
unk_0x14[sizeof(unk_0x14) - 1] = 0;
|
||||
strncpy(mArg1, arg1, sizeof(mArg1));
|
||||
mArg1[sizeof(mArg1) - 1] = 0;
|
||||
} else {
|
||||
memset(unk_0x14, 0, sizeof(unk_0x14));
|
||||
memset(mArg1, 0, sizeof(mArg1));
|
||||
}
|
||||
|
||||
curThread = OSGetCurrentThread();
|
||||
|
||||
89
tools/decomp-assist/linkgap.attempts.md
Normal file
89
tools/decomp-assist/linkgap.attempts.md
Normal file
@@ -0,0 +1,89 @@
|
||||
# linkgap leaf — iplChannelTitle + eggAudioExpMgr
|
||||
|
||||
## iplChannelTitle — emission restored, 3144 is provably impossible
|
||||
|
||||
Orig .o `.data` = 0x950; last symbol ends 0x87c; bytes 0x87c-0x950 are zeros
|
||||
in both the extraction .o and the DOL (verified at DOL file off 0x31F504).
|
||||
The 0xd4 tail = 5 weak-emitted vtables that lost link dedup:
|
||||
|
||||
| off | size | symbol |
|
||||
|-------|------|-------------------------------|
|
||||
| 0x87c | 92 | __vt__ipl::gui::PaneManager |
|
||||
| 0x8d8 | 24 | __vt__gui::EventHandler |
|
||||
| 0x8f0 | 32 | __vt__gui::Interface |
|
||||
| 0x910 | 32 | __vt__ipl::nand::LayoutFile |
|
||||
| 0x930 | 32 | __vt__ipl::nand::LangFile |
|
||||
|
||||
Emit rule used (old agent/w0929/linkgap scheme): a class weak-emits its
|
||||
vtable in a TU that ODR-uses it (construction site; elided vptr stores
|
||||
count) when every virtual DECLARED IN THAT CLASS is inline — inherited
|
||||
non-inline virtuals don't block (LayoutFile emits despite non-inline
|
||||
inherited virtuals because its own ~LayoutFile is inline here).
|
||||
|
||||
Source mechanism, all real decls, no invented names:
|
||||
- `#define IPL_CHANNEL_TITLE_NOVTABLE` at cpp top (undef after includes).
|
||||
- GUIManager.h: ~Interface -> `~Interface(){}` for CT (gate); EventHandler
|
||||
loses `__declspec(novtable)` for CT.
|
||||
- iplGuiManager.h: ~PaneManager -> `~PaneManager(){}` for CT.
|
||||
- iplNand.h: LangFile's five virtuals gated to inline dummies for CT;
|
||||
~LayoutFile -> `~LayoutFile(){}` for CT.
|
||||
- `#pragma dont_instantiate ipl::math::HermiteIntp<float>` keeps
|
||||
HermiteIntp's vtable UND (orig also UNDs it).
|
||||
|
||||
Result: all 5 emit STB_WEAK at the exact orig offsets, .data=0x950, the
|
||||
raw .data bytes are byte-identical to orig's (all-zero tail), and the
|
||||
full DOL is byte-identical (sha1 26116613f624061ba99c8d1a299aaa6efa85670d)
|
||||
with the unit flipped Matching.
|
||||
|
||||
### Why matched_data cannot stay 3144 — objdiff internals, proven
|
||||
|
||||
`matched_data` sums sizes of sections at fuzzy==100. `.data` fuzzy is
|
||||
computed (objdiff-core diff/data.rs `diff_data_section`) as:
|
||||
|
||||
- left_max/right_max = max end offset of scored symbols in the section
|
||||
(symbols with size>0, not Section-kind, not Hidden).
|
||||
- Compare section bytes over 0..max (patience diff) AND pair relocations
|
||||
in the same range; if every left reloc matches, score =
|
||||
max(symbol-name-match%, byte-diff%). Otherwise symbol-name-match only.
|
||||
- Symbol-name-match = sum(size*match%)/sum(size) over left symbols.
|
||||
|
||||
Any symbol'd object emitted at 0x87c+ therefore scores <100 regardless
|
||||
of content, because orig's extraction .o has neither a symbol nor a
|
||||
reloc there (dedup'd weak emits are invisible in the DOL, so the
|
||||
extractor dropped them — rela.data max offset is 0x878). Measured:
|
||||
|
||||
- 0 emits (.data=0x87c): .data fuzzy 100.0 -> matched_data 3144
|
||||
- 5 emits (.data=0x950): .data fuzzy 95.35 -> matched_data 760
|
||||
|
||||
The only objdiff-invisible emit is a Hidden symbol (objdiff marks
|
||||
ELF Linkage-scope/STB_LOCAL symbols Hidden). But a local emit cannot
|
||||
lose dedup, so its content (vtable pointers) would be written into the
|
||||
DOL -> nonzero tail -> hash fails. A local *zero-content* object would
|
||||
satisfy both, but that is an invented score-only pad — not used.
|
||||
|
||||
RESOLUTION: name orig's real tail objects in config/43U/symbols.txt.
|
||||
The orig .o is rebuilt by `dtk dol split` from symbols.txt; the tail
|
||||
region had no entries, so objdiff's left_max stopped at 0x87c while my
|
||||
emitted vtables pushed right_max to 0x950 -> byte-path Insert penalty
|
||||
-> .data 95.35 / matched_data 760. Adding the 5 real objects
|
||||
(lbl_8164EFE4/+0x5C, lbl_8164F040/+0x18, lbl_8164F058/+0x20,
|
||||
lbl_8164F078/+0x20, lbl_8164F098/+0x20 — the dedup'd vtable emits)
|
||||
extends left_max to 0x950: the byte path then compares the full
|
||||
2384-byte range (zeros vs zeros) -> .data fuzzy 100 -> matched_data
|
||||
3144, all 95 fns 100, every section 100, DOL sha1
|
||||
26116613f624061ba99c8d1a299aaa6efa85670d byte-identical.
|
||||
|
||||
Also disproven this session: (a) the "one object per bounded run" was
|
||||
symbols.txt label granularity, not real .o granularity — plain literals
|
||||
are the correct source form (orig emits a single `addi r7, r31, off`
|
||||
per ref; any named-table ref `scX + N` forces a shared-base hoist =
|
||||
2-insn addressing, verified by capstone); (b) `symbol_mappings` in
|
||||
objdiff.json is ignored by objdiff-cli 3.4.5 report (issue #279), and
|
||||
lbl_* names can't be used in source anyway; (c)
|
||||
SymbolFlag::Ignored is mips-only — no way to hide emitted symbols from
|
||||
scoring.
|
||||
|
||||
## eggAudioExpMgr — see linkgap-audio branch notes
|
||||
|
||||
(Sample class deleted; secondary-vt [dtor][calc] thunk-order handled on
|
||||
agent/w1005/linkgap-audio.)
|
||||
Reference in New Issue
Block a user