Compare commits
32 Commits
agent/w092
...
agent/data
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2aa13863fa | ||
|
|
3946983f96 | ||
|
|
85d75cd0cf | ||
|
|
af39f2678f | ||
|
|
d613662c54 | ||
|
|
0e6e235004 | ||
|
|
020e1b6f0b | ||
|
|
3440aab039 | ||
|
|
dab806eaa2 | ||
|
|
f4fd16f88f | ||
|
|
3d8de1a356 | ||
|
|
8e43db0528 | ||
|
|
21c9b95b1b | ||
|
|
d4bdd3462c | ||
|
|
f7d81a0196 | ||
|
|
4f35874d02 | ||
|
|
0a5cbaf78e | ||
|
|
6e7c016ae3 | ||
|
|
e60306db62 | ||
|
|
5d0ced6a15 | ||
|
|
858a507ddf | ||
|
|
ce424f1a3e | ||
|
|
bcb37e07ef | ||
|
|
11094c638a | ||
|
|
cb49bde9c6 | ||
|
|
df9fd72e87 | ||
|
|
0c554a1602 | ||
|
|
f00336cc8b | ||
|
|
842bbc6942 | ||
|
|
ab01520044 | ||
|
|
5f948d3f3a | ||
|
|
699f844395 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.31% | 86.75% | 60.61% | 91.11% |
|
||||
| 99.37% | 87.47% | 61.64% | 91.14% |
|
||||
|
||||
units 911/1027 complete, functions 12175/12563 matched.
|
||||
units 915/1027 complete, functions 12203/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
|
||||
|
||||
@@ -13113,7 +13113,7 @@ pfstub_com_massage = .text:0x815E6C40; // type:function size:0xE4
|
||||
pfstub_store_result = .text:0x815E6D24; // type:function size:0xC4
|
||||
PFSYS_initializeSYS = .text:0x815E6DE8; // type:function size:0x4
|
||||
PFSYS_GetCurrentContextID = .text:0x815E6DEC; // type:function size:0x18
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x74
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x7C
|
||||
pfstub_call_function_standard = .text:0x815E6E80; // type:function size:0x584
|
||||
pfstub_attach = .text:0x815E7404; // type:function size:0x50
|
||||
pfstub_buffering = .text:0x815E7454; // type:function size:0x50
|
||||
@@ -13202,7 +13202,7 @@ pfd_sddrv_pread = .text:0x815EAADC; // type:function size:0x38
|
||||
pfd_sddrv_pwrite = .text:0x815EAB14; // type:function size:0x38
|
||||
pfd_sddrv_unmount = .text:0x815EAB4C; // type:function size:0x34
|
||||
pfd_sddrv_finalize = .text:0x815EAB80; // type:function size:0xE4
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x180
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x188
|
||||
pfd_sddrv_init_drv_tbl = .text:0x815EADEC; // type:function size:0x18
|
||||
pfd_sddrv_registar_callback = .text:0x815EAE04; // type:function size:0x10
|
||||
pfd_sddrv_is_media_insert = .text:0x815EAE14; // type:function size:0x98
|
||||
|
||||
@@ -812,8 +812,8 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("memoryCard", [
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
@@ -987,7 +987,7 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi8alts.c"),
|
||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||
Object(NonMatching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(NonMatching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
@@ -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"),
|
||||
|
||||
@@ -187,7 +187,19 @@ namespace textinput {
|
||||
void SetFocusedText(s32 pane) { mnFocusedIdx = pane; }
|
||||
s32 GetFocusedText() { return mnFocusedIdx; }
|
||||
f32 GetWidthScale_() const { return 608.0f / mfScreenWidth; }
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
f32 GetMargin_() const {
|
||||
f32 margin;
|
||||
if (mfScreenWidth > 700.0f) {
|
||||
margin = 10.0f;
|
||||
} else {
|
||||
margin = 20.0f;
|
||||
}
|
||||
return margin;
|
||||
}
|
||||
#else
|
||||
f32 GetMargin_() const { return mfScreenWidth > 700.0f ? 10.0f : 20.0f; }
|
||||
#endif
|
||||
s32 GetNextPageIdx_(s32 page) const;
|
||||
s32 GetPrevPageIdx_(s32 page) const;
|
||||
s32 GetDispNum() const;
|
||||
|
||||
@@ -20,7 +20,11 @@ namespace gui {
|
||||
class Manager;
|
||||
class EventHandler;
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) Interface {
|
||||
#else
|
||||
class Interface {
|
||||
#endif
|
||||
public:
|
||||
virtual void create() {} // 0x08 (0x02)
|
||||
|
||||
@@ -30,14 +34,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class GCWindow : public MemoryBase, public MemCardEventHandler {
|
||||
class GCWindow : public MemoryBase, public MemCardEventListener {
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
friend class MemoryCard;
|
||||
#endif
|
||||
@@ -48,6 +48,25 @@ private:
|
||||
void set_texture(const char*, const GXTexObj&);
|
||||
public:
|
||||
virtual void onMemEvent(long, u8);
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
virtual void on_wait_anim() = 0;
|
||||
virtual void on_exit() = 0;
|
||||
virtual void on_error() = 0;
|
||||
virtual void on_format() = 0;
|
||||
virtual void on_dialog_result() = 0;
|
||||
virtual void on_select_in() = 0;
|
||||
virtual void on_message_done() = 0;
|
||||
virtual void on_button_trig() = 0;
|
||||
#else
|
||||
virtual void on_wait_anim();
|
||||
virtual void on_exit();
|
||||
virtual void on_error();
|
||||
virtual void on_format();
|
||||
virtual void on_dialog_result();
|
||||
virtual void on_select_in();
|
||||
virtual void on_message_done();
|
||||
virtual void on_button_trig();
|
||||
#endif
|
||||
bool isProcess();
|
||||
void stop_wait_anim();
|
||||
|
||||
|
||||
@@ -12,13 +12,61 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class MemCardEventHandler {
|
||||
class __declspec(novtable) MemCardEventListener {
|
||||
public:
|
||||
MemCardEventListener() {}
|
||||
|
||||
virtual ~MemCardEventListener() {}
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
};
|
||||
|
||||
class MemCardEventHandler : public MemCardEventListener {
|
||||
public:
|
||||
MemCardEventHandler() {}
|
||||
|
||||
virtual ~MemCardEventHandler();
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
virtual void onSlotStatus(u8 slot) = 0;
|
||||
};
|
||||
|
||||
typedef struct MCFile {
|
||||
@@ -56,6 +104,44 @@ namespace ipl {
|
||||
}
|
||||
virtual ~MemoryCardManager();
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
|
||||
void calc();
|
||||
|
||||
bool isSlotReady(u8 slot);
|
||||
@@ -96,7 +182,7 @@ namespace ipl {
|
||||
u16 getFreeBlocks(u8 slot);
|
||||
#endif
|
||||
|
||||
void setEventHandler(MemCardEventHandler* eventHandler) {
|
||||
void setEventHandler(MemCardEventListener* eventHandler) {
|
||||
mpEventHandler = eventHandler;
|
||||
}
|
||||
|
||||
@@ -107,7 +193,7 @@ namespace ipl {
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 unk_0x16938; // 0x16938
|
||||
MemCardEventHandler* mpEventHandler; // 0x1693C
|
||||
MemCardEventListener* mpEventHandler; // 0x1693C
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace nw4r {
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
#endif
|
||||
|
||||
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -142,6 +142,9 @@ typedef struct ziFuzzyZYPairs {
|
||||
int rANDn : 1;
|
||||
int bANDp : 1;
|
||||
int gANDk : 1;
|
||||
int dANDt : 1;
|
||||
|
||||
int reserved : 20;
|
||||
} ziFuzzyZYPairs;
|
||||
|
||||
typedef struct _ziGetParam {
|
||||
|
||||
@@ -269,10 +269,10 @@ Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
|
||||
Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
{
|
||||
Zi8UInt length = 0;
|
||||
ziU16 initialIndex = (ziU16)(((key & 0xffff) >> 9) & 0x3f);
|
||||
ziU16 finalIndex = (ziU16)(((key & 0xffff) >> 3) & 0x3f);
|
||||
ziU16 tone = (ziU16)(key & 7);
|
||||
Zi8UInt length = 0;
|
||||
volatile ziU16 tone = (ziU16)(key & 7);
|
||||
|
||||
output[0] = zi8PYinitialSpelling[initialIndex][0];
|
||||
output[1] = zi8PYinitialSpelling[initialIndex][1];
|
||||
|
||||
@@ -1161,13 +1161,14 @@ checkKeyLayout:
|
||||
keyLayoutCursor = keyLayout;
|
||||
candidateCharacterCount = wordLength + prefixCount;
|
||||
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
if (*keyLayoutCursor >= candidateCharacterCount) {
|
||||
if (*keyLayoutCursor < candidateCharacterCount) {
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
} else {
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) {
|
||||
index = (unsigned int)keyLayoutCount;
|
||||
}
|
||||
break;
|
||||
}
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
}
|
||||
if ((int)index < (int)(unsigned int)keyLayoutCount) {
|
||||
for (elementIndex = 0; (int)elementIndex < (int)(unsigned int)candidateCharacterCount;
|
||||
@@ -1196,7 +1197,7 @@ emitCandidate:
|
||||
if (firstCandidate == 0) {
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
if ((int)(wordLength + prefixCount) < (int)((ZiAlphaOptions*)optionData)->shortestWord) {
|
||||
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
|
||||
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
|
||||
}
|
||||
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
@@ -1223,23 +1224,17 @@ emitCandidate:
|
||||
} else {
|
||||
if (((((ZiAlphaWork*)workData)->suffixMode == '\0') && (wordCursor[1] == 0)) &&
|
||||
(candidateCount == 0)) {
|
||||
if ((*wordCursor < 0xeff1) || (0xf010 < *wordCursor)) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
else {
|
||||
if (*wordCursor >= 0xeff1 && *wordCursor <= 0xf010) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
}
|
||||
}
|
||||
if (((dictionaryExact == 0) || (parameters->elementCount != ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
|| ((parameters->maxCandidates != 1 &&
|
||||
((candidateCount != 0 || (parameters->firstCandidate != 0)))))) {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (dictionaryExact != 0 &&
|
||||
parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount &&
|
||||
(parameters->maxCandidates == 1 ||
|
||||
(candidateCount == 0 && parameters->firstCandidate == 0))) {
|
||||
for (index = 0; (int)index < (int)prefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index]
|
||||
= wordCursor[index - prefixCount];
|
||||
@@ -1250,6 +1245,13 @@ emitCandidate:
|
||||
}
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index + prefixCount] = 0;
|
||||
}
|
||||
else {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
}
|
||||
}
|
||||
if ((((ZiAlphaWork*)workData)->suffixMode == '\0') &&
|
||||
((((((dictionaryKind == 1 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 1) != 0)) ||
|
||||
((dictionaryKind == 3 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 2) != 0)))) ||
|
||||
|
||||
@@ -643,7 +643,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
{
|
||||
int strokeIndex;
|
||||
int outputCount;
|
||||
int extraCount;
|
||||
volatile int extraCount;
|
||||
|
||||
outputCount = 0;
|
||||
Zi8LogError(100, work);
|
||||
@@ -660,8 +660,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
goto lowStroke;
|
||||
}
|
||||
badStroke:
|
||||
outputCount--;
|
||||
outputBuffer[(ziU8)outputCount] = 0;
|
||||
outputBuffer[(ziU8)--outputCount] = 0;
|
||||
return outputCount;
|
||||
lowStroke:
|
||||
outputBuffer[(ziU8)outputCount] = zi8StrokeCode(strokes[strokeIndex] & 0xf, work);
|
||||
|
||||
@@ -89,7 +89,12 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
while ((entry = (ziU8*)ZI_WORK->unk_0x310) != 0) {
|
||||
for (;;) {
|
||||
entry = (ziU8*)ZI_WORK->unk_0x310;
|
||||
if (entry == 0) {
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
||||
word = entry + 1;
|
||||
wordSize = *entry;
|
||||
@@ -158,8 +163,6 @@ next:
|
||||
fallback = 1;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
ziU32 result;
|
||||
@@ -167,11 +170,12 @@ ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* out
|
||||
for (;;) {
|
||||
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
||||
if ((ziU8)result != 0) break;
|
||||
if ((ZI_WORK->pudCount = ZI_WORK->pudCount + 1) > 16) {
|
||||
if (++ZI_WORK->pudCount <= 16) {
|
||||
continuation = 0;
|
||||
} else {
|
||||
ZI_WORK->pudCount = 1;
|
||||
break;
|
||||
}
|
||||
continuation = 0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
if (candidate->length == length) {
|
||||
position = 0;
|
||||
while (position < length) {
|
||||
if ((ziU8)candidate->text[position] != (ziU8)word->text[position]) break;
|
||||
if (candidate->text[position] != word->text[position]) break;
|
||||
position++;
|
||||
}
|
||||
if (position == length) {
|
||||
@@ -56,8 +56,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
previous = current;
|
||||
current = current->next;
|
||||
}
|
||||
length = ZI_WORK->uwdCount;
|
||||
ZI_WORK->uwdCount = length + 1;
|
||||
length = ZI_WORK->uwdCount++;
|
||||
added = &ZI_WORK->uwdNodes[length];
|
||||
if (previous == 0) {
|
||||
ZI_WORK->uwdList = added;
|
||||
@@ -91,8 +90,11 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziWChar folded;
|
||||
int fallback = 0;
|
||||
int visited = 0;
|
||||
int position, prefixLength, previousOffset;
|
||||
ziU32 size, entryLanguage, entryLength;
|
||||
int prefixLength;
|
||||
int position, previousOffset;
|
||||
ziU32 size;
|
||||
ziU8 entryLanguage;
|
||||
ziU32 entryLength;
|
||||
ziU8* cursor;
|
||||
ziU8* begin;
|
||||
ziU8* boundary;
|
||||
@@ -103,18 +105,33 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziUserDictionary* dictionary;
|
||||
int firstSegment;
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (!(ZI_WORK->unk_0x138 < 3 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
Zi8ReplaceLastError(0x19C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
||||
if (continuation == 0) {
|
||||
if (continuation != 0) {
|
||||
result = Zi8_814803F4(__zi8_work_data);
|
||||
entryLength = 0;
|
||||
if (result != 0) {
|
||||
entryLanguage = result->language;
|
||||
entryLength = result->length;
|
||||
if (entryLength >= capacity) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
|
||||
}
|
||||
return entryLength;
|
||||
}
|
||||
{
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
ZI_WORK->unk_0x13C = 0;
|
||||
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
prefixLength = 0;
|
||||
for (position = currentLength - 2; position >= 0 && currentWord[position] != 0x20; position--) prefixLength++;
|
||||
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
|
||||
position++;
|
||||
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
ZI_WORK->unk_0x140 = 1;
|
||||
@@ -123,7 +140,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ZI_WORK->unk_0x141[1] = language;
|
||||
ZI_WORK->unk_0x141[2] = prefixLength;
|
||||
previousOffset = 4;
|
||||
for (; ++position, prefixLength > 0; prefixLength--) {
|
||||
for (; prefixLength > 0; prefixLength--, position++) {
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
@@ -131,12 +148,10 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
}
|
||||
if (ZI_WORK->unk_0x141[previousOffset] == 0) {
|
||||
if (ZI_WORK->unk_0x141[previousOffset++] == 0) {
|
||||
ZI_WORK->unk_0x140 = 0;
|
||||
previousOffset++;
|
||||
break;
|
||||
}
|
||||
previousOffset++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -146,7 +161,8 @@ rescan:
|
||||
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
||||
end = (ziU8*)dictionary + dictionary->end + 7;
|
||||
cursor = begin;
|
||||
firstSegment = begin < boundary;
|
||||
if (begin < boundary) firstSegment = 1;
|
||||
else firstSegment = 0;
|
||||
while (firstSegment ? cursor < boundary : cursor < end) {
|
||||
size = *cursor;
|
||||
candidate = (ziUserWord*)cursor;
|
||||
@@ -185,7 +201,7 @@ next:
|
||||
visited = 0;
|
||||
goto rescan;
|
||||
}
|
||||
if (complete != 0 && length == 1) {
|
||||
if (complete == 1 && length != 0 && continuation == 0) {
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
visited = 0;
|
||||
|
||||
@@ -22,7 +22,8 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
node += offset;
|
||||
if (((ziU32)header & 2) != 0) {
|
||||
if ((*(ziU8*)node & 0x80) != 0) {
|
||||
offset = *((ziU8*)node + 2) + ((*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000);
|
||||
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
|
||||
offset += *((ziU8*)node + 2);
|
||||
} else {
|
||||
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
|
||||
offset += (ziU32)*((ziU8*)node + 1);
|
||||
@@ -43,7 +44,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
ziU16 header;
|
||||
ziU8* cursor;
|
||||
ziU8* cursor = node;
|
||||
ziS32 depth;
|
||||
ziS32 offset;
|
||||
|
||||
@@ -53,29 +54,29 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 4) == 0) {
|
||||
node = 0;
|
||||
} else {
|
||||
cursor = node;
|
||||
if ((header & 8) != 0) {
|
||||
if ((node[0] & 0xf) == 0xf) {
|
||||
cursor = node + 2;
|
||||
node += 2;
|
||||
} else {
|
||||
cursor = node + 1;
|
||||
node += 1;
|
||||
}
|
||||
|
||||
if ((header & 2) != 0) {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
if ((*node & 0x80) == 0) {
|
||||
node += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
node += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
node += (ziU32)cursor[1] + (ziU32)*cursor * 0x100;
|
||||
if ((*node & 0x80) != 0) {
|
||||
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
|
||||
(ziU32)node[2] + 0x8000;
|
||||
} else {
|
||||
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
|
||||
0x8000 + (ziU32)cursor[2];
|
||||
node += (ziU16)*node * 0x100 + (ziU32)node[1];
|
||||
}
|
||||
} else {
|
||||
cursor = node;
|
||||
do {
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
@@ -89,24 +90,24 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 1) != 0) {
|
||||
if ((header & 2) == 0) {
|
||||
depth++;
|
||||
} else if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
} else if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
|
||||
if ((header & 4) == 0) {
|
||||
depth--;
|
||||
} else if ((header & 8) != 0) {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
depth--;
|
||||
}
|
||||
@@ -163,16 +164,10 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||
result = 0;
|
||||
pair = (((ziU16)entry[0] << 8) + entry[1]);
|
||||
if (pair != 0) {
|
||||
goto graph_invalid;
|
||||
return 0;
|
||||
}
|
||||
pair = (((ziU16)entry[2] << 8) + entry[3]);
|
||||
if (pair == 0) {
|
||||
goto graph_valid;
|
||||
}
|
||||
graph_invalid:
|
||||
result = 0;
|
||||
goto graph_done;
|
||||
graph_valid:
|
||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||
entry += 10;
|
||||
depth = 0;
|
||||
@@ -182,19 +177,18 @@ graph_valid:
|
||||
}
|
||||
|
||||
while (1) {
|
||||
if (*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
break;
|
||||
}
|
||||
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
|
||||
if ((end <= (ziU32)entry) ||
|
||||
(*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
if (((ziU32)entry >= end) ||
|
||||
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (end <= (ziU32)entry) {
|
||||
result = 0;
|
||||
break;
|
||||
if ((ziU32)entry >= end) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
|
||||
@@ -215,8 +209,7 @@ graph_valid:
|
||||
depth++;
|
||||
keys++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
graph_done:
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ typedef struct ziUserKeys {
|
||||
typedef struct ziChineseEntry {
|
||||
ziU8 data[9];
|
||||
ziU8 offsetHigh;
|
||||
ziU16 offsetLow;
|
||||
ziU8 offsetLow[2];
|
||||
} ziChineseEntry;
|
||||
|
||||
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
||||
@@ -26,19 +26,22 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziU8 remaining, group;
|
||||
ziU16 value = 0;
|
||||
int count;
|
||||
int offset;
|
||||
ziU8 group;
|
||||
ziU8 remaining;
|
||||
ziU16 value;
|
||||
ziWChar* cursor;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziSearchState search;
|
||||
ziGetParam request;
|
||||
ziWChar ordinals[65];
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
int length, count, offset;
|
||||
int length;
|
||||
int unmatched;
|
||||
ziChineseEntry* entry;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
search.flags = 0;
|
||||
search.word = 0;
|
||||
search.length = 0;
|
||||
@@ -52,7 +55,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
if (language != 1) {
|
||||
for (length = 0; word[length] != 0; length++) {
|
||||
if (word[length] > 0xEFF0 || length == 64) return 0;
|
||||
if (word[length] >= 0xEFF1 || length == 64) return 0;
|
||||
}
|
||||
((ziU8*)&search.length)[0] = length;
|
||||
((ziU8*)&search.flags)[2] = 1;
|
||||
@@ -91,21 +94,34 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
if (language == 1) {
|
||||
length = 0;
|
||||
do {
|
||||
if (word[length] == 0) {
|
||||
count = length - 1;
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
if (length == 64) return 0;
|
||||
} while (word[length] != 0);
|
||||
{
|
||||
if (length == 1) return 1;
|
||||
count = --length;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | entry->offsetLow);
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
group = *data & 7;
|
||||
if (group == 5) offset = 4;
|
||||
else if (group < 5) {
|
||||
if (group == 2) offset = 2;
|
||||
else if (group < 2) offset = 1;
|
||||
else offset = 3;
|
||||
} else offset = 1;
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
offset = 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
offset = 3;
|
||||
break;
|
||||
case 5:
|
||||
offset = 4;
|
||||
break;
|
||||
default:
|
||||
offset = 1;
|
||||
break;
|
||||
}
|
||||
data += offset;
|
||||
}
|
||||
if ((*data & 0x80) == 0) return 0;
|
||||
@@ -134,11 +150,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
Zi8LogError(0x2BD, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
} while (length != 64);
|
||||
}
|
||||
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
@@ -156,10 +168,9 @@ ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
found:
|
||||
if (key < 32) {
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
}
|
||||
if (key >= 32) return 0;
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -44,13 +44,12 @@ static ziU8 ziNumKeysWithChars(ziU8 language, ziPtr __zi8_work_data) {
|
||||
}
|
||||
|
||||
ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data) {
|
||||
ziU8 numKeys;
|
||||
ziU16 tableCount;
|
||||
ziU8 numKeys;
|
||||
ziU8* dataAddress;
|
||||
ziUserKeyMap* customTable;
|
||||
ziU32 totalCharacters;
|
||||
ziU16 charCount;
|
||||
ziU32 keyIndex;
|
||||
ziU16 keyIndex;
|
||||
ziWChar* keyChars;
|
||||
|
||||
dataAddress = 0;
|
||||
@@ -93,15 +92,15 @@ tables_ready:
|
||||
return 0;
|
||||
}
|
||||
|
||||
totalCharacters = 0;
|
||||
keyIndex = totalCharacters;
|
||||
tableCount = 0;
|
||||
keyIndex = tableCount;
|
||||
for (; (ziU16)keyIndex < key; keyIndex++) {
|
||||
totalCharacters += dataAddress[(ziU16)keyIndex];
|
||||
tableCount += dataAddress[(ziU16)keyIndex];
|
||||
}
|
||||
if ((charCount = (ziU8)dataAddress[key]) == 0) {
|
||||
return 0;
|
||||
}
|
||||
dataAddress = dataAddress + numKeys + ((totalCharacters & 0xffff) * 2);
|
||||
dataAddress = dataAddress + numKeys + (tableCount * 2);
|
||||
keyIndex = 0;
|
||||
for (; (ziU16)keyIndex < charCount; keyIndex++) {
|
||||
chars[(ziU16)keyIndex] = (ziU16)dataAddress[(ziU16)keyIndex * 2] |
|
||||
|
||||
@@ -23,48 +23,60 @@ ziU8 Zi8DetachOEMdata(ziU8 id ZI_NEED_WORK) {
|
||||
}
|
||||
ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word, ziU16 capacity, ziBool complete, ziBool continuation ZI_NEED_WORK) {
|
||||
ziWChar folded;
|
||||
ziU8 fallback = 0;
|
||||
ziU32 index;
|
||||
ziS32 index;
|
||||
ziU32 position;
|
||||
ziU32 fallback = 0;
|
||||
if (!continuation) ZI_WORK->oemIdx = 0;
|
||||
index = ZI_WORK->oemIdx;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || ZI_WORK->oemMatch == 0) goto noMatch;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||
capacity--;
|
||||
if (length >= capacity) goto noMatch;
|
||||
word[capacity] = 0;
|
||||
word[length] = complete ? 1 : 0;
|
||||
for (;;) {
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || !ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) {
|
||||
if (length != 1 || !complete || continuation) goto noMatch;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
continue;
|
||||
}
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF37F) {
|
||||
if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
} else if (pattern[position] != Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) break;
|
||||
}
|
||||
}
|
||||
if ((ziS32)position >= length) {
|
||||
if (fallback) {
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
ZI_WORK->oemIdx = index + 1;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
}
|
||||
word[length] = complete ? 1 : 0;
|
||||
index++;
|
||||
if ((ziS32)length >= (ziS32)capacity) {
|
||||
failed:
|
||||
return 0;
|
||||
}
|
||||
noMatch:
|
||||
word[capacity] = 0;
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
goto matchRetry;
|
||||
posEntry:
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF37F) {
|
||||
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
|
||||
break;
|
||||
} else if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((ziS32)position < length) {
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
index++;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
goto matchRetry;
|
||||
}
|
||||
if (fallback) {
|
||||
index = 0;
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
index++;
|
||||
ZI_WORK->oemIdx = index;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
matchRetry:
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
if (!ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) goto oemFailed;
|
||||
goto posEntry;
|
||||
oemFailed:
|
||||
if (length != 1 || !complete || continuation) goto tail0;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
goto matchRetry;
|
||||
tail0:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -554,7 +554,7 @@ s32 pfd_sddrv_get_disk_info(FADisk* disk, FADiskInfo* disk_info) {
|
||||
disk_info->heads = 0;
|
||||
disk_info->sectorsPerTrack = 0;
|
||||
disk_info->formatParam = 0;
|
||||
return result;
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_init_drv_tbl(FADiskTbl* disk_table, u32 extended) {
|
||||
|
||||
@@ -851,15 +851,15 @@ USBKBDErr KBDSetModState(u32 channel, u32 value) {
|
||||
}
|
||||
|
||||
u16 KBDTranslateHidCode(u32 keyCode, u32 modifiers, s32 country) {
|
||||
KBDKeyMap* map;
|
||||
u16* table;
|
||||
u32 keyIndex;
|
||||
u16 entry;
|
||||
s32 mask;
|
||||
u16* table;
|
||||
u16 activeFlag;
|
||||
u16 entry;
|
||||
KBDKeyMap* map;
|
||||
s32 offset;
|
||||
s32 group;
|
||||
u32 shiftFlag;
|
||||
u16 activeFlag;
|
||||
u32 keyIndex;
|
||||
|
||||
if (kbdInitialized == FALSE) {
|
||||
return 0xFFFF;
|
||||
@@ -920,9 +920,9 @@ u16 KBDTranslateHidCode(u32 keyCode, u32 modifiers, s32 country) {
|
||||
shiftFlag <<= offset;
|
||||
activeFlag = shiftFlag;
|
||||
|
||||
if (mask == 0 && (activeFlag & entry) != 0) {
|
||||
if (mask == 0 && (entry & activeFlag) != 0) {
|
||||
offset = offset ^ ((modifiers >> 9) & 1);
|
||||
} else if (mask == 0x8000 && (activeFlag & entry) != 0) {
|
||||
} else if (mask == 0x8000 && (entry & activeFlag) != 0) {
|
||||
u32 numLockShift = 0;
|
||||
if ((s32)(modifiers & 0x100) == 0x100 && offset == 0) {
|
||||
numLockShift = 1;
|
||||
|
||||
@@ -1607,8 +1607,8 @@ static void KPADiSamplingCallback(s32 chan) {
|
||||
u32 device;
|
||||
if (WPADProbe(chan, &device) != -1) {
|
||||
u8 index = kpad->ringIndex;
|
||||
KPADSample* status;
|
||||
u32 tier;
|
||||
KPADSample* status;
|
||||
u32 enabled;
|
||||
u32 tableIndex;
|
||||
if (index >= 16) {
|
||||
|
||||
@@ -367,7 +367,8 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
|
||||
} else {
|
||||
snprintf(endpoint, endpointSize, "https://%s/nus/services/NetUpdateSOAP", serverAddress);
|
||||
requestSize = strlen(messageId) + strlen(productArea);
|
||||
requestSize += strlen(countryCode) + 0x449;
|
||||
unsigned long countryLength = strlen(countryCode);
|
||||
requestSize += countryLength + 0x449;
|
||||
if (auditData != 0) {
|
||||
requestSize += strlen(auditData);
|
||||
}
|
||||
@@ -1174,7 +1175,7 @@ static inline s32 __nupGetBoot2Version(u16* version) {
|
||||
if (result == 0) {
|
||||
u16 checkedVersion = bootVersion;
|
||||
*version = checkedVersion;
|
||||
result = checkedVersion == bootVersion ? result : -0x1389;
|
||||
if (checkedVersion != bootVersion) { result = -0x1389; }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -1224,9 +1225,9 @@ static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
|
||||
extern "C" void* __nupOp(void* argument) {
|
||||
u8* response = 0;
|
||||
ESTmdView* tmdView = 0;
|
||||
char* auditData = 0;
|
||||
u32 needsAudit;
|
||||
u32 currentDeviceId;
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
s32 result;
|
||||
u16 serverBootVersion = 0;
|
||||
u16 bootTitleVersion;
|
||||
|
||||
@@ -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) {
|
||||
@@ -543,12 +547,12 @@ NWC24Err NWC24DumpDlTask(NWC24DlTask* dlTask) {
|
||||
}
|
||||
|
||||
NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
|
||||
NWC24Err result;
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Work* work;
|
||||
u16 taskId;
|
||||
u16 maxTaskCount;
|
||||
DlTaskListHeader* header;
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Err result;
|
||||
|
||||
if (NWC24WorkP != NULL) {
|
||||
header = (DlTaskListHeader*)NWC24WorkP->dlHead;
|
||||
@@ -580,7 +584,7 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
|
||||
}
|
||||
|
||||
entriesHeader = (DlTaskListHeader*)work->dlHead;
|
||||
do {
|
||||
while (taskId < (work == NULL ? (DlTaskListHeader*)NULL : entriesHeader)->maxTaskCount) {
|
||||
header = work != NULL ? entriesHeader : NULL;
|
||||
if (taskId >= header->maxTaskCount || taskId == 0xffff) {
|
||||
result = NWC24_ERR_INVALID_VALUE;
|
||||
@@ -594,20 +598,20 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
taskId++;
|
||||
} while (taskId < (work != NULL ? entriesHeader : (DlTaskListHeader*)NULL)->maxTaskCount);
|
||||
}
|
||||
return NWC24_ERR_DONE;
|
||||
}
|
||||
|
||||
NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIterateId) {
|
||||
DlTaskIterationState* state = (DlTaskIterationState*)dlIterateWork;
|
||||
s32 (*getValue)(NWC24DlId);
|
||||
NWC24DlId taskId;
|
||||
s32 value;
|
||||
BOOL descending;
|
||||
BOOL passesSelected;
|
||||
BOOL bestCandidate;
|
||||
NWC24Err result;
|
||||
BOOL found = FALSE;
|
||||
s32 (*getValue)(NWC24DlId);
|
||||
NWC24Err result;
|
||||
|
||||
if (state->valid == 0) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
@@ -635,8 +639,8 @@ NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIt
|
||||
if (value == state->comparisonValue && (s32)state->comparisonId < (s32)taskId) {
|
||||
*dlIterateId = taskId;
|
||||
state->comparisonValue = value;
|
||||
state->selectedValue = value;
|
||||
state->comparisonId = taskId;
|
||||
state->selectedValue = value;
|
||||
return NWC24_OK;
|
||||
}
|
||||
result = NWC24IterateDlTask(&taskId, FALSE);
|
||||
@@ -714,6 +718,16 @@ static inline NWC24Err CheckDlTaskRetry(NWC24DlTask* dlTask, u8 retryCount) {
|
||||
if ((retryMask & (1 << retryCount)) == 0) { return NWC24_ERR_DISABLED; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
static inline NWC24Err UpdateDlTaskAccessTime(NWC24DlTask* dlTask) {
|
||||
OSTime universalTime;
|
||||
NWC24Err result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result >= NWC24_OK) {
|
||||
result = SetDlTaskAccessTime(dlTask, universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header;
|
||||
@@ -725,11 +739,7 @@ NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result >= NWC24_OK) {
|
||||
result = SetDlTaskAccessTime(dlTask, universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
}
|
||||
result = UpdateDlTaskAccessTime(dlTask);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result == NWC24_OK) {
|
||||
@@ -778,23 +788,26 @@ 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;
|
||||
}
|
||||
|
||||
|
||||
NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
|
||||
DlTaskListHeader* header;
|
||||
NWC24File file;
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
NWC24Err operationResult;
|
||||
|
||||
@@ -847,7 +860,7 @@ NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
|
||||
if (operationResult < NWC24_OK) {
|
||||
result = operationResult;
|
||||
} else {
|
||||
operationResult = NWC24FRead(dlTask, 0x200, &file);
|
||||
operationResult = NWC24FRead(task, 0x200, &file);
|
||||
result = NWC24_OK;
|
||||
if (operationResult < NWC24_OK) {
|
||||
result = operationResult;
|
||||
@@ -879,17 +892,13 @@ NWC24Err NWC24PurgeOldestDlTask() {
|
||||
state.initialized = 1;
|
||||
state.valid = 1;
|
||||
|
||||
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
|
||||
while (result == NWC24_OK) {
|
||||
while ((result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId)) == NWC24_OK) {
|
||||
header = GetCachedDlHeader();
|
||||
if (taskId >= header->taskCount) { break; }
|
||||
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
|
||||
}
|
||||
|
||||
if (result == NWC24_ERR_DONE) {
|
||||
return NWC24_ERR_FAILED;
|
||||
}
|
||||
if (result < NWC24_OK) {
|
||||
if (result == NWC24_ERR_DONE) { result = NWC24_ERR_FAILED; }
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1014,9 +1023,7 @@ NWC24Err NWC24ExtendDlTaskList(u32 num) {
|
||||
result = WriteDlHeader(&file);
|
||||
closeList:
|
||||
closeResult = NWC24FClose(&file);
|
||||
if (result != NWC24_OK) {
|
||||
closeResult = result;
|
||||
}
|
||||
closeResult = result != NWC24_OK ? result : closeResult;
|
||||
result = NWC24iLoadDlHeader();
|
||||
if (closeResult != NWC24_OK) {
|
||||
result = closeResult;
|
||||
@@ -1215,13 +1222,16 @@ static inline NWC24Err ValidateDlTaskUrl(NWC24DlTask* dlTask) {
|
||||
DlTaskListHeader* header = GetCachedDlHeader();
|
||||
NWC24Err result;
|
||||
if (task->id >= header->maxTaskCount && task->id != 0xffff) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = NWC24iCheckStringLength(task->url, 7, 0x100);
|
||||
if (result >= NWC24_OK) {
|
||||
if (strncmp(task->url, "http://", 7) != 0 && strncmp(task->url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
|
||||
else { result = NWC24_OK; }
|
||||
{
|
||||
const char* url = task->url;
|
||||
result = NWC24iCheckStringLength(url, 7, 0x100);
|
||||
if (result >= NWC24_OK) {
|
||||
if (strncmp(url, "http://", 7) != 0 && strncmp(url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
|
||||
else { result = NWC24_OK; }
|
||||
}
|
||||
if (result < NWC24_OK) { return result; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
if (result < NWC24_OK) { return result; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err FindFreeDlTask(NWC24DlTask* dlTask, u16 taskCount, u16 maxTaskCount) {
|
||||
@@ -1251,11 +1261,7 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result >= NWC24_OK) {
|
||||
result = SetDlTaskAccessTime(dlTask, universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
}
|
||||
result = UpdateDlTaskAccessTime(dlTask);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result == NWC24_OK) {
|
||||
@@ -1263,9 +1269,7 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
|
||||
task->unknown_0x1a = 0;
|
||||
}
|
||||
if (task->retryEnabled == 1) {
|
||||
for (;;) {
|
||||
result = CheckDlTaskRetry(dlTask, task->retryCount);
|
||||
if (result != NWC24_ERR_DISABLED) { break; }
|
||||
while ((result = CheckDlTaskRetry(dlTask, task->retryCount)) == NWC24_ERR_DISABLED) {
|
||||
task->retryCount = (task->retryCount + 1) & 0x1f;
|
||||
}
|
||||
if (result < NWC24_OK) { 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,20 +343,14 @@ 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 chunkIdx;
|
||||
union {
|
||||
u32 off;
|
||||
ChunkEntry* entry;
|
||||
} u;
|
||||
ChunkEntry* chunk;
|
||||
u32 memSize;
|
||||
|
||||
if (object == vmNull || object->hasData != vmFalse || length == 0) {
|
||||
goto error;
|
||||
}
|
||||
u32 chunkIdx;
|
||||
|
||||
idx = pVm->nextChunkIdx;
|
||||
chunk = pVm->pChunks[idx / 1024];
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -2858,7 +2889,6 @@ VmCtorDefine(String) {
|
||||
|
||||
VmMethodDefine(String, FromCharCode) {
|
||||
CHANSVmObjHdr* arg;
|
||||
u32 offs;
|
||||
u32 argc;
|
||||
u32 ch;
|
||||
u32 i;
|
||||
@@ -2867,14 +2897,12 @@ VmMethodDefine(String, FromCharCode) {
|
||||
argc = ((CHANSVmPrivate*)VmInst)->pActiveCtx->argc;
|
||||
if (CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, argc * 2)) {
|
||||
i = 0;
|
||||
offs = 0;
|
||||
while (i < argc) {
|
||||
arg = CHANSVmGetArg(VmInst, i);
|
||||
arg = CHANSVmConvertObjectType(VmInst, CHANS_VM_OBJ_TYPE_INTEGER, arg);
|
||||
ch = arg != vmNull ? (u32)(arg->value.int_v & 0xFFFF) : 0;
|
||||
VmReturnObj->value.string_v->spData[offs] = (u8)(ch >> 8);
|
||||
VmReturnObj->value.string_v->spData[offs + 1] = (u8)ch;
|
||||
offs += 2;
|
||||
VmReturnObj->value.string_v->spData[i * 2] = (u8)(ch >> 8);
|
||||
VmReturnObj->value.string_v->spData[i * 2 + 1] = (u8)ch;
|
||||
i++;
|
||||
}
|
||||
return 1;
|
||||
@@ -3623,9 +3651,9 @@ CHANSVmObjHdr* CHANSVm_8145049C(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
goto loop_hint;
|
||||
}
|
||||
isEscaped = (u32)pad0;
|
||||
litLen = 0;
|
||||
*(u16*)pad0 = cv->value.int_v;
|
||||
*(u16*)(pad0 + 2) = 0;
|
||||
litLen = 0;
|
||||
goto common_string_format;
|
||||
}
|
||||
|
||||
@@ -3643,8 +3671,8 @@ CHANSVmObjHdr* CHANSVm_8145049C(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
if (nObj == vmNull) {
|
||||
goto null_return;
|
||||
}
|
||||
memcpy(nObj->value.string_v->spData, tempObj->value.string_v->spData, objLen);
|
||||
isEscaped = (u32)nObj->value.string_v->spData;
|
||||
memcpy((void*)isEscaped, tempObj->value.string_v->spData, objLen);
|
||||
litLen = (u32)nObj;
|
||||
}
|
||||
}
|
||||
@@ -4887,10 +4915,10 @@ param_processing:
|
||||
hasParam = 0;
|
||||
|
||||
for (paramValue = 0; curPos < fmtLen; curPos++) {
|
||||
curChar = fmtStr[curPos];
|
||||
u32 digit = fmtStr[curPos];
|
||||
|
||||
if (!hasParam) {
|
||||
if (curChar == '*') {
|
||||
if (digit == '*') {
|
||||
if (hasStar & 1) {
|
||||
paramValue = -1;
|
||||
curPos++;
|
||||
@@ -4904,9 +4932,10 @@ param_processing:
|
||||
}
|
||||
}
|
||||
|
||||
if (curChar >= 0x30 && curChar <= 0x39) {
|
||||
if (digit >= 0x30 && digit <= 0x39) {
|
||||
hasParam = 1;
|
||||
paramValue = paramValue * 10 + curChar - 0x30;
|
||||
paramValue *= 10;
|
||||
paramValue += (u32)(digit - 0x30);
|
||||
if (paramValue < 0) {
|
||||
elemSize = 1;
|
||||
elemType = 0;
|
||||
@@ -5196,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:
|
||||
@@ -5211,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;
|
||||
@@ -5757,7 +5786,6 @@ VmMethodDefine(Blob, Unpack) {
|
||||
case 11:
|
||||
case 12:
|
||||
case 13: {
|
||||
CHANSVmObjHdr* arrElem;
|
||||
u8* srcPtr;
|
||||
count = outVal;
|
||||
if ((s32)count < 0) {
|
||||
@@ -5806,7 +5834,6 @@ VmMethodDefine(Blob, Unpack) {
|
||||
continue;
|
||||
}
|
||||
case 14: {
|
||||
CHANSVmObjHdr* arrElem;
|
||||
u8* srcData;
|
||||
s32 bufSize;
|
||||
count = outVal;
|
||||
@@ -6363,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;
|
||||
@@ -6388,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++) {
|
||||
@@ -6397,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;
|
||||
@@ -6952,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;
|
||||
@@ -7006,33 +7034,31 @@ static CHANSVmErr VmCallMethod(CHANSVm* vm, u32 instructionSize, u32 callType, u
|
||||
if (callType == CHANS_VM_CALL_TYPE_FUNCTION) {
|
||||
return CHANS_VM_ERR_NO_SUCH_FUNCTION;
|
||||
}
|
||||
retVal = CHANS_VM_ERR_NO_SUCH_PROPERTY;
|
||||
if (callType == CHANS_VM_CALL_TYPE_METHOD) {
|
||||
retVal = CHANS_VM_ERR_NO_SUCH_METHOD;
|
||||
}
|
||||
goto return_label;
|
||||
return callType == CHANS_VM_CALL_TYPE_METHOD ? CHANS_VM_ERR_NO_SUCH_METHOD : CHANS_VM_ERR_NO_SUCH_PROPERTY;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
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);
|
||||
@@ -7047,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;
|
||||
@@ -7087,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;
|
||||
}
|
||||
@@ -7103,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) {
|
||||
@@ -7127,11 +7154,7 @@ static CHANSVmErr VmCallMethod(CHANSVm* vm, u32 instructionSize, u32 callType, u
|
||||
}
|
||||
}
|
||||
|
||||
if (target != vmNull) {
|
||||
pushEnd = pushDepth;
|
||||
}
|
||||
|
||||
retVal = VmPushFuncReturnInfo(vm, pushDepth, pushEnd, headerCount);
|
||||
retVal = VmPushFuncReturnInfo(vm, pushDepth, target != vmNull ? pushDepth : pushEnd, headerCount);
|
||||
if (retVal == CHANS_VM_OK) {
|
||||
if (target != vmNull) {
|
||||
if (funcPtr != vmNull && funcPtr(vm, acc, &localBuf) == CHANS_VM_OK) {
|
||||
@@ -7182,16 +7205,20 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
CHANSVmPrivate* pVm;
|
||||
s32 cmpHigh;
|
||||
u32 cmpLow;
|
||||
CHANSVmObjHdr tmpObj;
|
||||
CHANSVmObjHdr tmpCopyObj[2];
|
||||
CHANSVmObjType etypes[2];
|
||||
struct {
|
||||
CHANSVmObjType operandTypes[2];
|
||||
u64 floatBits;
|
||||
CHANSVmObjHdr copies[2];
|
||||
CHANSVmObjHdr load;
|
||||
CHANSVmObjHdr operand;
|
||||
} scratch;
|
||||
const VmResultTypeData* resultTypes = &VmResultTypeTbl;
|
||||
|
||||
pVm = (CHANSVmPrivate*)vm;
|
||||
|
||||
stepCount += (stepCount == 0);
|
||||
memset(&tmpObj, 0, sizeof(tmpObj));
|
||||
stackPtr = tmpCopyObj;
|
||||
memset(&scratch.operand, 0, sizeof(scratch.operand));
|
||||
stackPtr = scratch.copies;
|
||||
cmpHigh = 0;
|
||||
cmpLow = -2;
|
||||
|
||||
@@ -7262,11 +7289,10 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
break;
|
||||
|
||||
case CHANS_VM_OP_LOAD_FLOAT: {
|
||||
u64 floatRaw;
|
||||
opSize = 9;
|
||||
operandBuf = VmGetOperand(vm, 1, 9);
|
||||
memcpy(&floatRaw, operandBuf, 8);
|
||||
result = CHANSVmSetFloat(vm, &pVm->accumulator, *(double*)&floatRaw);
|
||||
memcpy(&scratch.floatBits, operandBuf, 8);
|
||||
result = CHANSVmSetFloat(vm, &pVm->accumulator, *(double*)&scratch.floatBits);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -7342,10 +7368,10 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
|
||||
binary_imm:
|
||||
leftOp = &pVm->accumulator;
|
||||
rightOp = &tmpObj;
|
||||
rightOp = &scratch.operand;
|
||||
opSize = 2;
|
||||
operandBuf = VmGetOperand(vm, 1, 2);
|
||||
result = VmLoadImmInteger(vm, &tmpObj, operandBuf, 1);
|
||||
result = VmLoadImmInteger(vm, &scratch.operand, operandBuf, 1);
|
||||
binary_typecheck:
|
||||
if (result != CHANS_VM_OK) {
|
||||
break;
|
||||
@@ -7354,7 +7380,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
rightTypeByte = rightOp->type;
|
||||
typeIdx = 0;
|
||||
leftTypeByte = leftOp->type;
|
||||
enumedType = etypes;
|
||||
enumedType = scratch.operandTypes;
|
||||
for (; typeIdx < 2; typeIdx++, enumedType++) {
|
||||
if (CHANSVmGetEnumedType(enumedType, (s32)(typeIdx == 0 ? leftTypeByte : rightTypeByte)) ==
|
||||
0) {
|
||||
@@ -7397,7 +7423,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
}
|
||||
|
||||
result = CHANS_VM_OK;
|
||||
convTypeIdx = convTbl[etypes[0] * 6 + etypes[1]];
|
||||
convTypeIdx = convTbl[scratch.operandTypes[0] * 6 + scratch.operandTypes[1]];
|
||||
goto result_check;
|
||||
}
|
||||
|
||||
@@ -7422,13 +7448,13 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
result = opFunc(vm, convTypeIdx, &pVm->accumulator, leftOp, rightOp);
|
||||
|
||||
if (result == CHANS_VM_OK) {
|
||||
result = CHANSVmDeleteObject(vm, &tmpObj);
|
||||
if (result == CHANS_VM_OK && leftOp != &pVm->accumulator && leftOp != &tmpObj && (leftOp->flags.raw & CHANSVM_OBJ_FLAG_READONLY) == 0 &&
|
||||
result = CHANSVmDeleteObject(vm, &scratch.operand);
|
||||
if (result == CHANS_VM_OK && leftOp != &pVm->accumulator && leftOp != &scratch.operand && (leftOp->flags.raw & CHANSVM_OBJ_FLAG_READONLY) == 0 &&
|
||||
(result = CHANSVmDeleteObject(vm, leftOp), result == CHANS_VM_OK)) {
|
||||
// TODO: find the correct sizeof(...) expression
|
||||
CHANSVmFree(vm, leftOp, 0x20);
|
||||
}
|
||||
if (result == CHANS_VM_OK && rightOp != &pVm->accumulator && rightOp != &tmpObj && (rightOp->flags.raw & CHANSVM_OBJ_FLAG_READONLY) == 0 &&
|
||||
if (result == CHANS_VM_OK && rightOp != &pVm->accumulator && rightOp != &scratch.operand && (rightOp->flags.raw & CHANSVM_OBJ_FLAG_READONLY) == 0 &&
|
||||
(result = CHANSVmDeleteObject(vm, rightOp), result == CHANS_VM_OK)) {
|
||||
// TODO: find the correct sizeof(...) expression
|
||||
CHANSVmFree(vm, rightOp, 0x20);
|
||||
@@ -7544,9 +7570,9 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
}
|
||||
|
||||
binary_pop:
|
||||
leftOp = &tmpObj;
|
||||
leftOp = &scratch.operand;
|
||||
rightOp = &pVm->accumulator;
|
||||
result = CHANSVmPopObject(vm, &tmpObj);
|
||||
result = CHANSVmPopObject(vm, &scratch.operand);
|
||||
if (result != CHANS_VM_OK) {
|
||||
break;
|
||||
}
|
||||
@@ -7610,15 +7636,14 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
|
||||
case CHANS_VM_OP_LOAD_INDIRECT: {
|
||||
CHANSVmObjHdr* pAcc = &pVm->accumulator;
|
||||
CHANSVmObjHdr loadTmp;
|
||||
result = CHANS_VM_ERR_LOAD_INDIRECT;
|
||||
if (pAcc->type == CHANS_VM_TYPE_INDEX_REF) {
|
||||
copyResult = CHANSVmCopyObject(vm, &loadTmp, pAcc);
|
||||
copyResult = CHANSVmCopyObject(vm, &scratch.load, pAcc);
|
||||
if (copyResult != vmNull) {
|
||||
foundObj = VmGetArrayElement(vm, &loadTmp, loadTmp.value.data.len, vmFalse);
|
||||
foundObj = VmGetArrayElement(vm, &scratch.load, scratch.load.value.data.len, vmFalse);
|
||||
result = VmStore(vm, pAcc, foundObj);
|
||||
if (result == CHANS_VM_OK) {
|
||||
result = CHANSVmDeleteObject(vm, &loadTmp);
|
||||
result = CHANSVmDeleteObject(vm, &scratch.load);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7636,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;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
#include "keyboard/tiCandidateBox.h"
|
||||
|
||||
#include "keyboard/tiManager.h"
|
||||
@@ -1280,157 +1281,32 @@ namespace textinput {
|
||||
GXSetScissor(left, top, wd, ht);
|
||||
}
|
||||
|
||||
extern "C" asm void GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl() {
|
||||
nofralloc
|
||||
stwu r1, -0xc0(r1)
|
||||
mflr r0
|
||||
stw r0, 0xc4(r1)
|
||||
stfd f31, 0xb0(r1)
|
||||
psq_st f31, 0xb8(r1), 0, 0
|
||||
stfd f30, 0xa0(r1)
|
||||
psq_st f30, 0xa8(r1), 0, 0
|
||||
stfd f29, 0x90(r1)
|
||||
psq_st f29, 0x98(r1), 0, 0
|
||||
stfd f28, 0x80(r1)
|
||||
psq_st f28, 0x88(r1), 0, 0
|
||||
stfd f27, 0x70(r1)
|
||||
psq_st f27, 0x78(r1), 0, 0
|
||||
stfd f26, 0x60(r1)
|
||||
psq_st f26, 0x68(r1), 0, 0
|
||||
stfd f25, 0x50(r1)
|
||||
psq_st f25, 0x58(r1), 0, 0
|
||||
stfd f24, 0x40(r1)
|
||||
psq_st f24, 0x48(r1), 0, 0
|
||||
stfd f23, 0x30(r1)
|
||||
psq_st f23, 0x38(r1), 0, 0
|
||||
addi r11, r1, 0x30
|
||||
bl _savegpr_24
|
||||
lfs f0, lbl_81694DA8(r2)
|
||||
mr r24, r3
|
||||
lfs f1, 0x1fc(r3)
|
||||
mr r25, r4
|
||||
lwz r5, 0xd8(r3)
|
||||
fdivs f25, f0, f1
|
||||
lfs f0, lbl_81694DB4(r2)
|
||||
lwz r5, 0x9c(r5)
|
||||
lwz r3, 0x38(r3)
|
||||
lfs f31, 0x4c(r5)
|
||||
lwz r27, 0x9c(r3)
|
||||
fcmpo cr0, f1, f0
|
||||
ble GetNextPageIdx_L1
|
||||
lfs f28, lbl_81694DAC(r2)
|
||||
b GetNextPageIdx_L2
|
||||
GetNextPageIdx_L1:
|
||||
lfs f28, lbl_81694DB0(r2)
|
||||
GetNextPageIdx_L2:
|
||||
fneg f23, f28
|
||||
lfd f29, lbl_81694DC8(r2)
|
||||
lfs f30, lbl_81694DBC(r2)
|
||||
mr r26, r25
|
||||
slwi r28, r4, 7
|
||||
lis r31, 0x4330
|
||||
b GetNextPageIdx_L3
|
||||
GetNextPageIdx_L4:
|
||||
lwz r0, 0x1e8(r24)
|
||||
cmpw r26, r0
|
||||
bne GetNextPageIdx_L5
|
||||
li r3, -1
|
||||
b GetNextPageIdx_L6
|
||||
GetNextPageIdx_L5:
|
||||
lwz r0, 0x204(r24)
|
||||
add r0, r0, r28
|
||||
addic. r30, r0, 4
|
||||
bne GetNextPageIdx_L7
|
||||
lfs f0, lbl_81694D90(r2)
|
||||
b GetNextPageIdx_L8
|
||||
GetNextPageIdx_L7:
|
||||
mr r3, r27
|
||||
bl GetFont__Q34nw4r3lyt8TextBoxCFv
|
||||
lfs f26, 0xe4(r27)
|
||||
mr r29, r3
|
||||
lfs f24, 0xf0(r27)
|
||||
lfs f27, lbl_81694D90(r2)
|
||||
b GetNextPageIdx_L9
|
||||
GetNextPageIdx_L10:
|
||||
lwz r12, 0(r29)
|
||||
fadds f27, f27, f24
|
||||
mr r3, r29
|
||||
lwz r12, 0x48(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
xoris r0, r3, 0x8000
|
||||
stw r31, 8(r1)
|
||||
addi r30, r30, 2
|
||||
stw r0, 0xc(r1)
|
||||
lfd f0, 8(r1)
|
||||
fsubs f0, f0, f29
|
||||
fadds f27, f27, f0
|
||||
GetNextPageIdx_L9:
|
||||
lhz r4, 0(r30)
|
||||
cmpwi r4, 0
|
||||
bne GetNextPageIdx_L10
|
||||
lwz r12, 0(r29)
|
||||
mr r3, r29
|
||||
lwz r12, 0xc(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
xoris r0, r3, 0x8000
|
||||
stw r31, 8(r1)
|
||||
stw r0, 0xc(r1)
|
||||
lfd f0, 8(r1)
|
||||
fsubs f0, f0, f29
|
||||
fdivs f0, f26, f0
|
||||
fmuls f0, f27, f0
|
||||
fadds f0, f30, f0
|
||||
GetNextPageIdx_L8:
|
||||
fmuls f0, f0, f25
|
||||
addi r28, r28, 0x80
|
||||
addi r26, r26, 1
|
||||
fadds f0, f28, f0
|
||||
fadds f23, f23, f0
|
||||
GetNextPageIdx_L3:
|
||||
fcmpo cr0, f23, f31
|
||||
cror 2, 0, 2
|
||||
beq GetNextPageIdx_L4
|
||||
addi r0, r26, -1
|
||||
cmpw r0, r25
|
||||
bne GetNextPageIdx_L11
|
||||
addi r26, r26, 1
|
||||
GetNextPageIdx_L11:
|
||||
addi r3, r26, -1
|
||||
GetNextPageIdx_L6:
|
||||
psq_l f31, 0xb8(r1), 0, 0
|
||||
lfd f31, 0xb0(r1)
|
||||
psq_l f30, 0xa8(r1), 0, 0
|
||||
lfd f30, 0xa0(r1)
|
||||
psq_l f29, 0x98(r1), 0, 0
|
||||
lfd f29, 0x90(r1)
|
||||
psq_l f28, 0x88(r1), 0, 0
|
||||
lfd f28, 0x80(r1)
|
||||
psq_l f27, 0x78(r1), 0, 0
|
||||
lfd f27, 0x70(r1)
|
||||
psq_l f26, 0x68(r1), 0, 0
|
||||
lfd f26, 0x60(r1)
|
||||
psq_l f25, 0x58(r1), 0, 0
|
||||
lfd f25, 0x50(r1)
|
||||
psq_l f24, 0x48(r1), 0, 0
|
||||
lfd f24, 0x40(r1)
|
||||
psq_l f23, 0x38(r1), 0, 0
|
||||
addi r11, r1, 0x30
|
||||
lfd f23, 0x30(r1)
|
||||
bl _restgpr_24
|
||||
lwz r0, 0xc4(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0xc0
|
||||
blr
|
||||
s32 UITextArea::GetNextPageIdx_(s32 idx) const {
|
||||
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
|
||||
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
|
||||
f32 widthScale = GetWidthScale_();
|
||||
f32 margin = GetMargin_();
|
||||
f32 xOffset = -margin;
|
||||
s32 candidateIndex = idx;
|
||||
while (xOffset <= areaPaneWidth) {
|
||||
if (candidateIndex == mnCandidateNum) {
|
||||
return -1;
|
||||
}
|
||||
f32 textWidth = calcStringWidth(mpCandidates->szwcPredicted[candidateIndex], textBox);
|
||||
xOffset += margin + textWidth * widthScale;
|
||||
++candidateIndex;
|
||||
}
|
||||
if (candidateIndex - 1 == idx) {
|
||||
++candidateIndex;
|
||||
}
|
||||
return candidateIndex - 1;
|
||||
}
|
||||
|
||||
s32 UITextArea::GetPrevPageIdx_(s32 idx) const {
|
||||
// NONMATCHING - only regswaps, hopefully
|
||||
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
|
||||
|
||||
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
|
||||
f32 widthScale = 608.0f / mfScreenWidth;
|
||||
f32 widthScale = GetWidthScale_();
|
||||
f32 margin = GetMargin_();
|
||||
f32 negMargin = -margin;
|
||||
|
||||
@@ -1450,7 +1326,6 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void UITextArea::StartScroll(s32 steps) {
|
||||
// NONMATCHING - only regswaps, hopefully
|
||||
f32 acc = 0.0f;
|
||||
f32 widthScale = GetWidthScale_();
|
||||
f32 margin = GetMargin_();
|
||||
@@ -1468,7 +1343,7 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, this);
|
||||
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, reinterpret_cast<void*>(steps));
|
||||
}
|
||||
|
||||
void UITextArea::StartScrollToIdx(s32 idx) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -557,10 +557,11 @@ void WithZi::setCurrentWord(const wchar_t* word) {
|
||||
LatestWord[1] = 0;
|
||||
return;
|
||||
}
|
||||
mbContextChanged = 1;
|
||||
wchar_t* currentWord;
|
||||
const wchar_t* source;
|
||||
u32 length;
|
||||
s32 copied;
|
||||
mbContextChanged = 1;
|
||||
length = 0;
|
||||
currentWord = reinterpret_cast<wchar_t*>(LatestWord);
|
||||
for (; *currentWord != 0 && *currentWord != 0x20;
|
||||
@@ -571,14 +572,10 @@ void WithZi::setCurrentWord(const wchar_t* word) {
|
||||
}
|
||||
}
|
||||
copied = 0;
|
||||
const wchar_t* source = word;
|
||||
u32 destinationOffset = length;
|
||||
source = word;
|
||||
for (; *source != 0 && length < 0x3f;) {
|
||||
wchar_t character = word[copied];
|
||||
++length;
|
||||
LatestWord[length++] = word[copied++];
|
||||
++source;
|
||||
++copied;
|
||||
LatestWord[destinationOffset++] = character;
|
||||
}
|
||||
LatestWord[length] = 0;
|
||||
mCurrentWordLength = copied;
|
||||
|
||||
@@ -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);
|
||||
@@ -536,11 +541,16 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline nw4r::math::_VEC2 negativeOffset(const nw4r::math::_VEC2& value) {
|
||||
f32 negativeY = -value.y;
|
||||
f32 negativeX = -value.x;
|
||||
nw4r::math::_VEC2 result = {negativeX, negativeY};
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::stt_cover_backward() {
|
||||
if (!mpLayout->getAnim(4)->isPlaying()) {
|
||||
math::VEC2 offset;
|
||||
offset.x = -sPageOffset.x;
|
||||
offset.y = -sPageOffset.y;
|
||||
math::VEC2 offset = negativeOffset(sPageOffset);
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
mbCover = true;
|
||||
mNextPageNum++;
|
||||
@@ -582,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++) {
|
||||
@@ -602,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);
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define IPL_GC_SAVEDATA_NOVTABLE
|
||||
#include "scene/memoryCard/iplGCSaveData.h"
|
||||
|
||||
#include "scene/memoryCard/iplMemoryCard.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#define IPL_MEMORYCARD_BASE_CTOR_OUT_OF_LINE
|
||||
#define IPL_MEMORYCARD_BASE_EVENT_OUT_OF_LINE
|
||||
#define IPL_GCW_PANEMANAGER_CTOR_OUT_OF_LINE
|
||||
#define IPL_GCW_INTP_CTOR_OUT_OF_LINE
|
||||
#define IPL_GC_WINDOW_NOVTABLE
|
||||
#define IPL_GC_WINDOW_CPP
|
||||
#include "scene/memoryCard/iplGCWindow.h"
|
||||
#include "scene/memoryCard/iplMemoryCard.h"
|
||||
@@ -14,10 +14,6 @@
|
||||
#include <cstring>
|
||||
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <typename T>
|
||||
LinearIntp<T>::LinearIntp() {}
|
||||
}
|
||||
namespace scene {
|
||||
struct TextboxToMessageID {
|
||||
const char* name;
|
||||
@@ -58,7 +54,7 @@ struct DigitTable {
|
||||
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
|
||||
|
||||
GCWindow::GCWindow(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName)
|
||||
: MemoryBase(), MemCardEventHandler(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
|
||||
: MemoryBase(), MemCardEventListener(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
|
||||
mWaiting(false) {
|
||||
mpLayout = new layout::Object(heap, layoutFile, directory, fileName);
|
||||
add_animation(scAnmName, 0x10);
|
||||
@@ -792,7 +788,6 @@ SavedataEditWindow::SavedataEditWindow(EGG::Heap* heap, nand::LayoutFile* layout
|
||||
add_animation("it_DataDetail_a_SeenOutNo.brlan", scAnmName[0].groupName);
|
||||
add_animation("it_DataDetail_a_Wait.brlan", scAnmName[15].groupName);
|
||||
mpLayout->finishBinding();
|
||||
set_visible("N_Wait", false);
|
||||
set_visible("T_Block_01", false);
|
||||
mpEvent = new MemoryBaseEvent(this);
|
||||
mpPaneManager = new gui::PaneManager(mpEvent, mpLayout->getDrawInfo(), NULL, NULL, true);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#define IPL_MEMORY_CARD_CPP
|
||||
#define IPL_MEMORY_CARD_NOVTABLE
|
||||
#include "scene/memoryCard/iplMemoryCard.h"
|
||||
|
||||
#include "scene/memoryCard/iplGCWindow.h"
|
||||
@@ -85,6 +86,47 @@ namespace ipl {
|
||||
|
||||
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
|
||||
|
||||
class __declspec(novtable) MemoryCardManagerImpl : public MemoryCardManager {
|
||||
public:
|
||||
virtual void onMount(u8) {}
|
||||
virtual void onUnmount(u8) {}
|
||||
virtual void onAttach(u8) {}
|
||||
virtual void onDetach(u8) {}
|
||||
virtual void onCheck(u8) {}
|
||||
virtual void onFormat(u8) {}
|
||||
virtual void onRepair(u8) {}
|
||||
virtual void onRead(u8) {}
|
||||
virtual void onWrite(u8) {}
|
||||
virtual void onOpen(u8) {}
|
||||
virtual void onClose(u8) {}
|
||||
virtual void onCreate(u8) {}
|
||||
virtual void onDelete(u8) {}
|
||||
virtual void onCopy(u8) {}
|
||||
virtual void onMove(u8) {}
|
||||
virtual void onRename(u8) {}
|
||||
virtual void onVerify(u8) {}
|
||||
virtual void onCommit(u8) {}
|
||||
virtual void onProbe(u8) {}
|
||||
virtual void onMountAsync(u8) {}
|
||||
virtual void onUnmountAsync(u8) {}
|
||||
virtual void onCheckAsync(u8) {}
|
||||
virtual void onFormatAsync(u8) {}
|
||||
virtual void onReadAsync(u8) {}
|
||||
virtual void onWriteAsync(u8) {}
|
||||
virtual void onCreateAsync(u8) {}
|
||||
virtual void onDeleteAsync(u8) {}
|
||||
virtual void onCopyAsync(u8) {}
|
||||
virtual void onMoveAsync(u8) {}
|
||||
virtual void onRenameAsync(u8) {}
|
||||
virtual void onVerifyAsync(u8) {}
|
||||
virtual void onCommitAsync(u8) {}
|
||||
virtual void onProbeAsync(u8) {}
|
||||
virtual void onFreeBlocks(u8) {}
|
||||
virtual void onGetLength(u8) {}
|
||||
virtual void onSetAttrib(u8) {}
|
||||
virtual void onGetAttrib(u8) {}
|
||||
};
|
||||
|
||||
MemoryCard::MemoryCard(EGG::Heap* heap)
|
||||
: Base(heap), MemoryBase(), mState(2), mPrevState(2), mSlot(0), mIconIndex(-15), mIconCount(0),
|
||||
mShowArwR(0), mShowArwL(0), mpEvent(NULL), mpFocusSaveData(NULL) {
|
||||
@@ -148,7 +190,7 @@ namespace ipl {
|
||||
mpGCWindow = new GCWindow(getSceneHeap(), unk_0x08, "arc", "it_CubeDetail_a.brlyt");
|
||||
mpGCWindow->do_animation(0);
|
||||
|
||||
MemoryCardManager* manager = new MemoryCardManager();
|
||||
MemoryCardManager* manager = new MemoryCardManagerImpl();
|
||||
mpManager = manager;
|
||||
mpManager->setEventHandler(mpGCWindow);
|
||||
mpGCWindow->mpMemoryCardManager = mpManager;
|
||||
@@ -701,3 +743,7 @@ namespace ipl {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Original .sdata2 ends with the PPC int-to-float conversion constant.
|
||||
extern "C" const f64 sMemoryCardIntToFloat = 4503601774854144.0;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#define IPL_MEMORYCARD_BASE_IMPLEMENTATION
|
||||
#define IPL_MEMORYCARD_BASE_CPP
|
||||
#include "scene/memoryCard/iplMemoryCardBase.h"
|
||||
#include "scene/settingSelect/iplSettingSelect.h"
|
||||
#include "scene/settingSelect/iplSettingButton.h"
|
||||
@@ -130,7 +131,7 @@ void MemoryBase::set_textbox(const char* paneName, u32 message) {
|
||||
|
||||
void MemoryBase::set_textbox(const char* paneName, u32 message, int animationIndex, int frame) {
|
||||
Anm* animation = get_animation(animationIndex);
|
||||
if (animation->mAnim->getCurrentFrame() >= frame) {
|
||||
if (animation->mAnim->getCurrentFrame() >= (f32)frame) {
|
||||
set_textbox(paneName, message);
|
||||
}
|
||||
}
|
||||
@@ -141,7 +142,7 @@ void MemoryBase::set_textbox(const char* paneName, const wchar_t* text, f32 widt
|
||||
while (length != 0) {
|
||||
textBox->SetString(text, 0, length);
|
||||
textBox->CalculateMtx(*mpLayout->getDrawInfo());
|
||||
nw4r::ut::Rect bounds = textBox->GetTextDrawRect(*mpLayout->getDrawInfo());
|
||||
const nw4r::ut::Rect& bounds = textBox->GetTextDrawRect(*mpLayout->getDrawInfo());
|
||||
if (bounds.right - bounds.left < width &&
|
||||
-1.0f * (bounds.bottom - bounds.top) < height) {
|
||||
break;
|
||||
|
||||
@@ -145,15 +145,14 @@ bool MemoryCardManager::isDistSlot(u8 slot, long* state) {
|
||||
bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
memorycard::CardState* states = memorycard::getCardSlotState();
|
||||
bool enabled = false;
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::FileInfo* dir = NULL;
|
||||
memorycard::CardState* destination = NULL;
|
||||
long result = file;
|
||||
long result;
|
||||
bool enabled = false;
|
||||
if (isDistSlot(slot, NULL) &&
|
||||
((dir = &dirs[slot][file])->canMove != 0) &&
|
||||
states[slot].key == (destination = &states[slot ^ 1])->key &&
|
||||
destination->freeBlocks >= dir->size && destination->unk_0x0E != 0 &&
|
||||
states[slot].key == states[slot ^ 1].key &&
|
||||
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dir->unk_0x06 == 0) {
|
||||
result = -0x15;
|
||||
enabled = true;
|
||||
@@ -169,9 +168,9 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
}
|
||||
} else if ((dir = &dirs[slot][file])->canMove == 0) {
|
||||
result = -0x1a;
|
||||
} else if (states[slot].key != (destination = &states[slot ^ 1])->key) {
|
||||
} else if (states[slot].key != states[slot ^ 1].key) {
|
||||
result = -0x1b;
|
||||
} else if (destination->freeBlocks < dir->size || destination->unk_0x0E == 0) {
|
||||
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
result = -0x19;
|
||||
} else if (dir->unk_0x06 != 0) {
|
||||
result = -0x18;
|
||||
@@ -186,15 +185,14 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
memorycard::CardState* states = memorycard::getCardSlotState();
|
||||
bool enabled = false;
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::FileInfo* dir = NULL;
|
||||
memorycard::CardState* destination = NULL;
|
||||
long result = file;
|
||||
long result;
|
||||
bool enabled = false;
|
||||
if (isDistSlot(slot, NULL) &&
|
||||
((dir = &dirs[slot][file])->canCopy != 0) &&
|
||||
states[slot].key == (destination = &states[slot ^ 1])->key &&
|
||||
destination->freeBlocks >= dir->size && destination->unk_0x0E != 0 &&
|
||||
states[slot].key == states[slot ^ 1].key &&
|
||||
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dir->unk_0x06 == 0) {
|
||||
result = -0x15;
|
||||
enabled = true;
|
||||
@@ -210,9 +208,9 @@ bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
|
||||
}
|
||||
} else if ((dir = &dirs[slot][file])->canCopy == 0) {
|
||||
result = -0x1a;
|
||||
} else if (states[slot].key != (destination = &states[slot ^ 1])->key) {
|
||||
} else if (states[slot].key != states[slot ^ 1].key) {
|
||||
result = -0x1b;
|
||||
} else if (destination->freeBlocks < dir->size || destination->unk_0x0E == 0) {
|
||||
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
result = -0x19;
|
||||
} else if (dir->unk_0x06 != 0) {
|
||||
result = -0x18;
|
||||
@@ -258,7 +256,7 @@ void MemoryCardManager::update_icon_anm() {
|
||||
mFileCell[slot][file].iconAnmCounter = frame;
|
||||
if ((s16)frame >= icons[slot][file].anmMax) {
|
||||
if (icon->anmType == 4) {
|
||||
mFileCell[slot][file].iconAnmCounter = icon->anmMax - icon->unk_0x07 - 1;
|
||||
mFileCell[slot][file].iconAnmCounter = icons[slot][file].anmMax - icon->unk_0x07 - 1;
|
||||
icon->anmDelta = -1;
|
||||
} else {
|
||||
mFileCell[slot][file].iconAnmCounter = 0;
|
||||
@@ -344,7 +342,7 @@ void MemoryCardManager::update_change_cardstate(u8 slot) {
|
||||
GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index) {
|
||||
memorycard::IconState (*icons)[0x7f] = reinterpret_cast<memorycard::IconState(*)[0x7f]>(memorycard::getIconStateArray());
|
||||
int total = 0;
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
s16 frame = 0;
|
||||
do {
|
||||
u32 shift = frame << 1;
|
||||
@@ -359,7 +357,7 @@ GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index) {
|
||||
|
||||
GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index, long start) {
|
||||
memorycard::getIconStateArray();
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
return _create_icon(slot, file, 0);
|
||||
}
|
||||
|
||||
@@ -385,7 +383,7 @@ GXTexObj* MemoryCardManager::_create_icon(u8 slot, s16 file, long start) {
|
||||
}
|
||||
|
||||
const wchar_t* MemoryCardManager::getComment(u8 slot, s16 index, int which) {
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
wmemset(mFileCell[slot][file].comment[which], 0, 0x40);
|
||||
char comment[33] = {0};
|
||||
const char* comments = memorycard::getIconComment(slot, file);
|
||||
@@ -427,7 +425,7 @@ const wchar_t* MemoryCardManager::getComment(u8 slot, s16 index, int which) {
|
||||
GXTexObj* MemoryCardManager::create_banner(u8 slot, s16 index) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
CardIcons* icons = reinterpret_cast<CardIcons*>(memorycard::getIconStateArray());
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
if (dirs[slot][file].fileNo == 0 || !icons[slot][file].bannerEnable) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -2076,13 +2076,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDChannelSelect::drawChannelTransitionObjects() {
|
||||
int index;
|
||||
int page;
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
page = channel->getPage();
|
||||
index = channel->getIndex();
|
||||
int page = channel->mPage;
|
||||
int index = channel->mIndex;
|
||||
if (!hasChannelObject(page, index) || !isChannelReady(channel)) {
|
||||
continue;
|
||||
}
|
||||
@@ -2091,12 +2089,23 @@ namespace ipl {
|
||||
iplSDChannelObj_813E32C8(channel);
|
||||
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (mState < 24 && mState >= 15 &&
|
||||
(page != mSourcePage || index != mSourceIndex)) {
|
||||
nw4r::math::VEC3 position(channel->getTranslate());
|
||||
mpPageLayouts[0]->GetRootPane()->SetTranslate(position);
|
||||
mpPageLayouts[0]->calcMtx();
|
||||
mpPageLayouts[0]->draw();
|
||||
switch (mState) {
|
||||
case 15:
|
||||
case 16:
|
||||
case 17:
|
||||
case 18:
|
||||
case 19:
|
||||
case 20:
|
||||
case 21:
|
||||
case 22:
|
||||
case 23:
|
||||
if (page != mSourcePage || index != mSourceIndex) {
|
||||
nw4r::math::VEC3 position(channel->getTranslate());
|
||||
mpPageLayouts[0]->GetRootPane()->SetTranslate(position);
|
||||
mpPageLayouts[0]->calcMtx();
|
||||
mpPageLayouts[0]->draw();
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else if (channel->mStateFlags == 2) {
|
||||
nw4r::math::VEC3 position(channel->getTranslate());
|
||||
@@ -2110,7 +2119,6 @@ namespace ipl {
|
||||
case 16:
|
||||
case 19:
|
||||
case 20:
|
||||
case 21:
|
||||
case 22:
|
||||
case 23:
|
||||
if (page == mSourcePage && index == mSourceIndex) {
|
||||
@@ -2122,10 +2130,15 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
|
||||
if (mState < 22 && mState >= 19 &&
|
||||
page == mDestinationPage && index == mDestinationIndex) {
|
||||
mpPageLayouts[2]->draw();
|
||||
mpPointerLayout->draw();
|
||||
switch (mState) {
|
||||
case 19:
|
||||
case 20:
|
||||
case 21:
|
||||
if (page == mDestinationPage && index == mDestinationIndex) {
|
||||
mpPageLayouts[2]->draw();
|
||||
mpPointerLayout->draw();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -399,7 +399,9 @@ int AOSS_Init_old(AOSSInitInput* input)
|
||||
u32 initialSleep;
|
||||
u32 nextSleep;
|
||||
u32 resultCode;
|
||||
u32 flags;
|
||||
int state;
|
||||
int protocolState;
|
||||
u32 retryWait;
|
||||
u16 retryDelay;
|
||||
u32 delayStep;
|
||||
@@ -442,6 +444,7 @@ int AOSS_Init_old(AOSSInitInput* input)
|
||||
waitIntervals.defaults.response = defaultResponse;
|
||||
waitSettings.value = 0;
|
||||
receivedPackets = 0;
|
||||
protocolState = 0;
|
||||
memset(&requestRecords,0,0x18);
|
||||
waitIntervals.limits.connection = input->options[0];
|
||||
if (waitIntervals.limits.connection == -1) {
|
||||
@@ -468,12 +471,13 @@ int AOSS_Init_old(AOSSInitInput* input)
|
||||
memset(&s_runtime,0,0x1c);
|
||||
s_runtime.config = input->ssid;
|
||||
s_runtime.configLength = (u32)input->ssidLength;
|
||||
s_runtime.flags = input->flags & 0xf;
|
||||
flags = input->flags;
|
||||
s_runtime.flags = flags & 0xf;
|
||||
s_runtime.interfaceType = input->mode;
|
||||
s_runtime.state = 0;
|
||||
s_runtime.ipAddress = 0xc0a80b01;
|
||||
s_runtime.active = '\0';
|
||||
if ((input->flags & 1) != 1) {
|
||||
if ((flags & 1u) != 1u) {
|
||||
s_errorCode = 0x13;
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
@@ -628,7 +632,7 @@ int AOSS_Init_old(AOSSInitInput* input)
|
||||
} else {
|
||||
memset(s_accessPointConfig,0,0x58);
|
||||
initialWait = waitIntervals.limits.connection;
|
||||
remainingWait = 0;
|
||||
attemptCount = 0;
|
||||
goto test_initial_link;
|
||||
}
|
||||
}
|
||||
@@ -662,8 +666,8 @@ wait_for_initial_link:
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
if ((state == 0) && ((u32)*s_accessPointConfig == 1u)) goto handle_initial_link;
|
||||
remainingWait = (u16)waitIntervals.limits.response;
|
||||
if ((state == 0) && (*s_accessPointConfig == 1)) goto handle_initial_link;
|
||||
for (; remainingWait != 0; remainingWait = (u16)(remainingWait - nextSleep)) {
|
||||
if (AOSSi_cancel_flag == 1) {
|
||||
input->status = 0xf;
|
||||
@@ -695,11 +699,11 @@ wait_for_initial_link:
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
remainingWait++;
|
||||
attemptCount++;
|
||||
test_initial_link:
|
||||
if ((short)remainingWait < initialWait) goto wait_for_initial_link;
|
||||
if (attemptCount < initialWait) goto wait_for_initial_link;
|
||||
handle_initial_link:
|
||||
if (remainingWait == waitIntervals.limits.connection) {
|
||||
if (attemptCount == waitIntervals.limits.connection) {
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
AOSSi_Free(s_accessPointConfig);
|
||||
@@ -783,14 +787,13 @@ handle_initial_link:
|
||||
attemptCount = waitSettings.halfwords.high;
|
||||
settings.gatewayAddress = 0xc0a80b65;
|
||||
settings.ipAddress = 0xc0a80b01;
|
||||
state = 0;
|
||||
perform_request:
|
||||
packetBuffer = s_responseBuffer;
|
||||
memset(networkAddresses,0,0x14);
|
||||
networkAddresses[4] = settings.gatewayAddress;
|
||||
networkAddresses[0] = settings.ipAddress;
|
||||
do {
|
||||
if ((state == 1) && ((s8)s_runtime.active != 1)) {
|
||||
if ((protocolState == 1) && ((s8)s_runtime.active != 1)) {
|
||||
if (s_socket != -1) {
|
||||
SOClose(s_socket);
|
||||
}
|
||||
@@ -941,7 +944,7 @@ request_socket_cleanup_complete:
|
||||
}
|
||||
}
|
||||
requestResult = s_socket;
|
||||
switch (state) {
|
||||
switch (protocolState) {
|
||||
case 0:
|
||||
if (s_operationState != 2) {
|
||||
s_operationState = 2;
|
||||
@@ -995,7 +998,7 @@ request_socket_cleanup_complete:
|
||||
break;
|
||||
}
|
||||
if (requestResult == -1) {
|
||||
s_errorCode = state + 0x1000;
|
||||
s_errorCode = protocolState + 0x1000;
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
AOSSi_Free(s_accessPointConfig);
|
||||
@@ -1025,7 +1028,7 @@ request_socket_cleanup_complete:
|
||||
if (0 < requestResult) goto process_received_packet;
|
||||
receivedPackets = receivedPackets + 1;
|
||||
if (receivedPackets > attemptCount) {
|
||||
switch (state) {
|
||||
switch (protocolState) {
|
||||
case 0: s_errorCode = 0xf; break;
|
||||
case 1: s_errorCode = 0x10; break;
|
||||
default: s_errorCode = 0x11; break;
|
||||
@@ -1086,7 +1089,7 @@ process_received_packet:
|
||||
packetBuffer->socket = s_socket;
|
||||
retryWait = SONtoHs(receivedLength);
|
||||
packetBuffer->length = retryWait & 0xffff;
|
||||
requestResult = AOSS_814001B4(state,packetBuffer,&receivedPackets,&requestRecords,s_socket);
|
||||
requestResult = AOSS_814001B4(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
|
||||
if (requestResult == 100) {
|
||||
protocolResult = 0;
|
||||
}
|
||||
@@ -1094,8 +1097,8 @@ process_received_packet:
|
||||
protocolResult = -1;
|
||||
}
|
||||
else {
|
||||
if (state != requestResult) {
|
||||
state = requestResult;
|
||||
if (protocolState != requestResult) {
|
||||
protocolState = requestResult;
|
||||
if (requestResult != 2) goto perform_request;
|
||||
if (s_socket != -1) {
|
||||
SOClose(s_socket);
|
||||
@@ -1291,10 +1294,10 @@ wait_for_packet:
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
state = requestResult;
|
||||
protocolState = requestResult;
|
||||
goto perform_request;
|
||||
}
|
||||
state = requestResult;
|
||||
protocolState = requestResult;
|
||||
if (receivedPackets > waitSettings.halfwords.high) {
|
||||
switch (requestResult) {
|
||||
case 0: s_errorCode = 0xf; break;
|
||||
@@ -2303,10 +2306,12 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
AOSSHelloPacket* response = (AOSSHelloPacket*)s_responseBuffer;
|
||||
AOSSHelloPayload* payload;
|
||||
AOSSRequestRecords* requestRecords = (AOSSRequestRecords*)request;
|
||||
AOSSSocketAddress destination;
|
||||
AOSSKeySchedule schedule;
|
||||
AOSSHelloRecord hello;
|
||||
u8 accessPointName[8];
|
||||
struct {
|
||||
AOSSSocketAddress destination;
|
||||
AOSSHelloRecord hello;
|
||||
u8 accessPointName[8];
|
||||
AOSSKeySchedule schedule;
|
||||
} construction;
|
||||
u32 checksum;
|
||||
u16 nonce;
|
||||
u32 stateLength;
|
||||
@@ -2324,14 +2329,14 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
|
||||
checksum = 0;
|
||||
sequence = 0;
|
||||
memset(&hello, 0, sizeof(hello));
|
||||
memset(&construction.hello, 0, sizeof(construction.hello));
|
||||
memset(response, 0, 0x5dc);
|
||||
payload = &response->payload;
|
||||
hello.data.fields.type = 2;
|
||||
hello.data.fields.reserved01 = 0;
|
||||
hello.data.fields.length = SOHtoNs(4);
|
||||
hello.data.fields.supportedModes = s_runtime.flags;
|
||||
hello.data.fields.supportedModes = SOHtoNl(hello.data.fields.supportedModes);
|
||||
construction.hello.data.fields.type = 2;
|
||||
construction.hello.data.fields.reserved01 = 0;
|
||||
construction.hello.data.fields.length = SOHtoNs(4);
|
||||
construction.hello.data.fields.supportedModes = s_runtime.flags;
|
||||
construction.hello.data.fields.supportedModes = SOHtoNl(construction.hello.data.fields.supportedModes);
|
||||
responseLength = 8;
|
||||
|
||||
if ((s32)s_connectionState == 1) {
|
||||
@@ -2344,44 +2349,44 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
u32 part;
|
||||
for (part = 0; part < 4; part++) {
|
||||
for (index = 0; index < 2; index++) {
|
||||
checksum = (checksum >> 8) ^ crcTable[(checksum ^ hello.data.bytes[part * 2 + index]) & 0xff];
|
||||
checksum = (checksum >> 8) ^ crcTable[(checksum ^ construction.hello.data.bytes[part * 2 + index]) & 0xff];
|
||||
}
|
||||
}
|
||||
}
|
||||
checksum = (checksum ^ 0xffffffff) & 0xff;
|
||||
|
||||
schedule.bytes = (u8*)AOSSi_Alloc(8);
|
||||
if (schedule.bytes != 0) {
|
||||
construction.schedule.bytes = (u8*)AOSSi_Alloc(8);
|
||||
if (construction.schedule.bytes != 0) {
|
||||
nonce = (u16)rand();
|
||||
memcpy(&payload->encrypted.key.nonce, &nonce, 2);
|
||||
memcpy(s_packetState.keyNonce, payload->encrypted.key.nonceBytes, 2);
|
||||
memcpy(s_packetState.keyAddress, s_accessPointName, 8);
|
||||
AOSS_81401C9C(&schedule, s_packetState.keyNonce,
|
||||
AOSS_81401C9C(&construction.schedule, s_packetState.keyNonce,
|
||||
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), 8);
|
||||
for (index = 0; index < 8; index++) {
|
||||
state = schedule.bytes;
|
||||
firstIndex = (schedule.i + 1) % schedule.length & 0xff;
|
||||
state = construction.schedule.bytes;
|
||||
firstIndex = (construction.schedule.i + 1) % construction.schedule.length & 0xff;
|
||||
firstByte = state[firstIndex];
|
||||
secondIndex = (firstByte + schedule.j) % schedule.length & 0xff;
|
||||
secondIndex = (firstByte + construction.schedule.j) % construction.schedule.length & 0xff;
|
||||
swap = state[secondIndex];
|
||||
stateLength = firstByte + swap;
|
||||
schedule.i = firstIndex;
|
||||
schedule.j = secondIndex;
|
||||
construction.schedule.i = firstIndex;
|
||||
construction.schedule.j = secondIndex;
|
||||
state[secondIndex] = (u8)firstByte;
|
||||
state[firstIndex] = swap;
|
||||
value = state[stateLength % schedule.length] ^ hello.data.bytes[index];
|
||||
value = state[stateLength % construction.schedule.length] ^ construction.hello.data.bytes[index];
|
||||
payload->bytes[index + 4] = value;
|
||||
}
|
||||
AOSSi_Free(schedule.bytes);
|
||||
AOSSi_Free(construction.schedule.bytes);
|
||||
}
|
||||
payload->encrypted.length = SOHtoNs(8);
|
||||
responseLength = 0x0c;
|
||||
} else {
|
||||
memcpy(payload->bytes, &hello, 8);
|
||||
memcpy(payload->bytes, &construction.hello, 8);
|
||||
}
|
||||
|
||||
memcpy(accessPointName, &requestRecords->records[1], 8);
|
||||
encryptionResult = AOSS_81401E80(accessPointName, 8, s_manufacturer, 6);
|
||||
memcpy(construction.accessPointName, &requestRecords->records[1], 8);
|
||||
encryptionResult = AOSS_81401E80(construction.accessPointName, 8, s_manufacturer, 6);
|
||||
if (encryptionResult != 0) {
|
||||
s_errorCode = 2;
|
||||
return -1;
|
||||
@@ -2396,17 +2401,17 @@ int AOSS_81401778(void* packet, void* request, int socket) {
|
||||
response->header.finalSequence = SOHtoNs(sequence);
|
||||
response->header.reserved = checksum;
|
||||
response->header.messageType = 0x11;
|
||||
memcpy(response->header.messageIdentity, accessPointName, 8);
|
||||
memcpy(response->header.messageIdentity, construction.accessPointName, 8);
|
||||
sendLength = (s16)(responseLength + 0x18);
|
||||
memset(&destination, 0, sizeof(destination));
|
||||
destination.family = 2;
|
||||
destination.port = SOHtoNs(0x5790);
|
||||
destination.address = SOHtoNl(s_runtime.ipAddress);
|
||||
memset(&construction.destination, 0, sizeof(construction.destination));
|
||||
construction.destination.family = 2;
|
||||
construction.destination.port = SOHtoNs(0x5790);
|
||||
construction.destination.address = SOHtoNl(s_runtime.ipAddress);
|
||||
if ((s8)s_runtime.active == 0) {
|
||||
destination.address = 0xffffffff;
|
||||
construction.destination.address = 0xffffffff;
|
||||
}
|
||||
destination.length = 8;
|
||||
SOSendTo(socket, response, sendLength, 0, &destination);
|
||||
construction.destination.length = 8;
|
||||
SOSendTo(socket, response, sendLength, 0, &construction.destination);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1419,8 +1419,8 @@ namespace ipl {
|
||||
mpChangeLayout->FindPaneByName("N_Tra0")->SetVisible(true);
|
||||
}
|
||||
|
||||
WWWRect* wideRect = NULL;
|
||||
WWWRect* standardRect = NULL;
|
||||
WWWRect* standardRect;
|
||||
WWWRect* wideRect;
|
||||
void* wideBuffer = browser->GetTextureBuffer(1, &wideRect);
|
||||
void* standardBuffer = browser->GetTextureBuffer(0, &standardRect);
|
||||
nw4r::ut::Rect projection4x3;
|
||||
@@ -1434,8 +1434,8 @@ namespace ipl {
|
||||
screenRect.bottom = -screenHeight / 2;
|
||||
|
||||
if (wideBuffer != NULL && standardBuffer != NULL) {
|
||||
GXTexObj wideTexture;
|
||||
GXTexObj standardTexture;
|
||||
GXTexObj wideTexture;
|
||||
GXInitTexObj(&wideTexture, wideBuffer, wideRect->w, wideRect->h, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
GXInitTexObj(&standardTexture, standardBuffer, standardRect->w, standardRect->h, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
GXInitTexObjLOD(&wideTexture, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
|
||||
@@ -1715,9 +1715,8 @@ namespace ipl {
|
||||
memset(unk_0x938, 0, sizeof(unk_0x938));
|
||||
}
|
||||
|
||||
keyboard::Manager* keyboardManager = System::getKeyboard();
|
||||
if (productArea == 11) {
|
||||
keyboardManager->memoFrm()->setZiDictionary(keyboardManager->getZiOemDic(), keyboardManager->getZiSystemDic());
|
||||
System::getKeyboard()->memoFrm()->setZiDictionary(System::getKeyboard()->getZiOemDic(), System::getKeyboard()->getZiSystemDic());
|
||||
}
|
||||
|
||||
keyboard::Manager::KeyboardSetting setting;
|
||||
@@ -1725,12 +1724,12 @@ namespace ipl {
|
||||
setting.wcString = reinterpret_cast<const wchar_t*>(unk_0x938);
|
||||
setting.stringLimit = stringLimit;
|
||||
setting.rowLimit = rowLimit;
|
||||
keyboardManager->start(0, setting);
|
||||
System::getKeyboard()->start(0, setting);
|
||||
|
||||
if (invalidInput != 0) {
|
||||
setDefaultBackString();
|
||||
} else {
|
||||
keyboardManager->baseMgr()->setTitleText(L"");
|
||||
System::getKeyboard()->baseMgr()->setTitleText(L"");
|
||||
}
|
||||
if (mpWiiSettingData->data[0x11] == 17) {
|
||||
System::getKeyboard()->baseMgr()->setSecretInputMode(true);
|
||||
@@ -1811,9 +1810,9 @@ namespace ipl {
|
||||
ext_ead::www::SurfaceManager::GetInstance()->GetBrowserThread()->CommitIme(mpBrowserData, formText);
|
||||
memset(mpStringBuffer->asterisks, 0, sizeof(mpStringBuffer->asterisks));
|
||||
} else if (mpWiiSettingData->data[0x11] == 2 || mpWiiSettingData->data[0x11] == 22) {
|
||||
s32 index = 0;
|
||||
memcpy(mpStringBuffer->asterisks, mpStringBuffer->securityKey, sizeof(mpStringBuffer->securityKey));
|
||||
mpStringBuffer->asterisks[0x41] = 0;
|
||||
s32 index = 0;
|
||||
while (mpStringBuffer->asterisks[index] != 0) {
|
||||
mpStringBuffer->asterisks[index++] = '*';
|
||||
}
|
||||
@@ -1905,12 +1904,16 @@ namespace ipl {
|
||||
case keyboard::Manager::STATE_HIDDEN:
|
||||
case keyboard::Manager::STATE_APPEARING: {
|
||||
u8 formId = mpWiiSettingData->data[0x11];
|
||||
if (formId >= 1 && formId <= 22 && formId != 9 && formId != 21) {
|
||||
if (!System::getKeyboard()->memoMgr()->isVacancy()) {
|
||||
System::getKeyboard()->baseMgr()->setTitleText(L"");
|
||||
} else {
|
||||
switch (formId) {
|
||||
case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
|
||||
case 10: case 11: case 12: case 13: case 14: case 15: case 16:
|
||||
case 17: case 18: case 19: case 20: case 22:
|
||||
if (System::getKeyboard()->memoMgr()->isVacancy()) {
|
||||
setDefaultBackString();
|
||||
} else {
|
||||
System::getKeyboard()->baseMgr()->setTitleText(L"");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -2448,11 +2451,12 @@ namespace ipl {
|
||||
void Setting::convertRevIP(u8* destination, const char* address) {
|
||||
char ascii[20];
|
||||
int count = 0;
|
||||
int index;
|
||||
memset(ascii, 0, sizeof(ascii));
|
||||
utility::CharacterCode::UTF8ToANSI(reinterpret_cast<u8*>(ascii), address);
|
||||
int componentStart = 0;
|
||||
u8* output = destination;
|
||||
for (int index = 0; index < 0x10; ++index) {
|
||||
for (index = 0; index < 0x10; ++index) {
|
||||
u8 character = static_cast<u8>(ascii[index]);
|
||||
if (character == '.' || character == 0) {
|
||||
if (character == 0) {
|
||||
@@ -2714,9 +2718,10 @@ namespace ipl {
|
||||
case 5:
|
||||
mpPaneManager->update();
|
||||
break;
|
||||
case 6:
|
||||
case 6: {
|
||||
int animationIndex = unk_0x918;
|
||||
unk_0xB9C = 1;
|
||||
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
|
||||
if (!mpMainLayout->getAnim(animationIndex)->isPlaying()) {
|
||||
unk_0x78 = 5;
|
||||
setAPDraw();
|
||||
if (unk_0x91C[0] != 0) {
|
||||
@@ -2738,6 +2743,7 @@ namespace ipl {
|
||||
mpMainLayout->FindPaneByName("N_AP7")->SetVisible(true);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 7:
|
||||
unk_0xB9C = 1;
|
||||
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
|
||||
@@ -3553,6 +3559,10 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline bool HasUSBAPResult(const u8* result) {
|
||||
return *result != 0;
|
||||
}
|
||||
|
||||
void Setting::setUSBAP() {
|
||||
switch (unk_0x84) {
|
||||
case 1:
|
||||
@@ -3573,7 +3583,7 @@ namespace ipl {
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (unk_0x91C[1] != 0) {
|
||||
if (HasUSBAPResult(&unk_0x91C[1])) {
|
||||
www::wiisetting::setFuncResult(unk_0x91C[1]);
|
||||
unk_0x84 = 1;
|
||||
unk_0x91C[1] = 0;
|
||||
|
||||
@@ -9,8 +9,8 @@ from pathlib import Path
|
||||
|
||||
|
||||
EXPECTED_DOL_SHA1 = "26116613f624061ba99c8d1a299aaa6efa85670d"
|
||||
EXPECTED_TOTAL_UNITS = 1026
|
||||
EXPECTED_TOTAL_CODE = 2995172
|
||||
EXPECTED_TOTAL_UNITS = 1027
|
||||
EXPECTED_TOTAL_CODE = 2995188
|
||||
EXPECTED_TOTAL_DATA = 1832684
|
||||
EXPECTED_TOTAL_FUNCTIONS = 12563
|
||||
INTEGER_PATTERN = re.compile(r"-?(0|[1-9][0-9]*)\Z")
|
||||
|
||||
@@ -1076,3 +1076,406 @@ GATE PASS
|
||||
```
|
||||
- Post-full-clean-build latest-main comparison repeated: zero project-wide matched/linked/function regressions; 121/121 Step jump relocations preserved.
|
||||
- Local improvement commits: c4ae8bcc correct interpreter scratch object storage; 743f0580 improve chansvmstep code matching; f9928196 improve chansvmstep code matching; 572a7c04 improve chansvmaddexe code matching; 076645dc improve vmstringreplace code matching; 647f5007 improve vmstringreplace code matching; 5e75409f improve chansvm_8144b4d4 code matching; 179218d7 improve vmblobunpack code matching; d125aec2 improve vmblobunpack code matching; 051a713b read unpacked integers through their typed value.
|
||||
CHANSVmNewObjData declaration order [0, 1, 2, 3, 4, 5]: structural/exact (0, 10)
|
||||
CHANSVmNewObjData diagnosis: (0, 10); target size 384; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' u32 idx;\n', ' u32 chunkIdx;\n', ' union {\n u32 off;\n ChunkEntry* entry;\n } u;\n', ' ChunkEntry* chunk;\n', ' u32 memSize;\n']
|
||||
CHANSVmNewObjData declaration order [1, 0, 2, 3, 4, 5]: structural/exact (0, 10)
|
||||
CHANSVmNewObjData declaration order [2, 1, 0, 3, 4, 5]: structural/exact (0, 10)
|
||||
CHANSVmNewObjData declaration order [5, 1, 2, 3, 4, 0]: structural/exact (0, 7)
|
||||
CHANSVmNewObjData result (0, 7), attempts 163, RESTORED
|
||||
VmStringFromCharCode declaration order [0, 1, 2, 3, 4]: structural/exact (0, 6)
|
||||
VmStringFromCharCode diagnosis: (0, 6); target size 236; declaration entries [' CHANSVmObjHdr* arg;\n', ' u32 offs;\n', ' u32 argc;\n', ' u32 ch;\n', ' u32 i;\n']
|
||||
VmStringFromCharCode declaration order [1, 0, 2, 3, 4]: structural/exact (0, 6)
|
||||
VmStringFromCharCode declaration order [2, 1, 0, 3, 4]: structural/exact (0, 9)
|
||||
VmStringFromCharCode result (0, 6), attempts 90, RESTORED
|
||||
VmWinEmuWrite declaration order [0, 1, 2, 3, 4, 5, 6, 7]: structural/exact (0, 5)
|
||||
VmWinEmuWrite diagnosis: (0, 5); target size 268; declaration entries [' CHANSVmObjHdr* strObj;\n', ' u32 offset;\n', ' u32 totalLength;\n', ' u8 buf[VM_STRING_SIZE];\n', ' s32 outLen;\n', ' s32 inLen;\n', ' s32 result;\n', ' u32 remaining;\n']
|
||||
VmWinEmuWrite declaration order [1, 0, 2, 3, 4, 5, 6, 7]: structural/exact (0, 5)
|
||||
VmWinEmuWrite declaration order [2, 1, 0, 3, 4, 5, 6, 7]: structural/exact (0, 8)
|
||||
VmWinEmuWrite declaration-order search stopped after 3+ distinct compiled orders without improvement; restored original source.
|
||||
|
||||
## 2026-10-01 215/233 baseline continuation
|
||||
Target and current instructions have equal counts for all 18 open functions. Full structural ctxdiff was captured before each experiment. Baseline pool IDENTICAL, .data 100%, 121/121 jump relocations. Declaration-only trials above did not produce exactness.
|
||||
vmBlobParsePackFormatString: distinct parameter digit scope then split accumulation; 116/116 instructions, 6 differences each; restored. Target preserves format character in r11 and uses distinct numeric digit r0.
|
||||
vmBlobParsePackFormatString: u32 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: wchar_t digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: s32 digit, decimal digit + paramValue * 10 - 0x30: 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10 + (digit - 0x30): 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 98.27586%; 116/116 insns; structural/exact (3, 5); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u16 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u32 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: wchar_t digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: s32 digit, decimal digit + paramValue * 10 - 0x30: 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10 + (digit - 0x30): 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 98.27586%; 116/116 insns; structural/exact (3, 5); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u16 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10;
|
||||
paramValue += digit;
|
||||
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
|
||||
paramValue = digit + paramValue - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
|
||||
digit += paramValue;
|
||||
paramValue = digit - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
|
||||
paramValue = (s32)(digit + paramValue) - 0x30;: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
|
||||
paramValue = (digit + paramValue);
|
||||
paramValue -= 0x30;: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
|
||||
{
|
||||
s32 sum = digit + paramValue;
|
||||
paramValue = sum - 0x30;
|
||||
}: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
|
||||
{
|
||||
u32 sum = digit + paramValue;
|
||||
paramValue = sum - 0x30;
|
||||
}: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
|
||||
paramValue += digit - 0x30;: 99.913795%; 116/116 insns; structural/exact (0, 1); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
|
||||
paramValue = paramValue + digit - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
|
||||
paramValue += (s32)digit;
|
||||
paramValue -= 0x30;: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
|
||||
digit = paramValue + digit;
|
||||
paramValue = digit - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
|
||||
paramValue = digit + (u32)paramValue;
|
||||
paramValue -= 0x30;: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal final operand paramValue = (digit - 0x30) + paramValue;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal final operand paramValue = digit - 0x30 + paramValue;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal final operand paramValue -= 0x30 - digit;: 97.75862%; 116/116 insns; structural/exact (3, 3); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal final operand paramValue += digit + -0x30;: 99.913795%; 116/116 insns; structural/exact (0, 1); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal final operand paramValue += (s32)digit - 0x30;: 99.913795%; 116/116 insns; structural/exact (0, 1); .data 100.0%; RESTORED
|
||||
vmBlobParsePackFormatString: decimal final operand paramValue += (u32)(digit - 0x30);: 100.0%; 116/116 insns; structural/exact (0, 0); .data 100.0%; KEPT exact; quick GATE PASS
|
||||
VmStringFromCharCode: character mask/cursor form 0: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: character mask/cursor form 1: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: character mask/cursor form 2: 94.32204%; 57/59 insns; structural/exact (9, 45); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: character mask/cursor form 3: 94.32204%; 57/59 insns; structural/exact (9, 45); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: character mask/cursor form 4: 99.32204%; 59/59 insns; structural/exact (0, 7); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: character mask/cursor form 5: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: character mask/cursor form 6: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: character mask/cursor form 7: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
VmWinEmuWrite: size type: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
|
||||
VmWinEmuWrite: signed size: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
|
||||
VmWinEmuWrite: cache payload: COMPILE FAIL orm_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\channelScript\CHANSVm.c
|
||||
# ------------------------------------
|
||||
# 6073: strValue = strObj->value.wstring_v;
|
||||
# Error: ^
|
||||
# (10209) illegal implicit conversion from 'struct *' to
|
||||
# 'struct *'
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
; RESTORED
|
||||
VmWinEmuWrite: unmasked cached size: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
|
||||
CHANSVmParseInt: one-slot end buffer: 94.69388%; 49/49 insns; structural/exact (2, 3); .data 100.0%; RESTORED
|
||||
CHANSVmParseInt: parse scratch structure: 94.69388%; 49/49 insns; structural/exact (2, 3); .data 100.0%; RESTORED
|
||||
CHANSVmParseInt: initialized parse end: 94.69388%; 49/49 insns; structural/exact (2, 3); .data 100.0%; RESTORED
|
||||
CHANSVmParseInt: explicit type after end initialization: 83.67347%; 49/49 insns; structural/exact (4, 5); .data 100.0%; RESTORED
|
||||
CHANSVm_8144B4D4: one-slot end buffer: 97.59036%; 83/83 insns; structural/exact (2, 2); .data 100.0%; RESTORED
|
||||
CHANSVm_8144B4D4: parse scratch structure: 97.59036%; 83/83 insns; structural/exact (2, 2); .data 100.0%; RESTORED
|
||||
CHANSVm_8144B4D4: initialized parse end: 97.59036%; 83/83 insns; structural/exact (2, 2); .data 100.0%; RESTORED
|
||||
CHANSVm_8144B4D4: explicit type after end initialization: 95.180725%; 83/83 insns; structural/exact (2, 3); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: explicit source table and guards 0: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: explicit source table and guards 1: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: explicit source table and guards 2: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: explicit source table and guards 3: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: explicit source table and guards 4: 62.065216%; 50/46 insns; structural/exact (21, 48); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: explicit source table and guards 5: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
|
||||
VmDateDtor: month and weekday pointer scopes: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
|
||||
VmDateDtor: calendar by value fields: 89.14286%; 90/91 insns; structural/exact (11, 85); .data 100.0%; RESTORED
|
||||
VmDateDtor: return format length directly to limit: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
|
||||
VmDateDtor: month table indexed pointer expression: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
|
||||
VmDateDtor: short-lived month pointer: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: module cached in null-guard scope 0: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: module cached in null-guard scope 1: 97.82609%; 46/46 insns; structural/exact (0, 18); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: module cached in null-guard scope 2: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: module cached in null-guard scope 3: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
|
||||
CHANSVmGetSourceLine: module cached in null-guard scope 4: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: integer argument helper: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
|
||||
VmWinEmuWrite: string argument helper: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
|
||||
VmStringReplace: two string argument helpers: 97.878784%; 132/132 insns; structural/exact (0, 40); .data 100.0%; RESTORED
|
||||
VmStringSplit: string and integer argument helpers: 98.04054%; 222/222 insns; structural/exact (0, 66); .data 100.0%; RESTORED
|
||||
VmBlobGetHexString: integer argument helper: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
|
||||
VmBlobPackCommon: typed argument helper boundaries: COMPILE FAIL .py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\channelScript\CHANSVm.c
|
||||
# ------------------------------------
|
||||
# 4976: argArr = CHANSVmGetArgArray(VmInst, 1);
|
||||
# Error: ^
|
||||
# (10209) illegal implicit conversion from 'int' to
|
||||
# 'struct CHANSVmObjHdr *'
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
; RESTORED
|
||||
VmBlobUnpack: typed string argument helper boundary: 98.26886%; 517/517 insns; structural/exact (0, 156); .data 100.0%; RESTORED
|
||||
CHANSVmNewObjData: separate index-offset and entry locals: 97.1875%; 95/96 insns; structural/exact (7, 59); .data 100.0%; RESTORED
|
||||
CHANSVmNewObjData: scope computed chunk address: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
|
||||
CHANSVmNewObjData: scope slot index to table scan: 99.583336%; 96/96 insns; structural/exact (0, 7); .data 100.0%; RESTORED
|
||||
CHANSVmNewObjData: counted chunk traversal: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
|
||||
VmStringReplace declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 40)
|
||||
VmStringReplace diagnosis: (0, 40); target size 528; declaration entries [' CHANSVmObjHdr* arg0;\n', ' CHANSVmObjHdr* arg1;\n', ' vmString parentStr;\n', ' vmString searchStr;\n', ' vmString replaceStr;\n', ' u32 parentLen;\n', ' u32 srcOffs;\n', ' u32 dstOffs;\n', ' u32 searchLen;\n', ' u32 replaceLen;\n', ' u32 dstBufLen;\n', ' vmString newStr;\n', ' u32 segLen;\n']
|
||||
VmStringReplace declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 40)
|
||||
VmStringReplace declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 40)
|
||||
VmStringReplace declaration order [4, 1, 2, 3, 5, 6, 8, 7, 0, 9, 10, 11, 12]: structural/exact (0, 28)
|
||||
VmStringReplace result (0, 28), attempts 29, RESTORED
|
||||
VmStringSplit declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]: structural/exact (0, 66)
|
||||
VmStringSplit diagnosis: (0, 66); target size 888; declaration entries [' CHANSVmObjHdr* arg0;\n', ' CHANSVmObjHdr* arg1;\n', ' u32 limit;\n', ' CHANSVmObjHdr* array;\n', ' vmString parentStr;\n', ' vmString delimStr;\n', ' u32 parentLen;\n', ' u32 delimLen;\n', ' u32 count;\n', ' u32 srcOffs;\n', ' u32 segStart;\n', ' u32 arrayCount;\n', ' u32 segLen;\n', ' u32 remaining;\n', ' CHANSVmObjHdr* elem;\n', ' u32 i;\n']
|
||||
VmStringSplit declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]: structural/exact (0, 66)
|
||||
VmStringSplit declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]: structural/exact (0, 66)
|
||||
VmStringSplit declaration order [14, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 15]: structural/exact (0, 61)
|
||||
VmStringSplit result (0, 61), attempts 29, RESTORED
|
||||
CHANSVmAddExe declaration order [0, 1, 2, 3, 4, 5, 6]: structural/exact (0, 34)
|
||||
CHANSVmAddExe diagnosis: (0, 34); target size 1016; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' ModuleHeader* mod;\n', ' CHANSVmModule* header;\n', ' u32 maxEnd;\n', ' u32 size;\n', ' u32 cnt;\n', ' u32 ofs;\n']
|
||||
CHANSVmAddExe declaration order [1, 0, 2, 3, 4, 5, 6]: structural/exact (0, 34)
|
||||
CHANSVmAddExe declaration order [2, 1, 0, 3, 4, 5, 6]: structural/exact (0, 34)
|
||||
CHANSVmAddExe result (0, 34), attempts 29, RESTORED
|
||||
CHANSVmLinkModules declaration order [0, 1, 2, 3]: structural/exact (0, 43)
|
||||
CHANSVmLinkModules diagnosis: (0, 43); target size 756; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' CHANSVmModule* module;\n', ' u32 modIdx;\n', ' u32 i;\n']
|
||||
CHANSVmLinkModules declaration order [1, 0, 2, 3]: structural/exact (0, 43)
|
||||
CHANSVmLinkModules declaration order [2, 1, 0, 3]: structural/exact (0, 46)
|
||||
CHANSVmLinkModules result (0, 43), attempts 19, RESTORED
|
||||
VmCallMethod declaration order [0, 1, 2, 3]: structural/exact (4, 97)
|
||||
VmCallMethod diagnosis: (4, 97); target size 1124; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' CHANSVmObjHdr* acc;\n', ' u32 retVal;\n', ' CHANSVmNativeClass* target;\n']
|
||||
VmCallMethod declaration order [1, 0, 2, 3]: structural/exact (4, 97)
|
||||
VmCallMethod declaration order [2, 1, 0, 3]: structural/exact (4, 109)
|
||||
VmCallMethod result (4, 97), attempts 19, RESTORED
|
||||
VmBlobPackCommon declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 246)
|
||||
VmBlobPackCommon diagnosis: (2, 246); target size 2672; declaration entries [' u32 packBuf[2];\n', ' BlobHeader* parentBlob;\n', ' CHANSVmObjHdr* argStr;\n', ' const wchar_t* fmtStr;\n', ' u32 fmtLen;\n', ' CHANSVmObjHdr* argArr;\n', ' u32 fmtPos;\n', ' u32 argCount;\n', ' u32 totalSize;\n', ' s32 count;\n', ' u32 i;\n', ' CHANSVmObjHdr* obj;\n', ' BlobHeader* srcBlob;\n', ' s32 copySize;\n', ' u32 dataSize;\n', ' u32 srcOff;\n', ' CHANSVmObjHdr* strObj;\n', ' u8* srcData;\n', ' u32 charCount;\n', ' u32 strLen;\n', ' CHANSVmObjHdr* intObj;\n', ' u32 valLow;\n', ' u32 valHigh;\n', ' s32 bufSize;\n', ' u8* dest;\n', ' u32 ch;\n', ' CHANSVmExecutionCtx* execCtx;\n']
|
||||
VmBlobPackCommon declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 246)
|
||||
VmBlobPackCommon declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 246)
|
||||
VmBlobPackCommon declaration order [15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 244)
|
||||
VmBlobPackCommon result (2, 244), attempts 29, RESTORED
|
||||
VmBlobUnpack declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 156)
|
||||
VmBlobUnpack diagnosis: (0, 156); target size 2068; declaration entries [' union {\n u64 value;\n u32 words[2];\n } unpackBuf;\n', ' BlobHeader* srcBlob;\n', ' CHANSVmObjHdr* argStr;\n', ' wchar_t* fmtStr;\n', ' u32 fmtLen;\n', ' u32 blobOff;\n', ' u32 argCount;\n', ' u32 fmtPos;\n', ' s32 count;\n', ' u32 elemIdx;\n', ' u32 iterIdx;\n', ' s64 value;\n', ' CHANSVmObjHdr* arrElem;\n']
|
||||
VmBlobUnpack declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 156)
|
||||
VmBlobUnpack declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 156)
|
||||
VmBlobUnpack declaration order [1, 9, 2, 3, 4, 5, 6, 7, 8, 0, 10, 11, 12]: structural/exact (0, 146)
|
||||
VmBlobUnpack result (0, 146), attempts 29, RESTORED
|
||||
CHANSVmNewObjData: offset before chunk scan initialization: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
|
||||
CHANSVmNewObjData: declare scanned chunk inside block: 99.583336%; 96/96 insns; structural/exact (0, 7); .data 100.0%; RESTORED
|
||||
CHANSVmNewObjData: aligned allocation declared in its lifetime: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
|
||||
VmWinEmuWrite: use byte-string member for output address and length: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
|
||||
VmWinEmuWrite: immutable converted string header: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
|
||||
VmWinEmuWrite: cache wide-string payload: 96.49254%; 65/67 insns; structural/exact (6, 54); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: scope byte offset to output creation: 98.72881%; 59/59 insns; structural/exact (0, 12); .data 100.0%; RESTORED
|
||||
VmStringFromCharCode: immutable argument pointer for char conversion: COMPILE FAIL lScript/CHANSVm.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\channelScript\CHANSVm.c
|
||||
# ------------------------------------
|
||||
# 2873: CHANSVmConvertObjectType(VmInst, CHANS_VM_OBJ_TYPE_INTEGER, arg);
|
||||
# Error: ^
|
||||
# (10209) illegal implicit conversion from 'const struct CHANSVmObjHdr *' to
|
||||
# 'struct CHANSVmObjHdr *'
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
; RESTORED
|
||||
VmStringFromCharCode: decrement argument count traversal: 96.10169%; 60/59 insns; structural/exact (7, 31); .data 100.0%; RESTORED
|
||||
VmDateDtor: calendar format inline helper char* buffer, OSCalendarTime* date: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
|
||||
VmDateDtor: calendar format inline helper OSCalendarTime* date, char* buffer: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
|
||||
VmDateDtor: calendar format inline helper char* buffer, OSCalendarTime date: 72.98901%; 107/91 insns; structural/exact (52, 97); .data 100.0%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 0: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 1: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\channelScript\CHANSVm.c
|
||||
# ------------------------------------
|
||||
# 3625: wchar_t* characterText = (wchar_t*)pad0;
|
||||
# Error: ^^^^^^^
|
||||
# (10141) expression syntax error
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 2: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\channelScript\CHANSVm.c
|
||||
# ------------------------------------
|
||||
# 3625: wchar_t* characterText = (wchar_t*)pad0;
|
||||
# Error: ^^^^^^^
|
||||
# (10141) expression syntax error
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 3: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\channelScript\CHANSVm.c
|
||||
# ------------------------------------
|
||||
# 3625: wchar_t* characterText = (wchar_t*)pad0;
|
||||
# Error: ^^^^^^^
|
||||
# (10141) expression syntax error
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 4: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\channelScript\CHANSVm.c
|
||||
# ------------------------------------
|
||||
# 3625: wchar_t* characterText = (wchar_t*)pad0;
|
||||
# Error: ^^^^^^^
|
||||
# (10141) expression syntax error
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 5: 98.58237%; 431/431 insns; structural/exact (10, 42); .data 100.0%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 0: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 1: 96.960556%; 430/431 insns; structural/exact (25, 248); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 2: 97.4594%; 431/431 insns; structural/exact (0, 143); .data 100.0%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 3: 96.19257%; 431/431 insns; structural/exact (10, 170); .data 100.0%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 4: 94.967514%; 432/431 insns; structural/exact (46, 358); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: formatted string payload/character lifetime 5: 98.58237%; 431/431 insns; structural/exact (10, 42); .data 100.0%; RESTORED
|
||||
VmBlobGetHexString declaration order [0, 1, 2, 3, 4, 5, 6]: structural/exact (0, 14)
|
||||
VmBlobGetHexString diagnosis: (0, 14); target size 328; declaration entries [' wchar_t* dest = (wchar_t*)VmGetStrFromObjHdr(VmReturnObj);\n', ' u8* src = blob->pData;\n', ' u32 offset = blob->offset;\n', ' u32 destOff = 0;\n', ' u32 i = 0;\n', ' char* hexTbl = lbl_816976E4;\n', ' u32 loop_i;\n']
|
||||
VmBlobGetHexString declaration order [1, 0, 2, 3, 4, 5, 6]: structural/exact (4, 27)
|
||||
VmBlobGetHexString declaration order [2, 1, 0, 3, 4, 5, 6]: structural/exact (8, 27)
|
||||
VmBlobGetHexString result (0, 14), attempts 98, RESTORED
|
||||
VmCallMethod: separate resolved method index and return status 0: 97.2242%; 281/281 insns; structural/exact (4, 97); .data 100.0%; RESTORED
|
||||
VmCallMethod: separate resolved method index and return status 1: 97.2242%; 281/281 insns; structural/exact (4, 97); .data 100.0%; RESTORED
|
||||
VmCallMethod: separate resolved method index and return status 2: 97.2242%; 281/281 insns; structural/exact (4, 97); .data 100.0%; RESTORED
|
||||
VmCallMethod: separate resolved method index and return status 3: 97.29537%; 281/281 insns; structural/exact (2, 93); .data 100.0%; RESTORED
|
||||
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 0: 99.84919%; 431/431 insns; structural/exact (0, 13); .data 100.0%; RESTORED
|
||||
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 1: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 2: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 3: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 4: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
|
||||
CHANSVm_8145049C: cached string payload before memcpy and assign the formatting-object tag after UTF-16 terminator storage; 99.84919%; 431/431 instructions, 13 register-only differences, .data 100%; KEPT quick GATE PASS.
|
||||
CHANSVm_8145049C declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]: structural/exact (0, 13)
|
||||
CHANSVm_8145049C diagnosis: (0, 13); target size 1724; declaration entries [' u32 halfMaxSize;\n', ' BOOL flag;\n', ' CHANSVmObjHdr* tempObj;\n', ' u32 argIdxCounter;\n', ' u32 totalLen;\n', ' u8* str;\n', ' u32 strLen;\n', ' u32 strPos;\n', ' u32 segStart;\n', ' u32 fmtBufPos;\n', ' u8* tmpBuf;\n', ' u32 maxSize;\n', ' u8* outputBuf;\n', ' u32 outputPos;\n', ' u32 maxLitLen;\n', ' u32 litLen;\n', ' u32 isEscaped;\n', ' CHANSVmObjHdr* cv;\n', ' CHANSVmPrivate* pVm;\n', ' CHANSVmObjHdr* argObj;\n']
|
||||
CHANSVm_8145049C declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]: structural/exact (5, 18)
|
||||
CHANSVm_8145049C declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]: structural/exact (5, 18)
|
||||
CHANSVm_8145049C result (0, 13), attempts 199, RESTORED
|
||||
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 0: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
|
||||
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 1: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
|
||||
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 2: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
|
||||
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 3: 96.15854%; 81/82 insns; structural/exact (8, 34); .data 100.0%; RESTORED
|
||||
VmCallMethod: direct missing method/property conditional return: 97.29537%; 281/281 insns; structural/exact (2, 93); .data 100.0%; RESTORED
|
||||
VmCallMethod: call argument/operand scheduling 0: 97.98933%; 281/281 insns; structural/exact (2, 95); .data 100.0%; RESTORED
|
||||
VmCallMethod: call argument/operand scheduling 1: 98.0605%; 281/281 insns; structural/exact (0, 91); .data 100.0%; RESTORED
|
||||
VmCallMethod: call argument/operand scheduling 2: 97.29537%; 281/281 insns; structural/exact (2, 93); .data 100.0%; RESTORED
|
||||
CHANSVmStep: typed interpreter scratch layout 0: 96.452515%; 1253/1253 insns; structural/exact (71, 318); .data 100.0%; RESTORED
|
||||
CHANSVmStep: typed interpreter scratch layout 1: 96.43735%; 1253/1253 insns; structural/exact (90, 332); .data 100.0%; RESTORED
|
||||
CHANSVmStep: typed interpreter scratch layout 2: 96.440544%; 1253/1253 insns; structural/exact (86, 329); .data 100.0%; RESTORED
|
||||
CHANSVmStep: entry count branch and pretested loop: 96.96728%; 1255/1253 insns; structural/exact (82, 1229); .data 18.050066%; RESTORED
|
||||
CHANSVmStep: pretested countdown retaining default count arithmetic: 96.400635%; 1254/1253 insns; structural/exact (87, 1238); .data 18.050066%; RESTORED
|
||||
CHANSVmStep: separate operand enums before copy headers: 96.43735%; 1253/1253 insns; structural/exact (90, 332); .data 100.0%; RESTORED
|
||||
VmCallMethod: direct missing-method/property return and choose header argument at call boundary; 98.0605%; 281/281 instructions, 91 register-only differences, structural differences 0; .data 100%; KEPT quick GATE PASS.
|
||||
CHANSVmStep: group actual type, floating-immediate, copy-header, load-header, and operand workspaces; all fields actively used, no padding or dummy fields; 96.452515%; 1253/1253 instructions, structural/exact 71/318; .data 100%; KEPT quick GATE PASS.
|
||||
CHANSVmNewObjData: declaration-order coverage 164 distinct source orders; best structural/exact (0, 7); no new exact result, restored previous accepted source.
|
||||
VmStringFromCharCode: declaration-order coverage 91 distinct source orders; best structural/exact (0, 6); no new exact result, restored previous accepted source.
|
||||
VmWinEmuWrite: declaration-order coverage 85 distinct source orders; best structural/exact (0, 5); no new exact result, restored previous accepted source.
|
||||
VmStringReplace: declaration-order coverage 30 distinct source orders; best structural/exact (0, 28); no new exact result, restored previous accepted source.
|
||||
VmStringSplit: declaration-order coverage 30 distinct source orders; best structural/exact (0, 61); no new exact result, restored previous accepted source.
|
||||
CHANSVmAddExe: declaration-order coverage 30 distinct source orders; best structural/exact (0, 34); no new exact result, restored previous accepted source.
|
||||
CHANSVmLinkModules: declaration-order coverage 20 distinct source orders; best structural/exact (0, 43); no new exact result, restored previous accepted source.
|
||||
VmCallMethod: declaration-order coverage 20 distinct source orders; best structural/exact (4, 97); no new exact result, restored previous accepted source.
|
||||
VmBlobPackCommon: declaration-order coverage 30 distinct source orders; best structural/exact (2, 244); no new exact result, restored previous accepted source.
|
||||
VmBlobUnpack: declaration-order coverage 30 distinct source orders; best structural/exact (0, 146); no new exact result, restored previous accepted source.
|
||||
VmBlobGetHexString: declaration-order coverage 99 distinct source orders; best structural/exact (0, 14); no new exact result, restored previous accepted source.
|
||||
CHANSVm_8145049C: declaration-order coverage 200 distinct source orders; best structural/exact (0, 13); no new exact result, restored previous accepted source.
|
||||
|
||||
## 2026-10-01 final handoff after clean full gate
|
||||
|
||||
Instruction-exact 215/233 -> 216/233; objdiff matched code 35020/53564 -> 35484/53564; data 6904/6904 -> 6904/6904; .data 100%. vmBlobParsePackFormatString is now 100% objdiff with 116/116 instructions and ctxdiff diffs 0. All 121 Step and all 89 formatter jump-table relocation offsets, types, and addends match after the clean rebuild.
|
||||
|
||||
| Open function | Objdiff % | Structural / raw differences | Distinct current-round attempts | Remaining difference |
|
||||
|---|---:|---:|---:|---|
|
||||
| CHANSVmGetSourceLine | 97.82609 | 0 / 16 | 11 | register allocation |
|
||||
| CHANSVmNewObjData | 99.427086 | 0 / 10 | 171 | register allocation |
|
||||
| CHANSVmParseInt | 94.69388 | 2 / 3 | 4 | parse-end store after parameter copies |
|
||||
| CHANSVm_8144B4D4 | 97.59036 | 2 / 2 | 4 | parse-end store after type comparison |
|
||||
| VmDateDtor | 94.96703 | 5 / 7 | 8 | month/day argument-load scheduling |
|
||||
| VmStringFromCharCode | 99.40678 | 0 / 6 | 102 | register allocation |
|
||||
| VmStringReplace | 97.878784 | 0 / 40 | 31 | register allocation |
|
||||
| VmStringSplit | 98.04054 | 0 / 66 | 31 | register allocation |
|
||||
| CHANSVm_8145049C | 99.84919 | 0 / 13 | 214 | register allocation |
|
||||
| VmBlobGetHexString | 98.71951 | 0 / 14 | 104 | register allocation |
|
||||
| VmBlobPackCommon | 97.934135 | 2 / 246 | 30 | register allocation and two operand-order differences |
|
||||
| VmBlobUnpack | 98.26886 | 0 / 156 | 31 | register allocation |
|
||||
| VmWinEmuWrite | 99.62687 | 0 / 5 | 92 | register allocation |
|
||||
| CHANSVmAddExe | 99.15354 | 0 / 34 | 30 | register allocation |
|
||||
| CHANSVmLinkModules | 98.677246 | 0 / 43 | 20 | register allocation |
|
||||
| VmCallMethod | 98.0605 | 0 / 91 | 29 | register allocation |
|
||||
| CHANSVmStep | 96.452515 | 71 / 318 | 7 | entry/countdown flow, result-table base, registers and remaining spills |
|
||||
|
||||
The unit remains partial with 17 open functions; all have at least three distinct compiled source-level attempts in this run. No linking/configuration changes. Compiler tie-breaks remain unresolved. Four local source commits: d6ec7d58, aa49bd1b, 9283affb, 9265fb79.
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 35484/53564 data 6904/6904 functions 216/233 fuzzy 99.2720 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 216/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.27205
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.427086
|
||||
[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: VmStringFromCharCode 99.40678
|
||||
[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.934135
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
|
||||
[src/channelScript/CHANSVm] baseline: code 35020/53564 data 6904 functions 215 fuzzy 99.2097
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.68724 -> 86.70274
|
||||
global fuzzy_match_percent: 99.30689 -> 99.30802
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11031 -> 91.11031
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
164
tools/decomp-assist/CHANSVm.round7-attempts.md
Normal file
164
tools/decomp-assist/CHANSVm.round7-attempts.md
Normal file
@@ -0,0 +1,164 @@
|
||||
# CHANSVm round 7 attempts
|
||||
|
||||
Baseline ab015200: 216/233 instruction-exact; code 35484/53564; data 6904/6904; all 121 .data relocations match.
|
||||
Pool checked before code experiments. Source scope is CHANSVm.c.
|
||||
|
||||
Initial CHANSVmGetSourceLine: 97.826090%; instructions 46/46; structural 0; diffs 16.
|
||||
Initial CHANSVmNewObjData: 99.583336%; instructions 96/96; structural 0; diffs 7.
|
||||
Initial CHANSVmParseInt: 94.693880%; instructions 49/49; structural 2; diffs 3.
|
||||
Initial CHANSVm_8144B4D4: 97.590360%; instructions 83/83; structural 2; diffs 2.
|
||||
Initial VmDateDtor: 94.967030%; instructions 91/91; structural 5; diffs 7.
|
||||
Initial VmStringFromCharCode: 99.406780%; instructions 59/59; structural 0; diffs 6.
|
||||
Initial VmStringReplace: 97.878784%; instructions 132/132; structural 0; diffs 40.
|
||||
Initial VmStringSplit: 98.040540%; instructions 222/222; structural 0; diffs 66.
|
||||
Initial CHANSVm_8145049C: 99.849190%; instructions 431/431; structural 0; diffs 13.
|
||||
Initial VmBlobGetHexString: 98.719510%; instructions 82/82; structural 0; diffs 14.
|
||||
Initial VmBlobPackCommon: 97.934135%; instructions 668/668; structural 2; diffs 246.
|
||||
Initial VmBlobUnpack: 98.268860%; instructions 517/517; structural 0; diffs 156.
|
||||
Initial VmWinEmuWrite: 99.626870%; instructions 67/67; structural 0; diffs 5.
|
||||
Initial CHANSVmAddExe: 99.153540%; instructions 254/254; structural 0; diffs 34.
|
||||
Initial CHANSVmLinkModules: 98.677246%; instructions 189/189; structural 0; diffs 43.
|
||||
Initial VmCallMethod: 98.060500%; instructions 281/281; structural 0; diffs 91.
|
||||
Initial CHANSVmStep: 96.452515%; instructions 1253/1253; structural 71; diffs 318.
|
||||
- CHANSVmNewObjData: chunk index scoped to chunk fallback scan; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: aligned allocation size scoped after entry selection; 99.427086%; instructions 96/96; structural 0; diffs 10; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: explicit chunk slot kept only across allocation; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: chunk table scanned with pointer and index; 90.020836%; instructions 96/96; structural 17; diffs 53; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: aligned total length scoped inside valid string; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: remaining and converted lengths scoped per conversion; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: capture conversion return directly at declaration; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: for loop owns the byte offset; COMPILE FAIL; restored. /43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6072: for (u32 offset = 0; offset < totalLength; offset += 0x80) { # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVmNewObjData: declaration-order search, 120 distinct compiling orders; best structural/diffs (0, 7); 99.583336%; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: declaration-order search, 120 distinct compiling orders; best structural/diffs (0, 5); 99.626870%; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: zero parser endpoint with memset; 77.020410%; instructions 53/49; structural 21; diffs 51; code 35484; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: zero parser endpoint with memset; 93.915665%; instructions 86/83; structural 9; diffs 74; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: cache object type as unsigned full word; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: cache object type as unsigned full word; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: assign type at declaration after endpoint declaration; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: assign type at declaration after endpoint declaration; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: initialize endpoint and type in one expression; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: initialize endpoint and type in one expression; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: load object type directly after parser endpoint initialization; 83.673470%; instructions 49/49; structural 4; diffs 5; code 35484; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: load object type directly after parser endpoint initialization; 95.180725%; instructions 83/83; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: word value temporary before UTF16 character mask; 94.322040%; instructions 57/59; structural 9; diffs 45; code 35484; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: separate character index increment from byte cursor increment; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: for traversal owns argument conversion scope; 99.322040%; instructions 59/59; structural 0; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: mask wide character with typed word mask; 94.322040%; instructions 57/59; structural 9; diffs 45; code 35484; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: converted integer helper call boundary; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
|
||||
- VmDateDtor: month and day tables use explicit pointer addition; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- VmDateDtor: cache weekday index and month index at format branch; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- VmDateDtor: format using explicit year value beside table pointers; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: inline module source-line lookup helper, module before pc; 88.369570%; instructions 48/46; structural 8; diffs 26; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: inline module source-line lookup helper, pc before module; 88.369570%; instructions 48/46; structural 8; diffs 26; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: declare module/table/pc alongside context with checked loads; 97.391304%; instructions 46/46; structural 0; diffs 17; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: unsigned marker offset separated from line table pointer; 97.826090%; instructions 46/46; structural 0; diffs 16; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: save raw argument before string conversion; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: loop uses current total length and named converted object; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: reserve chunk inline helper variant 1; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: reserve chunk inline helper variant 2; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: reserve chunk inline helper variant 3; 99.427086%; instructions 96/96; structural 0; diffs 10; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: inline converted string writer variant 1; 99.104480%; instructions 67/67; structural 5; diffs 13; code 35484; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: inline converted string writer variant 2; 96.388060%; instructions 67/67; structural 9; diffs 16; code 35484; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: inline integer character conversion variant 1; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: inline integer character conversion variant 2; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
|
||||
- VmDateDtor: inline calendar formatting variant 1; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- VmDateDtor: inline calendar formatting variant 2; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: reserve chunk inline helper selected for refinement; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; retained.
|
||||
- CHANSVmNewObjData: allocated size declared after reserved entry; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: outer private VM reference drives allocation; 99.270836%; instructions 96/96; structural 0; diffs 14; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: allocation size declared inside allocation scope; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: inline allocator for a reserved chunk entry; COMPILE FAIL; restored. ceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 384: object->value.ptr_v = entry; # Error: ^ # (10209) illegal implicit conversion from 'struct ChunkEntry *' to # 'void **' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Restored whole-reservation helper pending a narrower scan boundary; its only surviving differences were three allocation-size registers, 99.843750%.
|
||||
- CHANSVmNewObjData: reserve and allocate inline helper boundaries; 97.708336%; instructions 98/96; structural 6; diffs 13; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: reserve helper with typed aligned size named in outer scope; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: reserve helper with allocated byte count initialized at use; COMPILE FAIL; restored. /43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 390: u32 memSize = VM_ALIGN(length); # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVmNewObjData: inline chunk fallback scan keeps allocation in caller; 94.583336%; instructions 99/96; structural 8; diffs 67; code 35484; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: hex pairs share one character index; 90.060974%; instructions 83/82; structural 10; diffs 38; code 35484; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: character index advances after both hex digits; 93.780490%; instructions 79/82; structural 10; diffs 37; code 35484; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: byte loop index determines both output positions; 93.780490%; instructions 79/82; structural 10; diffs 37; code 35484; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: first nibble scoped before output index arithmetic; 98.719510%; instructions 82/82; structural 0; diffs 14; code 35484; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: argument index determines the two byte positions; 100.000000%; instructions 59/59; structural 0; diffs 0; code 35720; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: argument index determines the two byte positions exact candidate; 100.000000%; instructions 59/59; structural 0; diffs 0; code 35720; data 6904/6904; retained.
|
||||
- CHANSVmNewObjData: remove unobserved traversal-offset initialization and increments; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: typed chunk entry and direct global chunk index; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: first fallback slot declared at scan boundary; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35720; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: byte iteration supplies first destination index; 98.719510%; instructions 82/82; structural 0; diffs 14; code 35720; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: byte iteration supplies second destination index; 95.536580%; instructions 81/82; structural 9; diffs 36; code 35720; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: hex second index is initialized before first index cursor; 98.719510%; instructions 82/82; structural 0; diffs 14; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: program-counter-derived source entry index with explicit marker limit; 97.826090%; instructions 46/46; structural 0; diffs 18; code 35720; data 6904/6904; restored.
|
||||
- CHANSVm_8145049C: typed string-format payload/owner/count declaration location 1; 99.187935%; instructions 431/431; structural 0; diffs 53; code 35720; data 6904/6904; restored.
|
||||
- CHANSVm_8145049C: typed string-format payload/owner/count declaration location 2; 99.187935%; instructions 431/431; structural 0; diffs 53; code 35720; data 6904/6904; restored.
|
||||
- CHANSVm_8145049C: typed string-format payload/owner/count declaration location 3; 99.849190%; instructions 431/431; structural 0; diffs 13; code 35720; data 6904/6904; restored.
|
||||
- VmStringReplace: source and search payloads cached as typed string values; 97.954544%; instructions 132/132; structural 0; diffs 45; code 35720; data 6904/6904; restored.
|
||||
- VmStringReplace: scope parent/search lengths after string conversions; 97.878784%; instructions 132/132; structural 0; diffs 40; code 35720; data 6904/6904; restored.
|
||||
- VmStringReplace: second conversion uses its own argument scope; 97.878784%; instructions 132/132; structural 0; diffs 40; code 35720; data 6904/6904; restored.
|
||||
- VmStringReplace: tail copy derives segment length at the copy site; 97.878784%; instructions 132/132; structural 0; diffs 40; code 35720; data 6904/6904; restored.
|
||||
- VmStringSplit: cache parent and delimiter string records; 97.567566%; instructions 222/222; structural 0; diffs 88; code 35720; data 6904/6904; restored.
|
||||
- VmStringSplit: loop counts initialized before cursors; 98.040540%; instructions 222/222; structural 0; diffs 66; code 35720; data 6904/6904; restored.
|
||||
- VmStringSplit: delimiter miss branches around matched-segment tail; 96.238740%; instructions 222/222; structural 8; diffs 82; code 35720; data 6904/6904; restored.
|
||||
- VmStringSplit: empty-delimiter byte cursor derives from character index; 98.040540%; instructions 222/222; structural 0; diffs 66; code 35720; data 6904/6904; restored.
|
||||
- VmBlobPackCommon: skip integer packing immediately when no elements remain; 97.634730%; instructions 670/668; structural 33; diffs 469; code 35720; data 6904/6904; restored.
|
||||
- VmBlobPackCommon: integer elements use loop-tail continue into format parser; 97.934135%; instructions 668/668; structural 2; diffs 246; code 35720; data 6904/6904; restored.
|
||||
- VmBlobPackCommon: integer pack loop uses explicitly tested do loop; 97.410180%; instructions 669/668; structural 35; diffs 468; code 35720; data 6904/6904; restored.
|
||||
- VmBlobPackCommon: packing pass owns converted format and blob locals; 97.934135%; instructions 668/668; structural 2; diffs 246; code 35720; data 6904/6904; restored.
|
||||
- VmBlobUnpack: decoded integer scoped to numeric unpack cases; 98.268860%; instructions 517/517; structural 0; diffs 156; code 35720; data 6904/6904; restored.
|
||||
- VmBlobUnpack: counting pass owns index and cursor declarations; COMPILE FAIL; restored. d/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 5484: u32 blobOff = srcBlob->offset; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- VmBlobUnpack: string trimming separates remaining characters from byte pointer; 97.949710%; instructions 516/517; structural 51; diffs 258; code 35720; data 6904/6904; restored.
|
||||
- VmBlobUnpack: hex output indexes derive from source-byte iteration; 96.847200%; instructions 520/517; structural 55; diffs 227; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmAddExe: module clearing uses typed module array index; 99.153540%; instructions 254/254; structural 0; diffs 34; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmAddExe: range macro counters declared at each table boundary; COMPILE FAIL; restored. d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6301: { u32 cnt = header->nameCount; if (cnt) { u32 ofs = (u32) header- # Error: ^ # (10121) declaration syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVmAddExe: name pointer cached beside dispatch entry validation; 97.559050%; instructions 254/254; structural 7; diffs 42; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmAddExe: table traversal uses while loop with explicit increment; 97.618110%; instructions 254/254; structural 8; diffs 42; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: global and native dispatch loops own separate index scopes; COMPILE FAIL; restored. .py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6774: u32 i; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVmLinkModules: index-driven module loop uses for form; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: dispatch entry snapshots declared before nested index loop; COMPILE FAIL; restored. src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6779: u8* addr; # Error: ^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- VmCallMethod: method table selection compares method count first; 98.024910%; instructions 281/281; structural 1; diffs 92; code 35720; data 6904/6904; restored.
|
||||
- VmCallMethod: property selector derives method-null after set flag; 98.060500%; instructions 281/281; structural 0; diffs 91; code 35720; data 6904/6904; restored.
|
||||
- VmCallMethod: return-frame size uses conditional scalar temporary; 98.060500%; instructions 281/281; structural 0; diffs 91; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: global and native loop indices have independent lifetimes; COMPILE FAIL; restored. NSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6843: for (i = 0; i < module->nameCount; i++) { # Error: ^ # (10140) undefined identifier 'i' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVmLinkModules: dispatch snapshot declared before module passes; COMPILE FAIL; restored. src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6779: u8* addr; # Error: ^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVmLinkModules: global address derived with pointer addition operand order; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: aligned string length from inline payload accessor; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35720; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: byte offset increment moved into for loop expression; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35720; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: use byte length as signed nonnegative loop bound; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: parser endpoint reset crosses an inline helper boundary; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: typed object type loaded through inline helper; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: base argument copied beside parser initialization; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: separate global/native indices while retaining local-function index; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: dispatch snapshots scoped before each index loop; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: snapshot declared across passes with address declaration first; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmStep: normalize zero step count with explicit conditional; 96.854750%; instructions 1254/1253; structural 66; diffs 1229; code 35720; data 2232/6904; restored.
|
||||
- CHANSVmStep: pretested countdown loop and explicit zero normalization; 96.983240%; instructions 1255/1253; structural 63; diffs 1228; code 35720; data 2232/6904; restored.
|
||||
- CHANSVmStep: result table accesses directly name constant fields; 96.308860%; instructions 1254/1253; structural 89; diffs 1094; code 35720; data 2232/6904; restored.
|
||||
- CHANSVmStep: pretested countdown and direct result table fields; 96.772545%; instructions 1256/1253; structural 82; diffs 1231; code 35720; data 2232/6904; restored.
|
||||
- CHANSVmStep: enumerated operand type addresses derive from index; 96.396645%; instructions 1254/1253; structural 75; diffs 1131; code 35720; data 2232/6904; restored.
|
||||
- CHANSVmStep: operand type loads follow left then right source order; 96.452515%; instructions 1253/1253; structural 71; diffs 318; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmStep: conditional argument type declared at enumeration call; 96.452515%; instructions 1253/1253; structural 71; diffs 318; code 35720; data 6904/6904; restored.
|
||||
- CHANSVmStep: direct tables, indexed enumeration, and pretested countdown combined; 96.604950%; instructions 1257/1253; structural 74; diffs 1220; code 35720; data 2232/6904; restored.
|
||||
|
||||
## Final audit
|
||||
|
||||
VmStringFromCharCode is the only retained source change: replace the redundant byte cursor with i * 2 and i * 2 + 1. It is 100.0% in objdiff, 59/59 instructions, ctxdiff diffs 0. All other experiments were restored, including the temporary reservation helper. That helper reached 99.843750% but retained three allocation-size register differences.
|
||||
The completed source diff contains no added comments, assembly, data-placement changes, shared-header edits, compiler pragmas or uninitialized-value tricks. No configure.py changes were made.
|
||||
Final full clean gate: PASS; exact 216/233 -> 217/233; code 35484/53564 -> 35720/53564; data 6904/6904 -> 6904/6904. Pools contain 125 identical strings. All 121 CHANSVmStep .data jump-table relocations are identical. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Regressions, forbidden patterns and readability warnings are zero.
|
||||
|
||||
Every remaining function has at least three compiling, distinct source-level attempts in this run. Failed compilations are excluded. The declaration-order searches add 120 NewObjData and 120 WinEmuWrite compiled permutations; JSON trial orders are in /tmp/chansvm-r7-decl-*.json.
|
||||
|
||||
CHANSVmGetSourceLine 97.826090%, module, entry, bitfield and line-offset registers; 46/46 instructions, structural 0, diffs 16; 5 distinct compiling source attempts.
|
||||
CHANSVmNewObjData 99.583336%, seven chunk-index and table-slot register differences; 96/96 instructions, structural 0, diffs 7; 17 distinct compiling source attempts.
|
||||
CHANSVmParseInt 94.693880%, three prologue positions schedule endpoint initialization after argument copies; 49/49 instructions, structural 2, diffs 3; 8 distinct compiling source attempts.
|
||||
CHANSVm_8144B4D4 97.590360%, endpoint store and type comparison are scheduled in opposite order; 83/83 instructions, structural 2, diffs 2; 5 distinct compiling source attempts.
|
||||
VmDateDtor 94.967030%, seven calendar table-load and variadic argument positions are scheduled differently; 91/91 instructions, structural 5, diffs 7; 5 distinct compiling source attempts.
|
||||
VmStringReplace 97.878784%, source/search/replacement and traversal register allocation; 132/132 instructions, structural 0, diffs 40; 4 distinct compiling source attempts.
|
||||
VmStringSplit 98.040540%, delimiter, cursor, array and element register allocation; 222/222 instructions, structural 0, diffs 66; 4 distinct compiling source attempts.
|
||||
CHANSVm_8145049C 99.849190%, thirteen string-format payload and owner register differences; 431/431 instructions, structural 0, diffs 13; 3 distinct compiling source attempts.
|
||||
VmBlobGetHexString 98.719510%, fourteen hex index, cursor and digit register differences; 82/82 instructions, structural 0, diffs 14; 7 distinct compiling source attempts.
|
||||
VmBlobPackCommon 97.934135%, two branch destinations plus packing-state register allocation; 668/668 instructions, structural 2, diffs 246; 4 distinct compiling source attempts.
|
||||
VmBlobUnpack 98.268860%, format, cursor and decoded-value register allocation; 517/517 instructions, structural 0, diffs 156; 3 distinct compiling source attempts.
|
||||
VmWinEmuWrite 99.626870%, five converted-string and aligned-length register differences; 67/67 instructions, structural 0, diffs 5; 10 distinct compiling source attempts.
|
||||
CHANSVmAddExe 99.153540%, module, size and relocation-loop register allocation; 254/254 instructions, structural 0, diffs 34; 3 distinct compiling source attempts.
|
||||
CHANSVmLinkModules 98.677246%, module, dispatch and object-iterator register allocation; 189/189 instructions, structural 0, diffs 43; 5 distinct compiling source attempts.
|
||||
VmCallMethod 98.060500%, call-frame, native target and property selector register allocation; 281/281 instructions, structural 0, diffs 91; 3 distinct compiling source attempts.
|
||||
CHANSVmStep 96.452515%, countdown control flow, table-base addressing, operand-type spill and registers; 1253/1253 instructions, structural 71, diffs 318; 8 distinct compiling source attempts.
|
||||
|
||||
Disassembly note: disasm_fn.py stops at the first paired-single instruction in CHANSVmStep. Its complete target was read from build/43U/asm/src/channelScript/CHANSVm.s, and ctxdiff/declsearch compare all 1253 instructions. The compiler reason behind remaining register choices and scheduling is uncertain; the residual instruction differences are measured, not asserted impossible.
|
||||
36
tools/decomp-assist/CHANSVm.round7-final-gate.txt
Normal file
36
tools/decomp-assist/CHANSVm.round7-final-gate.txt
Normal file
@@ -0,0 +1,36 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 35720/53564 data 6904/6904 functions 217/233 fuzzy 99.2758 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 217/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.27578
|
||||
[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.934135
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
|
||||
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.76230 -> 86.77018
|
||||
global fuzzy_match_percent: 99.32123 -> 99.32127
|
||||
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
|
||||
37
tools/decomp-assist/CHANSVm.round7-gates.txt
Normal file
37
tools/decomp-assist/CHANSVm.round7-gates.txt
Normal file
@@ -0,0 +1,37 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 35720/53564 data 6904/6904 functions 217/233 fuzzy 99.2758 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 217/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.27578
|
||||
[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.934135
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
|
||||
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.76230 -> 86.77018
|
||||
global fuzzy_match_percent: 99.32123 -> 99.32127
|
||||
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
|
||||
|
||||
69
tools/decomp-assist/CHANSVm.round7-report.md
Normal file
69
tools/decomp-assist/CHANSVm.round7-report.md
Normal file
@@ -0,0 +1,69 @@
|
||||
GATE PASS
|
||||
|
||||
Instruction-exact 216/233 -> 217/233. Objdiff code 35484/53564 -> 35720/53564. Data 6904/6904 -> 6904/6904; .data 100.0%, all 121 interpreter jump-table relocations identical.
|
||||
|
||||
VmStringFromCharCode 100.0%; 59/59 instructions, ctxdiff diffs 0. Source commit 6f879ba3.
|
||||
|
||||
Remaining functions:
|
||||
|
||||
CHANSVmGetSourceLine 97.826090%, module, entry, bitfield and line-offset registers; 46/46 instructions, structural 0, diffs 16; 5 distinct compiling source attempts.
|
||||
CHANSVmNewObjData 99.583336%, seven chunk-index and table-slot register differences; 96/96 instructions, structural 0, diffs 7; 17 distinct compiling source attempts.
|
||||
CHANSVmParseInt 94.693880%, three prologue positions schedule endpoint initialization after argument copies; 49/49 instructions, structural 2, diffs 3; 8 distinct compiling source attempts.
|
||||
CHANSVm_8144B4D4 97.590360%, endpoint store and type comparison are scheduled in opposite order; 83/83 instructions, structural 2, diffs 2; 5 distinct compiling source attempts.
|
||||
VmDateDtor 94.967030%, seven calendar table-load and variadic argument positions are scheduled differently; 91/91 instructions, structural 5, diffs 7; 5 distinct compiling source attempts.
|
||||
VmStringReplace 97.878784%, source/search/replacement and traversal register allocation; 132/132 instructions, structural 0, diffs 40; 4 distinct compiling source attempts.
|
||||
VmStringSplit 98.040540%, delimiter, cursor, array and element register allocation; 222/222 instructions, structural 0, diffs 66; 4 distinct compiling source attempts.
|
||||
CHANSVm_8145049C 99.849190%, thirteen string-format payload and owner register differences; 431/431 instructions, structural 0, diffs 13; 3 distinct compiling source attempts.
|
||||
VmBlobGetHexString 98.719510%, fourteen hex index, cursor and digit register differences; 82/82 instructions, structural 0, diffs 14; 7 distinct compiling source attempts.
|
||||
VmBlobPackCommon 97.934135%, two branch destinations plus packing-state register allocation; 668/668 instructions, structural 2, diffs 246; 4 distinct compiling source attempts.
|
||||
VmBlobUnpack 98.268860%, format, cursor and decoded-value register allocation; 517/517 instructions, structural 0, diffs 156; 3 distinct compiling source attempts.
|
||||
VmWinEmuWrite 99.626870%, five converted-string and aligned-length register differences; 67/67 instructions, structural 0, diffs 5; 10 distinct compiling source attempts.
|
||||
CHANSVmAddExe 99.153540%, module, size and relocation-loop register allocation; 254/254 instructions, structural 0, diffs 34; 3 distinct compiling source attempts.
|
||||
CHANSVmLinkModules 98.677246%, module, dispatch and object-iterator register allocation; 189/189 instructions, structural 0, diffs 43; 5 distinct compiling source attempts.
|
||||
VmCallMethod 98.060500%, call-frame, native target and property selector register allocation; 281/281 instructions, structural 0, diffs 91; 3 distinct compiling source attempts.
|
||||
CHANSVmStep 96.452515%, countdown control flow, table-base addressing, operand-type spill and registers; 1253/1253 instructions, structural 71, diffs 318; 8 distinct compiling source attempts.
|
||||
|
||||
Files changed: src/channelScript/CHANSVm.c; tools/decomp-assist/CHANSVm.round7-attempts.md; CHANSVm.round7-gates.txt; CHANSVm.round7-final-gate.txt; CHANSVm.round7-report.md.
|
||||
|
||||
Uncertain: compiler cause of remaining scheduling and register allocation.
|
||||
|
||||
Final full gate:
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 35720/53564 data 6904/6904 functions 217/233 fuzzy 99.2758 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 217/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.27578
|
||||
[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.934135
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
|
||||
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.76230 -> 86.77018
|
||||
global fuzzy_match_percent: 99.32123 -> 99.32127
|
||||
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
|
||||
```
|
||||
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
|
||||
```
|
||||
215
tools/decomp-assist/CHANSVm.sol-low-attempts.md
Normal file
215
tools/decomp-assist/CHANSVm.sol-low-attempts.md
Normal file
@@ -0,0 +1,215 @@
|
||||
# CHANSVm sol-low matching attempts
|
||||
|
||||
Baseline 699f8443: instruction-exact 216/233; code 35484/53564; data 6904/6904.
|
||||
Pool identical, 125 strings; .data jump-table relocations must remain exact.
|
||||
|
||||
Initial CHANSVmGetSourceLine: 97.82609%; {'insns': '46/46', 'diffs': 16, 'structural': 0}
|
||||
Initial CHANSVmNewObjData: 99.427086%; {'insns': '96/96', 'diffs': 10, 'structural': 0}
|
||||
Initial CHANSVmParseInt: 94.69388%; {'insns': '49/49', 'diffs': 3, 'structural': 2}
|
||||
Initial CHANSVm_8144B4D4: 97.59036%; {'insns': '83/83', 'diffs': 2, 'structural': 2}
|
||||
Initial VmDateDtor: 94.96703%; {'insns': '91/91', 'diffs': 7, 'structural': 5}
|
||||
Initial VmStringFromCharCode: 99.40678%; {'insns': '59/59', 'diffs': 6, 'structural': 0}
|
||||
Initial VmStringReplace: 97.878784%; {'insns': '132/132', 'diffs': 40, 'structural': 0}
|
||||
Initial VmStringSplit: 98.04054%; {'insns': '222/222', 'diffs': 66, 'structural': 0}
|
||||
Initial CHANSVm_8145049C: 99.84919%; {'insns': '431/431', 'diffs': 13, 'structural': 0}
|
||||
Initial VmBlobGetHexString: 98.71951%; {'insns': '82/82', 'diffs': 14, 'structural': 0}
|
||||
Initial VmBlobPackCommon: 97.934135%; {'insns': '668/668', 'diffs': 246, 'structural': 2}
|
||||
Initial VmBlobUnpack: 98.26886%; {'insns': '517/517', 'diffs': 156, 'structural': 0}
|
||||
Initial VmWinEmuWrite: 99.62687%; {'insns': '67/67', 'diffs': 5, 'structural': 0}
|
||||
Initial CHANSVmAddExe: 99.15354%; {'insns': '254/254', 'diffs': 34, 'structural': 0}
|
||||
Initial CHANSVmLinkModules: 98.677246%; {'insns': '189/189', 'diffs': 43, 'structural': 0}
|
||||
Initial VmCallMethod: 98.0605%; {'insns': '281/281', 'diffs': 91, 'structural': 0}
|
||||
Initial CHANSVmStep: 96.452515%; {'insns': '1253/1253', 'diffs': 318, 'structural': 71}
|
||||
- CHANSVmParseInt: initialize endpoint at declaration after cached type; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: declare endpoint and initialize before type load; 83.673470%; insns 49/49; structural 4; diffs 5; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: load type immediately before null endpoint assignment; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: assign endpoint within string-type condition; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: scope endpoint within converted string block; 82.244896%; insns 51/49; structural 10; diffs 41; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: initialize floating parser endpoint at declaration; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: float parser type loaded before endpoint in statements; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: float parser endpoint assignment in type condition; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: float parser endpoint initialized before type declaration; 95.180725%; insns 83/83; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: allocation extent before chunk traversal index; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: chunk before traversal counters; 99.427086%; insns 96/96; structural 0; diffs 10; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: chunk traversal index after union entry; 99.427086%; insns 96/96; structural 0; diffs 10; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: aligned byte length declared before string object; 99.179110%; insns 67/67; structural 0; diffs 8; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: aligned length before byte offset; 99.179110%; insns 67/67; structural 0; diffs 8; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: remaining byte length before string object; 99.626870%; insns 67/67; structural 0; diffs 5; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: character value declared before byte cursor; 99.152540%; insns 59/59; structural 0; diffs 9; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: byte cursor declared after character index; 98.728810%; insns 59/59; structural 0; diffs 12; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: character value declared after character index; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- CHANSVm_8145049C: shared character and string payload use typed pointers; COMPILE FAIL; restored. ^ # (10209) illegal implicit conversion from 'char *' to # 'unsigned char *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVm_8145049C: set shared string object before character buffer pointer; 99.350350%; insns 430/431; structural 25; diffs 142; data 2232/6904; restored.
|
||||
- CHANSVm_8145049C: use separate source pointer for common string formatting; COMPILE FAIL; restored. ^ # (10209) illegal implicit conversion from 'char *' to # 'unsigned char *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- VmDateDtor: cache month name before variadic argument setup; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
- VmDateDtor: cache day then month names before formatting; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
- VmDateDtor: cache month then day names before formatting; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
- VmDateDtor: month table lookup through scoped pointer; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
- VmDateDtor: cache year after month name lookup; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: group parser endpoint and character buffer in typed workspace; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: group float parser endpoint and buffer in typed workspace; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: type mismatch jumps to shared failure return; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: float type mismatch jumps to shared failure return; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: allow automatic parser inlining; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: allocation extent before chunk traversal index; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; retained.
|
||||
- CHANSVmNewObjData: separate selected entry pointer from chunk index arithmetic; 97.187500%; insns 95/96; structural 7; diffs 59; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: typed selected entry declared before counters; 97.187500%; insns 95/96; structural 7; diffs 59; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: cache module before line table traversal; 97.826090%; insns 46/46; structural 0; diffs 16; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: declare marker offset after bitfield pointer; 97.826090%; insns 46/46; structural 0; diffs 16; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: cache low program-counter byte before line entry; 97.826090%; insns 46/46; structural 0; diffs 18; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: traverse source markers with explicit while loop; 97.826090%; insns 46/46; structural 0; diffs 16; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: use named UTF16 mask declared before cursor; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: scope byte cursor within allocated string block; 98.728810%; insns 59/59; structural 0; diffs 12; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: separate converted integer before truncation; 94.322040%; insns 57/59; structural 9; diffs 45; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: cache actual string payload for aligned length and conversion; 96.119400%; insns 65/67; structural 6; diffs 54; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: scope converted string within method body; 99.626870%; insns 67/67; structural 0; diffs 5; data 6904/6904; restored.
|
||||
- VmStringReplace: search length declared ahead of parent length; 97.992424%; insns 132/132; structural 0; diffs 40; data 6904/6904; restored.
|
||||
- VmStringReplace: declare output buffer ahead of source pointers; 96.818184%; insns 132/132; structural 0; diffs 61; data 6904/6904; restored.
|
||||
- VmStringReplace: load search length before parent length; 97.992424%; insns 132/132; structural 0; diffs 40; data 6904/6904; restored.
|
||||
- VmStringReplace: scope match pointer at comparison; 95.492424%; insns 132/132; structural 2; diffs 60; data 6904/6904; restored.
|
||||
- VmStringSplit: delimited source length declared before source pointers; 97.927925%; insns 222/222; structural 0; diffs 69; data 6904/6904; restored.
|
||||
- VmStringSplit: delimiter length before parent length; 97.927925%; insns 222/222; structural 0; diffs 69; data 6904/6904; restored.
|
||||
- VmStringSplit: array declared after traversal counters; 98.063065%; insns 222/222; structural 0; diffs 68; data 6904/6904; restored.
|
||||
- VmStringSplit: load delimiter pointer before parent pointer; 97.950450%; insns 222/222; structural 0; diffs 76; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: swap byte offset and character index declarations; 98.719510%; insns 82/82; structural 0; diffs 14; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: byte cursor initialized after hex character index; 98.719510%; insns 82/82; structural 0; diffs 14; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: cache first decoded nibble in word temporary; 98.719510%; insns 82/82; structural 0; diffs 14; data 6904/6904; restored.
|
||||
- VmBlobGetHexString: loop counter declared before hex cursor; 98.719510%; insns 82/82; structural 0; diffs 14; data 6904/6904; restored.
|
||||
- CHANSVmAddExe: source module declared after relocation counters; 99.035430%; insns 254/254; structural 0; diffs 39; data 6904/6904; restored.
|
||||
- CHANSVmAddExe: executable size declared before module header; 99.035430%; insns 254/254; structural 0; diffs 39; data 6904/6904; restored.
|
||||
- CHANSVmAddExe: counter before data bound; 99.153540%; insns 254/254; structural 0; diffs 34; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: module declared after indices; 98.571430%; insns 189/189; structural 0; diffs 46; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: global iterator before dispatch table; 98.677246%; insns 189/189; structural 0; diffs 43; data 6904/6904; restored.
|
||||
- CHANSVmLinkModules: scope dispatch index within module loop; 98.677246%; insns 189/189; structural 0; diffs 43; data 6904/6904; restored.
|
||||
- VmCallMethod: split frame push bounds into separate declarations; 98.060500%; insns 281/281; structural 0; diffs 91; data 6904/6904; restored.
|
||||
- VmCallMethod: return value declared after native method target; 98.060500%; insns 281/281; structural 0; diffs 91; data 6904/6904; restored.
|
||||
- VmCallMethod: instruction pointer declared ahead of frame metadata; 97.829180%; insns 281/281; structural 0; diffs 103; data 6904/6904; restored.
|
||||
- VmBlobPackCommon: format position declared before input format; 97.934135%; insns 668/668; structural 2; diffs 246; data 6904/6904; restored.
|
||||
- VmBlobPackCommon: argument array ahead of source format metadata; 97.934135%; insns 668/668; structural 2; diffs 246; data 6904/6904; restored.
|
||||
- VmBlobPackCommon: reset element width before next-position output; 97.898200%; insns 668/668; structural 24; diffs 268; data 6904/6904; restored.
|
||||
- VmBlobUnpack: format position before format string metadata; 98.268860%; insns 517/517; structural 0; diffs 156; data 6904/6904; restored.
|
||||
- VmBlobUnpack: argument count ahead of blob cursor; 98.268860%; insns 517/517; structural 0; diffs 156; data 6904/6904; restored.
|
||||
- VmBlobUnpack: signed unpacked integer declared ahead of loop counters; 98.268860%; insns 517/517; structural 0; diffs 156; data 6904/6904; restored.
|
||||
- CHANSVm_8145049C: typed common string data and owned temporary object; 99.187935%; insns 431/431; structural 0; diffs 53; data 6904/6904; restored.
|
||||
- CHANSVm_8145049C: separate common string data from escape flag; 99.187935%; insns 431/431; structural 0; diffs 53; data 6904/6904; restored.
|
||||
- CHANSVm_8145049C: temporary string length scoped beside its owned object; 99.849190%; insns 431/431; structural 0; diffs 13; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: name chunk table slot before allocator call; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: chunk table slot declared before chunk counter; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: byte table position replaces indexed chunk lookup; exploratory variant, fully restored; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: increment byte offset before chunk number; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: mask unsigned integer before explicit null fallback; 93.644066%; insns 56/59; structural 9; diffs 45; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: apply unsigned character mask before width cast; 94.322040%; insns 57/59; structural 9; diffs 45; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: signed byte cursor with unsigned loop index; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: promote mask to integer arithmetic width; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: scope aligned total length within validated string block; COMPILE FAIL; restored. : u32 totalLength; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- VmWinEmuWrite: fetch string before declaring loop metadata; 99.626870%; insns 67/67; structural 0; diffs 5; data 6904/6904; restored.
|
||||
- CHANSVmGetSourceLine: explicit module/table/pc locals with shared failure return; 96.847824%; insns 46/46; structural 0; diffs 21; data 6904/6904; restored.
|
||||
- CHANSVmStep: explicit zero step-count normalization; 96.854750%; insns 1254/1253; structural 66; diffs 1229; data 2232/6904; restored.
|
||||
- CHANSVmStep: pre-tested interpreter countdown; 96.416600%; insns 1254/1253; structural 68; diffs 1238; data 2232/6904; restored.
|
||||
- CHANSVmStep: direct typed result-table references; 96.308860%; insns 1254/1253; structural 89; diffs 1094; data 2232/6904; restored.
|
||||
- CHANSVmStep: normalize count and pre-test interpreter loop; 96.983240%; insns 1255/1253; structural 63; diffs 1228; data 2232/6904; restored.
|
||||
- CHANSVmStep: pre-tested loop with direct result table references; 96.772545%; insns 1256/1253; structural 82; diffs 1231; data 2232/6904; restored.
|
||||
- CHANSVmStep: index typed operand workspace instead of carrying pointer; 96.388664%; insns 1254/1253; structural 75; diffs 1131; data 2232/6904; restored.
|
||||
- CHANSVmStep: normalize pre-tested loop and index operand workspace; 96.596970%; insns 1257/1253; structural 74; diffs 1220; data 2232/6904; restored.
|
||||
- CHANSVmParseInt: test type field directly after parse-end initialization; 83.673470%; insns 49/49; structural 4; diffs 5; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: initialize parse endpoint through pointer to local; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: assign parse-end null after computing string predicate; COMPILE FAIL; restored. ^ # (10393) 'isString' is not a member of class 'struct CHANSVmObjHdr' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVm_8144B4D4: test type field directly after parse-end initialization; 95.180725%; insns 83/83; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: initialize parse endpoint through pointer to local; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: assign parse-end null after computing string predicate; COMPILE FAIL; restored. ^ # (10393) 'isString' is not a member of class 'struct CHANSVmObjHdr' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
- CHANSVmNewObjData: scope chunk scan state below fast-path lookup; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: express table scan with a for loop; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: outer allocation extent scoped only around allocation; 99.427086%; insns 96/96; structural 0; diffs 10; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: cast masked value through signed integer; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: use unsigned mask on signed low-word value; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: byte cursor before converted argument pointer; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: declare string inside a block containing all processing; 99.626870%; insns 67/67; structural 0; diffs 5; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: alignment explicitly performed in signed word arithmetic; 99.626870%; insns 67/67; structural 0; diffs 5; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: preserve byte count then align total length; 99.477615%; insns 67/67; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: helper for UTF16 truncation of non-null integer; 99.406780%; insns 59/59; structural 0; diffs 6; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: helper for nullable character argument; 86.016950%; insns 52/59; structural 13; diffs 44; data 6904/6904; restored.
|
||||
- VmStringFromCharCode: early-return nullable character helper; 92.457630%; insns 59/59; structural 5; diffs 11; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: inline helper for aligned string byte length; 99.626870%; insns 67/67; structural 0; diffs 5; data 6904/6904; restored.
|
||||
- VmWinEmuWrite: inline helper for argument conversion before processing; 99.626870%; insns 67/67; structural 0; diffs 5; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: separate byte-table cursor and selected entry lifetimes; 97.656250%; insns 97/96; structural 6; diffs 74; data 6904/6904; restored.
|
||||
- CHANSVmNewObjData: store selected chunk through header data pointer; 99.583336%; insns 96/96; structural 0; diffs 7; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: inline parser initializer combines type load and endpoint reset; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVmParseInt: inline parser initializer returns string predicate; 94.693880%; insns 49/49; structural 2; diffs 3; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: inline parser initializer combines type load and endpoint reset; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- CHANSVm_8144B4D4: inline parser initializer returns string predicate; 97.590360%; insns 83/83; structural 2; diffs 2; data 6904/6904; restored.
|
||||
- VmDateDtor: inline calendar name lookup month; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
- VmDateDtor: inline calendar name lookup day; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
- VmDateDtor: inline calendar name lookup both; 94.967030%; insns 91/91; structural 5; diffs 7; data 6904/6904; restored.
|
||||
|
||||
Declaration search: CHANSVm_8145049C, 300 compiled permutations, best structural/exact 0/13; source restored.
|
||||
|
||||
The clean gate checks byte matching, regressions, pool, source patterns and DOL integrity. Its PASS alone does not imply that the requested exact-count increase was achieved.
|
||||
|
||||
## Final clean-build measurements
|
||||
|
||||
Instruction-exact 216/233 -> 216/233; matched code 35484/53564 -> 35484/53564; matched data 6904/6904 -> 6904/6904.
|
||||
CHANSVmNewObjData 99.427086% -> 99.583336%, 10 -> 7 instruction differences, source commit f07fd85c.
|
||||
The requested exact-count increase was not achieved. Remaining compiler/source tie-break causes are unresolved.
|
||||
Fresh .data audit: all 121 CHANSVmStep jump-table relocation offsets, types and function-relative destinations match. No linking/configuration changes.
|
||||
|
||||
| Open function | Objdiff % | Instructions | Structural / positional diffs | Compiled attempts | Remaining difference |
|
||||
|---|---:|---|---|---:|---|
|
||||
| CHANSVmGetSourceLine | 97.82609 | 46/46 | 0 / 16 | 5 | module, marker and line-offset register allocation |
|
||||
| CHANSVmNewObjData | 99.583336 | 96/96 | 0 / 7 | 15 | chunk counter and table-slot registers are swapped; 7 differing instructions |
|
||||
| CHANSVmParseInt | 94.69388 | 49/49 | 2 / 3 | 11 | parse-end store follows parameter copies; 3 scheduling differences |
|
||||
| CHANSVm_8144B4D4 | 97.59036 | 83/83 | 2 / 2 | 11 | parse-end store follows type comparison; 2 scheduling differences |
|
||||
| VmDateDtor | 94.96703 | 91/91 | 5 / 7 | 8 | month/day table loads and variadic argument setup; 7 scheduling differences |
|
||||
| VmStringFromCharCode | 99.40678 | 59/59 | 0 / 6 | 16 | UTF16 mask and byte-cursor registers are swapped |
|
||||
| VmStringReplace | 97.878784 | 132/132 | 0 / 40 | 4 | argument, string pointer and traversal register allocation |
|
||||
| VmStringSplit | 98.04054 | 222/222 | 0 / 66 | 4 | delimiter, array and traversal register allocation |
|
||||
| CHANSVm_8145049C | 99.84919 | 431/431 | 0 / 13 | 4 | string pointer and temporary object/length register coalescing |
|
||||
| VmBlobGetHexString | 98.71951 | 82/82 | 0 / 14 | 4 | hex index, byte cursor and digit register allocation |
|
||||
| VmBlobPackCommon | 97.934135 | 668/668 | 2 / 246 | 3 | two branch targets and pack-state register allocation |
|
||||
| VmBlobUnpack | 98.26886 | 517/517 | 0 / 156 | 3 | format, cursor and decoded-value register allocation |
|
||||
| VmWinEmuWrite | 99.62687 | 67/67 | 0 / 5 | 11 | converted string and aligned byte-length registers are swapped |
|
||||
| CHANSVmAddExe | 99.15354 | 254/254 | 0 / 34 | 3 | module, size and relocation-loop register allocation |
|
||||
| CHANSVmLinkModules | 98.677246 | 189/189 | 0 / 43 | 3 | module, dispatch index and native/global iterator registers |
|
||||
| VmCallMethod | 98.0605 | 281/281 | 0 / 91 | 3 | call-frame and native target register allocation |
|
||||
| CHANSVmStep | 96.452515 | 1253/1253 | 71 / 318 | 7 | entry/countdown flow, constant table base, operand-type spills and registers |
|
||||
|
||||
The declaration search added 300 compiled formatter permutations beyond the per-function attempt counts above. Failed compilations are excluded. The single byte-offset lookup experiment was fully restored. All final source changes are the two declaration positions in CHANSVmNewObjData.
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 35484/53564 data 6904/6904 functions 216/233 fuzzy 99.2732 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 216/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.27317
|
||||
[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: VmStringFromCharCode 99.40678
|
||||
[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.934135
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
|
||||
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2720
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.76230 -> 86.76230
|
||||
global fuzzy_match_percent: 99.31232 -> 99.31234
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11031 -> 91.11031
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
52
tools/decomp-assist/clib.attempts.md
Normal file
52
tools/decomp-assist/clib.attempts.md
Normal file
@@ -0,0 +1,52 @@
|
||||
# clib leaf — round-2 findings (agent/w0929/clib)
|
||||
|
||||
## Solved this round
|
||||
|
||||
- **zi8cinfo → Matching (whole-unit 100%)**. `Zi8GetSInfo` needed two levers
|
||||
together: `volatile int extraCount;` (forces the stack stw/lwz orig has)
|
||||
and the fused decrement `outputBuffer[(ziU8)--outputCount] = 0;` (lets MWCC
|
||||
schedule `li r3,0` before the `subi` — orig's order). 133/133 insn-identical.
|
||||
- **zi8getc2 all data sections 100%** (`ziFuzzyZYPairs` struct sizing): orig's
|
||||
`Zi8ZYdefaultFuzzyPairs` object is 8B, not 4B — the struct has 12 real bit
|
||||
fields (added `dANDt`) plus `reserved : 20`. By-value param codegen
|
||||
unchanged (verified instruction-identical); no regression on the ~20 other
|
||||
units including zitypes.h.
|
||||
- **zidawg1 GetGraphInfo 80.8 → ~95+**: three real levers —
|
||||
(a) u16 pair compares must be `int`/`ziS32`-typed on the RHS cast (orig uses
|
||||
`cmpw`, not `cmplw` + `clrlwi`);
|
||||
(b) `entry >= end` operand order (orig `cmplw entry,end;bge`);
|
||||
(c) early exits are `return 0` (orig emits `li r3,0` direct-return blocks),
|
||||
not `result=0; goto done`.
|
||||
Residual: `||` block layout + regalloc, ~4 insns.
|
||||
- **zidawg1 GetChild 93.3 → ~97+**: orig folds `+0x8000` as `addis +1` /
|
||||
`addi -0x8000` applied to `(hi<<16 + mid<<8)` BEFORE adding `b2` — the
|
||||
two-statement form `offset = ... + 0x8000; offset += b2;` reproduces it.
|
||||
Residual: pure regname/scheduling.
|
||||
|
||||
## Extraction artifacts (no source lever)
|
||||
|
||||
- **zikorean .data 17.2%**: orig's extracted zikorean.o contains a THIRD
|
||||
jumptable at .data+0xf8 (10 entries) whose relocs target `Zi8_81483118` —
|
||||
a zkokeyp function. orig's zkokeyp.o has NO .data at all. The table bytes
|
||||
were attributed to zikorean's slice by the extractor; cannot be emitted
|
||||
from zikorean.c (its 3 fns are already 100%).
|
||||
- **extab/extabindex ~92-97% residuals** on several units — symbol-extent
|
||||
artifacts (byte-identical content where comparable).
|
||||
|
||||
## Systematic tie-break family (documented, unfixed)
|
||||
|
||||
- **Callee-reg home shift**: orig homes the loop counter/local in the FIRST
|
||||
callee reg (r26) and args after (r27+); MWCC homes args first. Recurs in
|
||||
zi8dawg MatchROMdata1, zmtkey, zi8getc2 (2 fns), zoemdata Zi8MatchOEMdata
|
||||
(4-way swap, 192/192 insn-identical otherwise), zi8match, zkokeyp fns.
|
||||
- zi8alpha Zi8AlphaGetCandidates (3946 insns): mostly uniform +4 stack-slot
|
||||
shift (orig has one more 4-byte local slot) + a few bound-form diffs
|
||||
(`>0xF010` vs `>=0xF011`, `<=1` vs `<2`) + one missing subf-rewind block.
|
||||
- ziswordw Zi8IsWordW 83.3: orig homes call result in callee reg + keeps a
|
||||
selector var in r27; mine spills via ziU8 narrowing — needs deeper decode.
|
||||
|
||||
## Old-tip adoption notes
|
||||
|
||||
Old leaf tip f2afe0e8 beat upstream on: zoemdata +34.2, ziswordw +10.5,
|
||||
zi8uwd +7.3, zidawg1 +1.7, zi8pud2 +0.7, zi81key/zmtkey marginal.
|
||||
Upstream won on: zi8alpha +4.5, zi8cgetc +16, zconvert +0.4, zkokeyp +0.1.
|
||||
82
tools/decomp-assist/fix-board-r4.attempts.md
Normal file
82
tools/decomp-assist/fix-board-r4.attempts.md
Normal file
@@ -0,0 +1,82 @@
|
||||
# AOSS and zi8alpha continuation, 2026-10-01
|
||||
|
||||
Entry 905c45b9. Object-order structural review; only measured improvements retained.
|
||||
No configuration changes, upstream contact, inline assembly, stack placeholders or data placement.
|
||||
|
||||
src/scene/setting/AOSS entry measures: {"fuzzy_match_percent": 96.50445, "matched_code": "6436", "matched_code_percent": 39.748024, "matched_data": "3896", "matched_data_percent": 99.18533, "matched_functions": 16, "matched_functions_percent": 76.190475, "total_code": "16192", "total_data": "3928", "total_functions": 21, "total_units": 1}
|
||||
AOSS_Init_old entry: {"deficit": 8, "fuzzy": 93.14899, "measures": {"fuzzy_match_percent": 96.50445, "matched_code": "6436", "matched_code_percent": 39.748024, "matched_data": "3896", "matched_data_percent": 99.18533, "matched_functions": 16, "matched_functions_percent": 76.190475, "total_code": "16192", "total_data": "3928", "total_functions": 21, "total_units": 1}, "mine": 1576, "positional": 1479, "strict_diffs": 1471, "structural": 1151, "target": 1584}
|
||||
AOSS_81400830 entry: {"deficit": 0, "fuzzy": 97.74143, "measures": {"fuzzy_match_percent": 96.50445, "matched_code": "6436", "matched_code_percent": 39.748024, "matched_data": "3896", "matched_data_percent": 99.18533, "matched_functions": 16, "matched_functions_percent": 76.190475, "total_code": "16192", "total_data": "3928", "total_functions": 21, "total_units": 1}, "mine": 321, "positional": 87, "strict_diffs": 89, "structural": 0, "target": 321}
|
||||
AOSS_814013AC entry: {"deficit": 0, "fuzzy": 98.77193, "measures": {"fuzzy_match_percent": 96.50445, "matched_code": "6436", "matched_code_percent": 39.748024, "matched_data": "3896", "matched_data_percent": 99.18533, "matched_functions": 16, "matched_functions_percent": 76.190475, "total_code": "16192", "total_data": "3928", "total_functions": 21, "total_units": 1}, "mine": 114, "positional": 22, "strict_diffs": 22, "structural": 0, "target": 114}
|
||||
AOSS_81401778 entry: {"deficit": 2, "fuzzy": 91.83883, "measures": {"fuzzy_match_percent": 96.50445, "matched_code": "6436", "matched_code_percent": 39.748024, "matched_data": "3896", "matched_data_percent": 99.18533, "matched_functions": 16, "matched_functions_percent": 76.190475, "total_code": "16192", "total_data": "3928", "total_functions": 21, "total_units": 1}, "mine": 271, "positional": 254, "strict_diffs": 252, "structural": 39, "target": 273}
|
||||
AOSS_81401E80 entry: {"deficit": 0, "fuzzy": 98.605446, "measures": {"fuzzy_match_percent": 96.50445, "matched_code": "6436", "matched_code_percent": 39.748024, "matched_data": "3896", "matched_data_percent": 99.18533, "matched_functions": 16, "matched_functions_percent": 76.190475, "total_code": "16192", "total_data": "3928", "total_functions": 21, "total_units": 1}, "mine": 147, "positional": 34, "strict_diffs": 36, "structural": 0, "target": 147}
|
||||
libs/RVLMiddleware/eZiText/src/clib/zi8alpha entry measures: {"fuzzy_match_percent": 93.149185, "matched_code": "5704", "matched_code_percent": 26.329395, "matched_data": "72", "matched_data_percent": 12.765958, "matched_functions": 10, "matched_functions_percent": 83.33333, "total_code": "21664", "total_data": "564", "total_functions": 12, "total_units": 1}
|
||||
Zi8ChangeWordCase entry: {"deficit": 0, "fuzzy": 99.09091, "measures": {"fuzzy_match_percent": 93.149185, "matched_code": "5704", "matched_code_percent": 26.329395, "matched_data": "72", "matched_data_percent": 12.765958, "matched_functions": 10, "matched_functions_percent": 83.33333, "total_code": "21664", "total_data": "564", "total_functions": 12, "total_units": 1}, "mine": 44, "positional": 8, "strict_diffs": 8, "structural": 0, "target": 44}
|
||||
Zi8AlphaGetCandidates entry: {"deficit": 1, "fuzzy": 90.6072, "measures": {"fuzzy_match_percent": 93.149185, "matched_code": "5704", "matched_code_percent": 26.329395, "matched_data": "72", "matched_data_percent": 12.765958, "matched_functions": 10, "matched_functions_percent": 83.33333, "total_code": "21664", "total_data": "564", "total_functions": 12, "total_units": 1}, "mine": 3945, "positional": 3809, "strict_diffs": 3808, "structural": 1228, "target": 3946}
|
||||
- AOSS_Init_old init.split.default.waits: recover independent constant connection and response defaults. Deficit 8 -> 9; fuzzy 93.14899 -> 93.15278; structural 1151 -> 1144; positional 1479 -> 1353. Restored.
|
||||
- AOSS_Init_old init.defaults.store.order: store the connection default before loading the response default. Deficit 8 -> 8; fuzzy 93.14899 -> 93.14899; structural 1151 -> 1151; positional 1479 -> 1479. Restored.
|
||||
- AOSS_Init_old init.defaults.direct.fields: initialize default wait fields directly from their constant array. Deficit 8 -> 8; fuzzy 93.14899 -> 93.14899; structural 1151 -> 1151; positional 1479 -> 1479. Restored.
|
||||
- AOSS_Init_old init.flags.word.capture: load the unsigned input flag word once for publication and enable validation. Deficit 8 -> 9; fuzzy 93.14899 -> 93.443184; structural 1151 -> 1144; positional 1479 -> 1301. Kept, full GATE PASS.
|
||||
- AOSS_Init_old init.link.retry.counter: keep initial link attempts separate from the response sleep countdown as target r18 and r17 show. Deficit 9 -> 9; fuzzy 93.443184 -> 93.61048; structural 1144 -> 1143; positional 1301 -> 1301. Kept, full GATE PASS.
|
||||
- AOSS_Init_old init.link.delay.after.success: read the response delay only after rejecting a successful initial connection. Deficit 9 -> 9; fuzzy 93.61048 -> 93.64836; structural 1143 -> 1141; positional 1301 -> 1302. Kept, full GATE PASS.
|
||||
- AOSS_Init_old init.link.status.unsigned: compare the initial configuration status as the unsigned target word. Deficit 9 -> 9; fuzzy 93.64836 -> 93.65467; structural 1141 -> 1140; positional 1302 -> 1302. Kept, full GATE PASS.
|
||||
- AOSS_Init_old init.scan.separate.delay: use a scan-local countdown rather than extending the link countdown lifetime. Deficit 9 -> 9; fuzzy 93.65467 -> 93.65467; structural 1140 -> 1140; positional 1302 -> 1302. Restored.
|
||||
- AOSS_Init_old init.protocol.distinct.state: retain protocol progress from entry separately from scan and cleanup results. Deficit 9 -> 9; fuzzy 93.65467 -> 93.78725; structural 1140 -> 1141; positional 1302 -> 1524. Kept, full GATE PASS.
|
||||
- AOSS_81400830 decrypt.checksum.byte: keep the packet checksum in its actual byte width. Deficit 0 -> 0; fuzzy 97.74143 -> 97.74143; structural 0 -> 0; positional 87 -> 87. Restored.
|
||||
- AOSS_81400830 decrypt.state.byte.values: retain permutation values as bytes instead of promoted words. Deficit 0 -> 0; fuzzy 97.74143 -> 97.74143; structural 0 -> 0; positional 87 -> 87. Restored.
|
||||
- AOSS_81400830 decrypt.state.store.order: store the swapped permutation bytes before updating its cursor fields. Deficit 0 -> 0; fuzzy 97.74143 -> 91.94704; structural 0 -> 23; positional 87 -> 95. Restored.
|
||||
- AOSS_81400830 decrypt.declarations.search: automatic detection selected a call site, not the function. No trials ran; excluded.
|
||||
- AOSS_81400830 decrypt.declarations.search.valid: AOSSEncryptedPayload* encrypted = &message->payload.encrypted; u8* decryptedData; u32 controlFlags; u32 dataLength; u32 i; s32 crcIndex; u32 firstIndex; u32 secondIndex; u32 firstValue; u32 secondValue; u32 stateIndex; u32 crc; const u8* inputCursor; u8* state; u8* outputCursor; int result; start (0, 87) best (0, 87) after 120 builds; source restored; best order was: u32 checksum; u8 manufacturerAddress[8]; AOSSKeySchedule schedule; AOSSEncryptedPayload* encrypted = &message->payload.encrypted; u8* decryptedData; u32 controlFlags; u32 dataLength; u32 i; s32 crcIndex; u32 firstIndex; u32 secondIndex; u32 firstValue; u32 secondValue; u32 stateIndex; u32 crc; const u8* inputCursor; u8* state; u8* outputCursor; int result;
|
||||
- AOSS_814013AC options.same.cursor: advance one response cursor from the outer record through the nested option records. Deficit 0 -> 0; fuzzy 98.77193 -> 96.18421; structural 0 -> 2; positional 22 -> 38. Restored.
|
||||
- AOSS_814013AC options.formal.cursor: advance the input response pointer through outer and nested records. Deficit 0 -> 0; fuzzy 98.77193 -> 95.08772; structural 0 -> 5; positional 22 -> 28. Restored.
|
||||
- AOSS_814013AC options.length.declaration.first: declare the response-length capture before the accumulated option flags. Deficit 0 -> 0; fuzzy 98.77193 -> 98.070175; structural 0 -> 0; positional 22 -> 33. Restored.
|
||||
- AOSS_814013AC options.selected.state: capture the selected response state before response-length validation. Build rejected; restored. ne 77, in main output = import_d_file(args.d_file) ^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/mnt/drive2/projects/wii-ipl-workers/w0929-fix-board/tools/transform_dep.py", line 31, in import_d_file with open(in_file) as file: ^^^^^^^^^^^^^ FileNotFoundError: [Errno 2] No such file or directory: 'build/43U/src/src/scene/setting/AOSS.d' ninja: build stopped: subcommand failed.
|
||||
- AOSS_814013AC options.declarations.search: Option* responseRecord; AOSSConfigRecord* configRecord; AOSSStoredConfig* wep40Config; AOSSStoredConfig* wep104Config; AOSSStoredConfig* tkipConfig; AOSSStoredConfig* aesConfig; u8* networkSettings; const AOSSReplyOption* option; u32 length; s32 remainingLength = responseLength; int result; start (0, 22) best (0, 22) after 130 builds; source restored; best order was: u32 flags = 0; const AOSSReplyOption* responseRecord; AOSSConfigRecord* configRecord; AOSSStoredConfig* wep40Config; AOSSStoredConfig* wep104Config; AOSSStoredConfig* tkipConfig; AOSSStoredConfig* aesConfig; u8* networkSettings; const AOSSReplyOption* option; u32 length; s32 remainingLength = responseLength; int result;
|
||||
- Correction: options.selected.state above overlapped a pending declaration sweep, causing a missing dependency file. Excluded; source was restored to the committed state. The sweep found no better candidate and is advisory. Retry below is exclusive.
|
||||
- AOSS_814013AC options.selected.state.retry: capture the selected state before validating the response length. Deficit 0 -> 0; fuzzy 98.77193 -> 98.77193; structural 0 -> 0; positional 22 -> 22. Restored.
|
||||
- AOSS_81401778 hello.crc.flat.record: traverse the complete hello record in a single byte loop. Deficit 2 -> 3; fuzzy 91.83883 -> 86.67033; structural 39 -> 49; positional 254 -> 266. Restored.
|
||||
- AOSS_81401778 hello.crc.explicit.pairs: process the two bytes of each protocol halfword directly. Deficit 2 -> 3; fuzzy 91.83883 -> 86.67033; structural 39 -> 49; positional 254 -> 266. Restored.
|
||||
- AOSS_81401778 hello.crc.byte.cursor: traverse the record with a byte cursor while retaining the same CRC recurrence. Deficit 2 -> 3; fuzzy 91.83883 -> 84.509155; structural 39 -> 51; positional 254 -> 257. Restored.
|
||||
- AOSS_81401778 hello.construction.state: keep the destination, hello record, identity and cipher schedule together as packet construction state. Deficit 2 -> 2; fuzzy 91.83883 -> 92.190475; structural 39 -> 33; positional 254 -> 254. Kept, full GATE PASS.
|
||||
- AOSS_81401E80 cipher.mask.byte.result: retain the input and key bytes separately and publish their xor through the key value. Deficit 0 -> 0; fuzzy 98.605446 -> 97.517006; structural 0 -> 0; positional 34 -> 52. Restored.
|
||||
- AOSS_81401E80 cipher.direct.packet.xor: publish the packet and key xor directly without a reassigned byte local. Deficit 0 -> 0; fuzzy 98.605446 -> 98.5034; structural 0 -> 0; positional 34 -> 37. Restored.
|
||||
- AOSS_81401E80 cipher.mask.compound.result: retain both bytes and xor the packet into the key byte before publishing it. Deficit 0 -> 0; fuzzy 98.605446 -> 98.57143; structural 0 -> 0; positional 34 -> 29. Restored.
|
||||
- AOSS_81401778 hello.runtime.external.binding: recover a separate runtime object address instead of the common private BSS base. Deficit 2 -> 2; fuzzy 92.190475 -> 92.190475; structural 33 -> 33; positional 254 -> 254. Restored.
|
||||
- AOSS_81401E80 cipher.declarations.search: declaration block: u8* temporaryHalf; s32 halfLength = length / 2; u8* packetHalf; s32 round; u8* keyMask; u8* temporary; s32 keyIndex; s32 index; int result = -1; u8* packetBytes; start (0, 34) best (0, 34) after 118 builds; source restored; best order was: u8* temporaryHalf; s32 halfLength = length / 2; u8* packetHalf; s32 round; u8* keyMask; u8* temporary; s32 keyIndex; s32 index; int result = -1; u8* packetBytes;
|
||||
- Zi8ChangeWordCase wordcase.work.typed.formal: use the recovered workspace structure type for the word-case argument. Deficit 0 -> 0; fuzzy 99.09091 -> 98.52273; structural 0 -> 0; positional 8 -> 11. Restored.
|
||||
- Zi8ChangeWordCase wordcase.work.field.view: use a typed workspace view for both mode reads while preserving helper arguments. Deficit 0 -> 3; fuzzy 99.09091 -> 84.318184; structural 0 -> 8; positional 8 -> 41. Restored.
|
||||
- Zi8ChangeWordCase wordcase.selector.signed.byte: retain the case selector as a signed byte with its actual zero/one values. Deficit 0 -> 0; fuzzy 99.09091 -> 99.09091; structural 0 -> 0; positional 8 -> 8. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.work.typed.argument: use the recovered workspace structure directly as the formal argument. Deficit 1 -> 1; fuzzy 90.6072 -> 89.9521; structural 1228 -> 1228; positional 3809 -> 3825. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.context.mask.byte: test the primary context-table flag through its low byte. Deficit 1 -> 1; fuzzy 90.6072 -> 90.60593; structural 1228 -> 1229; positional 3809 -> 3809. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.normalize.post.increment: express normalization cursor advancement with the native postfix loop update. Deficit 1 -> 1; fuzzy 90.6072 -> 90.6072; structural 1228 -> 1228; positional 3809 -> 3809. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.prefix.next.dictionary.switch: dispatch next-dictionary punctuation recovery with its recovered case range. Deficit 1 -> -1; fuzzy 90.6072 -> 90.571465; structural 1228 -> 1220; positional 3809 -> 3812. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.suffix.next.dictionary.switch: dispatch the suffix punctuation fallback through the five supported dictionary kinds. Deficit 1 -> 1; fuzzy 90.6072 -> 90.57425; structural 1228 -> 1228; positional 3809 -> 3809. Restored.
|
||||
- Zi8ChangeWordCase wordcase.typed.call.workspace: use the recovered case workspace for both field reads and helper calls. Deficit 0 -> -1; fuzzy 99.09091 -> 95.0; structural 0 -> 2; positional 8 -> 37. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.limit.sum.first: evaluate the candidate length before the maximum word length at both truncation and rejection checks. Deficit 1 -> 1; fuzzy 90.6072 -> 90.6072; structural 1228 -> 1225; positional 3809 -> 3810. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.truncate.sum.first: evaluate the candidate length before the truncation limit, matching the target compare and skip branch. Deficit 1 -> 1; fuzzy 90.6072 -> 90.56893; structural 1228 -> 1223; positional 3809 -> 3810. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.keylayout.advance.first: put the shorter key-layout entry advance before the terminal entry branch. Deficit 1 -> 0; fuzzy 90.6072 -> 90.94526; structural 1228 -> 1184; positional 3809 -> 3735. Restored.
|
||||
- Correction: alpha.keylayout.advance.first increased matched data 72 -> 180; a string-valued byte comparison incorrectly rejected it. Retrying with numeric comparisons.
|
||||
- Zi8AlphaGetCandidates alpha.keylayout.advance.first.retry: put the shorter key-layout entry advance before the terminal entry branch. Deficit 1 -> 0; fuzzy 90.6072 -> 90.94526; structural 1228 -> 1184; positional 3809 -> 3735. Kept, full GATE PASS.
|
||||
- Zi8AlphaGetCandidates alpha.skip.candidate.first: advance the skipped-candidate count before handling emitted candidates, matching the target entry branch. Deficit 0 -> 0; fuzzy 90.94526 -> 90.835785; structural 1184 -> 1263; positional 3735 -> 3675. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.remembered.copy.first: place the exact remembered-word copy before the inexact invalidation fallback. Deficit 0 -> 0; fuzzy 90.94526 -> 91.81044; structural 1184 -> 1142; positional 3735 -> 3739. Kept, full GATE PASS.
|
||||
- Zi8AlphaGetCandidates alpha.shortest.bound.first: load the current shortest-word bound before comparing the candidate length. Deficit 0 -> 0; fuzzy 91.81044 -> 91.88672; structural 1142 -> 1143; positional 3739 -> 3739. Kept, full GATE PASS.
|
||||
- Zi8AlphaGetCandidates alpha.count.limit.forward: compare the updated result count directly against the configured limit. Deficit 0 -> 0; fuzzy 91.88672 -> 91.88647; structural 1143 -> 1143; positional 3739 -> 3739. Restored.
|
||||
- Zi8AlphaGetCandidates alpha.single.punctuation.first: clear single-character state for punctuation before storing an ordinary character. Deficit 0 -> 0; fuzzy 91.88672 -> 92.01039; structural 1143 -> 1135; positional 3739 -> 3739. Kept, full GATE PASS.
|
||||
|
||||
## Final attempt coverage and remaining evidence
|
||||
AOSS_Init_old: 9 distinct completed trials; instruction deficit 9; fuzzy 93.14899 -> 93.78725; ctxdiff reports 1515 positional differences.
|
||||
AOSS_81400830: 3 distinct completed trials; instruction deficit 0; fuzzy 97.74143 -> 97.74143; ctxdiff reports 89 positional differences.
|
||||
AOSS_814013AC: 4 distinct completed trials; instruction deficit 0; fuzzy 98.77193 -> 98.77193; ctxdiff reports 22 positional differences.
|
||||
AOSS_81401778: 5 distinct completed trials; instruction deficit 2; fuzzy 91.83883 -> 92.190475; ctxdiff reports 252 positional differences.
|
||||
AOSS_81401E80: 3 distinct completed trials; instruction deficit 0; fuzzy 98.605446 -> 98.605446; ctxdiff reports 36 positional differences.
|
||||
Zi8ChangeWordCase: 4 distinct completed trials; instruction deficit 0; fuzzy 99.09091 -> 99.09091; ctxdiff reports 8 positional differences.
|
||||
Zi8AlphaGetCandidates: 13 distinct completed trials; instruction deficit 0; fuzzy 90.6072 -> 92.01039; ctxdiff reports 3739 positional differences.
|
||||
AOSS_Init_old: target has independent constant halfword relocations, a negative r14 guard before a defined assignment, additional cleanup, and scheduling differences. Constant folding of independent scalars reduced matched data; no uninitialized guard was introduced.
|
||||
AOSS_81400830/AOSS_814013AC/AOSS_81401E80: target instruction counts and non-register streams agree; three real source variants plus bounded declaration searches found no improvement. Register differences remain 87/22/34.
|
||||
AOSS_81401778: real packet construction state now has the target stack offsets. A common BSS address, CRC scheduling and the r24-versus-r25 saved range still differ; target 273, build 271 instructions.
|
||||
Zi8ChangeWordCase: target work r30/case r29 remain exchanged with build work r29/case r30; eight positional register differences, no non-register difference.
|
||||
Zi8AlphaGetCandidates: entry target stores work at +0x20 without any later load; no dead spill or placeholder was added. Scalar slots remain four bytes low. The target skips an initial dictionary-index assignment, but early completion uses the index, so initialized storage was preserved. Other call-result moves, dispatch branches and retry regions still differ. Both instruction totals now equal 3946.
|
||||
No new exact function was obtained; the higher instruction-exact-count acceptance condition remains unmet. All seven objdiff-unmatched functions have at least three distinct completed source trials. Retained source changes each passed the full gate and were committed individually.
|
||||
Final full gate: clean 43U build passed; main.dol SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; both pools identical; regressions/forbidden/readability counts all zero. Complete output: fix-board-r4.final-gate.txt.
|
||||
Instruction-exact counts AOSS 15/21 -> 15/21, zi8alpha 10/12 -> 10/12. Objdiff exact functions AOSS 16/21 -> 16/21, zi8alpha 10/12 -> 10/12. Matched code AOSS 6436 -> 6436, zi8alpha 5704 -> 5704; matched data AOSS 3896 -> 3896, zi8alpha 72 -> 180.
|
||||
Instruction deficits at entry -> final: Init 8 -> 9; Decrypt 0 -> 0; Options 0 -> 0; Hello 2 -> 2; Cipher 0 -> 0; WordCase 0 -> 0; Candidates 1 -> 0. The gate strict-count difference from objdiff for AOSS_81400E0C remains its CR1 branch normalization limitation; objdiff reports 100.0.
|
||||
Source review: only AOSS_Init_old, AOSS_81401778 and Zi8AlphaGetCandidates changed. No new comments, raw-offset field accesses, assembly, uninitialized locals, hand-placed data, configuration edits, external mutations or other translation-unit changes. Final git diff --check passed after trimming log whitespace.
|
||||
36
tools/decomp-assist/fix-board-r4.final-gate.txt
Normal file
36
tools/decomp-assist/fix-board-r4.final-gate.txt
Normal file
@@ -0,0 +1,36 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/scene/setting/AOSS] pool: IDENTICAL
|
||||
[src/scene/setting/AOSS] objdiff: code 6436/16192 data 3896/3928 functions 16/21 fuzzy 96.7779 linked code 0
|
||||
[src/scene/setting/AOSS] instruction-exact functions: 15/21
|
||||
[src/scene/setting/AOSS] section .bss size 3496 match 100.0
|
||||
[src/scene/setting/AOSS] section .data size 368 match 100.0
|
||||
[src/scene/setting/AOSS] section .sbss size 32 match 42.857143
|
||||
[src/scene/setting/AOSS] section .sdata size 24 match 100.0
|
||||
[src/scene/setting/AOSS] section .sdata2 size 8 match 100.0
|
||||
[src/scene/setting/AOSS] section .text size 16192 match 96.777916
|
||||
[src/scene/setting/AOSS] below 100: AOSS_Init_old 93.78725
|
||||
[src/scene/setting/AOSS] below 100: AOSS_81400830 97.74143
|
||||
[src/scene/setting/AOSS] below 100: AOSS_814013AC 98.77193
|
||||
[src/scene/setting/AOSS] below 100: AOSS_81401778 92.190475
|
||||
[src/scene/setting/AOSS] below 100: AOSS_81401E80 98.605446
|
||||
[src/scene/setting/AOSS] baseline: code 6436/16192 data 3896 functions 16 fuzzy 96.5045
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] objdiff: code 5704/21664 data 180/564 functions 10/12 fuzzy 94.1715 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] instruction-exact functions: 10/12
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] section .data size 48 match None
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] section .rodata size 336 match 99.0991
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] section .text size 21664 match 94.17153
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] section extab size 72 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] section extabindex size 108 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] below 100: Zi8ChangeWordCase 99.09091
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] below 100: Zi8AlphaGetCandidates 92.01039
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8alpha] baseline: code 5704/21664 data 72 functions 10 fuzzy 93.1492
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.68724 -> 86.68724
|
||||
global fuzzy_match_percent: 99.30809 -> 99.31698
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11031 -> 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
|
||||
|
||||
|
||||
|
||||
175
tools/decomp-assist/sol-high-structural-round4.attempts.md
Normal file
175
tools/decomp-assist/sol-high-structural-round4.attempts.md
Normal file
@@ -0,0 +1,175 @@
|
||||
# Structural round 4. Baseline /tmp/sol-baseline.json; all diagnostics saved under /tmp/sol-diag. No shared header guard removed.
|
||||
SD create diagnosis: missing loop-body reload of BS2 manager, string-base and System-base register lifetime differ, 145/146 instructions.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | create__Q33ipl5scene15SDChannelSelectFv | 1-cache-bs2-for-condition | structural 7 positional 27 insns 148/146 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | create__Q33ipl5scene15SDChannelSelectFv | 2-do-loop-explicit-state-break | structural 9 positional 40 insns 145/146 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | create__Q33ipl5scene15SDChannelSelectFv | 3-reload-manager-local | structural 4 positional 39 insns 145/146 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
handleSDTitleListResult diagnosis: early time guard branch is bne vs target beq+b; final-loop titleId/channelCount register lifetimes differ.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | 1-time-guard-inverted-body | structural 4 positional 143 insns 170/171 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | 2-channel-count-declared-after-title-id | structural 4 positional 141 insns 170/171 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | 3-explicit-next-channel-index | structural 4 positional 143 insns 170/171 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
collectTitlesByUsage diagnosis: count increment uses r3 vs target r0 and threshold load is scheduled before stack usage reload. ChannelOrder also has page/order/titleId lifetimes and operand order differences.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 1-threshold-operands | structural 6 positional 9 insns 101/101 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 2-compound-count-update | structural 2 positional 4 insns 101/101 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 3-postfix-count-update | structural 2 positional 4 insns 101/101 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
collectTitlesFromNandUsage diagnosis: count increment uses r3 vs target r0 and threshold load is scheduled before stack usage reload. ChannelOrder also has page/order/titleId lifetimes and operand order differences.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 1-threshold-operands | structural 6 positional 9 insns 102/102 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 2-compound-count-update | structural 2 positional 4 insns 102/102 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 3-postfix-count-update | structural 2 positional 4 insns 102/102 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
collectTitlesByChannelOrder diagnosis: count increment uses r3 vs target r0 and threshold load is scheduled before stack usage reload. ChannelOrder also has page/order/titleId lifetimes and operand order differences.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 1-threshold-operands | structural 6 positional 27 insns 126/126 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 2-compound-count-update | structural 2 positional 22 insns 126/126 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 3-postfix-count-update | structural 2 positional 22 insns 126/126 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
collectTitlesBySpecialChannels diagnosis: count increment uses r3 vs target r0 and threshold load is scheduled before stack usage reload. ChannelOrder also has page/order/titleId lifetimes and operand order differences.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 1-threshold-operands | structural 24 positional 36 insns 361/361 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 2-compound-count-update | structural 8 positional 16 insns 361/361 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 3-postfix-count-update | structural 8 positional 16 insns 361/361 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
flushSaveDataAndMountSD diagnosis: same frame/count; only flushAsync heap/savedata argument load order differs.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | 1-evaluate-heap-before-save-data | structural 2 positional 2 insns 35/35 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | 2-save-data-reference | BUILD FAILED
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | 3-heap-then-save-data-locals | BUILD FAILED
|
||||
drawChannelTransitionObjects diagnosis: target skips state 21, range guards bge+b, and page/index/channel register homes differ. Source currently incorrectly includes 21.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 1-correct-state-21-and-lifetimes | structural 11 positional 139 insns 157/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 2-separate-guard-sides-and-ranges | structural 11 positional 139 insns 157/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 3-explicit-switch-exclusion | structural 11 positional 139 insns 157/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | 4-save-data-then-heap-local | structural 2 positional 2 insns 35/35 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | 5-heap-then-save-data-local | structural 2 positional 2 insns 35/35 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 4-state-switches-instead-of-range-conditions | structural 0 positional 21 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
calcCommon diagnosis: source materializes missing default optOutEvent r5=0; all other instructions match. Preserve real ABI and both event handler arguments.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | calcCommon__Q33ipl5scene15SDChannelSelectFv | 1-explicit-default-argument | structural 4 positional 89 insns 109/108 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | calcCommon__Q33ipl5scene15SDChannelSelectFv | 2-receiver-via-reference | structural 4 positional 89 insns 109/108 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | calcCommon__Q33ipl5scene15SDChannelSelectFv | 3-separate-event-handler-local | structural 4 positional 89 insns 109/108 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
initializeNormalPage diagnosis: source materializes missing default optOutEvent r5=0; all other instructions match. Preserve real ABI and both event handler arguments.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | initializeNormalPage__Q33ipl5scene15SDChannelSelectFv | 1-explicit-default-argument | structural 3 positional 47 insns 95/94 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | initializeNormalPage__Q33ipl5scene15SDChannelSelectFv | 2-receiver-via-reference | structural 3 positional 47 insns 95/94 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | initializeNormalPage__Q33ipl5scene15SDChannelSelectFv | 3-separate-event-handler-local | structural 3 positional 47 insns 95/94 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
selectChannel diagnosis: source materializes missing default optOutEvent r5=0; all other instructions match. Preserve real ABI and both event handler arguments.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | selectChannel__Q33ipl5scene15SDChannelSelectFii | 1-explicit-default-argument | structural 1 positional 19 insns 60/59 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | selectChannel__Q33ipl5scene15SDChannelSelectFii | 2-receiver-via-reference | structural 1 positional 19 insns 60/59 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | selectChannel__Q33ipl5scene15SDChannelSelectFii | 3-separate-event-handler-local | structural 1 positional 19 insns 60/59 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
SDButton onEventDerived diagnosis: event branch is bne vs target beq+b, default r5 extra, net instruction counts coincide because of these opposite differences.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface | 1-early-return-event-guard | structural 9 positional 57 insns 144/144 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface | 2-switch-event-dispatch | structural 9 positional 60 insns 145/144 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface | 3-explicit-default-with-state-lifetime | structural 9 positional 57 insns 144/144 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
setChannelScissor diagnosis: same frame and instruction count; projection divisions, fb width/height conversion, and scissor axes order determine FP scheduling.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | 1-scissor-axis-declarations | structural 25 positional 76 insns 233/233 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | 2-projection-temporary-declarations | structural 23 positional 68 insns 233/233 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | 3-width-before-y-evaluation | structural 29 positional 64 insns 233/233 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
drawChannelTransitionObjects attempt 5 declaration search after restoring switches: declaration block: | int index; | int page; | SDChannelObj* channel = NULL; | start (1000000, 1000000) | best (1000000, 1000000) after 6 builds; source restored; best order was: | int index; | int page; | SDChannelObj* channel = NULL; |
|
||||
drawChannelTransitionObjects attempt 5 declaration search after restoring switches: declaration block: | int index; | int page; | SDChannelObj* channel = NULL; | start (0, 21) | best (0, 21) after 6 builds; source restored; best order was: | int index; | int page; | SDChannelObj* channel = NULL; |
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 6-page-and-index-loop-scope | structural 0 positional 21 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 7-channel-assignment-outside-condition | structural 18 positional 144 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 8-page-index-then-channel-local-binding | structural 0 positional 21 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 9-inline-list-iterator-for-loop | structural 9 positional 155 insns 162/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
CalcPaneLocate_ diagnosis: same frame and count, scale/margin FP homes differ, inline string-width helpers reserve later FP constants. CalcPaneLocate also has vector-y/coloring; StartScroll has callback receiver register difference.
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 1-margin-declaration-before-scale-with-same-evaluation | structural 0 positional 18 insns 435/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 2-margin-then-scale-declarations-and-assignments | structural 0 positional 18 insns 435/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 3-inline-margin-expression | structural 2 positional 404 insns 436/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
GetPrevPageIdx_ diagnosis: same frame and count, scale/margin FP homes differ, inline string-width helpers reserve later FP constants. CalcPaneLocate also has vector-y/coloring; StartScroll has callback receiver register difference.
|
||||
src/keyboard/tiCandidateBox | GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | 1-margin-declaration-before-scale-with-same-evaluation | structural 0 positional 11 insns 129/129 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | 2-margin-then-scale-declarations-and-assignments | structural 0 positional 11 insns 129/129 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | 3-inline-margin-expression | structural 0 positional 11 insns 129/129 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
StartScroll diagnosis: same frame and count, scale/margin FP homes differ, inline string-width helpers reserve later FP constants. CalcPaneLocate also has vector-y/coloring; StartScroll has callback receiver register difference.
|
||||
src/keyboard/tiCandidateBox | StartScroll__Q39textinput12candidatebox10UITextAreaFl | 1-margin-declaration-before-scale-with-same-evaluation | structural 0 positional 8 insns 185/185 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | StartScroll__Q39textinput12candidatebox10UITextAreaFl | 2-margin-then-scale-declarations-and-assignments | structural 0 positional 8 insns 185/185 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | StartScroll__Q39textinput12candidatebox10UITextAreaFl | 3-inline-margin-expression | structural 2 positional 161 insns 186/185 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
StartScrollToIdx diagnosis: same frame and count, scale/margin FP homes differ, inline string-width helpers reserve later FP constants. CalcPaneLocate also has vector-y/coloring; StartScroll has callback receiver register difference.
|
||||
src/keyboard/tiCandidateBox | StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl | 1-margin-declaration-before-scale-with-same-evaluation | structural 0 positional 7 insns 184/184 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl | 2-margin-then-scale-declarations-and-assignments | structural 0 positional 7 insns 184/184 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl | 3-inline-margin-expression | structural 2 positional 160 insns 185/184 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 4-helper-if-else-local | structural 0 positional 11 insns 435/435
|
||||
src/keyboard/tiCandidateBox | GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | 4-helper-if-else-local | structural 0 positional 17 insns 129/129
|
||||
src/keyboard/tiCandidateBox | StartScroll__Q39textinput12candidatebox10UITextAreaFl | 4-helper-if-else-local | structural 0 positional 1 insns 185/185
|
||||
src/keyboard/tiCandidateBox | StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl | 4-helper-if-else-local | structural 0 positional 0 insns 184/184
|
||||
StartScroll callback diagnosis: target r31 is steps, source r30 is this. Callback onAnmEvent treats data as signed scroll displacement; source passed the wrong value.
|
||||
src/keyboard/tiCandidateBox | StartScroll__Q39textinput12candidatebox10UITextAreaFl | 7-correct-callback-scroll-displacement | structural 0 positional 0 insns 185/185 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
Candidate create diagnosis: inline UITextArea::Init loop uses offsets instead of cursor; UIButton::Create and UIOnOffButton::Create string-pointer lifetime boundaries differ; 351/352 instructions.
|
||||
src/keyboard/tiCandidateBox | create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 1-combined-candidates-allocation-construction | structural 27 positional 239 insns 351/352 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 2-string-construction-local-reference | structural 27 positional 239 insns 351/352 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 3-pass-stored-allocator | structural 29 positional 242 insns 351/352 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
Candidate createAnmPane diagnosis: target retains pane-record cursor through CreateAnimTransform then reloads animation ID from table; source retains animation record, eliminating two target loads.
|
||||
src/keyboard/tiCandidateBox | createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 1-reload-animation-id-after-transform | structural 37 positional 170 insns 220/216 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 2-pane-local-inside-outer-loop | structural 9 positional 102 insns 214/216 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 3-animation-index-widened | structural 25 positional 153 insns 214/216 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
GetNextPageIdx diagnosis: existing asm has nonzero r2 SDA base bits unlike target zero relocation bases; objdiff 100 but instruction-exact checker differs. Try readable C conversion, without editing existing asm.
|
||||
src/keyboard/tiCandidateBox | GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl | 1-readable-c-forward-width-loop | structural 0 positional 0 insns 130/130 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
onGUIEvent diagnosis: objdiff 100%, 450/450 actual code matches. ctxdiff/odiff incorrectly uses CR operand as absolute branch target at two non-cr0 branches; do not alter tools or fake their score.
|
||||
src/keyboard/tiCandidateBox | onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input | 1-page-range-guard-split | structural 8 positional 19 insns 450/450 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input | 2-event-name-match-loop-index-u32 | structural 3 positional 3 insns 450/450 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input | 3-focus-guard-reference-temporary | structural 2 positional 33 insns 450/450 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | 7-scale-inline-helper-boundary | structural 0 positional 0 insns 129/129 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 7-string-height-local | structural 0 positional 11 insns 435/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 8-text-size-named-temporary | structural 12 positional 21 insns 435/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 9-inline-string-width-guard | structural 9 positional 164 insns 436/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 10-width-declared-before-height-read | structural 0 positional 11 insns 435/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 11-height-size-field-updated-in-place | structural 93 positional 311 insns 433/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 12-size-declaration-after-width-helper | structural 32 positional 314 insns 432/435 | POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 4-usage-threshold-inline-helper | structural 15 positional 40 insns 106/101 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 4-usage-threshold-inline-helper | structural 15 positional 39 insns 107/102 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 4-usage-threshold-inline-helper | structural 18 positional 63 insns 131/126 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 4-usage-threshold-inline-helper | structural 50 positional 224 insns 353/361 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
CellPhone onKey diagnosis: frame and 682 instructions identical; paneName/state, inlined key-array cursor and offset register homes differ in multiple findKeyForPane expansions.
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 1-state-declared-before-pane-name | structural 0 positional 37 insns 682/682 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 2-trigger-name-scope | structural 0 positional 37 insns 682/682 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 3-inline-keyset-boundary | structural 0 positional 37 insns 682/682 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
CellPhone create diagnosis: same frame and 333 instructions; toggle-pane record and inner animation index saved-register homes are swapped, seven diffs.
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 1-toggle-key-declared-before-record | structural 0 positional 10 insns 333/333 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 2-toggle-animation-record-lifetime | structural 4 positional 9 insns 333/333 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 3-toggle-record-before-pane-allocation | structural 14 positional 199 insns 331/333 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
CellPhone init diagnosis: target keeps layout this in r27 versus ours r30, zero/T in r26 versus r29; pane cursor and keyset offset homes differ. Full frame and 536 instructions identical.
|
||||
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 1-name-loop-cursor | structural 0 positional 155 insns 536/536 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 2-local-keyset-before-pane-lookups | structural 6 positional 166 insns 536/536 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 3-text-name-buffer-before-source-name | structural 0 positional 155 insns 536/536 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | 4-switch-time-condition | structural 5 positional 143 insns 173/171 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | 5-title-id-local-outside-final-loop | structural 4 positional 143 insns 170/171 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | 6-advance-count-after-array-store | structural 4 positional 143 insns 170/171 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 4-animation-id-inline-accessor | structural 0 positional 7 insns 333/333 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 5-animation-id-local-result | structural 0 positional 7 insns 333/333 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 6-animation-id-pointer-accessor | structural 0 positional 7 insns 333/333 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 13-box-width-return-local | structural 0 positional 11 insns 435/435
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 14-box-width-default-zero | structural 22 positional 318 insns 431/435
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 15-box-width-text-local | structural 0 positional 11 insns 435/435
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 5-signed-next-count-temporary | structural 2 positional 4 insns 101/101 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 6-value-copy-before-threshold-read | structural 2 positional 4 insns 101/101 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 7-separate-threshold-guard-sides | structural 2 positional 4 insns 101/101 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 5-signed-next-count-temporary | structural 2 positional 4 insns 102/102 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 6-value-copy-before-threshold-read | structural 2 positional 4 insns 102/102 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 7-separate-threshold-guard-sides | structural 2 positional 4 insns 102/102 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 5-signed-next-count-temporary | structural 2 positional 22 insns 126/126 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 6-value-copy-before-threshold-read | structural 2 positional 22 insns 126/126 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | declaration-search-last | declaration block: | f32 scissorWidth; | f32 scissorY; | f32 scissorX; | f32 scissorHeight; | u16 framebufferWidth; | u16 framebufferHeight; | start (23, 68) | best (23, 68) after 36 builds; source restored; best order was: | f32 scissorWidth; | f32 scissorY; | f32 scissorX; | f32 scissorHeight; | u16 framebufferWidth; | u16 framebufferHeight; |
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | declaration-search-last | declaration block: | f32 widthScale = GetWidthScale_(); | f32 margin = GetMargin_(); | f32 xOffset = mfXOffset; | | f32 areaPaneXOffset = mpTextAreaPane->getPane()->GetTranslate().x; | f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width; | s32 selectedIdx = GetSelectedTextIdx(); | start (0, 11) | best (0, 11) after 48 builds; source restored; best order was: | f32 widthScale = GetWidthScale_(); | f32 margin = GetMargin_(); | f32 xOffset = mfXOffset; | | f32 areaPaneXOffset = mpTextAreaPane->getPane()->GetTranslate().x; | f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width; | s32 selectedIdx = GetSelectedTextIdx(); |
|
||||
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 4-base-reset-inline-boundary | structural 0 positional 155 insns 536/536 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | declaration-search-last | declaration block: | u8 state = static_cast<KeyEvent*>(data)->state; | s32 controlKey = findCellPhoneControlKey(paneName); | start (0, 37) | best (0, 37) after 2 builds; source restored; best order was: | u8 state = static_cast<KeyEvent*>(data)->state; | s32 controlKey = findCellPhoneControlKey(paneName); |
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 10-direct-channel-location-fields | structural 0 positional 16 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 11-assignment-expression-condition | structural 0 positional 16 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 12-pointer-condition-for-loop | structural 0 positional 16 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 13-direct-channel-locations-loop-scope | structural 0 positional 0 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 14-channel-index-long-local | structural 0 positional 16 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | 15-channel-page-and-index-long-locals | structural 0 positional 16 insns 159/159 | POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 7-toggle-record-pointer-boundary | structural 0 positional 7 insns 333/333 | POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 5-control-key-record-reference | structural 3 positional 45 insns 682/682
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 6-character-key-record-reference | structural 9 positional 207 insns 682/682
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 7-control-key-unsigned-return | structural 1 positional 38 insns 682/682
|
||||
|
||||
## Final open-function audit
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | create__Q33ipl5scene15SDChannelSelectFv | 3 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | 6 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 7 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 7 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 6 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | 4 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | 3 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | calcCommon__Q33ipl5scene15SDChannelSelectFv | 3 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | initializeNormalPage__Q33ipl5scene15SDChannelSelectFv | 3 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | selectChannel__Q33ipl5scene15SDChannelSelectFii | 3 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | 4 successful distinct source trials logged | OPEN
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect | onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface | 3 successful distinct source trials logged | OPEN
|
||||
src/keyboard/tiCandidateBox | create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 3 successful distinct source trials logged | OPEN
|
||||
src/keyboard/tiCandidateBox | createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 3 successful distinct source trials logged | OPEN
|
||||
src/keyboard/tiCandidateBox | CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 14 successful distinct source trials logged | OPEN
|
||||
src/keyboard/tiCandidateBox | onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input | 3 successful distinct source trials logged | OPEN
|
||||
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 7 successful distinct source trials logged | OPEN
|
||||
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 7 successful distinct source trials logged | OPEN
|
||||
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 4 successful distinct source trials logged | OPEN
|
||||
|
||||
Final clean full gate over all three units: GATE PASS; regressions 0; forbidden patterns 0; readability warnings 0; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
113
tools/decomp-assist/sol-high-structural-round4.report.md
Normal file
113
tools/decomp-assist/sol-high-structural-round4.report.md
Normal file
@@ -0,0 +1,113 @@
|
||||
# Structural matching round 4
|
||||
|
||||
| Unit | Instruction-exact functions | Objdiff matched code bytes | Objdiff matched data bytes |
|
||||
| --- | --- | --- | --- |
|
||||
| `src/scene/sdChannelSelect/iplSDChannelSelect` | 116/129 -> 117/129 | 26472 -> 27108 / 33828 | 224 -> 224 / 2960 |
|
||||
| `src/keyboard/tiCandidateBox` | 104/112 -> 108/112 | 17996 -> 19988 / 24000 | 1132 -> 1132 / 4652 |
|
||||
| `src/keyboard/tiCellPhone` | 83/86 -> 83/86 | 12824 -> 12824 / 19028 | 3860 -> 3860 / 3860 |
|
||||
|
||||
## New exact functions
|
||||
|
||||
- `drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv`: objdiff 100.0%; src 0x27c base 0x27c insns 159/159; diffs 0: [].
|
||||
- `GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl`: objdiff 100.0%; src 0x208 base 0x208 insns 130/130; diffs 0: [].
|
||||
- `GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl`: objdiff 100.0%; src 0x204 base 0x204 insns 129/129; diffs 0: [].
|
||||
- `StartScroll__Q39textinput12candidatebox10UITextAreaFl`: objdiff 100.0%; src 0x2e4 base 0x2e4 insns 185/185; diffs 0: [].
|
||||
- `StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl`: objdiff 100.0%; src 0x2e0 base 0x2e0 insns 184/184; diffs 0: [].
|
||||
|
||||
## Remaining functions, in unit and object order
|
||||
|
||||
| Function | Objdiff | Successful logged trials | Remaining difference |
|
||||
| --- | --- | --- | --- |
|
||||
| `create__Q33ipl5scene15SDChannelSelectFv` | 97.73972% | 3 | BS2 loop manager reload and data-base lifetime; 145/146 instructions. |
|
||||
| `handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv` | 99.15205% | 6 | Time guard needs beq plus branch; titleId/channelCount homes differ; 170/171 instructions. |
|
||||
| `collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 97.81188% | 7 | Count update and threshold/stack load scheduling, four differences. |
|
||||
| `collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 97.833336% | 7 | Count update and threshold/stack load scheduling, four differences. |
|
||||
| `collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 97.29365% | 6 | Count update scheduling plus title/page/index register homes, 22 differences. |
|
||||
| `collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` | 97.55125% | 4 | Count update scheduling in four blocks, 16 differences. |
|
||||
| `flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv` | 99.65714% | 3 | Heap and savedata argument loads reversed, two differences. |
|
||||
| `calcCommon__Q33ipl5scene15SDChannelSelectFv` | 99.07407% | 3 | Target omits optOutEvent r5 default initialization; source preserves the declared ABI. |
|
||||
| `initializeNormalPage__Q33ipl5scene15SDChannelSelectFv` | 98.93617% | 3 | Target omits optOutEvent r5 default initialization; source preserves the declared ABI. |
|
||||
| `selectChannel__Q33ipl5scene15SDChannelSelectFii` | 98.305084% | 3 | Target omits optOutEvent r5 default initialization; source preserves the declared ABI. |
|
||||
| `setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj` | 93.4721% | 4 | Projection/scissor FP operand ordering, conversion scheduling and register homes, 68 differences. |
|
||||
| `onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface` | 98.541664% | 3 | Event branch form and missing target r5 default initialization. |
|
||||
| `create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator` | 92.71023% | 3 | Inline pane initialization cursor, button helper string lifetimes; 351/352 instructions. |
|
||||
| `createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator` | 96.56481% | 3 | Animation table reload boundaries and saved-register homes; 214/216 instructions. |
|
||||
| `CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv` | 99.873566% | 14 | Inline string width versus height FP homes, 11 differences. |
|
||||
| `onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input` | 100.0% | 3 | Objdiff 100%; odiff incorrectly subtracts function address from CR operands on two branches. The gate instruction count is conservative. |
|
||||
| `onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv` | 99.67009% | 7 | Inlined key search cursor/offset and pane/state saved-register homes, 37 differences. |
|
||||
| `create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator` | 99.8949% | 7 | Toggle-pane record and inner-animation offset saved-register homes, seven differences. |
|
||||
| `init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv` | 98.52612% | 4 | Layout this, zero/T and loop pointer/offset saved-register homes, 155 differences. |
|
||||
|
||||
## Validation
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] pool: IDENTICAL
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] objdiff: code 27108/33828 data 224/2960 functions 117/129 fuzzy 99.5051 linked code 0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] instruction-exact functions: 117/129
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .data size 2736 match 35.06984
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .rodata size 64 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata2 size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .text size 33828 match 99.50514
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: create__Q33ipl5scene15SDChannelSelectFv 97.73972
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv 99.15205
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.29365
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: calcCommon__Q33ipl5scene15SDChannelSelectFv 99.07407
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: initializeNormalPage__Q33ipl5scene15SDChannelSelectFv 98.93617
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: selectChannel__Q33ipl5scene15SDChannelSelectFii 98.305084
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj 93.4721
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface 98.541664
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] baseline: code 26472/33828 data 224 functions 116 fuzzy 99.4179
|
||||
[src/keyboard/tiCandidateBox] pool: IDENTICAL
|
||||
[src/keyboard/tiCandidateBox] objdiff: code 19988/24000 data 1132/4652 functions 109/112 fuzzy 99.4395 linked code 0
|
||||
[src/keyboard/tiCandidateBox] instruction-exact functions: 108/112
|
||||
[src/keyboard/tiCandidateBox] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .data size 3488 match 99.27954
|
||||
[src/keyboard/tiCandidateBox] section .rodata size 1048 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .sdata size 32 match 96.875
|
||||
[src/keyboard/tiCandidateBox] section .sdata2 size 80 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .text size 24000 match 99.4395
|
||||
[src/keyboard/tiCandidateBox] below 100: create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 92.71023
|
||||
[src/keyboard/tiCandidateBox] below 100: createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 96.56481
|
||||
[src/keyboard/tiCandidateBox] below 100: CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv 99.873566
|
||||
[src/keyboard/tiCandidateBox] baseline: code 17996/24000 data 1132 functions 106 fuzzy 99.4112
|
||||
[src/keyboard/tiCellPhone] pool: IDENTICAL
|
||||
[src/keyboard/tiCellPhone] objdiff: code 12824/19028 data 3860/3860 functions 83/86 fuzzy 99.7793 linked code 0
|
||||
[src/keyboard/tiCellPhone] instruction-exact functions: 83/86
|
||||
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiCellPhone] section .data size 2416 match 100.0
|
||||
[src/keyboard/tiCellPhone] section .rodata size 1320 match 100.0
|
||||
[src/keyboard/tiCellPhone] section .sdata size 112 match 100.0
|
||||
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 100.0
|
||||
[src/keyboard/tiCellPhone] section .text size 19028 match 99.779274
|
||||
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009
|
||||
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949
|
||||
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612
|
||||
[src/keyboard/tiCellPhone] baseline: code 12824/19028 data 3860 functions 83 fuzzy 99.7793
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.74680 -> 86.83454
|
||||
global fuzzy_match_percent: 99.31120 -> 99.31242
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11031 -> 91.11031
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
All existing shared keyboard header guard sides remain intact. The new CandidateBox helper is enabled only by its own translation unit. The units remain NonMatching; no configure, symbol-size, section-placement or other-unit source changes were made.
|
||||
|
||||
The onGUIEvent entry is a checker limitation, not an objdiff failure. The unchanged SD default-argument mismatch has no demonstrated readable C++ solution with the current ABI. The residual data bytes were preserved; identical string pools alone do not prove every data section exact.
|
||||
|
||||
## Source commits
|
||||
|
||||
c11d586e match candidate scroll margin helper
|
||||
85c1e3ae pass scroll displacement to animation callback
|
||||
b893fd2f replace forward page index assembly with c
|
||||
bc0ac0c5 match backward page scale helper boundary
|
||||
2d0b4e65 match sd channel transition state switches
|
||||
121
tools/decomp-assist/sol-low-leaves-attempts.md
Normal file
121
tools/decomp-assist/sol-low-leaves-attempts.md
Normal file
@@ -0,0 +1,121 @@
|
||||
Baseline HEAD f4fd16f8. Current baseline report missing; nearest available ancestor 8e43db05 will be selected explicitly for gate, supplemented with current HEAD report /tmp/sol-low-start.json.
|
||||
Structural diagnosis for every open function saved in /tmp/sol-low-diagnosis.
|
||||
KPADGetProjectionPos | operand order: half height and pixel scale | structural/exact (0, 10) insns 19/19 | restored
|
||||
KPADGetProjectionPos | target operand order: height first; pixel scale first | structural/exact (0, 10) insns 19/19 | restored
|
||||
KPADGetProjectionPos | explicit double temporary initialized before products | structural/exact (0, 14) insns 19/19 | restored
|
||||
reset_kpad | initialize reference distance before bounds | structural/exact (0, 10) insns 117/117 | restored
|
||||
reset_kpad | expression temporary: retain numerator for both stores | structural/exact (0, 8) insns 117/117 | restored
|
||||
reset_kpad | inline distance ratio and initialize reference distance | structural/exact (20, 95) insns 116/117 | restored
|
||||
KPADSetSensorHeight | move channel pointer initialization ahead of constants | structural/exact (0, 7) insns 52/52 | restored
|
||||
KPADSetSensorHeight | inline squares into sqrt argument | structural/exact (0, 7) insns 52/52 | restored
|
||||
KPADSetSensorHeight | store center before squared intermediates | structural/exact (0, 7) insns 52/52 | restored
|
||||
KPADGetProjectionPos | declaration-order search | declaration block:; f64 scaled;; f32 height = rect->bottom - rect->top;; f32 halfHeight = height * 0.5f;; f32 x = src->x * halfHeight;; f32 y = src->y * halfHeight;; start (0, 9); best (0, 9) after 23 builds; source restored; best order was:; f64 scaled;; f32 height = rect->bottom - rect->top;; f32 halfHeight = height * 0.5f;; f32 x = src->x * halfHeight;; f32 y = src->y * halfHeight;;
|
||||
KPADSetSensorHeight | declaration-order search | declaration block:; KPADInside* kpad;; f32 halfHeight;; f32 barOffsetX;; f32 barDiagonal;; f32 halfWidthSquared;; f32 halfWidth;; f32 negativeSensorHeight;; f32 barDiagonalSquared;; f32 halfHeightSquared;; start (0, 7); best (0, 7) after 93 builds; source restored; best order was:; KPADInside* kpad;; f32 halfHeight;; f32 barOffsetX;; f32 barDiagonal;; f32 halfWidthSquared;; f32 halfWidth;; f32 negativeSensorHeight;; f32 barDiagonalSquared;; f32 halfHeightSquared;;
|
||||
calc_acc_horizon | declaration-order search | declaration block:; f32 magnitude = (f32)sqrt(kpad->acceleration.x * kpad->acceleration.x + kpad->acceleration.y * kpad->acceleration.y);; f32 normalizedX;; f32 normalizedY;; f32 targetY;; f32 targetX;; f32 productX;; f32 oldX;; f32 oldY;; f32 blend;; f32 projectedX;; f32 smoothing;; f32 deltaX;; f32 nextX;; f32 nextY;; f32 normalized;; f32 unitX;; f32 oldCircleX;; f32 oldCircleY;; f32 unitY;; f32 circleX;; f32 deltaCircleX;; f32 circleY;; f32 deltaCircleY;; start (2, 35); improved (0, 30); improved (0, 29); best (0, 29) after 100 builds; kept in source:; f32 productX;; f32 oldX;; f32 normalizedY;; f32 targetY;; f32 targetX;; f32 magnitude = (f32)sqrt(kpad->acceleration.x * kpad->acceleration.x + kpad->acceleration.y * kpad->acceleration.y);; f32 normalizedX;; f32 oldY;; f32 blend;; f32 projectedX;; f32 smoothing;; f32 deltaX;; f32 nextX;; f32 nextY;; f32 normalized;; f32 unitX;; f32 oldCircleX;; f32 oldCircleY;; f32 unitY;; f32 circleX;; f32 deltaCircleX;; f32 circleY;; f32 deltaCircleY;;
|
||||
select_1obj_first | declaration-order search | declaration block:; KPADDPDObject* object = kpad->dpdState.objects;; KPADDPDObject* end = kpad->dpdState.candidates;; f32 scale = kpad->dpdObjectScale;; f32 productX = kpad->horizonTangent.x * kpad->horizonAxis.x;; f32 productY = kpad->horizonTangent.y * kpad->horizonAxis.x;; f32 offsetX = productX + kpad->horizonTangent.y * kpad->horizonAxis.y;; f32 offsetY = productY - kpad->horizonTangent.x * kpad->horizonAxis.y;; start (2, 26); best (2, 26) after 52 builds; source restored; best order was:; KPADDPDObject* object = kpad->dpdState.objects;; KPADDPDObject* end = kpad->dpdState.candidates;; f32 scale = kpad->dpdObjectScale;; f32 productX = kpad->horizonTangent.x * kpad->horizonAxis.x;; f32 productY = kpad->horizonTangent.y * kpad->horizonAxis.x;; f32 offsetX = productX + kpad->horizonTangent.y * kpad->horizonAxis.y;; f32 offsetY = productY - kpad->horizonTangent.x * kpad->horizonAxis.y;;
|
||||
kbdEventHandler | reuse report status temporary in comparisons | structural/exact (3, 148) insns 185/186 | restored
|
||||
kbdEventHandler | initialize channel pointer in one expression | structural/exact (0, 6) insns 186/186 | restored
|
||||
kbdEventHandler | declare report status with its first load | build failed .c -o build/43U/src/libs/RVL_SDK/src/kbd && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/kbd/kbd_lib.d build/43U/src/libs/RVL_SDK/src/kbd/kbd_lib.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: libs\RVL_SDK\src\kbd\kbd_lib.c
|
||||
# ---------------------------------------
|
||||
# 238: u8 status = bytes[2];
|
||||
# Error: ^^
|
||||
# (10141) expression syntax error
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
| restored
|
||||
KBDSetModState | typed channel pointer for load and store | structural/exact (0, 7) insns 42/42 | restored
|
||||
KBDSetModState | physical modifier masked expression | structural/exact (3, 7) insns 42/42 | restored
|
||||
KBDSetModState | single modifier state temporary | structural/exact (0, 4) insns 42/42 | restored
|
||||
kbd_led_handler | load completion callback before releasing command | structural/exact (24, 19) insns 23/25 | restored
|
||||
select_1obj_continue | declaration-order search | declaration block:; KPADDPDObject* candidates = kpad->dpdState.candidates;; KPADDPDObject* candidate;; KPADDPDObject* object;; KPADDPDObject* matchedCandidate;; KPADDPDObject* source;; f32 best = kp_err_near_pos * kp_err_near_pos;; start (0, 17); best (0, 17) after 36 builds; source restored; best order was:; KPADDPDObject* candidates = kpad->dpdState.candidates;; KPADDPDObject* candidate;; KPADDPDObject* object;; KPADDPDObject* matchedCandidate;; KPADDPDObject* source;; f32 best = kp_err_near_pos * kp_err_near_pos;;
|
||||
KPADInit | declaration-order search | declaration block:; KPADInside* kpad;; f32 distanceValue;; f32 sensorDistance;; f32 rotationElement;; f32 referenceWidth;; f32 referenceHeight;; f32 objectInterval;; f32 zero;; f32 degreesToRadians;; f32 one;; f32* matrix;; u32 i;; s32 chan;; BOOL enabled;; start (9, 81); improved (8, 70); improved (8, 67); improved (8, 58); improved (8, 54); improved (8, 51); best (8, 51) after 100 builds; kept in source:; f32 referenceHeight;; f32 objectInterval;; f32 sensorDistance;; f32 rotationElement;; f32 referenceWidth;; KPADInside* kpad;; f32 distanceValue;; f32 zero;; f32 degreesToRadians;; f32 one;; u32 i;; f32* matrix;; s32 chan;; BOOL enabled;;
|
||||
KPADRead | declaration-order search | declaration block:; KPADInside* kpad = &inside_kpads[chan];; s32 probe;; BOOL interruptState;; u32 available = 0;; u32 ringCount;; s32 start;; s32 sampleIndex;; u32 remaining;; u32 remainingSamples;; u32 buttons;; u16 previousButtons;; u32 changed;; u32 extensionButtons;; u32 coreButtons;; u8 device;; KPADSample latestSample;; KPADSample* sample;; KPADStatus* output;; start (11, 89); improved (11, 86); improved (11, 84); best (11, 84) after 100 builds; kept in source:; KPADInside* kpad = &inside_kpads[chan];; KPADStatus* output;; BOOL interruptState;; u32 available = 0;; u32 ringCount;; s32 start;; s32 sampleIndex;; u32 remaining;; u32 remainingSamples;; s32 probe;; u16 previousButtons;; u32 changed;; u32 extensionButtons;; u32 coreButtons;; u8 device;; KPADSample latestSample;; KPADSample* sample;; u32 buttons;;
|
||||
kbdProcMod | pass modifier expression directly | structural/exact (0, 4) insns 256/256 | restored
|
||||
kbdProcMod | local modifier scope around inline setter | structural/exact (0, 4) insns 256/256 | restored
|
||||
kbdProcMod | channel argument recovered from typed channel | structural/exact (14, 88) insns 259/256 | restored
|
||||
KBDSetModState | read old union through typed field pointer | structural/exact (0, 7) insns 42/42 | restored
|
||||
KBDSetModState | write new union through typed field pointer | structural/exact (0, 4) insns 42/42 | restored
|
||||
KBDSetModState | reverse union temporary declaration order | structural/exact (0, 4) insns 42/42 | restored
|
||||
kbd_led_handler | null callback test after clear; conditional error code | structural/exact (23, 21) insns 22/25 | restored
|
||||
kbd_led_handler | guard completion body with non-null callback | structural/exact (24, 19) insns 23/25 | restored
|
||||
KBDSetLedsAsync | unsigned indexed struct command loop | structural/exact (19, 72) insns 79/81 | restored
|
||||
KBDSetLedsAsync | unsigned indexed loop and direct channel flags | structural/exact (19, 72) insns 79/81 | restored
|
||||
KBDSetLedsAsync | unsigned counted byte offset with typed struct access | structural/exact (19, 72) insns 79/81 | restored
|
||||
KBDSetLeds | unsigned indexed struct command loop | structural/exact (19, 68) insns 78/79 | restored
|
||||
KBDSetLeds | unsigned indexed loop and direct flags access | structural/exact (19, 68) insns 78/79 | restored
|
||||
KBDSetLeds | unsigned indexed loop; preserve allocated command pointer | structural/exact (22, 69) insns 78/79 | restored
|
||||
KPADGetProjectionPos | inline double scale and target operand order | structural/exact (0, 10) insns 19/19 | restored
|
||||
KPADGetProjectionPos | reuse height temporary and inline final scale | build failed c/kpad/KPAD.c -o build/43U/src/libs/RVL_SDK/src/kpad && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/kpad/KPAD.d build/43U/src/libs/RVL_SDK/src/kpad/KPAD.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: libs\RVL_SDK\src\kpad\KPAD.c
|
||||
# -------------------------------------
|
||||
# 348: f32 x = src->x * height;
|
||||
# Error: ^^^
|
||||
# (10141) expression syntax error
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
| restored
|
||||
TMCJPEGDEC_IFD1_tag_parse | ignored planar configuration and contiguous EXIF tags | structural/exact (14, 226) insns 239/242 | restored
|
||||
TMCJPEGDEC_IFD1_tag_parse | ignored EXIF tag range only | structural/exact (57, 219) insns 239/242 | restored
|
||||
TMCJPEGDEC_IFD1_tag_parse | unsigned tag selector and ignored EXIF range | structural/exact (57, 219) insns 239/242 | restored
|
||||
TMCJPEGDEC_IFD0_tag_parse | unsigned widened tag selector | structural/exact (27, 446) insns 481/481 | restored
|
||||
TMCJPEGDEC_IFD0_tag_parse | signed widened tag selector | structural/exact (27, 446) insns 481/481 | restored
|
||||
TMCJPEGDEC_IFD0_tag_parse | swap initial tag/type local declarations | structural/exact (29, 446) insns 481/481 | restored
|
||||
TMCJPEGDEC_exif_parse | read helper boundary: standard 16-bit helper | structural/exact (0, 46) insns 212/212 | restored
|
||||
TMCJPEGDEC_exif_parse | declare IFD cursor before offset | structural/exact (0, 46) insns 212/212 | restored
|
||||
TMCJPEGDEC_exif_parse | reverse byte order expression operands | structural/exact (0, 46) insns 212/212 | restored
|
||||
calc_acc_horizon | operand order of acceleration dot products | structural/exact (4, 37) insns 101/101 | restored
|
||||
calc_acc_horizon | reuse blend for quadratic smoothing | structural/exact (2, 35) insns 101/101 | restored
|
||||
calc_acc_horizon | declare magnitude after scalar intermediates | structural/exact (2, 34) insns 101/101 | restored
|
||||
read_kpad_acc | stack frame local declaration order | structural/exact (32, 82) insns 400/400 | restored
|
||||
read_kpad_acc | scalar smoothing: explicit pre-update delta | structural/exact (16, 66) insns 400/400 | restored
|
||||
read_kpad_acc | extension stack local moved to function scope | structural/exact (16, 66) insns 400/400 | restored
|
||||
select_1obj_first | offset scale operand order | structural/exact (2, 26) insns 109/109 | restored
|
||||
select_1obj_first | end pointer declared before object cursor | structural/exact (4, 27) insns 109/109 | restored
|
||||
select_1obj_first | candidate positions declared before coordinates | structural/exact (2, 26) insns 109/109 | restored
|
||||
select_1obj_continue | offset distance first as target operands | structural/exact (0, 17) insns 93/93 | restored
|
||||
select_1obj_continue | direction block local declarations before initializers | structural/exact (0, 16) insns 93/93 | restored
|
||||
select_1obj_continue | inline tangent product intermediates | structural/exact (0, 19) insns 93/93 | restored
|
||||
calc_dpd_variable | explicit absolute-distance branch | structural/exact (14, 45) insns 250/250 | restored
|
||||
calc_dpd_variable | vector stack declaration order | structural/exact (40, 71) insns 250/250 | restored
|
||||
calc_dpd_variable | reuse distance smoothing magnitude for final displacement | structural/exact (14, 43) insns 250/250 | restored
|
||||
KPADRead | gravity structures declaration order | structural/exact (15, 93) insns 459/459 | restored
|
||||
KPADRead | ring count clear and cursor calculation order | structural/exact (14, 89) insns 459/459 | restored
|
||||
KPADRead | explicit sample selection branch | structural/exact (11, 97) insns 459/459 | restored
|
||||
KPADInit | matrix base declaration order | structural/exact (9, 65) insns 185/185 | restored
|
||||
KPADInit | sensor diagonal operand order | structural/exact (9, 81) insns 185/185 | restored
|
||||
KPADInit | rotation temporary separated for sine and cosine | structural/exact (9, 81) insns 185/185 | restored
|
||||
KPADiSamplingCallback | status pointer declared before index | structural/exact (2, 28) insns 182/182 | restored
|
||||
KPADiSamplingCallback | device declared before channel state pointer | structural/exact (2, 28) insns 182/182 | restored
|
||||
KPADiSamplingCallback | sensor diagonal temporary local order | structural/exact (3, 39) insns 182/182 | restored
|
||||
KBDTranslateHidCode | declaration-order search | declaration block:; KBDKeyMap* map;; u16* table;; u32 keyIndex;; u16 entry;; s32 mask;; s32 offset;; s32 group;; u32 shiftFlag;; u16 activeFlag;; ; if (kbdInitialized == FALSE) {; start (0, 9); improved (0, 3); improved (0, 2); best (0, 2) after 173 builds; kept in source:; s32 mask;; u16* table;; u16 activeFlag;; u16 entry;; KBDKeyMap* map;; s32 offset;; s32 group;; u32 shiftFlag;; u32 keyIndex;; ; if (kbdInitialized == FALSE) {;
|
||||
KBDTranslateHidCode | target bit-test operand order | structural/exact (0, 1) insns 164/164 | restored
|
||||
KBDTranslateHidCode | both target bit-test operand orders | structural/exact (0, 0) insns 164/164 | kept
|
||||
reset_kpad | initialized declarations followed by declaration search | declaration block:; f32 upperY = 0.75f;; f32 distanceValue;; f32 zero = 0.0f;; f32 sensorDistance = kpad->referenceDistance;; f32 lowerY = -0.75f;; f32 one = 1.0f;; f32 negativeOne = -1.0f;; KPADDPDObject* object;; start (0, 10); best (0, 10) after 71 builds; source restored; best order was:; f32 upperY = 0.75f;; f32 distanceValue;; f32 zero = 0.0f;; f32 sensorDistance = kpad->referenceDistance;; f32 lowerY = -0.75f;; f32 one = 1.0f;; f32 negativeOne = -1.0f;; KPADDPDObject* object;; | restored no exact gain
|
||||
|
||||
KBDTranslateHidCode accepted after full clean gate --base 8e43db05. Exact objdiff 100%, ctxdiff 164/164 diffs 0; kbd instruction-exact 13->14/21, objdiff functions 14->15/21, code 2432->3088/5764, data 5296/5296. Pools identical, regressions 0, forbidden 0, readability 0, target DOL SHA1 preserved.
|
||||
KBDSetModState | single expression merging old physical modifiers | structural/exact (3, 7) insns 42/42 | restored
|
||||
KBDSetModState | reverse physical merge operands | structural/exact (3, 7) insns 42/42 | restored
|
||||
KBDSetModState | assign physical field directly from stored state | structural/exact (0, 4) insns 42/42 | restored
|
||||
kbdEventHandler | remove redundant report status temporary | structural/exact (0, 5) insns 186/186 | restored
|
||||
kbdEventHandler | load status before computing channel pointer | structural/exact (0, 5) insns 186/186 | restored
|
||||
KPADGetProjectionPos | name pixel aspect multiplier as local | structural/exact (0, 10) insns 19/19 | restored
|
||||
KPADGetProjectionPos | name both screen geometry constants | structural/exact (7, 11) insns 19/19 | restored
|
||||
KPADGetProjectionPos | vector intermediate for projection scaled components | structural/exact (7, 19) insns 23/19 | restored
|
||||
read_kpad_acc | final declaration search | declaration block:; Vec raw;; Vec previous;; start (16, 66); best (16, 66) after 2 builds; source restored; best order was:; Vec raw;; Vec previous;;
|
||||
calc_dpd_variable | final declaration search | declaration block:; Vec2 point;; Vec2 delta;; start (14, 45); best (14, 45) after 2 builds; source restored; best order was:; Vec2 point;; Vec2 delta;;
|
||||
KPADiSamplingCallback | final declaration search | declaration block:; u8 index = kpad->ringIndex;; KPADSample* status;; u32 tier;; u32 enabled;; u32 tableIndex;; start (2, 28); improved (0, 0); best (0, 0) after 6 builds; kept in source:; u8 index = kpad->ringIndex;; u32 tier;; KPADSample* status;; u32 enabled;; u32 tableIndex;;
|
||||
KBDSetModState | final declaration search | declaration block:; KBDModifierState oldState;; KBDModifierState newState;; interrupts = OSDisableInterrupts();; start (0, 4); best (0, 4) after 6 builds; source restored; best order was:; KBDModifierState oldState;; KBDModifierState newState;; interrupts = OSDisableInterrupts();;
|
||||
TMCJPEGDEC_exif_parse | final declaration search | declaration block:; u16 byteOrder;; u32 ifdOffset;; const u8* entries;; u16 remaining;; u16 count;; s32 entriesSize;; u16 index;; start (0, 46); improved (0, 43); best (0, 43) after 70 builds; kept in source:; u16 byteOrder;; u32 ifdOffset;; const u8* entries;; u16 remaining;; u16 index;; s32 entriesSize;; u16 count;;
|
||||
kbdProcMod | register-only declaration search | declaration block:; KBDChannel* data;; u32 modState;; s32 delta;; u8 flags;; ; u32 finalState;; s8 value;; start (0, 4); best (0, 4) after 52 builds; source restored; best order was:; KBDChannel* data;; u32 modState;; s32 delta;; u8 flags;; ; u32 finalState;; s8 value;; | restored
|
||||
KBDResetChannel | objdiff 100% and actual instructions identical. gate.py reports two cr1 branch differences because odiff.dis subtracts function position from the CR operand instead of the branch target; source untouched. This accounts for instruction-exact 13 versus objdiff-exact 14 at baseline, and 14 versus 15 after translation match.
|
||||
KPADiSamplingCallback | accepted fresh full gate --base 8e43db05, objdiff 100%, ctxdiff 182/182 diffs 0. KPAD exact 18->19/29, matched code 5188->5916/13056, data 7912/8032 unchanged. Regressions 0, forbidden 0, readability 0, DOL SHA1 correct.
|
||||
KPADInit | extract atomic object-interval update into a real inline helper before reset_kpad | 185/185 instructions, 81 differences unchanged; sdata2 order unchanged because MWCC emits helper constant at call | restored
|
||||
|
||||
Final audit: all 19 remaining functions have >=3 logged distinct source-level trials. Full clean combined gate over all three units PASS (--base 8e43db05), DOL SHA1 correct; no baseline or tooling edits. Independent comparison to starting HEAD report: 0 regressions, only KPAD and kbd_lib report measures changed. See sol-low-leaves-report.md for percentages, structural differences, and pre-existing cr1 normalization caveat.
|
||||
55
tools/decomp-assist/sol-low-leaves-final-gate.txt
Normal file
55
tools/decomp-assist/sol-low-leaves-final-gate.txt
Normal file
@@ -0,0 +1,55 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/kpad/KPAD] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/kpad/KPAD] objdiff: code 5916/13056 data 7912/8032 functions 19/29 fuzzy 98.5983 linked code 0
|
||||
[libs/RVL_SDK/src/kpad/KPAD] instruction-exact functions: 19/29
|
||||
[libs/RVL_SDK/src/kpad/KPAD] section .bss size 7680 match 100.0
|
||||
[libs/RVL_SDK/src/kpad/KPAD] section .data size 88 match 100.0
|
||||
[libs/RVL_SDK/src/kpad/KPAD] section .sbss size 32 match 100.0
|
||||
[libs/RVL_SDK/src/kpad/KPAD] section .sdata size 112 match 100.0
|
||||
[libs/RVL_SDK/src/kpad/KPAD] section .sdata2 size 120 match 93.333336
|
||||
[libs/RVL_SDK/src/kpad/KPAD] section .text size 13056 match 98.59834
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: reset_kpad 99.48718
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: KPADGetProjectionPos 96.57895
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: KPADSetSensorHeight 99.23077
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: calc_acc_horizon 97.27723
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: read_kpad_acc 98.15
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: select_1obj_first 98.348625
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: select_1obj_continue 98.49462
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: calc_dpd_variable 94.82
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: KPADRead 97.52723
|
||||
[libs/RVL_SDK/src/kpad/KPAD] below 100: KPADInit 96.51351
|
||||
[libs/RVL_SDK/src/kpad/KPAD] baseline: code 5188/13056 data 7912 functions 18 fuzzy 98.4972
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] objdiff: code 3088/5764 data 5296/5296 functions 15/21 fuzzy 97.6523 linked code 0
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] instruction-exact functions: 14/21
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] section .bss size 3968 match 100.0
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] section .data size 1304 match 100.0
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] section .sbss size 16 match 100.0
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] section .sdata size 8 match 100.0
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] section .text size 5764 match 97.65233
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] below 100: kbdEventHandler 99.83871
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] below 100: kbdProcMod 99.90234
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] below 100: kbd_led_handler 61.12
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] below 100: KBDSetLedsAsync 86.234566
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] below 100: KBDSetLeds 84.6076
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] below 100: KBDSetModState 99.40476
|
||||
[libs/RVL_SDK/src/kbd/kbd_lib] baseline: code 2432/5764 data 5296 functions 14 fuzzy 97.6176
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] objdiff: code 1348/5088 data None/None functions 3/6 fuzzy 96.2893 linked code 0
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] instruction-exact functions: 3/6
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] section .text size 5088 match 96.28931
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] below 100: TMCJPEGDEC_exif_parse 98.679245
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] below 100: TMCJPEGDEC_IFD0_tag_parse 94.241165
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] below 100: TMCJPEGDEC_IFD1_tag_parse 93.099174
|
||||
[libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse] baseline: code 1348/5088 data None functions 3 fuzzy 96.2893
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 87.39812 -> 87.44433
|
||||
global fuzzy_match_percent: 99.36627 -> 99.36678
|
||||
global complete_code_percent: 61.40923 -> 61.64133
|
||||
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
|
||||
note: config touched: config/43U/splits.txt (orchestrator reviews every config/symbols change)
|
||||
note: config touched: configure.py (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
48
tools/decomp-assist/sol-low-leaves-report.md
Normal file
48
tools/decomp-assist/sol-low-leaves-report.md
Normal file
@@ -0,0 +1,48 @@
|
||||
# Leaf matching result
|
||||
|
||||
Source commits: c012e880, 78a83518.
|
||||
|
||||
Full final gate: sol-low-leaves-final-gate.txt, explicitly selecting --base 8e43db05.
|
||||
The current HEAD f4fd16f8 baseline file is absent. 8e43db05 is the nearest ancestor with an existing baseline; the starting HEAD report was independently saved as /tmp/sol-low-start.json. No baseline or gate tool was modified.
|
||||
|
||||
Before -> after:
|
||||
- KPAD instruction-exact 18/29 -> 19/29; objdiff functions 18/29 -> 19/29; code 5188/13056 -> 5916/13056; data 7912/8032 -> 7912/8032.
|
||||
- kbd_lib gate instruction-exact 13/21 -> 14/21; objdiff functions 14/21 -> 15/21; code 2432/5764 -> 3088/5764; data 5296/5296 -> 5296/5296.
|
||||
- exif_parse instruction-exact 3/6 -> 3/6; code 1348/5088 -> 1348/5088; data 0/0 -> 0/0.
|
||||
|
||||
KBDResetChannel remains objdiff 100% and its actual instructions are identical. The gate undercounts it because odiff.dis normalizes the CR operand rather than the branch destination for two cr1 branches. This pre-existing gate-tool issue is recorded without editing the tools.
|
||||
|
||||
KPAD .sdata2 first divergence is the real 0.383864f constant: target offset 0x0c, source offset 0x60. Extracting the interval update into a meaningful inline helper did not change emission order and was restored. No dummy constant or forced placement was introduced.
|
||||
|
||||
## Remaining functions
|
||||
|
||||
- reset_kpad: 99.48718%; 117/117 instructions; 10 floating-register differences around reference distance and ratio temporaries.
|
||||
- KPADGetProjectionPos: 96.57895%; 19/19 instructions; 9 floating-register and multiplication-operand differences.
|
||||
- KPADSetSensorHeight: 99.23077%; 52/52 instructions; 7 base-pointer and square-result register differences.
|
||||
- calc_acc_horizon: 97.27723%; 101/101 instructions; floating-register allocation and scheduling differ.
|
||||
- read_kpad_acc: 98.15%; 400/400 instructions; smoothing helper expansion and floating-register allocation differ.
|
||||
- select_1obj_first: 98.348625%; 109/109 instructions; end-pointer and floating temporary register allocation differ.
|
||||
- select_1obj_continue: 98.49462%; 93/93 instructions; direction and offset temporaries use different registers and operand order.
|
||||
- calc_dpd_variable: 94.82%; 250/250 instructions; distance magnitude and projected-coordinate temporaries differ.
|
||||
- KPADRead: 97.52723%; 459/459 instructions; copy/gravity stack locals and inline expansion register scheduling differ.
|
||||
- KPADInit: 96.51351%; 185/185 instructions; callee-saved integer and floating allocation, scheduling, and constant encounter order differ.
|
||||
- kbdEventHandler: 99.83871%; 186/186 instructions; 5 report-byte and channel-base scratch-register differences.
|
||||
- kbdProcMod: 99.90234%; 256/256 instructions; 4 pointer/value register differences in inlined modifier-state update.
|
||||
- kbd_led_handler: 61.12%; 23/25 instructions; callback null-test/release ordering and scratch register allocation differ.
|
||||
- KBDSetLedsAsync: 86.234566%; 80/81 instructions; channel offset rematerialization, signed loop index, and command addressing differ.
|
||||
- KBDSetLeds: 84.6076%; 75/79 instructions; pointer induction versus target indexed command loop and channel offset rematerialization differ.
|
||||
- KBDSetModState: 99.40476%; 42/42 instructions; 4 pointer/value register differences at physical-modifier insertion.
|
||||
- TMCJPEGDEC_exif_parse: 98.679245%; 212/212 instructions; byte-reader temporaries and callee-saved parser cursor/count registers differ.
|
||||
- TMCJPEGDEC_IFD0_tag_parse: 94.241165%; 481/481 instructions; decoded tag/type temporaries and switch default branch structure differ.
|
||||
- TMCJPEGDEC_IFD1_tag_parse: 93.099174%; 239/242 instructions; switch decision tree/default-return structure and byte-reader temporary allocation differ.
|
||||
|
||||
Every remaining function has at least three distinct source-level trials logged in sol-low-leaves-attempts.md. Unsuccessful experiments were restored. Declaration-search tool outputs and target/source ctxdiff diagnosis are recorded or referenced there.
|
||||
|
||||
Changed files:
|
||||
- libs/RVL_SDK/src/kpad/KPAD.c
|
||||
- libs/RVL_SDK/src/kbd/kbd_lib.c
|
||||
- tools/decomp-assist/sol-low-leaves-attempts.md
|
||||
- tools/decomp-assist/sol-low-leaves-final-gate.txt
|
||||
- tools/decomp-assist/sol-low-leaves-report.md
|
||||
|
||||
No source change to exif_parse; no linking/configuration/header change.
|
||||
129
tools/decomp-assist/sol-med-attempts.jsonl
Normal file
129
tools/decomp-assist/sol-med-attempts.jsonl
Normal file
@@ -0,0 +1,129 @@
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24InitDlTask", "attempt": "diagnosis", "before": [0, 31], "after": [0, 31], "kept": false, "evidence": "src 0x240 base 0x240 insns 144/144\ndiffs 31: [5, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 31, 32]\n 5 M li r28, 0\n B li r29, 0\n 7 M stw r28, 8(r1)\n B stw r29, 8(r1)\n 10 M stw r28, 0xc(r1)\n B stw r29, 0xc(r1)\n 11 M stw r28, 0x10(r1)\n B stw r29, 0x10(r1)\n 12 M stw r28, 0x14(r1)\n B stw r29, 0x14(r1)\n 13 M stw r28, 0x18(r1)\n B stw r29, 0x18(r1)\n 14 M stw r28, 0x1c(r1)\n B stw r29, 0x1c(r1)\n 15 M stw r28, 0x20(r1)\n B stw r29, 0x20(r1)\n 16 M stw r28, 0x24(r1)\n B stw r29, 0x24(r1)\n 17 M stw r28, 0x28(r1)\n B stw r29, 0x28(r1)\n 18 M stw r28, 0x2c(r1)\n B stw r29, 0x2c(r1)\n 19"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "diagnosis", "before": [0, 3], "after": [0, 3], "kept": false, "evidence": "src 0x24c base 0x24c insns 147/147\ndiffs 3: [126, 127, 137]\n 126 M lhz r28, 0(r30)\n B lhz r30, 0(r30)\n 127 M cmplwi r28, 0xffff\n B cmplwi r30, 0xffff\n 137 M rlwinm r0, r28, 4, 0xc, 0x1b\n B rlwinm r0, r30, 4, 0xc, 0x1b\n"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "diagnosis", "before": [3, 50], "after": [3, 50], "kept": false, "evidence": "src 0x138 base 0x13c insns 78/79\n--- replace mine 22:24 base 22:24\n M 22 lwz r6, 0(0)\n M 23 cmpwi r6, 0\n B 22 lwz r7, 0(0)\n B 23 cmpwi r7, 0\n--- replace mine 25:26 base 25:26\n M 25 addi r4, r6, 0x3600\n B 25 addi r4, r7, 0x3600\n--- replace mine 28:29 base 28:29\n M 28 lhz r7, 0(r3)\n B 28 lhz r8, 0(r3)\n--- replace mine 30:31 base 30:31\n M 30 cmplw r7, r0\n B 30 cmplw r8, r0\n--- replace mine 34:37 base 34:38\n M 34 addi r8, r6, 0x3600\n M 35 cmpwi r6, 0\n M 36 clrlwi r5, r7, 0x10\n B 34 addi r6, r7, 0x3600\n B 35 b 132\n B 36 cmpwi r7, 0\n B 37 clrlwi r5, r8, 0x10\n--- replace mine 38:39 base 39:40\n M 38 mr r4, r8\n B 39 mr r4, r6\n--- replace mine 4"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24UpdateDlTask", "attempt": "diagnosis", "before": [25, 249], "after": [25, 249], "kept": false, "evidence": "src 0x3dc base 0x3f4 insns 247/253\n--- replace mine 0:1 base 0:1\n M 0 stwu r1, -0x30(r1)\n B 0 stwu r1, -0x20(r1)\n--- replace mine 2:5 base 2:8\n M 2 stw r0, 0x34(r1)\n M 3 addi r11, r1, 0x30\n M 4 bl 0\n B 2 stw r0, 0x24(r1)\n B 3 stw r31, 0x1c(r1)\n B 4 mr r31, r3\n B 5 stw r30, 0x18(r1)\n B 6 stw r29, 0x14(r1)\n B 7 stw r28, 0x10(r1)\n--- delete mine 6:7 base 9:9\n M 6 mr r31, r3\n--- replace mine 32:34 base 34:36\n M 32 li r29, 0\n M 33 lhz r30, 0x14(r31)\n B 34 li r30, 0\n B 35 lhz r29, 0x14(r31)\n--- replace mine 38:39 base 40:41\n M 38 cmplw r30, r0\n B 40 cmplw r29, r0\n--- replace mine 40:42 base 42:44\n M 40 li r29, 1\n M 41 cmpwi r2"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24AddDlTask", "attempt": "diagnosis", "before": [5, 140], "after": [5, 140], "kept": false, "evidence": "src 0x248 base 0x23c insns 146/143\n--- delete mine 6:7 base 6:6\n M 6 stw r29, 0xb4(r1)\n--- replace mine 61:62 base 60:61\n M 61 b 312\n B 60 b 308\n--- replace mine 78:80 base 77:78\n M 78 bge 8\n M 79 b 240\n B 77 blt 240\n--- replace mine 89:90 base 87:88\n M 89 lwz r29, 0(0)\n B 87 lwz r30, 0(0)\n--- replace mine 92:93 base 90:91\n M 92 cmpwi r29, 0\n B 90 cmpwi r30, 0\n--- replace mine 98:99 base 96:97\n M 98 addi r5, r29, 0x3600\n B 96 addi r5, r30, 0x3600\n--- replace mine 121:123 base 119:121\n M 121 lhz r30, 0(r31)\n M 122 cmplwi r30, 0xffff\n B 119 lhz r31, 0(r31)\n B 120 cmplwi r31, 0xffff\n--- replace mine 129:130 base 127:128\n M 129 cmpwi r29, 0\n B 127"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24GetDlTask", "attempt": "diagnosis", "before": [0, 5], "after": [0, 5], "kept": false, "evidence": "src 0x170 base 0x170 insns 92/92\ndiffs 5: [4, 6, 60, 64, 73]\n 4 M mr r31, r4\n B mr r31, r3\n 6 M mr r30, r3\n B mr r30, r4\n 60 M cmplw r31, r0\n B cmplw r30, r0\n 64 M rlwinm r4, r31, 9, 7, 0x16\n B rlwinm r4, r30, 9, 7, 0x16\n 73 M mr r3, r30\n B mr r3, r31\n"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24PurgeOldestDlTask", "attempt": "diagnosis", "before": [33, 166], "after": [33, 166], "kept": false, "evidence": "src 0x2ac base 0x2c0 insns 171/176\n--- replace mine 9:10 base 9:11\n M 9 lis r3, -0x8000\n B 9 li r4, 0\n B 10 lis r5, -0x8000\n--- replace mine 11:15 base 12:18\n M 11 addi r7, r3, -1\n M 12 li r4, 0\n M 13 addi r6, r3, 1\n M 14 li r5, -1\n B 12 li r3, -1\n B 13 addi r6, r5, -1\n B 14 addi r5, r5, 1\n B 15 cmpwi r4, 0\n B 16 stw r6, 0x14(r1)\n B 17 stw r5, 0x18(r1)\n--- replace mine 16:21 base 19:20\n M 16 addi r3, r1, 0x10\n M 17 addi r4, r1, 8\n M 18 stw r7, 0x14(r1)\n M 19 stw r6, 0x18(r1)\n M 20 stw r5, 0x1c(r1)\n B 19 stw r3, 0x1c(r1)\n--- replace mine 23:25 base 22:26\n M 23 bl 0\n M 24 b 56\n B 22 bge 56\n B 23 li r3, 0\n B 24 b 584\n B "}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ManageDlTaskListForMenu", "attempt": "diagnosis", "before": [12, 36], "after": [12, 36], "kept": false, "evidence": "src 0x258 base 0x260 insns 150/152\n--- replace mine 18:19 base 18:19\n M 18 b 508\n B 18 b 516\n--- replace mine 22:23 base 22:23\n M 22 b 492\n B 22 b 500\n--- replace mine 27:28 base 27:28\n M 27 b 472\n B 27 b 480\n--- replace mine 106:107 base 106:107\n M 106 b 156\n B 106 b 164\n--- replace mine 109:113 base 109:113\n M 109 b 144\n M 110 lwz r3, 0(0)\n M 111 addi r0, r1, 0xa8\n M 112 cmpwi r3, 0\n B 109 b 152\n B 110 lwz r4, 0(0)\n B 111 addi r3, r1, 0xa8\n B 112 cmpwi r4, 0\n--- replace mine 114:115 base 114:115\n M 114 addi r3, r3, 0x3600\n B 114 addi r4, r4, 0x3600\n--- replace mine 116:121 base 116:117\n M 116 li r3, 0\n M 117 cmpwi r0, 0\n M 118 bne 12\n M 119"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ExtendDlTaskList", "attempt": "diagnosis", "before": [0, 4], "after": [0, 4], "kept": false, "evidence": "src 0x224 base 0x224 insns 137/137\ndiffs 4: [122, 124, 126, 128]\n 122 M mr r29, r3\n B mr r30, r3\n 124 M mr r29, r28\n B mr r30, r28\n 126 M cmpwi r29, 0\n B cmpwi r30, 0\n 128 M mr r3, r29\n B mr r3, r30\n"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24iCheckDlHeaderConsistency", "attempt": "diagnosis", "before": [2, 3], "after": [2, 3], "kept": false, "evidence": "src 0x350 base 0x350 insns 212/212\ndiffs 3: [5, 6, 7]\n 5 M mr r28, r3\n B addi r31, r1, 0xa8\n 6 M mr r29, r4\n B mr r28, r3\n 7 M addi r31, r1, 0xa8\n B mr r29, r4\n"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "AddTaskInternal", "attempt": "diagnosis", "before": [36, 328], "after": [36, 328], "kept": false, "evidence": "src 0x634 base 0x644 insns 397/401\n--- replace mine 58:59 base 58:59\n M 58 b 1332\n B 58 b 1348\n--- replace mine 72:74 base 72:74\n M 72 b 108\n M 73 addi r3, r29, 0xb4\n B 72 b 116\n B 73 addi r26, r29, 0xb4\n--- insert mine 75:75 base 75:76\n B 75 mr r3, r26\n--- replace mine 78:80 base 79:82\n M 78 blt 68\n M 79 addi r3, r29, 0xb4\n B 79 bge 8\n B 80 b 68\n B 81 mr r3, r26\n--- replace mine 86:87 base 88:89\n M 86 addi r3, r29, 0xb4\n B 88 mr r3, r26\n--- replace mine 102:103 base 104:105\n M 102 b 1156\n B 104 b 1164\n--- replace mine 133:134 base 135:136\n M 133 lhz r31, 0x14(r29)\n B 135 lhz r27, 0x14(r29)\n--- replace mine 138:139 base 140:141\n M 138 cmplw"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupParseServerInfo__FP14NUPContextInfoPcPcUx", "attempt": "diagnosis", "before": [0, 148], "after": [0, 148], "kept": false, "evidence": "src 0x710 base 0x710 insns 452/452\ndiffs 148: [13, 14, 15, 18, 21, 23, 26, 30, 32, 33, 34, 36, 41, 43, 44, 49, 52, 53, 56, 59]\n 13 M addi r24, r28, 0x90\n B addi r25, r28, 0x90\n 14 M addi r25, r28, 0x9c\n B addi r22, r28, 0x9c\n 15 M li r27, 0\n B li r23, 0\n 18 M mr r4, r25\n B mr r4, r22\n 21 M mr r23, r3\n B mr r24, r3\n 23 M mr r4, r24\n B mr r4, r25\n 26 M mr r22, r3\n B mr r26, r3\n 30 M mr r3, r25\n B mr r3, r22\n 32 M add r29, r23, r3\n B add r24, r24, r3\n 33 M mr r3, r24\n B mr r3, r25\n 34 M subf r26, r29, r22\n B subf r25, r24, r26\n 36 M add r0, r22, r3\n B add r0, r26, r3\n 41 M cmplw r26, r"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "diagnosis", "before": [9, 21], "after": [9, 21], "kept": false, "evidence": "src 0xfc base 0xfc insns 63/63\ndiffs 21: [5, 9, 11, 16, 17, 18, 20, 21, 22, 23, 25, 31, 35, 38, 42, 44, 48, 52, 55, 58]\n 5 M li r10, 0\n B li r7, 0\n 9 M addi r10, r10, 1\n B addi r7, r7, 1\n 11 M cmplwi r10, 3\n B cmplwi r7, 3\n 16 M rlwinm r5, r9, 0x14, 0x1a, 0x1f\n B rlwinm r0, r9, 0xe, 0x1a, 0x1f\n 17 M rlwinm r0, r9, 0xe, 0x1a, 0x1f\n B rlwinm r6, r9, 0x14, 0x1a, 0x1f\n 18 M lbzx r7, r8, r5\n B lbzx r7, r8, r0\n 20 M lbzx r6, r8, r0\n B clrlwi r0, r9, 0x1a\n 21 M clrlwi r0, r9, 0x1a\n B lbzx r6, r8, r6\n 22 M li r10, 0\n B stb r7, 0(r3)\n 23 M stb r6, 0(r3)\n B li r7, 0\n 25 M stb r7, 1(r3)\n B stb r6, 1(r3)"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetBootVersion__FP14ESTitleVersion", "attempt": "diagnosis", "before": [100000, 100000], "after": [100000, 100000], "kept": false, "evidence": ""}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetTitleSize__FP12NUPTitleInfo", "attempt": "diagnosis", "before": [0, 22], "after": [0, 22], "kept": false, "evidence": "src 0x22c base 0x22c insns 139/139\ndiffs 22: [39, 40, 42, 43, 56, 57, 58, 59, 61, 62, 67, 68, 69, 71, 74, 75, 78, 80, 90, 91]\n 39 M adde r0, r5, r7\n B adde r5, r5, r7\n 40 M addi r5, r8, 5\n B addi r0, r8, 5\n 42 M stw r5, 0x20(r3)\n B stw r0, 0x20(r3)\n 43 M adde r0, r0, r7\n B adde r0, r5, r7\n 56 M lwz r30, 0x54(r3)\n B lwz r28, 0x54(r3)\n 57 M add r27, r12, r8\n B add r26, r12, r8\n 58 M lwz r25, 0x5c(r27)\n B lwz r25, 0x5c(r26)\n 59 M cmpwi r30, 0\n B cmpwi r28, 0\n 61 M lwz r26, 0x58(r3)\n B lwz r30, 0x58(r3)\n 62 M cmpwi r26, 0\n B cmpwi r30, 0\n 67 M li r28, 0\n B li r27, 0\n 68 M mtctr r30\n B mtct"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupOp", "attempt": "diagnosis", "before": [7, 429], "after": [7, 429], "kept": false, "evidence": "src 0x6e0 base 0x6d8 insns 440/438\n--- delete mine 8:9 base 8:8\n M 8 li r28, 0\n--- insert mine 11:11 base 10:11\n B 10 li r21, 0\n--- delete mine 12:13 base 12:12\n M 12 li r21, 0\n--- replace mine 26:28 base 25:27\n M 26 bne 1428\n M 27 lwz r31, 0x24(r1)\n B 25 bne 1424\n B 26 lwz r30, 0x24(r1)\n--- replace mine 31:39 base 30:37\n M 31 bne 32\n M 32 lwz r4, 0x20(r1)\n M 33 li r0, -0x1389\n M 34 clrlwi r28, r4, 0x10\n M 35 cmplw r28, r4\n M 36 bne 8\n M 37 mr r0, r3\n M 38 mr r3, r0\n B 30 bne 28\n B 31 lwz r0, 0x20(r1)\n B 32 clrlwi r28, r0, 0x10\n B 33 cmplw r28, r0\n B 34 beq 8\n B 35 li r3, -0x1389\n B 36 cmplw r28, r0\n--- replace mine 54:55 bas"}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "diagnosis", "before": [15, 114], "after": [15, 114], "kept": false, "evidence": "src 0x4ac base 0x4b4 insns 299/301\n--- replace mine 0:1 base 0:1\n M 0 stwu r1, -0x200(r1)\n B 0 stwu r1, -0x210(r1)\n--- replace mine 2:4 base 2:4\n M 2 stw r0, 0x204(r1)\n M 3 addi r11, r1, 0x200\n B 2 stw r0, 0x214(r1)\n B 3 addi r11, r1, 0x210\n--- replace mine 16:17 base 16:17\n M 16 lis r23, 0\n B 16 lis r22, 0\n--- replace mine 18:19 base 18:19\n M 18 addi r23, r23, 0\n B 18 addi r22, r22, 0\n--- replace mine 20:21 base 20:21\n M 20 lwz r3, 0x28(r23)\n B 20 lwz r3, 0x28(r22)\n--- replace mine 45:46 base 45:46\n M 45 lwz r3, 0x28(r23)\n B 45 lwz r3, 0x28(r22)\n--- replace mine 162:163 base 162:163\n M 162 slwi r23, r25, 2\n B 162 slwi r22, r25, 2\n--- repla"}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "draw__Q33ipl5scene7SettingFv", "attempt": "diagnosis", "before": [123, 334], "after": [123, 334], "kept": false, "evidence": "src 0x958 base 0x9e0 insns 598/632\n--- replace mine 18:19 base 18:19\n M 18 bne 2280\n B 18 bne 2416\n--- replace mine 41:42 base 41:42\n M 41 b 2188\n B 41 b 2324\n--- replace mine 44:49 base 44:49\n M 44 beq 2176\n M 45 lwz r28, 0x28(r3)\n M 46 cmpwi r28, 0\n M 47 beq 2164\n M 48 mr r3, r28\n B 44 beq 2312\n B 45 lwz r31, 0x28(r3)\n B 46 cmpwi r31, 0\n B 47 beq 2300\n B 48 mr r3, r31\n--- replace mine 53:55 base 53:55\n M 53 beq 2140\n M 54 lwz r3, 0x680(r28)\n B 53 beq 2276\n B 54 lwz r3, 0x680(r31)\n--- replace mine 56:57 base 56:59\n M 56 beq 12\n B 56 bne 12\n B 57 li r0, 0\n B 58 b 8\n--- delete mine 58:60 base 60:60\n M 58 b 8\n M 59 li r0, "}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "initKeyboard__Q33ipl5scene7SettingFPCc", "attempt": "diagnosis", "before": [18, 183], "after": [18, 183], "kept": false, "evidence": "src 0x350 base 0x354 insns 212/213\n--- replace mine 8:9 base 8:9\n M 8 mr r23, r4\n B 8 mr r24, r4\n--- delete mine 17:18 base 17:17\n M 17 li r31, 0\n--- delete mine 19:20 base 18:18\n M 19 li r29, 0\n--- replace mine 33:34 base 31:32\n M 33 li r28, 0xa\n B 31 li r31, 0xa\n--- replace mine 36:37 base 34:35\n M 36 li r28, 0x20\n B 34 li r31, 0x20\n--- replace mine 40:41 base 38:39\n M 40 li r28, 0xff\n B 38 li r31, 0xff\n--- replace mine 44:45 base 42:43\n M 44 li r28, 0x20\n B 42 li r31, 0x20\n--- replace mine 49:50 base 47:48\n M 49 li r28, 0x20\n B 47 li r31, 0x20\n--- replace mine 58:59 base 56:57\n M 58 li r28, 0xf\n B 56 li r31, 0xf\n--- replace mine 61:62 base"}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "calcKeyboard__Q33ipl5scene7SettingFv", "attempt": "diagnosis", "before": [37, 251], "after": [37, 251], "kept": false, "evidence": "src 0x484 base 0x488 insns 289/290\n--- replace mine 11:12 base 11:12\n M 11 bge 1048\n B 11 bge 1052\n--- replace mine 13:15 base 13:15\n M 13 bge 932\n M 14 b 1036\n B 13 bge 924\n B 14 b 1040\n--- replace mine 16:18 base 16:18\n M 16 bge 1028\n M 17 b 868\n B 16 bge 1032\n B 17 b 860\n--- replace mine 20:21 base 20:21\n M 20 beq 544\n B 20 beq 536\n--- delete mine 23:24 base 23:23\n M 23 li r30, 0\n--- replace mine 109:110 base 108:109\n M 109 b 468\n B 108 b 464\n--- replace mine 115:116 base 114:115\n M 115 bne 140\n B 114 bne 136\n--- insert mine 117:117 base 116:117\n B 116 li r30, 0\n--- replace mine 121:122 base 121:122\n M 121 lwz r3, 0x934(r31)\n B 121 lwz "}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "convertRevIP__Q33ipl5scene7SettingFPUcPCc", "attempt": "diagnosis", "before": [0, 21], "after": [0, 21], "kept": false, "evidence": "src 0x124 base 0x124 insns 73/73\ndiffs 21: [6, 8, 12, 15, 16, 17, 18, 19, 21, 28, 29, 30, 36, 38, 45, 46, 47, 48, 50, 64]\n 6 M mr r27, r5\n B mr r28, r5\n 8 M li r29, 0\n B li r27, 0\n 12 M mr r4, r27\n B mr r4, r28\n 15 M addi r30, r1, 8\n B addi r29, r1, 8\n 16 M mr r28, r26\n B mr r31, r26\n 17 M li r4, 0\n B li r28, 0\n 18 M li r27, 0\n B li r4, 0\n 19 M li r31, 0\n B li r30, 0\n 21 M lbzx r0, r30, r27\n B lbzx r0, r29, r28\n 28 M li r27, 0x10\n B li r28, 0x10\n 29 M mr r3, r30\n B mr r3, r29\n 30 M stbx r31, r30, r27\n B stbx r30, r29, r28\n 36 M cmpwi r29, 0\n B cmpwi r27, 0\n 38 M stb r3, 0"}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "scanAP__Q33ipl5scene7SettingFv", "attempt": "diagnosis", "before": [56, 165], "after": [56, 165], "kept": false, "evidence": "src 0x428 base 0x440 insns 266/272\n--- replace mine 7:8 base 7:8\n M 7 bgt 1016\n B 7 bgt 1040\n--- replace mine 38:39 base 38:39\n M 38 b 892\n B 38 b 916\n--- replace mine 49:50 base 49:50\n M 49 beq 848\n B 49 beq 872\n--- replace mine 90:91 base 90:91\n M 90 b 684\n B 90 b 708\n--- replace mine 94:95 base 94:95\n M 94 bne 668\n B 94 bne 692\n--- replace mine 99:100 base 99:100\n M 99 b 648\n B 99 b 672\n--- replace mine 108:109 base 108:109\n M 108 b 612\n B 108 b 636\n--- replace mine 111:115 base 111:114\n M 111 b 600\n M 112 li r4, 1\n M 113 lwz r0, 0x918(r31)\n M 114 stw r4, 0xb9c(r3)\n B 111 b 624\n B 112 lwz r4, 0x918(r3)\n B 113 li r0, 1\n--- replace min"}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "setUSBAP__Q33ipl5scene7SettingFv", "attempt": "diagnosis", "before": [7, 21], "after": [7, 21], "kept": false, "evidence": "src 0xe0 base 0xe4 insns 56/57\n--- replace mine 8:9 base 8:9\n M 8 bge 172\n B 8 bge 176\n--- replace mine 11:12 base 11:12\n M 11 b 160\n B 11 b 164\n--- replace mine 15:16 base 15:16\n M 15 beq 144\n B 15 beq 148\n--- replace mine 35:36 base 35:36\n M 35 b 64\n B 35 b 68\n--- replace mine 40:41 base 40:44\n M 40 b 44\n B 40 b 48\n B 41 lbz r0, 0x91d(r3)\n B 42 cmpwi r0, 0\n B 43 beq 36\n--- delete mine 42:44 base 45:45\n M 42 cmpwi r3, 0\n M 43 beq 32\n"}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24InitDlTask", "attempt": "scope ownership result", "before": [0, 31], "after": [0, 31], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24InitDlTask", "attempt": "declare low identifier first", "before": [0, 31], "after": [0, 31], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24InitDlTask", "attempt": "scope initialized home directory", "before": [0, 31], "after": [0, 31], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24InitDlTask", "attempt": "declsearch 71 declaration orders", "before": [0, 31], "after": [0, 31], "kept": false}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "reuse next-time inline helper", "before": [0, 3], "after": [16, 58], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "separate terminal task identifier", "before": [0, 3], "after": [0, 3], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "scope interval validation identifier", "before": [0, 3], "after": [1000000, 1000000], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24GetDlTask", "attempt": "copy task destination before identifier", "before": [0, 5], "after": [0, 5], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24GetDlTask", "attempt": "scope identifier before open", "before": [0, 5], "after": [0, 5], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24GetDlTask", "attempt": "read through typed task pointer", "before": [0, 5], "after": [0, 0], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ExtendDlTaskList", "attempt": "distinct reload result", "before": [0, 4], "after": [0, 4], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ExtendDlTaskList", "attempt": "close result retained in operation local", "before": [0, 4], "after": [4, 7], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ExtendDlTaskList", "attempt": "ternary close error selection", "before": [0, 4], "after": [0, 0], "kept": true, "regressions": []}
|
||||
{"note":"Initial default gate could not find baseline-0c554a16.json; use --base f00336cc, the immediately preceding ancestor with a provided baseline. No tools or baselines modified."}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "precondition loop form", "before": [3, 50], "after": [5, 20], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24iCheckDlHeaderConsistency", "attempt": "move stack task pointer behind argument copies", "before": [2, 3], "after": [2, 20], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24iCheckDlHeaderConsistency", "attempt": "use header argument directly", "before": [2, 3], "after": [2, 3], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24iCheckDlHeaderConsistency", "attempt": "use repair argument directly", "before": [2, 3], "after": [2, 3], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "precondition loop matching target entry branch", "before": [3, 50], "after": [5, 20], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "for loop with identifier increment", "before": [5, 20], "after": [5, 20], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "scope cached entry header before work", "before": [5, 20], "after": [5, 20], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "reverse identifier comparison operands", "before": [5, 20], "after": [12, 50], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24iCheckDlHeaderConsistency", "attempt": "typed task address for validation", "before": [2, 3], "after": [2, 3], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "cached-header helper loop bound", "before": [5, 20], "after": [5, 20], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "explicit loop-bound header selection", "before": [5, 20], "after": [9, 55], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "declsearch 40 variable orders", "before": [5, 20], "after": [5, 12], "kept": true}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "scoped interval task validation", "before": [0, 3], "after": [0, 3], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24UpdateDlTask", "attempt": "isolate universal time update helper", "before": [25, 249], "after": [19, 250], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24UpdateDlTask", "attempt": "explicit retry result loop", "before": [19, 250], "after": [28, 251], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24UpdateDlTask", "attempt": "retry bit mask operand order", "before": [19, 250], "after": [19, 250], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "null-first loop bound branch", "before": [5, 12], "after": [0, 10], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24AddDlTask", "attempt": "positive universal-time branch", "before": [5, 140], "after": [6, 139], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24AddDlTask", "attempt": "time expression passed directly to inline helper", "before": [5, 140], "after": [5, 140], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24AddDlTask", "attempt": "inline helper scoped task identifier", "before": [5, 140], "after": [5, 140], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ManageDlTaskListForMenu", "attempt": "explicit delete error boundary", "before": [12, 36], "after": [12, 36], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ManageDlTaskListForMenu", "attempt": "delete using validated task pointer", "before": [12, 36], "after": [15, 137], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24ManageDlTaskListForMenu", "attempt": "scoped deletion result variable", "before": [12, 36], "after": [12, 36], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24PurgeOldestDlTask", "attempt": "iteration condition owns first call", "before": [33, 166], "after": [30, 155], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24PurgeOldestDlTask", "attempt": "map iteration-done only after negative result", "before": [30, 155], "after": [29, 95], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24PurgeOldestDlTask", "attempt": "typed destination copied before selected identifier", "before": [29, 95], "after": [29, 95], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "declsearch 71 declaration orders", "before": [0, 3], "after": [0, 3], "kept": false}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "AddTaskInternal", "attempt": "retry precondition loop in inline update", "before": [32, 329], "after": [23, 329], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "AddTaskInternal", "attempt": "separate URL string helper argument", "before": [23, 329], "after": [20, 323], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "AddTaskInternal", "attempt": "separate free-task search failure branch", "before": [20, 323], "after": [20, 323], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "declare first base64 digit before second", "before": [9, 21], "after": [9, 21], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "write base64 digits directly in order", "before": [9, 21], "after": [13, 19], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "loop count from postincrement threshold", "before": [9, 21], "after": [9, 21], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupParseServerInfo__FP14NUPContextInfoPcPcUx", "attempt": "tag helper end pointer declared first", "before": [0, 148], "after": [0, 148], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupParseServerInfo__FP14NUPContextInfoPcPcUx", "attempt": "parse result declared after tag cursor", "before": [0, 148], "after": [0, 148], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupParseServerInfo__FP14NUPContextInfoPcPcUx", "attempt": "tag helper separate start then end checks", "before": [0, 148], "after": [83, 471], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "encode digits in direct sequential stores", "before": [9, 21], "after": [8, 17], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetTitleSize__FP12NUPTitleInfo", "attempt": "delay progress-step increment until sizes", "before": [0, 22], "after": [4, 26], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetTitleSize__FP12NUPTitleInfo", "attempt": "content identifier passed without extra temporary", "before": [0, 22], "after": [0, 25], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetTitleSize__FP12NUPTitleInfo", "attempt": "explicit content size temporary", "before": [0, 22], "after": [5, 47], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupParseServerInfo__FP14NUPContextInfoPcPcUx", "attempt": "declsearch leading local permutations", "before": [0, 148], "after": [0, 148], "kept": false}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetTitleSize__FP12NUPTitleInfo", "attempt": "declsearch leading local permutations", "before": [0, 22], "after": [0, 22], "kept": false}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetBootVersion__FP14ESTitleVersion", "attempt": "declare installed content count at function entry", "before": [0, 17], "after": [0, 17], "kept": false, "source_symbol": "__nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion", "reason": "target symbol encodes one parameter but target uses r3 context and r4 title; source name/signature retained"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetBootVersion__FP14ESTitleVersion", "attempt": "inline template content membership boundary", "before": [0, 17], "after": [11, 62], "kept": false, "source_symbol": "__nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion", "reason": "target symbol encodes one parameter but target uses r3 context and r4 title; source name/signature retained"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetBootVersion__FP14ESTitleVersion", "attempt": "separate required content identifier temporary", "before": [0, 17], "after": [0, 17], "kept": false, "source_symbol": "__nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion", "reason": "target symbol encodes one parameter but target uses r3 context and r4 title; source name/signature retained"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupOp", "attempt": "boot version checked with explicit failure branch", "before": [7, 429], "after": [4, 56], "kept": true, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupOp", "attempt": "current title id comparison operand order", "before": [4, 56], "after": [4, 56], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupOp", "attempt": "scope audit state behind device setup", "before": [4, 56], "after": [4, 162], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupGetTitleSize__FP12NUPTitleInfo", "attempt": "declare content pointer at function entry", "before": [0, 22], "after": [0, 22], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "group base64 digit temporaries before stores", "before": [8, 17], "after": [12, 25], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "explicit seventh direct-page case before default", "before": [15, 114], "after": [14, 111], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "direct page path declared before search index", "before": [14, 111], "after": [14, 111], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "separate browser path declaration before base path", "before": [14, 111], "after": [37, 117], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupOp", "attempt": "declsearch 150 leading local orders", "before": [4, 56], "after": [4, 47], "kept": true}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "setUSBAP__Q33ipl5scene7SettingFv", "attempt": "explicit waiting-result early case exit", "before": [7, 21], "after": [7, 21], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "setUSBAP__Q33ipl5scene7SettingFv", "attempt": "boolean waiting result temporary", "before": [7, 21], "after": [7, 21], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "setUSBAP__Q33ipl5scene7SettingFv", "attempt": "switch pointer for completion-result field", "before": [7, 21], "after": [7, 21], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "convertRevIP__Q33ipl5scene7SettingFPUcPCc", "attempt": "declare component start before component count", "before": [0, 21], "after": [2, 39], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "convertRevIP__Q33ipl5scene7SettingFPUcPCc", "attempt": "declare output pointer before conversion buffer", "before": [0, 21], "after": [2, 27], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "convertRevIP__Q33ipl5scene7SettingFPUcPCc", "attempt": "declare component index before conversion call", "before": [0, 21], "after": [0, 16], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "draw__Q33ipl5scene7SettingFv", "attempt": "texture rectangle outputs need no initial values", "before": [123, 334], "after": [120, 570], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "draw__Q33ipl5scene7SettingFv", "attempt": "reverse texture object local declaration order", "before": [120, 570], "after": [87, 570], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "draw__Q33ipl5scene7SettingFv", "attempt": "reverse texture rectangle output declarations", "before": [87, 570], "after": [82, 570], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "scanAP__Q33ipl5scene7SettingFv", "attempt": "animation-playing result returned through inline lambda equivalent", "before": [56, 165], "after": [56, 165], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "scanAP__Q33ipl5scene7SettingFv", "attempt": "animation index read before activity flag", "before": [56, 165], "after": [53, 160], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "scanAP__Q33ipl5scene7SettingFv", "attempt": "explicit animation playing temporary in each case", "before": [53, 160], "after": [53, 160], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "initKeyboard__Q33ipl5scene7SettingFPCc", "attempt": "reload keyboard manager across calls", "before": [18, 183], "after": [4, 195], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "initKeyboard__Q33ipl5scene7SettingFPCc", "attempt": "delay invalid-input initialization to validation", "before": [4, 195], "after": [4, 199], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "initKeyboard__Q33ipl5scene7SettingFPCc", "attempt": "declare string limit before row limit", "before": [4, 195], "after": [4, 195], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "calcKeyboard__Q33ipl5scene7SettingFv", "attempt": "switch valid form identifiers in hidden states", "before": [37, 251], "after": [24, 253], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "calcKeyboard__Q33ipl5scene7SettingFv", "attempt": "positive vacancy branch preserves target call order", "before": [24, 253], "after": [17, 253], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "calcKeyboard__Q33ipl5scene7SettingFv", "attempt": "declare asterisk loop index before copying", "before": [17, 253], "after": [15, 258], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "convertRevIP__Q33ipl5scene7SettingFPUcPCc", "attempt": "declare output pointer and component start with other locals", "before": [0, 16], "after": [0, 16], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "advance encoded output before clearing byte count", "before": [8, 17], "after": [8, 17], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "postincrement output for each encoded digit", "before": [8, 17], "after": [8, 17], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupParseServerInfo__FP14NUPContextInfoPcPcUx", "attempt": "reuse tag pointers across sequential response fields", "before": [0, 148], "after": [1000000, 1000000], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupBase64Encode__FPUcPUcUl", "attempt": "discard structurally closer but lower objdiff experiment", "before": [8, 17], "after": [9, 21], "kept": false, "reason": "objdiff 86.53968 below initial 94.20635"}
|
||||
{"unit": "libs/RVL_SDK/src/nup/nup", "function": "__nupParseServerInfo__FP14NUPContextInfoPcPcUx", "attempt": "reuse response field tag variables preserving string order", "before": [0, 148], "after": [16, 299], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "draw__Q33ipl5scene7SettingFv", "attempt": "render mode value-return inline copy boundary", "before": [82, 570], "after": [135, 580], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "read cached header before work alias", "before": [0, 10], "after": [0, 10], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "compute entry pointer from global work identity", "before": [0, 10], "after": [0, 10], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24IterateDlTask", "attempt": "cache entry header immediately after work", "before": [0, 10], "after": [5, 19], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "scheduled identifier declared before work pointer", "before": [0, 3], "after": [0, 3], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24SetDlInterval", "attempt": "scheduled identifier promoted to array-index width", "before": [0, 3], "after": [1, 3], "kept": false, "regressions": []}
|
||||
{"unit": "libs/RevoEX/src/nwc24/NWC24Download", "function": "NWC24InitDlTask", "attempt": "typed task pointer initialized before home lookup", "before": [0, 31], "after": [0, 31], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "scanAP__Q33ipl5scene7SettingFv", "attempt": "layout animation query boolean inline boundary", "before": [53, 160], "after": [31, 160], "kept": true, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "share seventh direct-page case with first-page cases", "before": [14, 111], "after": [14, 114], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "declare selected page pointer at function entry", "before": [14, 111], "after": [14, 111], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "declare direct-page search index at function entry", "before": [14, 111], "after": [14, 111], "kept": false, "regressions": []}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "scanAP__Q33ipl5scene7SettingFv", "attempt": "discard helper emitted as extra calls", "before": [31, 160], "after": [53, 160], "kept": false, "reason": "target inlines animation test; wrapper left out-of-line calls"}
|
||||
{"unit": "src/scene/setting/iplSetting", "function": "createBrowser__Q33ipl5scene7SettingFv", "attempt": "discard added switch case with lower objdiff", "before": [14, 111], "after": [15, 114], "kept": false, "reason": "objdiff 98.75083 below initial 98.8505"}
|
||||
{"final_gate": "GATE PASS", "base": "f00336cc", "remaining_attempt_audit": "all 21 open functions have at least three distinct compiled attempts", "exact_additions": ["NWC24GetDlTask", "NWC24ExtendDlTaskList"]}
|
||||
@@ -1,79 +1,59 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/scene/address/iplAddressEdit] pool: IDENTICAL
|
||||
[src/scene/address/iplAddressEdit] objdiff: code 17384/27112 data 24/2560 functions 81/94 fuzzy 98.6425 linked code 0
|
||||
[src/scene/address/iplAddressEdit] instruction-exact functions: 81/94
|
||||
[src/scene/address/iplAddressEdit] section .bss size 320 match None
|
||||
[src/scene/address/iplAddressEdit] section .data size 2152 match 71.23057
|
||||
[src/scene/address/iplAddressEdit] section .rodata size 40 match 98.591545
|
||||
[src/scene/address/iplAddressEdit] section .sdata size 24 match 66.66667
|
||||
[src/scene/address/iplAddressEdit] section .sdata2 size 24 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .text size 27112 match 98.64252
|
||||
[src/scene/address/iplAddressEdit] below 100: create__Q33ipl5scene11AddressEditFv 97.44634
|
||||
[src/scene/address/iplAddressEdit] below 100: stt_wait_decide_anm__Q33ipl5scene11AddressEditFv 99.97362
|
||||
[src/scene/address/iplAddressEdit] below 100: stt_wait_btn_fadeout__Q33ipl5scene11AddressEditFv 99.73404
|
||||
[src/scene/address/iplAddressEdit] below 100: stt_add_code_fadeout__Q33ipl5scene11AddressEditFv 99.63964
|
||||
[src/scene/address/iplAddressEdit] below 100: stt_add_mii_input__Q33ipl5scene11AddressEditFv 70.84042
|
||||
[src/scene/address/iplAddressEdit] below 100: stt_add_confirm_fadeout__Q33ipl5scene11AddressEditFv 99.83871
|
||||
[src/scene/address/iplAddressEdit] below 100: stt_select_mii__Q33ipl5scene11AddressEditFv 99.85
|
||||
[src/scene/address/iplAddressEdit] below 100: start_point_event__Q33ipl5scene11AddressEditFPCcPQ33ipl10controller9Interface 99.34066
|
||||
[src/scene/address/iplAddressEdit] below 100: start_left_event__Q33ipl5scene11AddressEditFPCc 83.291664
|
||||
[src/scene/address/iplAddressEdit] below 100: start_ipt_trig_event__Q33ipl5scene11AddressEditFPCci 95.23569
|
||||
[src/scene/address/iplAddressEdit] below 100: get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571
|
||||
[src/scene/address/iplAddressEdit] below 100: update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105
|
||||
[src/scene/address/iplAddressEdit] below 100: set_err_msg__Q33ipl5scene11AddressEditFPwUl8NWC24Err 98.666664
|
||||
[src/scene/address/iplAddressEdit] baseline: code 15312/27112 data 24 functions 77 fuzzy 98.5457
|
||||
[src/scene/address/iplAddress] pool: IDENTICAL
|
||||
[src/scene/address/iplAddress] objdiff: code 18336/23988 data 36/1964 functions 91/101 fuzzy 99.0160 linked code 0
|
||||
[src/scene/address/iplAddress] instruction-exact functions: 90/101
|
||||
[src/scene/address/iplAddress] section .ctors size 4 match 100.0
|
||||
[src/scene/address/iplAddress] section .data size 1880 match 99.8935
|
||||
[src/scene/address/iplAddress] section .rodata size 24 match 95.2381
|
||||
[src/scene/address/iplAddress] section .sbss size 8 match None
|
||||
[src/scene/address/iplAddress] section .sdata size 16 match 92.30769
|
||||
[src/scene/address/iplAddress] section .sdata2 size 32 match 100.0
|
||||
[src/scene/address/iplAddress] section .text size 23988 match 99.01601
|
||||
[src/scene/address/iplAddress] below 100: draw__Q33ipl5scene7AddressFv 97.276596
|
||||
[src/scene/address/iplAddress] below 100: stt_cover_backward__Q33ipl5scene7AddressFv 84.8421
|
||||
[src/scene/address/iplAddress] below 100: stt_backward__Q33ipl5scene7AddressFv 89.60674
|
||||
[src/scene/address/iplAddress] below 100: stt_loop_forward__Q33ipl5scene7AddressFv 92.72727
|
||||
[src/scene/address/iplAddress] below 100: start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.34978
|
||||
[src/scene/address/iplAddress] below 100: onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 97.662964
|
||||
[src/scene/address/iplAddress] below 100: onPreviousPage__Q33ipl5scene7AddressFv 97.25455
|
||||
[src/scene/address/iplAddress] below 100: set_err_msg__Q33ipl5scene7AddressFPwUl8NWC24Err 98.6
|
||||
[src/scene/address/iplAddress] below 100: movePane_onDrag__Q33ipl5scene7AddressFv 95.70968
|
||||
[src/scene/address/iplAddress] below 100: update__Q33ipl5scene15FriendListCacheFUlPCwUx 81.35
|
||||
[src/scene/address/iplAddress] baseline: code 17688/23988 data 36 functions 88 fuzzy 98.9431
|
||||
[src/iplwww/www_wiisetting] pool: IDENTICAL
|
||||
[src/iplwww/www_wiisetting] objdiff: code 2448/6176 data 1280/3856 functions 19/21 fuzzy 99.7960 linked code 0
|
||||
[src/iplwww/www_wiisetting] instruction-exact functions: 19/21
|
||||
[src/iplwww/www_wiisetting] section .bss size 104 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .data size 2576 match None
|
||||
[src/iplwww/www_wiisetting] section .rodata size 792 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .sbss size 32 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .sdata size 320 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .sdata2 size 32 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .text size 6176 match 99.79598
|
||||
[src/iplwww/www_wiisetting] below 100: Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue 99.86043
|
||||
[src/iplwww/www_wiisetting] below 100: Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue 99.287926
|
||||
[src/iplwww/www_wiisetting] baseline: code 2448/6176 data 1280 functions 19 fuzzy 99.7960
|
||||
[src/scene/cardSequence/iplCardSequence] pool: IDENTICAL
|
||||
[src/scene/cardSequence/iplCardSequence] objdiff: code 4168/9852 data 1496/1496 functions 27/30 fuzzy 97.0122 linked code 0
|
||||
[src/scene/cardSequence/iplCardSequence] instruction-exact functions: 27/30
|
||||
[src/scene/cardSequence/iplCardSequence] section .bss size 16 match 100.0
|
||||
[src/scene/cardSequence/iplCardSequence] section .data size 1464 match 100.0
|
||||
[src/scene/cardSequence/iplCardSequence] section .sbss size 8 match 100.0
|
||||
[src/scene/cardSequence/iplCardSequence] section .sdata size 8 match 100.0
|
||||
[src/scene/cardSequence/iplCardSequence] section .text size 9852 match 97.01218
|
||||
[src/scene/cardSequence/iplCardSequence] below 100: CardSequence_813D2C8C 97.9402
|
||||
[src/scene/cardSequence/iplCardSequence] below 100: CardSequence_813D3424 89.44531
|
||||
[src/scene/cardSequence/iplCardSequence] below 100: CardSequence_813D3D14 97.804276
|
||||
[src/scene/cardSequence/iplCardSequence] baseline: code 4168/9852 data 1496 functions 27 fuzzy 97.0122
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 5668/12496 data 80/80 functions 21/30 fuzzy 98.1508 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 21/30
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 98.150764
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 99.303795
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 95.00395
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 87.11364
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 96.74342
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 97.7182
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 4752/12496 data 80 functions 19 fuzzy 97.3566
|
||||
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/nup/nup] objdiff: code 5744/10764 data 1720/1720 functions 18/23 fuzzy 93.3222 linked code 0
|
||||
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 18/23
|
||||
[libs/RVL_SDK/src/nup/nup] section .data size 1592 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .rodata size 88 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sbss size 8 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .text size 10764 match 93.32218
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupBase64Encode__FPUcPUcUl 94.20635
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14ESTitleVersion None
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupOp 99.25799
|
||||
[libs/RVL_SDK/src/nup/nup] baseline: code 5744/10764 data 1720 functions 18 fuzzy 93.2516
|
||||
[src/scene/setting/iplSetting] pool: IDENTICAL
|
||||
[src/scene/setting/iplSetting] objdiff: code 30532/37884 data 1040/5696 functions 105/112 fuzzy 99.1465 linked code 0
|
||||
[src/scene/setting/iplSetting] instruction-exact functions: 104/112
|
||||
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
|
||||
[src/scene/setting/iplSetting] section .data size 4016 match 5.146636
|
||||
[src/scene/setting/iplSetting] section .rodata size 640 match 32.25412
|
||||
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
|
||||
[src/scene/setting/iplSetting] section .text size 37884 match 99.14645
|
||||
[src/scene/setting/iplSetting] below 100: createBrowser__Q33ipl5scene7SettingFv 98.8505
|
||||
[src/scene/setting/iplSetting] below 100: draw__Q33ipl5scene7SettingFv 91.525314
|
||||
[src/scene/setting/iplSetting] below 100: initKeyboard__Q33ipl5scene7SettingFPCc 98.38498
|
||||
[src/scene/setting/iplSetting] below 100: calcKeyboard__Q33ipl5scene7SettingFv 98.0
|
||||
[src/scene/setting/iplSetting] below 100: convertRevIP__Q33ipl5scene7SettingFPUcPCc 98.69863
|
||||
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 95.39338
|
||||
[src/scene/setting/iplSetting] below 100: setUSBAP__Q33ipl5scene7SettingFv 98.070175
|
||||
[src/scene/setting/iplSetting] baseline: code 30532/37884 data 1040 functions 105 fuzzy 98.8008
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 83.63994 -> 83.73075
|
||||
global fuzzy_match_percent: 97.58787 -> 97.58935
|
||||
global complete_code_percent: 58.20100 -> 58.20100
|
||||
global matched_data_percent: 89.94218 -> 89.94218
|
||||
global matched_code_percent: 86.88876 -> 86.92723
|
||||
global fuzzy_match_percent: 99.32283 -> 99.33082
|
||||
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
|
||||
|
||||
54
tools/decomp-assist/sol-med-report.md
Normal file
54
tools/decomp-assist/sol-med-report.md
Normal file
@@ -0,0 +1,54 @@
|
||||
# sol-med matching report
|
||||
|
||||
Final full gate command:
|
||||
|
||||
`python3 /mnt/drive2/projects/wii-ipl-workers/_restore0928-tools/gate.py libs/RevoEX/src/nwc24/NWC24Download libs/RVL_SDK/src/nup/nup src/scene/setting/iplSetting --base f00336cc`
|
||||
|
||||
GATE PASS; clean 43U build; expected DOL SHA1; zero regressions, forbidden patterns, and readability warnings; all three pools identical.
|
||||
|
||||
| Unit | Instruction exact before -> after | Objdiff functions before -> after | Matched code bytes before -> after | Matched data bytes before -> after |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| libs/RevoEX/src/nwc24/NWC24Download | 19 -> 21 | 19 -> 21 | 4752 -> 5668 | 80 -> 80 |
|
||||
| libs/RVL_SDK/src/nup/nup | 18 -> 18 | 18 -> 18 | 5744 -> 5744 | 1720 -> 1720 |
|
||||
| src/scene/setting/iplSetting | 104 -> 104 | 105 -> 105 | 30532 -> 30532 | 1040 -> 1040 |
|
||||
|
||||
Exact additions: `NWC24GetDlTask` (92/92 instructions, ctxdiff diffs 0) and `NWC24ExtendDlTaskList` (137/137, diffs 0).
|
||||
|
||||
Remaining functions (every one has at least three distinct compiled source attempts recorded in sol-med-attempts.jsonl):
|
||||
|
||||
- NWC24InitDlTask: objdiff 98.923615; 4 attempts; same 144 instructions; 31 register differences.
|
||||
- NWC24SetDlInterval: objdiff 99.89796; 5 attempts; same 147 instructions; terminal task ID uses r28 instead of r30.
|
||||
- NWC24IterateDlTask: objdiff 99.303795; 11 attempts; same 79 instructions; 10 cached work/header register differences.
|
||||
- NWC24UpdateDlTask: objdiff 95.00395; 3 attempts; stack frame 0x30 versus 0x20; retry helper branch and register differences.
|
||||
- NWC24AddDlTask: objdiff 97.552444; 3 attempts; extra saved register and universal-time branch; next-time helper temporaries.
|
||||
- NWC24PurgeOldestDlTask: objdiff 87.11364; 3 attempts; iteration initialization and deletion inline boundaries; register assignments.
|
||||
- NWC24ManageDlTaskListForMenu: objdiff 96.74342; 3 attempts; deletion validation and return boundary differ by two instructions.
|
||||
- NWC24iCheckDlHeaderConsistency: objdiff 98.77358; 4 attempts; same 212 instructions; first three parameter/address moves scheduled differently.
|
||||
- AddTaskInternal: objdiff 97.7182; 3 attempts; URL validation, retry helper, and free-task search branches differ.
|
||||
- __nupParseServerInfo__FP14NUPContextInfoPcPcUx: objdiff 98.108406; 4 attempts; same 452 instructions; 148 register differences across tag helper expansions.
|
||||
- __nupBase64Encode__FPUcPUcUl: objdiff 94.20635; 7 attempts; same 63 instructions; digit load/store scheduling and count register differ.
|
||||
- __nupGetBootVersion__FP14ESTitleVersion: objdiff None; 3 attempts; target symbol encodes one parameter but assembly uses r3 context and r4 title; source retains two-parameter signature; 17 register differences under cross-name comparison.
|
||||
- __nupGetTitleSize__FP12NUPTitleInfo: objdiff 99.100716; 4 attempts; same 139 instructions; content helper registers and 64-bit addition temporaries differ.
|
||||
- __nupOp: objdiff 99.25799; 3 attempts; same 438 instructions; boot-version initialization/check placement and title-loop registers differ.
|
||||
- createBrowser__Q33ipl5scene7SettingFv: objdiff 98.8505; 6 attempts; stack frame 0x200 versus 0x210; direct-page switch and register allocation differ.
|
||||
- draw__Q33ipl5scene7SettingFv: objdiff 91.525314; 4 attempts; render-mode aggregate copy, side-rectangle floating-point scheduling and texture order differ.
|
||||
- initKeyboard__Q33ipl5scene7SettingFPCc: objdiff 98.38498; 3 attempts; extra safe initializations of keyboard limits plus register differences; target leaves unsupported form limits uninitialized.
|
||||
- calcKeyboard__Q33ipl5scene7SettingFv: objdiff 98.0; 3 attempts; asterisk loop pointer scheduling and cancellation branch temporaries differ; retains defined defaults.
|
||||
- convertRevIP__Q33ipl5scene7SettingFPUcPCc: objdiff 98.69863; 4 attempts; same 73 instructions; 16 register differences.
|
||||
- scanAP__Q33ipl5scene7SettingFv: objdiff 95.39338; 4 attempts; animation-playing boolean materialization and member-read ordering differ.
|
||||
- setUSBAP__Q33ipl5scene7SettingFv: objdiff 98.070175; 3 attempts; target reads completion byte twice; compiler reuses one read; no volatile cast added.
|
||||
|
||||
Gate limitations:
|
||||
|
||||
- The default merge-base 0c554a16 has no provided baseline report. The final gate uses its immediate ancestor f00336cc, whose baseline exists. Baseline files and gate.py were not modified.
|
||||
- iplSetting objdiff reports 105 exact functions, while the gate reports 104 instruction-exact. setUpdate_NoUpdateDialog___Q33ipl5scene7SettingFv remains objdiff 100; the gate compares unresolved relocated blt offsets whose values depend on preceding function sizes. This discrepancy existed before this run.
|
||||
- The __nupGetBootVersion target symbol/signature mismatch remains unresolved. No real functions or config symbols were renamed.
|
||||
- Removed initial values on draw rectangle output pointers are not uninitialized reads: BrowserWindow::GetTextureBuffer assigns the output rectangle before returning a non-null buffer (src/iplwww/www_window.cpp:445); draw uses those pointers only when both returned buffers are non-null. No shared header or other translation unit was edited.
|
||||
|
||||
Source paths changed:
|
||||
|
||||
- libs/RevoEX/src/nwc24/NWC24Download.c
|
||||
- libs/RVL_SDK/src/nup/nup.cpp
|
||||
- src/scene/setting/iplSetting.cpp
|
||||
|
||||
Supporting files: sol-med-attempts.jsonl and sol-med-final-gate.txt.
|
||||
389
tools/decomp-assist/sol-med-structural-round10.attempts.md
Normal file
389
tools/decomp-assist/sol-med-structural-round10.attempts.md
Normal file
@@ -0,0 +1,389 @@
|
||||
# Structural round 10
|
||||
|
||||
Starting HEAD 21c9b95b; baseline gate passes, target DOL SHA1 confirmed. All edits owned by this single worker.
|
||||
|
||||
## Diagnosis before source trials
|
||||
libs/RevoEX/src/nwc24/NWC24Download | NWC24InitDlTask | objdiff 98.923615 | structural/exact score, instructions ((0, 31), 144, 144); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | objdiff 99.303795 | structural/exact score, instructions ((0, 10), 79, 79); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RevoEX/src/nwc24/NWC24Download | NWC24UpdateDlTask | objdiff 95.00395 | structural/exact score, instructions ((19, 250), 249, 253); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RevoEX/src/nwc24/NWC24Download | NWC24PurgeOldestDlTask | objdiff 87.11364 | structural/exact score, instructions ((29, 95), 167, 176); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RevoEX/src/nwc24/NWC24Download | NWC24ManageDlTaskListForMenu | objdiff 96.74342 | structural/exact score, instructions ((12, 36), 150, 152); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RevoEX/src/nwc24/NWC24Download | NWC24iCheckDlHeaderConsistency | objdiff 98.77358 | structural/exact score, instructions ((2, 3), 212, 212); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RevoEX/src/nwc24/NWC24Download | AddTaskInternal | objdiff 97.7182 | structural/exact score, instructions ((20, 323), 398, 401); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RVL_SDK/src/nup/nup | __nupParseServerInfo__FP14NUPContextInfoPcPcUx | objdiff 98.108406 | structural/exact score, instructions ((0, 148), 452, 452); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RVL_SDK/src/nup/nup | __nupBase64Encode__FPUcPUcUl | objdiff 94.20635 | structural/exact score, instructions ((9, 21), 63, 63); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RVL_SDK/src/nup/nup | __nupGetBootVersion__FP14ESTitleVersion | objdiff None | structural/exact score, instructions ((0, 17), 163, 163); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RVL_SDK/src/nup/nup | __nupGetTitleSize__FP12NUPTitleInfo | objdiff 99.100716 | structural/exact score, instructions ((0, 22), 139, 139); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
libs/RVL_SDK/src/nup/nup | __nupOp | objdiff 99.25799 | structural/exact score, instructions ((4, 47), 438, 438); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
src/scene/setting/iplSetting | createBrowser__Q33ipl5scene7SettingFv | objdiff 98.8505 | structural/exact score, instructions ((15, 114), 299, 301); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
src/scene/setting/iplSetting | draw__Q33ipl5scene7SettingFv | objdiff 91.525314 | structural/exact score, instructions ((82, 570), 595, 632); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
src/scene/setting/iplSetting | initKeyboard__Q33ipl5scene7SettingFPCc | objdiff 98.38498 | structural/exact score, instructions ((4, 195), 215, 213); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
src/scene/setting/iplSetting | calcKeyboard__Q33ipl5scene7SettingFv | objdiff 98.0 | structural/exact score, instructions ((15, 258), 292, 290); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
src/scene/setting/iplSetting | convertRevIP__Q33ipl5scene7SettingFPUcPCc | objdiff 98.69863 | structural/exact score, instructions ((0, 16), 73, 73); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
src/scene/setting/iplSetting | scanAP__Q33ipl5scene7SettingFv | objdiff 95.39338 | structural/exact score, instructions ((53, 160), 266, 272); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
src/scene/setting/iplSetting | setUSBAP__Q33ipl5scene7SettingFv | objdiff 98.070175 | structural/exact score, instructions ((7, 21), 56, 57); full asm and diffs /tmp/sol-med-round10/diffs.txt
|
||||
NWC24InitDlTask | home-directory parser inline boundary with named high/low outputs | ((0, 31), 144, 144) -> ((0, 31), 144, 144) | objdiff 98.923615 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored
|
||||
NWC24InitDlTask | combine parsed identity into native 64-bit title value | ((0, 31), 144, 144) -> ((0, 31), 144, 144) | objdiff 98.923615 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored
|
||||
NWC24InitDlTask | initializer-specific ownership helper argument order | ((0, 31), 144, 144) -> ((0, 31), 144, 144) | objdiff 98.923615 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored
|
||||
NWC24IterateDlTask | cache header getter directly at every loop validation | ((0, 10), 79, 79) -> ((5, 3), 79, 79) | objdiff 94.81013 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored
|
||||
NWC24IterateDlTask | header recomputation through work dlHead field each use | ((0, 10), 79, 79) -> ((6, 52), 83, 79) | objdiff 92.21519 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored
|
||||
NWC24IterateDlTask | iterator search isolated from begin handling in inline helper | ((0, 10), 79, 79) -> ((0, 18), 79, 79) | objdiff 98.73418 | gain [] loss ['NWC24IterateDlTaskEx'] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored
|
||||
NWC24UpdateDlTask | materialized group ownership at update-only inline boundary | ((19, 250), 249, 253) -> ((5, 37), 253, 253) | objdiff 98.81423 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24UpdateDlTask | retry predicate shifts before mask with explicit nonnull header branch | ((5, 37), 253, 253) -> ((5, 37), 253, 253) | objdiff 98.83399 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24UpdateDlTask | access identifier copied through named inline output reader | ((5, 37), 253, 253) -> ((5, 29), 253, 253) | objdiff 98.992096 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24UpdateDlTask | retry checker count parameter precedes task pointer | ((5, 29), 253, 253) -> ((5, 29), 253, 253) | objdiff 98.992096 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24UpdateDlTask | group ownership accepts flags before group identifier | ((5, 29), 253, 253) -> ((19, 250), 249, 253) | objdiff 95.02371 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24UpdateDlTask | retry uses explicit read-validation inline boundary | BUILD FAIL /src/libs/RevoEX/src/nwc24 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: libs\RevoEX\src\nwc24\NWC24Download.c
|
||||
# ----------------------------------------------
|
||||
# 725: u32 retryMask;
|
||||
# Error: ^^^
|
||||
# (10141) expression syntax error
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
| restored
|
||||
NWC24UpdateDlTask | restore task-view group boundary after flags-first frame regression | ((19, 250), 249, 253) -> ((5, 29), 253, 253) | objdiff 98.992096 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24UpdateDlTask | retry read-validation expanded with declarations before statements | ((5, 29), 253, 253) -> ((5, 29), 253, 253) | objdiff 98.992096 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24UpdateDlTask | group identifier declared before result boolean | ((5, 29), 253, 253) -> ((19, 250), 249, 253) | objdiff 95.02371 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24UpdateDlTask | owner comparison materialized inside update validator | ((5, 29), 253, 253) -> ((5, 29), 253, 253) | objdiff 98.992096 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24iCheckDlHeaderConsistency | repair loop inline parameters task,header,repair with target-required out-of-line API call | ((2, 3), 212, 212) -> ((5, 6), 212, 212) | objdiff 96.95283 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24iCheckDlHeaderConsistency | repair loop inline parameters header,task,repair with target-required out-of-line API call | ((2, 3), 212, 212) -> ((5, 6), 212, 212) | objdiff 96.95283 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24iCheckDlHeaderConsistency | repair loop inline parameters header,repair,task with target-required out-of-line API call | ((2, 3), 212, 212) -> ((5, 6), 212, 212) | objdiff 96.95283 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
__nupBase64Encode__FPUcPUcUl | direct quartet stores in encoding order | ((9, 21), 63, 63) -> ((8, 17), 63, 63) | objdiff 86.53968 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | kept
|
||||
__nupBase64Encode__FPUcPUcUl | counter reset after first direct output assignment | ((8, 17), 63, 63) -> ((8, 17), 63, 63) | objdiff 86.53968 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupBase64Encode__FPUcPUcUl | load every quartet character before writing output and resetting counter | ((8, 17), 63, 63) -> ((17, 30), 63, 63) | objdiff 79.7619 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupBase64Encode__FPUcPUcUl | byte count initialized before value accumulator | ((8, 17), 63, 63) -> ((8, 30), 63, 63) | objdiff 85.190475 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
NWC24ManageDlTaskListForMenu | deletion propagates result through caller output pointer | ((12, 36), 150, 152) -> ((12, 36), 148, 152) | objdiff 96.2829 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24ManageDlTaskListForMenu | validation and successful deletion use separate inline lifetimes | ((12, 36), 150, 152) -> ((12, 36), 150, 152) | objdiff 96.74342 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24ManageDlTaskListForMenu | common deletion result assigned after validation success branch | ((12, 36), 150, 152) -> ((12, 36), 148, 152) | objdiff 96.2829 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24PurgeOldestDlTask | inline iterator initializer with checked status at API boundary | ((29, 95), 167, 176) -> ((21, 134), 171, 176) | objdiff 90.53977 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24PurgeOldestDlTask | read and delete guarded by success with iterator failure conversion at end | ((21, 134), 171, 176) -> ((64, 167), 150, 176) | objdiff 76.47159 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24PurgeOldestDlTask | read task inline returns status into explicit outer result output | ((21, 134), 171, 176) -> ((21, 134), 171, 176) | objdiff 90.59659 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
AddTaskInternal | free-slot iterator uses unsigned word with explicit validated short id | ((20, 323), 398, 401) -> ((20, 323), 398, 401) | objdiff 97.75561 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
AddTaskInternal | URL failure returned through inline string-check boundary | ((20, 323), 398, 401) -> ((17, 88), 399, 401) | objdiff 98.02992 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
AddTaskInternal | free-slot count validation uses sequential guards without shared condition register | ((17, 88), 399, 401) -> ((26, 101), 405, 401) | objdiff 96.12219 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24PurgeOldestDlTask | preserve initializer then defer iterator error conversion after read/delete branch | ((21, 134), 171, 176) -> ((10, 49), 174, 176) | objdiff 96.98864 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | kept
|
||||
NWC24PurgeOldestDlTask | selected deletion retains status separately from validation result | ((10, 49), 174, 176) -> ((10, 49), 174, 176) | objdiff 96.98864 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24PurgeOldestDlTask | selected read parameters id before pointer across inline call | ((10, 49), 174, 176) -> ((10, 49), 174, 176) | objdiff 96.98864 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
__nupBase64Encode__FPUcPUcUl | direct-store and cache trials reverted to starting source after no exact gain
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag parser output length parameter before value pointer | BUILD FAIL 319: &titleStart, &titleLength)) != 0 &&
|
||||
# Error: ^
|
||||
# (10248) function call '__nupFindTag({lval} char *, {lval} const char *,
|
||||
# {lval} const char *, char **, unsigned long *)' does not match
|
||||
# '__nupFindTag(char *, const char *, const char *, unsigned long *, char
|
||||
# **)'
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
| restored
|
||||
__nupBase64Encode__FPUcPUcUl | direct-store and cache trials reverted to starting source after no exact gain
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag parser output length parameter before value pointer | BUILD FAIL 21: &versionStart, &versionLength)) != 0) {
|
||||
# Error: ^
|
||||
# (10248) function call '__nupFindTag({lval} char *, {lval} const char *,
|
||||
# {lval} const char *, char **, unsigned long *)' does not match
|
||||
# '__nupFindTag(char *, const char *, const char *, unsigned long *, char
|
||||
# **)'
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
| restored
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag parser tests end tag through nested success branch | ((0, 148), 452, 452) -> ((69, 431), 470, 452) | objdiff 86.891594 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag values returned as named range at inline boundary | ((0, 148), 452, 452) -> ((0, 148), 452, 452) | objdiff 98.108406 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | size-specific content helper takes content id before title | ((0, 22), 139, 139) -> ((0, 22), 139, 139) | objdiff 99.100716 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | installed-content count passed explicitly at size-helper boundary | ((0, 22), 139, 139) -> ((0, 26), 139, 139) | objdiff 98.84892 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | reserve size computed in separate native-wide total | ((0, 22), 139, 139) -> ((0, 22), 139, 139) | objdiff 99.100716 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupGetBootVersion__FP14ESTitleVersion | installed-content count acquired before allocating list | ((0, 17), 163, 163) -> ((0, 17), 163, 163) | objdiff None | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupGetBootVersion__FP14ESTitleVersion | title-id equality tests candidate before owned-title value | ((0, 17), 163, 163) -> ((0, 17), 163, 163) | objdiff None | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupGetBootVersion__FP14ESTitleVersion | boot-version conversion moves into title-version function scope | ((0, 17), 163, 163) -> ((4, 26), 163, 163) | objdiff None | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupOp | boot-version output initialized only on successful output query | ((4, 47), 438, 438) -> ((3, 404), 437, 438) | objdiff 99.520546 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | kept
|
||||
__nupOp | boot-version output conversion stores only validated word | ((3, 404), 437, 438) -> ((0, 19), 438, 438) | objdiff 99.748856 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | kept
|
||||
__nupOp | title selection loop acquires title id through helper output boundary | ((0, 19), 438, 438) -> ((0, 18), 438, 438) | objdiff 99.76028 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | kept
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag helper length-before-value outputs with every call updated | ((0, 148), 452, 452) -> ((0, 148), 452, 452) | objdiff 98.108406 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored
|
||||
__nupOp | title selection compares current title id before array entry | ((0, 18), 438, 438) -> ((0, 18), 438, 438) | objdiff 99.783104 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupOp | title selection caches count after download-progress work | ((0, 18), 438, 438) -> ((0, 12), 438, 438) | objdiff 99.84018 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | kept
|
||||
__nupOp | title id acquired via semantic inline output reader | ((0, 12), 438, 438) -> ((0, 19), 438, 438) | objdiff 99.748856 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupOp | declsearch after structural trials | ((0, 12), 438, 438) -> ((0, 12), 438, 438)
|
||||
declaration block:
|
||||
u8* response = 0;
|
||||
ESTmdView* tmdView = 0;
|
||||
u32 currentDeviceId;
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
s32 result;
|
||||
u16 serverBootVersion;
|
||||
u16 bootTitleVersion;
|
||||
u16 systemMenuVersion;
|
||||
ESTitleId currentTitleId;
|
||||
NUPTitleInfo* bootTitle = 0;
|
||||
NUPTitleInfo* menuTitle = 0;
|
||||
NUPTitleInfo* systemTitle = 0;
|
||||
NUPContextInfo* context = (NUPContextInfo*)argument;
|
||||
u32 deviceId;
|
||||
char messageId[0x15];
|
||||
NANDStatus auditStatus;
|
||||
u32 i;
|
||||
start (0, 12)
|
||||
best (0, 12) after 180 builds; source restored; best order was:
|
||||
u8* response = 0;
|
||||
ESTmdView* tmdView = 0;
|
||||
u32 currentDeviceId;
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
s32 result;
|
||||
u16 serverBootVersion;
|
||||
u16 bootTitleVersion;
|
||||
u16 systemMenuVersion;
|
||||
ESTitleId currentTitleId;
|
||||
NUPTitleInfo* bootTitle = 0;
|
||||
NUPTitleInfo* menuTitle = 0;
|
||||
NUPTitleInfo* systemTitle = 0;
|
||||
NUPContextInfo* context = (NUPContextInfo*)argument;
|
||||
u32 deviceId;
|
||||
char messageId[0x15];
|
||||
NANDStatus auditStatus;
|
||||
u32 i;
|
||||
createBrowser__Q33ipl5scene7SettingFv | explicit case seven with invalid direct page returning safely | ((15, 114), 299, 301) -> ((15, 111), 303, 301) | objdiff 98.75083 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
createBrowser__Q33ipl5scene7SettingFv | projection dimensions calculated through rectangle accessors | ((15, 114), 299, 301) -> ((15, 114), 299, 301) | objdiff 98.8505 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
createBrowser__Q33ipl5scene7SettingFv | initialize default direct path before explicit seven-case switch | ((15, 114), 299, 301) -> ((9, 116), 302, 301) | objdiff 99.19933 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
draw__Q33ipl5scene7SettingFv | copy GX mode by scalar fields and sample-pattern pairs | ((82, 570), 595, 632) -> ((76, 537), 632, 632) | objdiff 91.01899 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | kept
|
||||
draw__Q33ipl5scene7SettingFv | window-null default branch and separate scroll direction stores | ((76, 537), 632, 632) -> ((71, 550), 632, 632) | objdiff 91.34335 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | kept
|
||||
draw__Q33ipl5scene7SettingFv | side rectangles calculate each float boundary at construction | ((71, 550), 632, 632) -> ((111, 601), 628, 632) | objdiff 85.54588 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored despite requested keep
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | keyboard defaults initialized in setting structure then copied to locals | ((4, 195), 215, 213) -> ((14, 202), 219, 213) | objdiff 96.478874 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | keyboard type stored after string and row limits in setting object | ((4, 195), 215, 213) -> ((7, 195), 215, 213) | objdiff 98.38028 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | unknown keyboard forms return before initialized limits are consumed | ((4, 195), 215, 213) -> ((18, 155), 215, 213) | objdiff 98.3615 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
__nupOp | current system title precedes candidate in 64-bit comparison after count lifetime fix | ((0, 12), 438, 438) -> ((0, 11), 438, 438) | objdiff 99.87443 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | kept
|
||||
__nupOp | selection count materialized at semantic inline output boundary | ((0, 11), 438, 438) -> ((0, 11), 438, 438) | objdiff 99.87443 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupOp | selection counter declared with thread locals but assigned at selection phase | ((0, 11), 438, 438) -> ((0, 11), 438, 438) | objdiff 99.87443 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupOp | separate selection loop indices after download phase | ((0, 11), 438, 438) -> ((0, 18), 438, 438) | objdiff 99.783104 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | asterisk assignment precedes explicit index increment | ((15, 258), 292, 290) -> ((9, 274), 291, 290) | objdiff 98.63793 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | kept
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | form text uses existing nickname as initialized fallback | ((9, 274), 291, 290) -> ((114, 271), 253, 290) | objdiff 84.82758 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | cancellation form text has its own scoped lifetime | ((9, 274), 291, 290) -> ((9, 274), 291, 290) | objdiff 98.63793 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | IPv4 parsing inline boundary takes source text before destination | ((0, 16), 73, 73) -> ((0, 10), 73, 73) | objdiff 99.178085 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | IPv4 parsing inline boundary takes destination before source text | ((0, 16), 73, 73) -> ((0, 10), 73, 73) | objdiff 99.178085 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | decimal parser takes named component pointer before conversion | ((0, 16), 73, 73) -> ((0, 16), 73, 73) | objdiff 98.69863 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored
|
||||
scanAP__Q33ipl5scene7SettingFv | animation boolean accumulated through inline query | ((53, 160), 266, 272) -> ((36, 165), 257, 272) | objdiff 93.25 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | kept
|
||||
scanAP__Q33ipl5scene7SettingFv | animation boolean converted through SDK BOOL return boundary | BUILD FAIL Setting.cpp:3)
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\scene\setting\iplSetting.cpp
|
||||
# -----------------------------------------
|
||||
# 2707: ol IsSettingAnimationPlaying(layout::Object* object, int index) {
|
||||
# Error: ^
|
||||
# (10333) object 'ipl::scene::IsSettingAnimationPlaying(ipl::layout::Object
|
||||
# *, int)' redefined
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
| restored
|
||||
scanAP__Q33ipl5scene7SettingFv | animation query separates animator acquisition from state read | BUILD FAIL Setting.cpp:3)
|
||||
### mwcceppc.exe Compiler:
|
||||
# File: src\scene\setting\iplSetting.cpp
|
||||
# -----------------------------------------
|
||||
# 2707: ol IsSettingAnimationPlaying(layout::Object* object, int index) {
|
||||
# Error: ^
|
||||
# (10333) object 'ipl::scene::IsSettingAnimationPlaying(ipl::layout::Object
|
||||
# *, int)' redefined
|
||||
# Too many errors printed, aborting program
|
||||
|
||||
User break, cancelled...
|
||||
ninja: build stopped: subcommand failed.
|
||||
| restored
|
||||
__nupOp | special-title selection inline parameters required,titles,count | ((0, 11), 438, 438) -> ((23, 187), 436, 438) | objdiff 98.6484 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupOp | special-title selection inline parameters count,titles,required | ((0, 11), 438, 438) -> ((23, 187), 436, 438) | objdiff 98.6484 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
setUSBAP__Q33ipl5scene7SettingFv | completion byte dispatches through switch before status argument reload | ((7, 21), 56, 57) -> ((7, 21), 56, 57) | objdiff 98.070175 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored despite requested keep
|
||||
__nupOp | special-title selection inline parameters titles,required,count | ((0, 11), 438, 438) -> ((23, 187), 436, 438) | objdiff 98.6484 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
scanAP__Q33ipl5scene7SettingFv | restore starting animation body after whole-query helper stayed out of line
|
||||
scanAP__Q33ipl5scene7SettingFv | leaf animation state query variant 1 | ((53, 160), 266, 272) -> ((54, 160), 266, 272) | objdiff 93.757355 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored despite requested keep
|
||||
scanAP__Q33ipl5scene7SettingFv | leaf animation state query variant 2 | ((53, 160), 266, 272) -> ((53, 160), 266, 272) | objdiff 95.39338 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored despite requested keep
|
||||
scanAP__Q33ipl5scene7SettingFv | leaf animation state query variant 3 | ((53, 160), 266, 272) -> ((53, 160), 266, 272) | objdiff 95.39338 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored despite requested keep
|
||||
setUSBAP__Q33ipl5scene7SettingFv | completion byte handled by one-iteration loop with explicit break | ((7, 21), 56, 57) -> ((9, 12), 57, 57) | objdiff 85.87719 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored despite requested keep
|
||||
setUSBAP__Q33ipl5scene7SettingFv | completion guard uses semantic result-byte inline predicate | ((7, 21), 56, 57) -> ((0, 0), 57, 57) | objdiff 100.0 | gain ['setUSBAP__Q33ipl5scene7SettingFv'] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | kept
|
||||
__nupOp | candidate identifier loaded before candidate pointer declaration | ((0, 11), 438, 438) -> ((0, 11), 438, 438) | objdiff 99.87443 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupOp | selection count acquired after array pointer in loop scope | ((0, 11), 438, 438) -> ((26, 185), 435, 438) | objdiff 98.3379 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
__nupOp | two title scans share an explicit pointer cursor instead of recomputing candidate | ((0, 11), 438, 438) -> ((0, 19), 438, 438) | objdiff 99.77169 | gain [] loss [] | POOL IDENTICAL up to 28 (mine=28 base=28) | restored despite requested keep
|
||||
|
||||
## First exact candidate
|
||||
setUSBAP: inline result-byte predicate preserves both target loads without volatile. 57/57 instructions, ctxdiff diffs 0, objdiff 100.0. All unrelated provisional code restored before full gate.
|
||||
|
||||
## Structural findings
|
||||
NWC24InitDlTask | 144/144 instructions; only local and nested ownership-helper register colors differ. | completed source trials 3
|
||||
NWC24IterateDlTask | 79/79 instructions; cached work/header r6 and r7 colors reversed. | completed source trials 3
|
||||
NWC24UpdateDlTask | timestamp and ownership inline boundaries force 0x30 rather than 0x20 frame; update-only task-view group helper reaches correct frame; retry branch and coloring still differ. | completed source trials 9
|
||||
NWC24PurgeOldestDlTask | initializer inline return and late iterator-error conversion explain most structural mismatch; reaches 174/176 instructions; removal result boundary remains different. | completed source trials 6
|
||||
NWC24ManageDlTaskListForMenu | delete-validation/result boundary produces 150/152 instructions with r3/r5 status allocation differences. | completed source trials 3
|
||||
NWC24iCheckDlHeaderConsistency | 212/212 instructions; task address scheduled after saved parameter copies instead of before. | completed source trials 3
|
||||
AddTaskInternal | URL failure branch, free-slot counter conversion, timestamp and retry helper boundaries. | completed source trials 3
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | 452/452 instructions; repeated tag-helper local colors differ. | completed source trials 3
|
||||
__nupBase64Encode__FPUcPUcUl | 63/63 instructions; quartet reads must be scheduled before stores, counter color differs. | completed source trials 4
|
||||
__nupGetBootVersion__FP14ESTitleVersion | target symbol omits context but asm uses both parameters; actual emitted two-parameter body has 163/163 instructions and 17 color differences. | completed source trials 3
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | 139/139 instructions; reserve high-word temporary and installed-content helper colors differ. | completed source trials 3
|
||||
__nupOp | boot output initialization and conversion branch resolved structurally; count lifetime removes 7 differences; remaining 11 differences swap count and low title-id register r7/r8. | completed source trials 16
|
||||
createBrowser__Q33ipl5scene7SettingFv | 0x200/0x210 frame; explicit seventh case and invalid-page default shape; target default retains uninitialized path, which will not be reproduced. | completed source trials 3
|
||||
draw__Q33ipl5scene7SettingFv | scalar GX mode copy explains most instruction-count gap; rectangle floating-point schedules and texture lifetimes differ. | completed source trials 3
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | safe row/string defaults add two instructions; keyboard settings stores and local colors differ. | completed source trials 3
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | safe form defaults add instructions; asterisk update ordering improves 292 to 291 against 290. | completed source trials 3
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | 73/73 instructions; pointer/count/index colors differ; semantic wrapper reduces 16 to 10 differences. | completed source trials 3
|
||||
scanAP__Q33ipl5scene7SettingFv | target materializes animation boolean; state/index store order differs; whole-query helper remains out of line and is rejected. | completed source trials 4
|
||||
setUSBAP__Q33ipl5scene7SettingFv | target reloads result byte; inline byte predicate reproduces both loads, 57/57 instructions and diffs 0. | completed source trials 3
|
||||
|
||||
setUSBAP clean full gate PASS; instruction-exact 104 -> 105, objdiff exact 105 -> 106, code 30532 -> 30760, data unchanged, regressions/forbidden/readability 0; committed 31cd9401
|
||||
NWC24InitDlTask | initial cached-header helper replaces open-coded acquisition | ((0, 31), 144, 144) -> ((0, 31), 144, 144) | objdiff 98.923615 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24InitDlTask | initial header acquired through named output parameter | ((0, 31), 144, 144) -> ((0, 31), 144, 144) | objdiff 98.923615 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24IterateDlTask | work cache acquired through semantic inline output reader | ((0, 10), 79, 79) -> ((0, 10), 79, 79) | objdiff 99.303795 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24IterateDlTask | reuse the validated cached header for later entry iteration | ((0, 10), 79, 79) -> ((2, 51), 78, 79) | objdiff 97.91139 | gain [] loss [] | POOL IDENTICAL up to 3 (mine=3 base=3) | restored despite requested keep
|
||||
NWC24InitDlTask | declsearch after structural trials | ((0, 31), 144, 144) -> ((0, 31), 144, 144)
|
||||
declaration block:
|
||||
char homePath[64] = {0};
|
||||
u32 nwc24IdHigh;
|
||||
u32 nwc24IdLow;
|
||||
DlTaskData* task;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
BOOL allowed;
|
||||
BOOL useContentFile;
|
||||
start (0, 31)
|
||||
best (0, 31) after 71 builds; source restored; best order was:
|
||||
char homePath[64] = {0};
|
||||
u32 nwc24IdHigh;
|
||||
u32 nwc24IdLow;
|
||||
DlTaskData* task;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
BOOL allowed;
|
||||
BOOL useContentFile;
|
||||
NWC24IterateDlTask | declsearch after structural trials | ((0, 10), 79, 79) -> ((0, 10), 79, 79)
|
||||
declaration block:
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Work* work;
|
||||
u16 taskId;
|
||||
u16 maxTaskCount;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
start (0, 10)
|
||||
best (0, 10) after 36 builds; source restored; best order was:
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Work* work;
|
||||
u16 taskId;
|
||||
u16 maxTaskCount;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
|
||||
## Rejected provisional work
|
||||
NWC24 update timestamp/ownership, purge initializer/error flow, AddTask URL helper, nupOp boot/title selection, Setting draw/calcKeyboard changes all restored. They improved structural or fuzzy scores but never achieved a new exact function. Saved snapshots under /tmp/sol-med-round10 are evidence only and will not be committed.
|
||||
No configuration, symbols, shared headers, original data placement, link flags, or other translation units edited.
|
||||
Readability: no new comments, asm, padding, volatile, uninitialized reads, raw pointer offsets, auto-named identifiers, or function deletion.
|
||||
NWC24iCheckDlHeaderConsistency | declsearch after structural trials | ((2, 3), 212, 212) -> ((2, 3), 212, 212)
|
||||
declaration block:
|
||||
NWC24DlTask task;
|
||||
NWC24DlTask* taskPointer = &task;
|
||||
NWC24DlId taskId;
|
||||
NWC24Err result;
|
||||
DlTaskListHeader* currentHeader;
|
||||
DlTaskListHeader* listHeader = header;
|
||||
BOOL shouldRepair = repair;
|
||||
start (2, 3)
|
||||
best (2, 3) after 52 builds; source restored; best order was:
|
||||
NWC24DlTask task;
|
||||
NWC24DlTask* taskPointer = &task;
|
||||
NWC24DlId taskId;
|
||||
NWC24Err result;
|
||||
DlTaskListHeader* currentHeader;
|
||||
DlTaskListHeader* listHeader = header;
|
||||
BOOL shouldRepair = repair;
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | declsearch after structural trials | ((0, 148), 452, 452) -> ((0, 148), 452, 452)
|
||||
definition of __nupParseServerInfo__FP14NUPContextInfoPcPcUx not found
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | declsearch after structural trials | ((0, 22), 139, 139) -> ((0, 22), 139, 139)
|
||||
definition of __nupGetTitleSize__FP12NUPTitleInfo not found
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | declsearch after structural trials | ((0, 16), 73, 73) -> ((0, 16), 73, 73)
|
||||
declaration block:
|
||||
char ascii[20];
|
||||
int count = 0;
|
||||
int index;
|
||||
start (0, 16)
|
||||
best (0, 16) after 6 builds; source restored; best order was:
|
||||
char ascii[20];
|
||||
int count = 0;
|
||||
int index;
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | declsearch explicit lines after mangled-name parser failure | ((0, 148), 452, 452) -> ((0, 148), 452, 452)
|
||||
declaration block:
|
||||
s32 result = 0;
|
||||
char* start;
|
||||
char* afterEnd;
|
||||
char* cursor;
|
||||
size_t valueLength;
|
||||
size_t titleCount;
|
||||
start (0, 148)
|
||||
best (0, 148) after 36 builds; source restored; best order was:
|
||||
s32 result = 0;
|
||||
char* start;
|
||||
char* afterEnd;
|
||||
char* cursor;
|
||||
size_t valueLength;
|
||||
size_t titleCount;
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | declsearch explicit lines after mangled-name parser failure | ((0, 22), 139, 139) -> ((0, 22), 139, 139)
|
||||
declaration block:
|
||||
s32 result = 0;
|
||||
s32 contentIndex;
|
||||
start (0, 22)
|
||||
best (0, 22) after 2 builds; source restored; best order was:
|
||||
s32 result = 0;
|
||||
s32 contentIndex;
|
||||
__nupBase64Encode__FPUcPUcUl | declsearch explicit lines after mangled-name parser failure | ((9, 21), 63, 63) -> ((9, 21), 63, 63)
|
||||
declaration block:
|
||||
u8* end = input + length;
|
||||
u32 value = 0;
|
||||
u32 count = 0;
|
||||
start (9, 21)
|
||||
best (9, 21) after 6 builds; source restored; best order was:
|
||||
u8* end = input + length;
|
||||
u32 value = 0;
|
||||
u32 count = 0;
|
||||
__nupGetBootVersion__FP14ESTitleVersion | declsearch actual body against target with explicit name mapping, no source symbol rename | ((0, 17), 163, 163) -> ((0, 17), 163, 163)
|
||||
declaration block:
|
||||
s32 result;
|
||||
ESTmdView* tmdView = 0;
|
||||
start (0, 17)
|
||||
best (0, 17) after 2 builds; source restored; best order was:
|
||||
s32 result;
|
||||
ESTmdView* tmdView = 0;
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | retain source-before-destination IPv4 helper for final declaration search | ((0, 16), 73, 73) -> ((0, 10), 73, 73) | objdiff 99.178085 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | kept
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | IPv4 helper leading declaration block includes start and destination cursor | ((0, 10), 73, 73) -> ((0, 10), 73, 73) | objdiff 99.178085 | gain [] loss [] | POOL IDENTICAL up to 108 (mine=108 base=108) | restored despite requested keep
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | declaration search on semantic parsing helper after source trials | ((0, 10), 73, 73) -> ((0, 10), 73, 73)
|
||||
declaration block:
|
||||
char ascii[20];
|
||||
int count = 0;
|
||||
int index;
|
||||
start (0, 10)
|
||||
best (0, 10) after 6 builds; source restored; best order was:
|
||||
char ascii[20];
|
||||
int count = 0;
|
||||
int index;
|
||||
|
||||
## Final open-function audit
|
||||
NWC24InitDlTask | objdiff 98.923615 | distinct successful-build source attempts 5
|
||||
NWC24IterateDlTask | objdiff 99.303795 | distinct successful-build source attempts 5
|
||||
NWC24UpdateDlTask | objdiff 95.00395 | distinct successful-build source attempts 9
|
||||
NWC24PurgeOldestDlTask | objdiff 87.11364 | distinct successful-build source attempts 5
|
||||
NWC24ManageDlTaskListForMenu | objdiff 96.74342 | distinct successful-build source attempts 3
|
||||
NWC24iCheckDlHeaderConsistency | objdiff 98.77358 | distinct successful-build source attempts 3
|
||||
AddTaskInternal | objdiff 97.7182 | distinct successful-build source attempts 3
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | objdiff 98.108406 | distinct successful-build source attempts 3
|
||||
__nupBase64Encode__FPUcPUcUl | objdiff 94.20635 | distinct successful-build source attempts 4
|
||||
__nupGetBootVersion__FP14ESTitleVersion | objdiff None | distinct successful-build source attempts 3
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | objdiff 99.100716 | distinct successful-build source attempts 3
|
||||
__nupOp | objdiff 99.25799 | distinct successful-build source attempts 16
|
||||
createBrowser__Q33ipl5scene7SettingFv | objdiff 98.8505 | distinct successful-build source attempts 3
|
||||
draw__Q33ipl5scene7SettingFv | objdiff 91.525314 | distinct successful-build source attempts 3
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | objdiff 98.38498 | distinct successful-build source attempts 3
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | objdiff 98.0 | distinct successful-build source attempts 3
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | objdiff 98.69863 | distinct successful-build source attempts 5
|
||||
scanAP__Q33ipl5scene7SettingFv | objdiff 95.39338 | distinct successful-build source attempts 4
|
||||
All 18 open functions have at least three distinct source attempts. Declaration-order searches followed structural trials. Purge trial with accidental early source slicing was rejected and excluded from this audit. All source changes outside the committed result-byte predicate restored.
|
||||
|
||||
Final clean full gate over all three: GATE PASS; DOL target SHA1, all pools identical, regressions/forbidden/readability 0. Only Setting unit changed among 1027 reports. setUSBAP: objdiff 100.0, 57/57 instructions, ctxdiff diffs 0.
|
||||
Fresh comparator caveat: setUpdate_NoUpdateDialog_ raw 120-byte bodies are identical and corrected disassembler score is (0,0). ctxdiff misreads blt cr1 first operand as branch target; two apparent differences depend on function offset. Prior round NaN explanation not supported by current output. Tooling left unchanged.
|
||||
@@ -0,0 +1,56 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 6828/12496 data 80/80 functions 23/30 fuzzy 98.2676 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 23/30
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 98.26761
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 99.303795
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 95.00395
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 87.11364
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 96.74342
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 97.7182
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 6828/12496 data 80 functions 23 fuzzy 98.2676
|
||||
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/nup/nup] objdiff: code 5744/10764 data 1720/1720 functions 18/23 fuzzy 93.3222 linked code 0
|
||||
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 18/23
|
||||
[libs/RVL_SDK/src/nup/nup] section .data size 1592 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .rodata size 88 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sbss size 8 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .text size 10764 match 93.32218
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupBase64Encode__FPUcPUcUl 94.20635
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14ESTitleVersion None
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupOp 99.25799
|
||||
[libs/RVL_SDK/src/nup/nup] baseline: code 5744/10764 data 1720 functions 18 fuzzy 93.3222
|
||||
[src/scene/setting/iplSetting] pool: IDENTICAL
|
||||
[src/scene/setting/iplSetting] objdiff: code 30760/37884 data 1040/5696 functions 106/112 fuzzy 99.1581 linked code 0
|
||||
[src/scene/setting/iplSetting] instruction-exact functions: 105/112
|
||||
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
|
||||
[src/scene/setting/iplSetting] section .data size 4016 match 5.146636
|
||||
[src/scene/setting/iplSetting] section .rodata size 640 match 32.25412
|
||||
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
|
||||
[src/scene/setting/iplSetting] section .text size 37884 match 99.15806
|
||||
[src/scene/setting/iplSetting] below 100: createBrowser__Q33ipl5scene7SettingFv 98.8505
|
||||
[src/scene/setting/iplSetting] below 100: draw__Q33ipl5scene7SettingFv 91.525314
|
||||
[src/scene/setting/iplSetting] below 100: initKeyboard__Q33ipl5scene7SettingFPCc 98.38498
|
||||
[src/scene/setting/iplSetting] below 100: calcKeyboard__Q33ipl5scene7SettingFv 98.0
|
||||
[src/scene/setting/iplSetting] below 100: convertRevIP__Q33ipl5scene7SettingFPUcPCc 98.69863
|
||||
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 95.39338
|
||||
[src/scene/setting/iplSetting] baseline: code 30532/37884 data 1040 functions 105 fuzzy 99.1465
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 87.12394 -> 87.13156
|
||||
global fuzzy_match_percent: 99.36623 -> 99.36638
|
||||
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
|
||||
111
tools/decomp-assist/sol-med-structural-round10.report.md
Normal file
111
tools/decomp-assist/sol-med-structural-round10.report.md
Normal file
@@ -0,0 +1,111 @@
|
||||
# Structural round 10
|
||||
|
||||
Committed one new exact function: `Setting::setUSBAP`, with an inline result-byte predicate that preserves the target's separate guard and argument loads. The source change adds five lines and changes one condition. No volatile access, new assembly, hand-placed data, header or configuration changes.
|
||||
|
||||
| Unit | Instruction-exact before -> after | Objdiff exact before -> after | Matched code bytes before -> after | Matched data bytes before -> after |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| libs/RevoEX/src/nwc24/NWC24Download | 23 -> 23 / 30 | 23 -> 23 / 30 | 6828 -> 6828 / 12496 | 80 -> 80 / 80 |
|
||||
| libs/RVL_SDK/src/nup/nup | 18 -> 18 / 23 | 18 -> 18 / 23 | 5744 -> 5744 / 10764 | 1720 -> 1720 / 1720 |
|
||||
| src/scene/setting/iplSetting | 104 -> 105 / 112 | 105 -> 106 / 112 | 30532 -> 30760 / 37884 | 1040 -> 1040 / 5696 |
|
||||
|
||||
## Remaining functions
|
||||
|
||||
NWC24InitDlTask | 98.923615 | 144/144 instructions; local and ownership-helper register colors.
|
||||
NWC24IterateDlTask | 99.303795 | 79/79 instructions; work/header r6/r7 colors reversed.
|
||||
NWC24UpdateDlTask | 95.00395 | 249/253 instructions; 0x30/0x20 frame, ownership/timestamp inline boundaries, retry branch and mask operands.
|
||||
NWC24PurgeOldestDlTask | 87.11364 | 167/176 instructions; iterator initializer, shared read/removal result and error conversion boundaries.
|
||||
NWC24ManageDlTaskListForMenu | 96.74342 | 150/152 instructions; inline validation/removal status lifetime and argument registers.
|
||||
NWC24iCheckDlHeaderConsistency | 98.77358 | 212/212 instructions; three prologue instructions scheduled in a different order.
|
||||
AddTaskInternal | 97.7182 | 398/401 instructions; URL failure branch, free-slot short counter, update helper boundaries.
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | 98.108406 | 452/452 instructions; colors across repeated tag-helper expansion.
|
||||
__nupBase64Encode__FPUcPUcUl | 94.20635 | 63/63 instructions; quartet load/store schedule and counter register.
|
||||
__nupGetBootVersion__FP14ESTitleVersion | unpaired | target name omits context although asm uses both parameters; actual two-parameter body has 163/163 instructions and 17 register differences.
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | 99.100716 | 139/139 instructions; wide-add high word and installed-content search colors.
|
||||
__nupOp | 99.25799 | 438/438 instructions; output initialization and conversion branches plus title selection colors. Provisional structural fixes reached 11 register differences, then were restored without exact gain.
|
||||
createBrowser__Q33ipl5scene7SettingFv | 98.8505 | 299/301 instructions; frame 0x200/0x210 and direct-page switch/default shape. Uninitialized default was not reproduced.
|
||||
draw__Q33ipl5scene7SettingFv | 91.525314 | 595/632 instructions; GX mode scalar copy, scroll/window branches, rectangle and texture lifetimes.
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | 98.38498 | 215/213 instructions; safe limit defaults, settings stores and local colors.
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | 98.0 | 292/290 instructions; safe form defaults, asterisk update and cancellation pointer lifetime.
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | 98.69863 | 73/73 instructions; component counter and buffer/output pointer colors.
|
||||
scanAP__Q33ipl5scene7SettingFv | 95.39338 | 266/272 instructions; animation boolean materialization and animation/state store order.
|
||||
|
||||
## Attempts and scope
|
||||
|
||||
Every remaining function has at least three distinct logged source attempts that built successfully. The final audit excludes the discarded purge trial with incorrect source slicing. Structural diagnosis preceded edits. Declaration searches ran last; explicit source line ranges bypassed the tool's SDK-symbol name parser limitation. For the boot-version body, the target lookup was mapped only in the temporary Python runner, without renaming source functions.
|
||||
|
||||
All rejected or fuzzy-only code changes were restored. No output from another translation unit was changed. Starting untracked round 8 and round 9 records were preserved.
|
||||
|
||||
Detailed attempts: `sol-med-structural-round10.attempts.md`. Complete source trial diffs and target assembly: `/tmp/sol-med-round10/diffs.txt`. Provisional source snapshots remain in `/tmp/sol-med-round10` for diagnostic evidence only.
|
||||
|
||||
## Validation and commits
|
||||
|
||||
Code commit: `31cd9401`, `match usb access point completion handling`.
|
||||
|
||||
The first clean full gate passed: build successful, DOL SHA1 `26116613f624061ba99c8d1a299aaa6efa85670d`, identical Setting pool, zero regressions, zero forbidden patterns and zero readability problems. `setUSBAP` has 57/57 instructions, ctxdiff diffs 0 and exact-name objdiff 100.0.
|
||||
|
||||
Final clean full gate over all three units is recorded in `sol-med-structural-round10.final-gate.txt`. Final clean full gate: `GATE PASS`. All three pools identical; full build successful; target DOL SHA1 retained; zero regressions, forbidden patterns and readability problems. Independent comparison of all 1027 unit reports confirms that only Setting changed. Exact `setUSBAP` was rechecked after the clean rebuild.
|
||||
|
||||
## Measurement uncertainties
|
||||
|
||||
Setting's instruction comparator reports one fewer exact function than objdiff. Fresh verification finds identical 120-byte bodies for `setUpdate_NoUpdateDialog_`, with structural/exact score `(0, 0)` in the operand-corrected disassembler. The gate/ctxdiff disassembler reads the first CR operand of `blt cr1` as an immediate rather than using the branch target operand; different function offsets therefore create two false differences. Prior round records attributed this to NaN; current evidence supports the CR-operand parsing explanation. No verification tooling was changed. Setting data remains 1040/5696; original weak/inline data may have been deduplicated by the linker. Linking is outside this phase. The boot-version target's one-parameter mangled name does not describe its two-parameter machine code.
|
||||
|
||||
## Final gate
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 6828/12496 data 80/80 functions 23/30 fuzzy 98.2676 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 23/30
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 98.26761
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 99.303795
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 95.00395
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 87.11364
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 96.74342
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 97.7182
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 6828/12496 data 80 functions 23 fuzzy 98.2676
|
||||
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/nup/nup] objdiff: code 5744/10764 data 1720/1720 functions 18/23 fuzzy 93.3222 linked code 0
|
||||
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 18/23
|
||||
[libs/RVL_SDK/src/nup/nup] section .data size 1592 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .rodata size 88 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sbss size 8 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .text size 10764 match 93.32218
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupBase64Encode__FPUcPUcUl 94.20635
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14ESTitleVersion None
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupOp 99.25799
|
||||
[libs/RVL_SDK/src/nup/nup] baseline: code 5744/10764 data 1720 functions 18 fuzzy 93.3222
|
||||
[src/scene/setting/iplSetting] pool: IDENTICAL
|
||||
[src/scene/setting/iplSetting] objdiff: code 30760/37884 data 1040/5696 functions 106/112 fuzzy 99.1581 linked code 0
|
||||
[src/scene/setting/iplSetting] instruction-exact functions: 105/112
|
||||
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
|
||||
[src/scene/setting/iplSetting] section .data size 4016 match 5.146636
|
||||
[src/scene/setting/iplSetting] section .rodata size 640 match 32.25412
|
||||
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
|
||||
[src/scene/setting/iplSetting] section .text size 37884 match 99.15806
|
||||
[src/scene/setting/iplSetting] below 100: createBrowser__Q33ipl5scene7SettingFv 98.8505
|
||||
[src/scene/setting/iplSetting] below 100: draw__Q33ipl5scene7SettingFv 91.525314
|
||||
[src/scene/setting/iplSetting] below 100: initKeyboard__Q33ipl5scene7SettingFPCc 98.38498
|
||||
[src/scene/setting/iplSetting] below 100: calcKeyboard__Q33ipl5scene7SettingFv 98.0
|
||||
[src/scene/setting/iplSetting] below 100: convertRevIP__Q33ipl5scene7SettingFPUcPCc 98.69863
|
||||
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 95.39338
|
||||
[src/scene/setting/iplSetting] baseline: code 30532/37884 data 1040 functions 105 fuzzy 99.1465
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 87.12394 -> 87.13156
|
||||
global fuzzy_match_percent: 99.36623 -> 99.36638
|
||||
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
|
||||
```
|
||||
304
tools/decomp-assist/sol-med.attempts.md
Normal file
304
tools/decomp-assist/sol-med.attempts.md
Normal file
@@ -0,0 +1,304 @@
|
||||
# sol-med matching attempts
|
||||
|
||||
43U only. All trials built only the owned object. Scores are structural/exact instruction differences; retained trial candidates were provisional. All fuzzy-only candidates were restored before final verification.
|
||||
|
||||
Baseline gate: NWC24Download instruction-exact 18/30, code 4172/12496, data 80/80; nup 17/23, code 5164/10764, data 1720/1720; iplSetting instruction-exact 104/112, objdiff 105/112, code 30532/37884, data 1040/5696. All pools identical.
|
||||
|
||||
## Structural diagnosis from target asm and ctxdiff
|
||||
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24InitDlTask | src 0x240 base 0x240 insns 144/144 | diffs 31: [5, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 31, 32]
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24SetDlInterval | src 0x24c base 0x24c insns 147/147 | diffs 3: [126, 127, 137]
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24IterateDlTask | src 0x138 base 0x13c insns 78/79 | --- replace mine 22:24 base 22:24
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24IterateDlTaskEx | src 0x244 base 0x244 insns 145/145 | diffs 17: [8, 15, 25, 26, 28, 29, 31, 32, 43, 56, 57, 58, 83, 87, 103, 120, 130]
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24UpdateDlTask | src 0x3dc base 0x3f4 insns 247/253 | --- replace mine 0:1 base 0:1
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24AddDlTask | src 0x248 base 0x23c insns 146/143 | --- delete mine 6:7 base 6:6
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24GetDlTask | src 0x170 base 0x170 insns 92/92 | diffs 5: [4, 6, 60, 64, 73]
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24PurgeOldestDlTask | src 0x2ac base 0x2c0 insns 171/176 | --- replace mine 9:10 base 9:11
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24ManageDlTaskListForMenu | src 0x258 base 0x260 insns 150/152 | --- replace mine 18:19 base 18:19
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24ExtendDlTaskList | src 0x224 base 0x224 insns 137/137 | diffs 4: [122, 124, 126, 128]
|
||||
libs/RevoEX/src/nwc24/NWC24Download NWC24iCheckDlHeaderConsistency | src 0x350 base 0x350 insns 212/212 | diffs 3: [5, 6, 7]
|
||||
libs/RevoEX/src/nwc24/NWC24Download AddTaskInternal | src 0x634 base 0x644 insns 397/401 | --- replace mine 58:59 base 58:59
|
||||
libs/RVL_SDK/src/nup/nup __nupParseServerInfo__FP14NUPContextInfoPcPcUx | src 0x710 base 0x710 insns 452/452 | diffs 148: [13, 14, 15, 18, 21, 23, 26, 30, 32, 33, 34, 36, 41, 43, 44, 49, 52, 53, 56, 59]
|
||||
libs/RVL_SDK/src/nup/nup __nupGetServerInfo__FPcPcUxPcPcUlPcUsUsUxUsPPc | src 0x244 base 0x244 insns 145/145 | diffs 1: [58]
|
||||
libs/RVL_SDK/src/nup/nup __nupBase64Encode__FPUcPUcUl | src 0xfc base 0xfc insns 63/63 | diffs 21: [5, 9, 11, 16, 17, 18, 20, 21, 22, 23, 25, 31, 35, 38, 42, 44, 48, 52, 55, 58]
|
||||
libs/RVL_SDK/src/nup/nup __nupGetBootVersion__FP14ESTitleVersion | | symbol absent from built object
|
||||
libs/RVL_SDK/src/nup/nup __nupGetTitleSize__FP12NUPTitleInfo | src 0x22c base 0x22c insns 139/139 | diffs 22: [39, 40, 42, 43, 56, 57, 58, 59, 61, 62, 67, 68, 69, 71, 74, 75, 78, 80, 90, 91]
|
||||
libs/RVL_SDK/src/nup/nup __nupOp | src 0x6e0 base 0x6d8 insns 440/438 | --- delete mine 8:9 base 8:8
|
||||
src/scene/setting/iplSetting createBrowser__Q33ipl5scene7SettingFv | src 0x4ac base 0x4b4 insns 299/301 | --- replace mine 0:1 base 0:1
|
||||
src/scene/setting/iplSetting draw__Q33ipl5scene7SettingFv | src 0x958 base 0x9e0 insns 598/632 | --- replace mine 18:19 base 18:19
|
||||
src/scene/setting/iplSetting initKeyboard__Q33ipl5scene7SettingFPCc | src 0x350 base 0x354 insns 212/213 | --- replace mine 8:9 base 8:9
|
||||
src/scene/setting/iplSetting calcKeyboard__Q33ipl5scene7SettingFv | src 0x484 base 0x488 insns 289/290 | --- replace mine 11:12 base 11:12
|
||||
src/scene/setting/iplSetting convertRevIP__Q33ipl5scene7SettingFPUcPCc | src 0x124 base 0x124 insns 73/73 | diffs 21: [6, 8, 12, 15, 16, 17, 18, 19, 21, 28, 29, 30, 36, 38, 45, 46, 47, 48, 50, 64]
|
||||
src/scene/setting/iplSetting scanAP__Q33ipl5scene7SettingFv | src 0x428 base 0x440 insns 266/272 | --- replace mine 7:8 base 7:8
|
||||
src/scene/setting/iplSetting setUSBAP__Q33ipl5scene7SettingFv | src 0xe0 base 0xe4 insns 56/57 | --- replace mine 8:9 base 8:9
|
||||
|
||||
Trials: structural/exact differences, with only verified improvements kept.
|
||||
__nupGetServerInfo__FPcPcUxPcPcUlPcUsUsUxUsPPc | country length temporary | (0, 1) -> (0, 22) | restored
|
||||
NWC24SetDlInterval | task pointer before work and header | (0, 3) -> (0, 3) | restored
|
||||
NWC24ExtendDlTaskList | reuse task identifier scope for close result | (0, 4) -> BUILD FAIL | restored
|
||||
NWC24iCheckDlHeaderConsistency | move task pointer initialization ahead of aliases | (2, 3) -> (2, 3) | restored
|
||||
__nupGetServerInfo__FPcPcUxPcPcUlPcUsUsUxUsPPc | reverse compound operand | (0, 1) -> (0, 22) | restored
|
||||
__nupGetServerInfo__FPcPcUxPcPcUlPcUsUsUxUsPPc | split country size expression | (0, 1) -> (0, 22) | restored
|
||||
__nupGetServerInfo__FPcPcUxPcPcUlPcUsUsUxUsPPc | named country length before compound addition | (0, 1) -> (0, 0) | kept
|
||||
NWC24ManageDlTaskListForMenu | nested success preserves removal result boundary | (12, 36) -> (12, 36) | restored
|
||||
NWC24iCheckDlHeaderConsistency | task pointer before argument aliases declarations | (2, 3) -> (2, 20) | restored
|
||||
NWC24ExtendDlTaskList | common close result uses operation result | (0, 4) -> (0, 4) | restored
|
||||
createBrowser__Q33ipl5scene7SettingFv | separate direct page seven from default | (15, 114) -> (14, 111) | kept
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | use manager getter across inline helper boundaries | (18, 183) -> (4, 195) | kept
|
||||
setUSBAP__Q33ipl5scene7SettingFv | preserve owner nickname BOOL result | (7, 21) -> (9, 23) | restored
|
||||
NWC24SetDlInterval | scoped final identifier temporary | (0, 3) -> (0, 3) | restored
|
||||
NWC24SetDlInterval | final identifier declared before task pointer | (0, 3) -> (0, 3) | restored
|
||||
NWC24ExtendDlTaskList | close and load status share lifetime | (0, 4) -> (0, 4) | restored
|
||||
NWC24iCheckDlHeaderConsistency | direct local task use in inline helpers | (2, 3) -> (5, 6) | restored
|
||||
createBrowser__Q33ipl5scene7SettingFv | move direct page path declaration before search loop | (14, 111) -> (14, 111) | restored
|
||||
createBrowser__Q33ipl5scene7SettingFv | local heap size declarations before initial allocation | (14, 111) -> (14, 117) | restored
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | keyboard limits reordered by lifetime | (4, 195) -> (6, 195) | restored
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | setting fields assigned in declaration order | (4, 195) -> (5, 195) | restored
|
||||
setUSBAP__Q33ipl5scene7SettingFv | guard completion with early switch exit | (7, 21) -> (7, 21) | restored
|
||||
setUSBAP__Q33ipl5scene7SettingFv | materialize completion flag | (7, 21) -> (7, 21) | restored
|
||||
scanAP__Q33ipl5scene7SettingFv | materialize animation state in int | (56, 165) -> (56, 165) | restored
|
||||
scanAP__Q33ipl5scene7SettingFv | animation index before state store | (56, 165) -> BUILD FAIL | restored
|
||||
scanAP__Q33ipl5scene7SettingFv | store animation BOOL before branch | (56, 165) -> BUILD FAIL | restored
|
||||
NWC24SetDlInterval | restore timestamp inline helper boundary | (0, 3) -> (0, 8) | restored
|
||||
NWC24InitDlTask | high and low identifiers scoped after parsing | (0, 31) -> BUILD FAIL | restored
|
||||
NWC24InitDlTask | direct header getter for initial validation | (0, 31) -> (0, 31) | restored
|
||||
NWC24InitDlTask | scope group identifier validation through task helper | (0, 31) -> (0, 31) | restored
|
||||
NWC24IterateDlTask | for loop with first condition instead of do while | (3, 50) -> (5, 20) | restored
|
||||
NWC24IterateDlTask | unsigned task identifier widened before loop | (3, 50) -> (12, 48) | restored
|
||||
NWC24IterateDlTask | cache entry header only after loop check | (3, 50) -> BUILD FAIL | restored
|
||||
NWC24IterateDlTaskEx | selected identifier temporary before result stores | (2, 17) -> (8, 104) | restored
|
||||
NWC24IterateDlTaskEx | descending signed flag form | (2, 17) -> (2, 17) | restored
|
||||
NWC24IterateDlTaskEx | callback declaration after candidate flags | (2, 17) -> (2, 14) | kept
|
||||
NWC24UpdateDlTask | operation time helper common result exit | (25, 249) -> (28, 252) | restored
|
||||
NWC24UpdateDlTask | retry loop uses explicit call and break | (25, 249) -> (34, 250) | restored
|
||||
NWC24UpdateDlTask | scope task identifier before time query | (25, 249) -> BUILD FAIL | restored
|
||||
NWC24AddDlTask | use explicit next time helper return status | (5, 140) -> (5, 140) | restored
|
||||
NWC24AddDlTask | scope next timestamp after universal time query | (5, 140) -> BUILD FAIL | restored
|
||||
NWC24AddDlTask | group universal time success with timestamp assignment | (5, 140) -> (6, 139) | restored
|
||||
NWC24GetDlTask | task destination alias before file declaration | (0, 5) -> (0, 5) | restored
|
||||
NWC24GetDlTask | scoped identifier for seek and read | (0, 5) -> BUILD FAIL | restored
|
||||
NWC24GetDlTask | read status as conditional value | (0, 5) -> (0, 5) | restored
|
||||
NWC24GetDlTask | read helper as whole function body | (0, 5) -> (0, 5) | restored
|
||||
NWC24iCheckDlHeaderConsistency | task pointer declared after argument copies | (2, 3) -> (2, 20) | restored
|
||||
NWC24IterateDlTask | loop entry through common condition label | (3, 50) -> (5, 20) | restored
|
||||
NWC24InitDlTask | reorder scalar initialization stores | (0, 31) -> (2, 31) | restored
|
||||
NWC24UpdateDlTask | result declaration before task and time declarations | (25, 249) -> (25, 249) | restored
|
||||
NWC24AddDlTask | scope interval conversion after multiplication | (5, 140) -> (5, 140) | restored
|
||||
NWC24ManageDlTaskListForMenu | shared read and remove result common success exit | (12, 36) -> (15, 46) | restored
|
||||
NWC24ManageDlTaskListForMenu | removal destination uses initialized task pointer | (12, 36) -> (15, 137) | restored
|
||||
NWC24ManageDlTaskListForMenu | scope count and task locals by declaration lifetime | (12, 36) -> (12, 36) | restored
|
||||
NWC24PurgeOldestDlTask | done handling at shared final exit | (33, 166) -> (32, 167) | kept
|
||||
NWC24PurgeOldestDlTask | read and remove common status return | (32, 167) -> (33, 165) | restored
|
||||
NWC24PurgeOldestDlTask | swap selected task and destination declaration order | (32, 167) -> (32, 167) | restored
|
||||
AddTaskInternal | URL pointer kept across inline string validation | (36, 328) -> (37, 337) | restored
|
||||
AddTaskInternal | nested success path for URL checks | (36, 328) -> (41, 324) | restored
|
||||
AddTaskInternal | URL scheme failure normalized at common exit | (36, 328) -> (39, 328) | restored
|
||||
AddTaskInternal | retry condition in loop header in inline update | (36, 328) -> (27, 328) | kept
|
||||
AddTaskInternal | access-time status through separate local | (27, 328) -> (27, 327) | kept
|
||||
AddTaskInternal | candidate retry mask operand order | (27, 327) -> (27, 327) | restored
|
||||
NWC24InitDlTask | initialize cached header before path parsing | (0, 31) -> (0, 31) | restored
|
||||
NWC24InitDlTask | initialize task pointer at declaration | (0, 31) -> (0, 31) | restored
|
||||
NWC24SetDlInterval | widen shared task identifier | (0, 3) -> (1, 3) | restored
|
||||
NWC24SetDlInterval | separate validation and final entry identifier lifetimes | (0, 3) -> (0, 3) | restored
|
||||
NWC24UpdateDlTask | shift mask first in bitwise test | (25, 249) -> (25, 249) | restored
|
||||
NWC24iCheckDlHeaderConsistency | order argument copy declarations after stack pointer | (2, 3) -> (2, 3) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | first and second output direct assignments | (9, 21) -> (9, 21) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | first character temporary declared before second | (9, 21) -> (9, 21) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | count before value declaration | (9, 21) -> (9, 27) | restored
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | end pointer declared before start pointer | (0, 148) -> (0, 148) | restored
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | scope value pointer temporary before output writes | (0, 148) -> (0, 148) | restored
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | sequential guards instead of compound short circuit | (0, 148) -> (83, 471) | restored
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | progress update after first size rounding | (0, 22) -> (11, 29) | restored
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | content size uses saved descriptor | (0, 22) -> (15, 82) | restored
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | content existence result scoped before branch | (0, 22) -> (0, 22) | restored
|
||||
__nupOp | uninitialized boot version removed initial zero only via query initialization | (7, 429) -> (7, 429) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | direct four alphabet lookups in output order | (9, 21) -> (8, 17) | kept
|
||||
__nupBase64Encode__FPUcPUcUl | pointer increments for encoded characters | (8, 17) -> (19, 43) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | count and value use unsigned long locals | (8, 17) -> (8, 17) | restored
|
||||
NWC24IterateDlTaskEx | found declaration before callback pointer | (2, 14) -> (2, 3) | kept
|
||||
NWC24ExtendDlTaskList | initialize close result in closing scope | (0, 4) -> (0, 4) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | accumulator shift and input as one expression | (8, 17) -> (8, 19) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | output first character through scoped byte temporary | (8, 17) -> (8, 17) | restored
|
||||
__nupBase64Encode__FPUcPUcUl | consume count before next group after first store | (8, 17) -> (8, 17) | restored
|
||||
NWC24IterateDlTaskEx | read comparison identifier before selected value store | (2, 3) -> (0, 0) | kept
|
||||
setUSBAP__Q33ipl5scene7SettingFv | signed completion byte comparison | (7, 21) -> (8, 21) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | index declared ahead of component locals | (0, 21) -> (0, 21) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | component start and output pointer declarations reversed | (0, 21) -> (0, 21) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | component value with common saturation expression | (0, 21) -> (6, 54) | restored
|
||||
draw__Q33ipl5scene7SettingFv | texture rectangles local order follows calls | (123, 334) -> (120, 570) | kept
|
||||
draw__Q33ipl5scene7SettingFv | initialize each texture and LOD together | (120, 570) -> (120, 570) | restored
|
||||
draw__Q33ipl5scene7SettingFv | side rectangle floats initialized in target order | (120, 570) -> (126, 571) | restored
|
||||
__nupGetBootVersion__FP14ESTitleVersion | owned title comparison uses requested title first | (0, 17) -> (0, 17) | restored; ABI uses context and title but original symbol encodes title only
|
||||
__nupGetBootVersion__FP14ESTitleVersion | view pointer declaration before operation result | (0, 17) -> (0, 17) | restored; ABI uses context and title but original symbol encodes title only
|
||||
__nupGetBootVersion__FP14ESTitleVersion | title search while loop with explicit next index | (0, 17) -> (0, 17) | restored; ABI uses context and title but original symbol encodes title only
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | default cases initialize form text instead of entry | (37, 251) -> (79, 211) | restored
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | explicit valid form switch instead of range checks | (37, 251) -> (24, 253) | kept
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | vacancy success branch first | (24, 253) -> (17, 253) | kept
|
||||
scanAP__Q33ipl5scene7SettingFv | bool compared with false at call boundary | (56, 165) -> (56, 165) | restored
|
||||
__nupOp | boot version overflow uses explicit error branch | (7, 429) -> (4, 56) | kept
|
||||
scanAP__Q33ipl5scene7SettingFv | animation state scalar outside switch | (56, 165) -> (56, 165) | restored
|
||||
scanAP__Q33ipl5scene7SettingFv | animation index scalar outside switch | (56, 165) -> (26, 160) | kept
|
||||
__nupOp | current title equality operand order | (4, 56) -> (4, 56) | restored
|
||||
__nupOp | title descriptor search count cached for loop | (4, 56) -> (22, 221) | restored
|
||||
createBrowser__Q33ipl5scene7SettingFv | direct path pointer declared at entry | (14, 111) -> (14, 111) | restored
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | zero limits initialized in default case | (4, 195) -> (18, 158) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | leading declarations with preserved assignment lifetimes | (0, 21) -> (0, 10) | kept
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | output pointer initialized at declaration | (0, 10) -> (2, 18) | restored
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | index initialization before component start | (0, 10) -> (0, 8) | kept
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | named component buffer pointer across parse calls | (0, 8) -> (9, 51) | restored
|
||||
|
||||
## /tmp/sol-init-decl
|
||||
|
||||
declaration block:
|
||||
char homePath[64] = {0};
|
||||
u32 nwc24IdHigh;
|
||||
u32 nwc24IdLow;
|
||||
DlTaskData* task;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
BOOL allowed;
|
||||
BOOL useContentFile;
|
||||
start (0, 31)
|
||||
best (0, 31) after 71 builds; source restored; best order was:
|
||||
char homePath[64] = {0};
|
||||
u32 nwc24IdHigh;
|
||||
u32 nwc24IdLow;
|
||||
DlTaskData* task;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
BOOL allowed;
|
||||
BOOL useContentFile;
|
||||
|
||||
## /tmp/sol-parse-decl
|
||||
|
||||
declaration block:
|
||||
s32 result = 0;
|
||||
char* start;
|
||||
char* afterEnd;
|
||||
char* cursor;
|
||||
size_t valueLength;
|
||||
size_t titleCount;
|
||||
start (0, 148)
|
||||
best (0, 148) after 36 builds; source restored; best order was:
|
||||
s32 result = 0;
|
||||
char* start;
|
||||
char* afterEnd;
|
||||
char* cursor;
|
||||
size_t valueLength;
|
||||
size_t titleCount;
|
||||
|
||||
## /tmp/sol-convert-decl
|
||||
|
||||
declaration block:
|
||||
char ascii[20];
|
||||
int componentStart;
|
||||
u8* output;
|
||||
int index;
|
||||
int count = 0;
|
||||
start (0, 10)
|
||||
best (0, 10) after 23 builds; source restored; best order was:
|
||||
char ascii[20];
|
||||
int componentStart;
|
||||
u8* output;
|
||||
int index;
|
||||
int count = 0;
|
||||
|
||||
Register-only declaration searches: SetDlInterval 71 builds, GetDlTask 13 builds, ExtendDlTaskList 23 builds, all restored without improvement.
|
||||
|
||||
Gate caveat: setUpdate_NoUpdateDialog_ is objdiff 100.0; odiff.dis reads the first operand of a CR1 conditional branch as its target, causing two address-dependent false differences. No change to this byte-exact function or to gate tools. Boot-version original symbol encodes only ESTitleVersion but its assembly receives context in r3 and title in r4. The readable source preserves both parameters; renaming or pinning symbols was excluded.
|
||||
|
||||
Final attempt audit: all 23 remaining objdiff-nonmatching functions have at least three distinct compiled source trials.
|
||||
|
||||
## Final remaining functions
|
||||
|
||||
NWC24InitDlTask | 98.923615% | register allocation, 144/144 instructions
|
||||
NWC24SetDlInterval | 99.89796% | final identifier register, 147/147 instructions
|
||||
NWC24IterateDlTask | 95.0% | loop entry branch and temporaries, 78/79 instructions
|
||||
NWC24UpdateDlTask | 94.17391% | stack frame and inline result/retry boundaries, 247/253 instructions
|
||||
NWC24AddDlTask | 97.552444% | timestamp helper lifetimes and extra branches, 146/143 instructions
|
||||
NWC24GetDlTask | 99.728264% | destination and identifier saved registers, 92/92 instructions
|
||||
NWC24PurgeOldestDlTask | 85.829544% | iteration initialization and removal helper boundaries, 171/176 instructions
|
||||
NWC24ManageDlTaskListForMenu | 96.74342% | removal helper result boundary, 150/152 instructions
|
||||
NWC24ExtendDlTaskList | 99.85401% | closing status saved register, 137/137 instructions
|
||||
NWC24iCheckDlHeaderConsistency | 98.77358% | entry assignment scheduling, 212/212 instructions
|
||||
AddTaskInternal | 93.57855% | URL and retry helper boundaries and candidate loop branches, 397/401 instructions
|
||||
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | 98.108406% | inline tag helper register allocation, 452/452 instructions
|
||||
__nupBase64Encode__FPUcPUcUl | 94.20635% | lookup/store scheduling and count lifetime, 63/63 instructions
|
||||
__nupGetBootVersion__FP14ESTitleVersion | None / no original-name symbol | original name missing; actual two-parameter ABI preserved; alternate-name body has 17 register differences
|
||||
__nupGetTitleSize__FP12NUPTitleInfo | 99.100716% | 64-bit accumulation scheduling and content helper registers, 139/139 instructions
|
||||
__nupOp | 98.8242% | boot version conversion branches and local initialization/lifetimes, 440/438 instructions
|
||||
createBrowser__Q33ipl5scene7SettingFv | 98.8505% | stack frame, direct-page switch and local lifetimes, 299/301 instructions
|
||||
draw__Q33ipl5scene7SettingFv | 91.03639% | texture/rectangle local layout, inline boundaries and render-mode copy, 598/632 instructions
|
||||
initKeyboard__Q33ipl5scene7SettingFPCc | 93.30986% | manager getter boundaries and defined defaults, 212/213 instructions
|
||||
calcKeyboard__Q33ipl5scene7SettingFv | 92.42069% | form dispatch, pointer lifetimes and vacancy branch, 289/290 instructions
|
||||
convertRevIP__Q33ipl5scene7SettingFPUcPCc | 98.15069% | register allocation, 73/73 instructions
|
||||
scanAP__Q33ipl5scene7SettingFv | 94.5625% | animation boolean materialization and argument/store order, 266/272 instructions
|
||||
setUSBAP__Q33ipl5scene7SettingFv | 98.070175% | target reloads completion byte, ours forwards first load, 56/57 instructions
|
||||
|
||||
Final source changes only: NWC24IterateDlTaskEx and __nupGetServerInfo, each objdiff 100.0, 145/145 instructions and ctxdiff diffs 0. All three pool_diff.py runs identical, NWC24Download 3 strings, nup 28 strings, iplSetting 108 strings. Raw bytes of setUpdate_NoUpdateDialog_ independently equal despite the gate decoder caveat. No source changes retained in iplSetting.
|
||||
|
||||
Source commits: 15d4e4b5, 4f34eabc. Final full gate follows.
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 4752/12496 data 80/80 functions 19/30 fuzzy 97.3566 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 19/30
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 97.3566
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 95.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 94.17391
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 85.829544
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 96.74342
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 4172/12496 data 80 functions 18 fuzzy 97.2654
|
||||
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/nup/nup] objdiff: code 5744/10764 data 1720/1720 functions 18/23 fuzzy 93.2516 linked code 0
|
||||
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 18/23
|
||||
[libs/RVL_SDK/src/nup/nup] section .data size 1592 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .rodata size 88 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sbss size 8 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .text size 10764 match 93.25158
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupBase64Encode__FPUcPUcUl 94.20635
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14ESTitleVersion None
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupOp 98.8242
|
||||
[libs/RVL_SDK/src/nup/nup] baseline: code 5164/10764 data 1720 functions 17 fuzzy 93.2479
|
||||
[src/scene/setting/iplSetting] pool: IDENTICAL
|
||||
[src/scene/setting/iplSetting] objdiff: code 30532/37884 data 1040/5696 functions 105/112 fuzzy 98.8008 linked code 0
|
||||
[src/scene/setting/iplSetting] instruction-exact functions: 104/112
|
||||
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
|
||||
[src/scene/setting/iplSetting] section .data size 4016 match 5.146636
|
||||
[src/scene/setting/iplSetting] section .rodata size 640 match 32.25412
|
||||
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
|
||||
[src/scene/setting/iplSetting] section .text size 37884 match 98.80076
|
||||
[src/scene/setting/iplSetting] below 100: createBrowser__Q33ipl5scene7SettingFv 98.8505
|
||||
[src/scene/setting/iplSetting] below 100: draw__Q33ipl5scene7SettingFv 91.03639
|
||||
[src/scene/setting/iplSetting] below 100: initKeyboard__Q33ipl5scene7SettingFPCc 93.30986
|
||||
[src/scene/setting/iplSetting] below 100: calcKeyboard__Q33ipl5scene7SettingFv 92.42069
|
||||
[src/scene/setting/iplSetting] below 100: convertRevIP__Q33ipl5scene7SettingFPUcPCc 98.15069
|
||||
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 94.5625
|
||||
[src/scene/setting/iplSetting] below 100: setUSBAP__Q33ipl5scene7SettingFv 98.070175
|
||||
[src/scene/setting/iplSetting] baseline: code 30532/37884 data 1040 functions 105 fuzzy 98.8008
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.76230 -> 86.80102
|
||||
global fuzzy_match_percent: 99.31232 -> 99.31272
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11031 -> 91.11031
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
61
tools/decomp-assist/sol-med.final.gate.txt
Normal file
61
tools/decomp-assist/sol-med.final.gate.txt
Normal file
@@ -0,0 +1,61 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 4752/12496 data 80/80 functions 19/30 fuzzy 97.3566 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 19/30
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 97.3566
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 95.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 94.17391
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 85.829544
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 96.74342
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 4172/12496 data 80 functions 18 fuzzy 97.2654
|
||||
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/nup/nup] objdiff: code 5744/10764 data 1720/1720 functions 18/23 fuzzy 93.2516 linked code 0
|
||||
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 18/23
|
||||
[libs/RVL_SDK/src/nup/nup] section .data size 1592 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .rodata size 88 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sbss size 8 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/nup/nup] section .text size 10764 match 93.25158
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupBase64Encode__FPUcPUcUl 94.20635
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14ESTitleVersion None
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
|
||||
[libs/RVL_SDK/src/nup/nup] below 100: __nupOp 98.8242
|
||||
[libs/RVL_SDK/src/nup/nup] baseline: code 5164/10764 data 1720 functions 17 fuzzy 93.2479
|
||||
[src/scene/setting/iplSetting] pool: IDENTICAL
|
||||
[src/scene/setting/iplSetting] objdiff: code 30532/37884 data 1040/5696 functions 105/112 fuzzy 98.8008 linked code 0
|
||||
[src/scene/setting/iplSetting] instruction-exact functions: 104/112
|
||||
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
|
||||
[src/scene/setting/iplSetting] section .data size 4016 match 5.146636
|
||||
[src/scene/setting/iplSetting] section .rodata size 640 match 32.25412
|
||||
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
|
||||
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
|
||||
[src/scene/setting/iplSetting] section .text size 37884 match 98.80076
|
||||
[src/scene/setting/iplSetting] below 100: createBrowser__Q33ipl5scene7SettingFv 98.8505
|
||||
[src/scene/setting/iplSetting] below 100: draw__Q33ipl5scene7SettingFv 91.03639
|
||||
[src/scene/setting/iplSetting] below 100: initKeyboard__Q33ipl5scene7SettingFPCc 93.30986
|
||||
[src/scene/setting/iplSetting] below 100: calcKeyboard__Q33ipl5scene7SettingFv 92.42069
|
||||
[src/scene/setting/iplSetting] below 100: convertRevIP__Q33ipl5scene7SettingFPUcPCc 98.15069
|
||||
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 94.5625
|
||||
[src/scene/setting/iplSetting] below 100: setUSBAP__Q33ipl5scene7SettingFv 98.070175
|
||||
[src/scene/setting/iplSetting] baseline: code 30532/37884 data 1040 functions 105 fuzzy 98.8008
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 86.76230 -> 86.80102
|
||||
global fuzzy_match_percent: 99.31232 -> 99.31272
|
||||
global complete_code_percent: 60.61288 -> 60.61288
|
||||
global matched_data_percent: 91.11031 -> 91.11031
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
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