Compare commits
21 Commits
ci/readme-
...
agent/w100
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9b09601af | ||
|
|
5689681bc2 | ||
|
|
fc0074f0d0 | ||
|
|
cd0cd3c65a | ||
|
|
fc3b22607c | ||
|
|
52862f1c28 | ||
|
|
d2286df586 | ||
|
|
a93771c1b0 | ||
|
|
89c3c6f375 | ||
|
|
a2c9b974a7 | ||
|
|
a2502a9294 | ||
|
|
f02043a765 | ||
|
|
5453d7e49a | ||
|
|
f2446827cd | ||
|
|
5518cb16fd | ||
|
|
0c06b01c8d | ||
|
|
adc15fdf6f | ||
|
|
dea64a8c9c | ||
|
|
3cde45682d | ||
|
|
ae7cf34cab | ||
|
|
91cc177cb7 |
19
.github/workflows/readme-progress.yml
vendored
19
.github/workflows/readme-progress.yml
vendored
@@ -2,6 +2,8 @@ name: README progress
|
||||
|
||||
# runs on the self-hosted runner on cole's server so it doesn't use hosted minutes.
|
||||
# only push/schedule/manual triggers, never pull_request, so fork PRs can't reach this machine.
|
||||
# README progress is written inside each landing commit by the orchestrator, so this job never commits;
|
||||
# it only rebuilds and publishes the current numbers to the job summary.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
@@ -15,7 +17,7 @@ concurrency:
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
progress:
|
||||
@@ -48,15 +50,8 @@ jobs:
|
||||
- name: Report
|
||||
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
|
||||
|
||||
- name: Update README
|
||||
run: python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
|
||||
- name: Commit
|
||||
- name: Summary
|
||||
run: |
|
||||
if git diff --quiet README.md; then exit 0; fi
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add README.md
|
||||
git commit -m "docs: update progress [skip ci]"
|
||||
git pull --rebase origin main || { git rebase --abort; echo "main moved, next run will update"; exit 0; }
|
||||
git push origin HEAD:main
|
||||
python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
sed -n '/progress:start/,/progress:end/p' README.md >> "$GITHUB_STEP_SUMMARY"
|
||||
git checkout -- README.md
|
||||
|
||||
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.55% | 90.33% | 69.37% | 99.37% |
|
||||
| 99.56% | 90.41% | 69.63% | 99.37% |
|
||||
|
||||
units 950/1027 complete, functions 12343/12563 matched.
|
||||
units 951/1027 complete, functions 12347/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 -->
|
||||
|
||||
@@ -103,7 +103,7 @@ AtermThread = .bss:0x810C0958; // type:object size:0x318 scope:local align:32
|
||||
Voices = .bss:0x810C0C80; // type:object size:0x1800 data:4byte
|
||||
sZeroMem = .bss:0x810C2480; // type:object size:0x100 data:byte
|
||||
s_player_thread_stack = .bss:0x810C2580; // type:object size:0x4000 scope:local
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0x10
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0xC
|
||||
layoutGatherDestructorRecord = .bss:0x810C6590; // type:object size:0xC data:4byte
|
||||
unInputedWCharColorDestructorRecord = .bss:0x810C659C; // type:object size:0xC data:4byte
|
||||
charColorDestructorRecord = .bss:0x810C65A8; // type:object size:0xC data:4byte
|
||||
|
||||
@@ -927,7 +927,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiPkData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -1695,7 +1695,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_cluster.c"),
|
||||
Object(Matching, "fa/pf_dir.c"),
|
||||
Object(Matching, "fa/pf_entry.c"),
|
||||
Object(NonMatching, "fa/pf_entry_iterator.c"),
|
||||
Object(Matching, "fa/pf_entry_iterator.c"),
|
||||
Object(NonMatching, "fa/pf_fat.c"),
|
||||
Object(Matching, "fa/pf_fat12.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
|
||||
@@ -55,7 +55,7 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
|
||||
@@ -197,6 +197,7 @@ namespace ipl {
|
||||
friend class SDChannelSelectEventHandler;
|
||||
friend class SDChannelSelectButtonEventHandler;
|
||||
#endif
|
||||
friend class SDMemory;
|
||||
void enqueueStartNotice();
|
||||
bool enqueueFinishNotice();
|
||||
bool enqueueNotice(u32 highTitleId, u32 lowTitleId, u32 result);
|
||||
|
||||
@@ -24,7 +24,11 @@ namespace nw4r {
|
||||
|
||||
// Constructor
|
||||
|
||||
#ifdef IPL_SDMEMORY_TRIVIAL_COLOR_CTOR
|
||||
Color() {}
|
||||
#else
|
||||
Color() { *this = WHITE; }
|
||||
#endif
|
||||
Color(u32 color) { *this = color; }
|
||||
Color(const GXColor& color) { *this = color; }
|
||||
Color(int red, int green, int blue, int alpha) { Set(red, green, blue, alpha); }
|
||||
|
||||
@@ -16,7 +16,7 @@ static u16 readU16(const u8* p, u16 byteOrder) {
|
||||
}
|
||||
|
||||
static u16 readExifU16(const u8* data, u16 byteOrder) {
|
||||
u32 value = data[0] | data[1] << 8;
|
||||
u16 value = data[0] | data[1] << 8;
|
||||
if (byteOrder == 0x4949) {
|
||||
return (u16)value;
|
||||
}
|
||||
@@ -246,9 +246,9 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
u32 ifdOffset;
|
||||
const u8* entries;
|
||||
u16 remaining;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
s32 entriesSize;
|
||||
u16 count;
|
||||
pInfo->thumbnailData = (u8*)data;
|
||||
pInfo->dataEnd = (u8*)data + size;
|
||||
pInfo->nextIfdOffset = 0;
|
||||
@@ -339,7 +339,7 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
|
||||
u16 tag;
|
||||
s32 tag;
|
||||
u16 type;
|
||||
|
||||
tag = readU16(entry, byteOrder);
|
||||
|
||||
@@ -511,8 +511,8 @@ pf_s32 PFENT_ITER_FindCluster(PF_DIR_ENT* p_ent, pf_u32 cluster, pf_bool* p_is_f
|
||||
iter.ffd.cluster_link.buffer = PF_NULL;
|
||||
iter.log2_entries_per_sector = p_ent->p_vol->bpb.log2_bytes_per_sector - 5;
|
||||
iter.file_sector_index = sector_index;
|
||||
entries_per_sector = 1 << iter.log2_entries_per_sector;
|
||||
iter.offset_mask = entries_per_sector - 1;
|
||||
iter.offset_mask = (1U << iter.log2_entries_per_sector) - 1;
|
||||
entries_per_sector = 1U << iter.log2_entries_per_sector;
|
||||
iter.p_vol = p_ent->p_vol;
|
||||
iter.sector = p_ent->entry_sector;
|
||||
iter.offset = p_ent->entry_offset;
|
||||
|
||||
@@ -393,6 +393,48 @@ CDBErr CDBRecordGetDataSize(CDBRecord* record, u32* size) {
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordReduceFileSize(CDBRecord* record, u32 size) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
u32 fileSize;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't reduce file size of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't reduce file size of the record ; the record is opened as READONLY\n");
|
||||
err = CDB_ERROR_ACCESS_DENIED;
|
||||
} else {
|
||||
err = CDBRecordFileGetFileSize(record, &fileSize);
|
||||
if (size >= fileSize) {
|
||||
CDBReportError("can't reduce file size of the record ; file size must be over %d bytes\n", fileSize);
|
||||
err = CDB_ERROR_OUT_OF_RANGE;
|
||||
}
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordReduceDataSize(CDBRecord* record, u32 size) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
u32 dataSize;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't reduce data size of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't reduce data size of the record ; the record is opened as READONLY\n");
|
||||
err = CDB_ERROR_ACCESS_DENIED;
|
||||
} else {
|
||||
err = CDBRecordFileGetDataSize(record, &dataSize);
|
||||
if (size >= dataSize) {
|
||||
CDBReportError("can't reduce data size of the record; permission denied\n");
|
||||
err = CDB_ERROR_ACCESS_DENIED;
|
||||
}
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordRemove(CDBRecord* record) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
@@ -424,6 +466,164 @@ CDBErr CDBRecordRemove_(CDBRecord* record) {
|
||||
return result;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordSetFileType(CDBRecord* record, char* fileType) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBLock();
|
||||
recordFile = record->file;
|
||||
if ((((CDBRecordDatabaseState*)((CDBDatabase*)record->unk_0x00)->instance)->openFlags & 2) == 0) {
|
||||
CDBReportError("can't set file type of the record; the database is opened as READONLY\n");
|
||||
err = CDB_ERROR_26;
|
||||
} else if (recordFile == NULL) {
|
||||
CDBReportError("can't set file type of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't set file type of the record ; the record is opened as READONLY\n");
|
||||
err = CDB_ERROR_ACCESS_DENIED;
|
||||
} else if (record->key.location != CDB_FS_LOCATION_NAND) {
|
||||
CDBReportError("can't set file type of the record ; the record must exsist on NAND\n");
|
||||
err = CDB_ERROR_ACCESS_DENIED;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetGameCode(CDBRecord* record, char* gameCode) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
u32 value;
|
||||
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, &value);
|
||||
CDBConvGCValueToGCStr(value, 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, int* year, int* month, int* day, int* hour, int* min, int* sec) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBLock();
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't get modified time of the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvertCDBDateToCalendarTime((CDBDate)recordFile->attr.buf.lastModifiedDate, year, month, day, hour, min, sec);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetModifiedCount(CDBRecord* record, u32* modifiedCount) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBLock();
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't get modified count of the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
err = CDBAttrGetModifiedCount(&recordFile->attr, modifiedCount);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordSetName(CDBRecord* record, char* name) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBLock();
|
||||
recordFile = record->file;
|
||||
if ((((CDBRecordDatabaseState*)((CDBDatabase*)record->unk_0x00)->instance)->openFlags & 2) == 0) {
|
||||
CDBReportError("can't set a name of the record; the database is opened as READONLY\n");
|
||||
err = CDB_ERROR_26;
|
||||
} else if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't add keyword to the record; permission denied\n");
|
||||
err = CDB_ERROR_ACCESS_DENIED;
|
||||
} else if (recordFile == NULL) {
|
||||
CDBReportError("can't set a name of the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else if ((recordFile->unk_0x1C & CDB_RECORD_ALLOC_WRITE) == 0) {
|
||||
CDBReportError("can't set a name of the record; the record is opened as READONLY\n");
|
||||
err = CDB_ERROR_ACCESS_DENIED;
|
||||
}
|
||||
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 {
|
||||
CDBRecordKeyGetKeyStr(&record->key, keyword);
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetCalendarTime(CDBRecord* record, int* year, int* month, int* day, int* hour, int* min, int* sec) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
char epochString[64];
|
||||
CDBDate epoch;
|
||||
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;
|
||||
}
|
||||
|
||||
void CDBRecordGetTypeForce(CDBRecord* record, char* type) {
|
||||
CDBLock();
|
||||
CDBConvKeyStrToType(record->key.keyString, type);
|
||||
@@ -622,6 +822,22 @@ CDBErr CDBRecordBackupToSD_(CDBRecord* record) {
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordDuplicate(CDBRecord* record, CDBRecord* newRecord) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
if (record->key.location != CDB_FS_LOCATION_NAND) {
|
||||
OSPanic(__FILE__, 0x38B, "CDBRecordDuplicate invalud location\n");
|
||||
}
|
||||
err = CDBRecordAllocate(newRecord, CDB_RECORD_ALLOC_RW);
|
||||
if (err == CDB_ERROR_OK) {
|
||||
CDBRecordKeyCopy(&newRecord->key, &record->key);
|
||||
newRecord->unk_0x00 = record->unk_0x00;
|
||||
err = CDBRecordBackupToSD_(newRecord);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBCryptBuffer(void* buffer, u32 size, void* iv, u32* processedSize, BOOL encrypt) {
|
||||
NETAESContext context ATTRIBUTE_ALIGN(64);
|
||||
u32 offset;
|
||||
@@ -960,3 +1176,11 @@ CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
void CDBRecordPrivateChangeOwner(CDBRecord* record, u64 preWiiId, u64 wiiId, char* path, char* path2) {
|
||||
CDBReportInfo("CDBRecordPrivateChangeOwner\n");
|
||||
CDBReportInfo(" i_pre-wiiid = %lX\n", preWiiId);
|
||||
CDBReportInfo(" record-wiiid = %lX\n", wiiId);
|
||||
CDBReportInfo("path =%s\n", path);
|
||||
CDBReportInfo("path2=%s\n", path2);
|
||||
}
|
||||
|
||||
@@ -120,10 +120,11 @@ NWC24Err NWC24iMinutesToOSCalendarTime(OSCalendarTime* calendar, s32 minutes) {
|
||||
NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* date) {
|
||||
BOOL isLeapYear;
|
||||
s32 days;
|
||||
const u16 year = date->year;
|
||||
|
||||
isLeapYear = 0;
|
||||
|
||||
calendar->year = date->year;
|
||||
calendar->year = year;
|
||||
calendar->mon = date->month - 1;
|
||||
calendar->mday = date->day;
|
||||
calendar->hour = date->hour;
|
||||
@@ -132,7 +133,7 @@ NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* d
|
||||
calendar->msec = 0;
|
||||
calendar->usec = 0;
|
||||
calendar->yday = date->day + DAYS_OF_YEAR[date->month - 1] - 1;
|
||||
if (((date->year % 4 == 0 && date->year % 100 != 0) || date->year % 400 == 0)) {
|
||||
if (((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)) {
|
||||
isLeapYear = 1;
|
||||
}
|
||||
if (isLeapYear && date->month > 2) {
|
||||
@@ -227,8 +228,9 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
|
||||
for (;;) {
|
||||
s32 previousDays;
|
||||
u8 currentMonth;
|
||||
const u8* parsedMonth = month;
|
||||
previousDays = days;
|
||||
currentMonth = *month;
|
||||
currentMonth = *parsedMonth;
|
||||
if (currentMonth == 2 && IsLeapYear(*year)) {
|
||||
days -= 29;
|
||||
} else {
|
||||
|
||||
@@ -817,6 +817,7 @@ done:
|
||||
|
||||
NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 subjectSize, NWC24EncodingRegion region, u16 alternative, u8* work,
|
||||
u32 workSize, NWC24Charset charset, char* charsetName) {
|
||||
const u8* encodedInput = work;
|
||||
u8* second;
|
||||
u32 secondSize;
|
||||
u32 workHalf;
|
||||
@@ -844,7 +845,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
{
|
||||
sourceOffset = subjectLength;
|
||||
@@ -872,7 +873,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
|
||||
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
sourceOffset += subjectLength;
|
||||
total = total + outputLength - 1;
|
||||
|
||||
1
report.json
Normal file
1
report.json
Normal file
File diff suppressed because one or more lines are too long
@@ -64,6 +64,7 @@ public:
|
||||
class AppearMemoState : public State {
|
||||
public:
|
||||
AppearMemoState() : mTime(0.0f) {}
|
||||
virtual ~AppearMemoState();
|
||||
Manager::StateType getStateType();
|
||||
void create();
|
||||
void init();
|
||||
@@ -1229,6 +1230,8 @@ Manager::StateType EditMemoState::getStateType() {
|
||||
|
||||
inline State::~State() {}
|
||||
|
||||
AppearMemoState::~AppearMemoState() {}
|
||||
|
||||
Manager::StateType AppearMemoState::getStateType() {
|
||||
return Manager::ST_Appearing;
|
||||
}
|
||||
@@ -1242,3 +1245,48 @@ Manager::StateType DispMemoState::getStateType() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data) {
|
||||
mfStartPoint = start;
|
||||
mfEndPoint = end;
|
||||
mfAnimationTime = duration;
|
||||
mfCurrentFrame = 0.0f;
|
||||
mbInAnimation = true;
|
||||
mpAnimObserver = observer;
|
||||
mpData = data;
|
||||
mbSE = false;
|
||||
if (observer) observer->onAnmEvent(AnimObserver::AE_0, data);
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::calc() {
|
||||
if (mbInAnimation) {
|
||||
if (mfCurrentFrame < mfAnimationTime) {
|
||||
mfCurrentFrame = 1.0f + mfCurrentFrame;
|
||||
} else {
|
||||
if (mbInAnimation && mpAnimObserver) {
|
||||
mpAnimObserver->onAnmEvent(AnimObserver::AE_1, mpData);
|
||||
}
|
||||
mbInAnimation = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline f32 textinput::util::Animation::getValue() {
|
||||
return hermiteInterporation(mfCurrentFrame, 0.0f, mfStartPoint, 0.0f, mfAnimationTime, mfEndPoint, 0.0f);
|
||||
}
|
||||
|
||||
inline bool textinput::util::Animation::isActive() {
|
||||
return mbInAnimation;
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::setSEFlag(bool flag) {
|
||||
mbSE = flag;
|
||||
}
|
||||
|
||||
inline bool textinput::util::Animation::isSEFlag() {
|
||||
return mbSE;
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::stop() {
|
||||
mbInAnimation = false;
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
const char* forceName;
|
||||
u32 animationCount;
|
||||
u32 paneIndex = 0;
|
||||
do {
|
||||
for (; paneIndex < 25; ++paneIndex) {
|
||||
AnmPane* pane = NULL;
|
||||
const PaneAnimation& paneInfo = csPaneToAnimationInSign[paneIndex & 0xFFFF];
|
||||
switch (paneInfo.type) {
|
||||
@@ -260,8 +260,7 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
}
|
||||
++animationIndex;
|
||||
}
|
||||
++paneIndex;
|
||||
} while (paneIndex < 25);
|
||||
}
|
||||
init();
|
||||
}
|
||||
|
||||
|
||||
@@ -111,12 +111,13 @@ void WithZi::init() {
|
||||
|
||||
void WithZi::clearCandidates() {
|
||||
if (mbDictionaryOpen != 0) {
|
||||
u16* const candidates = CandidatesBuffer;
|
||||
mInputLength = 0;
|
||||
mCandidateCount = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(CandidatesBuffer, 0, 0x200);
|
||||
memset(CandidatesBuffer + 0x100, 0, 0x1fe);
|
||||
memset(CandidatesBuffer + 0x200, 0, 0x200);
|
||||
memset(candidates, 0, 0x200);
|
||||
memset(candidates + 0x100, 0, 0x1fe);
|
||||
memset(candidates + 0x200, 0, 0x200);
|
||||
memset(CandidatedWord, 0, 0x1400);
|
||||
memset(&mSearch, 0, sizeof(mSearch) + sizeof(mSearchState));
|
||||
mSearch.language = getPredictLanguage();
|
||||
@@ -125,7 +126,7 @@ void WithZi::clearCandidates() {
|
||||
mSearch.context = 1;
|
||||
mSearch.getOptions = 0x81;
|
||||
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&candidates[0x200]);
|
||||
mSearch.maxCandidates = 0x28;
|
||||
mSearch.elementCount = 0;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -510,12 +511,14 @@ scanDone:
|
||||
}
|
||||
|
||||
u32 WithZi::setElementBuffer() {
|
||||
u16* elements;
|
||||
u16* candidates;
|
||||
u16 inputCharacter;
|
||||
u32 count = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
|
||||
u16* elements = ElementBuffer;
|
||||
u16* candidates = CandidatesBuffer;
|
||||
u16 inputCharacter;
|
||||
elements = ElementBuffer;
|
||||
candidates = CandidatesBuffer;
|
||||
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
|
||||
u16 index = count;
|
||||
elements[index] = inputCharacter;
|
||||
|
||||
@@ -1179,8 +1179,14 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mState != STATE_NORMAL || mMode != 0) {
|
||||
return;
|
||||
switch (mState) {
|
||||
case STATE_NORMAL:
|
||||
if (mMode == 0) {
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mpFriendCache->isThere(buttonNo + mPage * BTN_MAX)) {
|
||||
@@ -1425,10 +1431,7 @@ namespace ipl {
|
||||
|
||||
if (con->downTrg(controller::BTN_INTERACT)) {
|
||||
Button* button = static_cast<Button*>(System::getScene(SCENE_BUTTON));
|
||||
if (mState != STATE_COVER_NORMAL && mState != STATE_NORMAL) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (mState == STATE_COVER_NORMAL || mState == STATE_NORMAL) {
|
||||
if (Button::cmpButtonName(paneName, Button::BTN_EXIT) == 0) {
|
||||
MailAddressSelect* mailAddrSel = static_cast<MailAddressSelect*>(System::getScene(SCENE_MAIL_ADDRESS_SELECT));
|
||||
button->animation(Button::IDANIM_SELECT_CALENDAR_EXIT);
|
||||
@@ -1477,7 +1480,7 @@ namespace ipl {
|
||||
snd::getSystem()->startSE("WIPL_SE_FL_PAGE_DEC");
|
||||
onPreviousPage();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
// fallthrough
|
||||
}
|
||||
@@ -1589,7 +1592,7 @@ namespace ipl {
|
||||
math::VEC2 offset;
|
||||
offset.y = sPageOffset.y * PAGE_MAX;
|
||||
offset.x = sPageOffset.x * PAGE_MAX;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), math::VEC2(offset));
|
||||
mpLayout->getAnim(4)->setAnmType(0);
|
||||
mpLayout->getAnim(4)->play();
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
@@ -1777,16 +1780,17 @@ namespace ipl {
|
||||
nw4r::math::VEC3 baseTrans = mpLayout->FindPaneByName("N_base_move")->GetTranslate();
|
||||
math::VEC2 pos = System::getControllerManager()->getController(mDrag.mChan)->getDpdProjectionPos();
|
||||
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName("T_name_move"));
|
||||
const u16* name = mpFriendCache->getInfo(mDrag.mButton + mDrag.mPage * BTN_MAX).attr.name;
|
||||
const NWC24FriendInfo& info = mpFriendCache->getInfo(mDrag.mButton + mDrag.mPage * BTN_MAX);
|
||||
|
||||
f32 width = 0.0f;
|
||||
if (textBox != NULL && name != NULL) {
|
||||
const u16* name;
|
||||
if (textBox != NULL && (name = info.attr.name) != NULL) {
|
||||
textBox->GetFont()->GetWidth();
|
||||
for (; *name != 0; name++) {
|
||||
width += textBox->GetFont()->GetCharWidth(*name);
|
||||
}
|
||||
width += 0.01f;
|
||||
}
|
||||
width += 0.01f;
|
||||
|
||||
nw4r::ut::Rect rect;
|
||||
nw4r::ut::Rect rect4x3;
|
||||
@@ -1940,11 +1944,10 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void FriendListCache::update(u32 index, const wchar_t* name, u64 fdId) {
|
||||
NWC24FriendInfo* info = &mInfos[index];
|
||||
info->attr.fdId = fdId;
|
||||
memset(info->attr.name, 0, sizeof(info->attr.name));
|
||||
wcsncpy((wchar_t*)info->attr.name, name, 10);
|
||||
System::getNwc24Manager()->updateFriendInfo(info, index);
|
||||
mInfos[index].attr.fdId = fdId;
|
||||
memset(mInfos[index].attr.name, 0, sizeof(mInfos[index].attr.name));
|
||||
wcsncpy((wchar_t*)mInfos[index].attr.name, name, 10);
|
||||
System::getNwc24Manager()->updateFriendInfo(&mInfos[index], index);
|
||||
}
|
||||
|
||||
void FriendListCache::del(u32 index) {
|
||||
|
||||
@@ -521,7 +521,8 @@ void ipl::scene::AddressEdit::create() {
|
||||
set_textbox(textPane, friendText);
|
||||
textPane = (mpCodeLayout)
|
||||
->getNW4RLyt()->GetRootPane()->FindPaneByName("T_frnd_crd_00", true);
|
||||
set_textbox(textPane, mString.mDisplayText);
|
||||
friendText = mString.mDisplayText;
|
||||
set_textbox(textPane, friendText);
|
||||
mState = 0;
|
||||
break;
|
||||
}
|
||||
@@ -2118,6 +2119,8 @@ void ipl::scene::AddressEdit::start_point_event(
|
||||
|
||||
state0:
|
||||
switch (buttonNo) {
|
||||
case 4:
|
||||
goto done;
|
||||
case 0:
|
||||
goto state0Button0;
|
||||
case 1:
|
||||
@@ -2226,6 +2229,8 @@ void ipl::scene::AddressEdit::start_left_event(const char* paneName) {
|
||||
switch (mState) {
|
||||
case 0:
|
||||
switch (buttonNo) {
|
||||
case 4:
|
||||
break;
|
||||
case 0: {
|
||||
if (mpFriendCache->getInfo(mSelectedFriend).attr.status != 2) {
|
||||
break;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#define IPL_SDMEMORY_TITLE_CACHE_ACCESS
|
||||
|
||||
#define IPL_SDMEMORY_SCROLLER_INIT_OUT_OF_LINE
|
||||
#define IPL_SDMEMORY_SET_TRANSLATE_OUT_OF_LINE
|
||||
#define IPL_SDMEMORY_DIALOG_STATE_ACCESSOR
|
||||
@@ -8,6 +9,7 @@
|
||||
#define IPL_SDMEMORY_COMPLETION_PCT_ACCESSOR
|
||||
#define IPL_SDMEMORY_DIALOG_PROGRESS_FRAME_ACCESSOR
|
||||
#define IPL_SDMEMORY_SET_TEXT_COLORS
|
||||
#define IPL_SDMEMORY_TRIVIAL_COLOR_CTOR
|
||||
#define IPL_SDMEMORY_SCROLLER_STATE_ACCESSOR
|
||||
#include "system/iplDialogWindow.h"
|
||||
#undef IPL_SDMEMORY_DIALOG_PROGRESS_FRAME_ACCESSOR
|
||||
@@ -28,23 +30,6 @@
|
||||
#include "utility/iplLayout.h"
|
||||
#include <revolution/os/OSTime.h>
|
||||
|
||||
extern "C" bool iplSDChannelSelect_813DDB74(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ipl::scene::SDMemory::TitleRange* nandTitles,
|
||||
ipl::scene::SDMemory::TitleRange* sdTitles,
|
||||
ESTitleId* titleIds, wchar_t* titleNames, u32* titleCount,
|
||||
s32 state);
|
||||
extern "C" bool iplSDChannelSelect_813DB5EC(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId titleId);
|
||||
extern "C" bool iplSDChannelSelect_813DB4D4(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId titleId, u32 flags);
|
||||
extern "C" bool iplSDChannelSelect_813DB530(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId** titleNames, ESTitleId** secondaryTitles);
|
||||
extern "C" bool iplSDChannelSelect_813DB478(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId titleId);
|
||||
extern "C" bool iplSDChannelSelect_813DB58C(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId** titles, ESTitleId** secondaryTitles,
|
||||
ESTitleId** names);
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
typedef ::gui::Component GuiComponent;
|
||||
@@ -69,6 +54,13 @@ namespace ipl {
|
||||
SDMemory::~SDMemory() {}
|
||||
|
||||
void SDMemory::create(EGG::Heap* heap, nand::LayoutFile* layoutFile, SDChannelSelect* channelSelect) {
|
||||
s32 cachedTitleCount;
|
||||
const savedata::Manager* saveData;
|
||||
nw4r::lyt::TextBox* textBox;
|
||||
layout::Animator* scrollAnimator;
|
||||
ControlPaneEventHandler* controlEvent;
|
||||
TitlePaneEventHandler* titleEvent;
|
||||
DialogPaneEventHandler* dialogEvent;
|
||||
mpSDChannelSelect = channelSelect;
|
||||
|
||||
mpMainLayout = new layout::Object(heap, layoutFile, "arc", "mn_DialogWindow_ChChange_a.brlyt");
|
||||
@@ -89,7 +81,7 @@ namespace ipl {
|
||||
mpMainLayout->getAnim(5)->initAnmFrame();
|
||||
mpMainLayout->getAnim(8)->initAnmFrame();
|
||||
|
||||
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
|
||||
textBox->SetString(System::getMessage(0xB0));
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_05"));
|
||||
textBox->SetString(System::getMessage(0xBB));
|
||||
@@ -143,8 +135,8 @@ namespace ipl {
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_07"));
|
||||
textBox->SetString(System::getMessage(0xBA));
|
||||
|
||||
const savedata::Manager* saveData = System::getSaveData();
|
||||
s32 cachedTitleCount = 0;
|
||||
saveData = System::getSaveData();
|
||||
cachedTitleCount = 0;
|
||||
for (s32 i = 0; i < 48; ++i) {
|
||||
if (saveData->getTitleCacheEntry(i) == 0) {
|
||||
break;
|
||||
@@ -153,10 +145,12 @@ namespace ipl {
|
||||
}
|
||||
if (cachedTitleCount >= 5) {
|
||||
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(false);
|
||||
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(true);
|
||||
nw4r::lyt::Pane* expandedButton = mpTitleLayout->FindPaneByName("N_Btn_4");
|
||||
expandedButton->SetVisible(true);
|
||||
mDisplayMode = 4;
|
||||
} else {
|
||||
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(true);
|
||||
nw4r::lyt::Pane* compactButton = mpTitleLayout->FindPaneByName("N_Btn_3");
|
||||
compactButton->SetVisible(true);
|
||||
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(false);
|
||||
mDisplayMode = 3;
|
||||
}
|
||||
@@ -195,7 +189,7 @@ namespace ipl {
|
||||
mpDialogLayout->getAnim(11)->initAnmFrame();
|
||||
mpDialogLayout->getAnim(8)->initAnmFrame();
|
||||
mpDialogLayout->getAnim(18)->initAnmFrame();
|
||||
layout::Animator* scrollAnimator = mpDialogLayout->getAnim(18);
|
||||
scrollAnimator = mpDialogLayout->getAnim(18);
|
||||
scrollAnimator->initFrame();
|
||||
scrollAnimator->restart();
|
||||
|
||||
@@ -210,7 +204,7 @@ namespace ipl {
|
||||
mpDialogLayout->finishBinding();
|
||||
mpProgressLayout->getAnim(0)->initAnmFrame();
|
||||
|
||||
ControlPaneEventHandler* controlEvent = new ControlPaneEventHandler(this);
|
||||
controlEvent = new ControlPaneEventHandler(this);
|
||||
mpPaneManagers[0] = new gui::PaneManager(controlEvent, mpMainLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[0]->setupScene(mpMainLayout);
|
||||
mpPaneManagers[0]->setAllComponentTriggerTarget(false);
|
||||
@@ -218,7 +212,7 @@ namespace ipl {
|
||||
mpPaneManagers[0]->setTriggerTarget(mpMainLayout->FindPaneByName(sControlPaneNames[i]), true);
|
||||
}
|
||||
|
||||
TitlePaneEventHandler* titleEvent = new TitlePaneEventHandler(this);
|
||||
titleEvent = new TitlePaneEventHandler(this);
|
||||
mpPaneManagers[1] = new gui::PaneManager(titleEvent, mpTitleLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[1]->setupScene(mpTitleLayout);
|
||||
mpPaneManagers[1]->setAllComponentTriggerTarget(false);
|
||||
@@ -233,7 +227,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
DialogPaneEventHandler* dialogEvent = new DialogPaneEventHandler(this);
|
||||
dialogEvent = new DialogPaneEventHandler(this);
|
||||
mpPaneManagers[2] = new gui::PaneManager(dialogEvent, mpDialogLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[2]->setupScene(mpDialogLayout);
|
||||
mpPaneManagers[2]->setAllComponentTriggerTarget(false);
|
||||
@@ -714,8 +708,8 @@ namespace ipl {
|
||||
if (!mpMainLayout->isPlaying(-1)) {
|
||||
switch (mProcessState) {
|
||||
case 0:
|
||||
if (iplSDChannelSelect_813DDB74(mpSDChannelSelect, &mNandTitleRange, &mSDTitleRange,
|
||||
mTitleIds, &mTitleNames[0][0], &mTitleCount, 2)) {
|
||||
if (mpSDChannelSelect->collectTitlesForMode(&mNandTitleRange.mByteSize, &mSDTitleRange.mByteSize,
|
||||
mTitleIds, (char*)&mTitleNames[0][0], &mTitleCount, 2)) {
|
||||
mDialogState = 4;
|
||||
mpTitleLayout->getAnim(0)->initAnmFrame();
|
||||
mpTitleLayout->getAnim(0)->play();
|
||||
@@ -913,8 +907,8 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
if (iplSDChannelSelect_813DB530(mpSDChannelSelect, &mTitleListState.mpNames,
|
||||
&mTitleListState.mpSecondaryTitles)) {
|
||||
if (mpSDChannelSelect->enqueueErrorNotice((u32)&mTitleListState.mpNames,
|
||||
(u32)&mTitleListState.mpSecondaryTitles)) {
|
||||
mDialogState = 19;
|
||||
mCurrentTitleName[0] = L'\0';
|
||||
mCurrentTitle = 0;
|
||||
@@ -986,8 +980,8 @@ namespace ipl {
|
||||
|
||||
if (iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDChannelSelect_813DB478(mpSDChannelSelect, titleId)) {
|
||||
ESTitleId* curTitleId = &mTitleIds[mCurrentTitle];
|
||||
if (mpSDChannelSelect->enqueueMoveNotice((u32)curTitleId - offsetof(SDMemory, mTitleIds), ((u32*)curTitleId)[0], ((u32*)curTitleId)[1])) {
|
||||
mDialogState = 14;
|
||||
} else {
|
||||
System::getDialog()->terminate();
|
||||
@@ -1037,7 +1031,7 @@ namespace ipl {
|
||||
|
||||
void SDMemory::onDialogState16() {
|
||||
if (mTitleCount > mCurrentTitle && System::isReceiveScheduleStopped()) {
|
||||
if (iplSDChannelSelect_813DB4D4(mpSDChannelSelect, mTitleIds[mCurrentTitle], 0)) {
|
||||
if (mpSDChannelSelect->enqueueStateNotice(mTitleIds[mCurrentTitle], 0)) {
|
||||
mDialogState = 16;
|
||||
} else {
|
||||
System::getDialog()->terminate();
|
||||
@@ -1092,7 +1086,9 @@ namespace ipl {
|
||||
System::getDialog()->setTitleForSDMemory(mCurrentTitleName);
|
||||
|
||||
const ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDChannelSelect_813DB5EC(mpSDChannelSelect, titleId)) {
|
||||
if (mpSDChannelSelect->enqueueDeleteNotice((u32)&mTitleIds[mCurrentTitle] - offsetof(SDMemory, mTitleIds),
|
||||
((u32*)&mTitleIds[mCurrentTitle])[0],
|
||||
((u32*)&mTitleIds[mCurrentTitle])[1])) {
|
||||
mDialogState = 18;
|
||||
} else {
|
||||
System::getDialog()->terminate();
|
||||
@@ -1254,13 +1250,12 @@ namespace ipl {
|
||||
void SDMemory::drawTransferTitles() {
|
||||
const nw4r::math::VEC3& translation = mpDialogLayout->FindPaneByName("N_Memo")->GetTranslate();
|
||||
nw4r::math::VEC3 memoPosition;
|
||||
f32 bodyY = translation.y;
|
||||
memoPosition.x = translation.x;
|
||||
memoPosition.y = translation.y;
|
||||
memoPosition.y = bodyY;
|
||||
memoPosition.z = translation.z;
|
||||
mpDialogLayout->FindPaneByName("header_header");
|
||||
nw4r::lyt::Pane* bodyPane = mpDialogLayout->FindPaneByName("header_body");
|
||||
|
||||
f32 bodyY = memoPosition.y;
|
||||
if (bodyY < 500.0f) {
|
||||
mpDialogLayout->draw("header_header");
|
||||
}
|
||||
@@ -1279,9 +1274,12 @@ namespace ipl {
|
||||
if (mNandTitleCount != 0) {
|
||||
const wchar_t* messageForCount = System::getMessage(0xCB);
|
||||
const wchar_t* newline = wcsstr(messageForCount, L"\n");
|
||||
while (newline != NULL) {
|
||||
++lineCount;
|
||||
newline = wcsstr(newline + 1, L"\n");
|
||||
if (newline != NULL) {
|
||||
const wchar_t* separator = L"\n";
|
||||
while (newline != NULL) {
|
||||
++lineCount;
|
||||
newline = wcsstr(newline + 1, separator);
|
||||
}
|
||||
}
|
||||
|
||||
const wchar_t* messageLine = System::getMessage(0xCB);
|
||||
@@ -1289,13 +1287,14 @@ namespace ipl {
|
||||
mpDialogLayout->FindPaneByName("T_Header_body"));
|
||||
s32 totalLines = lineCount + 1;
|
||||
s32 lineIndex = 0;
|
||||
const wchar_t* lineSeparator = L"\n";
|
||||
if (lineIndex < totalLines) {
|
||||
do {
|
||||
const wchar_t* lineEnd = wcsstr(messageLine, L"\n");
|
||||
while (lineIndex < totalLines) {
|
||||
const wchar_t* lineEnd = wcsstr(messageLine, lineSeparator);
|
||||
if (lineEnd == NULL) {
|
||||
utility::layout::set_string(messageText, messageLine);
|
||||
} else {
|
||||
u32 lineLength = static_cast<u32>(lineEnd - messageLine);
|
||||
s32 lineLength = lineEnd - messageLine;
|
||||
wcsncpy(mCurrentTitleName, messageLine, lineLength);
|
||||
mCurrentTitleName[lineLength] = L'\0';
|
||||
utility::layout::set_string(messageText, mCurrentTitleName);
|
||||
@@ -1311,7 +1310,7 @@ namespace ipl {
|
||||
|
||||
messageOffset -= bodyHeight;
|
||||
++lineIndex;
|
||||
} while (lineIndex < totalLines);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1335,20 +1334,14 @@ namespace ipl {
|
||||
for (u32 titleIndex = 0; titleIndex < mTitleCount; ++titleIndex) {
|
||||
utility::layout::set_string(titleText, mTitleNames[titleIndex]);
|
||||
if (nandTitleIndex < mNandTitleCount && mTitleIds[titleIndex] == mNandTitleIds[nandTitleIndex]) {
|
||||
GXColor gxActive;
|
||||
writeFourFlagBytes(&gxActive.r, 0x34, 0xBE, 0xED, 0xFF);
|
||||
nw4r::ut::Color activeColor;
|
||||
writeFourFlagBytes(&activeColor.r, 0x34, 0xBE, 0xED, 0xFF);
|
||||
++nandTitleIndex;
|
||||
nw4r::ut::Color active0 = *reinterpret_cast<const nw4r::ut::Color*>(&gxActive);
|
||||
setTitleRowColors(titleText,
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxActive)),
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxActive)));
|
||||
setTitleRowColors(titleText, nw4r::ut::Color(activeColor), nw4r::ut::Color(activeColor));
|
||||
} else {
|
||||
GXColor gxInactive;
|
||||
writeFourFlagBytes(&gxInactive.r, 0x64, 0x64, 0x64, 0xFF);
|
||||
nw4r::ut::Color inactive0 = *reinterpret_cast<const nw4r::ut::Color*>(&gxInactive);
|
||||
setTitleRowColors(titleText,
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxInactive)),
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxInactive)));
|
||||
nw4r::ut::Color inactiveColor;
|
||||
writeFourFlagBytes(&inactiveColor.r, 0x64, 0x64, 0x64, 0xFF);
|
||||
setTitleRowColors(titleText, nw4r::ut::Color(inactiveColor), nw4r::ut::Color(inactiveColor));
|
||||
}
|
||||
|
||||
nw4r::ut::Rect textRect = mpDialogLayout->getTextDrawRect("T_Letter");
|
||||
@@ -1628,23 +1621,23 @@ namespace ipl {
|
||||
switch (paneIndex) {
|
||||
case 0:
|
||||
animator = mpTitleLayout->getAnim(7);
|
||||
iplSDChannelSelect_813DDB74(mpSDChannelSelect, &mNandTitleRange, &mSDTitleRange,
|
||||
mTitleIds, &mTitleNames[0][0], &mTitleCount, 0);
|
||||
mpSDChannelSelect->collectTitlesForMode(&mNandTitleRange.mByteSize, &mSDTitleRange.mByteSize,
|
||||
mTitleIds, (char*)&mTitleNames[0][0], &mTitleCount, 0);
|
||||
break;
|
||||
case 1:
|
||||
animator = mpTitleLayout->getAnim(10);
|
||||
iplSDChannelSelect_813DDB74(mpSDChannelSelect, &mNandTitleRange, &mSDTitleRange,
|
||||
mTitleIds, &mTitleNames[0][0], &mTitleCount, 1);
|
||||
mpSDChannelSelect->collectTitlesForMode(&mNandTitleRange.mByteSize, &mSDTitleRange.mByteSize,
|
||||
mTitleIds, (char*)&mTitleNames[0][0], &mTitleCount, 1);
|
||||
break;
|
||||
case 2:
|
||||
animator = mpTitleLayout->getAnim(13);
|
||||
iplSDChannelSelect_813DDB74(mpSDChannelSelect, &mNandTitleRange, &mSDTitleRange,
|
||||
mTitleIds, &mTitleNames[0][0], &mTitleCount, 2);
|
||||
mpSDChannelSelect->collectTitlesForMode(&mNandTitleRange.mByteSize, &mSDTitleRange.mByteSize,
|
||||
mTitleIds, (char*)&mTitleNames[0][0], &mTitleCount, 2);
|
||||
break;
|
||||
case 3:
|
||||
animator = mpTitleLayout->getAnim(16);
|
||||
iplSDChannelSelect_813DDB74(mpSDChannelSelect, &mNandTitleRange, &mSDTitleRange,
|
||||
mTitleIds, &mTitleNames[0][0], &mTitleCount, 3);
|
||||
mpSDChannelSelect->collectTitlesForMode(&mNandTitleRange.mByteSize, &mSDTitleRange.mByteSize,
|
||||
mTitleIds, (char*)&mTitleNames[0][0], &mTitleCount, 3);
|
||||
break;
|
||||
case 4:
|
||||
animator = mpTitleLayout->getAnim(4);
|
||||
@@ -1670,10 +1663,9 @@ namespace ipl {
|
||||
mTitleListState.mSecondaryCount = 0;
|
||||
mTitleListState.mpNames = mSDTitleIds;
|
||||
mTitleListState.mNameCount = 0;
|
||||
iplSDChannelSelect_813DB58C(mpSDChannelSelect,
|
||||
&mTitleListState.mpTitles,
|
||||
&mTitleListState.mpSecondaryTitles,
|
||||
&mTitleListState.mpNames);
|
||||
mpSDChannelSelect->enqueueCommandNotice((u32)&mTitleListState.mpTitles,
|
||||
(u32)&mTitleListState.mpSecondaryTitles,
|
||||
(u32)&mTitleListState.mpNames);
|
||||
}
|
||||
|
||||
if (paneIndex == 4) {
|
||||
|
||||
@@ -729,11 +729,10 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
if (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
|
||||
return;
|
||||
}
|
||||
setDialogMessage(1, 0);
|
||||
int result = mpSDWorker->get_async_result();
|
||||
switch (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
|
||||
default:
|
||||
setDialogMessage(1, 0);
|
||||
int result = mpSDWorker->get_async_result();
|
||||
if (result == NandSDWorker::RESULT_OK ||
|
||||
result == NandSDWorker::RESULT_SD_APP_LOC_NOT_FOUND) {
|
||||
for (int channelIndex = 0; channelIndex < mPageCount * 12;
|
||||
@@ -807,6 +806,10 @@ namespace ipl {
|
||||
mbSDCardBroken = true;
|
||||
}
|
||||
refreshAfterSDTitleList();
|
||||
break;
|
||||
case true:
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void SDChannelSelect::handleSDMountComplete() {
|
||||
@@ -1695,7 +1698,7 @@ namespace ipl {
|
||||
if (mState == 2 && !mpLayout->isPlaying(0)) {
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
if (button != NULL) {
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
button->setEventHandler((::gui::EventHandler*)button, mpButtonEventHandler);
|
||||
mState = 3;
|
||||
if (mCurrentPage > 0) {
|
||||
button->initArrowAppearance(1, true);
|
||||
@@ -2257,7 +2260,7 @@ namespace ipl {
|
||||
mbRightArrowVisible = false;
|
||||
}
|
||||
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
button->setEventHandler((::gui::EventHandler*)button, mpButtonEventHandler);
|
||||
TVRCManager::getHandle()->setEnable(TRUE);
|
||||
snd::getSystem()->startBGM("WIPL_BGM_MENU");
|
||||
clearNoticeQueue();
|
||||
@@ -2639,7 +2642,7 @@ namespace ipl {
|
||||
button->animation(SDButton::IDANIM_ARROW_RIGHT_DISAPPEAR);
|
||||
}
|
||||
button->disableBtn();
|
||||
button->setEventHandler(NULL);
|
||||
button->setEventHandler((::gui::EventHandler*)button, NULL);
|
||||
mCurrentChannelIndex = index;
|
||||
mState = 5;
|
||||
snd::getSystem()->startSE("WIPL_SE_BT_PUSH");
|
||||
@@ -3458,57 +3461,55 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
|
||||
if (event == 0) {
|
||||
switch (event) {
|
||||
default: return;
|
||||
case 0: break;
|
||||
}
|
||||
{
|
||||
if (mpScene->mState == 1) {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_OUT) {
|
||||
if (con != NULL) {
|
||||
if (con->downTrg(0x00100800)) {
|
||||
SDButton* button = static_cast<SDButton*>(
|
||||
System::getSceneManager()->getScene(0x24));
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_HELP]) == 0) {
|
||||
mpScene->mOperationResult = 0;
|
||||
mpScene->mState = 26;
|
||||
button->animation(4);
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_WII_MENU]) == 0) {
|
||||
button->setEventHandler(NULL);
|
||||
mpScene->mState = 4;
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_ARROW_LEFT]) == 0 &&
|
||||
mpScene->mCurrentPage > 0) {
|
||||
button->animation(7);
|
||||
mpScene->setStateAndPlaySelectSound(8);
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_ARROW_RIGHT]) == 0 &&
|
||||
mpScene->mCurrentPage < mpScene->mPageCount - 1) {
|
||||
button->animation(8);
|
||||
mpScene->setStateAndPlaySelectSound(9);
|
||||
}
|
||||
} else {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_OUT) {
|
||||
if (con != NULL) {
|
||||
if (con->downTrg(0x00100800)) {
|
||||
SDButton* button = static_cast<SDButton*>(
|
||||
System::getSceneManager()->getScene(0x24));
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_HELP]) == 0) {
|
||||
mpScene->mOperationResult = 0;
|
||||
mpScene->mState = 26;
|
||||
button->animation(4);
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
return;
|
||||
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_WII_MENU]) == 0) {
|
||||
button->setEventHandler((::gui::EventHandler*)button, NULL);
|
||||
mpScene->mState = 4;
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_ARROW_LEFT]) == 0 &&
|
||||
mpScene->mCurrentPage > 0) {
|
||||
button->animation(7);
|
||||
mpScene->setStateAndPlaySelectSound(8);
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_ARROW_RIGHT]) == 0 &&
|
||||
mpScene->mCurrentPage < mpScene->mPageCount - 1) {
|
||||
button->animation(8);
|
||||
mpScene->setStateAndPlaySelectSound(9);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SDChannelSelect::startResetting() {
|
||||
snd::getSystem()->resetAllSound();
|
||||
clearCommandQueue();
|
||||
|
||||
@@ -282,7 +282,7 @@ FaderSceneCommand SDChannelTitle::calcFadein() {
|
||||
if (!mpFade->isPlaying()) {
|
||||
iplSDChannelTitle_playBannerIntro(this);
|
||||
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
button->setEventHandler((::gui::EventHandler*)button, mpButtonEventHandler);
|
||||
button->animation(13);
|
||||
button->animation(14);
|
||||
mState = 1;
|
||||
@@ -344,7 +344,7 @@ void SDChannelTitle::initCalcFadeout() {
|
||||
button->animation(15);
|
||||
button->animation(16);
|
||||
}
|
||||
button->setEventHandler(NULL);
|
||||
button->setEventHandler((::gui::EventHandler*)button, NULL);
|
||||
}
|
||||
|
||||
FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
@@ -736,7 +736,8 @@ extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene) {
|
||||
if (channel->mStateFlags == 3) {
|
||||
scene->mState = 26;
|
||||
scene->mErrorMessage = 0xaf;
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(scene->mTitleId, reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(0, static_cast<u32>(scene->mTitleId >> 32),
|
||||
static_cast<u32>(scene->mTitleId), reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
scene->mState = 20;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
@@ -825,7 +826,8 @@ extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene) {
|
||||
ESTitleId temporaryTitle = SCGetTmpTitleID();
|
||||
if (temporaryTitle && scene->mTitleId != temporaryTitle) {
|
||||
if (System::isReceiveScheduleStopped()) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(temporaryTitle, 1)) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(0, static_cast<u32>(temporaryTitle >> 32),
|
||||
static_cast<u32>(temporaryTitle), 1)) {
|
||||
scene->mState = 16;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
@@ -1354,8 +1356,7 @@ extern "C" void iplSDChannelTitle_flushSaveBeforeExit(SDChannelTitle* scene, int
|
||||
System::getSaveData()->pushTitleCache(scene->mTitleId);
|
||||
}
|
||||
System::getSaveData()->getSDPrevPage() = scene->mPage;
|
||||
EGG::Heap* saveHeap = System::getMem2App();
|
||||
scene->mpSaveFile = System::getSaveData()->flushAsync(saveHeap);
|
||||
scene->mpSaveFile = System::getSaveData()->flushAsync(System::getMem2App());
|
||||
__WPADReconnect(TRUE);
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ struct AOSSAccessPoint {
|
||||
u8 bssid[6];
|
||||
u16 capabilities;
|
||||
u32 rateCount;
|
||||
u8 rates[12];
|
||||
u8 rates[16];
|
||||
u32 beaconPeriod;
|
||||
u32 mode;
|
||||
};
|
||||
@@ -84,7 +84,7 @@ void* AOSSi_Alloc(u32 size) {
|
||||
}
|
||||
|
||||
void AOSSi_Free(void* block) {
|
||||
if (releaseMemory != NULL) {
|
||||
if (releaseMemory) {
|
||||
releaseMemory(0, block, 0);
|
||||
}
|
||||
}
|
||||
@@ -129,15 +129,15 @@ int AOSSi_EndLocal(void) {
|
||||
int AOSSi_WLANGetBSSList(struct AOSSAccessPointList** output) {
|
||||
int result = -1;
|
||||
int startupRetries = 0;
|
||||
int scanRetries = 0;
|
||||
int cleanupRetries = 0;
|
||||
WDScanParam scan ATTRIBUTE_ALIGN(32);
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
int unlockRetries = 0;
|
||||
int driver;
|
||||
u8* buffer;
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
WDScanParam scan;
|
||||
int cleanupRetries = 0;
|
||||
int scanRetries = 0;
|
||||
u8 macAddress[6];
|
||||
if (allocateMemory == NULL || releaseMemory == NULL) {
|
||||
if (!allocateMemory || !releaseMemory) {
|
||||
return -1;
|
||||
}
|
||||
driver = NCDLockWirelessDriver();
|
||||
@@ -157,7 +157,7 @@ startup:
|
||||
memcpy(macAddress, info.MAC, 6);
|
||||
}
|
||||
buffer = AOSSi_Alloc(0x3200);
|
||||
if (buffer != NULL) {
|
||||
if (buffer) {
|
||||
memset(buffer, 0, 0x3200);
|
||||
scan.channelBit = info.enableChannel;
|
||||
scan.maxChannelTime = 40;
|
||||
@@ -178,37 +178,37 @@ startup:
|
||||
count = *(u16*)buffer;
|
||||
if (count != 0) {
|
||||
list = AOSSi_Alloc(sizeof(*list) + (count - 1) * sizeof(struct AOSSAccessPoint));
|
||||
if (list == NULL) {
|
||||
if (!list) {
|
||||
result = -1;
|
||||
break;
|
||||
}
|
||||
list->count = count;
|
||||
descriptor = (WDBssDesc*)&buffer[2];
|
||||
for (index = 0; index < count; ++index) {
|
||||
struct AOSSAccessPoint* accessPoint = &list->accessPoints[index];
|
||||
int rate;
|
||||
int rateCount = 0;
|
||||
accessPoint->ssidLength = descriptor->ssidLength;
|
||||
memcpy(accessPoint->ssid, descriptor->ssid, 32);
|
||||
accessPoint->channel = descriptor->channel;
|
||||
memcpy(accessPoint->bssid, descriptor->bssid, 6);
|
||||
int rateCount;
|
||||
list->accessPoints[index].ssidLength = descriptor->ssidLength;
|
||||
memcpy(list->accessPoints[index].ssid, descriptor->ssid, 32);
|
||||
list->accessPoints[index].channel = descriptor->channel;
|
||||
memcpy(list->accessPoints[index].bssid, descriptor->bssid, 6);
|
||||
rateCount = 0;
|
||||
for (rate = 0; rate < 12; ++rate) {
|
||||
if (descriptor->rateSet.support & supportedRates[rate].mask) {
|
||||
accessPoint->rates[rateCount] = supportedRates[rate].value;
|
||||
list->accessPoints[index].rates[rateCount] = supportedRates[rate].value;
|
||||
if (descriptor->rateSet.basic & supportedRates[rate].mask) {
|
||||
accessPoint->rates[rateCount] |= 128;
|
||||
list->accessPoints[index].rates[rateCount] |= 128;
|
||||
}
|
||||
++rateCount;
|
||||
}
|
||||
}
|
||||
accessPoint->rateCount = rateCount;
|
||||
accessPoint->beaconPeriod = descriptor->beaconPeriod;
|
||||
list->accessPoints[index].rateCount = rateCount;
|
||||
list->accessPoints[index].beaconPeriod = descriptor->beaconPeriod;
|
||||
if ((descriptor->capabilities & 3) == 1) {
|
||||
accessPoint->mode = 1;
|
||||
list->accessPoints[index].mode = 1;
|
||||
} else if ((descriptor->capabilities & 3) == 2) {
|
||||
accessPoint->mode = 2;
|
||||
list->accessPoints[index].mode = 2;
|
||||
} else {
|
||||
accessPoint->mode = 0;
|
||||
list->accessPoints[index].mode = 0;
|
||||
}
|
||||
descriptor = (WDBssDesc*)((u16*)descriptor + descriptor->length);
|
||||
}
|
||||
@@ -222,7 +222,7 @@ startup:
|
||||
}
|
||||
if (++scanRetries > 10) {
|
||||
list = AOSSi_Alloc(sizeof(*list));
|
||||
if (list == NULL) {
|
||||
if (!list) {
|
||||
result = -1;
|
||||
break;
|
||||
}
|
||||
@@ -236,31 +236,29 @@ startup:
|
||||
AOSSi_Free(buffer);
|
||||
}
|
||||
cleanup:
|
||||
if (WD_Cleanup() != 0) {
|
||||
while (WD_Cleanup() != 0) {
|
||||
if (cleanupRetries > 10) {
|
||||
result = -1;
|
||||
goto unlock;
|
||||
}
|
||||
++cleanupRetries;
|
||||
AOSSi_SleepMs(10);
|
||||
goto cleanup;
|
||||
}
|
||||
unlock:
|
||||
if (NCDUnlockWirelessDriver(driver) != 0) {
|
||||
while (NCDUnlockWirelessDriver(driver) != 0) {
|
||||
if (unlockRetries > 10) {
|
||||
result = -1;
|
||||
return -1;
|
||||
break;
|
||||
}
|
||||
++unlockRetries;
|
||||
AOSSi_SleepMs(10);
|
||||
goto unlock;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionStatus* status) {
|
||||
int retries = 0;
|
||||
int result = 0;
|
||||
int result;
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
NCDIfConfig* interfaceConfig = &AOSSi_NcdIfConfig;
|
||||
NCDIpConfig* ipConfig;
|
||||
@@ -288,6 +286,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
interfaceConfig->netif.wireless.config.manual.ssidLength = (u8)connection->ssidLength;
|
||||
memcpy(interfaceConfig->netif.wireless.config.manual.ssid, connection->ssid, connection->ssidLength);
|
||||
result = 0;
|
||||
ipConfig = &AOSSi_NcdIpConfig;
|
||||
memset(ipConfig, 0, sizeof(*ipConfig));
|
||||
ipConfig->adjust.maxTransferUnit = 1300;
|
||||
@@ -321,13 +320,14 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
}
|
||||
if (result == 0) {
|
||||
u32 ssidLength;
|
||||
status->connected = 1;
|
||||
if (WD_GetInfo(&info) == 0) {
|
||||
status->channel = info.channel;
|
||||
}
|
||||
status->ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
|
||||
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid,
|
||||
interfaceConfig->netif.wireless.config.manual.ssidLength);
|
||||
ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
|
||||
status->ssidLength = ssidLength;
|
||||
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid, ssidLength);
|
||||
} else {
|
||||
status->connected = 0;
|
||||
}
|
||||
|
||||
@@ -1245,3 +1245,248 @@ Immediate matching stack store/reload pairs in remaining targets: []. No definit
|
||||
- libs/RVL_SDK/src/kpad/KPAD calc_dpd_variable 94.82%; 3 successfully built distinct source trials; smoothing/projected geometry floating scheduling,250/250.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADRead 97.52723%; 3 successfully built distinct source trials; sample loop/polling temporaries and branch scheduling,459/459.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADInit 96.51351%; 3 successfully built distinct source trials; controller/ring initialization and floating scheduling,185/185.
|
||||
|
||||
# Round 4: fresh origin/main after KPAD reset and continuation landed
|
||||
Initial all-unit quick gate PASS. Pools checked explicitly first: address57/57, SD101/101, KPAD0/0. All owned data100%; no rename or extent edit needed. Current round uses new combinations of lifetime/alias boundaries and inline temporaries, rather than replaying prior variants.
|
||||
|
||||
## src/scene/address/iplAddressEdit create__Q33ipl5scene11AddressEditFv
|
||||
Fetch origin/main adcd8ca586dc4ad15c62df304e560a7c974f1c12. Initial assembly diagnosis: (19, 323) structural/positional differences; instructions 820/820
|
||||
Remote source equals tested HEAD; still open 97.44634%. Structural diagnosis: 820/820; frame/branch shape agrees, layout/event lifetime and floating/register scheduling remain. Probe heap and owner const views before allocation tuning.
|
||||
- name immutable scene heap once for all layout allocations: (24, 793) structural/positional; instructions 821/820; restored.
|
||||
- construct GUI handler objects through named parent view: (19, 323) structural/positional; instructions 820/820; restored.
|
||||
- read completed code layout through const object view for label setup: build failed ^ # (10184) return value expected ### mwcceppc.exe Compiler: # 317: } # Warning: ^ # (10184) return value expected ### mwcceppc.exe Compiler: # 438: nw4r::lyt::Pane* textPane = codeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_crd_btn_00", true); # Error: ^ # (10248) function call '[const ipl::layout::Object].getNW4RLyt()' does not # match # 'ipl::layout::Object::getNW4RLyt()' (non-static) # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. ; restored.
|
||||
|
||||
## src/scene/address/iplAddressEdit get_friendinfo__Q33ipl5scene11AddressEditFv
|
||||
Fetch origin/main adcd8ca586dc4ad15c62df304e560a7c974f1c12. Initial assembly diagnosis: (10, 68) structural/positional differences; instructions 82/84
|
||||
Remote source equals tested HEAD; still open 88.03571%. Structural diagnosis: 82/84; identical stack buffer extent, name/display pointer addresses should remain live across pane lookup; cache-copy source/destination order differs.
|
||||
- combine mutable String and friend-record references: (20, 45) structural/positional; instructions 81/84; restored.
|
||||
- combine String view with reusable pane/text temporaries: (10, 39) structural/positional; instructions 83/84; restored.
|
||||
- name cached friend source and destination before copy: (10, 68) structural/positional; instructions 82/84; restored.
|
||||
|
||||
## src/scene/address/iplAddressEdit update_friendinfo__Q33ipl5scene11AddressEditFv
|
||||
Fetch origin/main adcd8ca586dc4ad15c62df304e560a7c974f1c12. Initial assembly diagnosis: (2, 2) structural/positional differences; instructions 38/38
|
||||
Remote source equals tested HEAD; still open 99.42105%. Structural diagnosis: 38/38; sole two differences exchange memcpy source and destination addi order, not register-only. Test typed inputs and narrower local boundaries.
|
||||
- source create-id pointer declared after name-copy call: (2, 2) structural/positional; instructions 38/38; restored.
|
||||
- mutable string view and const create-id view combined: (2, 2) structural/positional; instructions 38/38; restored.
|
||||
- initialize friend-id destination pointer at memcpy boundary: (2, 2) structural/positional; instructions 38/38; restored.
|
||||
|
||||
## src/scene/address/iplAddressEdit set_err_msg__Q33ipl5scene11AddressEditFPwUl8NWC24Err
|
||||
Fetch origin/main adcd8ca586dc4ad15c62df304e560a7c974f1c12. Initial assembly diagnosis: (1, 30) structural/positional differences; instructions 76/75
|
||||
Remote source equals tested HEAD; still open 98.666664%. Structural diagnosis: 76/75; extra initialized default retained for unrecognized error; target leaves value unspecified. No uninitialized-value trial allowed; check safe selection boundary and local scope.
|
||||
- safe default initialized at error-message buffer declaration: (2, 45) structural/positional; instructions 77/75; restored.
|
||||
- switch collapsed to initialized default with network override: (12, 29) structural/positional; instructions 67/75; restored.
|
||||
- message pointer is immutable after exhaustive safe error selection: (1, 30) structural/positional; instructions 76/75; restored.
|
||||
|
||||
# Round 4: fresh origin/main after KPAD reset and continuation landed
|
||||
Initial all-unit quick gate PASS. Pools checked explicitly first: address57/57, SD101/101, KPAD0/0. All owned data100%; no rename or extent edit needed. Current round uses new combinations of lifetime/alias boundaries and inline temporaries, rather than replaying prior variants.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect create__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 68c4c9aeac0b0f28264f43f7c301ab20d873fb12. Initial assembly diagnosis: (4, 39) structural/positional differences; instructions 145/146
|
||||
Remote source equals tested HEAD; still open 97.73972%. Structural diagnosis: 145/146; earlier duration diagnosis was incomplete. Actual missing instruction is BS2-manager reload at loop-body entry; target has independent global and string bases, source reuses condition pointer. Frame matches; test loop boundaries first.
|
||||
- explicit endless loop with state-eight exit: (9, 40) structural/positional; instructions 145/146; restored.
|
||||
- name BS2 polling manager at each condition evaluation: build failed ne\iplSceneManager.h:14 # Z:\mnt\drive2\projects\wii-ipl-workers\data-d5\include\iplSceneUI.h:11 # Z:\mnt\drive2\projects\wii-ipl-workers\data- # d5\src\scene\sdChannelSelect\iplSDChannelSelect.cpp:6) ### mwcceppc.exe Compiler: # File: src\scene\sdChannelSelect\iplSDChannelSelect.cpp # --------------------------------------------------------- # 243: BS2Manager* manager; # Error: ^^^^^^^^^^ # (10140) undefined identifier 'BS2Manager' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. ; restored.
|
||||
- goto polling loop separates state query and update blocks: (4, 39) structural/positional; instructions 145/146; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 68c4c9aeac0b0f28264f43f7c301ab20d873fb12. Initial assembly diagnosis: (4, 143) structural/positional differences; instructions 170/171
|
||||
Remote source equals tested HEAD; still open 99.15205%. Structural diagnosis: 170/171; branch form requires second success beq8 plus b failure; compaction count r8 vsr6. Direct switch with scope/default termination and counter order are distinct structural levers.
|
||||
- switch with natural final default fallthrough: (8, 143) structural/positional; instructions 172/171; restored.
|
||||
- switch default before explicit success arms: (58, 107) structural/positional; instructions 171/171; restored.
|
||||
- reverse error compaction count declaration lifetimes: (4, 142) structural/positional; instructions 170/171; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main 68c4c9aeac0b0f28264f43f7c301ab20d873fb12. Initial assembly diagnosis: (2, 4) structural/positional differences; instructions 101/101
|
||||
Remote source equals tested HEAD; still open 97.81188%. Structural diagnosis: equal instruction counts; only threshold load/count store scheduling plus loop register lifetimes. Real output-buffer/operand views change alias scope without volatile casts.
|
||||
- postincrement count before checking usage: (2, 4) structural/positional; instructions 101/101; restored.
|
||||
- threshold-first source comparison operand order: (6, 9) structural/positional; instructions 101/101; restored.
|
||||
- name output array views independently of count pointer: (2, 4) structural/positional; instructions 101/101; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main 68c4c9aeac0b0f28264f43f7c301ab20d873fb12. Initial assembly diagnosis: (2, 4) structural/positional differences; instructions 102/102
|
||||
Remote source equals tested HEAD; still open 97.833336%. Structural diagnosis: equal instruction counts; only threshold load/count store scheduling plus loop register lifetimes. Real output-buffer/operand views change alias scope without volatile casts.
|
||||
- postincrement count before checking usage: (2, 4) structural/positional; instructions 102/102; restored.
|
||||
- threshold-first source comparison operand order: (6, 9) structural/positional; instructions 102/102; restored.
|
||||
- name output array views independently of count pointer: (2, 4) structural/positional; instructions 102/102; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main 68c4c9aeac0b0f28264f43f7c301ab20d873fb12. Initial assembly diagnosis: (2, 22) structural/positional differences; instructions 126/126
|
||||
Remote source equals tested HEAD; still open 97.29365%. Structural diagnosis: equal instruction counts; only threshold load/count store scheduling plus loop register lifetimes. Real output-buffer/operand views change alias scope without volatile casts.
|
||||
- postincrement count before checking usage: (2, 22) structural/positional; instructions 126/126; restored.
|
||||
- threshold-first source comparison operand order: (6, 27) structural/positional; instructions 126/126; restored.
|
||||
- name output array views independently of count pointer: (2, 22) structural/positional; instructions 126/126; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main c7896c380230bd05f4f8c011166e96451c9eabfb. Initial assembly diagnosis: (8, 16) structural/positional differences; instructions 361/361
|
||||
Remote source equals tested HEAD; still open 97.55125%. Structural diagnosis: equal instruction counts; only threshold load/count store scheduling plus loop register lifetimes. Real output-buffer/operand views change alias scope without volatile casts.
|
||||
- postincrement count before checking usage: (8, 16) structural/positional; instructions 361/361; restored.
|
||||
- threshold-first source comparison operand order: (24, 36) structural/positional; instructions 361/361; restored.
|
||||
- name output array views independently of count pointer: (8, 16) structural/positional; instructions 361/361; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main c7896c380230bd05f4f8c011166e96451c9eabfb. Initial assembly diagnosis: (2, 2) structural/positional differences; instructions 35/35
|
||||
Remote source equals tested HEAD; still open 99.65714%. Structural diagnosis: 35/35; target loads heap before manager; source loads manager first. Ref/pointer object input boundary may affect allocator/alias assumptions.
|
||||
- save manager reference view after heap pointer definition: (2, 2) structural/positional; instructions 35/35; restored.
|
||||
- save manager reference before heap definition: (2, 2) structural/positional; instructions 35/35; restored.
|
||||
- heap reference view evaluated at flush boundary: (2, 2) structural/positional; instructions 35/35; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect calcCommon__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 2119935c1dd8033630087deb598defc52f48d619. Initial assembly diagnosis: (0, 0) structural/positional differences; instructions 108/108
|
||||
|
||||
Baseline-report correction: build/43U/report.json was stale despite a fresh gate, because gate generates a temporary report. Regenerated exact-name baseline directly with objdiff-cli before resuming SD work; current live gate remains90/94,117/129,21/29. No matched functions edited.
|
||||
|
||||
# Round 4: fresh origin/main after KPAD reset and continuation landed
|
||||
Initial all-unit quick gate PASS. Pools checked explicitly first: address57/57, SD101/101, KPAD0/0. All owned data100%; no rename or extent edit needed. Current round uses new combinations of lifetime/alias boundaries and inline temporaries, rather than replaying prior variants.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect calcCommon__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 2119935c1dd8033630087deb598defc52f48d619. Initial assembly diagnosis: (0, 0) structural/positional differences; instructions 108/108
|
||||
|
||||
Fresh-build baseline correction: SD calcCommon, initializeNormalPage and selectChannel are ALREADY exact on origin/main. Header commit bac1e542 changed SDButton setter declaration to one argument before this round. Initial quick gate used stale compiled SD object; building the owned SD object updated those matches. Skip all3; do not count inherited improvements. Live baseline is SD120/129.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj
|
||||
Fetch origin/main ecee6f01e4ea2ca8f49a69d6259e21a60000ce7e. Initial assembly diagnosis: (23, 68) structural/positional differences; instructions 233/233
|
||||
Remote source equals tested HEAD; still open 93.4721%. Structural diagnosis: 233/233; target matrix input/scissor float scheduling differs. Constructor boundaries and geometry input/declaration order first.
|
||||
- separate uninitialized transformed input from vector constructor: (27, 72) structural/positional; instructions 233/233; restored.
|
||||
- swap framebuffer scalar declaration order: (23, 76) structural/positional; instructions 233/233; restored.
|
||||
- source scale division uses immutable scale vector reference: (59, 220) structural/positional; instructions 239/233; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface
|
||||
Fetch origin/main ecee6f01e4ea2ca8f49a69d6259e21a60000ce7e. Initial assembly diagnosis: (3, 109) structural/positional differences; instructions 143/144
|
||||
Remote source equals tested HEAD; still open 99.236115%. Structural diagnosis: 144/144; target branch target/event guard and scene/controller lifetimes differ. Read-only component/immutable scene-pointer input boundaries tested before registers.
|
||||
- normal event dispatch uses named immutable boolean: (3, 109) structural/positional; instructions 143/144; restored.
|
||||
- input component viewed as const during name lookup: build failed 5\src\scene\sdChannelSelect\iplSDChannelSelect.cpp:6) ### mwcceppc.exe Compiler: # File: src\scene\sdChannelSelect\iplSDChannelSelect.cpp # --------------------------------------------------------- # 3447: const char* paneName = component->getPane()->GetName(); # Error: ^ # (10248) function call '[const ipl::gui::PaneComponent].getPane()' does not # match # 'gui::PaneComponent::getPane()' (non-static) # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. ; restored.
|
||||
- normal-event owner stored in const pointer binding: (28, 128) structural/positional; instructions 137/144; restored.
|
||||
|
||||
## src/scene/address/iplAddressEdit create__Q33ipl5scene11AddressEditFv
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (19, 323) structural/positional differences; instructions 820/820
|
||||
Remote source equals tested HEAD; still open 97.44634%. Structural diagnosis: correct constness: NW4R layout getter requires mutable object; bind pointer const instead without changing layout.
|
||||
- immutable layout-pointer binding instead of const-pointee view: (52, 596) structural/positional; instructions 812/820; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect create__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (4, 39) structural/positional differences; instructions 145/146
|
||||
Remote source equals tested HEAD; still open 97.73972%. Structural diagnosis: correct manager type bs2::Manager; target has separate body/condition pointer loads.
|
||||
- name correctly typed BS2 polling manager at condition boundary: (4, 39) structural/positional; instructions 145/146; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (3, 109) structural/positional differences; instructions 143/144
|
||||
Remote source equals tested HEAD; still open 99.236115%. Structural diagnosis: Fresh setter header resolved prior register differences. Now only143/144, targetbeq8+b end versus ours bne end. Apply faithful switch dispatch boundary.
|
||||
- switch event with explicit default return before normal block: (0, 0) structural/positional; instructions 144/144; candidate kept.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADGetProjectionPos
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (0, 9) structural/positional differences; instructions 19/19
|
||||
Remote source equals tested HEAD; still open 96.57895%. Structural diagnosis: 19/19; target double calibration and half-height coefficients reuse their input registers; prior named scalar input fixed reset. Test true coefficient lifetimes/operand order, same frame.
|
||||
- name double calibration value then multiply scale in place: (0, 13) structural/positional; instructions 19/19; restored.
|
||||
- reuse half-height coefficient variable as height product: build failed e/private/bte -DNDEBUG=1 -DTARGET_RVL -ipa file -fp_contract off -lang=c -MMD -c libs/RVL_SDK/src/kpad/KPAD.c -o build/43U/src/libs/RVL_SDK/src/kpad && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/kpad/KPAD.d build/43U/src/libs/RVL_SDK/src/kpad/KPAD.d ### mwcceppc.exe Compiler: # File: libs\RVL_SDK\src\kpad\KPAD.c # ------------------------------------- # 360: f32 x = src->x * halfHeight; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. ; restored.
|
||||
- name all calibration coefficients with original literal order: (0, 13) structural/positional; instructions 19/19; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADSetSensorHeight
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (0, 7) structural/positional differences; instructions 52/52
|
||||
Remote source equals tested HEAD; still open 99.23077%. Structural diagnosis: 52/52; base-array pointer r4 versus targetr3, squared-height/zero floating registers. No stack reread evidence. Test typed array input and local declaration boundary.
|
||||
- unsigned immutable array index before controller lookup: (0, 7) structural/positional; instructions 52/52; restored.
|
||||
- const array-base pointer binding before index addition: (0, 7) structural/positional; instructions 52/52; restored.
|
||||
- reuse zero input and squared-height declaration before pointer: (0, 9) structural/positional; instructions 52/52; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD calc_acc_horizon
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (2, 35) structural/positional differences; instructions 101/101
|
||||
Remote source equals tested HEAD; still open 97.27723%. Structural diagnosis: 101/101; squared magnitude and target/circle weights float SSA lifetimes differ. All state outputs retained, same loop/frame.
|
||||
- name acceleration X/Y squared components before square-root: (2, 35) structural/positional; instructions 101/101; restored.
|
||||
- immutable normal vector value loaded before target-component assignments: (29, 89) structural/positional; instructions 105/101; restored.
|
||||
- name circle interpolation weight at declaration boundary: (12, 67) structural/positional; instructions 100/101; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD read_kpad_acc
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (16, 66) structural/positional differences; instructions 400/400
|
||||
Remote source equals tested HEAD; still open 98.15%. Structural diagnosis: 400/400; clamp/smooth helper limits and vector-copy lifetimes cause float/register scheduling differences. Probe helper input ownership and temporary scope.
|
||||
- name core acceleration clamp limit before axis updates: (32, 96) structural/positional; instructions 400/400; restored.
|
||||
- extension previous vector declared with top-level previous vectors: (16, 66) structural/positional; instructions 400/400; restored.
|
||||
- switch sample formats listed by high formats before low formats: (16, 66) structural/positional; instructions 400/400; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD select_1obj_first
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (2, 26) structural/positional differences; instructions 109/109
|
||||
Remote source equals tested HEAD; still open 98.348625%. Structural diagnosis: 109/109; target geometry coefficient lifetimes and vector store scheduling differ. Coefficient-first multiplication proved exact for continuation; test here too.
|
||||
- name horizontal and vertical tangent-normal product inputs: (2, 26) structural/positional; instructions 109/109; restored.
|
||||
- distance coefficient first in geometry offset multiplication: (2, 26) structural/positional; instructions 109/109; restored.
|
||||
- declare candidate geometry output vectors before object coordinates: (13, 33) structural/positional; instructions 109/109; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD calc_dpd_variable
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (14, 45) structural/positional differences; instructions 250/250
|
||||
Remote source equals tested HEAD; still open 94.82%. Structural diagnosis: 250/250; filter weights and projected vector temporaries drive FP scheduling. Test limit lifetimes and vector ordering.
|
||||
- dist filter named limit before magnitude normalization: (14, 46) structural/positional; instructions 250/250; restored.
|
||||
- pos filter normalized delta stored through two separate scalar temporaries: (14, 45) structural/positional; instructions 250/250; restored.
|
||||
- place delta vector declaration before point vector: (40, 71) structural/positional; instructions 250/250; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADRead
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (11, 89) structural/positional differences; instructions 459/459
|
||||
Remote source equals tested HEAD; still open 97.52723%. Structural diagnosis: 459/459; polling state and sample loop/register lifetimes differ. No uninitialized output introduced, preserve sampling semantics.
|
||||
- available counter assignment after pointer declarations: (11, 89) structural/positional; instructions 459/459; restored.
|
||||
- immutable core buttons mask when forming button state: (11, 89) structural/positional; instructions 459/459; restored.
|
||||
- live sample and output pointer declarations precede saved sample: (11, 89) structural/positional; instructions 459/459; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADInit
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (9, 81) structural/positional differences; instructions 185/185
|
||||
Remote source equals tested HEAD; still open 96.51351%. Structural diagnosis: 185/185; many controller/rotation initialization register ties. Named diagonal/calibration scalar lifetimes worked for reset; retain ordinary storage and loops.
|
||||
- reference diagonal squared components named inside loop: (9, 83) structural/positional; instructions 185/185; restored.
|
||||
- sensor conversion distance declared separately from reusable center offset: (9, 81) structural/positional; instructions 185/185; restored.
|
||||
- controller ring initialization uses named data-array pointer: (11, 82) structural/positional; instructions 185/185; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (4, 143) structural/positional differences; instructions 170/171
|
||||
Remote source equals tested HEAD; still open 99.15205%. Structural diagnosis: Same branch lever just matched handler. Test explicit success destinations before default failure, preserving shared postprocessing.
|
||||
- separate explicit success jumps to common title-list block: (4, 143) structural/positional; instructions 170/171; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADGetProjectionPos
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (0, 9) structural/positional differences; instructions 19/19
|
||||
Remote source equals tested HEAD; still open 96.57895%. Structural diagnosis: Correct C declaration scope. Keep half-height coefficient variable live through its multiply, as target does.
|
||||
- reuse half coefficient after all leading scalar declarations: (0, 10) structural/positional; instructions 19/19; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD calc_acc_horizon
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (2, 35) structural/positional differences; instructions 101/101
|
||||
Remote source equals tested HEAD; still open 97.27723%. Structural diagnosis: Target overwrites initial magnitude float register with smoothing weight; source separate temporary may prevent coalescing. This scalar is dead before smoothing assignment.
|
||||
- reuse acceleration magnitude as interpolation scale after normalization: (2, 35) structural/positional; instructions 101/101; restored.
|
||||
|
||||
Round4 exact candidate: button-handler onEventDerived144/144, ctxdiff0 and exact-name objdiff100. Explicit switch guard for event0 emits targetbeq8+b end. Fresh baselineSD120/129 ->121/129, code28152 ->28728. All-unit quick gatePASS, DOLcorrect, poolsidentical,0 regressions/patterns/style. Existing3 setter matches inherited from origin/main are excluded from claimed gain.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADSetSensorHeight
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (0, 7) structural/positional differences; instructions 52/52
|
||||
Remote source equals tested HEAD; still open 99.23077%. Structural diagnosis: Remaining diff is7 pure registers; prior namedzero+declaration placement reduced4 floating differences, leaving only base-pointer coloring. Try definition-level scalar const, never volatility.
|
||||
- immutable channel parameter at function definition: (0, 7) structural/positional; instructions 52/52; restored.
|
||||
- immutable height parameter at function definition: (0, 7) structural/positional; instructions 52/52; restored.
|
||||
- both sensor-height scalar inputs immutable: (0, 7) structural/positional; instructions 52/52; restored.
|
||||
- Last register search with real named zero and squared-height declarations: declaration block: | KPADInside* kpad; | f32 halfHeightSquared; | f32 zero; | f32 halfHeight; | f32 barOffsetX; | f32 barDiagonal; | f32 halfWidthSquared; | f32 halfWidth; | f32 negativeSensorHeight; | f32 barDiagonalSquared; | start (0, 9) | improved (0, 7) | improved (0, 3) | best (0, 3) after 70 builds; kept in source: | KPADInside* kpad; | f32 barDiagonalSquared; | f32 halfHeightSquared; | f32 halfHeight; | f32 barOffsetX; | f32 barDiagonal; | f32 halfWidthSquared; | f32 halfWidth; | f32 negativeSensorHeight; | f32 zero; |
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADGetProjectionPos
|
||||
Fetch origin/main 91cc177cb74e645bb7cd47991aa232fb6061bfcc. Initial assembly diagnosis: (0, 9) structural/positional differences; instructions 19/19
|
||||
Remote source equals tested HEAD; still open 96.57895%. Structural diagnosis: Same19/19 leaf structure. Final register-only search names the double literal separately from its scale product, as the target reuses that register. Previous round had only an anonymous double constant.
|
||||
- Last register search with named double calibration input: declaration block: | f64 correction; | f64 scaled; | f32 height; | f32 half; | f32 halfHeight; | f32 aspect; | f32 x; | f32 y; | start (0, 13) | improved (0, 12) | best (0, 12) after 75 builds; kept in source: | f32 aspect; | f64 scaled; | f32 height; | f32 half; | f32 halfHeight; | f64 correction; | f32 x; | f32 y; |
|
||||
|
||||
## Round4 final full clean gate and remaining-function audit
|
||||
Full non-quick gate over all3 units PASS; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; all pools identical;0 regressions,0 forbidden additions,0 readability warnings. Owned data100%, no symbol name/extent edits. Remaining function ELF extents end before/equal next symbol. Stack adjacent store/reload proof pairs []; no definition-level volatile justified.
|
||||
src/scene/address/iplAddressEdit: fresh exact 90 ->90/94; code 23044 ->23044/27112; data 2560 ->2560/2560.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect: fresh exact 120 ->121/129; code 28152 ->28728/33828; data 2960 ->2960/2960.
|
||||
libs/RVL_SDK/src/kpad/KPAD: fresh exact 21 ->21/29; code 6756 ->6756/13056; data 8032 ->8032/8032.
|
||||
SD prompt baseline117 was stale; fresh origin/main compiled baseline120 includes3 setter matches inherited from bac1e542, excluded from worker gain. Worker gain is handler only120 ->121. Retained source diff only switch/event guard. Uncertainty remains on unsupported NWC24 error defaults; safe initialization retained instead of reproducing unspecified target values. All20 remaining functions have at least3 successful distinct source trials in this round, failed builds excluded.
|
||||
- src/scene/address/iplAddressEdit create__Q33ipl5scene11AddressEditFv 97.44634%; 3 successful distinct source trials; layout construction lifetime/register scheduling; same820 instructions.
|
||||
- src/scene/address/iplAddressEdit get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571%; 3 successful distinct source trials; text-array addresses folded until after pane lookup; target retains pointers across lookup,82/84.
|
||||
- src/scene/address/iplAddressEdit update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105%; 3 successful distinct source trials; memcpy source/destination address evaluation order,38/38.
|
||||
- src/scene/address/iplAddressEdit set_err_msg__Q33ipl5scene11AddressEditFPwUl8NWC24Err 98.666664%; 3 successful distinct source trials; extra safe default initialization; target appears to leave messageId undefined for unhandled error,76/75.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect create__Q33ipl5scene15SDChannelSelectFv 97.73972%; 3 successful distinct source trials; BS2 polling body omits separate manager reload,145/146; loop/inline getter boundaries remain.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv 99.15205%; 4 successful distinct source trials; beq-plus-branch dispatch and compaction count coloring,170/171.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188%; 3 successful distinct source trials; threshold load hoisted before count store,101/101.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336%; 3 successful distinct source trials; threshold load hoisted before count store,102/102.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.29365%; 3 successful distinct source trials; threshold/count schedule plus loop coloring,126/126.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125%; 3 successful distinct source trials; four repeated threshold/count schedules,361/361.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714%; 3 successful distinct source trials; save manager/heap argument load order,35/35.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj 93.4721%; 3 successful distinct source trials; matrix/scissor floating operand scheduling and temporaries,233/233.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADGetProjectionPos 96.57895%; 3 successful distinct source trials; floating calibration coefficient registers and multiply operands,19/19; named double calibration search best12 differences restored.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADSetSensorHeight 99.23077%; 6 successful distinct source trials; base-array register r4 versusr3 plus zero/squared-height float registers,52/52; scalar const inputs unchanged, declaration search best3 restored.
|
||||
- libs/RVL_SDK/src/kpad/KPAD calc_acc_horizon 97.27723%; 4 successful distinct source trials; magnitude/interpolation and circle float-register lifetimes,101/101; scalar reuse did not change coloring.
|
||||
- libs/RVL_SDK/src/kpad/KPAD read_kpad_acc 98.15%; 3 successful distinct source trials; clamp/smoothing inline boundaries and floating scheduling,400/400.
|
||||
- libs/RVL_SDK/src/kpad/KPAD select_1obj_first 98.348625%; 3 successful distinct source trials; geometry floating lifetimes and paired stores,109/109.
|
||||
- libs/RVL_SDK/src/kpad/KPAD calc_dpd_variable 94.82%; 3 successful distinct source trials; smoothing/projected geometry floating scheduling,250/250.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADRead 97.52723%; 3 successful distinct source trials; sample loop/polling temporaries and branch scheduling,459/459.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADInit 96.51351%; 3 successful distinct source trials; controller/ring initialization and floating scheduling,185/185.
|
||||
Final authority lines:
|
||||
```
|
||||
[src/scene/address/iplAddressEdit] instruction-exact functions: 90/94
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] instruction-exact functions: 121/129
|
||||
[libs/RVL_SDK/src/kpad/KPAD] instruction-exact functions: 21/29
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
457
tools/decomp-assist/fz21.attempts.md
Normal file
457
tools/decomp-assist/fz21.attempts.md
Normal file
@@ -0,0 +1,457 @@
|
||||
# fz21, zi8cgetc
|
||||
|
||||
Baseline source equals fetched origin/main at start. Object build succeeded; pool_diff reports identical empty narrow-string pools. Fresh objdiff: 5/8 exact functions, code 4168/47816, data 144/536. Open functions in address order: ZiMatchZHSpelling, zi8InternalGetZH, Zi8GetElementCount.
|
||||
|
||||
Structural diagnosis: ZiMatchZHSpelling 121/121 instructions, same frame/branches/stack offsets, 29 register-only differences. Zi8GetElementCount 115/115 instructions, same frame/branches/stack offsets, 13 register-only differences. Engine has matching instruction count but displaced control flow and stack/local differences; inspect the first structural divergence before allocation.
|
||||
|
||||
Data audit: named ziTones/ziPuncts/zi8tones already pair exactly, 24/24 bytes. extab/extabindex pair exactly, 120/120 bytes. Remaining 392 bytes are four compiler-generated switch tables, source @2795/@2794/@2793/@2792 at offsets 0/44/88/248, target jumptable_8166AA88/8166AAB4/8166AAE0/8166AB80 with sizes 44/44/160/144. No extent error or user-defined symbol rename exists; generated table labels are unstable compiler internals and entries relocate into the unmatched engine. No symbols.txt changes justified.
|
||||
|
||||
- s01 ZiMatchZHSpelling: scope result and candidate length as named match state; insns 126/121, structural/exact diffs (27, 117), fuzzy 93.380165, data 24. Restored pending gates.
|
||||
|
||||
- s02 ZiMatchZHSpelling: count candidate before initializing result; insns 121/121, structural/exact diffs (2, 30), fuzzy 97.19009, data 144. Restored pending gates.
|
||||
|
||||
- s03 ZiMatchZHSpelling: make leading spelling scan pointer-based; insns 124/121, structural/exact diffs (35, 113), fuzzy 87.75207, data 24. Restored pending gates.
|
||||
|
||||
- s04 ZiMatchZHSpelling: declare incoming candidate pointer immutable; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, data 144. Restored pending gates.
|
||||
|
||||
- s05 ZiMatchZHSpelling: initialize both spaced buffers through one chained assignment; insns 120/121, structural/exact diffs (5, 96), fuzzy 97.95868, data 72. Restored pending gates.
|
||||
|
||||
- s06 ZiMatchZHSpelling: test spellingLength before candidate pointer; insns 121/121, structural/exact diffs (4, 31), fuzzy 97.14876, data 144. Restored pending gates.
|
||||
|
||||
- s07 ZiMatchZHSpelling: keep candidate length in a named single-field state; insns 122/121, structural/exact diffs (22, 85), fuzzy 97.66942, data 24. Restored pending gates.
|
||||
|
||||
- s08 ZiMatchZHSpelling: keep match result in a named single-field state; insns 125/121, structural/exact diffs (31, 119), fuzzy 94.900826, data 24. Restored pending gates.
|
||||
|
||||
- s09 ZiMatchZHSpelling: use one spelling-buffer aggregate; insns 121/121, structural/exact diffs (33, 40), fuzzy 98.71075, data 144. Restored pending gates.
|
||||
|
||||
- s10 ZiMatchZHSpelling: scope candidate character count initialization in declaration; insns 121/121, structural/exact diffs (2, 30), fuzzy 97.19009, data 144. Restored pending gates.
|
||||
|
||||
- s11 ZiMatchZHSpelling: set mismatch result through conditional expression; insns 124/121, structural/exact diffs (16, 116), fuzzy 95.6033, data 24. Restored pending gates.
|
||||
|
||||
- s12 ZiMatchZHSpelling: return successful constant after successful phonetic traversal; insns 120/121, structural/exact diffs (7, 53), fuzzy 96.07438, data 72. Restored pending gates.
|
||||
|
||||
- g01 zi8InternalGetZH: split charset helper into scoped byte local after short-circuit input test; insns 10679/10676, structural/exact diffs (10275, 10604), fuzzy 93.25862, data 24. Restored pending gates.
|
||||
|
||||
- g02 zi8InternalGetZH: use explicit else-if charset helper branch; insns 10675/10676, structural/exact diffs (7283, 9381), fuzzy 95.689865, data 72. Restored pending gates.
|
||||
|
||||
- g03 zi8InternalGetZH: test charset mask through a switch; insns 10676/10676, structural/exact diffs (8992, 10094), fuzzy 95.6805, data 144. Restored pending gates.
|
||||
|
||||
- g04 zi8InternalGetZH: use readonly options view for engine input; BUILD FAIL put, work)) goto engine_finish;
|
||||
# Error: ^
|
||||
# (10209) illegal implicit conversion from 'const struct *' to
|
||||
# 'struct *'
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
. Restored pending gates.
|
||||
|
||||
- g05 zi8InternalGetZH: make table-count presence comparisons explicit; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, data 144. Restored pending gates.
|
||||
|
||||
- c01 Zi8GetElementCount: use integer result count until byte return; insns 115/115, structural/exact diffs (2, 13), fuzzy 98.391304, data 144. Restored pending gates.
|
||||
|
||||
- c02 Zi8GetElementCount: test definition-level volatile separator hypothesis, rejected: target only saves across a helper call, so immediate reload evidence is absent; insns 117/115, structural/exact diffs (4, 107), fuzzy 97.608696, data 72. Restored pending gates.
|
||||
|
||||
- c03 Zi8GetElementCount: initialize result count before cursors as separate statements; insns 115/115, structural/exact diffs (2, 14), fuzzy 98.347824, data 144. Restored pending gates.
|
||||
|
||||
- c04 Zi8GetElementCount: group element indices as named cursor state; insns 138/115, structural/exact diffs (56, 136), fuzzy 69.791306, data 24. Restored pending gates.
|
||||
|
||||
- c05 Zi8GetElementCount: use unsigned integer element count parameter; BUILD FAIL 3) identifier 'Zi8GetElementCount(unsigned short *, unsigned char,
|
||||
# unsigned char, void *)' redeclared as 'unsigned char (unsigned short *,
|
||||
# unsigned int, unsigned char, void *)'
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
. Restored pending gates.
|
||||
|
||||
- c06 Zi8GetElementCount: use immutable input view for character reads; insns 116/115, structural/exact diffs (1, 109), fuzzy 98.391304, data 24. Restored pending gates.
|
||||
|
||||
- c07 Zi8GetElementCount: fold equal latin bound into range expression; insns 111/115, structural/exact diffs (10, 93), fuzzy 94.64348, data 72. Restored pending gates.
|
||||
|
||||
- c08 Zi8GetElementCount: count each consumed input at a common block before the branch; insns 115/115, structural/exact diffs (0, 14), fuzzy 99.26087, data 144. Restored pending gates.
|
||||
|
||||
- c09 Zi8GetElementCount: save separator in a one-element character array; insns 115/115, structural/exact diffs (0, 13), fuzzy 99.347824, data 144. Restored pending gates.
|
||||
|
||||
- c10 Zi8GetElementCount: save separator in a union field; insns 115/115, structural/exact diffs (0, 13), fuzzy 99.347824, data 144. Restored pending gates.
|
||||
|
||||
- c11 Zi8GetElementCount: use separate zero initialization in cursor traversal order; insns 115/115, structural/exact diffs (2, 14), fuzzy 98.347824, data 144. Restored pending gates.
|
||||
|
||||
- c12 Zi8GetElementCount: scan next spaced element with continue; insns 116/115, structural/exact diffs (8, 55), fuzzy 98.347824, data 72. Restored pending gates.
|
||||
|
||||
- c13 Zi8GetElementCount: retain byte result via explicit cast from integer count; insns 115/115, structural/exact diffs (2, 13), fuzzy 98.391304, data 144. Restored pending gates.
|
||||
|
||||
- c14 Zi8GetElementCount: use preincrement results consistently for input and result advances; insns 115/115, structural/exact diffs (0, 13), fuzzy 99.347824, data 144. Restored pending gates.
|
||||
|
||||
- s13 ZiMatchZHSpelling: use readonly spelling view in prefix comparison; insns 122/121, structural/exact diffs (7, 120), fuzzy 97.71901, data 24. Restored pending gates.
|
||||
|
||||
- s14 ZiMatchZHSpelling: use countdown prefix loop with independent byte index; insns 126/121, structural/exact diffs (32, 118), fuzzy 93.33058, data 72. Restored pending gates.
|
||||
|
||||
- s15 ZiMatchZHSpelling: place match result initialization next to its declaration; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, data 144. Restored pending gates.
|
||||
|
||||
- s16 ZiMatchZHSpelling: reverse operand order of prefix equality; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, data 144. Restored pending gates.
|
||||
|
||||
- s17 ZiMatchZHSpelling: use explicit unsigned phonetic index decrement; insns 122/121, structural/exact diffs (8, 69), fuzzy 97.80991, data 72. Restored pending gates.
|
||||
|
||||
- s18 ZiMatchZHSpelling: use early match return before phonetic fallback; insns 123/121, structural/exact diffs (4, 98), fuzzy 97.06612, data 72. Restored pending gates.
|
||||
|
||||
- g06 zi8InternalGetZH: use const options view in both private matching helpers; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, data 144. Restored pending gates.
|
||||
|
||||
- g07 zi8InternalGetZH: use unsigned sublanguage value for traditional-mask expression; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, data 144. Restored pending gates.
|
||||
|
||||
- g08 zi8InternalGetZH: initialize match aggregate explicitly before local engine initialization; insns 10669/10676, structural/exact diffs (10210, 10645), fuzzy 95.679375, data 72. Restored pending gates.
|
||||
|
||||
- g09 zi8InternalGetZH: separate phrase mask and value array initialization; insns 10694/10676, structural/exact diffs (10404, 10657), fuzzy 94.52595, data 24. Restored pending gates.
|
||||
|
||||
Declaration-order searches after structural diagnosis: ZiMatchZHSpelling, 52 built orders, best structural/exact (0,29); Zi8GetElementCount, 13 built orders, best (0,13). Neither kept source changes.
|
||||
|
||||
Coverage audit: all three remaining functions have at least three distinct successfully compiled source-level trials in this run. ZiMatchZHSpelling s01-s18, 18 compiled; zi8InternalGetZH g01-g03/g05-g09, 8 compiled plus rejected compile failure g04; Zi8GetElementCount c01-c04/c06-c14, 13 compiled plus rejected compile failure c05. All restored. Source byte-identical to the initial checkout; no gate-passing improvement or new exact function found. No source commit warranted.
|
||||
|
||||
Engine first instruction-count displacement is after traditional charset helper: source emits an extra mr before return-byte conversion in the case-2 branch. Scoped temporary, split branch and switch expression each worsened overall code or data. Const view did not change the output when propagated consistently. The target function extent ends precisely at Zi8NewMatchPhonetic; no overlap correction is justified.
|
||||
|
||||
Final full clean gate:
|
||||
|
||||
```
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] objdiff: code 4168/47816 data 144/536 functions 5/8 fuzzy 96.4008 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] instruction-exact functions: 5/8
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .data size 392 match None
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sbss2 size 8 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sdata2 size 16 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .text size 47816 match 96.40079
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extab size 48 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extabindex size 72 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: ZiMatchZHSpelling 98.80165
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: zi8InternalGetZH 95.99054
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: Zi8GetElementCount 99.347824
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] baseline: code 4168/47816 data 144 functions 5 fuzzy 96.4008
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 89.97868 -> 89.97868
|
||||
global fuzzy_match_percent: 99.54133 -> 99.54133
|
||||
global complete_code_percent: 69.30851 -> 69.30851
|
||||
global matched_data_percent: 99.36508 -> 99.36508
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
Instruction-exact functions 5/8 -> 5/8; matched code 4168/47816 -> 4168/47816; matched data 144/536 -> 144/536. Full build and target DOL SHA1 pass; zero regressions and zero forbidden/readability additions. Exact-count increase and unit completion remain unmet. No commits. Only this attempts log changed.
|
||||
|
||||
# HIGH continuation, four units
|
||||
|
||||
Fresh origin fetch and object builds: owned sources equal origin/main. zi8cgetc exact 5/8, code 4168/47816, data 144/536; zmtkey 3/4, code 1488/2216, data 60/60; zconvert 3/4, code 1380/2208, data 112/112; tiPcKeyboard 140/141, code 28064/28484, data 18548/18564. Every unit's pool_diff passed before source work.
|
||||
|
||||
Structural diagnosis: getKeyLayout 182/182 instructions, language and tableCount r26/r27 swap only, 16 diffs; ConvertUC2Key 207/207, work/key r27/r28 swap only, 18 diffs. setTranslateMode has one extra initialization move, 106/105, otherwise identical operations. Target leaves its mapped-mode register undefined for out-of-enum inputs. Uninitialized values are forbidden, so retain defined behavior in every experiment. No definition-level volatile evidence in these three target functions. Symbol extents stop at their neighbours, no function-size correction justified.
|
||||
|
||||
- HIGH m01 Zi8getKeyLayout: declare builtin data as pointer to const; insns 182/182, structural/exact diffs (0, 16), fuzzy 99.53297, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m02 Zi8getKeyLayout: declare custom table as pointer to const; insns 182/182, structural/exact diffs (0, 16), fuzzy 99.53297, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m03 Zi8getKeyLayout: declare copied custom characters as pointer to const; insns 183/182, structural/exact diffs (5, 140), fuzzy 98.81868, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH m04 Zi8getKeyLayout: use all three readonly table views; insns 183/182, structural/exact diffs (5, 140), fuzzy 98.81868, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH m05 Zi8getKeyLayout: decode high byte before low byte in table output; insns 182/182, structural/exact diffs (6, 24), fuzzy 96.84066, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m06 Zi8getKeyLayout: place count and index in a single declaration; insns 182/182, structural/exact diffs (0, 16), fuzzy 99.53297, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m07 Zi8getKeyLayout: use explicit independent total for builtin character summation; insns 182/182, structural/exact diffs (2, 4), fuzzy 99.28571, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m08 Zi8getKeyLayout: read char count through a const local value; insns 181/182, structural/exact diffs (6, 63), fuzzy 98.65385, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH v01 Zi8ConvertUC2Key: use const conversion range view; insns 207/207, structural/exact diffs (0, 18), fuzzy 99.565216, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH v02 Zi8ConvertUC2Key: use const conversion-entry view throughout table walk; insns 207/207, structural/exact diffs (0, 18), fuzzy 99.565216, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH v03 Zi8ConvertUC2Key: use const conversion table view; insns 207/207, structural/exact diffs (0, 18), fuzzy 99.565216, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH v04 Zi8ConvertUC2Key: use readonly mapped character array; insns 208/207, structural/exact diffs (13, 53), fuzzy 99.08212, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH v05 Zi8ConvertUC2Key: use readonly views for all conversion inputs; insns 208/207, structural/exact diffs (13, 53), fuzzy 99.08212, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH v06 Zi8ConvertUC2Key: use named key-result structure; BUILD FAIL are/eZiText/src/clib && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zconvert.d build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zconvert.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zconvert.c # ------------------------------------------------------- # 129: ziU16 index, count, first, last; # Error: ^^^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- HIGH v07 Zi8ConvertUC2Key: decode mapped key through independent const entry bytes; BUILD FAIL .py build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zconvert.d build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zconvert.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zconvert.c # ------------------------------------------------------- # 157: const ziU8* keyBytes = (const ziU8*)table + key + (character - first) * 2 + 8; # Error: ^^^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- HIGH v08 Zi8ConvertUC2Key: initialize key in fallback branches rather than before calls; insns 207/207, structural/exact diffs (4, 35), fuzzy 98.62319, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH m09 Zi8getKeyLayout: use char-count storage for lookup validation before summation; insns 182/182, structural/exact diffs (2, 4), fuzzy 99.28571, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m10 Zi8getKeyLayout: test table availability directly, retain tableCount only for summation; insns 180/182, structural/exact diffs (6, 111), fuzzy 98.84615, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH m11 Zi8getKeyLayout: initialize character total before loop then start key index independently; insns 182/182, structural/exact diffs (1, 16), fuzzy 99.23077, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m12 Zi8getKeyLayout: use lookup count storage with independent result sum and grouped locals; insns 182/182, structural/exact diffs (2, 4), fuzzy 99.28571, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m13 Zi8getKeyLayout: load lookup table count before conditional path selection; insns 182/182, structural/exact diffs (0, 22), fuzzy 99.36813, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH m14 Zi8getKeyLayout: use signed halfword lookup and sum with unsigned reads; insns 182/182, structural/exact diffs (3, 16), fuzzy 98.62637, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH k01 setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode: map translation through a const input parameter; insns 106/105, structural/exact diffs (1, 99), fuzzy 99.04762, code 28064, data 18548. Restored pending gates.
|
||||
|
||||
- HIGH k02 setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode: map mode with an inline lambda-free typed helper returning defined fallback; insns 107/105, structural/exact diffs (6, 89), fuzzy 98.0, code 27408, data 18548. Restored pending gates.
|
||||
|
||||
- HIGH k03 setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode: initialize mapped mode to direct before explicit valid switch; insns 106/105, structural/exact diffs (1, 101), fuzzy 99.04762, code 28064, data 18548. Restored pending gates.
|
||||
|
||||
- HIGH k04 setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode: select current ABC state as a defined invalid-input fallback; insns 106/105, structural/exact diffs (5, 97), fuzzy 95.2381, code 28064, data 18548. Restored pending gates.
|
||||
|
||||
- HIGH k05 setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode: use signed mapped mode, preserve comparison conversion; insns 106/105, structural/exact diffs (1, 99), fuzzy 99.04762, code 28064, data 18548. Restored pending gates.
|
||||
|
||||
- HIGH k06 setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode: scope mapping and command input in an initialized mode-state aggregate; insns 106/105, structural/exact diffs (23, 101), fuzzy 87.48572, code 28064, data 18548. Restored pending gates.
|
||||
|
||||
- HIGH sH01 ZiMatchZHSpelling: initialize result before const candidate-length declaration; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH sH02 ZiMatchZHSpelling: initialize result and candidate length in declaration order without const; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH sH03 ZiMatchZHSpelling: declare function work pointer immutable; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH sH04 ZiMatchZHSpelling: choose mismatch through a single equality after terminator guard; insns 123/121, structural/exact diffs (6, 109), fuzzy 97.06612, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- HIGH sH05 ZiMatchZHSpelling: scope prefix scan index to the scan; insns 124/121, structural/exact diffs (10, 122), fuzzy 92.85124, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- HIGH sH06 ZiMatchZHSpelling: short-circuit matching work after explicit prefix-success check; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH v09 Zi8ConvertUC2Key: keep key in named initialized conversion result; BUILD FAIL b && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zconvert.d build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zconvert.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zconvert.c # ------------------------------------------------------- # 133: result.result.key = 0; # Error: ^ # (10393) 'result' is not a member of class 'struct ' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- HIGH v10 Zi8ConvertUC2Key: read direct table character through separate readonly byte view; insns 213/207, structural/exact diffs (23, 207), fuzzy 93.87923, code 1380, data 32. Restored pending gates.
|
||||
|
||||
- HIGH v11 Zi8ConvertUC2Key: change key storage to unsigned int while retaining narrow uses; insns 205/207, structural/exact diffs (11, 130), fuzzy 98.333336, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH v12 Zi8ConvertUC2Key: use signed key storage while retaining narrow uses; insns 205/207, structural/exact diffs (11, 130), fuzzy 98.333336, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH v13 Zi8ConvertUC2Key: read big-endian key low byte before high byte; insns 207/207, structural/exact diffs (2, 22), fuzzy 98.54589, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH v14 Zi8ConvertUC2Key: combine the two address steps for the table-selected key; insns 207/207, structural/exact diffs (0, 18), fuzzy 99.565216, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH v15 Zi8ConvertUC2Key: initialize result to key-not-found only in table paths; insns 208/207, structural/exact diffs (10, 139), fuzzy 98.115944, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH cH01 Zi8GetElementCount: use unsigned-short result count with explicit byte read; insns 115/115, structural/exact diffs (2, 13), fuzzy 98.391304, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH02 Zi8GetElementCount: preserve count as signed byte converted for return; insns 115/115, structural/exact diffs (2, 13), fuzzy 98.391304, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH03 Zi8GetElementCount: use a const element-count input parameter; insns 115/115, structural/exact diffs (2, 13), fuzzy 98.391304, code 3548, data 72. Restored pending gates.
|
||||
|
||||
- HIGH cH04 Zi8GetElementCount: initialize result and spaced index as declarations before starting Latin scan; insns 115/115, structural/exact diffs (4, 57), fuzzy 97.565216, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH05 Zi8GetElementCount: assign result count from completed element index at return; insns 115/115, structural/exact diffs (0, 1), fuzzy 99.95652, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH06 Zi8GetElementCount: put spaced-character range test before decrement decision; insns 115/115, structural/exact diffs (4, 17), fuzzy 99.24348, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH07 Zi8GetElementCount: count consumed inputs using a single increment at the common path; insns 114/115, structural/exact diffs (11, 32), fuzzy 97.91304, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- HIGH vA01 Zi8ConvertUC2Key: name function work context as local view before calls; insns 213/207, structural/exact diffs (26, 206), fuzzy 95.019325, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH vA02 Zi8ConvertUC2Key: make local context pointer immutable; insns 213/207, structural/exact diffs (26, 206), fuzzy 95.019325, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH vA03 Zi8ConvertUC2Key: use local language identifier view before helper calls; insns 214/207, structural/exact diffs (70, 202), fuzzy 91.68116, code 1380, data 32. Restored pending gates.
|
||||
|
||||
- HIGH mA01 Zi8getKeyLayout: name function work context as local view before calls; insns 186/182, structural/exact diffs (10, 176), fuzzy 97.10439, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH mA02 Zi8getKeyLayout: make local context pointer immutable; insns 186/182, structural/exact diffs (10, 176), fuzzy 97.10439, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH mA03 Zi8getKeyLayout: use local language identifier view before helper calls; insns 186/182, structural/exact diffs (34, 180), fuzzy 97.2033, code 1488, data None. Restored pending gates.
|
||||
|
||||
- HIGH cH08 Zi8GetElementCount: return result count through byte conversion; insns 115/115, structural/exact diffs (1, 13), fuzzy 98.86957, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH09 Zi8GetElementCount: return result count through a wider character conversion; insns 115/115, structural/exact diffs (1, 13), fuzzy 98.86957, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH10 Zi8GetElementCount: use result count for remaining input loop bound; insns 115/115, structural/exact diffs (0, 14), fuzzy 99.304344, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH11 Zi8GetElementCount: start the result count from the initialized element index; insns 115/115, structural/exact diffs (0, 14), fuzzy 99.304344, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH12 Zi8GetElementCount: group element index and count initialization first; insns 115/115, structural/exact diffs (1, 14), fuzzy 98.82609, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH cH13 Zi8GetElementCount: return explicit conditional count when input traversal completed; insns 121/115, structural/exact diffs (8, 27), fuzzy 94.13043, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- HIGH cH14 Zi8GetElementCount: scope result count only around the spaced traversal; insns 119/115, structural/exact diffs (9, 114), fuzzy 91.9913, code 4168, data 24. Restored pending gates.
|
||||
|
||||
HIGH data audit: zmtkey and zconvert already 100% data. tiPcKeyboard has 16 unpaired .bss bytes: target lbl_810C6580 versus compiler-generated source @6381, source size 12. Relocations from sendInputWChar/onPressedCaps/onKey/updateInput/refreshState all pass this object as the third argument to __register_global_object. Runtime NMWException.h proves DestructorChain is three pointers, 12 bytes; target 16-byte extent includes four alignment bytes before layoutGatherDestructorRecord at 810C6590. The source symbol is a compiler-generated ordinal, not a real source-defined mangled name. No name change is justified under the allowed rename policy. Addresses and section totals remain untouched. Existing data/rodata/sdata/sdata2/sbss already match fully. zi8cgetc's remaining four switch tables target unmatched engine destinations; named ordinary data and exception tables pair fully.
|
||||
|
||||
- HIGH vV01 Zi8ConvertUC2Key: define table pointer volatile, target stw/lwz at 5b4/5b8 proves stack reload; insns 207/207, structural/exact diffs (0, 18), fuzzy 99.565216, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH vV02 Zi8ConvertUC2Key: define mapped pointer volatile, target stw/lwz at 7b8/7bc proves stack reload; insns 207/207, structural/exact diffs (0, 18), fuzzy 99.565216, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH vV03 Zi8ConvertUC2Key: define both proven stack-reloaded pointer locals volatile; insns 207/207, structural/exact diffs (0, 18), fuzzy 99.565216, code 1380, data 112. Restored pending gates.
|
||||
|
||||
- HIGH vV04 Zi8ConvertUC2Key: combine const mapped data view with proven volatile pointer storage; insns 208/207, structural/exact diffs (13, 53), fuzzy 99.08212, code 1380, data 64. Restored pending gates.
|
||||
|
||||
- HIGH mW01 Zi8getKeyLayout: store lookup/total as ziU32 with explicit original halfword reads; insns 180/182, structural/exact diffs (7, 116), fuzzy 98.07692, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH mW02 Zi8getKeyLayout: store lookup/total as ziS32 with explicit original halfword reads; insns 180/182, structural/exact diffs (7, 116), fuzzy 98.07692, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH mW03 Zi8getKeyLayout: store lookup/total as unsigned long with explicit original halfword reads; insns 180/182, structural/exact diffs (7, 116), fuzzy 98.07692, code 1488, data 24. Restored pending gates.
|
||||
|
||||
- HIGH mW04 Zi8getKeyLayout: store lookup/total as ziS16 with explicit original halfword reads; insns 182/182, structural/exact diffs (3, 16), fuzzy 98.62637, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH mW05 Zi8getKeyLayout: use key-character count as unsigned int with narrow loop-bound read; insns 182/182, structural/exact diffs (6, 46), fuzzy 97.77473, code 1488, data 60. Restored pending gates.
|
||||
|
||||
- HIGH mW06 Zi8getKeyLayout: decode output as a const dictionary word pointer; insns 186/182, structural/exact diffs (12, 181), fuzzy 94.33517, code 1488, data None. Restored pending gates.
|
||||
|
||||
- HIGH gH01 zi8InternalGetZH: read traditional charset mask as a byte-valued result; insns 10676/10676, structural/exact diffs (9079, 10068), fuzzy 95.98117, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH gH02 zi8InternalGetZH: express simplified charset flag test as two explicit early decisions; insns 10675/10676, structural/exact diffs (9194, 10136), fuzzy 95.68893, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- HIGH gH03 zi8InternalGetZH: preserve charset masks using a scoped readonly helper result; insns 10679/10676, structural/exact diffs (10275, 10604), fuzzy 93.25862, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- HIGH gH04 zi8InternalGetZH: use readonly charset lookup-table views; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH gH05 zi8InternalGetZH: use unsigned ordinal table-count test; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH gH06 zi8InternalGetZH: initialize first-pass phase flags adjacent to declarations; insns 10667/10676, structural/exact diffs (9769, 10419), fuzzy 95.17272, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- HIGH gH07 zi8InternalGetZH: initialize only entry phase flags at their declaration, preserve every retry reset; insns 10676/10676, structural/exact diffs (9142, 10097), fuzzy 95.85847, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- HIGH v16 Zi8ConvertUC2Key: use a named result field initialized after declarations; insns 212/207, structural/exact diffs (31, 206), fuzzy 95.521736, code 1380, data 32. Restored pending gates.
|
||||
|
||||
HIGH audit corrections: gH06 incorrectly removed later retry resets as well as entry assignments, so its measurement is invalid and excluded from distinct-attempt counts. gH07 repeats the intended change while preserving every later reset. v06/v07/v09 were compiler-rejected transformations; v16 corrects the result-field transformation. mW06 scoped the actual custom character pointer but left an unnecessary outer initialized pointer; restored and excluded, no such object retained.
|
||||
|
||||
cH05 increases fuzzy to 99.95652% and fixes the register allocation of the counters but returns elementIndex rather than count, leaving the count calculation dead. It still differs at its return instruction and would retain dead arithmetic solely for codegen. Rejected under source-quality requirements; not a candidate for a commit. The truthful source retains its returned count.
|
||||
|
||||
Proven volatile check revised: ConvertUC2Key does have immediate table-pointer and mapped-pointer store/reload pairs at target 5b4/5b8 and 7b8/7bc. Source already emits both. vV01-vV03 applied definition-level volatile only to those proven pointer objects; output remained 207/207 with the same 18 register differences. The const-data/volatile-pointer combination added an instruction and was restored.
|
||||
|
||||
HIGH declaration-order search Zi8GetElementCount:
|
||||
```
|
||||
declaration block:
|
||||
ziU8 spacedIndex;
|
||||
ziU8 elementIndex;
|
||||
ziU8 count;
|
||||
ziWChar spacedElements[256];
|
||||
struct { ziWChar separator; } savedState;
|
||||
start (0, 13)
|
||||
best (0, 13) after 23 builds; source restored; best order was:
|
||||
ziU8 spacedIndex;
|
||||
ziU8 elementIndex;
|
||||
ziU8 count;
|
||||
ziWChar spacedElements[256];
|
||||
struct { ziWChar separator; } savedState;
|
||||
```
|
||||
|
||||
HIGH declaration-order search ZiMatchZHSpelling:
|
||||
```
|
||||
declaration block:
|
||||
ziWChar* candidateCursor;
|
||||
ziWChar* spellingCursor;
|
||||
int index;
|
||||
int matches;
|
||||
int candidateLength;
|
||||
ziWChar spacedSpelling[64];
|
||||
ziWChar spacedCandidate[64];
|
||||
start (0, 29)
|
||||
best (0, 29) after 52 builds; source restored; best order was:
|
||||
ziWChar* candidateCursor;
|
||||
ziWChar* spellingCursor;
|
||||
int index;
|
||||
int matches;
|
||||
int candidateLength;
|
||||
ziWChar spacedSpelling[64];
|
||||
ziWChar spacedCandidate[64];
|
||||
```
|
||||
|
||||
HIGH declaration-order search Zi8getKeyLayout:
|
||||
```
|
||||
declaration block:
|
||||
ziU16 tableCount;
|
||||
ziU8 numKeys;
|
||||
ziU8* dataAddress;
|
||||
ziUserKeyMap* customTable;
|
||||
ziU16 charCount;
|
||||
ziU16 keyIndex;
|
||||
ziWChar* keyChars;
|
||||
start (0, 16)
|
||||
best (0, 16) after 52 builds; source restored; best order was:
|
||||
ziU16 tableCount;
|
||||
ziU8 numKeys;
|
||||
ziU8* dataAddress;
|
||||
ziUserKeyMap* customTable;
|
||||
ziU16 charCount;
|
||||
ziU16 keyIndex;
|
||||
ziWChar* keyChars;
|
||||
```
|
||||
|
||||
HIGH declaration-order search Zi8ConvertUC2Key:
|
||||
```
|
||||
declaration block:
|
||||
ziU16 key = 0;
|
||||
ziU16 index, count, first, last;
|
||||
ziConversionTable* table;
|
||||
ziWChar* mapped;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
start (0, 18)
|
||||
best (0, 18) after 36 builds; source restored; best order was:
|
||||
ziU16 key = 0;
|
||||
ziU16 index, count, first, last;
|
||||
ziConversionTable* table;
|
||||
ziWChar* mapped;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
```
|
||||
|
||||
HIGH data extent correction: lbl_810C6580 is the third argument to __register_global_object in six matched keyboard functions; Runtime/include/NMWException.h defines DestructorChain as three 4-byte pointers, so its real size is 12 bytes, not 16. Corrected only size 0x10 -> 0xC, same .bss address 810C6580, no name change. The following layoutGatherDestructorRecord remains at 810C6590. Four trailing alignment bytes stay unowned; validate that .bss section size remains 16. This is a type correction, not a function extent change or a match claim.
|
||||
|
||||
HIGH corrected extent verification: fresh extraction now records lbl_810C6580 size 12, .bss size still 16. tiPcKeyboard matched data increases 18548/18564 -> 18564/18564, all other section totals unchanged, code remains 28064/28484 and exact functions 140/141. No symbol rename or source trick was needed. This is the sole retained improvement.
|
||||
|
||||
HIGH completion audit: all six open functions received at least three distinct successfully compiled source trials. Every code candidate was restored. Four declaration-order searches covered 23/52/52/36 orders for GetElementCount/MatchZHSpelling/getKeyLayout/ConvertUC2Key, with no accepted ordering. The invalid gH06 transformation and mW06 unnecessary outer pointer are excluded. Compiler-rejected candidates are excluded. None of the six code functions became exact; all remain open. setTranslateMode cannot match this target using the tested defined fallbacks; target behavior for invalid enums remains unspecified, and no uninitialized source was introduced.
|
||||
|
||||
HIGH final full clean gate over all four units:
|
||||
|
||||
```
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] objdiff: code 4168/47816 data 144/536 functions 5/8 fuzzy 96.4008 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] instruction-exact functions: 5/8
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .data size 392 match None
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sbss2 size 8 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sdata2 size 16 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .text size 47816 match 96.40079
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extab size 48 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extabindex size 72 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: ZiMatchZHSpelling 98.80165
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: zi8InternalGetZH 95.99054
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: Zi8GetElementCount 99.347824
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] baseline: code 4168/47816 data 144 functions 5 fuzzy 96.4008
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] objdiff: code 1488/2216 data 60/60 functions 3/4 fuzzy 99.8466 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] instruction-exact functions: 3/4
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section .text size 2216 match 99.84657
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section extab size 24 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section extabindex size 36 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] below 100: Zi8getKeyLayout 99.53297
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] baseline: code 1488/2216 data 60 functions 3 fuzzy 99.8466
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] objdiff: code 1380/2208 data 112/112 functions 3/4 fuzzy 99.8370 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] instruction-exact functions: 3/4
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section .rodata size 32 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section .text size 2208 match 99.83696
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section extab size 32 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section extabindex size 48 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] below 100: Zi8ConvertUC2Key 99.565216
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zconvert] baseline: code 1380/2208 data 112 functions 3 fuzzy 99.8370
|
||||
[src/keyboard/tiPcKeyboard] pool: IDENTICAL
|
||||
[src/keyboard/tiPcKeyboard] objdiff: code 28064/28484 data 18564/18564 functions 140/141 fuzzy 99.9860 linked code 0
|
||||
[src/keyboard/tiPcKeyboard] instruction-exact functions: 140/141
|
||||
[src/keyboard/tiPcKeyboard] section .bss size 16 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .data size 12576 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .rodata size 5816 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sbss size 8 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sdata size 136 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sdata2 size 8 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .text size 28484 match 99.985954
|
||||
[src/keyboard/tiPcKeyboard] below 100: setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode 99.04762
|
||||
[src/keyboard/tiPcKeyboard] baseline: code 28064/28484 data 18548 functions 140 fuzzy 99.9860
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.32564 -> 90.32564
|
||||
global fuzzy_match_percent: 99.55189 -> 99.55189
|
||||
global complete_code_percent: 69.30851 -> 69.30851
|
||||
global matched_data_percent: 99.36508 -> 99.36596
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
HIGH before -> after, instruction-exact/code/data bytes: zi8cgetc 5/4168/144 -> 5/4168/144; zmtkey 3/1488/60 -> 3/1488/60; zconvert 3/1380/112 -> 3/1380/112; tiPcKeyboard 140/28064/18548 -> 140/28064/18564. The gate passes, DOL SHA1 is exact, no regressions. The required instruction-exact count increase is still unmet. The retained data correction makes keyboard data 100% without changing section size or any code.
|
||||
@@ -1693,3 +1693,286 @@ src/keyboard/tiSignWindow | exact 55/56 -> 55/56 | code bytes 6300 -> 6300/7184
|
||||
R8 remaining | create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | 99.72851% | 221/221, frame0x50,10operand differences: All-vtable/table address-load relocation order4 andanimation-count22vs31/slot31vs22 registerswap6. First51LISAll30vstable24; allotherconstructors, pointerread/call/order exact. | 20 distinct compiled source attempts this round.
|
||||
libs/RVLMiddleware/TMC_JPEG/src/reschange/idct_resolution_change_var | exact 5/6 -> 6/6 | code bytes 1260 -> 1804/1804 | data bytes 0 -> 0/0
|
||||
R8 final files: src/keyboard/tiSignWindow.cpp; libs/RVLMiddleware/TMC_JPEG/src/reschange/idct_resolution_change_var.c; tools/decomp-assist/fz3.attempts.md. Source commits8fbf59f0,1988244e. One new exact function and544matchedcodebytes, IDCTunit6/6code1804/1804data0. Signcreate99.162895->99.72851genuinefuzzyimprovement, exactcountunchanged. 45distinctcompiledsource trials and107declaration evaluations followingstructuraldiagnostics. Allfivepoolsidentical,data100, correctDOL,0globalregressions/forbidden/readability. No sourcechangesafterfullclean gate; finalcommit logonly. Uncertain: original Hangul helper/newline-processing structure andremaining SO/iterator/register constant-hoist choices; allacceptedbytes/state provedbygate. No untried openfunctions, no symbol/data/header/config changes, no Matching status switches orlinking claims.
|
||||
|
||||
# R9 XHIGH continued, fresh origin/main branch
|
||||
Initial HEAD 76d72f06ce72601ba50236376319984c3e70f2af; origin adcd8ca586dc4ad15c62df304e560a7c974f1c12. Four owned units only; IDCT/pf_volume/eZiText excluded.
|
||||
libs/RevoEX/src/so/SOOption | initial pool | POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
libs/RevoEX/src/so/SOOption | initial pool | POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
libs/RVL_SDK/src/fa/pf_entry_iterator | initial pool | POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
src/keyboard/tiString | initial pool | POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
src/keyboard/tiSignWindow | initial pool | POOL IDENTICAL up to 30 (mine=30 base=30)
|
||||
SOGetInterfaceOpt | R9 fetch origin/main adcd8ca5 source equal. First5 level25 vs26, then option28 vs25;119/119 frame0x30, stackslots0xc/8, branch shape and pointer arithmetic/inline OptionLength boundary all exact. No stack-store/reload volatility proof or extent overlap; all owned data empty. New scalar-reference/response-helper and local lifetime experiments before register-only search.
|
||||
SOGetInterfaceOpt | R9 unsigned allocation size and response length as byte extents | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 level and option scalar parameters immutable at definition | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 scoped selector copies taken after preparation and before validation | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 readonly scalar input references in selector helper | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 readonly option selector reference alone in command helper | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 readonly protocol level reference alone in command helper | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 typed reply buffer inline accessor boundary | objdiff 98.94958; 119/119 instructions; structural/exact (0, 24); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 typed returned length inline accessor boundary | objdiff 99.07563; 119/119 instructions; structural/exact (0, 22); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 returned length and reply locals scoped to successful allocation | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and reply descriptors scoped to successful allocation | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command helper gets input selectors through aggregate const view | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 vector base and byte lengths assigned through typed descriptor helper | objdiff 96.193275; 119/119 instructions; structural/exact (6, 25); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 successful request payload pointers accessed by actual struct fields | objdiff 97.5042; 119/119 instructions; structural/exact (5, 10); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
PFENT_ITER_FindCluster | R9 fresh fetch 68c4c9ae, sourceequal. First39 li r7,1 vstargetr8;237/237/frame0xa0, eight constant1/entries-per-sector operands. All branches/local offsets/load/store/inline LoadEntry identical. Immediate iter.index reload alreadypresent, prior volatile adds3 loads; no new volatile. Extent endsatRetreat, data24/24. Test natural left-shift entry index and typed count initialization before declsearch.
|
||||
PFENT_ITER_FindCluster | R9 file entry index computed with shift rather than sector multiplication | objdiff 98.945145; 237/237 instructions; structural/exact (2, 9); first (39, ('li', 'r7, 1'), ('li', 'r8, 1'))
|
||||
PFENT_ITER_FindCluster | R9 entry mask helper derives count and mask from readonly geometry | objdiff 98.48101; 237/237 instructions; structural/exact (2, 26); first (2, ('stw', 'r0, 0xa4(r1)'), ('li', 'r6, 0'))
|
||||
PFENT_ITER_FindCluster | R9 entry count helper keeps shift operand unsigned | objdiff 99.81013; 237/237 instructions; structural/exact (0, 8); first (39, ('li', 'r7, 1'), ('li', 'r8, 1'))
|
||||
PFENT_ITER_FindCluster | R9 local count and first-cluster sentinel grouped as geometry values | BUILD FAIL -maxerrors 1 -nosyspath -RTTI off -fp_contract on -str reuse -DSDK_IPL -D_REVOLUTION -DMEM_MANAGER_DIRECT -i include -i include/global -i libs/MetroTRK/include -i libs/Runtime/include -i libs/MSL/include -i libs/RVL_SDK/include -i libs/RevoEX/include -i libs/NW4R/include -i libs/RVLMiddleware/eZiText/include -i libs/RVLMiddleware/TMC_JPEG/include -i libs/RVLFaceLib/include -i libs/EGG/include -i libs/OperaWWW/include -ir libs/RVL_SDK/include/private/bte -i build/43U/include -DBUILD_VERSION=0 -DVERSION_43U -i libs/RVL_SDK/include/private/bte -DNDEBUG=1 -DTARGET_RVL -ipa file -fp_contract off -lang=c -MMD -c libs/RVL_SDK/src/fa/pf_entry_iterator.c -o build/43U/src/libs/RVL_SDK/src/fa && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/fa/pf_entry_iterator.d build/43U/src/libs/RVL_SDK/src/fa/pf_entry_iterator.d ### mwcceppc.exe Compiler: # File: libs\RVL_SDK\src\fa\pf_entry_iterator.c # ------------------------------------------------ # 513: iter.log2_geometry.entries_per_sector = p_ent->p_vol->bpb.log2_bytes_per_sector - 5; # Error: ^ # (10393) 'log2_geometry' is not a member of class 'struct PFITER_ENT_ITER' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
PFENT_ITER_FindCluster | R9 shift count temporary uses natural byte geometry before iterator storage | objdiff 98.48101; 237/237 instructions; structural/exact (2, 26); first (2, ('stw', 'r0, 0xa4(r1)'), ('li', 'r6, 0'))
|
||||
PFENT_ITER_FindCluster | R9 offset mask initialized before persistent entries-per-sector value | objdiff 100.0; 237/237 instructions; structural/exact (0, 0); first None
|
||||
create | R9 fresh origin c7896c38 sourceequal.221/221/frame0x50. First51 LIS Allvtable30vstable24; four relocation-address load-order diffs, six animation count22vs31 and slot31vs22 register operands. All calls/constructors/pane switch/loop forms otherwiseexact; readonly animation-slotreference gain preserved. No adjacentstackreload/extentoverlap, owneddata3468/3468. Test early type input, const table fields and helper/scopes before declsearch.
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 pane type read before metadata row address | objdiff 99.38914; 221/221 instructions; structural/exact (0, 21); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 switch type input directly indexes table | objdiff 99.38914; 221/221 instructions; structural/exact (0, 21); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 metadata row constructed before empty pane result | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 constructor switch source order 2,0,1 | objdiff 99.63801; 221/221 instructions; structural/exact (2, 14); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
PFENT_ITER_FindCluster | R9 breakthrough: initialize offset_mask directly from shifted geometry before declaring the persistent entries_per_sector value. Compiler CSE retains identical 237-instruction scheduling but chooses shared1=r8 and shiftedentrycount=r7, resolving all eight operands. Natural dependency/statement order lever, no header/type/volatile or data change. New source saved for gate.
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 constructor switch source order 1,2,0 | objdiff 99.24435; 222/221 instructions; structural/exact (8, 158); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
SOGetInterfaceOpt | R9 thirteen compiled new source constructs; leading declsearch: declaration block: | s32 rm; | int temporary; | int size; | int result; | InterfaceOption* request; | InterfaceCommand* command; | int* returnedLength; | u8* reply; | start (0, 5) | best (0, 5) after 70 builds; source restored; best order was: | s32 rm; | int temporary; | int size; | int result; | InterfaceOption* request; | InterfaceCommand* command; | int* returnedLength; | u8* reply; | . No improvement; baseline source restored.
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 constructor switch source order 1,0,2 | objdiff 99.17647; 222/221 instructions; structural/exact (8, 158); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 constructor switch source order 0,2,1 | objdiff 99.049774; 222/221 instructions; structural/exact (6, 159); first (50, ('lis', 'r28, 0'), ('lis', 'r29, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 constructor switch source order 0,1,2 | objdiff 99.06335; 222/221 instructions; structural/exact (8, 160); first (50, ('lis', 'r28, 0'), ('lis', 'r29, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 immutable type field on pane table metadata | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
inputChar | R9 fresh fetch c7896c38, sourceequal125/136/frame0x30. First branch10offset differs only due shorter Hangulblock; first real instruction65 initializer/count/newline compare/indexed append absent. Target carries countzero r6 through shift,indexed store,increment, mask u16return; initialNUL before cmplwi ch10 retaineddead compare. Kana/cursor methods exactshape; no volatile proof, extent0x220 endsatconfirmKana. Data288/288. Test const input/buffer/helper stream ownership and natural newline conversion variants; keep semantic operations, no empty helpers/stubs/dummy state.
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 immutable animation count field in pane table | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 immutable force animation target pointer in pane table | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 immutable animation pointer slots at metadata definition | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 metadata selector and count immutable fields together | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation count initialized before force target from same metadata | objdiff 99.69683; 221/221 instructions; structural/exact (4, 11); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 loop count unsigned temporary derived through const field reference | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation index wide with explicit UTF16 lookup and comparison | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation count shares binding state with force target | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 count declared at outer pane iteration but assigned after pane construction | objdiff 99.61539; 221/221 instructions; structural/exact (0, 14); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 force target declared at outer pane iteration with retained count lifetime | objdiff 99.54751; 221/221 instructions; structural/exact (0, 17); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 allocation buffer declared once for all constructor cases | objdiff 98.86878; 221/221 instructions; structural/exact (0, 46); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 pane row type query in readonly inline boundary | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
|
||||
R9 exact entry iterator candidate quick full-build authority gate:
|
||||
```
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/so/SOOption] pool: IDENTICAL
|
||||
[libs/RevoEX/src/so/SOOption] objdiff: code 816/1292 data None/None functions 3/4 fuzzy 99.9226 linked code 0
|
||||
[libs/RevoEX/src/so/SOOption] instruction-exact functions: 3/4
|
||||
[libs/RevoEX/src/so/SOOption] section .text size 1292 match 99.9226
|
||||
[libs/RevoEX/src/so/SOOption] below 100: SOGetInterfaceOpt 99.78992
|
||||
[libs/RevoEX/src/so/SOOption] baseline: code 816/1292 data None functions 3 fuzzy 99.9226
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] objdiff: code 7880/7880 data 24/24 functions 16/16 fuzzy 100.0000 linked code 0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] instruction-exact functions: 16/16
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .sdata size 24 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .text size 7880 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] baseline: code 6932/7880 data 24 functions 15 fuzzy 99.9772
|
||||
[src/keyboard/tiString] pool: IDENTICAL
|
||||
[src/keyboard/tiString] objdiff: code 4632/5176 data 288/288 functions 41/42 fuzzy 98.9629 linked code 0
|
||||
[src/keyboard/tiString] instruction-exact functions: 41/42
|
||||
[src/keyboard/tiString] section .data size 288 match 100.0
|
||||
[src/keyboard/tiString] section .text size 5176 match 98.962906
|
||||
[src/keyboard/tiString] below 100: inputChar__Q39textinput8tistring9DecolatedFw 90.132355
|
||||
[src/keyboard/tiString] baseline: code 4632/5176 data 288 functions 41 fuzzy 98.9629
|
||||
[src/keyboard/tiSignWindow] pool: IDENTICAL
|
||||
[src/keyboard/tiSignWindow] objdiff: code 6300/7184 data 3468/3468 functions 55/56 fuzzy 99.9666 linked code 0
|
||||
[src/keyboard/tiSignWindow] instruction-exact functions: 55/56
|
||||
[src/keyboard/tiSignWindow] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .data size 2672 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .rodata size 784 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .sdata size 8 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .text size 7184 match 99.96659
|
||||
[src/keyboard/tiSignWindow] below 100: create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.72851
|
||||
[src/keyboard/tiSignWindow] baseline: code 6300/7184 data 3468 functions 55 fuzzy 99.9666
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.02490 -> 90.05654
|
||||
global fuzzy_match_percent: 99.54210 -> 99.54217
|
||||
global complete_code_percent: 69.30851 -> 69.30851
|
||||
global matched_data_percent: 99.36508 -> 99.36508
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
R9 accepted PFENT_ITER_FindCluster 100.0%, ctxdiff0/237instructions, wholeunit16/16/code7880/7880/data24/24; all four pools identical,0globalregressions/forbidden/readability, correctDOL. Only two source initialization lines changed; no configure/header/config/data changes.
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime level,length,option,reply | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime level,length,reply,option | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime option,level,length,reply | objdiff 99.85714; 119/119 instructions; structural/exact (2, 3); first (5, ('mr', 'r28, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime option,length,level,reply | objdiff 99.85714; 119/119 instructions; structural/exact (2, 3); first (5, ('mr', 'r28, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime option,length,reply,level | objdiff 99.85714; 119/119 instructions; structural/exact (2, 3); first (5, ('mr', 'r28, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime length,level,option,reply | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime length,level,reply,option | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime length,option,level,reply | objdiff 99.85714; 119/119 instructions; structural/exact (2, 3); first (5, ('mr', 'r28, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime length,option,reply,level | objdiff 99.85714; 119/119 instructions; structural/exact (2, 3); first (5, ('mr', 'r28, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime length,reply,level,option | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 command and response statements by actual lifetime length,reply,option,level | objdiff 99.85714; 119/119 instructions; structural/exact (2, 3); first (5, ('mr', 'r28, r4'), ('mr', 'r26, r4'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 UTF16 character passed as const reference into indexed append helper | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 UTF16 output bounded array reference and immutable pointer helper | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 literal conversion buffer uses output array member and meaningful current length | objdiff 87.80147; 128/136 instructions; structural/exact (30, 76); first (0, ('stwu', 'r1, -0x50(r1)'), ('stwu', 'r1, -0x30(r1)'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 stream appender carries pointer and UTF16 count through readonly character input | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline resets UTF16 count before common append in readonly character helper | objdiff 93.60294; 135/136 instructions; structural/exact (15, 61); first (10, ('beq', '468'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline empties buffered literal stream through Clear helper before append | objdiff 92.52941; 135/136 instructions; structural/exact (16, 61); first (10, ('beq', '468'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline byteview reset helper returns zero cursor before common append | objdiff 91.72794; 136/136 instructions; structural/exact (17, 61); first (63, ('b', '88'), ('b', '80'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 generic literal newline flush resets output length using unsigned short state | objdiff 95.036766; 136/136 instructions; structural/exact (8, 23); first (39, ('clrlwi', 'r28, r3, 0x18'), ('clrlwi', 'r29, r3, 0x18'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 stream constructor initializes count through const buffer input reference | objdiff 93.05147; 136/136 instructions; structural/exact (17, 60); first (63, ('b', '88'), ('b', '80'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 generic single character stream uses common append method for newline | objdiff 91.01471; 137/136 instructions; structural/exact (17, 74); first (10, ('beq', '476'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 Hangul conversion derives one character length from bounded output pointer | objdiff 89.92647; 130/136 instructions; structural/exact (18, 87); first (10, ('beq', '448'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 single character buffer append loops over existing buffer terminator | objdiff 89.117645; 139/136 instructions; structural/exact (18, 74); first (10, ('beq', '484'), ('beq', '472'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 mutable pane row reference with readonly animation slot view | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 immutable pane row pointer with readonly animation slot view | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 mutable pane row pointer with readonly animation slot view | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 table input bound through immutable array reference | objdiff 99.502266; 221/221 instructions; structural/exact (0, 18); first (49, ('lis', 'r22, 0'), ('lis', 'r27, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 table row lookup uses scoped const pointer after owner setup | objdiff 99.502266; 221/221 instructions; structural/exact (0, 18); first (49, ('lis', 'r22, 0'), ('lis', 'r27, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation count local signed extent with unsigned compare | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation slot view pointer accessed by typed inline reference getter | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation pointer value read inside readonly slot wrapper struct | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 pane name virtual lookup extracted before allocation in each branch | objdiff 78.746605; 224/221 instructions; structural/exact (74, 158); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation count copied after explicit zero index initialization | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation count and index declaration order shared across pane loop | objdiff 98.64253; 221/221 instructions; structural/exact (0, 54); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation index outside count lifetime and declared before force target | objdiff 98.57466; 221/221 instructions; structural/exact (0, 56); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 generic literal newline flush resets output length using unsigned short state detailed candidate disassembly | objdiff 95.036766; 136/136 instructions; structural/exact (8, 23); first (39, ('clrlwi', 'r28, r3, 0x18'), ('clrlwi', 'r29, r3, 0x18'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline reset skips alreadyempty stream u32 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline clear removes existing buffered characters u32 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline reset guards stream clear using immutable length view u32 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar | R9 candidate u16 streamcount reference reaches95.036766/136instructions,firstrealHangulblock66stillhaslive newline branch and redundant countzero, maskedscaledindexinsteadtargetu32slwi. Registercount28vs29 propagates intoKana. Not retained; next trials implement functional Clear that skips alreadyempty stream or removes existing chars, to test deadbranch elimination at actual helper boundary.
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline reset assigns only when positive old count u32 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline reset skips alreadyempty stream u16 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline clear removes existing buffered characters u16 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline reset guards stream clear using immutable length view u16 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline reset assigns only when positive old count u16 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline stream clears existing buffered chars u32 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
inputChar__Q39textinput8tistring9DecolatedFw | R9 newline stream clears existing buffered chars u16 | objdiff 90.757355; 126/136 instructions; structural/exact (17, 73); first (10, ('beq', '432'), ('beq', '472'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer pane traversal written as natural unsigned for loop | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer pane index initialized by traversal header rather than declaration | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer pane loop while form with increment at tail | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer pane loop do with preincrement in comparison | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer pane loop signed counter with unsigned bounds and UTF16 element lookup | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation traversal uses explicit for loop with existing local counter | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation index initialization inside for header after force metadata | objdiff 99.72851; 221/221 instructions; structural/exact (0, 10); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation loop exit inverted inside unconditional loop | objdiff 59.95475; 221/221 instructions; structural/exact (6, 52); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation count direct copy into index-and-count state | objdiff 98.57466; 221/221 instructions; structural/exact (0, 56); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 pane loop index initialized before force and animation metadata declarations | objdiff 99.54751; 221/221 instructions; structural/exact (0, 17); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 animation bound held by early unsigned immutable scalar copy per pane iteration | objdiff 98.75565; 221/221 instructions; structural/exact (0, 50); first (51, ('lis', 'r30, 0'), ('lis', 'r24, 0'))
|
||||
signcreate | R9 leadingdeclsearch6builds unchanged10; new structural outer pane do->for loop immediatelyfixesAll/table addresshoistorder,221/221 and6registeronly bound/slot operands remain,99.86425%. Proven natural controlflow lever; candidate pending gate after remaining loop trials.
|
||||
SOGetInterfaceOpt | R9 preparation failure returns early before request scope | objdiff 98.52941; 120/119 instructions; structural/exact (2, 108); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 preparation failure branches to shared return label | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 preparation status separate with early return and operation result scope | objdiff 98.86555; 120/119 instructions; structural/exact (2, 108); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 valid option block first with invalid branch in trailing else | objdiff 93.31092; 120/119 instructions; structural/exact (9, 108); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 allocated request success block before allocation error branch | objdiff 96.344536; 119/119 instructions; structural/exact (5, 73); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 selector pair store expressions followed by response construction inline block | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 input parameter names reflect protocol level and option request | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
SOGetInterfaceOpt | R9 input values named for response buffer and byte length | objdiff 99.78992; 119/119 instructions; structural/exact (0, 5); first (5, ('mr', 'r25, r4'), ('mr', 'r26, r4'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer pane traversal written as natural unsigned for loop retained best outer loop | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
|
||||
R9 accepted natural pane for loop quick gate:
|
||||
```
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/so/SOOption] pool: IDENTICAL
|
||||
[libs/RevoEX/src/so/SOOption] objdiff: code 816/1292 data None/None functions 3/4 fuzzy 99.9226 linked code 0
|
||||
[libs/RevoEX/src/so/SOOption] instruction-exact functions: 3/4
|
||||
[libs/RevoEX/src/so/SOOption] section .text size 1292 match 99.9226
|
||||
[libs/RevoEX/src/so/SOOption] below 100: SOGetInterfaceOpt 99.78992
|
||||
[libs/RevoEX/src/so/SOOption] baseline: code 816/1292 data None functions 3 fuzzy 99.9226
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] objdiff: code 7880/7880 data 24/24 functions 16/16 fuzzy 100.0000 linked code 0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] instruction-exact functions: 16/16
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .sdata size 24 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .text size 7880 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] baseline: code 6932/7880 data 24 functions 15 fuzzy 99.9772
|
||||
[src/keyboard/tiString] pool: IDENTICAL
|
||||
[src/keyboard/tiString] objdiff: code 4632/5176 data 288/288 functions 41/42 fuzzy 98.9629 linked code 0
|
||||
[src/keyboard/tiString] instruction-exact functions: 41/42
|
||||
[src/keyboard/tiString] section .data size 288 match 100.0
|
||||
[src/keyboard/tiString] section .text size 5176 match 98.962906
|
||||
[src/keyboard/tiString] below 100: inputChar__Q39textinput8tistring9DecolatedFw 90.132355
|
||||
[src/keyboard/tiString] baseline: code 4632/5176 data 288 functions 41 fuzzy 98.9629
|
||||
[src/keyboard/tiSignWindow] pool: IDENTICAL
|
||||
[src/keyboard/tiSignWindow] objdiff: code 6300/7184 data 3468/3468 functions 55/56 fuzzy 99.9833 linked code 0
|
||||
[src/keyboard/tiSignWindow] instruction-exact functions: 55/56
|
||||
[src/keyboard/tiSignWindow] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .data size 2672 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .rodata size 784 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .sdata size 8 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .text size 7184 match 99.9833
|
||||
[src/keyboard/tiSignWindow] below 100: create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425
|
||||
[src/keyboard/tiSignWindow] baseline: code 6300/7184 data 3468 functions 55 fuzzy 99.9666
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.02490 -> 90.05654
|
||||
global fuzzy_match_percent: 99.54210 -> 99.54221
|
||||
global complete_code_percent: 69.30851 -> 69.30851
|
||||
global matched_data_percent: 99.36508 -> 99.36508
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
R9 signcreate improvement99.72851->99.86425; hoisted global/table address-load order nowexact,6register operands count22/slot31 swapped versuscount31/slot22.221/221frame0x50; all pools/dataexact,0globalregression/forbidden/readability/correctDOL. Leadingdeclsearch onforcandidate6buildsleaves6diffs. Minimal loop-form change retained andcommitted; no type/header/data changes.
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop initializes animation extent before traversal | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop initializes force target before traversal | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop animation bound initialized after index declaration | objdiff 99.75113; 221/221 instructions; structural/exact (0, 10); first (58, ('li', 'r22, 0'), ('li', 'r21, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop animation counter declared before scoped bound | objdiff 98.77828; 221/221 instructions; structural/exact (0, 50); first (58, ('li', 'r22, 0'), ('li', 'r21, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop animation bound shares readonly metadata input scope | objdiff 98.8914; 221/221 instructions; structural/exact (0, 46); first (58, ('li', 'r22, 0'), ('li', 'r21, 0'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop uses actual readonly pointer-to-slot input view | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop declares resource and transform before slot pointer view | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop readonly pane binding helper carries count before pointer reference | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop mutable animation pointer slot reference | objdiff 99.86425; 221/221 instructions; structural/exact (0, 6); first (159, ('lwz', 'r22, 0x18(r20)'), ('lwz', 'r31, 0x18(r20)'))
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | R9 outer for loop caches animation file readonly reference as object | objdiff 97.004524; 219/221 instructions; structural/exact (9, 91); first (48, ('lis', 'r26, 0'), ('lis', 'r25, 0'))
|
||||
R9 data ownership audit: owned target data already100 by exact names: entry_iterator.sdata24, tiString.data288, tiSignWindow.data/rodata/sdata/ctors3468; SOOption noowneddata. Weak extras ignored. No relocation/type proof requiresrename/extentcorrection; no symbol/config/header/section changes.
|
||||
R9 extent audit SOGetInterfaceOpt = .text:0x814B476C; // type:function size:0x1DC | next SOSetInterfaceOpt = .text:0x814B4948; // type:function size:0x128 | no overlap.
|
||||
R9 extent audit PFENT_ITER_FindCluster = .text:0x815D3414; // type:function size:0x3B4 | next PFENT_ITER_Retreat = .text:0x815D37C8; // type:function size:0x25C | no overlap.
|
||||
R9 extent audit inputChar__Q39textinput8tistring9DecolatedFw = .text:0x81432CE4; // type:function size:0x220 | next confirmKana__Q39textinput8tistring9DecolatedFv = .text:0x81432F04; // type:function size:0x14 | no overlap.
|
||||
R9 extent audit create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator = .text:0x81430E50; // type:function size:0x374 | next __dt__Q49textinput8keyboard10signwindow7AnmPaneFv = .text:0x814311C4; // type:function size:0x58 | no overlap.
|
||||
SOGetInterfaceOpt | R9 all source variants rejected:5pureoperand differences unchanged by selector const/reference/scopes/types. Eleven dependency-valid command/response operation orders either preserve5diffs orreverse actual header stores, giving99.85714/3diffs but2structural forms; latter rejected because introduces non-target scheduling. Earlyreturn/branchinversion adds1instruction orotherbranchforms, aliases unchanged. Leadingdeclsearch70builds noimprovement. Baseline source intact,3/4.
|
||||
inputChar | R9 22 distinct compiled new converter trials. Best95.036766/136 stillhaslive newline reset branch absenttarget andwrongindexwidth/countregs; guarded actualclear removesbranch butfoldsindex/count,126/136. No candidate retained because original converter boundary unresolved; baseline125/136,90.132355 restored. Functional helper trials only, no empty stubs, unsupportedvolatile ordata changes.
|
||||
R9 pre-final remaining audit | SOGetInterfaceOpt | 32 distinct compiled scored source attempts this round; >=3 proved.
|
||||
R9 pre-final remaining audit | inputChar__Q39textinput8tistring9DecolatedFw | 22 distinct compiled source trials plus one repeated detailed disassembly run; >=3 proved.
|
||||
R9 pre-final remaining audit | create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | 54 distinct compiled source trials plus one repeated retained-candidate rebuild; >=3 proved.
|
||||
R9 retained source: entry iterator two initialization-line change exactly237/237 and16/16; sign outerdo->for loop exactly221/221shape and6pure operands,99.86425. SO andtiString source restored. All other units/exactfunctions/data preserved, no header/config changes. Final clean gate follows.
|
||||
R9 trial totals: 113 distinct compiled source variations across four functions, plus82 declaration-order evaluations,195 builds; failed geometry-struct trial excluded. Three remaining open functions all exceed3 distinct attempts. One new exact function,948newmatchedcodebytes, signloadorderfour operands resolved; no original helper source inferred beyond evidence.
|
||||
|
||||
# R9 final clean full gate over all four owned units (non --quick)
|
||||
```
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/so/SOOption] pool: IDENTICAL
|
||||
[libs/RevoEX/src/so/SOOption] objdiff: code 816/1292 data None/None functions 3/4 fuzzy 99.9226 linked code 0
|
||||
[libs/RevoEX/src/so/SOOption] instruction-exact functions: 3/4
|
||||
[libs/RevoEX/src/so/SOOption] section .text size 1292 match 99.9226
|
||||
[libs/RevoEX/src/so/SOOption] below 100: SOGetInterfaceOpt 99.78992
|
||||
[libs/RevoEX/src/so/SOOption] baseline: code 816/1292 data None functions 3 fuzzy 99.9226
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] objdiff: code 7880/7880 data 24/24 functions 16/16 fuzzy 100.0000 linked code 0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] instruction-exact functions: 16/16
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .sdata size 24 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .text size 7880 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_entry_iterator] baseline: code 6932/7880 data 24 functions 15 fuzzy 99.9772
|
||||
[src/keyboard/tiString] pool: IDENTICAL
|
||||
[src/keyboard/tiString] objdiff: code 4632/5176 data 288/288 functions 41/42 fuzzy 98.9629 linked code 0
|
||||
[src/keyboard/tiString] instruction-exact functions: 41/42
|
||||
[src/keyboard/tiString] section .data size 288 match 100.0
|
||||
[src/keyboard/tiString] section .text size 5176 match 98.962906
|
||||
[src/keyboard/tiString] below 100: inputChar__Q39textinput8tistring9DecolatedFw 90.132355
|
||||
[src/keyboard/tiString] baseline: code 4632/5176 data 288 functions 41 fuzzy 98.9629
|
||||
[src/keyboard/tiSignWindow] pool: IDENTICAL
|
||||
[src/keyboard/tiSignWindow] objdiff: code 6300/7184 data 3468/3468 functions 55/56 fuzzy 99.9833 linked code 0
|
||||
[src/keyboard/tiSignWindow] instruction-exact functions: 55/56
|
||||
[src/keyboard/tiSignWindow] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .data size 2672 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .rodata size 784 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .sdata size 8 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .text size 7184 match 99.9833
|
||||
[src/keyboard/tiSignWindow] below 100: create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425
|
||||
[src/keyboard/tiSignWindow] baseline: code 6300/7184 data 3468 functions 55 fuzzy 99.9666
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.02490 -> 90.05654
|
||||
global fuzzy_match_percent: 99.54210 -> 99.54221
|
||||
global complete_code_percent: 69.30851 -> 69.30851
|
||||
global matched_data_percent: 99.36508 -> 99.36508
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
libs/RevoEX/src/so/SOOption | exact 3/4 -> 3/4 | code bytes 816 -> 816/1292 | data bytes 0 -> 0/0
|
||||
R9 remaining | SOGetInterfaceOpt | 99.78992% | 119/119 frame0x30; five argument selector/level register operands, first5mr25vs26; rm/temp stack offsets, branch/helper/load/store/pointer order all exact. 32 distinct compiled source trials,70declsearchevaluations.
|
||||
libs/RVL_SDK/src/fa/pf_entry_iterator | exact 15/16 -> 16/16 | code bytes 6932 -> 7880/7880 | data bytes 24 -> 24/24
|
||||
src/keyboard/tiString | exact 41/42 -> 41/42 | code bytes 4632 -> 4632/5176 | data bytes 288 -> 288/288
|
||||
R9 remaining | inputChar__Q39textinput8tistring9DecolatedFw | 90.132355% | 125/136 frame0x30; Hangul converter original inline boundary, indexed append counter and dead newline compare unresolved.22distinct converter trials plus repeated135/136 detailed disassembly; best95.036766rejected because addslive newline branch.
|
||||
src/keyboard/tiSignWindow | exact 55/56 -> 55/56 | code bytes 6300 -> 6300/7184 | data bytes 3468 -> 3468/3468
|
||||
R9 remaining | create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | 99.86425% | 221/221 frame0x50; all relocation-address/load orders nowexact, only6count22/slot31 operand differences vstargetcount31/slot22; first159lwz22vs31.54distinct source trials,12declaration evals.
|
||||
R9 final files: libs/RVL_SDK/src/fa/pf_entry_iterator.c; src/keyboard/tiSignWindow.cpp; tools/decomp-assist/fz3.attempts.md. Source commits83182c27,2ee7e995. Exactcount+1,948matchedcodebytes. Allpoolsidentical/data100/correctDOL/0globalregression/forbidden/readability. No sourcechangesafterfullcleangate. Remaining original Hangul helper structure and SO/count/slot register choices uncertain, logged without fake completion. No symbolrenames/extentchanges/sharedheaders/configure switches, no out-of-scope sourcefiles. Finalcommit logonly.
|
||||
|
||||
File diff suppressed because one or more lines are too long
6
tools/decomp-assist/iplAddress.attempts.md
Normal file
6
tools/decomp-assist/iplAddress.attempts.md
Normal file
@@ -0,0 +1,6 @@
|
||||
|
||||
## beq+b inside onEventDerived (solved — switch-dispatch + case-fallthrough structure)
|
||||
- Orig's ON_TRIG case: `if (con == NULL) break;` (real break → switch join), `if (con->downTrg(...)) { if (mState == STATE_COVER_NORMAL || mState == STATE_NORMAL) {buttons} }` — arms and failed guards FALL THROUGH to ON_POINT code (0x31c) — no break after the if-chain; the positive `||` mState-guard emits `beq body` + `bne ON_POINT`.
|
||||
- start_drag_event: `switch (mState) { case STATE_NORMAL: if (mMode == 0) break; /*fall*/ default: return; }` reproduces `beq fwd / b ret` per clause — the `b` is default's arm edge placed between dispatch test and case body. Sequential `if`s, `||`, goto, if/else all fold to single `bne`.
|
||||
- Residual: pure reg-web coloring (orig this→r29/con→r30/paneName→r31 vs mine r27/r28/r30) — liveness-priority coloring, no source lever (keep-vs-remat wall family).
|
||||
- movePane_onDrag: `width += 0.01f` was INSIDE the `if (textBox && name)` block in orig (b 0x164 skips it). `&&` clause polarity `bne fwd / b end` still folded in mine (block-layout tie).
|
||||
8
tools/decomp-assist/iplAddressEdit.attempts.md
Normal file
8
tools/decomp-assist/iplAddressEdit.attempts.md
Normal file
@@ -0,0 +1,8 @@
|
||||
|
||||
## get_friendinfo keep-vs-remat (88%)
|
||||
Orig caches mString.mName (this+0x2b4) and mString.mDisplayText (this+0x2cc)
|
||||
pointers in r29 across the FindPaneByName+set_textbox calls (extra addi + mr
|
||||
reuse, +2 insns); mine rematerializes the member addresses inline at the call.
|
||||
Orig this=r28, ptr webs=r29 (reused sequentially for both ptrs). Mine this=r29,
|
||||
no ptr webs - the callee-reg web rotation differs by one position. Same
|
||||
documented keep-vs-remat + web-ordering wall family as create/CDBRecordEncrypt.
|
||||
@@ -7,3 +7,29 @@
|
||||
- **setEventHandler r5 mystery (documented):** orig calls `setEventHandler__Q33ipl5scene8SDButtonFPQ23gui12EventHandlerPQ23gui12EventHandler` (2-param) at 4 sites in iplSDChannelSelect + 2 in iplSDChannelTitle with r5 NEVER materialized (no li/lwz/mr r5 in the 4-insn window before bl; callee is non-static so this=r3, event=r4, optOutEvent=r5 garbage). MWCC always emits `li r5,0` for the =NULL default (verified: both `(h, NULL)` and `(h)` call forms emit it in mine). iplAddress.o Button callers DO emit `li r5,0` for the analogous Button decl. No C++ source model reproduces a 2-param bl with unset r5 (1-arg call to a defaulted 2-param decl emits the default; a 1-param decl would mangle differently). Left as `(h, NULL)` explicit; ~4 insn residual across create/selectChannel/initializeNormalPage/calcCommon/onEventDerived.
|
||||
- kpr_lib: orig's `once$2281` is an 8-byte fn-local accessed via lbz/stb → decoded as `static union { u64 align; u8 flag; }` inside KPRInitQueue — gives size-8 `once$` + .sbss 0x10 and .sbss scored 100%. Orig's .sbss ordering [DeadKeys@0,Romaji@4,once@8] vs mine [once@0,Romaji@4,DeadKeys@8] is MWCC reverse-decl-order emission; objdiff .sbss scores 100 anyway. kpr_lib now 8/9 fns, all data 100.
|
||||
- iplSDMemory: removed dead `#pragma inline_max_total_size` (no effect). drawTransferTitles: orig re-materializes f32 consts from sdata (`lfs f0,const@sda21`) where mine spills/reloads stack copies — frame-lever not found. create: 1064 vs 1060, mostly lbl_/@N symbol-name + r30/r31 data-base home.
|
||||
|
||||
## beq+b two-way dispatch — SOLVED (onEventDerived)
|
||||
|
||||
Orig emits `beq fwd / b end` pairs where single-branch guards were expected.
|
||||
Produced by a real `switch (event) { case 0: BODY; break; default: break; }`
|
||||
dispatch — MWCC keeps the 2-arm dispatch layout instead of folding to `bne`.
|
||||
`if`/`else` and `goto` forms all fold back to a single `bne`; only `switch`
|
||||
reproduces it. Applied at the `event == 0` check in the anon
|
||||
SDChannelSelectButtonEventHandler::onEventDerived → 144/144 insn-identical.
|
||||
The same pair inside a u64 `<` compare (handleSDTitleListResult `neg.` hi-test)
|
||||
has no applicable source form — that one stays a wall.
|
||||
|
||||
## switch-on-bool dispatch (handleSDTitleListResult)
|
||||
Orig emits `beq fwd-body / b ret` where a plain `if (u64 < K) return;` folds to single `bne ret`.
|
||||
Decode: `switch (x < K) { default: BODY; break; case true: return; }` — `default` arm FIRST
|
||||
(source order) with the bool-compare as discriminant → MWCC emits the two-arm dispatch
|
||||
(171/171 insn-equal). `case false:` regresses (jump-table range dispatch), if/else folds.
|
||||
Residual: orig uses `neg.` flags directly (`beq`); mine emits `neg` + `cmpwi 1` + `beq` —
|
||||
same insn count, operand-level diff only.
|
||||
|
||||
## Dead-arm fossil (iplAddressEdit, earlier)
|
||||
An unreachable empty `case N:` arm in a switch materializes a dead `b end` between
|
||||
dispatch and bodies: `case 4: break;` in start_left_event → EXACT 96/96;
|
||||
`case 4: goto done;` in start_point_event → 182/182. Only works in range-mapped
|
||||
dispatch (table/dense compare); every listed case in a compare-chain gets its own
|
||||
cmpwi level — the trick cannot produce extra `b` edges there (set_err_msg stays +1).
|
||||
|
||||
94
tools/decomp-assist/iplSDMemory.attempts.md
Normal file
94
tools/decomp-assist/iplSDMemory.attempts.md
Normal file
@@ -0,0 +1,94 @@
|
||||
|
||||
## drawTransferTitles — setTitleRowColors decode (session cont.)
|
||||
- Helper signature: `setTitleRowColors(TextBox*, const ut::Color&, const ut::Color&)` — mangle `RCQ34nw4r2ut5Color` proven via orig .text symbol.
|
||||
- Orig callsite: `Color c; writeFourFlagBytes(&c.r,...); Color a=c; Color b=c; setTitleRowColors(tb,a,b)` — 3 memberwise byte-copies (lbz/stb x4) from the same source.
|
||||
- DECODE: orig's `ut::Color()` ctor was TRIVIAL in this TU — orig emits no WHITE-init `stw` anywhere in drawTransferTitles and no `__ct__Color` weak def. Gated via `IPL_SDMEMORY_TRIVIAL_COLOR_CTOR` -> `Color() {}`. Produces exact 451-insn instruction stream (structure identical; residual = stack slot numbering + sched + regalloc).
|
||||
- WALL: weak-emission asymmetry — orig UND-references `__as__Color`/`__dt__PaneManager`/`__ct__PaneManager`/`__dt__Interface`/`__dt__scroller`/`__dt__Scroller`/`__dt__BScroller` (emitted weak in OTHER TUs); ours emits them as weak defs here -> extra .text bytes. Same family as iplGCWindow's weak-dtor backup wall.
|
||||
- Result: drawTransferTitles 96.99 fuzzy, create 99.13 (1064/1064 reg-home tie). Unit stays NonMatching.
|
||||
|
||||
## Weak-emission asymmetry — decl-only gating (session cont. 2)
|
||||
- Mechanism: orig's TU sees many gui/nw4r members DECL-ONLY while ours inlines/emits weak defs. Orig .o UND-references: EventHandler{onEvent,setManager,setLatestEventCtrlNo,getLatestEventCtrlNo}, scene::scroller{calc,is_busy,~scroller}, Pane::SetVisible, Pane::SetTranslate, ipl::gui::PaneManager{ctor,~}, Color::operator=(const Color&), iplSDChannelTitle_copyTitleRange.
|
||||
- Orig emits the 3 handler vtables as unnamed .data objects (4 slots each: onEvent + 3 UND EventHandler slots).
|
||||
- Gates applied: IPL_SDMEMORY_PANEMANAGER_DECL_ONLY (iplGuiManager.h ctor+~PaneManager), IPL_SDMEMORY_DECL_ONLY_GUI (GUIManager.h EventHandler 4 virtuals + Pane::SetVisible), IPL_SDMEMORY_DECL_ONLY_SCROLLER (iplFocusObject.h ~scroller+calc+is_busy), IPL_SDMEMORY_TRIVIAL_COLOR_CTOR (Color() trivial + operator=(const Color&) decl + ~Color undec'd, ~Rect undec'd).
|
||||
- DECODE: setTitleLists calls free fn iplSDChannelTitle_copyTitleRange(&dst,&src) x2 — NOT operator= (53/53 insn-equal now).
|
||||
- Result: extra weak defs 28 -> 4 (__dt__Scroller, __dt__Rect, getPane__PaneComponent, offPoint__Component — all unreferenced emission fossils; the getPane/offPoint CALLSITES are identical virtual dispatches vs orig). .text 21012 vs orig 20920 (+92B fossils).
|
||||
- create regalloc rotation noise (r30 vs r31 home) after layout shift — count-equal family.
|
||||
|
||||
## Decl-only gating cont. — weak-emission fully resolved (session cont. 3)
|
||||
- All 28 extra weak defs eliminated: additional gates = offPoint/getPane decl-only (GUIManager.h under IPL_SDMEMORY_DECL_ONLY_GUI — the virtual CALLSITES are byte-identical bctrl dispatches vs orig; only the weak DEF emission differed) + scroller ctor teardown (decl-only ~scroller/calc/is_busy kills __dt__Scroller fossil) + ~Rect undec kills __dt__Rect fossil + setTitleLists now calls iplSDChannelTitle_copyTitleRange (kills __as__TitleRange).
|
||||
- .text now 20836 vs orig 20920 (-84B). .data relocs byte-identical incl. the 3 handler vtables at same offsets with UND slot targets = orig.
|
||||
- REGRESSION to document: .data shrank 3144 -> 2996 (-148B). Orig's .data has a 148B ALL-ZERO tail after the last vtable (no relocs) — provenance unknown (link slack from split? a zero .data object our reconstruction lacks?). Pre-gate .data was coincidentally filled by the weak-vtable emission region (zero bytes + relocs). matched_data dropped 100 -> 5.98 as a side effect of removing the wrong vtables; .data fuzzy = 97.59.
|
||||
- create fuzzy 98.07 (reg-homing rotation after layout shift), drawTransferTitles 96.99.
|
||||
|
||||
---
|
||||
|
||||
## Weak-emission asymmetry — decl-only gating (session cont. 2)
|
||||
- Mechanism: orig's TU sees many gui/nw4r members DECL-ONLY while ours inlines/emits weak defs. Orig .o UND-references: EventHandler{onEvent,setManager,setLatestEventCtrlNo,getLatestEventCtrlNo}, scene::scroller{calc,is_busy,~scroller}, Pane::SetVisible, Pane::SetTranslate, ipl::gui::PaneManager{ctor,~}, Color::operator=(const Color&), iplSDChannelTitle_copyTitleRange.
|
||||
- Orig emits the 3 handler vtables as unnamed .data objects (4 slots each: onEvent + 3 UND EventHandler slots).
|
||||
- Gates applied: IPL_SDMEMORY_PANEMANAGER_DECL_ONLY (iplGuiManager.h ctor+~PaneManager), IPL_SDMEMORY_DECL_ONLY_GUI (GUIManager.h EventHandler 4 virtuals + Pane::SetVisible), IPL_SDMEMORY_DECL_ONLY_SCROLLER (iplFocusObject.h ~scroller+calc+is_busy), IPL_SDMEMORY_TRIVIAL_COLOR_CTOR (Color() trivial + operator=(const Color&) decl + ~Color undec'd, ~Rect undec'd).
|
||||
- DECODE: setTitleLists calls free fn iplSDChannelTitle_copyTitleRange(&dst,&src) x2 — NOT operator= (53/53 insn-equal now).
|
||||
- Result: extra weak defs 28 -> 4 (__dt__Scroller, __dt__Rect, getPane__PaneComponent, offPoint__Component — all unreferenced emission fossils; the getPane/offPoint CALLSITES are identical virtual dispatches vs orig). .text 21012 vs orig 20920 (+92B fossils).
|
||||
- create regalloc rotation noise (r30 vs r31 home) after layout shift — count-equal family.
|
||||
|
||||
## Decl-only gating cont. — weak-emission fully resolved (session cont. 3)
|
||||
- All 28 extra weak defs eliminated: additional gates = offPoint/getPane decl-only (GUIManager.h under IPL_SDMEMORY_DECL_ONLY_GUI — the virtual CALLSITES are byte-identical bctrl dispatches vs orig; only the weak DEF emission differed) + scroller ctor teardown (decl-only ~scroller/calc/is_busy kills __dt__Scroller fossil) + ~Rect undec kills __dt__Rect fossil + setTitleLists now calls iplSDChannelTitle_copyTitleRange (kills __as__TitleRange).
|
||||
- .text now 20836 vs orig 20920 (-84B). .data relocs byte-identical incl. the 3 handler vtables at same offsets with UND slot targets = orig.
|
||||
- REGRESSION to document: .data shrank 3144 -> 2996 (-148B). Orig's .data has a 148B ALL-ZERO tail after the last vtable (no relocs) — provenance unknown (link slack from split? a zero .data object our reconstruction lacks?). Pre-gate .data was coincidentally filled by the weak-vtable emission region (zero bytes + relocs). matched_data dropped 100 -> 5.98 as a side effect of removing the wrong vtables; .data fuzzy = 97.59.
|
||||
- create fuzzy 98.07 (reg-homing rotation after layout shift), drawTransferTitles 96.99.
|
||||
|
||||
## Trailing .data zeros (148B) — unrecreateable
|
||||
|
||||
Orig `.data` ends at 0xc48; ours at 0xbb4 — ours is a strict byte-identical prefix.
|
||||
The missing 148B is an all-zero object dtk merged into `lbl_8165683C` (0xac = the
|
||||
0x18 ControlPaneEventHandler vtable + 148B trailing zeros), emitted AFTER the
|
||||
three event-handler vtables, unreferenced, no relocs.
|
||||
|
||||
Micro-test results (mwcceppc 3.0a5.2): EVERY all-zero decl goes to .bss —
|
||||
`static u32 a[37] = {0}`, `= {}`, `static char b[148] = ""`, POD struct zero-init,
|
||||
`__declspec(section ".data")`, `#pragma section ".data"` — all .bss.
|
||||
So the zeros cannot be a standalone source-level object. Two remaining theories:
|
||||
(1) pure-pad vtable slots (MCM precedent) — contradicted by `new
|
||||
ControlPaneEventHandler` compiling in the same TU (abstract can't instantiate);
|
||||
(2) same wall as MyTiLetterForm's "six trailing target zeros were not recreated
|
||||
with padding" — an accepted tail artifact.
|
||||
|
||||
## Trailing .data zeros SOLVED — deduplicated weak vtables
|
||||
|
||||
The 148B all-zero tail = three weak vtables emitted in this TU then deduplicated
|
||||
at link (dtk extraction shows zeros+no relocs, consistent with the MyTiInputForm
|
||||
and iplSetting findings in data-d3/data-d4):
|
||||
|
||||
__vt__ipl::gui::PaneManager 0x5c (bb4..c10)
|
||||
__vt__gui::EventHandler 0x18 (c10..c28)
|
||||
__vt__gui::Interface 0x20 (c28..c48)
|
||||
|
||||
Earlier decl-only gates (IPL_SDMEMORY_DECL_ONLY_GUI /
|
||||
IPL_SDMEMORY_PANEMANAGER_DECL_ONLY / IPL_SDMEMORY_DECL_ONLY_SCROLLER) suppressed
|
||||
the weak emission; removing them emits the vtables in the same tail order and
|
||||
.data becomes byte-identical (3144B, data 100%). Lesson: an orig data region of
|
||||
zeros with no relocs after vtables = deduplicated weak vtable, NOT an all-zero
|
||||
object — .bss-promotion analysis was the wrong frame.
|
||||
|
||||
## drawTransferTitles: copy-temp decode (451/451 insn-equal)
|
||||
|
||||
Orig's callsite copies the built Color into THREE disjoint stack slots per call
|
||||
(4 lbz + 12 stb) — decoded as `Color(x)` copy-ctor temporaries:
|
||||
`setTitleRowColors(titleText, Color(c), Color(c))` reproduces all three
|
||||
materializations (MWCC emits a third dead temp in the arg area). The callee
|
||||
still calls out-of-line `__as__Color` for its member copies — consistent with
|
||||
decl-only `operator=(const Color&)` + inlined implicit copy-ctor in this TU.
|
||||
Direct pass (`setTitleRowColors(t, c, c)`) removes 32 insns; named copies emit
|
||||
`bl __as__` instead of memberwise bytes — neither matches. Remaining residual:
|
||||
frame +0x20 slot layout + reg-web coloring (insn-equal tie).
|
||||
|
||||
## enqueue*/collect member-call conversion (post-rebase cleanup)
|
||||
Removed the six `extern "C" bool iplSDChannelSelect_813Dxxxx` address-suffixed
|
||||
stubs (banned identifier style). All 10 call sites now call real private member
|
||||
fns via `mpSDChannelSelect->` with `friend class SDMemory` added to
|
||||
iplSDChannelSelect.h (orig must have granted SDMemory access to the private
|
||||
enqueue* members). Arg semantics decoded from callee impls: enqueue*Notice
|
||||
page/index params are the u64 titleId halves (caller passes ((u32*)&entry)[0/1]
|
||||
for the two-u32-arg callees; the raw u64 for enqueueStateNotice(u64,u32) which
|
||||
emits pad-r4 + u64 in r5:r6 exactly as orig). The arg1 = this+i*8 pointer for
|
||||
the 3-u32 callees is reproduced via `(u32)&mTitleIds[i] - offsetof(SDMemory,
|
||||
mTitleIds)`. All call sites byte-identical after conversion.
|
||||
Reference in New Issue
Block a user