Compare commits
11 Commits
agent/w092
...
agent/bitt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df26ca27d6 | ||
|
|
b29ea61a90 | ||
|
|
f4fd16f88f | ||
|
|
3d8de1a356 | ||
|
|
8e43db0528 | ||
|
|
21c9b95b1b | ||
|
|
d4bdd3462c | ||
|
|
f7d81a0196 | ||
|
|
4f35874d02 | ||
|
|
0a5cbaf78e | ||
|
|
6e7c016ae3 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.36% | 86.97% | 61.41% | 91.14% |
|
||||
| 99.37% | 87.40% | 61.64% | 91.14% |
|
||||
|
||||
units 914/1027 complete, functions 12189/12563 matched.
|
||||
units 915/1027 complete, functions 12198/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 -->
|
||||
|
||||
@@ -4192,11 +4192,11 @@ libs/RVL_SDK/src/fa/driver/nand_drv.c:
|
||||
.sbss start:0x816996C0 end:0x816996E0
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/sd_drv.c:
|
||||
.bss start:0x811AF460 end:0x811AF6C0
|
||||
.bss start:0x811AF460 end:0x811AF6C0 align:32
|
||||
.text start:0x815EA41C end:0x815ED20C
|
||||
.rodata start:0x816329E8 end:0x81632B58
|
||||
.data start:0x81690D18 end:0x81691728
|
||||
.sbss start:0x816996E0 end:0x81699708
|
||||
.sbss start:0x816996E0 end:0x81699708 align:32
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/pfd_cmn.c:
|
||||
.text start:0x815ED20C end:0x815ED324
|
||||
|
||||
@@ -1853,7 +1853,7 @@ config.libs = [
|
||||
|
||||
Object(Matching, "fa/kernel/pfk_api.c"),
|
||||
|
||||
Object(NonMatching, "fa/driver/nand_drv.c"),
|
||||
Object(Matching, "fa/driver/nand_drv.c"),
|
||||
Object(NonMatching, "fa/driver/sd_drv.c"),
|
||||
Object(Matching, "fa/driver/pfd_cmn.c"),
|
||||
Object(Matching, "fa/driver/msc_drv.c"),
|
||||
|
||||
@@ -24,9 +24,9 @@ char NAND_Org_Path[64];
|
||||
NAND_DISK_INFO nanddisk_info[23];
|
||||
NAND_SEMAPHORE csem;
|
||||
NAND_SEMAPHORE osem;
|
||||
s32 Nanddisk_Internal_Info_Init;
|
||||
s32 NAND_Init;
|
||||
s32 fa_nanad_semid;
|
||||
s32 Nanddisk_Internal_Info_Init = 0;
|
||||
s32 NAND_Init = 0;
|
||||
s32 fa_nanad_semid = 0;
|
||||
|
||||
static inline s32 find_disk(PDM_DISK* disk, NAND_DISK_INFO** result) {
|
||||
NAND_DISK_INFO* info;
|
||||
|
||||
@@ -347,6 +347,10 @@ NWC24Err NWC24SetDlPriority(NWC24DlTask* dlTask, u8 dlPriority) {
|
||||
|
||||
|
||||
|
||||
static inline void ReadDlTaskIdentifier(const NWC24DlTask* dlTask, u16* identifier) {
|
||||
*identifier = ((const DlTaskData*)dlTask)->id;
|
||||
}
|
||||
|
||||
static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
|
||||
NWC24Work* work = NWC24WorkP;
|
||||
DlTaskListHeader* header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
|
||||
@@ -358,7 +362,7 @@ static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
|
||||
else if (task->id != 0xffff && task->id >= header->maxTaskCount) { result = NWC24_ERR_INVALID_VALUE; }
|
||||
else { result = NWC24_OK; }
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
ReadDlTaskIdentifier(dlTask, &taskId);
|
||||
if (taskId == 0xffff) { return NWC24_ERR_FAILED; }
|
||||
time /= 60;
|
||||
header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
|
||||
@@ -421,7 +425,7 @@ NWC24Err NWC24SetDlInterval(NWC24DlTask* dlTask, u16 dlInterval) {
|
||||
}
|
||||
}
|
||||
if (result == NWC24_OK) {
|
||||
taskId = task->id;
|
||||
ReadDlTaskIdentifier(dlTask, &taskId);
|
||||
if (taskId != 0xffff) {
|
||||
nextTime /= 60;
|
||||
if (work != NULL) {
|
||||
@@ -784,17 +788,19 @@ NWC24Err NWC24AddDlTask(NWC24DlTask* dlTask) {
|
||||
result = CheckDlTaskListHeader(header);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
result = AddTaskInternal(dlTask, GetCachedDlHeader()->taskCount, GetCachedDlHeader()->maxTaskCount);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
universalTime = 0;
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
{
|
||||
s32 intervalSeconds;
|
||||
s64 nextTime;
|
||||
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
|
||||
nextTime = universalTime + intervalSeconds;
|
||||
return SetDlTaskNextTime(dlTask, nextTime);
|
||||
if (result >= NWC24_OK) {
|
||||
universalTime = 0;
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
{
|
||||
s32 intervalSeconds;
|
||||
s64 nextTime;
|
||||
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
|
||||
nextTime = universalTime + intervalSeconds;
|
||||
return SetDlTaskNextTime(dlTask, nextTime);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -78,26 +78,47 @@ void CHANSVmDebugPrintf(const vmString format, ...) {
|
||||
CHANSVmDebugPrintf(msg, __VA_ARGS__);
|
||||
|
||||
vmU16 CHANSVmGetSourceLine(CHANSVm* vm) {
|
||||
CHANSVmExecutionCtx* ctx = ((CHANSVmPrivate*)vm)->pActiveCtx;
|
||||
CHANSVmExecutionCtx* ctx;
|
||||
CHANSVmModule* module;
|
||||
SrcLineEntry* lines;
|
||||
SrcLineEntry* entry;
|
||||
u32 pc;
|
||||
s32 lineOffset;
|
||||
u8 lastBit;
|
||||
u32 index;
|
||||
u8* bitfield;
|
||||
|
||||
if (ctx && ctx->pDbg && ctx->pDbg->pLineTbl && ctx->pc < ctx->pDbg->codeSize) {
|
||||
SrcLineEntry* curEntry = &ctx->pDbg->pLineTbl[ctx->pc / 256];
|
||||
s32 lineOffset = curEntry->baseLine;
|
||||
u8* bitfield = curEntry->bitfield;
|
||||
u32 i = 0;
|
||||
|
||||
for (i = 0; i <= (u8)ctx->pc; i++) {
|
||||
if (bitfield[i / 8] & (128 >> (i & 0b111))) {
|
||||
lineOffset += 2;
|
||||
}
|
||||
}
|
||||
|
||||
if ((u8*)ctx->pDbg->pLineTbl + lineOffset + 1 < (u8*)ctx->pDbg + ctx->pDbg->regionSize) {
|
||||
u8* lineData = (u8*)ctx->pDbg->pLineTbl + lineOffset;
|
||||
return VM_READ_BE_U16(lineData, 0);
|
||||
}
|
||||
ctx = ((CHANSVmPrivate*)vm)->pActiveCtx;
|
||||
if (ctx == vmNull) {
|
||||
goto error;
|
||||
}
|
||||
module = ctx->pDbg;
|
||||
if (module == vmNull) {
|
||||
goto error;
|
||||
}
|
||||
lines = module->pLineTbl;
|
||||
if (lines == vmNull) {
|
||||
goto error;
|
||||
}
|
||||
pc = ctx->pc;
|
||||
if (pc >= module->codeSize) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
entry = &lines[pc / 256];
|
||||
lastBit = (u8)pc;
|
||||
lineOffset = entry->baseLine;
|
||||
bitfield = entry->bitfield;
|
||||
for (index = 0; index <= lastBit; index++) {
|
||||
if (bitfield[index / 8] & (128 >> (index & 7))) {
|
||||
lineOffset += 2;
|
||||
}
|
||||
}
|
||||
if ((u8*)lines + lineOffset + 1 < (u8*)module + module->regionSize) {
|
||||
u8* lineData = (u8*)lines + lineOffset;
|
||||
return VM_READ_BE_U16(lineData, 0);
|
||||
}
|
||||
error:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -322,10 +343,8 @@ error:
|
||||
return CHANS_VM_ERR_DELETE_OBJECT;
|
||||
}
|
||||
|
||||
vmPtr CHANSVmNewObjData(CHANSVm* vm, CHANSVmObjHdr* object, u32 length) {
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
static inline ChunkEntry* VmReserveChunkEntry(CHANSVmPrivate* pVm) {
|
||||
u32 idx;
|
||||
u32 memSize;
|
||||
union {
|
||||
u32 off;
|
||||
ChunkEntry* entry;
|
||||
@@ -333,10 +352,6 @@ vmPtr CHANSVmNewObjData(CHANSVm* vm, CHANSVmObjHdr* object, u32 length) {
|
||||
ChunkEntry* chunk;
|
||||
u32 chunkIdx;
|
||||
|
||||
if (object == vmNull || object->hasData != vmFalse || length == 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
idx = pVm->nextChunkIdx;
|
||||
chunk = pVm->pChunks[idx / 1024];
|
||||
if (chunk == vmNull || chunk[idx & 0x3FF].inUse != 0) {
|
||||
@@ -345,7 +360,7 @@ vmPtr CHANSVmNewObjData(CHANSVm* vm, CHANSVmObjHdr* object, u32 length) {
|
||||
while (chunkIdx < 0x80) {
|
||||
chunk = pVm->pChunks[chunkIdx];
|
||||
if (chunk == vmNull) {
|
||||
chunk = CHANSVmAlloc(vm, 0x4000);
|
||||
chunk = CHANSVmAlloc((CHANSVm*)pVm, 0x4000);
|
||||
if (chunk == vmNull) {
|
||||
goto no_entry;
|
||||
}
|
||||
@@ -377,19 +392,35 @@ found:
|
||||
u.entry->inUse = 1;
|
||||
|
||||
check_entry:
|
||||
if (u.entry == vmNull) {
|
||||
return u.entry;
|
||||
}
|
||||
|
||||
static inline u32 VmGetAlignedAllocationSize(u32 length) {
|
||||
return VM_ALIGN(length);
|
||||
}
|
||||
|
||||
vmPtr CHANSVmNewObjData(CHANSVm* vm, CHANSVmObjHdr* object, u32 length) {
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
ChunkEntry* entry;
|
||||
u32 memSize;
|
||||
|
||||
if (object == vmNull || object->hasData != vmFalse || length == 0) {
|
||||
goto error;
|
||||
}
|
||||
entry = VmReserveChunkEntry(pVm);
|
||||
if (entry == vmNull) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
memSize = VM_ALIGN(length);
|
||||
memSize = VmGetAlignedAllocationSize(length);
|
||||
{
|
||||
void* pData = CHANSVmAlloc(vm, memSize);
|
||||
if (pData != vmNull) {
|
||||
*(u32*)(u8*)object = (u32)u.entry;
|
||||
object->value.data.ptr = entry;
|
||||
object->hasData = vmTrue;
|
||||
u.entry->pData = pData;
|
||||
u.entry->size = length;
|
||||
u.entry->alloc = memSize;
|
||||
entry->pData = pData;
|
||||
entry->size = length;
|
||||
entry->alloc = memSize;
|
||||
return pData;
|
||||
}
|
||||
}
|
||||
@@ -5194,8 +5225,8 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
}
|
||||
if (paramValue > 0) {
|
||||
memset(parentBlob->pData + parentBlob->offset, 0, paramValue);
|
||||
parentBlob->offset += paramValue;
|
||||
}
|
||||
parentBlob->offset += paramValue;
|
||||
break;
|
||||
}
|
||||
case 6:
|
||||
@@ -5209,12 +5240,12 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
execCtx = ((CHANSVmPrivate*)VmInst)->pActiveCtx;
|
||||
count = execCtx->argc - argCount - 1;
|
||||
}
|
||||
if (count < 0) {
|
||||
goto error;
|
||||
}
|
||||
} else {
|
||||
count = paramValue;
|
||||
}
|
||||
if (count < 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
|
||||
goto error;
|
||||
@@ -5755,7 +5786,6 @@ VmMethodDefine(Blob, Unpack) {
|
||||
case 11:
|
||||
case 12:
|
||||
case 13: {
|
||||
CHANSVmObjHdr* arrElem;
|
||||
u8* srcPtr;
|
||||
count = outVal;
|
||||
if ((s32)count < 0) {
|
||||
@@ -5804,7 +5834,6 @@ VmMethodDefine(Blob, Unpack) {
|
||||
continue;
|
||||
}
|
||||
case 14: {
|
||||
CHANSVmObjHdr* arrElem;
|
||||
u8* srcData;
|
||||
s32 bufSize;
|
||||
count = outVal;
|
||||
@@ -6361,14 +6390,14 @@ CHANSVmErr CHANSVmAddExe(CHANSVm* vm, vmS32 unk0, CHANSVm* execCtx) {
|
||||
CHANSConvertModuleOfsToPtr(header);
|
||||
|
||||
{
|
||||
u32 i;
|
||||
DispatchEntry* methodTable = header->pMethodRefTbl;
|
||||
u32 i;
|
||||
int ok;
|
||||
|
||||
for (i = 1; i < header->methodCount; i++) {
|
||||
if (methodTable[i].nameLength) {
|
||||
if ((u8*)(methodTable[i].nameLength + (vmU32)methodTable + methodTable[i].offset) <= (u8*)(header->regionSize + (vmU32)header)) {
|
||||
CHANSVmObjHdr* method = (CHANSVmObjHdr*)CHANSVmAddNativeMethodName(vm, (const char*)((u8*)methodTable + methodTable[i].offset),
|
||||
if ((u8*)(methodTable[i].nameLength + (vmU32)methodTable + methodTable[i].offset) <= (u8*)((vmU32)header + header->regionSize)) {
|
||||
CHANSVmObjHdr* method = (CHANSVmObjHdr*)CHANSVmAddNativeMethodName(vm, (const char*)(methodTable[i].offset + (vmU32)methodTable),
|
||||
methodTable[i].nameLength);
|
||||
if (method) {
|
||||
header->pMethodTbl[i] = (vmU32)method;
|
||||
@@ -6386,8 +6415,8 @@ CHANSVmErr CHANSVmAddExe(CHANSVm* vm, vmS32 unk0, CHANSVm* execCtx) {
|
||||
}
|
||||
}
|
||||
{
|
||||
u32 i;
|
||||
u8* strPtr = header->pStringDataTbl;
|
||||
u32 i;
|
||||
int ok;
|
||||
|
||||
for (i = 0; i < header->stringCount; i++) {
|
||||
@@ -6395,7 +6424,7 @@ CHANSVmErr CHANSVmAddExe(CHANSVm* vm, vmS32 unk0, CHANSVm* execCtx) {
|
||||
strPtr += 2;
|
||||
|
||||
if ((len & 1) == 0) {
|
||||
if (strPtr + len <= (u8*)(header->regionSize + (vmU32)header)) {
|
||||
if (strPtr + len <= (u8*)((vmU32)header + header->regionSize)) {
|
||||
header->pStringTbl[i].pStringData = strPtr;
|
||||
header->pStringTbl[i].length = len;
|
||||
strPtr += len;
|
||||
@@ -6950,16 +6979,17 @@ static CHANSVmErr VmCallMethod(CHANSVm* vm, u32 instructionSize, u32 callType, u
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
CHANSVmObjHdr* acc;
|
||||
u32 retVal;
|
||||
u32 methodRef;
|
||||
const u8* instruction;
|
||||
u32 newPc;
|
||||
CHANSVmFunction funcPtr;
|
||||
CHANSVmNativeClass* target;
|
||||
u32 pushEnd, headerCount;
|
||||
u32 newPc;
|
||||
const u8* instruction;
|
||||
CHANSVmObjHdr localBuf;
|
||||
u32 pushDepth;
|
||||
CHANSVmFunction funcPtr;
|
||||
|
||||
acc = &pVm->accumulator;
|
||||
retVal = 0;
|
||||
funcPtr = vmNull;
|
||||
target = vmNull;
|
||||
pushEnd = 0;
|
||||
headerCount = 0;
|
||||
@@ -7010,23 +7040,25 @@ static CHANSVmErr VmCallMethod(CHANSVm* vm, u32 instructionSize, u32 callType, u
|
||||
}
|
||||
|
||||
{
|
||||
u32 pc = pVm->pActiveCtx->pc;
|
||||
CHANSVmExecutionCtx* ctx = pVm->pActiveCtx;
|
||||
u32 pc = ctx->pc;
|
||||
CHANSVmModule* module = ctx->pDbg;
|
||||
|
||||
newPc = pc + instructionSize;
|
||||
instruction = pVm->pActiveCtx->pDbg->pData + pc;
|
||||
instruction = module->pData + pc;
|
||||
|
||||
if (newPc < pc || newPc > pVm->pActiveCtx->pDbg->codeSize) {
|
||||
if (newPc < pc || newPc > module->codeSize) {
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
if (target == 0) {
|
||||
pVm->pActiveCtx->pc = newPc;
|
||||
ctx->pc = newPc;
|
||||
}
|
||||
}
|
||||
|
||||
memset(&localBuf, 0, sizeof(CHANSVmObjHdr));
|
||||
|
||||
if (callType == CHANS_VM_CALL_TYPE_FUNCTION) {
|
||||
target = vmNull;
|
||||
methodRef = 0;
|
||||
} else {
|
||||
CHANSVmExecutionCtx* ec = pVm->pActiveCtx;
|
||||
u32 methodId = VM_READ_BE_U16(instruction, 1);
|
||||
@@ -7041,24 +7073,26 @@ static CHANSVmErr VmCallMethod(CHANSVm* vm, u32 instructionSize, u32 callType, u
|
||||
goto error_check;
|
||||
}
|
||||
|
||||
methodRef = methodId;
|
||||
if (methodId != 0) {
|
||||
retVal = ec->pDbg->pMethodTbl[methodId];
|
||||
methodRef = ec->pDbg->pMethodTbl[methodId];
|
||||
}
|
||||
}
|
||||
|
||||
// If callType == PROP_GET or PROP_SET
|
||||
if (callType - CHANS_VM_CALL_TYPE_PROP_GET <= 1) {
|
||||
CHANSVmNativeProperty* entry;
|
||||
u32 isMethodNull = retVal == 0;
|
||||
u32 isSet = callType == CHANS_VM_CALL_TYPE_PROP_SET;
|
||||
u32 isMethodNull;
|
||||
entry = target->pNativeProperties;
|
||||
pushDepth = isSet;
|
||||
isMethodNull = methodRef == 0;
|
||||
|
||||
while (vmTrue) {
|
||||
if (isMethodNull != 0 || entry == 0) {
|
||||
return CHANS_VM_ERR_NO_SUCH_PROPERTY;
|
||||
}
|
||||
if (entry->index == retVal) {
|
||||
if (methodRef == entry->index) {
|
||||
if (acc->type == CHANS_VM_TYPE_CLASS_REF) {
|
||||
if (entry->flag == 0) {
|
||||
return CHANS_VM_ERR_FORBIDDEN_CLASS_PROPERTY;
|
||||
@@ -7081,14 +7115,14 @@ static CHANSVmErr VmCallMethod(CHANSVm* vm, u32 instructionSize, u32 callType, u
|
||||
}
|
||||
} else {
|
||||
pushDepth = instruction[instructionSize - 1];
|
||||
if (retVal != 0) {
|
||||
if (methodRef != 0) {
|
||||
CHANSVmNativeMethod* node = target->pNativeMethods;
|
||||
|
||||
while (vmTrue) {
|
||||
if (node == vmNull) {
|
||||
return CHANS_VM_ERR_NO_SUCH_METHOD;
|
||||
}
|
||||
if (node->index == retVal) {
|
||||
if (methodRef == node->index) {
|
||||
if (acc->type == CHANS_VM_TYPE_CLASS_REF && node->hasStar == vmFalse) {
|
||||
return CHANS_VM_ERR_FORBIDDEN_CLASS_METHOD;
|
||||
}
|
||||
@@ -7097,7 +7131,6 @@ static CHANSVmErr VmCallMethod(CHANSVm* vm, u32 instructionSize, u32 callType, u
|
||||
}
|
||||
node = node->pNext;
|
||||
}
|
||||
retVal = 0;
|
||||
} else if (target != vmNull) {
|
||||
if (acc->type != CHANS_VM_TYPE_CLASS_REF) {
|
||||
if (callType == CHANS_VM_CALL_TYPE_METHOD) {
|
||||
@@ -7628,12 +7661,13 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
}
|
||||
|
||||
case CHANS_VM_OP_IS_CLASS: {
|
||||
if (pVm->accumulator.type != CHANS_VM_TYPE_CLASS_REF) {
|
||||
if (pVm->accumulator.type == CHANS_VM_TYPE_CLASS_REF) {
|
||||
result = 1;
|
||||
goto call_function_common;
|
||||
} else {
|
||||
result = CHANS_VM_ERR_INVALID_OBJECT_TYPE;
|
||||
break;
|
||||
}
|
||||
result = 1;
|
||||
goto call_function_common;
|
||||
}
|
||||
case CHANS_VM_OP_CALL_FUNCTION: {
|
||||
result = CHANS_VM_OK;
|
||||
|
||||
@@ -284,122 +284,12 @@ void Base::inputCharDefault_(wchar_t character, u32 modifiers) {
|
||||
meScrollFlag = SF_ScrollOn;
|
||||
}
|
||||
|
||||
extern "C" asm void draw__Q39textinput9inputform12LayoutByNW4RFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x50(r1)
|
||||
mflr r0
|
||||
stw r0, 0x54(r1)
|
||||
stw r31, 0x4c(r1)
|
||||
stw r30, 0x48(r1)
|
||||
mr r30, r3
|
||||
addi r3, r3, 0x218
|
||||
bl draw__Q39textinput11nw4rmanager6LayoutFv
|
||||
lwz r12, 0x218(r30)
|
||||
addi r3, r30, 0x218
|
||||
lwz r12, 0x28(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r4, 0x10(r3)
|
||||
li r5, 1
|
||||
lwz r3, 0x21c(r30)
|
||||
lbz r0, 0xcd(r4)
|
||||
lwz r4, 0x2c0(r30)
|
||||
stb r0, 0x1c8(r30)
|
||||
lwz r3, 0x10(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x3c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0x218(r30)
|
||||
mr r6, r3
|
||||
addi r3, r30, 0x218
|
||||
addi r4, r30, 0x130
|
||||
lwz r12, 0x70(r12)
|
||||
addi r5, r30, 0x230
|
||||
addi r6, r6, 0x84
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0x188(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
stw r3, 0x18(r1)
|
||||
addi r3, r30, 0x10
|
||||
lfs f2, 0x188(r30)
|
||||
stw r4, 0x1c(r1)
|
||||
lfs f1, 0x18(r1)
|
||||
bl SetCursor__Q34nw4r2ut10CharWriterFff
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0x188(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lfs f0, lbl_81694D28(r0)
|
||||
stw r3, 0x20(r1)
|
||||
stfs f0, 0x30(r1)
|
||||
stfs f0, 0x34(r1)
|
||||
stfs f0, 0x38(r1)
|
||||
stfs f0, 0x3c(r1)
|
||||
lwz r12, 0(r30)
|
||||
stw r3, 8(r1)
|
||||
mr r3, r30
|
||||
lwz r12, 0x184(r12)
|
||||
stw r4, 0x24(r1)
|
||||
stw r4, 0xc(r1)
|
||||
mtctr r12
|
||||
bctrl
|
||||
stw r3, 0x10(r1)
|
||||
lfs f1, 8(r1)
|
||||
stw r4, 0x14(r1)
|
||||
lfs f5, 0x10(r1)
|
||||
lfs f4, 0x14(r1)
|
||||
stfs f5, 0x30(r1)
|
||||
lfs f0, 0xc(r1)
|
||||
stfs f4, 0x3c(r1)
|
||||
lfs f3, 0x128(r30)
|
||||
lfs f2, 0x120(r30)
|
||||
stw r3, 0x28(r1)
|
||||
fsubs f2, f3, f2
|
||||
stw r4, 0x2c(r1)
|
||||
fmuls f1, f1, f2
|
||||
fadds f1, f5, f1
|
||||
stfs f1, 0x38(r1)
|
||||
lfs f2, 0x124(r30)
|
||||
lfs f1, 0x12c(r30)
|
||||
fsubs f1, f2, f1
|
||||
fmuls f0, f0, f1
|
||||
fadds f0, f4, f0
|
||||
stfs f0, 0x34(r1)
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0x5c(r30)
|
||||
mr r31, r3
|
||||
addi r3, r30, 0x10
|
||||
addi r4, r1, 0x30
|
||||
lwz r12, 0x20(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
lwz r12, 0x174(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0x5c(r30)
|
||||
addi r3, r30, 0x10
|
||||
lwz r12, 0x24(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r0, 0x54(r1)
|
||||
lwz r31, 0x4c(r1)
|
||||
lwz r30, 0x48(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x50
|
||||
blr
|
||||
void LayoutByNW4R::draw() {
|
||||
nw4rmanager::Layout::draw();
|
||||
muGlobalAlpha = getLayout()->GetRootPane()->GetAlpha();
|
||||
nw4r::lyt::Pane* textBox = mpLayout->GetRootPane()->FindPaneByName(static_cast<const char*>(mpLayoutData), true);
|
||||
AdjustPaneMtx(mMtx.m, mDrawInfo, textBox->GetGlobalMtx());
|
||||
Base::draw();
|
||||
}
|
||||
void Base::calcCursorTimer() {
|
||||
muCursorTimer += 8;
|
||||
@@ -1046,17 +936,17 @@ void Base::onCommand(INPUT_COMMAND command, void* data) {
|
||||
mbPredictOn = enabled;
|
||||
if (meLanguage == KR) mpManager->getPCKeyboard()->refreshState();
|
||||
}
|
||||
tistring::Decolated::TranslateMode predictionFixedMode = mpString->getTranslateMode();
|
||||
const tistring::Decolated::TranslateMode predictionUnfixMode = mpUnfixString->getTranslateMode();
|
||||
s32 predictionFixedMode = mpString->getTranslateMode();
|
||||
s32 predictionUnfixMode = mpUnfixString->getTranslateMode();
|
||||
mpString->initKanaConverter();
|
||||
mpUnfixString->initKanaConverter();
|
||||
if (meLanguage == KR) {
|
||||
if (predictionFixedMode != tistring::Decolated::TM_Direct) predictionFixedMode = tistring::Decolated::TM_Hangul;
|
||||
} else if (meLanguage == CN) predictionFixedMode = tistring::Decolated::TM_Direct;
|
||||
mpString->getCursorPos();
|
||||
mpString->setTranslateMode(predictionFixedMode);
|
||||
mpString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionFixedMode));
|
||||
mpString->getCursorPos();
|
||||
mpUnfixString->setTranslateMode(predictionUnfixMode);
|
||||
mpUnfixString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionUnfixMode));
|
||||
switch (mePredictMode) {
|
||||
case PM_Atok:
|
||||
if (!mbPredictOn) {
|
||||
|
||||
@@ -327,15 +327,20 @@ namespace ipl {
|
||||
mpDialogLayout->calc();
|
||||
}
|
||||
|
||||
static inline math::VEC2 scaledPageOffset(f32 scale) {
|
||||
math::VEC2 result;
|
||||
result.y = sPageOffset.y * scale;
|
||||
result.x = sPageOffset.x * scale;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::draw() {
|
||||
if (System::getSceneManager()->onDrawLayer(DRAW_LAYER_2)) {
|
||||
utility::Graphics::setOrtho(0);
|
||||
|
||||
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("N_note_a");
|
||||
for (int i = mNextPageNum; i >= 1; i--) {
|
||||
math::VEC2 trans;
|
||||
trans.y = sPageOffset.y * i;
|
||||
trans.x = sPageOffset.x * i;
|
||||
math::VEC2 trans = scaledPageOffset(i);
|
||||
pane->SetTranslate(trans);
|
||||
pane->CalculateMtx(*mpLayout->getDrawInfo());
|
||||
mpLayout->draw(pane);
|
||||
@@ -587,10 +592,20 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline nw4r::math::_VEC2 previousPageOffset() {
|
||||
f32 negativeY = -sPageOffset.y;
|
||||
f32 negativeX = -sPageOffset.x;
|
||||
nw4r::math::_VEC2 result;
|
||||
result.y = negativeY;
|
||||
result.x = negativeX;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::stt_backward() {
|
||||
if (!mpLayout->getAnim(5)->isPlaying()) {
|
||||
mNextPageNum++;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset);
|
||||
math::VEC2 offset = previousPageOffset();
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
|
||||
for (u32 i = 0; i < BTN_MAX; i++) {
|
||||
@@ -607,9 +622,17 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline nw4r::math::VEC2 loopPageOffset() {
|
||||
nw4r::math::VEC2 result;
|
||||
result.y = -sPageOffset.y;
|
||||
result.x = -sPageOffset.x;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::stt_loop_forward() {
|
||||
if (!mpLayout->getAnim(4)->isPlaying()) {
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset * PAGE_MAX);
|
||||
math::VEC2 offset = loopPageOffset() * PAGE_MAX;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
reset_gui(false);
|
||||
|
||||
|
||||
@@ -744,4 +744,3 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern const f64 lbl_81694A78 = 4503601774854144.0;
|
||||
|
||||
164
tools/decomp-assist/CHANSVm.round8-attempts.md
Normal file
164
tools/decomp-assist/CHANSVm.round8-attempts.md
Normal file
@@ -0,0 +1,164 @@
|
||||
# CHANSVm round 8 attempts
|
||||
|
||||
Scope CHANSVm.c only; 43U matching, no link classification changes.
|
||||
Unslop writing pass applied.
|
||||
Baseline HEAD 0c554a16: instruction-exact 217/233; code 35720/53564; data 6904/6904.
|
||||
Initial pool identical, 125 strings; .data 4672 bytes and 121 jump-table relocations 100%.
|
||||
Default gate cannot find baseline-0c554a16.json. Nearest existing immutable ancestor baseline is f00336cc; gates use --base f00336cc and compare retained improvements separately against the fresh initial report.
|
||||
|
||||
Initial CHANSVmGetSourceLine: 97.826090%; instructions 46/46; structural 0; positional diffs 16.
|
||||
Initial CHANSVmNewObjData: 99.583336%; instructions 96/96; structural 0; positional diffs 7.
|
||||
Initial CHANSVmParseInt: 94.693880%; instructions 49/49; structural 2; positional diffs 3.
|
||||
Initial CHANSVm_8144B4D4: 97.590360%; instructions 83/83; structural 2; positional diffs 2.
|
||||
Initial VmDateDtor: 94.967030%; instructions 91/91; structural 5; positional diffs 7.
|
||||
Initial VmStringReplace: 97.878784%; instructions 132/132; structural 0; positional diffs 40.
|
||||
Initial VmStringSplit: 98.040540%; instructions 222/222; structural 0; positional diffs 66.
|
||||
Initial CHANSVm_8145049C: 99.849190%; instructions 431/431; structural 0; positional diffs 13.
|
||||
Initial VmBlobGetHexString: 98.719510%; instructions 82/82; structural 0; positional diffs 14.
|
||||
Initial VmBlobPackCommon: 97.934135%; instructions 668/668; structural 2; positional diffs 246.
|
||||
Initial VmBlobUnpack: 98.268860%; instructions 517/517; structural 0; positional diffs 156.
|
||||
Initial VmWinEmuWrite: 99.626870%; instructions 67/67; structural 0; positional diffs 5.
|
||||
Initial CHANSVmAddExe: 99.153540%; instructions 254/254; structural 0; positional diffs 34.
|
||||
Initial CHANSVmLinkModules: 98.677246%; instructions 189/189; structural 0; positional diffs 43.
|
||||
Initial VmCallMethod: 98.060500%; instructions 281/281; structural 0; positional diffs 91.
|
||||
Initial CHANSVmStep: 96.452515%; instructions 1253/1253; structural 71; positional diffs 318.
|
||||
- CHANSVm_8145049C: separate typed string payload from escaped flag and format count; 99.187935%; instructions 431/431; structural 0; diffs 53; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: separate temporary string owner from literal byte length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: separate typed string payload and owner lifetimes; 99.187935%; instructions 431/431; structural 0; diffs 53; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis CHANSVmNewObjData: target/source frame 0x30, 96 instructions; branch graph and operand order identical. Only compiler-generated chunk-table slot r25/r26 and chunk counter r26/r25 are exchanged. Tried source boundaries before allocation coloring.
|
||||
- CHANSVmNewObjData: signed chunk ordinal with unsigned bounds; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: explicit typed chunk-table slot lifetime; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: table-slot pointer plus offset initialized before ordinal; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: inline reservation owns scan and selected-entry lifetime; 99.843750%; instructions 96/96; structural 0; diffs 3; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: inline reservation and aligned size declared after selected entry; 99.843750%; instructions 96/96; structural 0; diffs 3; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: inline reservation aligned allocation scoped beside payload; 99.843750%; instructions 96/96; structural 0; diffs 3; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis CHANSVm_8145049C: frame 0xe0, all 431 instructions and control flow match. Thirteen differences exchange the temporary string payload/length and object-owner registers only, beginning at char_body. Inner declaration lifetimes are the next lever.
|
||||
- CHANSVm_8145049C: temporary string owner declared before temporary string length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: temporary string owner declared beside temporary string length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: payload result declared before literal length and nested owner before size; 99.756380%; instructions 431/431; structural 0; diffs 21; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis VmWinEmuWrite: frame 0xb0 and 67 instructions agree; branch and operand forms agree. Converted object r27 and aligned length r29 target are r29/r27 in source; five register differences. Tried typed argument/converted-owner reuse and branch ownership.
|
||||
- VmWinEmuWrite: raw argument and converted string share object lifetime; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmWinEmuWrite: converted string reuses the unused receiver parameter; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmWinEmuWrite: converted string reuses the unused return-header parameter; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmWinEmuWrite: conversion lengths declared before the conversion buffer; 99.552240%; instructions 67/67; structural 5; diffs 10; data 6904/6904; regressions 0; restored.
|
||||
- VmWinEmuWrite: raw argument gets an independent typed temporary; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: reservation and payload allocation have separate inline boundaries; 94.895836%; instructions 100/96; structural 8; diffs 88; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: payload helper receives selected entry before header; 94.895836%; instructions 100/96; structural 8; diffs 88; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: payload helper receives requested size before selected entry; 94.895836%; instructions 100/96; structural 8; diffs 88; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis CHANSVmParseInt: frame 0x70 and 49 instructions match; first type load matches, but endpoint zero store occurs three slots too late after base/output argument copies. CHANSVm_8144B4D4 has the same parser initialization issue inlined, with two adjacent endpoint-store/type-compare slots exchanged.
|
||||
- CHANSVmParseInt: whole inline parser boundary, argument order obj, out, base; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmParseInt: whole inline parser boundary, argument order base, obj, out; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmParseInt: whole inline parser boundary, argument order out, obj, base; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8144B4D4: parser endpoint initialized through const-qualified local pointer; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8144B4D4: parser keyword conversion uses explicit success predicate; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8144B4D4: parser result has scoped null-output handling; 95.060240%; instructions 85/83; structural 10; diffs 24; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis CHANSVmGetSourceLine: leaf frame, 46/46 instructions and normalized structure identical. Module, entry-offset, low PC byte, bitfield and line offset registers differ. Explicit named module and local declaration order are tested after verifying branch/operand forms.
|
||||
- CHANSVmGetSourceLine: name the module loaded in the validation condition; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: name the low program-counter byte before line-entry traversal; 97.391304%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: loop index initialized only in its loop initializer; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: named module and program-counter byte lifetimes; 97.391304%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: inner declaration order lineOffset,i,bitfield; 97.282610%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: inner declaration order bitfield,lineOffset,i; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: inner declaration order bitfield,i,lineOffset; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: inner declaration order i,lineOffset,bitfield; 97.282610%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmGetSourceLine: inner declaration order i,bitfield,lineOffset; 97.282610%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmParseInt: single-case object-type switch; 89.591835%; instructions 50/49; structural 6; diffs 43; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmParseInt: object-type predicate computed before endpoint reset; 87.551020%; instructions 51/49; structural 7; diffs 45; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmParseInt: parser endpoint lifetime inside parsing scope; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8144B4D4: single-case object-type switch; 96.265060%; instructions 84/83; structural 4; diffs 69; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8144B4D4: object-type predicate computed before endpoint reset; 94.939760%; instructions 85/83; structural 5; diffs 74; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8144B4D4: parser endpoint lifetime inside parsing scope; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis VmBlobGetHexString: frame 0x20, 82/82 instructions, structural 0. Fourteen differences exchange character index, generated byte cursor and digit registers. Data/pool identical. Trial declarations, digit temporaries and loop operand forms.
|
||||
- VmBlobGetHexString: declare character index before output index; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobGetHexString: explicit signed digit temporary before low-digit index; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobGetHexString: explicit signed digit temporary after low-digit index; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobGetHexString: source byte advancement in the low-digit expression; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobGetHexString: initialize character index immediately before traversal; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis VmStringReplace: frame 0x40, 132/132 instructions, structural 0. VM/return, conversion result, source/search/replacement strings and traversal registers differ; branch and operand forms already agree. Source ownership and declaration order are the tested class.
|
||||
- VmStringReplace: declare traversal lengths before all source pointers; 97.878784%; instructions 132/132; structural 0; diffs 40; data 6904/6904; regressions 0; restored.
|
||||
- VmStringReplace: declare search and replacement extents before traversal offsets; 97.803030%; instructions 132/132; structural 0; diffs 43; data 6904/6904; regressions 0; restored.
|
||||
- VmStringReplace: explicit typed string payload owners for length and pointer loads; 97.878784%; instructions 132/132; structural 0; diffs 40; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis CHANSVmAddExe: frame and 254/254 instruction count match. Mostly module/context and loop-cursor registers; target also reverses addition operands for module end and native method name. Those operand forms are corrected before register search.
|
||||
- CHANSVmAddExe: module-end and native-name addition follow target operand order; 99.232285%; instructions 254/254; structural 0; diffs 32; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmAddExe: executable type copied before module-header read; 99.153540%; instructions 254/254; structural 0; diffs 34; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmAddExe: table cursors declared before their traversal counters; 99.547240%; instructions 254/254; structural 0; diffs 18; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmAddExe: target addition forms with cursors declared first; 99.625984%; instructions 254/254; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: record temporary owner before copying its payload; 96.925750%; instructions 431/431; structural 3; diffs 150; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: record temporary owner before both character and string payloads; 96.426910%; instructions 430/431; structural 28; diffs 249; data 2232/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: literal extent reused for converted string length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVm_8145049C: temporary owner is the direct allocation result; 97.389790%; instructions 431/431; structural 0; diffs 147; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmAddExe: module header initialized in its declaration after cursor and operand fixes; 99.625984%; instructions 254/254; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmAddExe: module header declared after header and region extents after cursor and operand fixes; 99.507870%; instructions 254/254; structural 0; diffs 21; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmAddExe: module size cached immediately at declaration after cursor and operand fixes; 99.625984%; instructions 254/254; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
|
||||
CHANSVmAddExe declaration-order search: declaration block: | CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm; | ModuleHeader* mod; | CHANSVmModule* header; | u32 maxEnd; | u32 size; | u32 cnt; | u32 ofs; | start (0, 16) | best (0, 16) after 52 builds; source restored; best order was: | CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm; | ModuleHeader* mod; | CHANSVmModule* header; | u32 maxEnd; | u32 size; | u32 cnt; | u32 ofs; |
|
||||
Retained CHANSVmAddExe: 99.153540 -> 99.625984%, 34 -> 16 differing instructions; 254/254 instructions; .data and all data sections 100%. Full clean gate --base f00336cc PASS, regressions/forbidden/readability 0, DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Exact count remains 217/233; this is a measured fuzzy improvement only.
|
||||
Diagnosis VmDateDtor: frame 0x70 and 91/91 instructions match. Seven scheduling differences load weekday table before month table and place the year stack argument earlier than target. Month-first preparation, typed indexes and calendar helper boundary are tested.
|
||||
- VmDateDtor: month-name lookup evaluated before weekday-name lookup; 94.967030%; instructions 91/91; structural 5; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
- VmDateDtor: year stack argument captured before the variadic call; 94.967030%; instructions 91/91; structural 5; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
- VmDateDtor: month and weekday table bases have explicit typed temporaries; 94.967030%; instructions 91/91; structural 5; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis VmStringSplit: target/source 222 instructions and normalized structure agree. Remaining differences are delimiter/limit, source/delimiter lengths, array ownership and traversal register allocation. Typed owner scopes and initialized array creation order are tested.
|
||||
- VmStringSplit: parent and delimiter payloads get named typed owners; 98.040540%; instructions 222/222; structural 0; diffs 66; data 6904/6904; regressions 0; restored.
|
||||
- VmStringSplit: optional limit conversion object scoped to the limit block; 98.040540%; instructions 222/222; structural 0; diffs 66; data 6904/6904; regressions 0; restored.
|
||||
- VmStringSplit: result array starts null at its declaration; 96.666664%; instructions 222/222; structural 7; diffs 93; data 6904/6904; regressions 0; restored.
|
||||
- VmStringSplit: delimiter and source extents declared before their pointers; 98.040540%; instructions 222/222; structural 0; diffs 66; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis VmCallMethod: frame 0x50 and 281/281 instructions agree. The target keeps the method/property selector in caller register r5 after memset and initializes the eventual callback pointer in r28 at entry. Source reuses retVal for both selector and error status across memset, holding it in r30, and leaves funcPtr uninitialized. Separate selector/error lifetimes and callback initialization are the structural-temporary class to test first.
|
||||
- VmCallMethod: method/property selector has separate lifetime from call error status; 98.060500%; instructions 281/281; structural 0; diffs 91; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: initialize callback pointer and delay selector initialization until after scratch clear; 98.113880%; instructions 282/281; structural 12; diffs 226; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: selector reuses decoded operand, function calls explicitly select zero; 98.896800%; instructions 281/281; structural 0; diffs 54; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis VmCallMethod: frame 0x50 and 281/281 instructions agree. The target keeps the method/property selector in caller register r5 after memset and initializes the eventual callback pointer in r28 at entry. Source reuses retVal for both selector and error status across memset, holding it in r30, and leaves funcPtr uninitialized. Separate selector/error lifetimes and callback initialization are the structural-temporary class to test first.
|
||||
- VmCallMethod: instruction and next-PC declared before callback and native target; 99.697510%; instructions 281/281; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: target lifetime order with selector-first comparisons and property flag order; 99.768684%; instructions 281/281; structural 0; diffs 12; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: target lifetime order with explicit PC/module owners; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: property null selector initialized before set flag; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: set-property predicate has a named operation offset; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: set-property predicate assigned after property-list lookup; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: null-selector predicate assigned after push-depth selection; 100.000000%; instructions 281/281; structural 0; diffs 0; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: inline property-mode predicate; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: inline null-method predicate; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
- VmCallMethod: inline mode classifier sets both property flags; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
|
||||
VmCallMethod exact candidate: separate decoded method selector from call-status return, initialize callback to null at entry, retain native target on function mode as the target assembly does, declare instruction/PC/callback before native target, name PC/module owners, compare selector before table index, and compute null-method flag after selecting pushDepth. No artificial/uninitialized values. 281/281 instructions, ctxdiff diffs 0, objdiff 100.0%, data 6904/6904; pending full clean gate.
|
||||
VmCallMethod source review removed two dead selector assignments introduced by broad trial replacements, including one after a later scratch memset. Rebuild remains 100.0% and ctxdiff diffs 0; final source uses only live selector initialization and callbacks are initialized.
|
||||
Accepted VmCallMethod after fresh reviewed full gate: GATE PASS, instruction-exact 217 -> 218 / 233, matched code 35720 -> 36844 / 53564, data 6904/6904 including .data 100%, pool identical. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; regressions 0; forbidden patterns 0; readability warnings 0. Function objdiff 100%, 281/281 instructions and diffs 0.
|
||||
Diagnosis CHANSVmLinkModules: target frame 0x40 and 189/189 instructions agree; only module/dispatch/global/native traversal registers differ. Target gives module r23, global dispatch r25/global node r26/index r27, then native dispatch r27/native node r26/index r25. Source shares one dispatch and one index across both passes; test distinct pass-local ownership before register permutations.
|
||||
- CHANSVmLinkModules: global and native dispatch tables have independent lifetimes; 98.597885%; instructions 189/189; structural 0; diffs 45; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmLinkModules: global and native table indices have independent lifetimes; 98.571430%; instructions 189/189; structural 0; diffs 46; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmLinkModules: independent dispatch tables and pass indices; 98.571430%; instructions 189/189; structural 0; diffs 46; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmLinkModules: module and dispatch owners declared together at function scope; 98.571430%; instructions 189/189; structural 0; diffs 46; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmLinkModules: pass-local initialized table and iterator precede pass index; 98.677246%; instructions 189/189; structural 0; diffs 43; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmLinkModules: native pass index precedes initialized table and iterator; 98.534390%; instructions 189/189; structural 2; diffs 46; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmLinkModules: global iterator declared after pass index; 98.677246%; instructions 189/189; structural 0; diffs 43; data 6904/6904; regressions 0; restored.
|
||||
Diagnosis VmBlobPackCommon: 668/668 instructions and frame agree, data/jump tables 100%. Two branch destinations differ before register tuning: zero-byte padding source still stores an unchanged offset while target branches directly to the parse loop; integer-count validation source checks negatives only in inferred-count branch while target shares the check after both branches. Packing-state register allocation also differs widely.
|
||||
- VmBlobPackCommon: zero padding bypasses unchanged-offset store; 97.941620%; instructions 668/668; structural 1; diffs 245; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobPackCommon: integer count validation is shared by explicit and inferred counts; 97.941620%; instructions 668/668; structural 1; diffs 245; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobPackCommon: both target branch destinations preserved with common count validation; 97.949104%; instructions 668/668; structural 0; diffs 244; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobPackCommon: format owners declared after per-element work; 97.949104%; instructions 668/668; structural 0; diffs 244; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobPackCommon: pass counters declared before format owners; 97.949104%; instructions 668/668; structural 0; diffs 244; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobPackCommon: format-state declarations shared between counting and writing passes; 97.889220%; instructions 668/668; structural 40; diffs 277; data 6904/6904; regressions 0; restored.
|
||||
Retained VmBlobPackCommon branch correction: target zero-padding bypass and shared count validation remove both structural differences, 668/668 instructions, 97.934135 -> 97.949104%, 246 -> 244 diffs; all remaining diffs are register/operand coloring. Data remains 6904/6904, pending gate.
|
||||
VmBlobPackCommon retained branch correction passed full clean gate --base f00336cc. Instruction-exact 218/233, code 36844/53564, data 6904/6904, .data 100%, pool identical; no regressions, forbidden additions or readability warnings; correct DOL SHA1.
|
||||
Diagnosis VmBlobUnpack: frame and all 517 instructions match structurally, but format cursor/count, blob owner, array element and decoded-value registers differ. Shared versus per-case array-element lifetimes, signed count treatment and type-specific decode temporaries are tested before register-only search.
|
||||
- VmBlobUnpack: one array-element owner shared across integer/string/hex output cases; 98.452614%; instructions 517/517; structural 0; diffs 141; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobUnpack: decoded integer value scoped to each integer output iteration; 98.268860%; instructions 517/517; structural 0; diffs 156; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobUnpack: signed integer traversal counter with explicit unsigned bound; 98.268860%; instructions 517/517; structural 0; diffs 156; data 6904/6904; regressions 0; restored.
|
||||
- VmBlobUnpack: format length read through named string-value owner; 96.392650%; instructions 526/517; structural 11; diffs 500; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: chunk-table slot declared and initialized inside the scan iteration; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: chunk scan bound has an unsigned named extent; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmNewObjData: chunk scan ordinal and initialized slot share fallback scope; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
|
||||
Retained VmBlobUnpack: one array-element variable used by every decode case, removing two shadow declarations. 98.268860 -> 98.452614%, 156 -> 141 positional differences, 517/517 instructions, structural 0, data 6904/6904; pending full gate.
|
||||
VmBlobUnpack shared array-element owner passed full clean gate --base f00336cc: GATE PASS, exact 218/233, matched code 36844/53564, data 6904/6904, pools identical and .data 100%. DOL hash correct; regressions/forbidden/readability all 0.
|
||||
Diagnosis CHANSVmStep last: frame 0xf0 and 1253 instructions agree, but 71 structural differences remain. Target uses explicit zero-count normalization and a pretested postdecrement loop, one shared rodata base for undefined constants and result-type tables, byte-offset enumeration rather than a moving enum pointer, different load-string error merge, and different property-result ownership. All 121 initial jump-table relocations are identical; any variant that moves them is rejected.
|
||||
- CHANSVmStep: explicit zero normalization and pretested postdecrement interpreter loop; 96.983240%; instructions 1255/1253; structural 63; diffs 1228; data 2232/6904; regressions 0; restored.
|
||||
- CHANSVmStep: result-type tables named directly for compiler rodata-base reuse; 96.308860%; instructions 1254/1253; structural 89; diffs 1094; data 2232/6904; regressions 0; restored.
|
||||
- CHANSVmStep: enumerated type pointer derived from array index each iteration; 96.396645%; instructions 1254/1253; structural 75; diffs 1131; data 2232/6904; regressions 0; restored.
|
||||
- CHANSVmStep: float index comparisons follow target operand direction; 96.452515%; instructions 1253/1253; structural 71; diffs 318; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmStep: pretested countdown with direct tables and indexed type enumeration; 96.604950%; instructions 1257/1253; structural 74; diffs 1220; data 2232/6904; regressions 0; restored.
|
||||
- CHANSVmStep: class test puts successful constructor selector before the error arm; 96.466080%; instructions 1253/1253; structural 65; diffs 313; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmStep: indirect store addresses the second scratch header directly; 95.683160%; instructions 1251/1253; structural 78; diffs 1234; data 2232/6904; regressions 0; restored.
|
||||
- CHANSVmStep: string load preserves deletion failures and merges the final result; 96.032720%; instructions 1253/1253; structural 75; diffs 318; data 6904/6904; regressions 0; restored.
|
||||
- CHANSVmStep: constructor branch and direct indirect-store scratch address; 95.696730%; instructions 1251/1253; structural 72; diffs 1235; data 2232/6904; regressions 0; restored.
|
||||
- CHANSVmStep: constructor branch, direct scratch address and merged string-load result; 95.450120%; instructions 1251/1253; structural 76; diffs 1235; data 2232/6904; regressions 0; restored.
|
||||
Retained CHANSVmStep constructor-test direction: 96.452515 -> 96.466080%, 318 -> 313 diffs, structural 71 -> 65, unchanged 1253/1253 instructions and .data 100%. Only the positive class arm precedes the failure arm; no table relocations or strings move. Rejected every size/pool-regressing countdown/table/enumeration/indirect-store trial.
|
||||
CHANSVmStep positive constructor branch passed full clean gate --base f00336cc: GATE PASS, exact 218/233, matched code 36844/53564, data 6904/6904 and .data 100%; no regressions, forbidden patterns or readability warnings. DOL hash correct.
|
||||
Completeness audit PASS: every remaining open function has at least three distinct compiling source-level trials in this run. Declaration-order search added 52 builds. Accepted VmCallMethod is separately exact after a clean build; current exact count 218/233. Work remains partial because 15 functions are open.
|
||||
Relocation audit correction: .data has 255 code relocations including method/function-pointer tables; all 255 normalized destinations are identical. Of these, the 121 CHANSVmStep interpreter jump-table relocations are identical. The earlier assertion mistakenly counted all code relocations as interpreter entries; no source or data changed.
|
||||
Final independent unit comparison against fresh initial snapshot: preserves every one of the original 217 objdiff-exact functions, adds VmCallMethod at 100.0%, code 35720 -> 36844, data 6904 -> 6904. All 15 remaining functions have >=3 distinct compiling trials; full final gate PASS.
|
||||
35
tools/decomp-assist/CHANSVm.round8-final-gate.txt
Normal file
35
tools/decomp-assist/CHANSVm.round8-final-gate.txt
Normal file
@@ -0,0 +1,35 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 36844/53564 data 6904/6904 functions 218/233 fuzzy 99.3346 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 218/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
|
||||
[src/channelScript/CHANSVm] section .text size 53564 match 99.33456
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.583336
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmParseInt 94.69388
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVm_8144B4D4 97.59036
|
||||
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
|
||||
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
|
||||
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVm_8145049C 99.84919
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.625984
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.46608
|
||||
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.88876 -> 86.93417
|
||||
global fuzzy_match_percent: 99.32283 -> 99.32392
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11620 -> 91.11620
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
97
tools/decomp-assist/CHANSVm.round8-report.md
Normal file
97
tools/decomp-assist/CHANSVm.round8-report.md
Normal file
@@ -0,0 +1,97 @@
|
||||
GATE PASS
|
||||
|
||||
Before -> after, measured against fresh initial HEAD 0c554a16:
|
||||
Instruction-exact functions 217/233 -> 218/233.
|
||||
Objdiff matched code bytes 35720/53564 -> 36844/53564.
|
||||
Objdiff matched data bytes 6904/6904 -> 6904/6904.
|
||||
.data 4672/4672 bytes, 100.0% -> 100.0%; all 121 interpreter jump-table relocations identical. All 255 .data code relocations also have identical normalized destinations. Pools identical at 125/125 strings.
|
||||
VmCallMethod 98.060500% -> 100.0%; 281/281 instructions, ctxdiff diffs 0, independently rebuilt after the full clean gate.
|
||||
|
||||
Remaining non-matching functions, in object order:
|
||||
|
||||
CHANSVmGetSourceLine 97.826090%, module, entry, bitfield and line-offset registers; 46/46 instructions, structural 0, diffs 16, 9 compiling attempts.
|
||||
CHANSVmNewObjData 99.583336%, chunk ordinal and compiler-generated table-slot registers; 96/96 instructions, structural 0, diffs 7, 12 compiling attempts.
|
||||
CHANSVmParseInt 94.693880%, endpoint store scheduled after base/output argument copies; 49/49 instructions, structural 2, diffs 3, 6 compiling attempts.
|
||||
CHANSVm_8144B4D4 97.590360%, endpoint store and object-type comparison scheduled in opposite order; 83/83 instructions, structural 2, diffs 2, 6 compiling attempts.
|
||||
VmDateDtor 94.967030%, weekday/month table loads and variadic stack argument scheduling; 91/91 instructions, structural 5, diffs 7, 3 compiling attempts.
|
||||
VmStringReplace 97.878784%, source/search/replacement strings and traversal registers; 132/132 instructions, structural 0, diffs 40, 3 compiling attempts.
|
||||
VmStringSplit 98.040540%, delimiter, array/element ownership and traversal registers; 222/222 instructions, structural 0, diffs 66, 4 compiling attempts.
|
||||
CHANSVm_8145049C 99.849190%, temporary formatted-string payload and owner registers; 431/431 instructions, structural 0, diffs 13, 10 compiling attempts.
|
||||
VmBlobGetHexString 98.719510%, hex character index, byte cursor and digit registers; 82/82 instructions, structural 0, diffs 14, 5 compiling attempts.
|
||||
VmBlobPackCommon 97.949104%, packing-state registers after both structural branch differences were removed; 668/668 instructions, structural 0, diffs 244, 6 compiling attempts.
|
||||
VmBlobUnpack 98.452614%, format/cursor/decoded-value registers after array-element lifetime was shared; 517/517 instructions, structural 0, diffs 141, 4 compiling attempts.
|
||||
VmWinEmuWrite 99.626870%, converted string and aligned byte-length registers; 67/67 instructions, structural 0, diffs 5, 5 compiling attempts.
|
||||
CHANSVmAddExe 99.625984%, module/type registers, module-clear counter and one addition operand order; 254/254 instructions, structural 0, diffs 16, 7 compiling attempts.
|
||||
CHANSVmLinkModules 98.677246%, module, dispatch, global/native iterator and index registers; 189/189 instructions, structural 0, diffs 43, 7 compiling attempts.
|
||||
CHANSVmStep 96.466080%, countdown control flow, result-table base, operand-type spill, result merge and registers; 1253/1253 instructions, structural 65, diffs 313, 10 compiling attempts.
|
||||
|
||||
Files changed:
|
||||
|
||||
src/channelScript/CHANSVm.c
|
||||
tools/decomp-assist/CHANSVm.round8-attempts.md
|
||||
tools/decomp-assist/CHANSVm.round8-final-gate.txt
|
||||
tools/decomp-assist/CHANSVm.round8-report.md
|
||||
|
||||
Source improvements were committed only after their full clean gates passed:
|
||||
|
||||
8a87f2c2 refine module table traversal ordering
|
||||
15c33bf7 match vm method dispatch
|
||||
802c636a align blob packing validation branches
|
||||
407c0895 share unpacked array element lifetime
|
||||
1019c675 align interpreter constructor branch
|
||||
|
||||
Final report/log commit is the next commit after these source commits.
|
||||
|
||||
Uncertain: exact compiler causes of the remaining scheduling/register choices are unconfirmed. The default gate has no immutable baseline for HEAD 0c554a16; full gates therefore use --base f00336cc, the nearest ancestor with an existing baseline. Its printed baseline is 216 functions/35484 code bytes. The fresh initial unit report separately proves this run improved 217 -> 218 without regressing any initial exact function. No baseline, config, header or other translation unit was changed.
|
||||
|
||||
Every remaining function has at least three distinct compiling source-level attempts; the declaration-order search also tried 52 orders. Size/data regressions were restored. This is partial matching progress, with 15 functions still open and the unit remaining NonMatching/unlinked as requested.
|
||||
|
||||
Final full gate summary, copied verbatim:
|
||||
|
||||
```text
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 36844/53564 data 6904/6904 functions 218/233 fuzzy 99.3346 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 218/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
Final full non-quick gate:
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 36844/53564 data 6904/6904 functions 218/233 fuzzy 99.3346 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 218/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
|
||||
[src/channelScript/CHANSVm] section .text size 53564 match 99.33456
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.583336
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmParseInt 94.69388
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVm_8144B4D4 97.59036
|
||||
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
|
||||
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
|
||||
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVm_8145049C 99.84919
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.625984
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.46608
|
||||
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.88876 -> 86.93417
|
||||
global fuzzy_match_percent: 99.32283 -> 99.32392
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11620 -> 91.11620
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
@@ -7,8 +7,10 @@ BASE = 'build/43U/obj/src/utility/iplESMisc.o'
|
||||
|
||||
def pool(path):
|
||||
e = ELFFile(open(path, 'rb'))
|
||||
sec = {s.name: s for s in e.iter_sections()}
|
||||
d = sec['.data'].data()
|
||||
section = e.get_section_by_name('.data')
|
||||
if section is None:
|
||||
return []
|
||||
d = section.data()
|
||||
out = []
|
||||
off = 0
|
||||
while off < len(d):
|
||||
@@ -42,6 +44,7 @@ def main():
|
||||
for j in range(n, max(len(mine), len(base))):
|
||||
src = mine if j < len(mine) else base
|
||||
print(' extra %3d %r' % (j, src[j][1][:70]))
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
53
tools/decomp-assist/test_pool_diff.py
Normal file
53
tools/decomp-assist/test_pool_diff.py
Normal file
@@ -0,0 +1,53 @@
|
||||
import contextlib
|
||||
import io
|
||||
import unittest
|
||||
from unittest.mock import Mock, mock_open, patch
|
||||
|
||||
import pool_diff
|
||||
|
||||
|
||||
class PoolDiffTests(unittest.TestCase):
|
||||
def read_pool(self, data):
|
||||
elf = Mock()
|
||||
section = None if data is None else Mock()
|
||||
if section is not None:
|
||||
section.data.return_value = data
|
||||
elf.get_section_by_name.return_value = section
|
||||
with patch('builtins.open', mock_open(read_data=b'')), patch.object(pool_diff, 'ELFFile', return_value=elf):
|
||||
result = pool_diff.pool('test.o')
|
||||
elf.get_section_by_name.assert_called_once_with('.data')
|
||||
return result
|
||||
|
||||
def compare(self, left, right):
|
||||
with patch.object(pool_diff.sys, 'argv', ['pool_diff.py', 'left.o', 'right.o']), \
|
||||
patch.object(pool_diff, 'pool', side_effect=[left, right]), \
|
||||
contextlib.redirect_stdout(io.StringIO()):
|
||||
return pool_diff.main()
|
||||
|
||||
def test_missing_data_has_no_strings(self):
|
||||
self.assertEqual(self.read_pool(None), [])
|
||||
|
||||
def test_empty_data_has_no_strings(self):
|
||||
self.assertEqual(self.read_pool(b''), [])
|
||||
|
||||
def test_existing_string_extraction(self):
|
||||
self.assertEqual(self.read_pool(b'abc\x00hello\x00world\x00'), [(4, 'hello'), (10, 'world')])
|
||||
|
||||
def test_two_missing_pools_match(self):
|
||||
self.assertEqual(self.compare([], []), 0)
|
||||
|
||||
def test_identical_pools_match(self):
|
||||
self.assertEqual(self.compare([(0, 'hello')], [(0, 'hello')]), 0)
|
||||
|
||||
def test_changed_string_fails(self):
|
||||
self.assertEqual(self.compare([(0, 'hello')], [(0, 'world')]), 1)
|
||||
|
||||
def test_missing_left_pool_does_not_hide_strings(self):
|
||||
self.assertEqual(self.compare([], [(0, 'hello')]), 1)
|
||||
|
||||
def test_missing_right_pool_does_not_hide_strings(self):
|
||||
self.assertEqual(self.compare([(0, 'hello')], []), 1)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
128
tools/decomp-assist/tiInputForm-sol.attempts.md
Normal file
128
tools/decomp-assist/tiInputForm-sol.attempts.md
Normal file
@@ -0,0 +1,128 @@
|
||||
# tiInputForm matching attempts
|
||||
|
||||
Baseline objdiff 209/221; raw instruction check 207/221; code 30712/50656; data 908/3772; six asm bodies.
|
||||
Each discarded trial restores the source; only exact candidates are retained.
|
||||
Shared header helper trial was restored completely. No shared header changes remain.
|
||||
|
||||
onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv | command-mode-declaration-order | structural 0 positional 7 insns 2053/2053 objdiff 99.98295 | POOL IDENTICAL up to 20 (mine=20 base=20) | d75cc54817fe
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-boolean-guard | structural 4 positional 172 insns 263/264 objdiff 99.583336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 9abe3d595151
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-boolean-guard | structural 4 positional 183 insns 274/275 objdiff 99.6 | POOL IDENTICAL up to 20 (mine=20 base=20) | 7a3c965a3965
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-multiply-operands | structural 0 positional 5 insns 473/473 objdiff 99.915436 | POOL IDENTICAL up to 20 (mine=20 base=20) | 6e582ddce1a8
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-space-width-locals | structural 0 positional 4 insns 473/473 objdiff 99.93658 | POOL IDENTICAL up to 20 (mine=20 base=20) | 978f300afffd
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-offset-local-first | structural 0 positional 5 insns 473/473 objdiff 99.915436 | POOL IDENTICAL up to 20 (mine=20 base=20) | d0d4a84c46ad
|
||||
onPressUp__Q39textinput9inputform4BaseFv | pressUp-switch-false | structural 9 positional 54 insns 247/246 objdiff 99.532524 | POOL IDENTICAL up to 20 (mine=20 base=20) | 6d33e7106da1
|
||||
onPressDown__Q39textinput9inputform4BaseFv | pressDown-switch-false | structural 9 positional 54 insns 247/246 objdiff 99.532524 | POOL IDENTICAL up to 20 (mine=20 base=20) | 7b46b351d366
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-switch-false | structural 4 positional 173 insns 265/264 objdiff 99.56439 | POOL IDENTICAL up to 20 (mine=20 base=20) | 92b5c1ec5c4e
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-switch-false | structural 4 positional 184 insns 276/275 objdiff 99.58182 | POOL IDENTICAL up to 20 (mine=20 base=20) | c89d25fed981
|
||||
onPressDownHWKB__Q39textinput9inputform4BaseFv | hwDown-switch-and-zi-branch | structural 15 positional 168 insns 268/270 objdiff 98.333336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 898a595ff3e4
|
||||
onPressDownHWKB__Q39textinput9inputform4BaseFv | hwDown-scoped-selection | structural 15 positional 168 insns 268/270 objdiff 98.333336 | POOL IDENTICAL up to 20 (mine=20 base=20) | a2ba02ff4f55
|
||||
onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv | command-mode-unfix-pointer | structural 0 positional 7 insns 2053/2053 objdiff 99.98295 | POOL IDENTICAL up to 20 (mine=20 base=20) | a6b28507b819
|
||||
onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv | command-mode-signed-values | structural 0 positional 0 insns 2053/2053 objdiff 100.0 | POOL IDENTICAL up to 20 (mine=20 base=20) | 984336fd7638
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-separate-pane-name | structural 12 positional 22 insns 237/237 objdiff 96.44726 | POOL IDENTICAL up to 20 (mine=20 base=20) | 0416736fc39f
|
||||
onPressUp__Q39textinput9inputform4BaseFv | pressUp-true-switch | structural 2 positional 2 insns 246/246 objdiff 99.97561 | POOL IDENTICAL up to 20 (mine=20 base=20) | 9c9dccc15fc8
|
||||
onPressUp__Q39textinput9inputform4BaseFv | pressUp-positive-nested | structural 9 positional 53 insns 245/246 objdiff 99.55285 | POOL IDENTICAL up to 20 (mine=20 base=20) | a07574e011c3
|
||||
onPressDown__Q39textinput9inputform4BaseFv | pressDown-true-switch | structural 2 positional 2 insns 246/246 objdiff 99.97561 | POOL IDENTICAL up to 20 (mine=20 base=20) | 0765e6acf20b
|
||||
onPressDown__Q39textinput9inputform4BaseFv | pressDown-positive-nested | structural 9 positional 53 insns 245/246 objdiff 99.55285 | POOL IDENTICAL up to 20 (mine=20 base=20) | 692b741821d3
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-integer-zero-case | structural 7 positional 171 insns 268/264 objdiff 98.46212 | POOL IDENTICAL up to 20 (mine=20 base=20) | a8c7bbc6118c
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-positive-nested | structural 5 positional 41 insns 264/264 objdiff 99.204544 | POOL IDENTICAL up to 20 (mine=20 base=20) | d0ceb5604173
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-integer-zero-case | structural 7 positional 182 insns 279/275 objdiff 98.523636 | POOL IDENTICAL up to 20 (mine=20 base=20) | 3c64fdb5df5b
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-positive-nested | INVALID HARNESS: prior failed edit was not restored; restored all source from accepted commit; excluded from attempts
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-branch-name | INVALID HARNESS: prior failed edit was not restored; restored all source from accepted commit; excluded from attempts
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-inverted-name-branch | INVALID HARNESS: prior failed edit was not restored; restored all source from accepted commit; excluded from attempts
|
||||
onPressUp__Q39textinput9inputform4BaseFv | pressUp-switch-body | structural 9 positional 53 insns 245/246 objdiff 99.55285 | POOL IDENTICAL up to 20 (mine=20 base=20) | 7354ddbfd6e3
|
||||
onPressDown__Q39textinput9inputform4BaseFv | pressDown-switch-body | structural 9 positional 53 insns 245/246 objdiff 99.55285 | POOL IDENTICAL up to 20 (mine=20 base=20) | dcc9b7d4b55f
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-switch-body | structural 4 positional 173 insns 265/264 objdiff 99.56439 | POOL IDENTICAL up to 20 (mine=20 base=20) | 932a87b84b7e
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-switch-body | build failed; restored
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | calc-cursor-scale-components | structural 80 positional 235 insns 317/326 objdiff 86.54601 | POOL IDENTICAL up to 20 (mine=20 base=20) | 9ba6717476d8
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | calc-cursor-height-temporaries | structural 34 positional 45 insns 326/326 objdiff 91.622696 | POOL IDENTICAL up to 20 (mine=20 base=20) | e02d1e3b0f98
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | calc-cursor-width-first-declarations | structural 42 positional 65 insns 326/326 objdiff 91.269936 | POOL IDENTICAL up to 20 (mine=20 base=20) | a10cbdfc0919
|
||||
onPressUp__Q39textinput9inputform4BaseFv | pressUp-negative-switch | structural 12 positional 101 insns 247/246 objdiff 97.439026 | POOL IDENTICAL up to 20 (mine=20 base=20) | 3b7efb6bad83
|
||||
onPressDown__Q39textinput9inputform4BaseFv | pressDown-negative-switch | structural 12 positional 101 insns 247/246 objdiff 97.439026 | POOL IDENTICAL up to 20 (mine=20 base=20) | c21d9f059975
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-negative-switch | structural 7 positional 198 insns 265/264 objdiff 97.5 | POOL IDENTICAL up to 20 (mine=20 base=20) | 179355ecfda8
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-negative-switch | structural 5 positional 185 insns 276/275 objdiff 99.4 | POOL IDENTICAL up to 20 (mine=20 base=20) | 3c81716eaf9b
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-split-offset | structural 10 positional 17 insns 473/473 objdiff 97.97463 | POOL IDENTICAL up to 20 (mine=20 base=20) | c16585407d68
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-double-scale-expression | structural 0 positional 4 insns 473/473 objdiff 99.93658 | POOL IDENTICAL up to 20 (mine=20 base=20) | 651274cad027
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-reuse-layout-data | structural 23 positional 190 insns 252/237 objdiff 91.818565 | POOL IDENTICAL up to 20 (mine=20 base=20) | d0baa013fa7c
|
||||
onPressUp__Q39textinput9inputform4BaseFv | pressUp-default-first | structural 9 positional 54 insns 247/246 objdiff 99.532524 | POOL IDENTICAL up to 20 (mine=20 base=20) | 2fc2fb852a90
|
||||
onPressDown__Q39textinput9inputform4BaseFv | pressDown-default-first | structural 9 positional 54 insns 247/246 objdiff 99.532524 | POOL IDENTICAL up to 20 (mine=20 base=20) | 8319afbfcc60
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-default-first | structural 4 positional 173 insns 265/264 objdiff 99.56439 | POOL IDENTICAL up to 20 (mine=20 base=20) | 05d9bc50ee69
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-default-first | structural 4 positional 184 insns 276/275 objdiff 99.58182 | POOL IDENTICAL up to 20 (mine=20 base=20) | 1d7a33f1c796
|
||||
onPressDownHWKB__Q39textinput9inputform4BaseFv | hwDown-default-first | structural 15 positional 168 insns 268/270 objdiff 98.333336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 2689db88dd9d
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layout-create-root-pane-search | structural 15 positional 178 insns 354/356 objdiff 95.80618 | POOL IDENTICAL up to 20 (mine=20 base=20) | 69ead8b11801
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layout-create-animation-file-reload | structural 11 positional 225 insns 354/356 objdiff 95.97472 | POOL IDENTICAL up to 20 (mine=20 base=20) | 75a40753bb59
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layout-create-loop-declarations | structural 20 positional 229 insns 352/356 objdiff 95.02809 | POOL IDENTICAL up to 20 (mine=20 base=20) | b4df3e032fef
|
||||
isOverRowLimit__Q39textinput9inputform4BaseFUlPCw | row-limit-retain-scale-vector | structural 1 positional 54 insns 238/238 objdiff 98.61345 | POOL IDENTICAL up to 20 (mine=20 base=20) | 6e323fc2e8cb
|
||||
isOverRowLimit__Q39textinput9inputform4BaseFUlPCw | row-limit-leading-declarations | structural 17 positional 136 insns 235/238 objdiff 97.35294 | POOL IDENTICAL up to 20 (mine=20 base=20) | a006fa65fa61
|
||||
isOverRowLimit__Q39textinput9inputform4BaseFUlPCw | row-limit-inner-width-recalculation | structural 8 positional 167 insns 239/238 objdiff 98.17227 | POOL IDENTICAL up to 20 (mine=20 base=20) | 35a561a80470
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-loop | INVALID HARNESS: declaration matched instead of definition; restored; excluded from attempts
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-row-reference | INVALID HARNESS: declaration matched instead of definition; restored; excluded from attempts
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-short-index | INVALID HARNESS: declaration matched instead of definition; restored; excluded from attempts
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | base-create-cpp-locals | structural 0 positional 26 insns 72/72 objdiff 97.708336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 0eb7dc26059f
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | base-create-cpp-declare-index-first | structural 0 positional 26 insns 72/72 objdiff 97.708336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 62cf6b694b1a
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | base-create-cpp-reuse-rows | structural 0 positional 26 insns 72/72 objdiff 97.708336 | POOL IDENTICAL up to 20 (mine=20 base=20) | a82cc97841ef
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | base-create-declsearch | 38 declaration permutations; best structural 0 positional 19; restored
|
||||
onPressLeft__Q39textinput9inputform4BaseFv | asm-pressLeft-cpp-early-return | structural 4 positional 66 insns 153/154 objdiff 99.28571 | POOL IDENTICAL up to 20 (mine=20 base=20) | 607eb261877c
|
||||
onPressLeft__Q39textinput9inputform4BaseFv | asm-pressLeft-cpp-switch-true | structural 2 positional 2 insns 154/154 objdiff 99.96104 | POOL IDENTICAL up to 20 (mine=20 base=20) | 976a6153f21d
|
||||
onPressLeft__Q39textinput9inputform4BaseFv | asm-pressLeft-cpp-switch-false | structural 4 positional 67 insns 155/154 objdiff 99.25325 | POOL IDENTICAL up to 20 (mine=20 base=20) | dfe9e3c3d383
|
||||
onPressRight__Q39textinput9inputform4BaseFv | asm-pressRight-cpp-early-return | structural 34 positional 153 insns 194/185 objdiff 91.33514 | POOL IDENTICAL up to 20 (mine=20 base=20) | f04543734c7e
|
||||
onPressRight__Q39textinput9inputform4BaseFv | asm-pressRight-cpp-switch-true | structural 34 positional 190 insns 195/185 objdiff 91.8973 | POOL IDENTICAL up to 20 (mine=20 base=20) | eb835b78de0d
|
||||
onPressRight__Q39textinput9inputform4BaseFv | asm-pressRight-cpp-switch-false | structural 35 positional 193 insns 196/185 objdiff 91.308105 | POOL IDENTICAL up to 20 (mine=20 base=20) | 1186ce86d3d8
|
||||
calc__Q39textinput9inputform4BaseFv | asm-calc-cpp-color-members | INVALID HARNESS: declaration matched instead of definition; restored; excluded from attempts
|
||||
calc__Q39textinput9inputform4BaseFv | asm-calc-cpp-integral-color-conversions | INVALID HARNESS: declaration matched instead of definition; restored; excluded from attempts
|
||||
calc__Q39textinput9inputform4BaseFv | asm-calc-cpp-sustain-color-order | INVALID HARNESS: declaration matched instead of definition; restored; excluded from attempts
|
||||
onPressUp__Q39textinput9inputform4BaseFv | pressUp-zero-case-only | structural 9 positional 54 insns 247/246 objdiff 99.532524 | POOL IDENTICAL up to 20 (mine=20 base=20) | 180beccdcd88
|
||||
onPressDown__Q39textinput9inputform4BaseFv | pressDown-zero-case-only | structural 9 positional 54 insns 247/246 objdiff 99.532524 | POOL IDENTICAL up to 20 (mine=20 base=20) | a5de099a7701
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | hwLeft-zero-case-only | structural 4 positional 173 insns 265/264 objdiff 99.56439 | POOL IDENTICAL up to 20 (mine=20 base=20) | f8039bc8c5ac
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | hwRight-zero-case-only | structural 4 positional 184 insns 276/275 objdiff 99.58182 | POOL IDENTICAL up to 20 (mine=20 base=20) | 9c77e36da31b
|
||||
onPressDownHWKB__Q39textinput9inputform4BaseFv | hwDown-zero-case-only | structural 15 positional 168 insns 268/270 objdiff 98.333336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 38ead171e991
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-loop | structural 20 positional 31 insns 47/39 objdiff 58.589745 | POOL IDENTICAL up to 20 (mine=20 base=20) | 37f330b49d1e
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-row-reference | structural 20 positional 31 insns 47/39 objdiff 58.589745 | POOL IDENTICAL up to 20 (mine=20 base=20) | a36c8df331ab
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-short-index | structural 20 positional 31 insns 47/39 objdiff 58.589745 | POOL IDENTICAL up to 20 (mine=20 base=20) | b8d509644b6d
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | base-create-cpp-locals | structural 0 positional 26 insns 72/72 objdiff 97.708336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 0eb7dc26059f
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | base-create-cpp-declare-index-first | structural 0 positional 26 insns 72/72 objdiff 97.708336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 62cf6b694b1a
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | base-create-cpp-reuse-rows | structural 0 positional 26 insns 72/72 objdiff 97.708336 | POOL IDENTICAL up to 20 (mine=20 base=20) | a82cc97841ef
|
||||
calc__Q39textinput9inputform4BaseFv | asm-calc-cpp-color-members | structural 6 positional 13 insns 165/165 objdiff 96.15151 | POOL IDENTICAL up to 20 (mine=20 base=20) | 822d6248d14c
|
||||
calc__Q39textinput9inputform4BaseFv | asm-calc-cpp-integral-color-conversions | structural 6 positional 13 insns 165/165 objdiff 96.15151 | POOL IDENTICAL up to 20 (mine=20 base=20) | 1f321e3e07d7
|
||||
calc__Q39textinput9inputform4BaseFv | asm-calc-cpp-sustain-color-order | structural 10 positional 17 insns 165/165 objdiff 96.12727 | POOL IDENTICAL up to 20 (mine=20 base=20) | 480cbca6c766
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-cpp-rect | build failed; actual pane field at 0xCD uses GetAlpha; restored; retried below
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-cpp-scale-local | build failed; actual pane field at 0xCD uses GetAlpha; restored; retried below
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-cpp-rect-construct | build failed; actual pane field at 0xCD uses GetAlpha; restored; retried below
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-cpp-rect | structural 12 positional 12 insns 114/114 objdiff 99.89474 | POOL IDENTICAL up to 20 (mine=20 base=20) | 0f32a2388795
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-cpp-scale-local | structural 14 positional 14 insns 114/114 objdiff 98.14035 | POOL IDENTICAL up to 20 (mine=20 base=20) | 9e0c10784f78
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-cpp-rect-construct | structural 12 positional 12 insns 114/114 objdiff 99.89474 | POOL IDENTICAL up to 20 (mine=20 base=20) | a688e8db5e54
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-position-first | structural 16 positional 14 insns 114/114 objdiff 96.833336 | POOL IDENTICAL up to 20 (mine=20 base=20) | 209adef28e0d
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-vectors-leading | structural 21 positional 66 insns 116/114 objdiff 90.54386 | POOL IDENTICAL up to 20 (mine=20 base=20) | 53d4dc4b9bf8
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-scale-assignment | structural 17 positional 66 insns 116/114 objdiff 93.60526 | POOL IDENTICAL up to 20 (mine=20 base=20) | fdbe90516347
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-head-pointers | structural 7 positional 24 insns 38/39 objdiff 81.02564 | POOL IDENTICAL up to 20 (mine=20 base=20) | d784982b5ddb
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-head-declarations | structural 7 positional 24 insns 38/39 objdiff 81.02564 | POOL IDENTICAL up to 20 (mine=20 base=20) | df89867b9a97
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-head-index | structural 15 positional 27 insns 41/39 objdiff 73.46154 | POOL IDENTICAL up to 20 (mine=20 base=20) | f242af921e84
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-name-inline-boundary | structural 12 positional 22 insns 237/237 objdiff 96.44726 | FIRST DIVERGENCE at index 18 16 mine=0x418 base=0x418 M 'N_separateBarAll' B 'N_separateBarAll' 17 mine=0x42c base=0x42c M 'T_title_text' B 'T_title_text' * 18 mine=0xbb4 base=0xa5c M 'T_2l_TextBox' B 'OutOfLength\n' * 19 mine=0xbc4 base=0xa6c M 'OutOfLength\n' B 'Error#004\nAn error has occurred.\nThe system files are corrupted.' mine has 21 strings, base has 20 | 310e507c1ba6
|
||||
draw__Q39textinput9inputform12LayoutByNW4RFv | asm-draw-base-boundary | structural 0 positional 0 insns 114/114 objdiff 100.0 | POOL IDENTICAL up to 20 (mine=20 base=20) | 809714fa4eb8
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-head-before-last | structural 6 positional 24 insns 38/39 objdiff 84.48718 | POOL IDENTICAL up to 20 (mine=20 base=20) | 275024d1ac01
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-assignment-head | structural 7 positional 24 insns 38/39 objdiff 81.02564 | POOL IDENTICAL up to 20 (mine=20 base=20) | ff64ac7e4d9f
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rowinfo-cpp-head-first-direct-back | structural 9 positional 12 insns 39/39 objdiff 82.5641 | POOL IDENTICAL up to 20 (mine=20 base=20) | dc54453e7984
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-const-widths-scale-local | structural 0 positional 7 insns 473/473 objdiff 99.87315 | POOL IDENTICAL up to 20 (mine=20 base=20) | 204be0b3619d
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-scale-offset-reuse | structural 0 positional 7 insns 473/473 objdiff 99.87315 | POOL IDENTICAL up to 20 (mine=20 base=20) | 53556a72c25d
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-vector-scale-local | structural 78 positional 248 insns 475/473 objdiff 98.67865 | POOL IDENTICAL up to 20 (mine=20 base=20) | 65003abb2099
|
||||
|
||||
## Final open-function audit
|
||||
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | 8 distinct built source variants | all non-exact trials restored
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | 3 distinct built source variants | all non-exact trials restored
|
||||
onPressUp__Q39textinput9inputform4BaseFv | 7 distinct built source variants | all non-exact trials restored
|
||||
onPressDown__Q39textinput9inputform4BaseFv | 7 distinct built source variants | all non-exact trials restored
|
||||
onPressDownHWKB__Q39textinput9inputform4BaseFv | 4 distinct built source variants | all non-exact trials restored
|
||||
onPressLeftHWKB__Q39textinput9inputform4BaseFv | 8 distinct built source variants | all non-exact trials restored
|
||||
onPressRightHWKB__Q39textinput9inputform4BaseFv | 6 distinct built source variants | all non-exact trials restored
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | 3 distinct built source variants | all non-exact trials restored
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | 3 distinct built source variants | all non-exact trials restored
|
||||
isOverRowLimit__Q39textinput9inputform4BaseFUlPCw | 3 distinct built source variants | all non-exact trials restored
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | 3 distinct built source variants | all non-exact trials restored
|
||||
onPressLeft__Q39textinput9inputform4BaseFv | 3 distinct built source variants | all non-exact trials restored
|
||||
onPressRight__Q39textinput9inputform4BaseFv | 3 distinct built source variants | all non-exact trials restored
|
||||
calc__Q39textinput9inputform4BaseFv | 3 distinct built source variants | all non-exact trials restored
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | 9 distinct built source variants | all non-exact trials restored
|
||||
|
||||
Two gate raw instruction mismatches are normalization artifacts. Animation::calc instructions 7/16 are byte-identical 41860054/41860028; confirmInputting_ instructions 211/227 are byte-identical 40860028/41860024. Both are objdiff 100%. No offset or symbol changes were made to change the count.
|
||||
The concatenated isEnableCursorCache/getStartPos target symbol has no corresponding source function and no fuzzy score. It was not renamed, removed, or resized.
|
||||
Remaining asm bodies are still present at objdiff 100%; conversion trials were restored because they did not stay instruction-exact.
|
||||
81
tools/decomp-assist/tiInputForm-sol.report.md
Normal file
81
tools/decomp-assist/tiInputForm-sol.report.md
Normal file
@@ -0,0 +1,81 @@
|
||||
# tiInputForm worker result
|
||||
|
||||
Instruction-exact gate count: 207/221 -> 208/221.
|
||||
Objdiff-exact functions: 209/221 -> 210/221.
|
||||
Matched code: 30712/50656 -> 38924/50656 bytes.
|
||||
Matched data: 908/3772 -> 908/3772 bytes.
|
||||
Asm bodies: 6 -> 5.
|
||||
|
||||
Accepted changes: onCommand prediction modes use signed temporaries with typed conversions at the API calls; LayoutByNW4R::draw is C++ and keeps the Base::draw inline boundary. Both have fresh ctxdiff diffs 0. Source commits: 82f652f0 and 320f8719.
|
||||
Changed files: src/keyboard/tiInputForm.cpp, tools/decomp-assist/tiInputForm-sol.attempts.md, tools/decomp-assist/tiInputForm-sol.report.md.
|
||||
No shared headers, configuration, symbols, protected tools, or baseline reports were changed.
|
||||
|
||||
## Remaining non-matching functions
|
||||
|
||||
| Function | Objdiff percent | Remaining difference |
|
||||
| --- | ---: | --- |
|
||||
| Base::onCursor | 99.915436 | Float allocation and multiply operand order; same 473 instructions. |
|
||||
| Base::calcCursorPos | 91.622696 | Scale-component allocation and float load/arithmetic scheduling; same 326 instructions. |
|
||||
| Base::onPressUp | 99.55285 | Guard omits the target's redundant branch; 245/246 instructions. |
|
||||
| Base::onPressDown | 99.55285 | Guard omits the target's redundant branch; 245/246 instructions. |
|
||||
| Base::onPressDownHWKB | 98.35185 | Guard, trailing Zi comparison, and selection register; 266/270 instructions. |
|
||||
| Base::onPressLeftHWKB | 99.97727 | Guard compares 1/beq, target compares 0/bne; same 264 instructions. |
|
||||
| Base::onPressRightHWKB | 99.97818 | Guard compares 1/beq, target compares 0/bne; same 275 instructions. |
|
||||
| LayoutByNW4R::create | 95.02809 | Root-pane search and animation-file reload boundaries, allocation; 352/356 instructions. |
|
||||
| LayoutByNW4R::setLanguage | 96.44726 | Root-pane load moves ahead of pane-name selection; same 237 instructions. |
|
||||
| Base::isOverRowLimit | 97.184875 | Scale scalar caching removes target loads; allocation and operand order; 235/238 instructions. |
|
||||
|
||||
## Remaining asm conversions
|
||||
|
||||
All five existing asm bodies remain objdiff 100%. All have at least three distinct built C++ trials and were restored because no conversion stayed exact.
|
||||
|
||||
- Base::create: C++ reaches 72/72 instructions, structural 0; declaration search reached 19 register differences after 38 builds.
|
||||
- Base::onPressLeft: C++ reaches 154/154 instructions, two guard differences.
|
||||
- Base::onPressRight: local wchar array copies as halfwords rather than target words; stack and guard differ.
|
||||
- Base::calc: C++ reaches 165/165 instructions; float scheduling and operand order differ.
|
||||
- Base::RowInfoManager::init: grouped row pointers improve to 39/39 instructions; loop-limit reuse and head setup still differ.
|
||||
|
||||
Every remaining real non-exact function and asm conversion has at least three distinct, built, logged source trials. Failed harness trials are labeled and excluded. No fuzzy trial remains in the source.
|
||||
|
||||
## Gate count limitations
|
||||
|
||||
Animation::calc and Base::confirmInputting_ are objdiff 100%; the gate's disassembly normalizer reports two branch differences in each despite identical encoded branch bytes. These are count artifacts, not new matches. The concatenated isEnableCursorCache/getStartPos target symbol has no source function or fuzzy score and was left intact.
|
||||
The exact source form for the remaining functions is unresolved. The data score remains below 100%; no linking investigation was attempted.
|
||||
|
||||
## Final full gate
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiInputForm] pool: IDENTICAL
|
||||
[src/keyboard/tiInputForm] objdiff: code 38924/50656 data 908/3772 functions 210/221 fuzzy 99.4528 linked code 0
|
||||
[src/keyboard/tiInputForm] instruction-exact functions: 208/221
|
||||
[src/keyboard/tiInputForm] section .bss size 96 match None
|
||||
[src/keyboard/tiInputForm] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiInputForm] section .data size 2736 match 65.53332
|
||||
[src/keyboard/tiInputForm] section .rodata size 760 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sbss size 32 match 33.333336
|
||||
[src/keyboard/tiInputForm] section .sdata size 40 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata2 size 104 match 100.0
|
||||
[src/keyboard/tiInputForm] section .text size 50656 match 99.45278
|
||||
[src/keyboard/tiInputForm] below 100: onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos 99.915436
|
||||
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 91.622696
|
||||
[src/keyboard/tiInputForm] below 100: onPressUp__Q39textinput9inputform4BaseFv 99.55285
|
||||
[src/keyboard/tiInputForm] below 100: onPressDown__Q39textinput9inputform4BaseFv 99.55285
|
||||
[src/keyboard/tiInputForm] below 100: onPressDownHWKB__Q39textinput9inputform4BaseFv 98.35185
|
||||
[src/keyboard/tiInputForm] below 100: onPressLeftHWKB__Q39textinput9inputform4BaseFv 99.97727
|
||||
[src/keyboard/tiInputForm] below 100: onPressRightHWKB__Q39textinput9inputform4BaseFv 99.97818
|
||||
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 95.02809
|
||||
[src/keyboard/tiInputForm] below 100: setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language 96.44726
|
||||
[src/keyboard/tiInputForm] below 100: isOverRowLimit__Q39textinput9inputform4BaseFUlPCw 97.184875
|
||||
[src/keyboard/tiInputForm] below 100: isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv None
|
||||
[src/keyboard/tiInputForm] baseline: code 30712/50656 data 908 functions 209 fuzzy 99.4500
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 87.07200 -> 87.34617
|
||||
global fuzzy_match_percent: 99.36478 -> 99.36484
|
||||
global complete_code_percent: 61.40923 -> 61.40923
|
||||
global matched_data_percent: 91.13999 -> 91.13999
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
Reference in New Issue
Block a user