Compare commits

...

13 Commits

Author SHA1 Message Date
coah
c403d9edcc cleanup(SettingButton): name deferred command ring buffer
Rename Unk/unk_* queue fields from usage as a circular command buffer:
- Unk → CmdEntry
- unk_0x64 → mCmdQueue
- unk_0x264 → mCmdCapacity
- unk_0x268 → mCmdCount
- unk_0x26C → mCmdReadIdx
- unk_0x270 → mCmdWriteIdx

Verified: SettingButton 100%/100%, build/43U/ok, DOL sha1
26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-02 14:03:03 -05:00
coah
2d9e3ee14a cleanup(eZiText): rename work unk_0x1A to separator (#854)
Init to space (0x20); Matching zi8space emits it; zi8cgetc saves as separator.
2026-10-02 14:00:30 -05:00
coah
23db5e05e1 cleanup(CDBCryptBuf): rename unk_0x3EC00/04 to size/offset (#853)
Decrypt fills size; Matching CDBRecordFile uses offset for seek/tell/read.
2026-10-02 14:00:24 -05:00
coah
741c9263e3 cleanup(iplSDButton): rename unk_0x54 to mAnimWait (#852)
Same pattern as Button: wait flag while help-button click anim plays.
2026-10-02 14:00:18 -05:00
coah
29fe1efaf2 Use the original Raku progress callback directly and link its thread (#851) 2026-10-02 13:32:07 -05:00
devin-ai-integration[bot]
45aaeb16b2 Link iplChannelTitle: emit gates + name 5 real .data objects (#834)
iplNand.h: IPL_CHANNEL_TITLE_NOVTABLE makes LangFile/LayoutFile virtuals
inline-only for this TU (orig emits their vtables elsewhere), while the
GUIManager.h/iplGuiManager.h gates no longer suppress ~Interface/
EventHandler/~PaneManager emission here - those vtables emit weakly as in
orig. config/43U/symbols.txt: name the 5 real emitted objects at
0x8164EFE4-0x8164F0B8 (dedup'd PaneManager/EventHandler/Interface/
LayoutFile/LangFile vtable emits) so objdiff's byte-diff range covers the
full .data extent; without names the compare stopped at 0x87c and the
extra emit range scored as inserts.

DOL sha1 identical, .data bytes + .rela.data set identical to orig, unit
all sections 100.

Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: coah80 <usernamecole7@gmail.com>
2026-10-02 13:26:47 -05:00
coah
e9114959c9 Retain original socket-option APIs and link matched routines (#848) 2026-10-02 13:20:27 -05:00
coah
1f0eb50f01 match(iplChannelSelect 102/102) (rt7b) (worker e0f02483) (#850) 2026-10-02 13:17:47 -05:00
coah
d93fb2d5f8 match(iplRakuRakuThread 14/14) (rt8b) (worker 8e747652) (#849) 2026-10-02 13:14:53 -05:00
coah
27abfe81d9 Link matched FAT allocation-chain routines (#847) 2026-10-02 13:10:48 -05:00
coah
bf6bc87fbd match(nup 20/23) (fz15h) (worker d8281f4c) (#846) 2026-10-02 13:01:18 -05:00
coah
786a2dd3e8 match(ATERM 17/26, zi8alpha 11/12) (fz20e) (worker 8133f528) (#845) 2026-10-02 12:55:03 -05:00
coah
bdd15186a7 match(pf_fat 35/35) (fz21e) (worker 4f270f72) (#844) 2026-10-02 12:48:07 -05:00
41 changed files with 7466 additions and 268 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.57% | 90.68% | 71.01% | 99.37% |
| 99.59% | 90.81% | 71.43% | 99.37% |
units 955/1027 complete, functions 12358/12563 matched.
units 956/1027 complete, functions 12365/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 -->

View File

@@ -11,6 +11,8 @@ splits: 'config/43U/splits.txt'
ldscript_template: 'config/ldscript_ipl2.lcf'
force_active:
- SOGetSockOpt
- SOSetInterfaceOpt
- fprintf
- leap_days
- __msl_time2tm

View File

@@ -87,7 +87,8 @@ m_allocator__Q23ipl5scene = .bss:0x810BD498; // type:object size:0x10
AOSSi_NcdIfConfig = .bss:0x810BD4A8; // type:object size:0x15E data:byte
AOSSi_NcdIpConfig = .bss:0x810BD608; // type:object size:0x7C4 data:4byte
sRakuAllocator = .bss:0x810BDDD0; // type:object size:0x10
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xC data:4byte
sRakuConfiguration = .bss:0x810BDDEC; // type:object size:0xE8
sRakuMsgQueue = .bss:0x810BDED4; // type:object size:0x20
AOSS_810BDEF8 = .bss:0x810BDEF8; // type:object size:0x20 data:4byte
AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
@@ -5158,7 +5159,7 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFP12RakuProgress = .text:0x813FDA04; // type:function size:0x6C scope:local
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
@@ -16149,6 +16150,11 @@ lbl_8164EF14 = .data:0x8164EF14; // type:object size:0x34
__vt__Q33ipl5scene27CsChanTtlButtonEventHandler = .data:0x8164EF48; // type:object size:0x1C
__vt__Q33ipl5scene24ChannelTitleEventHandler = .data:0x8164EF64; // type:object size:0x18
__vt__Q33ipl5scene12ChannelTitle = .data:0x8164EF7C; // type:object size:0x68
lbl_8164EFE4 = .data:0x8164EFE4; // type:object size:0x5C
lbl_8164F040 = .data:0x8164F040; // type:object size:0x18
lbl_8164F058 = .data:0x8164F058; // type:object size:0x20
lbl_8164F078 = .data:0x8164F078; // type:object size:0x20
lbl_8164F098 = .data:0x8164F098; // type:object size:0x20
@10125 = .data:0x8164F0B8; // type:object size:0xD scope:local data:string
...data.0 = .data:0x8164F0B8; // type:label scope:local
@10126 = .data:0x8164F0C5; // type:object size:0xD scope:local data:string

View File

@@ -772,7 +772,7 @@ config.libs = [
]
),
IPLSection("channelTitle", [
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
]
),
IPLSection("faceSelect", [
@@ -877,7 +877,7 @@ config.libs = [
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
Object(NonMatching, "scene/setting/AOSSLink.c"),
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
]
@@ -1098,7 +1098,7 @@ config.libs = [
Object(Matching, "so/SOCommon.c"),
Object(NonMatching, "so/SOBasic.c"),
Object(Matching, "so/SOInformation.c"),
Object(NonMatching, "so/SOOption.c"),
Object(Matching, "so/SOOption.c"),
]
),
RevoEXLib("ssl", [
@@ -1696,7 +1696,7 @@ config.libs = [
Object(Matching, "fa/pf_dir.c"),
Object(Matching, "fa/pf_entry.c"),
Object(Matching, "fa/pf_entry_iterator.c"),
Object(NonMatching, "fa/pf_fat.c"),
Object(Matching, "fa/pf_fat.c"),
Object(Matching, "fa/pf_fat12.c"),
Object(Matching, "fa/pf_fat16.c"),
Object(Matching, "fa/pf_fat32.c"),

View File

@@ -34,14 +34,14 @@ namespace gui {
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
virtual void draw() {} // 0x18 (0x06)
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
virtual ~Interface(); // 0x1C (0x07)
#else
virtual ~Interface() {} // 0x1C (0x07)
#endif
};
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
class __declspec(novtable) EventHandler {
#else
class EventHandler {

View File

@@ -24,7 +24,7 @@ namespace ipl {
mbDisableCon(bDisableCon) {}
#endif
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
virtual ~PaneManager();
#else
virtual ~PaneManager() {}

View File

@@ -145,7 +145,7 @@ namespace ipl {
ANIM_MAX,
};
int unk_0x54;
int mAnimWait;
layout::Object* mpLayout; // 0x58
nand::LayoutFile* mpLayoutFile; // 0x5C

View File

@@ -62,17 +62,17 @@ namespace ipl {
void start_left_event(const char* paneName);
void start_trig_event(const char* paneName);
typedef struct Unk {
typedef struct CmdEntry {
int command; // 0x00
u32 msgID; // 0x04
} Unk;
} CmdEntry;
Unk unk_0x64[64];
CmdEntry mCmdQueue[64];
int unk_0x264;
int unk_0x268;
int unk_0x26C;
int unk_0x270;
int mCmdCapacity;
int mCmdCount;
int mCmdReadIdx;
int mCmdWriteIdx;
int mSettingArg; // 0x274

View File

@@ -145,6 +145,13 @@ namespace ipl {
mpCommonFile = commonFile;
mpLangFile = langFile;
}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~LangFile() {}
virtual void read() {}
virtual bool isFinished() { return false; }
virtual int checkData() { return 0; }
virtual bool isFatalError() { return false; }
#else
virtual ~LangFile(); // 0x08
virtual void read(); // 0x0C
@@ -152,6 +159,7 @@ namespace ipl {
virtual bool isFinished(); // 0x14
virtual int checkData(); // 0x18
virtual bool isFatalError(); // 0x1C
#endif
File* getCmnFile() const { return mpCommonFile; }
File* getLangFile() const { return mpLangFile; }
@@ -165,7 +173,11 @@ namespace ipl {
public:
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~LayoutFile() {} // 0x08
#else
virtual ~LayoutFile(); // 0x08
#endif
};
} // namespace nand
} // namespace ipl

View File

@@ -314,7 +314,7 @@ namespace nw4r {
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
u32 glgrInnerLen;
HeaderedGlyphGroups* pGlgr;
ArchiveFontBinaryLayout* font;
const ArchiveFontBinaryLayout* font;
u8* glgrEnd;
u32 expectedMaxSize;
@@ -337,7 +337,7 @@ namespace nw4r {
// Copy the glgr to work
{
pGlgr = &font->glgr;
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
glgrEnd = (u8*)pGlgr + (u32)ctx->mNextBlockHdr.size;
memcpy(pGlgr, &ctx->mNextBlockHdr, sizeof(BinaryBlockHeader));
@@ -382,7 +382,7 @@ namespace nw4r {
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
pGlgr = &font->glgr;
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
// return CONSTRUCT_STATE_FATAL_ERR;

View File

@@ -224,7 +224,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -238,7 +238,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -252,7 +252,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -266,7 +266,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -345,7 +345,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
red = blue + redOffset;
green = blue + greenOffset;
blue = blue + blueOffset;
if ((blue | red | green) >> 8) {
if ((green | red | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -415,7 +415,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -426,7 +426,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -502,7 +502,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
red = value + redOffset;
blue = value + blueOffset;
green = value + greenOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -578,7 +578,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -593,7 +593,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -660,7 +660,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
s32 green = value + greenOffset;
s32 red = value + redOffset;
s32 blue = value + blueOffset;
if ((blue | red | green) >> 8) {
if ((green | red | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -742,7 +742,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -831,7 +831,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;
@@ -863,7 +863,7 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
u8* cb;
u8* cr;
TMCCJPEGDecState* state;
s8 crValue;
s32 crValue;
s32 height;
s32 width;
s32 column;
@@ -896,10 +896,10 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
cbValue = (s8)*cb++;
crValue = (s8)*cr++;
value = *luminance++;
green = value + (-(crValue * 183 + cbValue * 88) >> 8);
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
red = value + ((crValue * 359) >> 8);
blue = value + ((cbValue * 454) >> 8);
if ((blue | green | red) >> 8) {
if ((red | green | blue) >> 8) {
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
green = green > 255 ? 255 : green < 0 ? 0 : green;
red = red > 255 ? 255 : red < 0 ? 0 : red;

View File

@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
ziU8 unk_0x17;
ziU8 subLanguage; // 0x18
ziU8 unk_0x19;
ziU16 unk_0x1A;
ziU16 separator; // 0x1A
ziU8 unk_0x1C[3];
ziU8 unk_0x1F;
ziU16 unk_0x20[0x40];

View File

@@ -940,8 +940,7 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
for (tableIndex = 0; tableIndex < params->count;) {
while (*output != 0) {
if (*output != 0x27) {
*output |= 0xf300;
output++;
*output++ |= 0xf300;
} else {
*output++ = 0xf360;
}
@@ -1004,7 +1003,7 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
totalCandidates = totalCandidates + 1;
if (options->countOnly == 0) {
output += phoneticIndex + 1;
candidateCount = candidateCount + 1;
++candidateCount;
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
if (candidateCount >= params->maxCandidates) goto finishSpelling;
} else {

View File

@@ -285,9 +285,9 @@ static ziBool ZiIsLetterHyphen(ziWChar character ZI_NEED_WORK) {
else return ZI8_FALSE;
}
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ziPtr work) {
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ZiAlphaWork* work) {
enum { LOWER_CASE, UPPER_CASE } upper = LOWER_CASE;
if (((ZiAlphaWork*)work)->caseMode == 3) {
if (work->caseMode == 3) {
Zi8ChangeCharCase(1, word++, language, work);
} else if (((ZiAlphaWork*)work)->caseMode == 1) {
upper = UPPER_CASE;

View File

@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
}
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
++spelling;
}
if (!*spelling || spelling == end) {
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
return 1;
}
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
break;
}
if (*spelling != *candidate) {
@@ -2868,7 +2868,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
ziU8 count;
ziWChar spacedElements[256];
struct { ziWChar separator; } savedState;
savedState.separator = ZI_WORK->unk_0x1A;
savedState.separator = ZI_WORK->separator;
if (elementCount <= 1 || !charCount) {
return elementCount;
}
@@ -2881,9 +2881,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
if (spacedIndex == elementCount) {
return elementCount;
}
ZI_WORK->unk_0x1A = 0xF360;
ZI_WORK->separator = 0xF360;
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
ZI_WORK->unk_0x1A = savedState.separator;
ZI_WORK->separator = savedState.separator;
spacedIndex = elementIndex = count = 0;
while (charCount && elementIndex < elementCount) {
if (spacedElements[spacedIndex] == 0xF360) {

View File

@@ -21,7 +21,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
ZI_WORK->unk_0x0A = 0xFF;
ZI_WORK->unk_0x10 = 0x64;
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
ZI_WORK->unk_0x1A = 0x20;
ZI_WORK->separator = 0x20;
ZI_WORK->unk_0x1C[2] = 0;
ZI_WORK->unk_0x1B30 = 0;
ZI_WORK->unk_0x1B3A = 0;

View File

@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
}
if (pdst[k - 1] != 0xF360 &&
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
pdst[k++] = ZI_WORK->unk_0x1A;
pdst[k++] = ZI_WORK->separator;
}
psrc += i;
n -= i;

View File

@@ -550,7 +550,15 @@ pf_s32 PFCACHE_DoWriteSector(PF_VOLUME* p_vol, PF_CACHE_PAGE** pp_head, const pf
#pragma dont_inline reset
#pragma dont_inline on
static inline pf_u32 PFCACHE_RecordPageEndOverlap(PF_CACHE_PAGE* p_page, pf_u32 end_sector, pf_u32* p_num_success, pf_u32* p_num_rest_sector) {
pf_u32 last_sector = end_sector - 1;
pf_u32 num_overlap = end_sector - p_page->sector;
*p_num_success += num_overlap;
*p_num_rest_sector -= num_overlap;
p_page->stat |= 2;
return last_sector;
}
pf_s32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded(PF_VOLUME* p_vol, PF_CACHE_PAGE** pp_head, const pf_u8* p_buf, pf_u32 sector,
pf_u32 num_sector, pf_u32* p_num_success) {
PF_CACHE_PAGE* p_page = PF_NULL;
@@ -609,11 +617,9 @@ pf_s32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded(PF_VOLUME* p_vol, PF_CACHE_PAGE**
(p_page->sector + p_page->size) >= (sector + num_sector)) {
pf_memcpy(p_page->buffer, (pf_u8*)&p_buf[(p_page->sector - sector) << p_vol->bpb.log2_bytes_per_sector],
(sector + num_sector - p_page->sector) << p_vol->bpb.log2_bytes_per_sector);
num_overlap = p_page->size - ((p_page->sector + p_page->size) - (num_sector + sector));
last_sector = p_page->sector + num_overlap - 1;
*p_num_success += num_overlap;
num_rest_sector -= num_overlap;
p_page->stat |= 2;
num_overlap = num_sector;
num_overlap += sector;
last_sector = PFCACHE_RecordPageEndOverlap(p_page, num_overlap, p_num_success, &num_rest_sector);
p_ebuf = &p_page->buffer[(last_sector - p_page->sector) << p_vol->bpb.log2_bytes_per_sector];
p_page->p_mod_sbuf = p_page->buffer;
if (p_page->p_mod_ebuf == NULL || p_page->p_mod_ebuf < p_ebuf) {

View File

@@ -1458,6 +1458,19 @@ s32 PFFAT_CountFreeClusters(PF_VOLUME* volume, u32* numFreeClusters)
return 0;
}
static inline s32 PFFAT_ClearEntryWithBuf(PF_VOLUME* volume, u32 cluster, PF_CACHE_PAGE* page) {
switch (volume->bpb.fat_type) {
case FAT_12:
return PFFAT12_WriteFATEntryWithBuf(volume, (u16)cluster, 0, page);
case FAT_16:
return PFFAT16_WriteFATEntryWithBuf(volume, cluster, 0, page);
case FAT_32:
return PFFAT32_WriteFATEntryWithBuf(volume, cluster, 0, page);
default:
return 15;
}
}
s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
u32 size)
{
@@ -1523,9 +1536,9 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
}
if (nextCluster == 0) {
s32 firstFlushError;
PF_CACHE_PAGE* flushPage;
u16 fatIndex;
u32 fatSector;
u16 fatIndex;
const PF_CACHE_PAGE* flushPage;
firstFlushError = 0;
flushPage = page;
@@ -1546,33 +1559,19 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
PFCACHE_FreeDataPage(volume, page);
return 0;
}
if (chainIndex != -1) {
error = PFFAT_WriteClusterWithBuf(file, startCluster, chainIndex,
0, 1, page);
chainIndex++;
} else {
currentPage = page;
switch (volume->bpb.fat_type) {
case FAT_12:
error = PFFAT12_WriteFATEntryWithBuf(
volume, (u16)startCluster, 0, currentPage);
break;
case FAT_16:
error = PFFAT16_WriteFATEntryWithBuf(volume, startCluster, 0,
currentPage);
break;
case FAT_32:
error = PFFAT32_WriteFATEntryWithBuf(volume, startCluster, 0,
currentPage);
break;
default:
error = 15;
break;
{
s32 writeError;
if (chainIndex != -1) {
writeError = PFFAT_WriteClusterWithBuf(file, startCluster, chainIndex,
0, 1, page);
chainIndex++;
} else {
writeError = PFFAT_ClearEntryWithBuf(volume, startCluster, page);
}
if (writeError != 0) {
PFCACHE_FreeDataPage(volume, page);
return writeError;
}
}
if (error != 0) {
PFCACHE_FreeDataPage(volume, page);
return error;
}
if (size != 0 && fileSize != 0) {
if (fileSize <= clusterSize) {
@@ -1590,7 +1589,7 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
s32 firstFlushError;
u32 fatSector;
u16 fatIndex;
PF_CACHE_PAGE* flushPage;
const PF_CACHE_PAGE* flushPage;
firstFlushError = 0;
flushPage = page;

View File

@@ -484,6 +484,7 @@ static inline unsigned long __nupBase64EncodedSize(unsigned long length) {
}
static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
static char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
u8* end = input + length;
u32 value = 0;
u32 count = 0;
@@ -496,26 +497,19 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
if (count < 3) {
continue;
}
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
output[1] = encodedSecond;
u8 encodedFourth = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value & 0x3f];
output[2] = encodedThird;
output[3] = encodedFourth;
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
output[2] = alphabet[value >> 6 & 0x3f];
output[3] = alphabet[value & 0x3f];
count = 0;
output += 4;
}
if (count == 2) {
value <<= 8;
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
output[1] = encodedSecond;
output[2] = encodedThird;
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
output[2] = alphabet[value >> 6 & 0x3f];
output[3] = fillByte;
return;
}
@@ -523,10 +517,8 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
return;
}
value <<= 16;
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
output[1] = encodedSecond;
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
output[2] = fillByte;
output[3] = fillByte;
}

View File

@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
u32 buffer32[0xFB00];
}; // 0x00
u32 unk_0x3EC00;
u32 unk_0x3EC04;
u32 size; // 0x3EC00
u32 offset; // 0x3EC04
BOOL allocated; // 0x3EC08
u8 unk_0x3EC0C[0x34];
} CDBCryptBuf;

View File

@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
goto open_result_ready;
open_location_ok:
if (CDBFSSDIsMounted()) {
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
} else {
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
}
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return err;
}
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
cryptBuf->offset = sizeof(CDBAttrBuf);
}
return CDB_ERROR_OK;
}
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
goto result_ready;
location_ok:
if (CDBFSSDIsMounted()) {
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
} else {
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
}
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return result;
}
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
cryptBuf->offset = sizeof(CDBAttrBuf);
}
return CDB_ERROR_OK;
}

View File

@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) {
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
if (cryptBuf->unk_0x3EC00 < unk) {
u32 unk = cryptBuf->size - cryptBuf->offset;
if (cryptBuf->size < unk) {
unk = 0;
}
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
}
if (unk != 0) {
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
cryptBuf->unk_0x3EC04 += unk;
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
cryptBuf->offset += unk;
}
if (readSize != NULL) {
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
if (cryptBuf != NULL) {
switch (seek) {
case CDB_SEEK_BEGIN: {
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
cryptBuf->unk_0x3EC04 += offset;
cryptBuf->offset = sizeof(CDBAttrBuf);
cryptBuf->offset += offset;
break;
}
case CDB_SEEK_END: {
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
cryptBuf->offset = (cryptBuf->size - 1) - offset;
break;
}
case CDB_SEEK_CUR: {
cryptBuf->unk_0x3EC04 += offset;
cryptBuf->offset += offset;
break;
}
}
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) {
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
return cryptBuf->offset - sizeof(CDBAttrBuf);
}
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
}

View File

@@ -23,8 +23,7 @@ static int ReadHeaderChar(const NHTTPResponseInfo* response, NHTTPi_HDRBUFLIST**
}
static int LowerCase(int character) {
if((character>='A') & (character<='Z')) character+=32;
return character;
return ((character >= 'A') & (character <= 'Z')) ? character + 32 : character;
}
s32 NHTTPi_findNextLineHdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, s32* colon, s32* newlineLength) {
@@ -76,15 +75,17 @@ s32 NHTTPi_skipSpaceHdrRecvBuf(const NHTTPResponseInfo* response, s32 position,
s32 NHTTPi_compareTokenN_HdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, const char* token, s8 delimiter) {
NHTTPi_HDRBUFLIST* block;
s32 offset;
s8 character;
if(position>=limit) return -1;
FindHeaderBlock(response,position,&block,&offset);
character=ReadHeaderChar(response,&block,&offset);
while(LowerCase(character)==LowerCase(*token)) {
if(*token==0 || *token==' ' || *token==delimiter || position==limit-1) return 0;
character=ReadHeaderChar(response,&block,&offset);
++position;
++token;
int character;
if (position < limit) {
FindHeaderBlock(response, position, &block, &offset);
character = ReadHeaderChar(response, &block, &offset);
while (LowerCase((s8)character) == LowerCase(*token)) {
if (*token == 0 || *token == ' ' || *token == delimiter || position == limit - 1) return 0;
character = ReadHeaderChar(response, &block, &offset);
++position;
++token;
}
}
return -1;
}

View File

@@ -638,7 +638,7 @@ namespace ipl {
void ChannelObj::setLangPane(const layout::Object* layout) {
int lang = System::getLanguage();
const char* langGroup = scLangGroups[lang];
char langCodeBuf[40] = "";
char langCodeBuf[10][4] = {""};
bool foundLangGroup = false;
@@ -648,7 +648,7 @@ namespace ipl {
} else {
bool isNonRsoGroup = true;
for (int i = 0; i < channel::MAX_ANIMS; i++) {
char name[6];
char name[8];
sprintf(name, "Rso%d", i);
if (strncmp(it->GetName(), name, 5) == 0) {
isNonRsoGroup = false;
@@ -663,8 +663,8 @@ namespace ipl {
for (int i = 0; i < 10; i++) {
if (strncmp(it->GetName(), scLangGroups[i], 3) == 0) {
memcpy(&langCodeBuf[i], it->GetName(), 3);
langCodeBuf[i + 3] = 0;
memcpy(langCodeBuf[i], it->GetName(), 3);
langCodeBuf[i][3] = 0;
break;
}
}
@@ -680,16 +680,15 @@ namespace ipl {
} else {
s32 region = System::getRegion();
for (int i = 0; i < channel::MAX_ANIMS; i++) {
char* groupName = (char*)scModuleData.langGroupLookup[region][i];
if (groupName != NULL) {
if (strcmp(groupName, &langCodeBuf[scLangLookup[region][i]]) == 0) {
nw4r::lyt::Group* group = layout->FindGroupByName(groupName);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(true);
}
if (scModuleData.langGroupLookup[region][i] == NULL) {
break;
}
if (strcmp(scModuleData.langGroupLookup[region][i], langCodeBuf[scLangLookup[region][i]]) == 0) {
nw4r::lyt::Group* group = layout->FindGroupByName(scModuleData.langGroupLookup[region][i]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
}
break;
}
}
}

View File

@@ -1901,64 +1901,59 @@ namespace ipl {
nw4r::ut::Rect projRect;
System::getProjectionRect(&projRect);
GXRenderModeObj* rMode = System::getRenderModeObj();
f32 var_f29;
f32 var_f30;
f32 var_f31;
f32 var_f1;
u16 var_r0;
u16 var_r3;
f32 scissorX;
f32 scissorY;
f32 scissorWidth;
f32 scissorHeight;
u16 fbWidth;
u16 efbHeight;
if (mState == STATE_NORMAL_FADE_ZOOM || mState == STATE_NORMAL_DONE_FADE_ZOOM || mState == STATE_NORMAL_RESTART) {
nw4r::math::MTX44 mtx;
f32 rightScale = projRect.right / unk_0xE4.x;
f32 leftScale = projRect.left / unk_0xE4.x;
f32 topScale = projRect.top / unk_0xE4.y;
f32 bottomScale = projRect.bottom / unk_0xE4.y;
f32 bottom = unk_0xD8.y - bottomScale;
f32 right = unk_0xD8.x + rightScale;
f32 left = unk_0xD8.x + leftScale;
f32 top = unk_0xD8.y - topScale;
f32 right = unk_0xD8.x + projRect.right / unk_0xE4.x;
f32 left = unk_0xD8.x + projRect.left / unk_0xE4.x;
f32 bottom = unk_0xD8.y - projRect.bottom / unk_0xE4.y;
f32 top = unk_0xD8.y - projRect.top / unk_0xE4.y;
MTXOrtho(mtx, top, bottom, left, right, -100.0f, 100.0f);
nw4r::math::VEC4 vec4_in(vec.x, vec.y, 0.0f, 1.0f);
nw4r::math::VEC4 vec4;
nw4r::math::VEC4Transform(&vec4, &mtx, &vec4_in);
var_r0 = rMode->fbWidth;
var_r3 = rMode->efbHeight;
var_f29 = projRect.GetWidth();
var_f30 = (var_r3 - ((1.0f + vec4.y) * var_r3 / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
f32 temp_f7_2 = var_r0 / var_f29;
var_f31 = ((1.0f + vec4.x) * var_r0 / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (temp_f7_2));
var_f29 = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (var_r0 / var_f29);
var_f1 = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
fbWidth = rMode->fbWidth;
efbHeight = rMode->efbHeight;
f32 projectionWidth = projRect.GetWidth();
scissorX = ((1.0f + vec4.x) * fbWidth / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth));
scissorY = (efbHeight - ((1.0f + vec4.y) * efbHeight / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
scissorWidth = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth);
scissorHeight = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
} else {
var_r0 = rMode->fbWidth;
var_r3 = rMode->efbHeight;
var_f31 = ((f32)var_r0 / 2) + ((vec.x - mChanThumbOff_X) * (var_r0 / projRect.GetWidth()));
var_f30 = (((f32)var_r3 / 2) - vec.y) - mChanThumbOff_Y;
var_f29 = 2.0f * mChanThumbOff_X * (var_r0 / projRect.GetWidth());
var_f1 = 2.0f * mChanThumbOff_Y;
fbWidth = rMode->fbWidth;
efbHeight = rMode->efbHeight;
scissorX = ((f32)fbWidth / 2) + ((vec.x - mChanThumbOff_X) * (fbWidth / projRect.GetWidth()));
scissorY = (((f32)efbHeight / 2) - vec.y) - mChanThumbOff_Y;
scissorWidth = 2.0f * mChanThumbOff_X * (fbWidth / projRect.GetWidth());
scissorHeight = 2.0f * mChanThumbOff_Y;
}
var_f31 -= 1.0f;
var_f30 -= 1.0f;
var_f29 += 2.0f;
var_f1 += 2.0f;
if (var_f31 >= var_r0 || (var_f31 + var_f29) <= 0.0f || var_f30 >= var_r3 || (var_f30 + var_f1) <= 0.0f) {
scissorX -= 1.0f;
scissorY -= 1.0f;
scissorWidth += 2.0f;
scissorHeight += 2.0f;
if (scissorX >= fbWidth || (scissorX + scissorWidth) <= 0.0f || scissorY >= efbHeight || (scissorY + scissorHeight) <= 0.0f) {
GXSetScissor(0, 0, 0, 0);
} else {
if (var_f31 < 0.0f) {
var_f29 += var_f31;
var_f31 = 0.0f;
if (scissorX < 0.0f) {
scissorWidth += scissorX;
scissorX = 0.0f;
}
if (var_f30 < 0.0f) {
var_f1 += var_f30;
var_f30 = 0.0f;
if (scissorY < 0.0f) {
scissorHeight += scissorY;
scissorY = 0.0f;
}
if ((var_f31 + var_f29) > 1705.0f) {
var_f29 -= (var_f31 + var_f29) - 1705.0f;
if ((scissorX + scissorWidth) > 1705.0f) {
scissorWidth -= (scissorX + scissorWidth) - 1705.0f;
}
if ((var_f30 + var_f1) > 1705.0f) {
var_f1 -= (var_f30 + var_f1) - 1705.0f;
if ((scissorY + scissorHeight) > 1705.0f) {
scissorHeight -= (scissorY + scissorHeight) - 1705.0f;
}
GXSetScissor(var_f31, var_f30, var_f29, var_f1);
GXSetScissor(scissorX, scissorY, scissorWidth, scissorHeight);
}
}

View File

@@ -20,7 +20,7 @@
#include <private/os.h>
#include <private/wpad.h>
#pragma dont_instantiate ipl::math::HermiteIntp<float>
#undef IPL_CHANNEL_TITLE_NOVTABLE

View File

@@ -31,7 +31,7 @@ namespace ipl {
};
// clang-format on
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(0) {
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
for (int i = 0; i < 2; i++) {
@@ -114,10 +114,10 @@ namespace ipl {
}
void SDButton::calc() {
if (unk_0x54 == 1) {
if (mAnimWait == 1) {
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
reset_gui();
unk_0x54 = 0;
mAnimWait = 0;
}
}
@@ -347,7 +347,7 @@ namespace ipl {
switch (animNo) {
case IDANIM_HELP_BTN_CLICK: {
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
unk_0x54 = 1;
mAnimWait = 1;
break;
}
case IDANIM_ARROW_RIGHT_CLICK: {

View File

@@ -1647,7 +1647,10 @@ s32 ATERMRunConfigProtocol(void) {
SONtoHs(option->length);
optionValue = option->value;
}
if (optionValue != NULL && optionType == 0x101) {
if (optionValue == NULL || optionType != 0x101) {
break;
}
{
AtermProgress progress;
u32 authenticationTime = (u32)(OSGetTime() /
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
@@ -1900,7 +1903,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
u64 passBase = (u64)(s64)blockCount * (u64)(s64)pass;
u8* stateBytes = block.bytes;
outputBlock = destinationBytes + blockOffset;
outputBlock = (u8*)(destination + blockOffset / 2);
memcpy(stateBytes + 8, outputBlock, 8);
ATERMAesEncryptBlock(expandedKey, rounds, stateBytes, stateBytes);
counter.value = (u64)(s64)blockIndex + passBase;

View File

@@ -30,12 +30,10 @@ namespace ipl {
namespace scene {
extern "C" MEMAllocator sRakuAllocator;
MEMAllocator sRakuAllocator;
struct RakuStatus {
RakuProgress progress;
RakuConfiguration configuration;
};
extern "C" RakuStatus sRakuStatus;
RakuStatus sRakuStatus;
extern "C" RakuProgress sRakuStatus;
RakuProgress sRakuStatus;
extern "C" RakuConfiguration sRakuConfiguration;
RakuConfiguration sRakuConfiguration;
extern "C" OSMessageQueue sRakuMsgQueue;
OSMessageQueue sRakuMsgQueue;
static u32 startTimeHigh = 0;
@@ -61,8 +59,7 @@ public:
virtual ~RakuRakuThread();
virtual void* Run();
virtual void unk_0x2C() = 0;
void syncRakuProgress();
static void progressCallback(RakuProgress* progress);
static void syncRakuProgress(RakuProgress* progress);
void destroy();
int start();
int getState();
@@ -79,19 +76,15 @@ private:
MEMHeapHandle mHeap;
};
void RakuRakuThread::syncRakuProgress() {
void RakuRakuThread::syncRakuProgress(RakuProgress* progress) {
BOOL interrupts = OSDisableInterrupts();
sRakuStatus.progress = *(RakuProgress*)this;
sRakuStatus = *progress;
OSTime time = OSGetTime();
startTimeHigh = time >> 32;
startTimeLow = time;
OSRestoreInterrupts(interrupts);
}
void RakuRakuThread::progressCallback(RakuProgress* progress) {
((RakuRakuThread*)progress)->syncRakuProgress();
}
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
u32 version = ATERMi_ApConfigGetVersion();
if (((version >> 12) & 15) * 10 + ((version >> 8) & 15) != 1) {
@@ -148,14 +141,14 @@ int RakuRakuThread::start() {
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
active = true;
mFinished = 0;
memset(&sRakuStatus.configuration, 0, sizeof(RakuConfiguration));
memset(&sRakuStatus.progress, 0, sizeof(RakuProgress));
memset(&sRakuConfiguration, 0, sizeof(RakuConfiguration));
memset(&sRakuStatus, 0, sizeof(RakuProgress));
SOLibraryConfig socketConfig;
socketConfig.alloc = RakuSocketAlloc;
socketConfig.free = RakuSocketFree;
SOInit(&socketConfig);
ATERMi_ApConfigStart(mPriority, 200,
progressCallback,
syncRakuProgress,
RakuAtermAlloc, RakuAtermFree, 4096);
if (!mRunning) {
mRunning = 1;
@@ -207,7 +200,7 @@ int RakuRakuThread::getState() {
return 0;
}
BOOL interrupts = OSDisableInterrupts();
switch (sRakuStatus.progress.state) {
switch (sRakuStatus.state) {
case 1: displayState = 1; break;
case 2: displayState = 2; break;
case 3: displayState = 2; break;
@@ -229,6 +222,30 @@ int RakuRakuThread::cancel() {
return OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
}
inline void copyRakuPrivacy(NCDApConfig* config, const RakuConfiguration* settings) {
if (settings->security == 1) {
config->privacy.mode = 1;
config->privacy.wep40.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep40.key[index], settings->wepKeys[index], 5);
}
} else if (settings->security == 2) {
config->privacy.mode = 2;
config->privacy.wep104.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep104.key[index], settings->wepKeys[index], 13);
}
} else if (settings->security == 4) {
config->privacy.mode = 4;
memcpy(config->privacy.tkip.key, settings->passphrase, 64);
config->privacy.tkip.keyLen = strlen(settings->passphrase);
} else if (settings->security == 5) {
config->privacy.mode = 6;
memcpy(config->privacy.aes.key, settings->passphrase, 64);
config->privacy.aes.keyLen = strlen(settings->passphrase);
}
}
int RakuRakuThread::finish(NCDApConfig* config, int* result) {
if (!active) {
if (result != NULL) {
@@ -236,49 +253,29 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
}
return 1;
}
s32 state = sRakuStatus.progress.state;
if ((u32)(state - 6) > 1) {
return 0;
}
if (!mFinished) {
if (state == 6) {
ATERMi_ApConfigGetResult(&sRakuStatus.configuration);
printInfo();
s32 state = sRakuStatus.state;
if ((u32)(state - 6) <= 1) {
if (!mFinished) {
if (state == 6) {
ATERMi_ApConfigGetResult(&sRakuConfiguration);
printInfo();
}
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
return 0;
}
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
SOFinish();
active = false;
destroy();
} else {
return 0;
}
SOFinish();
active = false;
destroy();
if (config != NULL) {
RakuConfiguration* settings = &sRakuStatus.configuration;
memcpy(config->ssid, settings->ssid, 32);
config->ssidLength = strlen(settings->ssid);
if (settings->security == 1) {
config->privacy.mode = 1;
config->privacy.wep40.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep40.key[index], settings->wepKeys[index], 5);
}
} else if (settings->security == 2) {
config->privacy.mode = 2;
config->privacy.wep104.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep104.key[index], settings->wepKeys[index], 13);
}
} else if (settings->security == 4) {
config->privacy.mode = 4;
memcpy(config->privacy.tkip.key, settings->passphrase, 64);
config->privacy.tkip.keyLen = strlen(settings->passphrase);
} else if (settings->security == 5) {
config->privacy.mode = 6;
memcpy(config->privacy.aes.key, settings->passphrase, 64);
config->privacy.aes.keyLen = strlen(settings->passphrase);
}
memcpy(config->ssid, sRakuConfiguration.ssid, 32);
config->ssidLength = strlen(sRakuConfiguration.ssid);
copyRakuPrivacy(config, &sRakuConfiguration);
}
if (result != NULL) {
*result = sRakuStatus.progress.result;
*result = sRakuStatus.result;
}
return 1;
}

View File

@@ -15,10 +15,10 @@ namespace ipl {
// clang-format on
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
unk_0x264 = 64;
unk_0x268 = 0;
unk_0x26C = 0;
unk_0x270 = 0;
mCmdCapacity = 64;
mCmdCount = 0;
mCmdReadIdx = 0;
mCmdWriteIdx = 0;
mSettingArg = arg;
mpLayout = NULL;
mpLayoutFile = NULL;
@@ -81,8 +81,8 @@ namespace ipl {
FaderSceneCommand SettingButton::calcNormal() {
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
Unk unk = unk_0x64[unk_0x26C];
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mCmdCount != 0) {
CmdEntry unk = mCmdQueue[mCmdReadIdx];
switch (unk.command) {
case CMD_SHOW_BTN: {
showBtn();
@@ -98,11 +98,11 @@ namespace ipl {
}
}
if (unk_0x268 != 0) {
if (++unk_0x26C >= unk_0x264) {
unk_0x26C = 0;
if (mCmdCount != 0) {
if (++mCmdReadIdx >= mCmdCapacity) {
mCmdReadIdx = 0;
}
unk_0x268--;
mCmdCount--;
}
}
@@ -225,16 +225,16 @@ namespace ipl {
}
void SettingButton::reserve(int command, u32 msgId) {
if (unk_0x264 != unk_0x268) {
int unk = unk_0x270;
unk_0x64[unk].command = command;
unk_0x64[unk].msgID = msgId;
unk_0x270++;
if (mCmdCapacity != mCmdCount) {
int unk = mCmdWriteIdx;
mCmdQueue[unk].command = command;
mCmdQueue[unk].msgID = msgId;
mCmdWriteIdx++;
if (unk_0x270 >= unk_0x264) {
unk_0x270 = 0;
if (mCmdWriteIdx >= mCmdCapacity) {
mCmdWriteIdx = 0;
}
unk_0x268++;
mCmdCount++;
}
}

View File

@@ -3939,3 +3939,924 @@ Zi8PrepareMatch 96.319145%: target component branch stores a local flag absent i
Changed files: libs/RevoEX/src/nwc24/NWC24MsgCommit.c; libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8.c; tools/decomp-assist/fz15.attempts.md. Exact source commits: 36ff398b and e4b0d291. Final log-only commit follows this audit.
Uncertainty: original source forms for converter shared-base preservation, keyboard allocator/LED loop behavior, and the zprepare component branch remain unresolved. No unsupported volatile declaration or dummy component flag added. zprepare data remains 8/68 because the unpaired compiler table points into nonexact code, with no legitimate stable source-name rename or extent correction.
# Xhigh continuation fz15h
Starting fresh branch agent/w1002/sol-fz15h-xhigh from 0d9b03878228a086954abc59b964164b0f7db5f2. Read AGENTS.md and unslop. Six units owned; NWC18/18 is landed and outside this round.
Initial pool libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8: POOL IDENTICAL up to 0 (mine=0 base=0)
Initial pool libs/RVL_SDK/src/kbd/kbd_lib: POOL IDENTICAL up to 0 (mine=0 base=0)
Initial pool libs/RVLMiddleware/eZiText/src/clib/zprepare: POOL IDENTICAL up to 0 (mine=0 base=0)
Initial pool libs/RVLMiddleware/eZiText/src/clib/zi8match: POOL IDENTICAL up to 0 (mine=0 base=0)
Initial pool src/keyboard/tiCellPhone: POOL IDENTICAL up to 76 (mine=76 base=76)
Initial pool libs/RVL_SDK/src/nup/nup: POOL IDENTICAL up to 28 (mine=28 base=28)
## fz15h TMCJPEGDEC_set_converterY8U8V8 diagnosis
Origin body unchanged after fetch. 195/196 instructions; structural/exact (41, 195); first differences [(1, ('stw', 'r31, 0xc(r1)'), ('addi', 'r4, r3, 0x1858')), (2, ('lbz', 'r0, 0x17fc(r3)'), ('stw', 'r31, 0xc(r1)')), (3, ('lwz', 'r4, 0x19e4(r3)'), ('lbz', 'r0, 0x17fc(r3)')), (4, ('cmpwi', 'r0, 3'), ('lwz', 'r5, 0x19e4(r3)')), (5, ('beq', '324'), ('cmpwi', 'r0, 3')), (6, ('bge', '28'), ('beq', '324'))].
src 0x30c base 0x310 insns 195/196
--- insert mine 1:1 base 1:2
B 1 addi r4, r3, 0x1858
--- replace mine 3:4 base 4:5
M 3 lwz r4, 0x19e4(r3)
B 4 lwz r5, 0x19e4(r3)
--- replace mine 18:19 base 19:108
M 18 addi r11, r3, 0x185c
B 19 addi r11, r4, 4
B 20 lis r31, 0
B 21 lis r12, 0
B 22 add r10, r11, r0
B 23 addi r7, r4, 0x104
B 24 add r9, r10, r0
B 25 addi r6, r4, 0x144
B 26 add r8, r9, r0
B 27 addi r31, r31, 0
B 28 addi r12, r12, 0
B 29 li r4, 0x20
B 30 li r0, 0
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h kbdEventHandler diagnosis
Origin body unchanged after fetch. 186/186 instructions; structural/exact (0, 5); first differences [(35, ('lbz', 'r3, 2(r4)'), ('lbz', 'r5, 2(r4)')), (36, ('lis', 'r30, 0'), ('lis', 'r3, 0')), (38, ('addi', 'r0, r3, 0xff'), ('addi', 'r0, r5, 0xff')), (39, ('addi', 'r30, r30, 0'), ('addi', 'r3, r3, 0')), (42, ('add', 'r30, r30, r4'), ('add', 'r30, r3, r4'))].
src 0x2e8 base 0x2e8 insns 186/186
diffs 5: [35, 36, 38, 39, 42]
35 M lbz r3, 2(r4)
B lbz r5, 2(r4)
36 M lis r30, 0
B lis r3, 0
38 M addi r0, r3, 0xff
B addi r0, r5, 0xff
39 M addi r30, r30, 0
B addi r3, r3, 0
42 M add r30, r30, r4
B add r30, r3, r4
## fz15h kbdProcMod diagnosis
Origin body unchanged after fetch. 256/256 instructions; structural/exact (0, 4); first differences [(245, ('add', 'r5, r4, r31'), ('add', 'r4, r4, r31')), (246, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (247, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f')), (248, ('stw', 'r0, 0x220(r5)'), ('stw', 'r0, 0x220(r4)'))].
src 0x400 base 0x400 insns 256/256
diffs 4: [245, 246, 247, 248]
245 M add r5, r4, r31
B add r4, r4, r31
246 M lwz r4, 0x220(r5)
B lwz r5, 0x220(r4)
247 M rlwimi r0, r4, 0, 0x1a, 0x1f
B rlwimi r0, r5, 0, 0x1a, 0x1f
248 M stw r0, 0x220(r5)
B stw r0, 0x220(r4)
## fz15h kbd_led_handler diagnosis
Origin body unchanged after fetch. 24/25 instructions; structural/exact (13, 21); first differences [(1, ('slwi', 'r8, r4, 3'), ('lis', 'r6, 0')), (2, ('addi', 'r5, r5, 0'), ('slwi', 'r0, r4, 3')), (3, ('lis', 'r7, 0'), ('li', 'r8, 0')), (4, ('lwzx', 'r0, r5, r8'), ('addi', 'r5, r5, 0')), (5, ('li', 'r6, 0'), ('slwi', 'r7, r4, 5')), (6, ('slwi', 'r4, r4, 5'), ('lwzx', 'r0, r5, r0'))].
src 0x60 base 0x64 insns 24/25
--- replace mine 1:2 base 1:4
M 1 slwi r8, r4, 3
B 1 lis r6, 0
B 2 slwi r0, r4, 3
B 3 li r8, 0
--- replace mine 3:10 base 5:10
M 3 lis r7, 0
M 4 lwzx r0, r5, r8
M 5 li r6, 0
M 6 slwi r4, r4, 5
M 7 addi r7, r7, 0
M 8 cmplw r0, r6
M 9 stwx r6, r7, r4
B 5 slwi r7, r4, 5
B 6 lwzx r0, r5, r0
B 7 addi r6, r6, 0
B 8 stwx r8, r6, r7
B 9 cmplw r0, r8
--- replace mine 12:13 base 12:15
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h KBDSetLedsAsync diagnosis
Origin body unchanged after fetch. 80/81 instructions; structural/exact (14, 70); first differences [(7, ('mr', 'r26, r5'), ('mr', 'r26, r3')), (8, ('mr', 'r27, r6'), ('mr', 'r27, r5')), (10, ('addi', 'r31, r31, 0'), ('mr', 'r28, r6')), (11, ('bne', '12'), ('addi', 'r31, r31, 0')), (12, ('li', 'r3, 2'), ('bne', '12')), (13, ('b', '244'), ('li', 'r3, 2'))].
src 0x140 base 0x144 insns 80/81
--- replace mine 7:9 base 7:9
M 7 mr r26, r5
M 8 mr r27, r6
B 7 mr r26, r3
B 8 mr r27, r5
--- insert mine 10:10 base 10:11
B 10 mr r28, r6
--- replace mine 18:19 base 19:20
M 18 mulli r30, r3, 0x268
B 19 mulli r3, r3, 0x268
--- replace mine 20:21 base 21:22
M 20 add r3, r0, r30
B 21 add r3, r0, r3
--- replace mine 28:29 base 29:30
M 28 clrlwi r28, r4, 0x18
B 29 clrlwi r30, r4, 0x18
--- replace mine 31:32 base 32:33
M 31 addi r4, r31, 0x400
B 32 addi r6, r31, 0x400
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h KBDSetLeds diagnosis
Origin body unchanged after fetch. 75/79 instructions; structural/exact (19, 75); first differences [(4, ('stw', 'r30, 0x18(r1)'), ('mr', 'r31, r3')), (5, ('stw', 'r29, 0x14(r1)'), ('stw', 'r30, 0x18(r1)')), (6, ('lwz', 'r0, 0(0)'), ('stw', 'r29, 0x14(r1)')), (7, ('cmpwi', 'r0, 0'), ('lwz', 'r0, 0(0)')), (8, ('bne', '12'), ('cmpwi', 'r0, 0')), (9, ('li', 'r3, 2'), ('bne', '12'))].
src 0x12c base 0x13c insns 75/79
--- insert mine 4:4 base 4:5
B 4 mr r31, r3
--- replace mine 10:11 base 11:12
M 10 b 232
B 11 b 244
--- replace mine 14:16 base 15:17
M 14 b 216
M 15 mulli r30, r3, 0x268
B 15 b 228
B 16 mulli r0, r3, 0x268
--- replace mine 18:19 base 19:20
M 18 add r3, r3, r30
B 19 add r3, r3, r0
--- replace mine 25:27 base 26:28
M 25 b 172
M 26 clrlwi r31, r4, 0x18
B 26 b 184
B 27 clrlwi r30, r4, 0x18
--- replace mine 28:29 base 29:30
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h KBDSetModState diagnosis
Origin body unchanged after fetch. 42/42 instructions; structural/exact (0, 4); first differences [(30, ('add', 'r5, r5, r4'), ('add', 'r4, r5, r4')), (31, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (32, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f')), (33, ('stw', 'r0, 0x220(r5)'), ('stw', 'r0, 0x220(r4)'))].
src 0xa8 base 0xa8 insns 42/42
diffs 4: [30, 31, 32, 33]
30 M add r5, r5, r4
B add r4, r5, r4
31 M lwz r4, 0x220(r5)
B lwz r5, 0x220(r4)
32 M rlwimi r0, r4, 0, 0x1a, 0x1f
B rlwimi r0, r5, 0, 0x1a, 0x1f
33 M stw r0, 0x220(r5)
B stw r0, 0x220(r4)
## fz15h Zi8PrepareMatch diagnosis
Origin body unchanged after fetch. 939/940 instructions; structural/exact (36, 889); first differences [(11, ('li', 'r3, 0x20'), ('li', 'r0, 0x20')), (12, ('stb', 'r3, 0xb(r1)'), ('stb', 'r0, 0xb(r1)')), (17, ('li', 'r28, 0'), ('li', 'r0, 0')), (18, ('li', 'r3, 0'), ('stb', 'r0, 0xf(r1)')), (19, ('stb', 'r3, 0xd(r1)'), ('li', 'r28, 0')), (20, ('lbz', 'r0, 0xc(r30)'), ('li', 'r3, 0'))].
src 0xeac base 0xeb0 insns 939/940
--- replace mine 11:13 base 11:13
M 11 li r3, 0x20
M 12 stb r3, 0xb(r1)
B 11 li r0, 0x20
B 12 stb r0, 0xb(r1)
--- insert mine 17:17 base 17:19
B 17 li r0, 0
B 18 stb r0, 0xf(r1)
--- replace mine 26:28 base 28:30
M 26 slwi r0, r0, 1
M 27 lhzx r0, r4, r0
B 28 slwi r3, r0, 1
B 29 lhzx r0, r4, r3
--- replace mine 30:33 base 32:35
M 30 lbz r3, 0xe(r1)
M 31 addi r0, r3, -1
M 32 stb r0, 0xe(r1)
B 32 lbz r4, 0xe(r1)
B 33 addi r3, r4, -1
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h Zi8GetPyPhonetic diagnosis
Origin body unchanged after fetch. 718/718 instructions; structural/exact (0, 167); first differences [(7, ('mr', 'r25, r5'), ('mr', 'r26, r5')), (8, ('mr', 'r26, r6'), ('mr', 'r28, r6')), (9, ('mr', 'r31, r7'), ('mr', 'r25, r7')), (13, ('addi', 'r29, r1, 0x20'), ('addi', 'r30, r1, 0x20')), (19, ('stb', 'r0, 0(r31)'), ('stb', 'r0, 0(r25)')), (29, ('li', 'r28, 0'), ('li', 'r29, 0'))].
src 0xb38 base 0xb38 insns 718/718
diffs 167: [7, 8, 9, 13, 19, 29, 30, 32, 37, 42, 47, 58, 64, 71, 74, 83, 87, 93, 96, 97]
7 M mr r25, r5
B mr r26, r5
8 M mr r26, r6
B mr r28, r6
9 M mr r31, r7
B mr r25, r7
13 M addi r29, r1, 0x20
B addi r30, r1, 0x20
19 M stb r0, 0(r31)
B stb r0, 0(r25)
29 M li r28, 0
B li r29, 0
30 M stb r28, 0xf(r1)
B stb r29, 0xf(r1)
32 M clrlwi r4, r28, 0x18
B clrlwi r4, r29, 0x18
37 M clrlwi r3, r28, 0x18
B clrlwi r3, r29, 0x18
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h Zi8GetPyFinal diagnosis
Origin body unchanged after fetch. 53/53 instructions; structural/exact (0, 8); first differences [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))].
src 0xd4 base 0xd4 insns 53/53
diffs 8: [26, 27, 28, 29, 34, 35, 36, 37]
26 M slwi r6, r0, 3
B slwi r7, r0, 3
27 M lis r7, 0
B lis r6, 0
28 M addi r0, r7, 0
B addi r0, r6, 0
29 M add r6, r0, r6
B add r6, r0, r7
34 M slwi r6, r0, 3
B slwi r7, r0, 3
35 M lis r7, 0
B lis r6, 0
36 M addi r0, r7, 0
B addi r0, r6, 0
37 M add r6, r0, r6
B add r6, r0, r7
## fz15h onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv diagnosis
Origin body unchanged after fetch. 682/682 instructions; structural/exact (0, 37); first differences [(13, ('lwz', 'r27, 0(r5)'), ('lwz', 'r26, 0(r5)')), (15, ('lbz', 'r28, 4(r5)'), ('lbz', 'r27, 4(r5)')), (19, ('mr', 'r4, r27'), ('mr', 'r4, r26')), (20, ('mulli', 'r22, r0, 0x18'), ('mulli', 'r19, r0, 0x18')), (21, ('add', 'r3, r20, r22'), ('add', 'r3, r20, r19')), (25, ('add', 'r3, r20, r22'), ('add', 'r3, r20, r19'))].
src 0xaa8 base 0xaa8 insns 682/682
diffs 37: [13, 15, 19, 20, 21, 25, 146, 148, 149, 150, 154, 160, 180, 377, 384, 386, 387, 391, 452, 454]
13 M lwz r27, 0(r5)
B lwz r26, 0(r5)
15 M lbz r28, 4(r5)
B lbz r27, 4(r5)
19 M mr r4, r27
B mr r4, r26
20 M mulli r22, r0, 0x18
B mulli r19, r0, 0x18
21 M add r3, r20, r22
B add r3, r20, r19
25 M add r3, r20, r22
B add r3, r20, r19
146 M lwz r18, 0(r3)
B lwz r21, 0(r3)
148 M mr r4, r27
B mr r4, r26
149 M mulli r21, r0, 0x34
B mulli r19, r0, 0x34
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator diagnosis
Origin body unchanged after fetch. 333/333 instructions; structural/exact (0, 7); first differences [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))].
src 0x534 base 0x534 insns 333/333
diffs 7: [219, 220, 223, 228, 247, 249, 255]
219 M add r16, r19, r0
B add r18, r19, r0
220 M lwz r17, 0x14(r16)
B lwz r17, 0x14(r18)
223 M mulli r18, r0, 0x44
B mulli r16, r0, 0x44
228 M add r5, r31, r18
B add r5, r31, r16
247 M lwzx r5, r31, r18
B lwzx r5, r31, r16
249 M lwz r7, 0x14(r16)
B lwz r7, 0x14(r18)
255 M lwzx r5, r31, r18
B lwzx r5, r31, r16
## fz15h init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv diagnosis
Origin body unchanged after fetch. 536/536 instructions; structural/exact (0, 155); first differences [(5, ('li', 'r29, 0'), ('li', 'r26, 0')), (7, ('stw', 'r29, 0x14(r3)'), ('stw', 'r26, 0x14(r3)')), (9, ('mr', 'r30, r3'), ('mr', 'r27, r3')), (10, ('stw', 'r29, 0x18(r3)'), ('stw', 'r26, 0x18(r3)')), (12, ('stw', 'r29, 0x24(r3)'), ('stw', 'r26, 0x24(r3)')), (13, ('stb', 'r29, 0x1c(r3)'), ('stb', 'r26, 0x1c(r3)'))].
src 0x860 base 0x860 insns 536/536
diffs 155: [5, 7, 9, 10, 12, 13, 14, 15, 18, 25, 29, 31, 32, 33, 34, 38, 39, 49, 50, 60]
5 M li r29, 0
B li r26, 0
7 M stw r29, 0x14(r3)
B stw r26, 0x14(r3)
9 M mr r30, r3
B mr r27, r3
10 M stw r29, 0x18(r3)
B stw r26, 0x18(r3)
12 M stw r29, 0x24(r3)
B stw r26, 0x24(r3)
13 M stb r29, 0x1c(r3)
B stb r26, 0x1c(r3)
14 M stb r29, 0x1e(r3)
B stb r26, 0x1e(r3)
15 M stb r29, 0x1d(r3)
B stb r26, 0x1d(r3)
18 M stb r29, 0x21(r3)
B stb r26, 0x21(r3)
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h __nupParseServerInfo__FP14NUPContextInfoPcPcUx diagnosis
Origin body unchanged after fetch. 452/452 instructions; structural/exact (0, 148); first differences [(13, ('addi', 'r24, r28, 0x90'), ('addi', 'r25, r28, 0x90')), (14, ('addi', 'r25, r28, 0x9c'), ('addi', 'r22, r28, 0x9c')), (15, ('li', 'r27, 0'), ('li', 'r23, 0')), (18, ('mr', 'r4, r25'), ('mr', 'r4, r22')), (21, ('mr', 'r23, r3'), ('mr', 'r24, r3')), (23, ('mr', 'r4, r24'), ('mr', 'r4, r25'))].
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]
13 M addi r24, r28, 0x90
B addi r25, r28, 0x90
14 M addi r25, r28, 0x9c
B addi r22, r28, 0x9c
15 M li r27, 0
B li r23, 0
18 M mr r4, r25
B mr r4, r22
21 M mr r23, r3
B mr r24, r3
23 M mr r4, r24
B mr r4, r25
26 M mr r22, r3
B mr r26, r3
30 M mr r3, r25
B mr r3, r22
32 M add r29, r23, r3
B add r24, r24, r3
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h __nupBase64Encode__FPUcPUcUl diagnosis
Origin body unchanged after fetch. 63/63 instructions; structural/exact (9, 21); first differences [(5, ('li', 'r10, 0'), ('li', 'r7, 0')), (9, ('addi', 'r10, r10, 1'), ('addi', 'r7, r7, 1')), (11, ('cmplwi', 'r10, 3'), ('cmplwi', 'r7, 3')), (16, ('rlwinm', 'r5, r9, 0x14, 0x1a, 0x1f'), ('rlwinm', 'r0, r9, 0xe, 0x1a, 0x1f')), (17, ('rlwinm', 'r0, r9, 0xe, 0x1a, 0x1f'), ('rlwinm', 'r6, r9, 0x14, 0x1a, 0x1f')), (18, ('lbzx', 'r7, r8, r5'), ('lbzx', 'r7, r8, r0'))].
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]
5 M li r10, 0
B li r7, 0
9 M addi r10, r10, 1
B addi r7, r7, 1
11 M cmplwi r10, 3
B cmplwi r7, 3
16 M rlwinm r5, r9, 0x14, 0x1a, 0x1f
B rlwinm r0, r9, 0xe, 0x1a, 0x1f
17 M rlwinm r0, r9, 0xe, 0x1a, 0x1f
B rlwinm r6, r9, 0x14, 0x1a, 0x1f
18 M lbzx r7, r8, r5
B lbzx r7, r8, r0
20 M lbzx r6, r8, r0
B clrlwi r0, r9, 0x1a
21 M clrlwi r0, r9, 0x1a
B lbzx r6, r8, r6
22 M li r10, 0
B stb r7, 0(r3)
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion diagnosis
Origin body unchanged after fetch. 163/163 instructions; structural/exact (0, 17); first differences [(108, ('lwz', 'r9, 0x54(r30)'), ('lwz', 'r5, 0x54(r30)')), (110, ('cmplw', 'r9, r8'), ('cmplw', 'r5, r8')), (112, ('li', 'r10, 0'), ('li', 'r9, 0')), (114, ('cmpwi', 'r9, 0'), ('cmpwi', 'r5, 0')), (115, ('lwz', 'r3, 0x5c(r7)'), ('lwz', 'r10, 0x5c(r7)')), (122, ('li', 'r4, 0'), ('li', 'r3, 0'))].
src 0x28c base 0x28c insns 163/163
diffs 17: [108, 110, 112, 114, 115, 122, 123, 124, 125, 128, 130, 132, 134, 136, 141, 142, 144]
108 M lwz r9, 0x54(r30)
B lwz r5, 0x54(r30)
110 M cmplw r9, r8
B cmplw r5, r8
112 M li r10, 0
B li r9, 0
114 M cmpwi r9, 0
B cmpwi r5, 0
115 M lwz r3, 0x5c(r7)
B lwz r10, 0x5c(r7)
122 M li r4, 0
B li r3, 0
123 M li r5, 0
B li r4, 0
124 M mtctr r9
B mtctr r5
125 M cmplwi r9, 0
B cmplwi r5, 0
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
## fz15h __nupGetTitleSize__FP12NUPTitleInfo diagnosis
Origin body unchanged after fetch. 139/139 instructions; structural/exact (0, 22); first differences [(39, ('adde', 'r0, r5, r7'), ('adde', 'r5, r5, r7')), (40, ('addi', 'r5, r8, 5'), ('addi', 'r0, r8, 5')), (42, ('stw', 'r5, 0x20(r3)'), ('stw', 'r0, 0x20(r3)')), (43, ('adde', 'r0, r0, r7'), ('adde', 'r0, r5, r7')), (56, ('lwz', 'r30, 0x54(r3)'), ('lwz', 'r28, 0x54(r3)')), (57, ('add', 'r27, r12, r8'), ('add', 'r26, r12, r8'))].
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]
39 M adde r0, r5, r7
B adde r5, r5, r7
40 M addi r5, r8, 5
B addi r0, r8, 5
42 M stw r5, 0x20(r3)
B stw r0, 0x20(r3)
43 M adde r0, r0, r7
B adde r0, r5, r7
56 M lwz r30, 0x54(r3)
B lwz r28, 0x54(r3)
57 M add r27, r12, r8
B add r26, r12, r8
58 M lwz r25, 0x5c(r27)
B lwz r25, 0x5c(r26)
59 M cmpwi r30, 0
B cmpwi r28, 0
61 M lwz r26, 0x58(r3)
B lwz r30, 0x58(r3)
Remaining instruction differences omitted here; full target/source disassembly and ctxdiff saved under /tmp/fz15h-<symbol>*.
Structural mapping TMCJPEGDEC_set_converterY8U8V8: frame 0x10. Missing instruction is shared convBuf base addi r4,work,0x1858 at index 1; compiler folds it into each case. Extents checked separately; no immediate reload proving volatile. Test switch helper boundary and logical converter metadata before register search.
## fz15h TMCJPEGDEC_set_converterY8U8V8 trials
Direct discriminator, promoted actual IDCT stride type, and complete selection helper boundary.
- TMCJPEGDEC_set_converterY8U8V8: direct: (41, 195) 195/196 instructions
- TMCJPEGDEC_set_converterY8U8V8: mode: (41, 195) 195/196 instructions
- TMCJPEGDEC_set_converterY8U8V8: helper: (99999, 99999) compile failed re_MCUtoY8U8V8.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\TMC_JPEG\src\texturecvtr\Texture_MCUtoY8U8V8.c # -------------------------------------------------------------------------- # 162: s32 selected = SelectPlanarConverter(work, buffer, componentCount); # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
Structural mapping kbdEventHandler: frame 0x20, same 186 instructions. Index35 report status uses r3 rather than r5; table base uses r30 rather than r3. No branch or stack changes; preserve post-OSCancelAlarm report reread.
## fz15h kbdEventHandler trials
Input representation and classification expression ownership.
- kbdEventHandler: status local owns classification: (0, 5) 186/186 instructions first [(35, ('lbz', 'r3, 2(r4)'), ('lbz', 'r5, 2(r4)')), (36, ('lis', 'r30, 0'), ('lis', 'r3, 0')), (38, ('addi', 'r0, r3, 0xff'), ('addi', 'r0, r5, 0xff')), (39, ('addi', 'r30, r30, 0'), ('addi', 'r3, r3, 0')), (42, ('add', 'r30, r30, r4'), ('add', 'r30, r3, r4'))]
- kbdEventHandler: typed HID report owns first key and flags: (0, 5) 186/186 instructions first [(35, ('lbz', 'r3, 2(r4)'), ('lbz', 'r5, 2(r4)')), (36, ('lis', 'r30, 0'), ('lis', 'r3, 0')), (38, ('addi', 'r0, r3, 0xff'), ('addi', 'r0, r5, 0xff')), (39, ('addi', 'r30, r30, 0'), ('addi', 'r3, r3, 0')), (42, ('add', 'r30, r30, r4'), ('add', 'r30, r3, r4'))]
- kbdEventHandler: readonly report and direct channel lvalue: (0, 6) 186/186 instructions first [(35, ('lbz', 'r3, 2(r4)'), ('lbz', 'r5, 2(r4)')), (36, ('lis', 'r4, 0'), ('lis', 'r3, 0')), (37, ('mulli', 'r5, r31, 0x268'), ('mulli', 'r4, r31, 0x268')), (38, ('addi', 'r0, r3, 0xff'), ('addi', 'r0, r5, 0xff')), (39, ('addi', 'r4, r4, 0'), ('addi', 'r3, r3, 0')), (42, ('add', 'r30, r4, r5'), ('add', 'r30, r3, r4'))]
Structural mapping kbdProcMod: modifier update at 245 has address/old-state r4/r5 swap. Frame 0x20; exact instruction count and physical bit layout. Test unsigned word representation and a logical field grouping before declaration order.
## fz15h kbdProcMod trials
State word and bitfield object boundaries.
- kbdProcMod: int: (0, 4) 256/256 instructions first [(245, ('add', 'r5, r4, r31'), ('add', 'r4, r4, r31')), (246, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (247, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f')), (248, ('stw', 'r0, 0x220(r5)'), ('stw', 'r0, 0x220(r4)'))]
- kbdProcMod: logical: (0, 4) 256/256 instructions first [(245, ('add', 'r5, r4, r31'), ('add', 'r4, r4, r31')), (246, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (247, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f')), (248, ('stw', 'r0, 0x220(r5)'), ('stw', 'r0, 0x220(r4)'))]
- kbdProcMod: readonly: (0, 4) 256/256 instructions first [(245, ('add', 'r5, r4, r31'), ('add', 'r4, r4, r31')), (246, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (247, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f')), (248, ('stw', 'r0, 0x220(r5)'), ('stw', 'r0, 0x220(r4)'))]
Structural mapping KBDSetModState: modifier update at 30 has address/old-state r4/r5 swap. Frame 0x10; exact instruction count and physical bit layout. Test unsigned word representation and a logical field grouping before declaration order.
## fz15h KBDSetModState trials
State word and bitfield object boundaries.
- KBDSetModState: int: (0, 4) 42/42 instructions first [(30, ('add', 'r5, r5, r4'), ('add', 'r4, r5, r4')), (31, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (32, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f')), (33, ('stw', 'r0, 0x220(r5)'), ('stw', 'r0, 0x220(r4)'))]
- KBDSetModState: logical: (0, 4) 42/42 instructions first [(30, ('add', 'r5, r5, r4'), ('add', 'r4, r5, r4')), (31, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (32, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f')), (33, ('stw', 'r0, 0x220(r5)'), ('stw', 'r0, 0x220(r4)'))]
- KBDSetModState: readonly: (0, 7) 42/42 instructions first [(26, ('mulli', 'r5, r30, 0x268'), ('mulli', 'r4, r30, 0x268')), (27, ('lis', 'r4, 0'), ('lis', 'r5, 0')), (29, ('addi', 'r4, r4, 0'), ('addi', 'r5, r5, 0')), (30, ('add', 'r5, r4, r5'), ('add', 'r4, r5, r4')), (31, ('lwz', 'r4, 0x220(r5)'), ('lwz', 'r5, 0x220(r4)')), (32, ('rlwimi', 'r0, r4, 0, 0x1a, 0x1f'), ('rlwimi', 'r0, r5, 0, 0x1a, 0x1f'))]
Structural mapping kbd_led_handler: no frame, source24/target25. Target separates the completion index from the reservation index and tests success positively, retains final blr after tail callback. No volatile proof; test result type and callback view without dummy branches.
## fz15h kbd_led_handler trials
Callback argument rematerialization with real result type and branch forms.
- kbd_led_handler: BOOL: (5, 9) 25/25 instructions first [(1, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (3, ('li', 'r6, 0'), ('li', 'r8, 0')), (5, ('slwi', 'r8, r4, 5'), ('slwi', 'r7, r4, 5')), (7, ('addi', 'r7, r7, 0'), ('addi', 'r6, r6, 0')), (8, ('stwx', 'r6, r7, r8'), ('stwx', 'r8, r6, r7')), (9, ('cmplw', 'r0, r6'), ('cmplw', 'r0, r8'))]
- kbd_led_handler: pointer: (5, 9) 25/25 instructions first [(1, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (3, ('li', 'r6, 0'), ('li', 'r8, 0')), (5, ('slwi', 'r8, r4, 5'), ('slwi', 'r7, r4, 5')), (7, ('addi', 'r7, r7, 0'), ('addi', 'r6, r6, 0')), (8, ('stwx', 'r6, r7, r8'), ('stwx', 'r8, r6, r7')), (9, ('cmplw', 'r0, r6'), ('cmplw', 'r0, r8'))]
- kbd_led_handler: if: (30, 23) 23/25 instructions
Structural mapping KBDSetLedsAsync: target has channel scalar live through OSDisableInterrupts and indexed unsigned slot/byte offset CTR loop; source retains channel-stride product and pointer induction. Frame0x20. Test slot record lvalue and readonly helper input.
## fz15h KBDSetLedsAsync trials
Typed slot reservation direct loop, const pointer helper, and scalar helper.
- KBDSetLedsAsync: loop: (19, 72) 79/81 instructions
- KBDSetLedsAsync: constptr: (20, 44) 81/81 instructions
- KBDSetLedsAsync: value: (19, 73) 79/81 instructions
Structural mapping KBDSetLeds: target has channel scalar live through OSDisableInterrupts and indexed unsigned slot/byte offset CTR loop; source retains channel-stride product and pointer induction. Frame0x20. Test slot record lvalue and readonly helper input.
## fz15h KBDSetLeds trials
Typed slot reservation direct loop, const pointer helper, and scalar helper.
- KBDSetLeds: loop: (19, 68) 78/79 instructions
- KBDSetLeds: constptr: (48, 75) 82/79 instructions
- KBDSetLeds: value: (19, 69) 78/79 instructions
Structural mapping Zi8PrepareMatch: frame0x70, source939/target940. First context-mask zero uses different scratch register; target later stores component flag absent in source. No dummy flag or unsupported volatility. Tables/element index source boundaries can affect opt-off frame ownership.
## fz15h Zi8PrepareMatch trials
Readonly tables, explicit index progression, direct classifier boolean.
- Zi8PrepareMatch: tables: (36, 897) 938/940 instructions
- Zi8PrepareMatch: index: (39, 891) 938/940 instructions
- Zi8PrepareMatch: boolean: (36, 889) 939/940 instructions
Structural mapping Zi8GetPyPhonetic: frame0x250; 718/718 instructions. All differences are register choices, beginning saved output pointers and converted-buffer address. No stack-local layout or branch changes. Test readonly input argument, helper-like conversion-buffer scope, and scalar initialization ownership before declsearch.
## fz15h Zi8GetPyPhonetic trials
Actual input const qualification, initializer boundary, buffer pointer initialization, paired-output chain.
- Zi8GetPyPhonetic: const: (6, 646) 720/718 instructions
- Zi8GetPyPhonetic: initialize: (3, 181) 718/718 instructions
- Zi8GetPyPhonetic: buffer: (0, 167) 718/718 instructions
- Zi8GetPyPhonetic: chain: (2, 635) 717/718 instructions
Structural mapping Zi8GetPyFinal: frame0x10, 53/53 instructions. Only the two matched-row output reads allocate row stride r6/table base r7 versus target r7/r6. The matching loop itself is exact. Test readonly phonetic input, ordinary typed row view, and output load boundary.
## fz15h Zi8GetPyFinal trials
Const phonetic input and table row/byte lvalue boundaries. Table contents and symbol names unchanged.
- Zi8GetPyFinal: const: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
Structural mapping TMCJPEGDEC_set_converterY8U8V8: frame 0x10. Missing instruction is shared convBuf base addi r4,work,0x1858 at index 1; compiler folds it into each case. Extents checked separately; no immediate reload proving volatile. Test switch helper boundary and logical converter metadata before register search.
## fz15h TMCJPEGDEC_set_converterY8U8V8 trials
Direct discriminator, promoted actual IDCT stride type, and complete selection helper boundary.
- TMCJPEGDEC_set_converterY8U8V8: helper: (45, 198) 199/196 instructions
Correction: Zi8GetPyFinal table-row generator initially matched a nested if call rather than its definition. It performed no source mutation for the failed row-view candidate; exclude that rejected generator. Function-boundary parser now explicitly rejects control statements. All other function boundaries verified against their definition bodies.
Structural mapping Zi8GetPyFinal: frame0x10, 53/53 instructions. Only the two matched-row output reads allocate row stride r6/table base r7 versus target r7/r6. The matching loop itself is exact. Test readonly phonetic input, ordinary typed row view, and output load boundary.
## fz15h Zi8GetPyFinal trials
Const phonetic input and table row/byte lvalue boundaries. Table contents and symbol names unchanged.
- Zi8GetPyFinal: const: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
- Zi8GetPyFinal: rowview: (24, 57) 58/53 instructions
- Zi8GetPyFinal: commute: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
- Zi8GetPyFinal: snapshot: (18, 62) 63/53 instructions
## fz15h Zi8GetPyFinal trials
Output row address lowering: equivalent byte dereference, row dereference, promoted index types and const table array view; no new layout or objects.
- Zi8GetPyFinal: deref: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
- Zi8GetPyFinal: rowderef: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
- Zi8GetPyFinal: u32: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
- Zi8GetPyFinal: u16: (5, 31) 55/53 instructions
- Zi8GetPyFinal: int: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
- Zi8GetPyFinal: baseview: (0, 8) 53/53 instructions first [(26, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (27, ('lis', 'r7, 0'), ('lis', 'r6, 0')), (28, ('addi', 'r0, r7, 0'), ('addi', 'r0, r6, 0')), (29, ('add', 'r6, r0, r6'), ('add', 'r6, r0, r7')), (34, ('slwi', 'r6, r0, 3'), ('slwi', 'r7, r0, 3')), (35, ('lis', 'r7, 0'), ('lis', 'r6, 0'))]
Structural mapping Base::onKey: frame0x80,682/682 instructions. First difference is pane-name input pointer r27 versus r26 at13, then state r28 versus r27. Remaining differences are in inlined table search bases/offsets, with identical ConfirmInput field offsets. Input event is only read, so test const view, ordinary input snapshots and helper boundaries.
## fz15h onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv trials
Readonly event field view, shared event pointer, event value snapshot, ordinary command clearing.
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: const: (0, 37) 682/682 instructions
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: named: (0, 37) 682/682 instructions
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: local: (48, 672) 685/682 instructions
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: commands: (25, 327) 683/682 instructions
Structural mapping LayoutByNW4R::create: same0x60 frame,333 instructions. First219 is toggle table entry add using r16 rather than r18, and animation-file stride uses r18 rather than r16. Normal-key loop and calls exact. Test toggle readonly entry representation and loaded-key helper boundary.
## fz15h create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator trials
Toggle metadata pointer versus reference/value; use indexed key directly or define read at branch.
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: pointer: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: direct: (0, 12) 333/333 instructions first [(117, ('add', 'r18, r23, r0'), ('add', 'r17, r23, r0')), (118, ('lwz', 'r17, 0x14(r18)'), ('lwz', 'r18, 0x14(r17)')), (142, ('cmpwi', 'r17, 0'), ('cmpwi', 'r18, 0')), (147, ('lwz', 'r7, 0x14(r18)'), ('lwz', 'r7, 0x14(r17)')), (219, ('add', 'r17, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r16, 0x14(r17)'), ('lwz', 'r17, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: loadlate: (6, 113) 332/333 instructions
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: snapshot: (19, 243) 344/333 instructions
Structural mapping LayoutByNW4R::init: same0x50 frame and536 instructions. First zero/this callee-saved allocation at5/9, reused across inline Base::init, animation/visible helpers; no branch or instruction-order differences. Scope the actual pane-name scratch and readonly layout metadata before final declarations.
## fz15h init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv trials
Unsigned loop index, scratch array lifetime, const layout view and toggle entry reference.
- init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv: u32loop: (1, 155) 536/536 instructions
- init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv: outerbuffer: (0, 155) 536/536 instructions
- init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv: keyview: (4, 405) 534/536 instructions
- init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv: rowref: (0, 155) 536/536 instructions
Structural mapping __nupParseServerInfo: frame0x50,452/452 instructions. First13/14 inline tag literal pointers and result zero use different callee-saved registers; most remaining differences track the same tag helper start/end/length temporaries. Test helper const input and expression boundaries; string tokens kept in original source order.
## fz15h __nupParseServerInfo__FP14NUPContextInfoPcPcUx trials
Readonly response parameter in helper, named strlen result and pointer difference, ABI-compatible result/count types, helper declarations last.
- __nupParseServerInfo__FP14NUPContextInfoPcPcUx: const: (0, 148) 452/452 instructions
- __nupParseServerInfo__FP14NUPContextInfoPcPcUx: direct: (0, 148) 452/452 instructions
- __nupParseServerInfo__FP14NUPContextInfoPcPcUx: ints: (0, 148) 452/452 instructions
- __nupParseServerInfo__FP14NUPContextInfoPcPcUx: helperlocals: (0, 148) 452/452 instructions
Structural mapping __nupBase64Encode: no frame,63/63 instructions. First count usesr10 insteadr7; source defines second output byte before first, target computes first index then second, with loads and stores interleaved. Test actual output expressions and byte accumulation, no string pool changes.
## fz15h __nupBase64Encode__FPUcPUcUl trials
Natural output stores, first-byte source order, readonly scan, nested accumulate expression, unsigned int word locals.
- __nupBase64Encode__FPUcPUcUl: direct: (8, 17) 63/63 instructions
- __nupBase64Encode__FPUcPUcUl: order: (9, 21) 63/63 instructions
- __nupBase64Encode__FPUcPUcUl: readonly: (8, 17) 63/63 instructions
- __nupBase64Encode__FPUcPUcUl: accumulate: (9, 23) 63/63 instructions
- __nupBase64Encode__FPUcPUcUl: int: (9, 21) 63/63 instructions
Structural mapping __nupGetBootVersion: frame0x20,163/163 instructions. First108 cached installed countr9 vsr5, content-loop indexr10 vsr9, inline content search saved IDr3 vsr10. Entire remaining mismatch lies in __nupHasInstalledContent inline boundary, no volatile reread evidence.
## fz15h __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion trials
Readonly installed IDs, direct index lvalue in helper, C int loop/count and const title view.
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: helperconst: (0, 17) 163/163 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: helperexpr: (0, 17) 163/163 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: int: (0, 17) 163/163 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: view: (0, 17) 163/163 instructions
Structural mapping __nupGetTitleSize: frame0x30,139/139 instructions. First39 high-word sum ownsr0 ratherthanr5, progress incrementr5 ratherthanr0. After56 inline installed-content count/table stride/ID pointer trade registers. Test immutable content record and typed helper boundaries before declarations.
## fz15h __nupGetTitleSize__FP12NUPTitleInfo trials
Readonly content record/view, int index, direct ID indexed comparison helper, equivalent fixed storage total.
- __nupGetTitleSize__FP12NUPTitleInfo: const: (0, 22) 139/139 instructions
- __nupGetTitleSize__FP12NUPTitleInfo: snapshot: (99999, 99999) compile failed ### mwcceppc.exe Compiler: # File: libs\RVL_SDK\src\nup\nup.cpp # ------------------------------------- # 927: ESCmdView* content = &view->contents[contentIndex]; # Error: ^ # (10209) illegal implicit conversion from 'const ESCmdView *' to # 'ESCmdView *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- __nupGetTitleSize__FP12NUPTitleInfo: index: (0, 22) 139/139 instructions
- __nupGetTitleSize__FP12NUPTitleInfo: helper: (0, 22) 139/139 instructions
- __nupGetTitleSize__FP12NUPTitleInfo: sum: (16, 113) 134/139 instructions
Structural mapping __nupBase64Encode: no frame,63/63 instructions. First count usesr10 insteadr7; source defines second output byte before first, target computes first index then second, with loads and stores interleaved. Test actual output expressions and byte accumulation, no string pool changes.
## fz15h __nupBase64Encode__FPUcPUcUl trials
Natural stores baseline has 8 structural/17 total differences. Test actual alphabet lookup boundary, full-triplet loop branch, accumulation tree and reset lifetime; no force placement.
- __nupBase64Encode__FPUcPUcUl: named: (18, 39) 59/63 instructions
- __nupBase64Encode__FPUcPUcUl: literalarray: (0, 0) 63/63 instructions first []
Exact candidate retained pending pool/objdiff/quick gate: __nupBase64Encode__FPUcPUcUl
- __nupBase64Encode__FPUcPUcUl: mutable static alphabet with real base64 lookup contents: (0, 0) 63/63 instructions. Const candidate pool diverged because compiler emitted alphabet in rodata; gate failed, no commit. Test ordinary mutable table in data, without section pragmas.
## fz15h base64 exact and data proof
An ordinary function-local static char alphabet[] initialized from the single base64 literal, plus direct output-byte assignments, removes temporary byte ownership and matches all63 instructions, ctxdiff diffs0. const alphabet[] was first tested and emitted rodata, failing data/pool gate; it was corrected to the ordinary mutable char array. Final28-string pool identical and all data1720/1720, sections/data totals unchanged. This is the actual encoding lookup table, without dummy bytes, packed strings, section pragmas or pinned addresses. No symbols/config rename needed. Quick gate GATE PASS, functions19->20, code7496->7748/10764, no regressions/forbidden/readability, DOL hash correct.
source data section sizes .rodata:86, .data:1592, .sdata:25, .sbss:4
target data section sizes .rodata:88, .data:1592, .sdata:32, .sbss:8
## fz15h create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator trials
Remaining table-entry vs animation-stride register swap. Test actual loaded-key call argument and independent declaration/assignment boundaries at the toggle loop, then final local order.
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: loadedkey: (1, 11) 333/333 instructions first [(219, ('add', 'r3, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r16, 0x14(r3)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (233, ('mr', 'r17, r3'), ('mr', 'r15, r3')), (239, ('mr', 'r4, r17'), ('mr', 'r4, r15'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: declfirst: (0, 8) 333/333 instructions first [(219, ('add', 'r17, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r16, 0x14(r17)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (244, ('cmpwi', 'r16, 0'), ('cmpwi', 'r17, 0')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16'))]
## fz15h kbdEventHandler final declsearch
Structural trials complete; only registers remain. Search local declaration order last, restoring any non-exact result.
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: ptrfirst: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: ptrsecond: (0, 8) 333/333 instructions first [(219, ('add', 'r17, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r16, 0x14(r17)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (244, ('cmpwi', 'r16, 0'), ('cmpwi', 'r17, 0')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16'))]
declaration block:
KBDChannel* data;
u8* bytes;
u8 status;
start (0, 5)
best (0, 5) after 6 builds; source restored; best order was:
KBDChannel* data;
u8* bytes;
u8 status;
## fz15h kbdProcMod final declsearch
Structural trials complete; only registers remain. Search local declaration order last, restoring any non-exact result.
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: jtype: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: scope: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
declaration block:
KBDChannel* data;
u32 modState;
s32 delta;
u8 flags;
start (0, 4)
best (0, 4) after 13 builds; source restored; best order was:
KBDChannel* data;
u32 modState;
s32 delta;
u8 flags;
## fz15h KBDSetModState final declsearch
Structural trials complete; only registers remain. Search local declaration order last, restoring any non-exact result.
declaration block:
BOOL interrupts;
KBDModifierState oldState;
KBDModifierState newState;
start (0, 4)
best (0, 4) after 6 builds; source restored; best order was:
BOOL interrupts;
KBDModifierState oldState;
KBDModifierState newState;
## fz15h Zi8GetPyPhonetic final declsearch
Structural trials complete; only registers remain. Search local declaration order last, restoring any non-exact result.
## fz15h owned data and function extent audit
JPEG owns no data. Keyboard5296/5296, zi8match728/728, tiCellPhone3860/3860 and nup1720/1720 already pair exactly; no name/extent corrections justified. zprepare has code-dependent table/extabindex gaps documented next.
target zprepare data relocations: 0->Zi8PrepareMatch+0x260, 4->Zi8PrepareMatch+0x1e4, 8->Zi8PrepareMatch+0x1f4, 12->Zi8PrepareMatch+0x204, 16->Zi8PrepareMatch+0x214, 20->Zi8PrepareMatch+0x224, 24->Zi8PrepareMatch+0x234, 28->Zi8PrepareMatch+0x244, 32->Zi8PrepareMatch+0x254, 36->Zi8PrepareMatch+0x260, 40->Zi8PrepareMatch+0x260, 44->Zi8PrepareMatch+0x204
source zprepare data relocations: 0->Zi8PrepareMatch+0x250, 4->Zi8PrepareMatch+0x1d4, 8->Zi8PrepareMatch+0x1e4, 12->Zi8PrepareMatch+0x1f4, 16->Zi8PrepareMatch+0x204, 20->Zi8PrepareMatch+0x214, 24->Zi8PrepareMatch+0x224, 28->Zi8PrepareMatch+0x234, 32->Zi8PrepareMatch+0x244, 36->Zi8PrepareMatch+0x250, 40->Zi8PrepareMatch+0x250, 44->Zi8PrepareMatch+0x1f4
Relocation proof: target jumptable_8166B3D0 is48bytes, twelve entries into Zi8PrepareMatch; source anonymous @230 has different code offsets. Gap is non-exact function layout, not a stable real source name. Extab8 exact, extabindex12 depends on function extent. No rename or size change permitted by this evidence.
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv extent 0x81417274..0x81417d1c, next getInputMode__Q49textinput8keyboard13cellphonetype4BaseCFv 0x81417d1c, overlap 0.
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator extent 0x814187b4..0x81418ce8, next init__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPaneFv 0x81418ce8, overlap 0.
init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv extent 0x81418d4c..0x814195ac, next draw__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 0x814195ac, overlap 0.
Zi8GetPyPhonetic extent 0x8147dde8..0x8147e920, next Zi8GetPyFinal 0x8147e920, overlap 0.
Zi8GetPyFinal extent 0x8147e920..0x8147e9f4, next Zi8GetBpmfPhonetic 0x8147e9f4, overlap 0.
Zi8PrepareMatch extent 0x814850fc..0x81485fac, next CDBInit 0x81485fac, overlap 0.
TMCJPEGDEC_set_converterY8U8V8 extent 0x814efb9c..0x814efeac, next TMCJPEG_814EFEAC 0x814efeac, overlap 0.
__nupParseServerInfo__FP14NUPContextInfoPcPcUx extent 0x815efa30..0x815f0140, next __nupGetServerInfo__FPcPcUxPcPcUlPcUsUsUxUsPPc 0x815f0140, overlap 0.
__nupBase64Encode__FPUcPUcUl extent 0x815f04c0..0x815f05bc, next __nupGetAuditData__FP14NUPContextInfoPPc 0x815f05bc, overlap 0.
__nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion extent 0x815f0a40..0x815f0ccc, next __nupGetTicket__FP12NUPTitleInfoPc 0x815f0ccc, overlap 0.
__nupGetTitleSize__FP12NUPTitleInfo extent 0x815f1014..0x815f1240, next __nupGetContentFull__FP14NUPContextInfoP12NUPTitleInfoPcUl 0x815f1240, overlap 0.
kbdEventHandler extent 0x815f34d8..0x815f37c0, next kbdRepeatHandler 0x815f37c0, overlap 0.
kbdProcMod extent 0x815f3aa4..0x815f3ea4, next kbdSendKey 0x815f3ea4, overlap 0.
kbd_led_handler extent 0x815f3fb4..0x815f4018, next KBDSetLedsAsync 0x815f4018, overlap 0.
KBDSetLedsAsync extent 0x815f4018..0x815f415c, next KBDSetLeds 0x815f415c, overlap 0.
KBDSetLeds extent 0x815f415c..0x815f4298, next kbdInitMap 0x815f4298, overlap 0.
KBDSetModState extent 0x815f4664..0x815f470c, next KBDTranslateHidCode 0x815f470c, overlap 0.
declaration block:
ziU8 pyInitial;
ziU8 pyFinal;
ziU8 convertedCount;
ziU8 result;
ziBool partial;
ziBool alternateInitial;
ziU8 outputIndex;
ziU8 index;
ziU16 value;
ziWChar converted[256];
ziU8 pinyin[12];
ziWChar* current;
start (0, 167)
best (0, 167) after 120 builds; source restored; best order was:
ziU8 pyInitial;
ziU8 pyFinal;
ziU8 convertedCount;
ziU8 result;
ziBool partial;
ziBool alternateInitial;
ziU8 outputIndex;
ziU8 index;
ziU16 value;
ziWChar converted[256];
ziU8 pinyin[12];
ziWChar* current;
## fz15h Zi8GetPyFinal final declsearch
Structural trials complete; only registers remain. Search local declaration order last, restoring any non-exact result.
fewer than two leading declarations; pass --lines START END
## fz15h __nupParseServerInfo__FP14NUPContextInfoPcPcUx final declsearch
Structural trials complete; only registers remain. Search local declaration order last, restoring any non-exact result.
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;
## fz15h __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion trials
Inline helper argument bindings resist const/local representation. Test true count/id/title input parameter order and field-count ownership in the existing helper or generic template; no public signature changes.
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed-content helper input order title,contentCount,contentId: (0, 17) 163/163 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed-content helper input order contentId,title,contentCount: (0, 17) 163/163 instructions
## fz15h onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv trials
Call input order and explicit readonly key/control entry local in real lookup helpers. They define the index/table stride virtual register lifetime seen in onKey; matched caller effects checked if a candidate appears.
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed-content helper input order contentId,contentCount,title: (0, 17) 163/163 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed-content helper input order contentCount,title,contentId: (0, 17) 163/163 instructions
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: order: (0, 37) 682/682 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed-content helper input order contentCount,contentId,title: (0, 17) 163/163 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed count owned by generic helper: (11, 62) 164/163 instructions
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: ptr: (9, 207) 682/682 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed count owned by word helper: (11, 61) 164/163 instructions
- __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: installed count owned by int helper: (11, 61) 164/163 instructions
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: s8: (0, 37) 682/682 instructions
- onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: ctrl: (3, 45) 682/682 instructions
## fz15h __nupGetTitleSize__FP12NUPTitleInfo trials
Map first high-word/result temporary to tmdSize rounding expression. Test equivalent masked 64-bit widening, complement masks, real readonly view, named alignment helper and SDK ROUNDUP macro. All roundups preserve unsigned wrap for the 32-bit field.
- __nupGetTitleSize__FP12NUPTitleInfo: wide: (46, 115) 140/139 instructions
- __nupGetTitleSize__FP12NUPTitleInfo: mask: (0, 22) 139/139 instructions
- __nupGetTitleSize__FP12NUPTitleInfo: snapshot: (34, 103) 138/139 instructions
## fz15h create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator trials
Toggle entry readonly reference helper separates the stride/header IR boundary, with scalar index, const index pointer, and const table input. No metadata objects or layout changed.
- __nupGetTitleSize__FP12NUPTitleInfo: helper: (0, 22) 139/139 instructions
- __nupGetTitleSize__FP12NUPTitleInfo: roundup: (0, 22) 139/139 instructions
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: constarg: (0, 21) 333/333 instructions
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: index: (0, 21) 333/333 instructions
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: table: (0, 21) 333/333 instructions
## fz15h create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator trials
Toggle animation loop ownership via real while, postincrement, locally declared counter and phase-shared loop counters. The target table and stride lifetimes may reflect a shared loop local, analogous to the previous JPEG row match.
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: while: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: increment: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: outerj: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: sharedj: (0, 131) 333/333 instructions
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: sharediter: (0, 36) 333/333 instructions
## fz15h create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator trials
Fixed metadata readonly definition may change alias assumptions at virtual animation calls. Every table contains the original entries; no addresses/extent/layout changes or volatility added. Check all data/functions with gate if exact.
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: table: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: both: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: entry: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
- create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: normal: (0, 7) 333/333 instructions first [(219, ('add', 'r16, r19, r0'), ('add', 'r18, r19, r0')), (220, ('lwz', 'r17, 0x14(r16)'), ('lwz', 'r17, 0x14(r18)')), (223, ('mulli', 'r18, r0, 0x44'), ('mulli', 'r16, r0, 0x44')), (228, ('add', 'r5, r31, r18'), ('add', 'r5, r31, r16')), (247, ('lwzx', 'r5, r31, r18'), ('lwzx', 'r5, r31, r16')), (249, ('lwz', 'r7, 0x14(r16)'), ('lwz', 'r7, 0x14(r18)'))]
## fz15h Zi8GetPyFinal final nested declsearch
Structural/helper/loop trials complete. Search actual declaration lines 719..720 last. Tool automatic scan can mistake an inline if call for a definition; explicit lines avoid that.
declaration block:
ziU8 index = 0;
ziU8 row;
start (0, 8)
best (0, 8) after 2 builds; source restored; best order was:
ziU8 index = 0;
ziU8 row;
## fz15h onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv final nested declsearch
Structural/helper/loop trials complete. Search actual declaration lines 224..225 last. Tool automatic scan can mistake an inline if call for a definition; explicit lines avoid that.
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);
## fz15h create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator final nested declsearch
Structural/helper/loop trials complete. Search actual declaration lines 609..610 last. Tool automatic scan can mistake an inline if call for a definition; explicit lines avoid that.
declaration block:
const char* animationKey;
const PaneNameToAnimationKey& paneName = csPaneNameNormalAnimationKey[i];
start (0, 7)
best (0, 7) after 2 builds; source restored; best order was:
const char* animationKey;
const PaneNameToAnimationKey& paneName = csPaneNameNormalAnimationKey[i];
## fz15h init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv final nested declsearch
Structural/helper/loop trials complete. Search actual declaration lines 679..681 last. Tool automatic scan can mistake an inline if call for a definition; explicit lines avoid that.
declaration block:
nw4r::lyt::TextBox* textPane = static_cast<nw4r::lyt::TextBox*>(getPane(textPaneName));
nw4r::lyt::Pane* buttonPane = getPane(paneName);
const KeySet* keySet = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[i];
start (0, 155)
best (0, 155) after 6 builds; source restored; best order was:
nw4r::lyt::TextBox* textPane = static_cast<nw4r::lyt::TextBox*>(getPane(textPaneName));
nw4r::lyt::Pane* buttonPane = getPane(paneName);
const KeySet* keySet = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[i];
## fz15h __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion final nested declsearch
Structural/helper/loop trials complete. Search actual declaration lines 721..722 last. Tool automatic scan can mistake an inline if call for a definition; explicit lines avoid that.
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;
## fz15h __nupGetTitleSize__FP12NUPTitleInfo final nested declsearch
Structural/helper/loop trials complete. Search actual declaration lines 901..902 last. Tool automatic scan can mistake an inline if call for a definition; explicit lines avoid that.
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;
## fz15h pre-final completeness audit
Only new code retained is the exact nup base64 lookup table/output expression. All other owned source/header/config files restored. No renames, extent changes, inline assembly or unsupported volatility. Each remaining function has at least three distinct compiled current-round source attempts; compile failures and no-op rejected generators excluded.
TMCJPEGDEC_set_converterY8U8V8: 3 distinct compiled current-round source variants; remains open.
kbdEventHandler: 3 distinct compiled current-round source variants; remains open.
kbdProcMod: 3 distinct compiled current-round source variants; remains open.
kbd_led_handler: 3 distinct compiled current-round source variants; remains open.
KBDSetLedsAsync: 3 distinct compiled current-round source variants; remains open.
KBDSetLeds: 3 distinct compiled current-round source variants; remains open.
KBDSetModState: 3 distinct compiled current-round source variants; remains open.
Zi8PrepareMatch: 3 distinct compiled current-round source variants; remains open.
Zi8GetPyPhonetic: 4 distinct compiled current-round source variants; remains open.
Zi8GetPyFinal: 10 distinct compiled current-round source variants; remains open.
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: 8 distinct compiled current-round source variants; remains open.
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: 22 distinct compiled current-round source variants; remains open.
init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv: 4 distinct compiled current-round source variants; remains open.
__nupParseServerInfo__FP14NUPContextInfoPcPcUx: 4 distinct compiled current-round source variants; remains open.
__nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion: 12 distinct compiled current-round source variants; remains open.
__nupGetTitleSize__FP12NUPTitleInfo: 8 distinct compiled current-round source variants; remains open.
All six owned sources equal the last gated commit before the final clean gate. The prior JPEG/keyboard CR1 branch-normalizer artifact persists unchanged; instruction counts from the gate are reported separately from objdiff exact counts.
Frame values cross-checked against the disassembly: LayoutByNW4R::create0x60 and init0x50; corrected the preliminary frame labels above. Their respective instruction counts333/536 and operand-only mismatch diagnoses are unchanged.
## fz15h remaining structural uncertainties
Converter setup shared-buffer expression still folds to per-case addresses; not a symbol extent issue. Keyboard event/modifier mismatches remain same-count virtual register ownership despite const views/bitfield structure/local-order trials. LED reservation still caches stride rather than channel and its completion callback has a different success branch layout.
Zi8GetPyPhonetic saved arguments/conversion-buffer address and Zi8GetPyFinal output row-base/stride remain allocator choices at identical frames/instruction counts. Cellphone onKey/create/init have identical structure and stack sizes after input/table/scope/helper/loop attempts; missing source distinction is unresolved. Nup parser tag helper, installed-content lookup and title-size arithmetic still allocate intermediates differently.
The only retained new data object is the actual base64 alphabet, one ordinary string initializer. All65 declared bytes, including terminator, come from that literal; emitted compiler alignment was not forced. Exact data/pool verification already passed; no ownership/address/extent edits were made.
## fz15h final clean full gate
Final non-quick gate rebuilt43U from clean objects. All six pools identical; zero regressions, forbidden additions, or readability warnings. Retained base64 candidate independently rechecked after clean build:63/63 instructions, ctxdiff diffs0.
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8] pool: IDENTICAL
[libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8] objdiff: code 15164/15948 data None/None functions 12/13 fuzzy 99.6453 linked code 0
[libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8] instruction-exact functions: 2/13
[libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8] section .text size 15948 match 99.64535
[libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8] below 100: TMCJPEGDEC_set_converterY8U8V8 92.78571
[libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8] baseline: code 15164/15948 data None functions 12 fuzzy 99.6453
[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.7044 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.70437
[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 64.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 3088/5764 data 5296 functions 15 fuzzy 97.7044
[libs/RVLMiddleware/eZiText/src/clib/zprepare] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zprepare] objdiff: code None/3760 data 8/68 functions 0/1 fuzzy 96.3191 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zprepare] instruction-exact functions: 0/1
[libs/RVLMiddleware/eZiText/src/clib/zprepare] section .data size 48 match None
[libs/RVLMiddleware/eZiText/src/clib/zprepare] section .text size 3760 match 96.319145
[libs/RVLMiddleware/eZiText/src/clib/zprepare] section extab size 8 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zprepare] section extabindex size 12 match 91.66667
[libs/RVLMiddleware/eZiText/src/clib/zprepare] below 100: Zi8PrepareMatch 96.319145
[libs/RVLMiddleware/eZiText/src/clib/zprepare] baseline: code None/3760 data 8 functions 0 fuzzy 96.3191
[libs/RVLMiddleware/eZiText/src/clib/zi8match] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zi8match] objdiff: code 5172/8256 data 728/728 functions 8/10 fuzzy 99.5300 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zi8match] instruction-exact functions: 8/10
[libs/RVLMiddleware/eZiText/src/clib/zi8match] section .rodata size 528 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8match] section .text size 8256 match 99.53004
[libs/RVLMiddleware/eZiText/src/clib/zi8match] section extab size 80 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8match] section extabindex size 120 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8match] below 100: Zi8GetPyPhonetic 98.704735
[libs/RVLMiddleware/eZiText/src/clib/zi8match] below 100: Zi8GetPyFinal 99.245285
[libs/RVLMiddleware/eZiText/src/clib/zi8match] baseline: code 5172/8256 data 728 functions 8 fuzzy 99.5300
[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
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
[libs/RVL_SDK/src/nup/nup] objdiff: code 7748/10764 data 1720/1720 functions 20/23 fuzzy 99.5968 linked code 0
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 20/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 99.5968
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion 99.35583
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
[libs/RVL_SDK/src/nup/nup] baseline: code 7496/10764 data 1720 functions 19 fuzzy 99.4612
regressions vs baseline: 0
global matched_code_percent: 90.55054 -> 90.55895
global fuzzy_match_percent: 99.57091 -> 99.57140
global complete_code_percent: 70.30611 -> 70.30611
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
## fz15h final before -> after
Instruction-exact values below are the gate tool values. Objdiff function counts are separate because the unchanged JPEG/keyboard CR1 branch normalization artifact undercounts gate exact functions. Missing matched_code is0.
libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8: gate instruction-exact 2/13 -> 2/13; objdiff exact 12/13 -> 12/13; code 15164/15948 -> 15164/15948; data 0/0 -> 0/0.
Open: TMCJPEGDEC_set_converterY8U8V8 92.78571%; shared buffer address folds into case-specific additions; source195/target196 instructions; 3 distinct compiled source variants logged, plus declaration searches where applicable.
libs/RVL_SDK/src/kbd/kbd_lib: gate instruction-exact 14/21 -> 14/21; objdiff exact 15/21 -> 15/21; code 3088/5764 -> 3088/5764; data 5296/5296 -> 5296/5296.
Open: kbdEventHandler 99.83871%; same186 instructions; status and report-array base virtual registers differ; 3 distinct compiled source variants logged, plus declaration searches where applicable.
Open: kbdProcMod 99.90234%; same256 instructions; inlined modifier address/old-value operands swap r4/r5; 3 distinct compiled source variants logged, plus declaration searches where applicable.
Open: kbd_led_handler 64.12%; source24/target25 instructions; success branch and callback-index rematerialization differ; 3 distinct compiled source variants logged, plus declaration searches where applicable.
Open: KBDSetLedsAsync 86.234566%; source80/target81 instructions; channel versus cached record stride across interrupt calls; 3 distinct compiled source variants logged, plus declaration searches where applicable.
Open: KBDSetLeds 84.6076%; source75/target79 instructions; channel lifetime and reservation-loop stride differ; 3 distinct compiled source variants logged, plus declaration searches where applicable.
Open: KBDSetModState 99.40476%; same42 instructions; modifier address/old-value operands swap r4/r5; 3 distinct compiled source variants logged, plus declaration searches where applicable.
libs/RVLMiddleware/eZiText/src/clib/zprepare: gate instruction-exact 0/1 -> 0/1; objdiff exact 0/1 -> 0/1; code 0/3760 -> 0/3760; data 8/68 -> 8/68.
Open: Zi8PrepareMatch 96.319145%; source939/target940 instructions; component flag store and local/branch scheduling differ; 3 distinct compiled source variants logged, plus declaration searches where applicable.
libs/RVLMiddleware/eZiText/src/clib/zi8match: gate instruction-exact 8/10 -> 8/10; objdiff exact 8/10 -> 8/10; code 5172/8256 -> 5172/8256; data 728/728 -> 728/728.
Open: Zi8GetPyPhonetic 98.704735%; same718 instructions/frame0x250; saved pointers/conversion-buffer operands differ; 4 distinct compiled source variants logged, plus declaration searches where applicable.
Open: Zi8GetPyFinal 99.245285%; same53 instructions/frame0x10; eight output-row base/stride operand differences; 10 distinct compiled source variants logged, plus declaration searches where applicable.
src/keyboard/tiCellPhone: gate instruction-exact 83/86 -> 83/86; objdiff exact 83/86 -> 83/86; code 12824/19028 -> 12824/19028; data 3860/3860 -> 3860/3860.
Open: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009%; same682 instructions/frame0x80;37 key-state/table helper operand differences; 8 distinct compiled source variants logged, plus declaration searches where applicable.
Open: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949%; same333 instructions/frame0x60; seven toggle-entry/animation-stride operand differences; 22 distinct compiled source variants logged, plus declaration searches where applicable.
Open: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612%; same536 instructions/frame0x50;155 visibility/text-pane helper operand differences; 4 distinct compiled source variants logged, plus declaration searches where applicable.
libs/RVL_SDK/src/nup/nup: gate instruction-exact 19/23 -> 20/23; objdiff exact 19/23 -> 20/23; code 7496/10764 -> 7748/10764; data 1720/1720 -> 1720/1720.
Open: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406%; same452 instructions/frame0x50;148 tag-helper pointer/length/result operand differences; 4 distinct compiled source variants logged, plus declaration searches where applicable.
Open: __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion 99.35583%; same163 instructions/frame0x20;17 installed-content count/id/index operand differences; 12 distinct compiled source variants logged, plus declaration searches where applicable.
Open: __nupGetTitleSize__FP12NUPTitleInfo 99.100716%; same139 instructions/frame0x30;22 wide arithmetic and installed-content pointer/stride operand differences; 8 distinct compiled source variants logged, plus declaration searches where applicable.
## fz15h final changes and limitations
Code commit e3c6f50737979184d5b359286e710b8f56fdd853 changes only libs/RVL_SDK/src/nup/nup.cpp and this attempts log. Final verification/log commit adds only this attempts log. No headers/configuration/symbols modified.
One new exact function: __nupBase64Encode__FPUcPUcUl. Nup19/23 ->20/23, matched code7496 ->7748 bytes, data1720 unchanged. Other five units unchanged; all16 remaining functions have at least3 valid distinct source-level attempts in this round.
Remaining source distinctions are unresolved, as listed per function above. The JPEG/keyboard gate instruction-count discrepancy is a branch-normalizer artifact documented with raw instruction evidence earlier; no tools were modified. No complete-unit or terminal completion claim.

File diff suppressed because it is too large Load Diff

View File

@@ -869,3 +869,341 @@ GATE PASS
MAX before -> after, instruction-exact/code/data bytes: zi8cgetc 5/4168/144 -> 5/4168/144 (engine fuzzy 95.99054 -> 96.27482); NWC24MBoxCtrl 24/10376/192 -> 25/10604/192; pf_cache 35/6464/0 -> 35/6464/0 (no data sections). Full GATE PASS, exact DOL SHA1, pools identical, zero regressions and forbidden/readability failures. Owned instruction-exact total 64/69 -> 65/69. Local source commits: 25fabf7b and 93e82b61.
Remaining open functions, with all source attempts exhausted this MAX round: ZiMatchZHSpelling98.80165% (29 register differences); zi8InternalGetZH96.27482% (return copies, missing halfword conversions, allocation); Zi8GetElementCount99.347824% (13 register differences); PFCACHE_DoWriteNumSectorAndFreeIfNeeded98.21889% (9 third-overlap arithmetic/scheduling differences). The correct engine temporary boundaries and paired phonetic-code interface widths remain uncertain. No new symbol rename/extent adjustment or linking investigation was needed.
# MAX continuation after mailbox landing, five units
libs/RVLMiddleware/eZiText/src/clib/zi8cgetc pool first: POOL IDENTICAL up to 0 (mine=0 base=0)
libs/RVL_SDK/src/fa/pf_cache pool first: POOL IDENTICAL up to 0 (mine=0 base=0)
libs/RVL_SDK/src/fa/pf_fat pool first: POOL IDENTICAL up to 0 (mine=0 base=0)
src/scene/channelSelect/iplChannelObj pool first: POOL IDENTICAL up to 20 (mine=20 base=20)
libs/NW4R/src/lyt/lyt_window pool first: POOL IDENTICAL up to 1 (mine=1 base=1)
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] objdiff: code 4168/47816 data 144/536 functions 5/8 fuzzy 96.6547 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] instruction-exact functions: 5/8
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .data size 392 match None
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sbss2 size 8 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sdata2 size 16 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .text size 47816 match 96.65468
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extab size 48 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extabindex size 72 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: ZiMatchZHSpelling 98.80165
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: zi8InternalGetZH 96.27482
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: Zi8GetElementCount 99.347824
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] baseline: code 4168/47816 data 144 functions 5 fuzzy 96.6547
[libs/RVL_SDK/src/fa/pf_cache] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_cache] objdiff: code 6464/7396 data None/None functions 35/36 fuzzy 99.7755 linked code 0
[libs/RVL_SDK/src/fa/pf_cache] instruction-exact functions: 35/36
[libs/RVL_SDK/src/fa/pf_cache] section .text size 7396 match 99.77555
[libs/RVL_SDK/src/fa/pf_cache] below 100: PFCACHE_DoWriteNumSectorAndFreeIfNeeded 98.21889
[libs/RVL_SDK/src/fa/pf_cache] baseline: code 6464/7396 data None functions 35 fuzzy 99.7755
[libs/RVL_SDK/src/fa/pf_fat] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_fat] objdiff: code 11556/12572 data 64/64 functions 34/35 fuzzy 99.8346 linked code 0
[libs/RVL_SDK/src/fa/pf_fat] instruction-exact functions: 34/35
[libs/RVL_SDK/src/fa/pf_fat] section .rodata size 64 match 100.0
[libs/RVL_SDK/src/fa/pf_fat] section .text size 12572 match 99.83456
[libs/RVL_SDK/src/fa/pf_fat] below 100: PFFAT_FreeChain 97.95276
[libs/RVL_SDK/src/fa/pf_fat] baseline: code 11556/12572 data 64 functions 34 fuzzy 99.8346
[src/scene/channelSelect/iplChannelObj] pool: IDENTICAL
[src/scene/channelSelect/iplChannelObj] objdiff: code 10144/10924 data 2216/2216 functions 55/56 fuzzy 99.7993 linked code 0
[src/scene/channelSelect/iplChannelObj] instruction-exact functions: 54/56
[src/scene/channelSelect/iplChannelObj] section .data size 1240 match 100.0
[src/scene/channelSelect/iplChannelObj] section .rodata size 784 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata size 120 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata2 size 72 match 100.0
[src/scene/channelSelect/iplChannelObj] section .text size 10924 match 99.79934
[src/scene/channelSelect/iplChannelObj] below 100: setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object 97.18974
[src/scene/channelSelect/iplChannelObj] baseline: code 10144/10924 data 2216 functions 55 fuzzy 99.7993
[libs/NW4R/src/lyt/lyt_window] pool: IDENTICAL
[libs/NW4R/src/lyt/lyt_window] objdiff: code 9848/11352 data 316/316 functions 20/21 fuzzy 99.7586 linked code 0
[libs/NW4R/src/lyt/lyt_window] instruction-exact functions: 20/21
[libs/NW4R/src/lyt/lyt_window] section .ctors size 4 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .data size 256 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sbss size 8 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sdata2 size 48 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .text size 11352 match 99.75864
[libs/NW4R/src/lyt/lyt_window] below 100: DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc 98.17819
[libs/NW4R/src/lyt/lyt_window] baseline: code 9848/11352 data 316 functions 20 fuzzy 99.7586
regressions vs baseline: 0
global matched_code_percent: 90.47482 -> 90.47482
global fuzzy_match_percent: 99.57024 -> 99.57024
global complete_code_percent: 70.30611 -> 70.30611
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
MAX2 ZiMatchZHSpelling: fetched origin/main; owned source equals remote. Still 98.80165%, 121/121 instructions, frame0x130, identical stack buffers/branches/helpers/operands. Remaining29 are register allocation; no immediate store/reload volatile proof. Extent0x1e4 reaches the following engine exactly. Prior trials exhausted type/const variants; try scan-result branch form, traversal initialization, and count-result type before last declaration search.
- MAX2 s2_01 ZiMatchZHSpelling: use signed-long match and character count as natural word-sized state; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
- MAX2 s2_02 ZiMatchZHSpelling: separate nonzero candidate check from prefix mismatch check; insns 123/121, structural/exact diffs (6, 109), fuzzy 97.06612, code 4168, data 72. Restored pending gates.
- MAX2 s2_03 ZiMatchZHSpelling: initialize candidate and spelling cursors in reverse traversal order; insns 121/121, structural/exact diffs (2, 31), fuzzy 98.70248, code 4168, data 144. Restored pending gates.
- MAX2 s2_04 ZiMatchZHSpelling: make prefix scan a while loop with explicit increment; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
- MAX2 g2_01 zi8InternalGetZH: combine alternate cursor advancement with entry initialization; insns 10673/10676, structural/exact diffs (8353, 9799), fuzzy 95.613525, code 4168, data 24. Restored pending gates.
- MAX2 g2_02 zi8InternalGetZH: initialize duplicate pass ordinal and status through chained assignment; insns 10686/10676, structural/exact diffs (10284, 10653), fuzzy 95.704575, code 4168, data 24. Restored pending gates.
- MAX2 g2_03 zi8InternalGetZH: preserve readonly request element view for all engine reads with explicit legacy helper conversions; insns 10685/10676, structural/exact diffs (10224, 10655), fuzzy 95.70148, code 4168, data 24. Restored pending gates.
- MAX2 g2_04 zi8InternalGetZH: match actual phonetic-code interface width while grouping returned mask test operands; insns 10678/10676, structural/exact diffs (8713, 9803), fuzzy 96.492134, code 4168, data 72. Restored pending gates.
- MAX2 c2_01 Zi8GetElementCount: declare fixed element-count input const at its definition; insns 115/115, structural/exact diffs (2, 13), fuzzy 98.391304, code 3548, data 72. Restored pending gates.
- MAX2 c2_02 Zi8GetElementCount: put element exhaustion before character count in traversal condition; insns 115/115, structural/exact diffs (7, 19), fuzzy 96.347824, code 4168, data 144. Restored pending gates.
- MAX2 c2_03 Zi8GetElementCount: limit saved separator state lifetime to spacing operation; insns 118/115, structural/exact diffs (11, 113), fuzzy 90.68696, code 4168, data 24. Restored pending gates.
- MAX2 p2_01 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: recover proven staged request endpoint and inline partial-page accounting; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_02 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: keep helper request-end input signed while unsigned overlap remains native sector count; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
MAX2 engine diagnosis: fetched origin/main; current landed chained table initializer remains96.27482%,10676/10676,0x4e0 frame. Branch-aware earlier disassembly proves returned-value copies and two missing narrow conversions before any allocation tuning; new immutable element view and chained lifetime probes rejected. Actual Zi8GetPCode returns ziU16, but correcting just that contract grows two instructions and regresses exception data. No volatile proof for changed definitions.
MAX2 GetElementCount diagnosis: fetched origin/main still99.347824%,115/115 and0x230 frame, all13 original differences are count/element-count register coloring. New const input definition also regresses an inlined caller; all trials restored. Saved separator load is separated from its store by a helper call and does not justify volatile.
MAX2 cache diagnosis: fetched origin/main still98.21889%,233/233 and0x30 frame. Nine differences solely third/right overlap arithmetic. Recovered prior MAX candidate from /tmp/fz4-max-pf-M19.c: staged endpoint addition and inline partial-page accounting have structurally identical instructions except four r4/r5 operand/register choices. No uninitialized or volatile state, same overlap range and flags. Re-test before considering new alias/lifetime boundaries. pf_cache has no allocated data; pf_fat64/64, ChannelObj2216/2216, lyt_window316/316 already exact data, no symbol rename or extent change is justified.
MAX2 spelling declaration search after four structural attempts: (0, 29) | best (0, 29) after 52 builds; source restored; best order was: | ziWChar* candidateCursor; | ziWChar* spellingCursor; | int index; | int matches; | int candidateLength; | ziWChar spacedSpelling[64]; | ziWChar spacedCandidate[64]; |
- MAX2 p2_03 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: return signed last-sector result from partial-page accounting helper; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_04 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use const-qualified page pointer formal at helper definition; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_05 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: subtract page sector from helper endpoint in place after preserving last sector; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_06 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use a signed last-sector local with unsigned overlap range; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
MAX2 retained cache partial-page accounting helper: target/ours233/233, same branches and operands; only four r4/r5 differences. Fuzzy98.21889->99.8927, exact35/36 unchanged, code6464/7396, no data. Quick gate:
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_cache] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_cache] objdiff: code 6464/7396 data None/None functions 35/36 fuzzy 99.9865 linked code 0
[libs/RVL_SDK/src/fa/pf_cache] instruction-exact functions: 35/36
[libs/RVL_SDK/src/fa/pf_cache] section .text size 7396 match 99.98648
[libs/RVL_SDK/src/fa/pf_cache] below 100: PFCACHE_DoWriteNumSectorAndFreeIfNeeded 99.8927
[libs/RVL_SDK/src/fa/pf_cache] baseline: code 6464/7396 data None functions 35 fuzzy 99.7755
regressions vs baseline: 0
global matched_code_percent: 90.47482 -> 90.47482
global fuzzy_match_percent: 99.57024 -> 99.57076
global complete_code_percent: 70.30611 -> 70.30611
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
- MAX2 f2_01 PFFAT_FreeChain: preserve inline FAT-type dispatch return boundary for clear-entry result; insns 254/254, structural/exact diffs (0, 17), fuzzy 99.56693, code 11556, data 64. Restored pending gates.
- MAX2 f2_02 PFFAT_FreeChain: share inline dirty-page flush lifetime at both exit paths; insns 256/254, structural/exact diffs (21, 123), fuzzy 97.67716, code 11556, data 64. Restored pending gates.
- MAX2 f2_03 PFFAT_FreeChain: combine independent inline clear-entry and dirty-page flush boundaries; insns 254/254, structural/exact diffs (0, 30), fuzzy 99.291336, code 11556, data 64. Restored pending gates.
- MAX2 f2_04 PFFAT_FreeChain: read-only cached-page inputs at flush helper boundary; insns 254/254, structural/exact diffs (0, 24), fuzzy 99.44882, code 11556, data 64. Restored pending gates.
- MAX2 f2_05 PFFAT_FreeChain: page-first reusable inline flush helper; insns 254/254, structural/exact diffs (0, 30), fuzzy 99.291336, code 11556, data 64. Restored pending gates.
- MAX2 f2_06 PFFAT_FreeChain: clear helper cluster input first before volume selection; insns 254/254, structural/exact diffs (0, 17), fuzzy 99.56693, code 11556, data 64. Restored pending gates.
- MAX2 f2_07 PFFAT_FreeChain: share named flushing state declarations across both return paths; insns 254/254, structural/exact diffs (0, 17), fuzzy 99.56693, code 11556, data 64. Restored pending gates.
- MAX2 f2_08 PFFAT_FreeChain: use native unsigned-long sector and page copies at each flush boundary; insns 254/254, structural/exact diffs (0, 9), fuzzy 99.78346, code 11556, data 64. Restored pending gates.
- MAX2 f2_09 PFFAT_FreeChain: scope clear-entry result separately from chain-read and flushing errors; insns 254/254, structural/exact diffs (0, 13), fuzzy 99.64567, code 11556, data 64. Restored pending gates.
- MAX2 f2_10 PFFAT_FreeChain: combine separate write status with readonly flushing page views; insns 254/254, structural/exact diffs (0, 5), fuzzy 99.862206, code 11556, data 64. Restored pending gates.
- MAX2 f2_11 PFFAT_FreeChain: readonly flush page plus scoped signed-long write status; insns 254/254, structural/exact diffs (0, 5), fuzzy 99.862206, code 11556, data 64. Restored pending gates.
- MAX2 f2_12 PFFAT_FreeChain: preserve independent first flush error as signed long; insns 254/254, structural/exact diffs (0, 5), fuzzy 99.862206, code 11556, data 64. Restored pending gates.
- MAX2 f2_13 PFFAT_FreeChain: reuse the existing current page when flushing without a redundant copy; insns 254/254, structural/exact diffs (0, 13), fuzzy 99.64567, code 11556, data 64. Restored pending gates.
- MAX2 ch2_01 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: reconstruct ten four-byte language records, eight-byte RSO buffer, and first-match fallback termination; insns 195/195, structural/exact diffs (0, 4), fuzzy 99.89744, code 10144, data 2216. Restored pending gates.
- MAX2 ch2_02 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: make matched groups read-only views while visibility mutates their member panes; BUILD FAIL annelSelect\iplChannelObj.cpp # -------------------------------------------------- # 677: for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++ # Error: ^ # (10248) function call '[const nw4r::lyt::Group].GetPaneList()' does not # match # 'nw4r::lyt::Group::GetPaneList()' (non-static) # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
- MAX2 ch2_03 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: scope named pane list reference inside each language visibility operation; BUILD FAIL data- # d1\src\scene\channelSelect\iplChannelObj.cpp:8) ### mwcceppc.exe Compiler: # File: src\scene\channelSelect\iplChannelObj.cpp # -------------------------------------------------- # 1249: for (nw4r::lyt::PaneLinkList::Iterator it = panes.GetBeginIter(); it != panes.GetEndIter(); it++) { # Error: ^^^^^ # (10140) undefined identifier 'panes' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
- MAX2 ch2_04 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: declare group returned by lookup as a fixed pointer at its definition; insns 195/195, structural/exact diffs (0, 4), fuzzy 99.89744, code 10144, data 2216. Restored pending gates.
MAX2 PFFAT_FreeChain diagnosis: fetched origin/main source unchanged. Target254/ours256, same0x40 frame, no adjacent-symbol overlap. Read FAT dispatch has per-case copies; write dispatch instead returns r3 through a common inline boundary before copying once. Shared error lifetimes color the second write status incorrectly. Inline clear-entry helper removes the extra two instructions; readonly flush page input fixes the final flushing register allocation, and scoped writeError fixes status allocation. Best f2_10 is254/254 with five register-only differences in the early flushing page/fat-sector locals. Data64/64 already exact; 60-byte fat_special_values plus trailing alignment, no symbol changes needed. Proceed to nested declaration search.
- MAX2 ch2_03b setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: scope named pane-list reference inside the owned visibility operations; insns 195/195, structural/exact diffs (6, 6), fuzzy 97.23077, code 10144, data 2216. Restored pending gates.
- MAX2 ch2_05 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: read matched groups through const local view and explicit legacy mutable accessor; insns 195/195, structural/exact diffs (0, 4), fuzzy 99.89744, code 10144, data 2216. Restored pending gates.
- MAX2 ch2_06 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: lookup matching group directly as a pane list pointer; insns 195/195, structural/exact diffs (6, 6), fuzzy 97.23077, code 10144, data 2216. Restored pending gates.
MAX2 PFFAT_FreeChain EXACT: inline clear-entry return boundary removes per-case return copies; separate write-error scope allows reuse of target r23. Const cached-page views reproduce read-only flushing lifetimes. Nested declaration search swapped fatSector/flushPage ordering: six builds, structural/exact0/0. Final readable candidate254/254, ctxdiff0, objdiff100%, unit34/35->35/35, code11556->12572, data64/64. Quick gate:
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_fat] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_fat] objdiff: code 12572/12572 data 64/64 functions 35/35 fuzzy 100.0000 linked code 0
[libs/RVL_SDK/src/fa/pf_fat] instruction-exact functions: 35/35
[libs/RVL_SDK/src/fa/pf_fat] section .rodata size 64 match 100.0
[libs/RVL_SDK/src/fa/pf_fat] section .text size 12572 match 100.0
[libs/RVL_SDK/src/fa/pf_fat] baseline: code 11556/12572 data 64 functions 34 fuzzy 99.8346
regressions vs baseline: 0
global matched_code_percent: 90.47482 -> 90.50874
global fuzzy_match_percent: 99.57024 -> 99.57144
global complete_code_percent: 70.30611 -> 70.30611
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
- MAX2 w2_01 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: return immutable texture-flip table reference and use readonly coordinate views; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 w2_02 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: allow natural local storage for vertex-color setup result without const qualifier; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 w2_03 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: use a single tex-coordinate object rather than one-element array; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 w2_04 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: scope texture dimensions as a mutable Size copied from actual texture state; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 w2_05 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: initialize white quad colors through an ordinary four-element constructor initializer; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 ch2_07 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: keep visible-pane traversal in a natural inline group helper with ch2_07; insns 153/195, structural/exact diffs (77, 103), fuzzy 78.30769, code 10144, data 2216. Restored pending gates.
- MAX2 ch2_08 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: keep visible-pane traversal in a natural inline group helper with ch2_08; insns 151/195, structural/exact diffs (80, 106), fuzzy 77.128204, code 10144, data 2216. Restored pending gates.
- MAX2 ch2_09 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: keep visible-pane traversal in a natural inline group helper with ch2_09; insns 153/195, structural/exact diffs (77, 103), fuzzy 78.30769, code 10144, data 2216. Restored pending gates.
- MAX2 ch2_10 setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: keep visible-pane traversal in a natural inline group helper with ch2_10; insns 151/195, structural/exact diffs (80, 107), fuzzy 77.128204, code 10144, data 2216. Restored pending gates.
- MAX2 p2_07 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: partial-page accounting reads sector through a const page view; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_08 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: consume caller endpoint through an in-out overlap count parameter; insns 233/233, structural/exact diffs (0, 8), fuzzy 99.74249, code 6464, data None. Restored pending gates.
- MAX2 p2_09 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: keep last-sector output pointer in accounting helper rather than its scalar return; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_10 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: readonly endpoint pointer is an explicit helper input boundary; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_11 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: introduce readonly geometry input separately from mutable dirty-page state; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 w2_06 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: read-only window geometry view at the frame-drawing boundary; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 w2_07 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: name window dimensions as a const reference used by all geometry helpers; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 w2_08 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: keep returned texture dimensions through const-reference lifetime extension; insns 376/376, structural/exact diffs (0, 119), fuzzy 98.17819, code 9848, data 316. Restored pending gates.
- MAX2 w2_09 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: declare vertex-color storage before querying texture dimensions; insns 372/376, structural/exact diffs (80, 372), fuzzy 84.32979, code 9848, data 316. Restored pending gates.
MAX2 ChannelObj setLangPane diagnosis: fresh fetch still97.18974%,195/195. Target0x90 frame; original language rows use stride4 and record base0x40, RSO buffer8; fallback stops at null and first visible match. ch2_01 corrects those structural errors to99.89744%; all remaining four differences are group-pointer r28/r30. Helpers did not inline the visibility loops and regress instruction count; readonly groups require a mutable legacy pane-list accessor and do not move registers. No immediate reload or neighbouring extent issue; all2216 data bytes pair exactly.
MAX2 Window DrawFrame diagnosis: fresh fetch still98.17819%,376/376 and0xe0 frame. Every119 difference is register-only: shared flip table r31/r21, shifted geometry/material/alpha GPRs, temporary colors; branch/call order and stack-local offsets agree. Const flip-table view, scope/storage/type trials leave instruction stream unchanged. No immediate reload volatile evidence. Extent0x5e0 does not overlap DrawFrame4; all316 target data bytes already matched, extra source weak data ignored.
MAX2 GetElementCount final declaration search: (0, 13) | best (0, 13) after 13 builds; source restored; best order was: | ziU8 spacedIndex; | ziU8 elementIndex; | ziU8 count; | ziWChar spacedElements[256]; |
- MAX2 p2_12 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: page overlap count computed with modulo-32 two-complement displacement; insns 235/233, structural/exact diffs (14, 107), fuzzy 98.81974, code 6464, data None. Restored pending gates.
- MAX2 p2_13 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: set last-sector input via decrement in place before count subtraction; insns 234/233, structural/exact diffs (15, 108), fuzzy 98.49356, code 6464, data None. Restored pending gates.
- MAX2 p2_14 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use signed long difference at partial-page helper input boundary; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_15 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: start helper count with endpoint then update using a separate subtract statement; insns 233/233, structural/exact diffs (0, 4), fuzzy 99.8927, code 6464, data None. Restored pending gates.
- MAX2 p2_16 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: derive overlap from the inclusive last sector plus one; insns 234/233, structural/exact diffs (15, 108), fuzzy 98.49356, code 6464, data None. Restored pending gates.
MAX2 retained ChannelObj language-record layout and fallback exits. Target and ours195/195 with four surviving pointer-register differences,97.18974->99.89744%; data remains2216/2216. Last declaration search6 builds stayed0/4. Correct records and branch forms are useful gate-passing structural progress even while exact-count55/56 is unchanged (instruction counter54/56 has its existing calcCursorAnim branch-normalization artifact). Quick gate:
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/scene/channelSelect/iplChannelObj] pool: IDENTICAL
[src/scene/channelSelect/iplChannelObj] objdiff: code 10144/10924 data 2216/2216 functions 55/56 fuzzy 99.9927 linked code 0
[src/scene/channelSelect/iplChannelObj] instruction-exact functions: 54/56
[src/scene/channelSelect/iplChannelObj] section .data size 1240 match 100.0
[src/scene/channelSelect/iplChannelObj] section .rodata size 784 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata size 120 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata2 size 72 match 100.0
[src/scene/channelSelect/iplChannelObj] section .text size 10924 match 99.992676
[src/scene/channelSelect/iplChannelObj] below 100: setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object 99.89744
[src/scene/channelSelect/iplChannelObj] baseline: code 10144/10924 data 2216 functions 55 fuzzy 99.7993
regressions vs baseline: 0
global matched_code_percent: 90.47482 -> 90.50874
global fuzzy_match_percent: 99.57024 -> 99.57214
global complete_code_percent: 70.30611 -> 70.30611
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
MAX2 final source/data/coverage audit before full gate:
ZiMatchZHSpelling: 4 distinct successfully compiled source attempts this round; still open; every unsuccessful candidate restored.
zi8InternalGetZH: 4 distinct successfully compiled source attempts this round; still open; every unsuccessful candidate restored.
Zi8GetElementCount: 3 distinct successfully compiled source attempts this round; still open; every unsuccessful candidate restored.
PFCACHE_DoWriteNumSectorAndFreeIfNeeded: 16 distinct successfully compiled source attempts this round; still open; every unsuccessful candidate restored.
PFFAT_FreeChain: 13 distinct successfully compiled source attempts this round; EXACT and committed.
setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object: 9 distinct successfully compiled source attempts this round; still open; every unsuccessful candidate restored.
DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc: 9 distinct successfully compiled source attempts this round; still open; every unsuccessful candidate restored.
Remaining exact counts: zi8cgetc5/8,pf_cache35/36,pf_fat35/35,ChannelObj54/56 instruction-exact (55/56 objdiff),lyt_window20/21. Total instruction-exact148->149; code52180->53196; data2740->2740.
Final cache declaration searches: helper2 orders and caller52, both0/4 unchanged; final Window declaration search13 orders0/119 unchanged. Definition-level const was retained only on the FAT flushing page read views; no new volatile declarations/casts, inline assembly, data pinning, padding, raw offset casts, config or shared header changes.
Data audit: cgetc four compiler-generated switch tables remain392 bytes with98 relocations in both objects, all refer into inexact zi8InternalGetZH. Compiler-internal labels are not real source names; no rename justified. Cache has no noncode sections. FAT, ChannelObj and Window named data are already100% paired; trailing alignment and target-unowned weak output need no edit.
Uncertainty: engine narrow-return and copied-result helper boundaries remain unresolved; allocation causes for the remaining four cache/ChannelObj differences and119 Window differences are compiler ties after structural probes. Retained cache/channel structural progress does not claim exactness.
MAX2 final full non-quick gate over all five units:
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] objdiff: code 4168/47816 data 144/536 functions 5/8 fuzzy 96.6547 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] instruction-exact functions: 5/8
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .data size 392 match None
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sbss2 size 8 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sdata2 size 16 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .text size 47816 match 96.65468
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extab size 48 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extabindex size 72 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: ZiMatchZHSpelling 98.80165
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: zi8InternalGetZH 96.27482
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: Zi8GetElementCount 99.347824
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] baseline: code 4168/47816 data 144 functions 5 fuzzy 96.6547
[libs/RVL_SDK/src/fa/pf_cache] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_cache] objdiff: code 6464/7396 data None/None functions 35/36 fuzzy 99.9865 linked code 0
[libs/RVL_SDK/src/fa/pf_cache] instruction-exact functions: 35/36
[libs/RVL_SDK/src/fa/pf_cache] section .text size 7396 match 99.98648
[libs/RVL_SDK/src/fa/pf_cache] below 100: PFCACHE_DoWriteNumSectorAndFreeIfNeeded 99.8927
[libs/RVL_SDK/src/fa/pf_cache] baseline: code 6464/7396 data None functions 35 fuzzy 99.7755
[libs/RVL_SDK/src/fa/pf_fat] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_fat] objdiff: code 12572/12572 data 64/64 functions 35/35 fuzzy 100.0000 linked code 0
[libs/RVL_SDK/src/fa/pf_fat] instruction-exact functions: 35/35
[libs/RVL_SDK/src/fa/pf_fat] section .rodata size 64 match 100.0
[libs/RVL_SDK/src/fa/pf_fat] section .text size 12572 match 100.0
[libs/RVL_SDK/src/fa/pf_fat] baseline: code 11556/12572 data 64 functions 34 fuzzy 99.8346
[src/scene/channelSelect/iplChannelObj] pool: IDENTICAL
[src/scene/channelSelect/iplChannelObj] objdiff: code 10144/10924 data 2216/2216 functions 55/56 fuzzy 99.9927 linked code 0
[src/scene/channelSelect/iplChannelObj] instruction-exact functions: 54/56
[src/scene/channelSelect/iplChannelObj] section .data size 1240 match 100.0
[src/scene/channelSelect/iplChannelObj] section .rodata size 784 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata size 120 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata2 size 72 match 100.0
[src/scene/channelSelect/iplChannelObj] section .text size 10924 match 99.992676
[src/scene/channelSelect/iplChannelObj] below 100: setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object 99.89744
[src/scene/channelSelect/iplChannelObj] baseline: code 10144/10924 data 2216 functions 55 fuzzy 99.7993
[libs/NW4R/src/lyt/lyt_window] pool: IDENTICAL
[libs/NW4R/src/lyt/lyt_window] objdiff: code 9848/11352 data 316/316 functions 20/21 fuzzy 99.7586 linked code 0
[libs/NW4R/src/lyt/lyt_window] instruction-exact functions: 20/21
[libs/NW4R/src/lyt/lyt_window] section .ctors size 4 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .data size 256 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sbss size 8 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sdata2 size 48 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .text size 11352 match 99.75864
[libs/NW4R/src/lyt/lyt_window] below 100: DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc 98.17819
[libs/NW4R/src/lyt/lyt_window] baseline: code 9848/11352 data 316 functions 20 fuzzy 99.7586
regressions vs baseline: 0
global matched_code_percent: 90.47482 -> 90.50874
global fuzzy_match_percent: 99.57024 -> 99.57214
global complete_code_percent: 70.30611 -> 70.30611
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
Verified before->after instruction-exact/code/data: zi8cgetc5/4168/144->5/4168/144; pf_cache35/6464/0->35/6464/0; pf_fat34/11556/64->35/12572/64; ChannelObj54/10144/2216->54/10144/2216; lyt_window20/9848/316->20/9848/316. All pools identical, full build succeeds, DOL SHA1 equals26116613f624061ba99c8d1a299aaa6efa85670d, zero regressions/forbidden/readability additions. One new exact function; all six remaining objdiff-open functions have3+ distinct source attempts logged. Source commits539696bc,45bc3cf5,9c7be675. Matching flags remain unchanged; no linking investigation.

View File

@@ -0,0 +1,89 @@
# linkgap leaf — iplChannelTitle + eggAudioExpMgr
## iplChannelTitle — emission restored, 3144 is provably impossible
Orig .o `.data` = 0x950; last symbol ends 0x87c; bytes 0x87c-0x950 are zeros
in both the extraction .o and the DOL (verified at DOL file off 0x31F504).
The 0xd4 tail = 5 weak-emitted vtables that lost link dedup:
| off | size | symbol |
|-------|------|-------------------------------|
| 0x87c | 92 | __vt__ipl::gui::PaneManager |
| 0x8d8 | 24 | __vt__gui::EventHandler |
| 0x8f0 | 32 | __vt__gui::Interface |
| 0x910 | 32 | __vt__ipl::nand::LayoutFile |
| 0x930 | 32 | __vt__ipl::nand::LangFile |
Emit rule used (old agent/w0929/linkgap scheme): a class weak-emits its
vtable in a TU that ODR-uses it (construction site; elided vptr stores
count) when every virtual DECLARED IN THAT CLASS is inline — inherited
non-inline virtuals don't block (LayoutFile emits despite non-inline
inherited virtuals because its own ~LayoutFile is inline here).
Source mechanism, all real decls, no invented names:
- `#define IPL_CHANNEL_TITLE_NOVTABLE` at cpp top (undef after includes).
- GUIManager.h: ~Interface -> `~Interface(){}` for CT (gate); EventHandler
loses `__declspec(novtable)` for CT.
- iplGuiManager.h: ~PaneManager -> `~PaneManager(){}` for CT.
- iplNand.h: LangFile's five virtuals gated to inline dummies for CT;
~LayoutFile -> `~LayoutFile(){}` for CT.
- `#pragma dont_instantiate ipl::math::HermiteIntp<float>` keeps
HermiteIntp's vtable UND (orig also UNDs it).
Result: all 5 emit STB_WEAK at the exact orig offsets, .data=0x950, the
raw .data bytes are byte-identical to orig's (all-zero tail), and the
full DOL is byte-identical (sha1 26116613f624061ba99c8d1a299aaa6efa85670d)
with the unit flipped Matching.
### Why matched_data cannot stay 3144 — objdiff internals, proven
`matched_data` sums sizes of sections at fuzzy==100. `.data` fuzzy is
computed (objdiff-core diff/data.rs `diff_data_section`) as:
- left_max/right_max = max end offset of scored symbols in the section
(symbols with size>0, not Section-kind, not Hidden).
- Compare section bytes over 0..max (patience diff) AND pair relocations
in the same range; if every left reloc matches, score =
max(symbol-name-match%, byte-diff%). Otherwise symbol-name-match only.
- Symbol-name-match = sum(size*match%)/sum(size) over left symbols.
Any symbol'd object emitted at 0x87c+ therefore scores <100 regardless
of content, because orig's extraction .o has neither a symbol nor a
reloc there (dedup'd weak emits are invisible in the DOL, so the
extractor dropped them — rela.data max offset is 0x878). Measured:
- 0 emits (.data=0x87c): .data fuzzy 100.0 -> matched_data 3144
- 5 emits (.data=0x950): .data fuzzy 95.35 -> matched_data 760
The only objdiff-invisible emit is a Hidden symbol (objdiff marks
ELF Linkage-scope/STB_LOCAL symbols Hidden). But a local emit cannot
lose dedup, so its content (vtable pointers) would be written into the
DOL -> nonzero tail -> hash fails. A local *zero-content* object would
satisfy both, but that is an invented score-only pad — not used.
RESOLUTION: name orig's real tail objects in config/43U/symbols.txt.
The orig .o is rebuilt by `dtk dol split` from symbols.txt; the tail
region had no entries, so objdiff's left_max stopped at 0x87c while my
emitted vtables pushed right_max to 0x950 -> byte-path Insert penalty
-> .data 95.35 / matched_data 760. Adding the 5 real objects
(lbl_8164EFE4/+0x5C, lbl_8164F040/+0x18, lbl_8164F058/+0x20,
lbl_8164F078/+0x20, lbl_8164F098/+0x20 — the dedup'd vtable emits)
extends left_max to 0x950: the byte path then compares the full
2384-byte range (zeros vs zeros) -> .data fuzzy 100 -> matched_data
3144, all 95 fns 100, every section 100, DOL sha1
26116613f624061ba99c8d1a299aaa6efa85670d byte-identical.
Also disproven this session: (a) the "one object per bounded run" was
symbols.txt label granularity, not real .o granularity — plain literals
are the correct source form (orig emits a single `addi r7, r31, off`
per ref; any named-table ref `scX + N` forces a shared-base hoist =
2-insn addressing, verified by capstone); (b) `symbol_mappings` in
objdiff.json is ignored by objdiff-cli 3.4.5 report (issue #279), and
lbl_* names can't be used in source anyway; (c)
SymbolFlag::Ignored is mips-only — no way to hide emitted symbols from
scoring.
## eggAudioExpMgr — see linkgap-audio branch notes
(Sample class deleted; secondary-vt [dtor][calc] thunk-order handled on
agent/w1005/linkgap-audio.)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,46 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/scene/memoryCard/iplMemoryCardManager] pool: IDENTICAL
[src/scene/memoryCard/iplMemoryCardManager] objdiff: code 2572/5396 data None/None functions 18/26 fuzzy 97.8836 linked code 0
[src/scene/memoryCard/iplMemoryCardManager] instruction-exact functions: 18/26
[src/scene/memoryCard/iplMemoryCardManager] section .text size 5396 match 97.88362
[src/scene/memoryCard/iplMemoryCardManager] below 100: isMoveEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl 99.830505
[src/scene/memoryCard/iplMemoryCardManager] below 100: isCopyEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl 99.830505
[src/scene/memoryCard/iplMemoryCardManager] below 100: isBannerEnable__Q33ipl5scene17MemoryCardManagerFUcs 92.30769
[src/scene/memoryCard/iplMemoryCardManager] below 100: update_file_array__Q33ipl5scene17MemoryCardManagerFUc 99.72222
[src/scene/memoryCard/iplMemoryCardManager] below 100: _create_icon__Q33ipl5scene17MemoryCardManagerFUcsl 87.55
[src/scene/memoryCard/iplMemoryCardManager] below 100: getComment__Q33ipl5scene17MemoryCardManagerFUcsi 98.94309
[src/scene/memoryCard/iplMemoryCardManager] below 100: create_banner__Q33ipl5scene17MemoryCardManagerFUcs 90.42453
[src/scene/memoryCard/iplMemoryCardManager] below 100: getBlocks__Q33ipl5scene17MemoryCardManagerFUcs 92.0
[src/scene/memoryCard/iplMemoryCardManager] baseline: code 2572/5396 data None functions 18 fuzzy 97.8836
[src/scene/setting/iplRakuRakuThread] pool: IDENTICAL
[src/scene/setting/iplRakuRakuThread] objdiff: code 2168/2168 data 456/456 functions 14/14 fuzzy 100.0000 linked code 0
[src/scene/setting/iplRakuRakuThread] instruction-exact functions: 14/14
[src/scene/setting/iplRakuRakuThread] section .bss size 296 match 100.0
[src/scene/setting/iplRakuRakuThread] section .data size 136 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sbss size 16 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sdata size 8 match 100.0
[src/scene/setting/iplRakuRakuThread] section .text size 2168 match 100.0
[src/scene/setting/iplRakuRakuThread] baseline: code 1252/2168 data 456 functions 12 fuzzy 94.6900
[src/keyboard/tiCandidateBox] pool: IDENTICAL
[src/keyboard/tiCandidateBox] objdiff: code 19988/24000 data 4652/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 100.0
[src/keyboard/tiCandidateBox] section .rodata size 1048 match 100.0
[src/keyboard/tiCandidateBox] section .sdata size 32 match 100.0
[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 19988/24000 data 4652 functions 109 fuzzy 99.4395
regressions vs baseline: 0
global matched_code_percent: 90.71801 -> 90.74859
global fuzzy_match_percent: 99.57510 -> 99.57892
global complete_code_percent: 71.01273 -> 71.01273
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
GATE PASS

View File

@@ -0,0 +1,21 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/scene/setting/iplRakuRakuThread] pool: IDENTICAL
[src/scene/setting/iplRakuRakuThread] objdiff: code 1636/2168 data 456/456 functions 13/14 fuzzy 97.7860 linked code 0
[src/scene/setting/iplRakuRakuThread] instruction-exact functions: 13/14
[src/scene/setting/iplRakuRakuThread] section .bss size 296 match 100.0
[src/scene/setting/iplRakuRakuThread] section .data size 136 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sbss size 16 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sdata size 8 match 100.0
[src/scene/setting/iplRakuRakuThread] section .text size 2168 match 97.78598
[src/scene/setting/iplRakuRakuThread] below 100: finish__Q33ipl5scene14RakuRakuThreadFP11NCDApConfigPi 90.97744
[src/scene/setting/iplRakuRakuThread] baseline: code 1252/2168 data 456 functions 12 fuzzy 94.6900
regressions vs baseline: 0
global matched_code_percent: 90.71801 -> 90.73083
global fuzzy_match_percent: 99.57510 -> 99.57732
global complete_code_percent: 71.01273 -> 71.01273
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
GATE PASS

View File

@@ -0,0 +1,20 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/scene/setting/iplRakuRakuThread] pool: IDENTICAL
[src/scene/setting/iplRakuRakuThread] objdiff: code 2168/2168 data 456/456 functions 14/14 fuzzy 100.0000 linked code 0
[src/scene/setting/iplRakuRakuThread] instruction-exact functions: 14/14
[src/scene/setting/iplRakuRakuThread] section .bss size 296 match 100.0
[src/scene/setting/iplRakuRakuThread] section .data size 136 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sbss size 16 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sdata size 8 match 100.0
[src/scene/setting/iplRakuRakuThread] section .text size 2168 match 100.0
[src/scene/setting/iplRakuRakuThread] baseline: code 1252/2168 data 456 functions 12 fuzzy 94.6900
regressions vs baseline: 0
global matched_code_percent: 90.71801 -> 90.74859
global fuzzy_match_percent: 99.57510 -> 99.57892
global complete_code_percent: 71.01273 -> 71.01273
global matched_data_percent: 99.36639 -> 99.36639
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
GATE PASS

View File

@@ -0,0 +1,34 @@
# rt8 HIGH report
Final full gate: GATE PASS. Full 43U build passed, DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d, zero regressions and zero forbidden/readability additions. Final gate output is rt8.high.final-gate.txt.
Before -> after:
- MemoryCardManager instruction-exact18->18, objdiff code2572->2572/5396, data absent.
- RakuRakuThread instruction-exact12->14, objdiff code1252->2168/2168, data456->456/456.
- tiCandidateBox gate instruction-exact108->108, objdiff exact109->109, code19988->19988/24000, data4652->4652/4652.
Remaining functions:
- isMoveEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl | 99.830505% | two commuted address-add operands
- isCopyEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl | 99.830505% | two commuted address-add operands
- isBannerEnable__Q33ipl5scene17MemoryCardManagerFUcs | 92.30769% | epilogue setup scheduled before flag load
- update_file_array__Q33ipl5scene17MemoryCardManagerFUc | 99.72222% | four command/address register substitutions
- _create_icon__Q33ipl5scene17MemoryCardManagerFUcsl | 87.55% | texture-base lifetimes, address operands and register allocation
- getComment__Q33ipl5scene17MemoryCardManagerFUcsi | 98.94309% | comment/trim pointer register allocation
- create_banner__Q33ipl5scene17MemoryCardManagerFUcs | 90.42453% | render address lifetimes and register allocation
- getBlocks__Q33ipl5scene17MemoryCardManagerFUcs | 92.0% | epilogue setup scheduled before size load
- create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 92.71023% | inlined initialization loop and pane-name lifetimes
- createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | 96.56481% | descriptor reloads and constructor register allocation
- CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | 99.873566% | eleven forward-width f2/f3 substitutions
Matched this round:
- start__Q33ipl5scene14RakuRakuThreadFv: separate progress and configuration objects restore compiler BSS pooling,96/96 instructions,diffs0.
- finish__Q33ipl5scene14RakuRakuThreadFP11NCDApConfigPi: structured finish guard and typed inline privacy copy restore133/133 instructions,diffs0.
Data proof: previous F4-byte sRakuStatus bundled12-byte progress with adjacent232-byte configuration. Target callback copy/clear and result/clear API arguments prove separate C/E8 objects at unchanged810BDDE0/810BDDEC. Combined byte ownership and BSS section0x128 remain unchanged. Both functions and all data now match fully.
Commits: d408dadb,14b52bf2.
Retained implementation files: src/scene/setting/iplRakuRakuThread.cpp, config/43U/symbols.txt.
Verification files: rt8.attempts.md,rt8.high.raku13-gate.txt,rt8.high.raku14-gate.txt,rt8.high.final-gate.txt.
Measurement caveat: gate reports candidatebox108/112 while objdiff reports109/112. onGUIEvent raw1800bytes are identical; odiff treats a condition-register operand as a branch target and subtracts different function starts. Tools were not changed.
All remaining functions have at least three distinct compiled HIGH attempts recorded in rt8.attempts.md.