Compare commits
9 Commits
cleanup/ip
...
agent/w100
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46d0dbb0a7 | ||
|
|
6f49df32b3 | ||
|
|
8864436cde | ||
|
|
a9a3f36cf0 | ||
|
|
ffeed96e49 | ||
|
|
1216db0acb | ||
|
|
85b993f48c | ||
|
|
a2a0460567 | ||
|
|
df0fa22203 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.59% | 90.92% | 73.37% | 99.37% |
|
||||
| 99.59% | 90.94% | 73.73% | 99.37% |
|
||||
|
||||
units 960/1027 complete, functions 12368/12563 matched.
|
||||
units 961/1027 complete, functions 12369/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -768,7 +768,7 @@ config.libs = [
|
||||
IPLSection("channelSelect", [
|
||||
Object(Matching, "scene/channelSelect/iplChannelSelect.cpp"),
|
||||
Object(Matching, "scene/channelSelect/iplClock.cpp"),
|
||||
Object(Equivalent, "scene/channelSelect/iplChannelObj.cpp"),
|
||||
Object(Matching, "scene/channelSelect/iplChannelObj.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("channelTitle", [
|
||||
|
||||
@@ -43,7 +43,7 @@ private:
|
||||
bool mIsPlaying; // 0xB2
|
||||
bool mIsSetBuf; // 0xB3
|
||||
bool mThreadRunning; // 0xB4
|
||||
bool unk_0xB5; // 0xB5
|
||||
bool mbFillInCallback; // 0xB5
|
||||
|
||||
WaveFileAiff mAiff; // 0xB8
|
||||
WaveFileWav mWav; // 0xE8
|
||||
|
||||
@@ -195,7 +195,7 @@ typedef struct _zi8DawgCtx {
|
||||
ziU8* table; // 0x10
|
||||
ziU8* p14; // 0x14
|
||||
zi8DawgRec recs[0x32]; // 0x18
|
||||
ziU32 unk_0x338; // 0x338
|
||||
ziU32 endNode; // 0x338
|
||||
} zi8DawgCtx;
|
||||
|
||||
typedef struct _ziUwdNode {
|
||||
@@ -221,7 +221,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x19;
|
||||
ziU16 separator; // 0x1A
|
||||
ziU8 unk_0x1C[3];
|
||||
ziU8 unk_0x1F;
|
||||
ziU8 ignoreCase;
|
||||
ziU16 unk_0x20[0x40];
|
||||
ziU16 unk_0xA0[0x42];
|
||||
ziU16* unk_0x124[1];
|
||||
|
||||
@@ -32,7 +32,7 @@ ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
if (language != context->lang || graphTable != context->key) records[0].key = 0;
|
||||
if (count == 1 && mode != 0 && graphTable == 0xe) goto finish_graph;
|
||||
if (status != 0) {
|
||||
if (records[context->cnt - 1].node == (ziU8*)context->unk_0x338) goto finish_graph;
|
||||
if (records[context->cnt - 1].node == (ziU8*)context->endNode) goto finish_graph;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (records[index].key != elements[index] &&
|
||||
(ziU16)records[index].attr != elements[index]) goto finish_graph;
|
||||
@@ -82,7 +82,7 @@ check_keys:
|
||||
records[0].node = ZiDAWGGetGraphInfo(context, keyData, (ziS16*)keys);
|
||||
} else {
|
||||
records[0].node = ZiDAWGGetGraph(context);
|
||||
context->unk_0x338 = 0;
|
||||
context->endNode = 0;
|
||||
context->p14 = 0;
|
||||
}
|
||||
records[0].key = 0;
|
||||
@@ -98,7 +98,7 @@ check_keys:
|
||||
}
|
||||
searching = 1;
|
||||
current = &records[context->cnt - 1];
|
||||
while (searching && context->cnt != 0 && current->node != (ziU8*)context->unk_0x338) {
|
||||
while (searching && context->cnt != 0 && current->node != (ziU8*)context->endNode) {
|
||||
if (capacity < context->cnt) goto finish_graph;
|
||||
current->attr = ZiDAWGgetCHARattribute(context, current->node, ZI_WORK);
|
||||
if (context->cnt <= count) {
|
||||
|
||||
@@ -126,7 +126,7 @@ matchText:
|
||||
if (pattern[index] != Zi8ConvertUC2Key(word[index], language, __zi8_work_data)) goto next;
|
||||
} else {
|
||||
folded = Zi8ConvertUC2WC(word[index], language, __zi8_work_data);
|
||||
if (folded != pattern[index] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[index])) goto next;
|
||||
if (folded != pattern[index] && (!ZI_WORK->ignoreCase || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[index])) goto next;
|
||||
}
|
||||
}
|
||||
matched:
|
||||
|
||||
@@ -148,7 +148,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
if (ZI_WORK->unk_0x1F != 0) {
|
||||
if (ZI_WORK->ignoreCase != 0) {
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
}
|
||||
@@ -192,7 +192,7 @@ next:
|
||||
if (pattern[position] != Zi8ConvertUC2Key(text[position], language, __zi8_work_data)) goto next;
|
||||
} else {
|
||||
folded = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
|
||||
if (folded != pattern[position] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[position])) goto next;
|
||||
if (folded != pattern[position] && (!ZI_WORK->ignoreCase || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[position])) goto next;
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x140 != 0) {
|
||||
|
||||
@@ -199,10 +199,10 @@ checkEntry:
|
||||
}
|
||||
|
||||
result = graph + (ziU32)entry[4] * 0x10000 + (((ziU16)entry[5] << 8) + entry[6]);
|
||||
((zi8DawgCtx*)context)->unk_0x338 =
|
||||
((zi8DawgCtx*)context)->endNode =
|
||||
graph + (ziU32)entry[7] * 0x10000 + (((ziU16)entry[8] << 8) + entry[9]);
|
||||
if (((zi8DawgCtx*)context)->unk_0x338 == graph) {
|
||||
((zi8DawgCtx*)context)->unk_0x338 = 0;
|
||||
if (((zi8DawgCtx*)context)->endNode == graph) {
|
||||
((zi8DawgCtx*)context)->endNode = 0;
|
||||
}
|
||||
|
||||
if ((((ziU16)entry[0] << 8) + entry[1]) == 0) {
|
||||
|
||||
@@ -45,7 +45,7 @@ posEntry:
|
||||
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
|
||||
break;
|
||||
} else if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
if (!ZI_WORK->ignoreCase || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
|
||||
@@ -152,10 +152,10 @@ u32 __SCGetConfBufSize();
|
||||
|
||||
typedef struct SC_BT_DEV_INFO {
|
||||
u8 devName[20]; // 0x00
|
||||
u8 unk_0x14;
|
||||
u8 unk_0x15[0xB];
|
||||
u8 pad_0x14; // 0x14
|
||||
u8 pad_0x15[0xB]; // 0x15
|
||||
LINK_KEY linkKey; // 0x20
|
||||
u8 unk_0x30[0x10];
|
||||
u8 pad_0x30[0x10]; // 0x30
|
||||
} SC_BT_DEV_INFO;
|
||||
|
||||
typedef struct SCBtDeviceInfo {
|
||||
|
||||
@@ -26,7 +26,7 @@ typedef struct USBKBDCmdLED {
|
||||
|
||||
typedef struct USBKBDCmdLEDAsync {
|
||||
USBKBDCmdLED base; // 0x00
|
||||
u8 unk_0x08[0x10];
|
||||
u8 pad_0x08[0x10]; // 0x08
|
||||
USBKBDCmdLEDCallback cb; // 0x18
|
||||
void* cbArg; // 0x1C
|
||||
} USBKBDCmdLEDAsync;
|
||||
|
||||
@@ -393,6 +393,67 @@ CDBErr CDBRecordGetDataSize(CDBRecord* record, u32* size) {
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordReduceFileSize(CDBRecord* record, u32 newFileSize) {
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
u32 fileSize;
|
||||
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't reduce file size of the record ; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't reduce file size of the record ; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBAttrGetFileSize(&recordFile->attr, &fileSize);
|
||||
if (newFileSize > fileSize) {
|
||||
CDBReportError("can't reduce file size of the record ; file size must be over %d bytes\n", fileSize);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
CDBAttrSetFileSize(&recordFile->attr, newFileSize);
|
||||
recordFile->attr.dirty = TRUE;
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordReduceDataSize(CDBRecord* record, u32 newDataSize) {
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
u32 dataSize;
|
||||
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't reduce data size of the record ; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't reduce data size of the record ; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't reduce data size of the record; permission denied\n");
|
||||
return CDB_ERROR_ACCESS_DENIED;
|
||||
}
|
||||
err = CDBRecordFileGetDataSize(record, &dataSize);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
}
|
||||
if (newDataSize < dataSize) {
|
||||
CDBAttrSetFileSize(&recordFile->attr, newDataSize);
|
||||
recordFile->attr.dirty = TRUE;
|
||||
}
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordRemove(CDBRecord* record) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
@@ -430,6 +491,50 @@ void CDBRecordGetTypeForce(CDBRecord* record, char* type) {
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordSetFileType(CDBRecord* record, const char* fileType) {
|
||||
CDBRecordDatabaseState* instance;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
|
||||
instance = ((CDBDatabase*)record->database)->instance;
|
||||
recordFile = record->file;
|
||||
if ((instance->openFlags & 2) == 0) {
|
||||
CDBReportError("can't set file type of the record; the database is opened as READONLY\n");
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't set file type of the record ; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't set file type of the record ; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (record->key.location != CDB_FS_LOCATION_NAND) {
|
||||
CDBReportError("can't set file type of the record ; the record must exsist on NAND\n");
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
CDBLock();
|
||||
strcpy(CDBKeyStrType(record->key.keyString), fileType);
|
||||
CDBAttrSetKeyStr(&recordFile->attr, &record->key);
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetFileType(CDBRecord* record, char* fileType) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get file type of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToType(record->key.keyString, fileType);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
void CDBRecordGetGameCodeForce(CDBRecord* record, char* gameCode) {
|
||||
u32 value;
|
||||
CDBLock();
|
||||
@@ -438,12 +543,122 @@ void CDBRecordGetGameCodeForce(CDBRecord* record, char* gameCode) {
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetGameCode(CDBRecord* record, u32* gameCode) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get game code of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToGameCode(record->key.keyString, gameCode);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetMakerCode(CDBRecord* record, u32* makerCode) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get maker code of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToMakerCode(record->key.keyString, makerCode);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetModifiedTime(CDBRecord* record, u32* modifiedTime) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get modified time of the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
*modifiedTime = ((CDBRecordFile*)record->file)->attr.buf.lastModifiedDate;
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetModifiedCount(CDBRecord* record, u32* modifiedCount) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get modified count of the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBAttrGetModifiedCount(&((CDBRecordFile*)record->file)->attr, modifiedCount);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
void CDBRecordGetKeyForce(CDBRecord* record, CDBRecordKey* key) {
|
||||
CDBLock();
|
||||
CDBRecordKeyCopy(key, &record->key);
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordSetName(CDBRecord* record, const char* name, const char* keyword) {
|
||||
CDBRecordDatabaseState* instance;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
|
||||
instance = ((CDBDatabase*)record->database)->instance;
|
||||
recordFile = record->file;
|
||||
if ((instance->openFlags & 2) == 0) {
|
||||
CDBReportError("can't set a name of the record; the database is opened as READONLY\n");
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't add keyword to the record; permission denied\n");
|
||||
return CDB_ERROR_ACCESS_DENIED;
|
||||
}
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't set a name of the record; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't set a name of the record; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBLock();
|
||||
strncpy(recordFile->attr.buf.desc, name, CDB_ATTR_BUF_MAX_DESC_LEN);
|
||||
recordFile->attr.buf.descLength = strlen(name);
|
||||
recordFile->attr.dirty = TRUE;
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetKeyword(CDBRecord* record, char* keyword) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get keyword from the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
strcpy(keyword, ((CDBRecordFile*)record->file)->attr.buf.desc);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetKey(CDBRecord* record, CDBRecordKey* key) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get key from the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBRecordKeyCopy(key, &record->key);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
void CDBRecordGetCalendarTimeForce(CDBRecord* record, int* year, int* month, int* day, int* hour, int* min, int* sec) {
|
||||
char epochString[64];
|
||||
CDBDate epoch;
|
||||
@@ -454,6 +669,23 @@ void CDBRecordGetCalendarTimeForce(CDBRecord* record, int* year, int* month, int
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetCalendarTime(CDBRecord* record, int* year, int* month, int* day, int* hour, int* min, int* sec) {
|
||||
char epochString[64];
|
||||
CDBDate epoch;
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get calender time from the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToEpochStr(record->key.keyString, epochString);
|
||||
CDBConvEpochStrToEpochValue(epochString, &epoch);
|
||||
CDBConvEpochValueToDate(epoch, year, month, day, hour, min, sec);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetId(CDBRecord* record, CDBId* id) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBRecordFile* recordFile;
|
||||
@@ -532,6 +764,27 @@ CDBErr CDBRecordUpdateModifiedDate(CDBRecord* record) {
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordDuplicate(CDBRecord* record, CDBRecord* newRecord) {
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
|
||||
if (record->key.location != CDB_FS_LOCATION_NAND && record->key.location != CDB_FS_LOCATION_SD) {
|
||||
OSPanic(__FILE__, __LINE__, "CDBRecordDuplicate invalud location\n");
|
||||
return CDB_ERROR_1;
|
||||
}
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBLock();
|
||||
CDBRecordKeyCopy(&newRecord->key, &record->key);
|
||||
newRecord->file = NULL;
|
||||
newRecord->database = record->database;
|
||||
err = CDBRecordFileCreateBlank(newRecord);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordBackupToSD(CDBRecord* record) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
@@ -695,8 +948,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
}
|
||||
{
|
||||
CDBErr result;
|
||||
CDBRecordFile* tempFile;
|
||||
tempFile = record->file;
|
||||
CDBRecordFile* tempFile = record->file;
|
||||
if ((s32)tempFile == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (tempFile->allocFlag == 1) {
|
||||
@@ -825,7 +1077,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
|
||||
CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize, CDBRecordKey* key) {
|
||||
CDBErr status;
|
||||
int fileOffset;
|
||||
s32 fileOffset;
|
||||
CDBRecordFile* recordFile;
|
||||
u32 fileDataSize;
|
||||
u32 fileSize;
|
||||
@@ -960,3 +1212,32 @@ CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordPrivateChangeOwner(CDBRecord* record, u64 newWiiId) {
|
||||
CDBRecordFile* recordFile;
|
||||
char fullPath[256];
|
||||
char newPath[256];
|
||||
CDBErr err;
|
||||
u64 preWiiId;
|
||||
u64 recordWiiId;
|
||||
|
||||
CDBReportError("CDBRecordPrivateChangeOwner\n");
|
||||
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
preWiiId = CDBGetWiiId();
|
||||
recordWiiId = record->key.wiiId;
|
||||
OSReport(" i_pre-wiiid = %lX\n", preWiiId);
|
||||
OSReport(" record-wiiid = %lX\n", recordWiiId);
|
||||
CDBConvKeyToFullPath(&record->key, fullPath);
|
||||
record->key.wiiId = newWiiId;
|
||||
CDBConvKeyToFullPath(&record->key, newPath);
|
||||
OSReport("path =%s\n", fullPath);
|
||||
OSReport("path2=%s\n", newPath);
|
||||
CDBLock();
|
||||
err = CDBAttrSetWiiId(&recordFile->attr, newWiiId);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -64,13 +64,13 @@ void SimpleWavePlayer::wavePacketCallback(WavePacketCallbackStatus status, WaveP
|
||||
return;
|
||||
}
|
||||
|
||||
if (self->unk_0xB5) {
|
||||
if (self->mbFillInCallback) {
|
||||
MakeWave(player, packet, self);
|
||||
}
|
||||
}
|
||||
|
||||
SimpleWavePlayer::SimpleWavePlayer() : mSetupParam(1, nw4r::snd::SAMPLE_FORMAT_PCM_S16, 32000, 1.0f, 1) {
|
||||
unk_0xB5 = true;
|
||||
mbFillInCallback = true;
|
||||
unk_0xB0 = false;
|
||||
mIsSetData = false;
|
||||
mIsPlaying = false;
|
||||
@@ -196,7 +196,7 @@ void SimpleWavePlayer::stop() {
|
||||
|
||||
void SimpleWavePlayer::update() {
|
||||
if (mIsPlaying) {
|
||||
if (!unk_0xB5) {
|
||||
if (!mbFillInCallback) {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
if (mWavePackets[i].GetAppendFlag()) {
|
||||
continue;
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace ipl {
|
||||
namespace cs {
|
||||
namespace savedata {
|
||||
struct data {
|
||||
char unk_0x00[MAX_PATH_LENGTH + sizeof(wchar_t)]; // 0x00
|
||||
char sMountPath[MAX_PATH_LENGTH + sizeof(wchar_t)]; // 0x00
|
||||
char sPath[MAX_PATH_LENGTH + sizeof(wchar_t)]; // 0x42
|
||||
u8 flag; // 0x84
|
||||
u8* pData; // 0x88
|
||||
@@ -67,7 +67,7 @@ namespace ipl {
|
||||
data* data = static_cast<savedata::data*>(*hdr->value.ptr_v);
|
||||
|
||||
if (data->pData == NULL && data->size == 0) {
|
||||
if (data->unk_0x00[0] == 0) {
|
||||
if (data->sMountPath[0] == 0) {
|
||||
error = load_nand_(vm, data, heap, offset, size, 0x20);
|
||||
} else {
|
||||
error = load_vf_(vm, data, heap, offset, size, 0x20);
|
||||
@@ -127,7 +127,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (data->unk_0x00[0] == '\0') {
|
||||
if (data->sMountPath[0] == '\0') {
|
||||
error = load_nand_(vm, data, csHeap, 0, size, -0x20);
|
||||
} else {
|
||||
error = load_vf_(vm, data, csHeap, 0, size, -0x20);
|
||||
@@ -591,7 +591,7 @@ namespace ipl {
|
||||
memset(data, 0, sizeof(savedata::data));
|
||||
memset(temp, 0, sizeof(temp));
|
||||
if (arg1 != NULL) {
|
||||
util::utf16_to_ascii(data->unk_0x00, temp, MAX_PATH_LENGTH, arg0);
|
||||
util::utf16_to_ascii(data->sMountPath, temp, MAX_PATH_LENGTH, arg0);
|
||||
memset(temp, 0, sizeof(temp));
|
||||
util::utf16_to_ascii(data->sPath, temp, MAX_PATH_LENGTH, arg1);
|
||||
} else {
|
||||
|
||||
@@ -674,7 +674,8 @@ namespace ipl {
|
||||
|
||||
if (foundLangGroup) {
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
|
||||
nw4r::lyt::Group* const& groupView = group;
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = groupView->GetPaneList().GetBeginIter(); it != groupView->GetPaneList().GetEndIter(); it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
}
|
||||
} else {
|
||||
@@ -685,7 +686,8 @@ namespace ipl {
|
||||
}
|
||||
if (strcmp(scModuleData.langGroupLookup[region][i], langCodeBuf[scLangLookup[region][i]]) == 0) {
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(scModuleData.langGroupLookup[region][i]);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
|
||||
nw4r::lyt::Group* const& groupView = group;
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = groupView->GetPaneList().GetBeginIter(); it != groupView->GetPaneList().GetEndIter(); it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -29,3 +29,26 @@ Additional Decrypt correction: restored 0x3E800 size limit, actual seek/read err
|
||||
Remaining: CDBCryptBuffer 99.97479%, 119/119 instructions, three pool offsets; CDBRecordEncrypt 97.19014%, register allocation and one instruction; CDBRecordDecrypt 99.96789%, stack placement.
|
||||
|
||||
The four forced field accessors end with CDBUnlock and do not produce a CDBErr result. Their void declarations are gated by CDB_RECORD_IMPLEMENTATION, preserving all other translation units and avoiding fall-through non-void definitions.
|
||||
|
||||
## w1008/cdb leaf — dead-fn fossil + Encrypt coloring (worker w1008)
|
||||
|
||||
SOLVED — link-deadstrip fossil mechanism: orig .data's fossil literals (0x398-0x9be)
|
||||
come from ~15 dead functions whose code mwldeppc stripped at link. Added all dead
|
||||
fns (CDBRecordGetFileSize through CDBRecordPrivateChangeOwner) as GLOBAL fns in
|
||||
fossil-emission order; global (not static) emits standalone code AND auto-inlines
|
||||
at use sites. .data content byte-identical (orig has 2B reconstruction tail pad).
|
||||
Verified at DOL level: fossil strings land at exact expected vaddrs.
|
||||
|
||||
SOLVED — Encrypt +0x40 code gap: `err = CDBRecordGetFileSize(record, &fileSize)`
|
||||
calls the dead fn which auto-inlines, reproducing orig's expanded block.
|
||||
`(s32)ptr == 0` → `cmpwi r0,0` required (== NULL gives cmplw). 284/284 insns
|
||||
identical, 0 stream diffs.
|
||||
|
||||
WALL — CDBRecordEncrypt 57 byte diffs, pure callee-reg coloring on identical
|
||||
web structure. Orig packs {key+err}→r24, {tempFile+fileOffset}→r31, pool→r25,
|
||||
args→r26-29; mine packs {tempFile+err}→r24, {key+fileOffset}→r29, pool→r31,
|
||||
args→r25-28. Equal-cost packings (tie-break). ~18 probes all neutral/regressed:
|
||||
recordFile/err/tempFile/fileOffset decl order+scope+init forms, per-block vs
|
||||
shared `result`, single-web fileOffset (-69), fn-scope tempFile, `register`,
|
||||
err dead-init (emits, +4B/831), u32/s32 types, decl+init forms.
|
||||
DOL-verified: the entire DOL diff vs orig = exactly these 57 bytes.
|
||||
|
||||
39
tools/decomp-assist/link3.attempts.md
Normal file
39
tools/decomp-assist/link3.attempts.md
Normal file
@@ -0,0 +1,39 @@
|
||||
# ChannelObj native linking
|
||||
|
||||
Baseline HEAD 8864436c, Equivalent; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
Read PR #934 native weak emission fix. Baseline report and ELF saved under /tmp/link3.*.
|
||||
|
||||
1. Set only ChannelObj to Matching and measure the first linked divergence.
|
||||
Result: Matching immediately produces DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Entire DOL is byte-identical to orig/43U/00000008.app; there is no first differing byte or shifted target symbol to investigate. Pool identical, 20/20 strings. No source/header emission changes required after the near1c landing.
|
||||
|
||||
2. Run the final clean gate, explicit build/43U/ok, all 56 ctxdiff checks, and compare every other unit with the initial report.
|
||||
Final clean gate passes; explicit ninja build/43U/ok passes. Objdiff code 10924/10924, data 2216/2216, functions 56/56; linked code 10924 and linked data 2216, both 100%. All 1026 other unit records are identical to the initial live report.
|
||||
|
||||
Instruction-check caveat: gate and ctxdiff report 55/56 because odiff.dis reads operands[0].imm for a conditional branch. In calcCursorAnim, branches at instruction indices 11, 21 and 22 use cr1, so operand zero is a register, not the branch target. Source function starts at object offset 0x1e08, original at 0x1cf8. The checker subtracts those different offsets from the register number 13. Actual instructions are identical: 41860014, 41860010, 40840014. Entire 240-byte calcCursorAnim bodies have SHA1 35d649cf56bd349a345a7f3da15fc3d80ac8c508 in both objects. A separate Capstone comparison using PPC_OP_IMM for branch targets verifies all 56/56 instruction streams. No repository or external verification tool was edited.
|
||||
|
||||
Final clean gate output:
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/scene/channelSelect/iplChannelObj] pool: IDENTICAL
|
||||
[src/scene/channelSelect/iplChannelObj] objdiff: code 10924/10924 data 2216/2216 functions 56/56 fuzzy 100.0000 linked code 10924
|
||||
[src/scene/channelSelect/iplChannelObj] instruction-exact functions: 55/56
|
||||
[src/scene/channelSelect/iplChannelObj] section .data size 1240 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .rodata size 784 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .sdata size 120 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .sdata2 size 72 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] section .text size 10924 match 100.0
|
||||
[src/scene/channelSelect/iplChannelObj] baseline: code 10924/10924 data 2216 functions 56 fuzzy 100.0000
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.94304 -> 90.94304
|
||||
global fuzzy_match_percent: 99.58742 -> 99.58742
|
||||
global complete_code_percent: 73.36610 -> 73.73083
|
||||
global matched_data_percent: 99.36639 -> 99.36639
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
note: config touched: configure.py (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
No remaining non-matching function or data section. No source/header changes; configure.py switches this exact native object from Equivalent to Matching. Full DOL bytes equal the original, SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Before and after: objdiff 56/56 functions, code 10924/10924, data 2216/2216; linked code 0 -> 10924 and linked data 0 -> 2216. Gate instruction count 55/56 before and after, corrected branch-operand count 56/56.
|
||||
10224
tools/decomp-assist/near1.attempts.md
Normal file
10224
tools/decomp-assist/near1.attempts.md
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user