Compare commits
1 Commits
cleanup/co
...
linkgap-au
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d790ea2111 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.59% | 90.81% | 71.43% | 99.37% |
|
||||
| 99.57% | 90.47% | 70.31% | 99.37% |
|
||||
|
||||
units 956/1027 complete, functions 12365/12563 matched.
|
||||
units 952/1027 complete, functions 12350/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 -->
|
||||
|
||||
@@ -11,8 +11,6 @@ splits: 'config/43U/splits.txt'
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- SOGetSockOpt
|
||||
- SOSetInterfaceOpt
|
||||
- fprintf
|
||||
- leap_days
|
||||
- __msl_time2tm
|
||||
|
||||
@@ -87,8 +87,7 @@ 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:0xC data:4byte
|
||||
sRakuConfiguration = .bss:0x810BDDEC; // type:object size:0xE8
|
||||
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
|
||||
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
|
||||
@@ -5159,7 +5158,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__Q33ipl5scene14RakuRakuThreadFP12RakuProgress = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .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
|
||||
@@ -16150,11 +16149,6 @@ 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
|
||||
|
||||
14
configure.py
14
configure.py
@@ -772,7 +772,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("channelTitle", [
|
||||
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
Object(Equivalent, "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(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "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"]),
|
||||
]
|
||||
@@ -1005,7 +1005,7 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(Matching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
Object(NonMatching, "clib/zmtkey.c"),
|
||||
@@ -1075,11 +1075,11 @@ config.libs = [
|
||||
Object(Matching, "nwc24/NWC24Utils.c"),
|
||||
Object(Matching, "nwc24/NWC24Manage.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgObj.c"),
|
||||
Object(Matching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(Matching, "nwc24/NWC24Mime.c"),
|
||||
Object(Matching, "nwc24/NWC24Stream.c"),
|
||||
Object(Matching, "nwc24/NWC24Parser.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
||||
Object(Matching, "nwc24/NWC24Schedule.c"),
|
||||
@@ -1098,7 +1098,7 @@ config.libs = [
|
||||
Object(Matching, "so/SOCommon.c"),
|
||||
Object(NonMatching, "so/SOBasic.c"),
|
||||
Object(Matching, "so/SOInformation.c"),
|
||||
Object(Matching, "so/SOOption.c"),
|
||||
Object(NonMatching, "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(Matching, "fa/pf_fat.c"),
|
||||
Object(NonMatching, "fa/pf_fat.c"),
|
||||
Object(Matching, "fa/pf_fat12.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
Object(Matching, "fa/pf_fat32.c"),
|
||||
|
||||
@@ -34,14 +34,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -18,11 +18,11 @@ namespace ipl {
|
||||
|
||||
class line_collision {
|
||||
public:
|
||||
line_collision() : mLeft(0.0f), mRight(0.0f), mY(0.0f) {}
|
||||
line_collision() : unk_0x00(0.0f), unk_0x04(0.0f), unk_0x08(0.0f) {}
|
||||
|
||||
f32 mLeft;
|
||||
f32 mRight;
|
||||
f32 mY;
|
||||
f32 unk_0x00;
|
||||
f32 unk_0x04;
|
||||
f32 unk_0x08;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
};
|
||||
|
||||
@@ -31,9 +31,9 @@ namespace ipl {
|
||||
url_collision();
|
||||
~url_collision();
|
||||
|
||||
int mTagNo;
|
||||
wchar_t* mpStart;
|
||||
wchar_t* mpEnd;
|
||||
int unk_0x00;
|
||||
wchar_t* unk_0x04;
|
||||
wchar_t* unk_0x08;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
nw4r::ut::List mLineCollisions; // 0x14
|
||||
};
|
||||
@@ -53,19 +53,19 @@ namespace ipl {
|
||||
void parse(nw4r::ut::PrintContext<wchar_t>* context);
|
||||
|
||||
BOOL is_focused() const;
|
||||
void select(int tagNo);
|
||||
void select(int unk);
|
||||
|
||||
int get_focused_tagno(int chan) const;
|
||||
url_collision* get_selected_col();
|
||||
|
||||
void get_url(char* urlOut, u32 urlLen);
|
||||
|
||||
void setHitYOffset(f32 val) { mHitYOffset = val; }
|
||||
void setMemoTranslateY(f32 val) { mMemoTranslateY = val; }
|
||||
void setFocusEnabled(bool val) { mbFocusEnabled = val; }
|
||||
void setUnk_0x40(f32 val) { unk_0x40 = val; }
|
||||
void setUnk_0x44(f32 val) { unk_0x44 = val; }
|
||||
void setUnk_0x53(bool val) { unk_0x53 = val; }
|
||||
|
||||
u8 getColorPass() const { return mbColorPass; }
|
||||
void setColorPass(u8 val) { mbColorPass = val; }
|
||||
u8 getUnk_0x50() const { return unk_0x50; }
|
||||
void setUnk_0x50(u8 val) { unk_0x50 = val; }
|
||||
|
||||
private:
|
||||
typedef struct {
|
||||
@@ -75,14 +75,14 @@ namespace ipl {
|
||||
|
||||
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
|
||||
nw4r::ut::List mUrlCollisions; // 0x34
|
||||
f32 mHitYOffset;
|
||||
f32 mMemoTranslateY;
|
||||
int mCurTagNo;
|
||||
int mSelectedTagNo;
|
||||
u8 mbColorPass;
|
||||
u8 mbInTag;
|
||||
u8 mbHoverOffset;
|
||||
u8 mbFocusEnabled;
|
||||
f32 unk_0x40;
|
||||
f32 unk_0x44;
|
||||
int unk_0x48;
|
||||
int unk_0x4C;
|
||||
u8 unk_0x50;
|
||||
u8 unk_0x51;
|
||||
u8 unk_0x52;
|
||||
u8 unk_0x53;
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -145,7 +145,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int mAnimWait;
|
||||
int unk_0x54;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
|
||||
@@ -62,17 +62,17 @@ namespace ipl {
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
|
||||
typedef struct CmdEntry {
|
||||
typedef struct Unk {
|
||||
int command; // 0x00
|
||||
u32 msgID; // 0x04
|
||||
} CmdEntry;
|
||||
} Unk;
|
||||
|
||||
CmdEntry mCmdQueue[64];
|
||||
Unk unk_0x64[64];
|
||||
|
||||
int mQueueCapacity;
|
||||
int mQueueCount;
|
||||
int mQueueRead;
|
||||
int mQueueWrite;
|
||||
int unk_0x264;
|
||||
int unk_0x268;
|
||||
int unk_0x26C;
|
||||
int unk_0x270;
|
||||
|
||||
int mSettingArg; // 0x274
|
||||
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace ipl {
|
||||
|
||||
int mIPLState; // 0x04
|
||||
volatile BS2State mState; // 0x08
|
||||
bool mbTickEnabled; // 0x0C
|
||||
bool mbUpdateRequested; // 0x0D
|
||||
bool mbAbortRequested; // 0x0E
|
||||
bool mbRestartRequested; // 0x0F
|
||||
bool unk_0x0C;
|
||||
bool unk_0x0D;
|
||||
bool unk_0x0E;
|
||||
bool unk_0x0F;
|
||||
bool mbIsDiagDisc; // 0x10
|
||||
bool mbIncludesSeatTitles; // 0x11
|
||||
u8* mpBannerBuffer; // 0x14
|
||||
|
||||
@@ -118,26 +118,26 @@ namespace ipl {
|
||||
public:
|
||||
Base(int chan, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
mDecideHoldCount = 0;
|
||||
unk_0x08 = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = 2;
|
||||
mbForceInvalid = 0;
|
||||
unk_0x1C = 0;
|
||||
KPADEnableDPD(chan);
|
||||
mbPinch = 0;
|
||||
mbPrevPinch = 0;
|
||||
mpStatus = &status;
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &status;
|
||||
}
|
||||
|
||||
Base(int chan, int type, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
mDecideHoldCount = 0;
|
||||
unk_0x08 = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = type;
|
||||
mbForceInvalid = 0;
|
||||
unk_0x1C = 0;
|
||||
KPADEnableDPD(chan);
|
||||
}
|
||||
|
||||
@@ -152,15 +152,15 @@ namespace ipl {
|
||||
|
||||
protected:
|
||||
u8 mButton;
|
||||
u32 mDecideHoldCount;
|
||||
u32 unk_0x08;
|
||||
OSTick mLastRumbleTime;
|
||||
s32 mRumbleType;
|
||||
u32 mChan;
|
||||
u32 mType;
|
||||
u8 mbForceInvalid;
|
||||
u8 mbPinch;
|
||||
u8 mbPrevPinch;
|
||||
KPADStatus* mpStatus;
|
||||
u8 unk_0x1C;
|
||||
u8 unk_0x1D;
|
||||
u8 unk_0x1E;
|
||||
KPADStatus* unk_0x20;
|
||||
};
|
||||
|
||||
class Revolution : public Base {
|
||||
@@ -206,8 +206,8 @@ namespace ipl {
|
||||
virtual BOOL isValidDpdClassic() const;
|
||||
|
||||
private:
|
||||
math::VEC2 mClassicCursor;
|
||||
int mClassicCursorTimer;
|
||||
math::VEC2 unk_0x24;
|
||||
int unk_0x2C;
|
||||
};
|
||||
|
||||
class Master : public Interface {
|
||||
@@ -264,18 +264,18 @@ namespace ipl {
|
||||
public:
|
||||
Base(int chan, KPADStatus& arg1) {
|
||||
mButton = 0;
|
||||
mDecideHoldCount = 0;
|
||||
unk_0x08 = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = 2;
|
||||
mbForceInvalid = 0;
|
||||
unk_0x1C = 0;
|
||||
|
||||
KPADEnableDPD(chan);
|
||||
|
||||
mbPinch = 0;
|
||||
mbPrevPinch = 0;
|
||||
mpStatus = &arg1;
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &arg1;
|
||||
}
|
||||
|
||||
virtual ~Base(); // 0x08
|
||||
@@ -326,15 +326,15 @@ namespace ipl {
|
||||
|
||||
// protected:
|
||||
u8 mButton; // 0x4
|
||||
u32 mDecideHoldCount; // 0x8
|
||||
u32 unk_0x08; // 0x8
|
||||
OSTick mLastRumbleTime; // 0xC
|
||||
s32 mRumbleType; // 0x10
|
||||
u32 mChan; // 0x14
|
||||
u32 mType; // 0x18
|
||||
u8 mbForceInvalid;
|
||||
u8 mbPinch; // 0x1D
|
||||
u8 mbPrevPinch; // 0x1E
|
||||
KPADStatus* mpStatus; // 0x20
|
||||
u8 unk_0x1C;
|
||||
u8 unk_0x1D; // 0x1D
|
||||
u8 unk_0x1E; // 0x1E
|
||||
KPADStatus* unk_0x20; // 0x20
|
||||
};
|
||||
|
||||
class Interface : public Base {
|
||||
@@ -446,8 +446,8 @@ namespace ipl {
|
||||
virtual BOOL isValidDpdClassic() const; // 0x8C
|
||||
|
||||
private:
|
||||
math::VEC2 mClassicCursor;
|
||||
int mClassicCursorTimer;
|
||||
math::VEC2 unk_0x24;
|
||||
int unk_0x2C;
|
||||
};
|
||||
|
||||
class Manager {
|
||||
|
||||
@@ -60,9 +60,9 @@ namespace ipl {
|
||||
|
||||
int mMessageID; // 0x08
|
||||
|
||||
int mArg2;
|
||||
int mArg3;
|
||||
char mArg1[4];
|
||||
int unk_0x0C;
|
||||
int unk_0x10;
|
||||
char unk_0x14[4];
|
||||
|
||||
u8* mpArcData; // 0x18
|
||||
u32 mArcSize; // 0x1C
|
||||
|
||||
@@ -145,13 +145,6 @@ 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
|
||||
@@ -159,7 +152,6 @@ 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; }
|
||||
@@ -173,11 +165,7 @@ 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
|
||||
|
||||
@@ -139,7 +139,7 @@ namespace ipl {
|
||||
|
||||
bool received() { return mbReviecedMsg; }
|
||||
void prepNextReceive() { mbReviecedMsg = false; }
|
||||
volatile bool isReceivingIdle() { return mbReceiving == false; }
|
||||
volatile bool isUnk0xA31() { return unk_0xA31 == false; }
|
||||
|
||||
BOOL isAppDlEnableLock(u32 appId) {
|
||||
utility::autoMutexLock lock(mAutoLock);
|
||||
@@ -175,9 +175,9 @@ namespace ipl {
|
||||
OSMutex mAutoLock; // 0xA18
|
||||
|
||||
bool mbReviecedMsg;
|
||||
bool mbReceiving;
|
||||
bool unk_0xA31;
|
||||
bool mbReceivePaused; // 0xA32
|
||||
bool mbNewTitleTblReady;
|
||||
bool unk_0xA33;
|
||||
|
||||
static Arg smArg;
|
||||
|
||||
|
||||
@@ -1120,7 +1120,6 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
case 's':
|
||||
if (format.argument_options == wchar_argument) {
|
||||
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
|
||||
int wideLength;
|
||||
|
||||
if (wcs_ptr == NULL) {
|
||||
wcs_ptr = L"";
|
||||
@@ -1128,24 +1127,22 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
|
||||
if (format.alternate_form) {
|
||||
wchar_t first = *wcs_ptr++;
|
||||
wideLength = (unsigned char)first;
|
||||
num_chars = (unsigned char)first;
|
||||
|
||||
if (format.precision_specified && wideLength > format.precision) {
|
||||
wideLength = format.precision;
|
||||
if (format.precision_specified && num_chars > format.precision) {
|
||||
num_chars = format.precision;
|
||||
}
|
||||
} else if (format.precision_specified) {
|
||||
wideLength = format.precision;
|
||||
num_chars = format.precision;
|
||||
|
||||
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, wideLength)) != 0) {
|
||||
wideLength = string_end - wcs_ptr;
|
||||
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, num_chars)) != 0) {
|
||||
num_chars = string_end - wcs_ptr;
|
||||
}
|
||||
|
||||
} else {
|
||||
wideLength = wcslen(wcs_ptr);
|
||||
num_chars = wcslen(wcs_ptr);
|
||||
}
|
||||
|
||||
num_chars = wideLength;
|
||||
|
||||
buff_ptr = wcs_ptr;
|
||||
break;
|
||||
} else {
|
||||
|
||||
@@ -314,7 +314,7 @@ namespace nw4r {
|
||||
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
|
||||
u32 glgrInnerLen;
|
||||
HeaderedGlyphGroups* pGlgr;
|
||||
const ArchiveFontBinaryLayout* font;
|
||||
ArchiveFontBinaryLayout* font;
|
||||
u8* glgrEnd;
|
||||
|
||||
u32 expectedMaxSize;
|
||||
@@ -337,7 +337,7 @@ namespace nw4r {
|
||||
|
||||
// Copy the glgr to work
|
||||
{
|
||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
||||
pGlgr = &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 = (HeaderedGlyphGroups*)&font->glgr;
|
||||
pGlgr = &font->glgr;
|
||||
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
||||
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
||||
// return CONSTRUCT_STATE_FATAL_ERR;
|
||||
|
||||
@@ -63,7 +63,7 @@ typedef struct {
|
||||
u8 mcuYRem; // 0x0F
|
||||
u16 mcuYCount; // 0x10
|
||||
u16 mcuXCount2; // 0x12
|
||||
u32 mcuTotal; // 0x14
|
||||
u32 unk_0x14;
|
||||
u8 remX; // 0x18
|
||||
u8 remY; // 0x19
|
||||
u8 compCount; // 0x1A
|
||||
@@ -142,7 +142,7 @@ struct TMCCJPEGDecWork_t {
|
||||
u8 mcuYRem; // 0x17FF
|
||||
u16 mcuYCount; // 0x1800
|
||||
u16 mcuXCount2; // 0x1802
|
||||
u32 mcuTotal; // 0x1804
|
||||
u32 unk_0x1804;
|
||||
u8 remX; // 0x1808
|
||||
u8 remY; // 0x1809
|
||||
u8 compCount; // 0x180A
|
||||
|
||||
@@ -51,7 +51,7 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
state->componentCount = work->componentCount;
|
||||
state->result = work->mcuTotal;
|
||||
state->result = work->unk_0x1804;
|
||||
state->maxX = work->mcuYCount;
|
||||
state->maxY = work->mcuXCount2;
|
||||
|
||||
|
||||
@@ -567,7 +567,7 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
||||
|
||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||
p->mcuTotal = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
p->unk_0x14 = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
|
||||
for (idx = 0; idx < (s32)p->scanCompCount; idx++) {
|
||||
u8 compId;
|
||||
@@ -1929,7 +1929,7 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
||||
mcuCountY += yr;
|
||||
frameInfo->mcuYCount = mcuCountX;
|
||||
frameInfo->mcuXCount2 = mcuCountY;
|
||||
work->mcuTotal = (u32)mcuCountX * (u32)mcuCountY;
|
||||
work->unk_0x1804 = (u32)mcuCountX * (u32)mcuCountY;
|
||||
}
|
||||
|
||||
compCount2 = frameInfo->compCount;
|
||||
|
||||
@@ -224,7 +224,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((green | red | blue) >> 8) {
|
||||
if ((blue | red | green) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((green | red | blue) >> 8) {
|
||||
if ((blue | red | green) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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 ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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;
|
||||
s32 crValue;
|
||||
s8 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 + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||
green = value + (-(crValue * 183 + cbValue * 88) >> 8);
|
||||
red = value + ((crValue * 359) >> 8);
|
||||
blue = value + ((cbValue * 454) >> 8);
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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;
|
||||
|
||||
@@ -303,7 +303,9 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 chromaXEnd;
|
||||
s32 row;
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 width;
|
||||
s32 height;
|
||||
@@ -314,6 +316,7 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* cb;
|
||||
u32 tileWidth;
|
||||
u8* cr;
|
||||
s32 chromaRowSkip;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -338,17 +341,18 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
for (row = y; row < chromaYEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaRowSkip = 8 - width;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cb += chromaRowSkip;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -205,12 +205,12 @@ typedef struct _ziUwdNode {
|
||||
|
||||
struct __zi8_work_data_s {
|
||||
ziU8 unk_0x00;
|
||||
ziU8 countOnly; // 0x01
|
||||
ziU8 unk_0x01;
|
||||
ziU8 unk_0x02[2];
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
ziU8 unk_0x09;
|
||||
ziU8 maxWordLength;
|
||||
ziU8 unk_0x0A;
|
||||
ziU8 unk_0x0B;
|
||||
ziU32 unk_0x0C;
|
||||
ziU32 unk_0x10;
|
||||
@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x17;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 separator; // 0x1A
|
||||
ziU16 unk_0x1A;
|
||||
ziU8 unk_0x1C[3];
|
||||
ziU8 unk_0x1F;
|
||||
ziU16 unk_0x20[0x40];
|
||||
@@ -265,25 +265,25 @@ struct __zi8_work_data_s {
|
||||
ziPtr unk_0x11FC;
|
||||
ziPtr userKeys[0x83]; // 0x1200
|
||||
ziU8 unk_0x140C[4];
|
||||
ziU32 formats; // 0x1410
|
||||
ziU32 unk_0x1410;
|
||||
ziU8 unk_0x1414[4];
|
||||
ziU8 formatCount;
|
||||
ziU8 unk_0x1418;
|
||||
ziU8 unk_0x1419;
|
||||
ziU16 capacity; // 0x141A
|
||||
ziU16 unk_0x141A;
|
||||
ziU8 unk_0x141C;
|
||||
ziU8 unk_0x141D;
|
||||
ziU8 graphTableId; // 0x141E
|
||||
ziU8 maxCnt; // 0x141F
|
||||
ziU8 unk_0x141E;
|
||||
ziU8 unk_0x141F;
|
||||
ziU8 unk_0x1420[4];
|
||||
zi8DawgCtx dawgCtx; // 0x1424
|
||||
ziU8 unk_0x1760[4]; // 0x1760
|
||||
ziU8* groupPtr; // 0x1764
|
||||
ziU8* unk_0x1764; // 0x1764
|
||||
ziU8 unk_0x1768;
|
||||
ziU8 unk_0x1769[0x81];
|
||||
ziU16 matchOffset; // 0x17EA
|
||||
ziU16 unk_0x17EA;
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
ziU8* unk_0x17F0;
|
||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||
ziU16 unk_0x1874;
|
||||
ziU8 unk_0x1876;
|
||||
|
||||
@@ -940,7 +940,8 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
for (tableIndex = 0; tableIndex < params->count;) {
|
||||
while (*output != 0) {
|
||||
if (*output != 0x27) {
|
||||
*output++ |= 0xf300;
|
||||
*output |= 0xf300;
|
||||
output++;
|
||||
} else {
|
||||
*output++ = 0xf360;
|
||||
}
|
||||
@@ -1003,7 +1004,7 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
totalCandidates = totalCandidates + 1;
|
||||
if (options->countOnly == 0) {
|
||||
output += phoneticIndex + 1;
|
||||
++candidateCount;
|
||||
candidateCount = candidateCount + 1;
|
||||
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||
} else {
|
||||
|
||||
@@ -285,9 +285,9 @@ static ziBool ZiIsLetterHyphen(ziWChar character ZI_NEED_WORK) {
|
||||
else return ZI8_FALSE;
|
||||
}
|
||||
|
||||
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ZiAlphaWork* work) {
|
||||
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ziPtr work) {
|
||||
enum { LOWER_CASE, UPPER_CASE } upper = LOWER_CASE;
|
||||
if (work->caseMode == 3) {
|
||||
if (((ZiAlphaWork*)work)->caseMode == 3) {
|
||||
Zi8ChangeCharCase(1, word++, language, work);
|
||||
} else if (((ZiAlphaWork*)work)->caseMode == 1) {
|
||||
upper = UPPER_CASE;
|
||||
|
||||
@@ -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->separator && *spelling != 0xF360 && spelling < end) {
|
||||
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *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->separator && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
|
||||
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
|
||||
break;
|
||||
}
|
||||
if (*spelling != *candidate) {
|
||||
@@ -753,7 +753,8 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
if (!componentTable) {
|
||||
componentCount = Zi8GetTableCount(1, 7, work);
|
||||
componentOrdinals = (ziU8*)Zi8GetTableAddress(1, 7, work);
|
||||
componentTable = componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
|
||||
componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
|
||||
componentTable = componentCursor;
|
||||
componentCursor += 8;
|
||||
--componentCount;
|
||||
componentIndex = componentCount;
|
||||
@@ -2868,7 +2869,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
ziU8 count;
|
||||
ziWChar spacedElements[256];
|
||||
struct { ziWChar separator; } savedState;
|
||||
savedState.separator = ZI_WORK->separator;
|
||||
savedState.separator = ZI_WORK->unk_0x1A;
|
||||
if (elementCount <= 1 || !charCount) {
|
||||
return elementCount;
|
||||
}
|
||||
@@ -2881,9 +2882,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
if (spacedIndex == elementCount) {
|
||||
return elementCount;
|
||||
}
|
||||
ZI_WORK->separator = 0xF360;
|
||||
ZI_WORK->unk_0x1A = 0xF360;
|
||||
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
|
||||
ZI_WORK->separator = savedState.separator;
|
||||
ZI_WORK->unk_0x1A = savedState.separator;
|
||||
spacedIndex = elementIndex = count = 0;
|
||||
while (charCount && elementIndex < elementCount) {
|
||||
if (spacedElements[spacedIndex] == 0xF360) {
|
||||
|
||||
@@ -39,10 +39,10 @@ ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
}
|
||||
if (mode == 1) acceptPrefix = 0;
|
||||
} else {
|
||||
if (ZI_WORK->graphTableId != 0 && graphTable == 0xc &&
|
||||
Zi8GetTableSize(language, ZI_WORK->graphTableId, ZI_WORK) != 0) {
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->graphTableId, ZI_WORK);
|
||||
keyTable = ZI_WORK->graphTableId + 1;
|
||||
if (ZI_WORK->unk_0x141E != 0 && graphTable == 0xc &&
|
||||
Zi8GetTableSize(language, ZI_WORK->unk_0x141E, ZI_WORK) != 0) {
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->unk_0x141E, ZI_WORK);
|
||||
keyTable = ZI_WORK->unk_0x141E + 1;
|
||||
} else {
|
||||
if (Zi8GetTableSize(language, graphTable, ZI_WORK) == 0) {
|
||||
Zi8LogError(0x961, ZI_WORK);
|
||||
@@ -136,7 +136,7 @@ descend:
|
||||
records[context->cnt].node = ZiDAWGGetChild(records[context->cnt - 1].node);
|
||||
if (records[context->cnt].node == (ziU8*)0) goto next_sibling;
|
||||
context->cnt++;
|
||||
if (ZI_WORK->maxCnt < context->cnt) ZI_WORK->maxCnt = context->cnt;
|
||||
if (ZI_WORK->unk_0x141F < context->cnt) ZI_WORK->unk_0x141F = context->cnt;
|
||||
goto update_current;
|
||||
next_sibling:
|
||||
while (context->cnt != 0) {
|
||||
@@ -184,36 +184,36 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
|
||||
|
||||
result = 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->groupPtr = (ziU8*)group;
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)group;
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
||||
ZI_WORK->groupPtr = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->groupPtr != 0) {
|
||||
for (; (*ZI_WORK->groupPtr != 0xff && ((groupIndex & 0xff) != 0));
|
||||
if (ZI_WORK->unk_0x1764 != 0) {
|
||||
for (; (*ZI_WORK->unk_0x1764 != 0xff && ((groupIndex & 0xff) != 0));
|
||||
groupIndex = groupIndex - 1) {
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
ZI_WORK->groupPtr += 2;
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
}
|
||||
ZI_WORK->groupPtr++;
|
||||
ZI_WORK->unk_0x1764++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,capacity & 0xffff,
|
||||
mode & 0xff,status & 0xff,0,1,acceptPrefix,0,&ZI_WORK->dawgCtx,
|
||||
ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,
|
||||
capacity & 0xffff,mode & 0xff,status & 0xff,
|
||||
*ZI_WORK->groupPtr,
|
||||
ZI_WORK->groupPtr[1],acceptPrefix,0,
|
||||
*ZI_WORK->unk_0x1764,
|
||||
ZI_WORK->unk_0x1764[1],acceptPrefix,0,
|
||||
&ZI_WORK->dawgCtx,ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
if ((result & 0xff) != 0) break;
|
||||
ZI_WORK->groupPtr += 2;
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
status = 0;
|
||||
}
|
||||
}
|
||||
@@ -230,31 +230,31 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
if (reservedMode != 0) return 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1768 = 0;
|
||||
ZI_WORK->matchOffset = 0;
|
||||
ZI_WORK->unk_0x17EA = 0;
|
||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
||||
ZI_WORK->graphTableId = 0x10;
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
} else {
|
||||
ZI_WORK->graphTableId = 0;
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
}
|
||||
}
|
||||
search_segment:
|
||||
ZI_WORK->maxCnt = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
ZI_WORK->unk_0x141F = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
mode, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
for (index = (ziU8)(ZI_WORK->matchOffset + result); index != 0; index--) {
|
||||
for (index = (ziU8)(ZI_WORK->unk_0x17EA + result); index != 0; index--) {
|
||||
output[index - 1] = ZI_WORK->unk_0x17F4[index - 1];
|
||||
}
|
||||
result = (ziU8)(result + ZI_WORK->matchOffset);
|
||||
result = (ziU8)(result + ZI_WORK->unk_0x17EA);
|
||||
} else {
|
||||
if (status != 0 || count == 1) goto finish_segments;
|
||||
if (mode == 1 && ZI_WORK->unk_0x1768 == 0 &&
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
0, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK) != 0) goto finish_segments;
|
||||
if ((Zi8GetTableCount(language, 0x1f, ZI_WORK) & 4) == 0) {
|
||||
@@ -262,25 +262,25 @@ search_segment:
|
||||
if (elements[index] == 0xeff1) goto finish_segments;
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->maxCnt > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->maxCnt; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
if (ZI_WORK->unk_0x141F > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->unk_0x141F; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
1, 0, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
ZI_WORK->matchOffset += (ziU8)result;
|
||||
if (ZI_WORK->matchOffset == count) return 0;
|
||||
ZI_WORK->unk_0x17EA += (ziU8)result;
|
||||
if (ZI_WORK->unk_0x17EA == count) return 0;
|
||||
ZI_WORK->unk_0x1768++;
|
||||
status = 0;
|
||||
ZI_WORK->graphTableId = 0;
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
if (ZI_WORK->dawgCtx.key == 0 && language == 10) {
|
||||
for (index = 0; index < ZI_WORK->matchOffset; index++) {
|
||||
for (index = 0; index < ZI_WORK->unk_0x17EA; index++) {
|
||||
switch (ZI_WORK->unk_0x17F4[index]) {
|
||||
case 0x61:
|
||||
case 0x6f:
|
||||
case 0x75:
|
||||
ZI_WORK->graphTableId = 0x10;
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
goto search_segment;
|
||||
}
|
||||
}
|
||||
@@ -306,7 +306,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
@@ -316,30 +316,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) break;
|
||||
status = 0;
|
||||
if (count <= 1 && language == 0x36) break;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
}
|
||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||
mode = 0;
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize != 0) {
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
|
||||
@@ -50,11 +50,11 @@ ziBool Zi8ZHsetZYfuzzyPairs(ziFuzzyZYPairs pairs ZI_NEED_WORK) {
|
||||
|
||||
ziBool Zi8SetLatinSearchOrder(ziU8* searchArray, ziU8 searchSize ZI_NEED_WORK) {
|
||||
if (searchArray == 0 || *searchArray == 0) {
|
||||
ZI_WORK->formats = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->formatCount = 9;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->unk_0x1418 = 9;
|
||||
} else {
|
||||
ZI_WORK->formats = (ziU32)searchArray;
|
||||
ZI_WORK->formatCount = searchSize;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)searchArray;
|
||||
ZI_WORK->unk_0x1418 = searchSize;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
@@ -175,7 +175,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
current = signatures.first;
|
||||
length = signatures.length;
|
||||
}
|
||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
@@ -185,7 +185,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
if (parameters->letters == 2) {
|
||||
current = signatures.second;
|
||||
length = secondLength;
|
||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
@@ -194,7 +194,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
*output++ = 0;
|
||||
}
|
||||
*output++ = 0;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
@@ -279,13 +279,13 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
||||
|
||||
ziU8 _Zi8GetCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
ZiCandidateOptions options = {0};
|
||||
options.capacity = ZI_WORK->capacity;
|
||||
options.capacity = ZI_WORK->unk_0x141A;
|
||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||
}
|
||||
|
||||
ziU8 _Zi8CheckCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
ZiCandidateOptions options = {0};
|
||||
options.capacity = ZI_WORK->capacity;
|
||||
options.capacity = ZI_WORK->unk_0x141A;
|
||||
options.flags = 1;
|
||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||
}
|
||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEFF2) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -493,8 +493,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->maxWordLength;
|
||||
ZI_WORK->maxWordLength = -1;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
ZI_WORK->unk_0x0A = -1;
|
||||
if ((ziU8)Zi8LangSupported(parameters->language,ZI_WORK) == 0) {
|
||||
Zi8LogError(0x163,ZI_WORK);
|
||||
return 0;
|
||||
@@ -711,6 +711,6 @@ void Zi8Memcpy(ziU8* destination, ziU8* source, ziS32 count) {
|
||||
}
|
||||
|
||||
ziBool Zi8SetMaxWordLength(ziU8 length ZI_NEED_WORK) {
|
||||
ZI_WORK->maxWordLength = length;
|
||||
ZI_WORK->unk_0x0A = length;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
Zi8Memset(__zi8_work_data, 0, 0x1B44);
|
||||
ZI_WORK->unk_0x08 = 1;
|
||||
ZI_WORK->unk_0x09 = 1;
|
||||
ZI_WORK->maxWordLength = 0xFF;
|
||||
ZI_WORK->unk_0x0A = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
ZI_WORK->separator = 0x20;
|
||||
ZI_WORK->unk_0x1A = 0x20;
|
||||
ZI_WORK->unk_0x1C[2] = 0;
|
||||
ZI_WORK->unk_0x1B30 = 0;
|
||||
ZI_WORK->unk_0x1B3A = 0;
|
||||
@@ -44,7 +44,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x1874 = 0x2D;
|
||||
ZI_WORK->language = 0;
|
||||
ZI_WORK->unk_0x1C[3] = 0;
|
||||
ZI_WORK->capacity = 0x100;
|
||||
ZI_WORK->unk_0x141A = 0x100;
|
||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||
ZI_WORK->unk_0x17 = 5;
|
||||
|
||||
@@ -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->separator;
|
||||
pdst[k++] = ZI_WORK->unk_0x1A;
|
||||
}
|
||||
psrc += i;
|
||||
n -= i;
|
||||
|
||||
@@ -41,7 +41,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
current = ZI_WORK->uwdList;
|
||||
while (current != 0) {
|
||||
candidate = (ziUserWord*)current->word;
|
||||
if (ZI_WORK->unk_0x12E == 1 && candidate->priority < word->priority) break;
|
||||
if (ZI_WORK->unk_0x12E == 1 && word->priority > candidate->priority) break;
|
||||
if (candidate->length == length) {
|
||||
position = 0;
|
||||
while (position < length) {
|
||||
|
||||
@@ -41,13 +41,6 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
return node;
|
||||
}
|
||||
|
||||
typedef struct ziDawgLongOffset {
|
||||
ziU8 flags;
|
||||
ziU8 middle;
|
||||
ziU8 low;
|
||||
} ziDawgLongOffset;
|
||||
typedef char ziDawgLongOffsetSizeCheck[(sizeof(ziDawgLongOffset) == 3) ? 1 : -1];
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
ziS32 depth;
|
||||
ziU8* node;
|
||||
@@ -77,14 +70,14 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
}
|
||||
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
node += (((const ziDawgLongOffset*)cursor)->flags & 0x7f) * 0x10000 +
|
||||
(((ziU32)(ziU16)cursor[1] << 8) +
|
||||
((const ziDawgLongOffset*)cursor)->low) + 0x8000;
|
||||
node += (*cursor & 0x7f) * 0x10000 +
|
||||
(((ziU32)cursor[1] << 8) + (ziU32)cursor[2]) + 0x8000;
|
||||
} else {
|
||||
node = cursor[1] + (node + (ziU16)*cursor * 0x100);
|
||||
}
|
||||
return node;
|
||||
} else {
|
||||
cursor = node;
|
||||
do {
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
|
||||
@@ -25,12 +25,6 @@ ziU8 Zi8GetFormatVersion(ziU8 ZI_NEED_WORK);
|
||||
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||
|
||||
typedef struct ziEncodedOrdinal {
|
||||
ziU8 low;
|
||||
ziU8 high;
|
||||
} ziEncodedOrdinal;
|
||||
typedef char ziEncodedOrdinalSizeCheck[(sizeof(ziEncodedOrdinal) == 2) ? 1 : -1];
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziChineseEntry* table = 0;
|
||||
ziU8* baseData = 0;
|
||||
@@ -45,8 +39,8 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziWChar* cursor;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->formats;
|
||||
ziU8 savedCount = ZI_WORK->formatCount;
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
ziSearchState search = {0};
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (word == 0 || *word == 0) {
|
||||
@@ -73,22 +67,22 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
request.candidates = ordinals;
|
||||
request.maxCandidates = 1;
|
||||
request.firstCandidate = 0;
|
||||
ZI_WORK->formats = (ziU32)formats;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)formats;
|
||||
if (ZI_WORK->unk_0x1C[0] == 2) {
|
||||
ZI_WORK->formatCount = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->formatCount = 2;
|
||||
else ZI_WORK->formatCount = 1;
|
||||
ZI_WORK->unk_0x1418 = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->unk_0x1418 = 2;
|
||||
else ZI_WORK->unk_0x1418 = 1;
|
||||
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
||||
ZI_WORK->formats = savedFormats;
|
||||
ZI_WORK->formatCount = savedCount;
|
||||
ZI_WORK->unk_0x1410 = savedFormats;
|
||||
ZI_WORK->unk_0x1418 = savedCount;
|
||||
if (count != 0) return 1;
|
||||
}
|
||||
if (language != 1) {
|
||||
@@ -140,10 +134,10 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
countLeft = count;
|
||||
cursor = ordinals;
|
||||
while (countLeft > 0) {
|
||||
value = ((ziU32)(ziU16)data[1] << 8) |
|
||||
((const ziEncodedOrdinal*)data)->low;
|
||||
value = (data[1] << 8) | data[0];
|
||||
data += 2;
|
||||
if (value != *++cursor) break;
|
||||
cursor++;
|
||||
if (value != *cursor) break;
|
||||
countLeft--;
|
||||
if (value & 0x8000) break;
|
||||
}
|
||||
|
||||
@@ -30,7 +30,8 @@ ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word
|
||||
index = ZI_WORK->oemIdx;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||
if ((ziS32)length >= (ziS32)--capacity) {
|
||||
capacity--;
|
||||
if ((ziS32)length >= (ziS32)capacity) {
|
||||
failed:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -242,8 +242,8 @@ typedef struct WPADCB {
|
||||
WPADCallback getInfoCB; // 0x988
|
||||
u8 getInfoBusy; // 0x98C
|
||||
|
||||
u8 encStatus; // 0x98D
|
||||
u8 continuous; // 0x98E
|
||||
u8 unk_0x98D; // 0x98D
|
||||
u8 unk_0x98E; // 0x98E
|
||||
u8 unk_0x98F[0x9A0 - 0x990];
|
||||
} WPADCB;
|
||||
|
||||
@@ -261,7 +261,7 @@ void WPADiExcludeButton(s32 chan);
|
||||
void WPADiCopyOut(s32 chan);
|
||||
|
||||
BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableDPD(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableSpeaker(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendGetContStat(WPADCommandQueue* pQueue, WPADInfo* pInfo, WPADCallback pCallback);
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct WPADMemBlock {
|
||||
int unk_0x04; // 0x04
|
||||
s16 unk_0x08; // 0x08
|
||||
int unk_0x0C; // 0x0C
|
||||
WPADCallback callback; // 0x10
|
||||
WPADCallback unk_0x10; // 0x10
|
||||
} WPADMemBlock;
|
||||
|
||||
typedef struct WPADGameInfo {
|
||||
|
||||
@@ -550,15 +550,7 @@ pf_s32 PFCACHE_DoWriteSector(PF_VOLUME* p_vol, PF_CACHE_PAGE** pp_head, const pf
|
||||
|
||||
#pragma dont_inline reset
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
#pragma dont_inline on
|
||||
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;
|
||||
@@ -617,9 +609,11 @@ 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 = num_sector;
|
||||
num_overlap += sector;
|
||||
last_sector = PFCACHE_RecordPageEndOverlap(p_page, num_overlap, p_num_success, &num_rest_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;
|
||||
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) {
|
||||
|
||||
@@ -1458,19 +1458,6 @@ 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)
|
||||
{
|
||||
@@ -1536,9 +1523,9 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
|
||||
}
|
||||
if (nextCluster == 0) {
|
||||
s32 firstFlushError;
|
||||
u32 fatSector;
|
||||
PF_CACHE_PAGE* flushPage;
|
||||
u16 fatIndex;
|
||||
const PF_CACHE_PAGE* flushPage;
|
||||
u32 fatSector;
|
||||
|
||||
firstFlushError = 0;
|
||||
flushPage = page;
|
||||
@@ -1559,20 +1546,34 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
|
||||
PFCACHE_FreeDataPage(volume, page);
|
||||
return 0;
|
||||
}
|
||||
{
|
||||
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 (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;
|
||||
}
|
||||
}
|
||||
if (error != 0) {
|
||||
PFCACHE_FreeDataPage(volume, page);
|
||||
return error;
|
||||
}
|
||||
if (size != 0 && fileSize != 0) {
|
||||
if (fileSize <= clusterSize) {
|
||||
fileSize = 0;
|
||||
@@ -1589,7 +1590,7 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
|
||||
s32 firstFlushError;
|
||||
u32 fatSector;
|
||||
u16 fatIndex;
|
||||
const PF_CACHE_PAGE* flushPage;
|
||||
PF_CACHE_PAGE* flushPage;
|
||||
|
||||
firstFlushError = 0;
|
||||
flushPage = page;
|
||||
|
||||
@@ -484,7 +484,6 @@ 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;
|
||||
@@ -497,19 +496,26 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
if (count < 3) {
|
||||
continue;
|
||||
}
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
output[2] = alphabet[value >> 6 & 0x3f];
|
||||
output[3] = alphabet[value & 0x3f];
|
||||
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;
|
||||
count = 0;
|
||||
output += 4;
|
||||
}
|
||||
|
||||
if (count == 2) {
|
||||
value <<= 8;
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
output[2] = alphabet[value >> 6 & 0x3f];
|
||||
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[3] = fillByte;
|
||||
return;
|
||||
}
|
||||
@@ -517,8 +523,10 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
return;
|
||||
}
|
||||
value <<= 16;
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
output[1] = encodedSecond;
|
||||
output[2] = fillByte;
|
||||
output[3] = fillByte;
|
||||
}
|
||||
|
||||
@@ -1283,7 +1283,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
p->sleeping = TRUE;
|
||||
p->getInfoBusy = FALSE;
|
||||
p->getInfoCB = NULL;
|
||||
p->continuous = 0;
|
||||
p->unk_0x98E = 0;
|
||||
|
||||
memset(&p->wpInfo, 0, sizeof(p->wpInfo));
|
||||
memset(&p->wmReadDataBuf, 0, sizeof(p->wmReadDataBuf));
|
||||
@@ -1315,7 +1315,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
_wmb[chan].unk_0x04 = 0;
|
||||
_wmb[chan].unk_0x08 = 0;
|
||||
_wmb[chan].unk_0x0C = 0;
|
||||
_wmb[chan].callback = NULL;
|
||||
_wmb[chan].unk_0x10 = NULL;
|
||||
|
||||
_rumbleCnt[chan] = 0;
|
||||
}
|
||||
@@ -1551,7 +1551,7 @@ static void firmwareCheckCallback(s32 chan, s32 status) {
|
||||
|
||||
DEBUGPrint(" ==>this error means that the firmware is for NDEV %s\n", p->configIndex != 0 ? "2.0" : "2.1 or later");
|
||||
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->continuous, &abortConnCallback);
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->unk_0x98E, &abortConnCallback);
|
||||
|
||||
WPADiSendDPDCSB(&p->stdCmdQueue, FALSE, &abortConnCallback);
|
||||
WPADiSendSetPort(&p->stdCmdQueue, port, &abortConnCallback);
|
||||
@@ -1626,7 +1626,7 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
p->status = WPAD_ERR_OK;
|
||||
p->radioSensitivity = 100;
|
||||
p->sleeping = FALSE;
|
||||
p->encStatus = FALSE;
|
||||
p->unk_0x98D = FALSE;
|
||||
|
||||
WPADiSendReadData(&p->stdCmdQueue, p->wmReadDataBuf, 1, WM_ADDR_MEM_1770, firmwareCheckCallback);
|
||||
|
||||
@@ -1643,8 +1643,8 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
|
||||
if (p->cmdBlkCB != NULL) {
|
||||
p->cmdBlkCB(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].callback != NULL) {
|
||||
_wmb[chan].callback(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].unk_0x10 != NULL) {
|
||||
_wmb[chan].unk_0x10(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
}
|
||||
|
||||
do {
|
||||
@@ -1886,7 +1886,7 @@ s32 WPADSetDataFormat(s32 chan, u32 format) {
|
||||
}
|
||||
|
||||
if (currFormat != format) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->continuous, NULL)) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->unk_0x98E, NULL)) {
|
||||
status = WPAD_ERR_COMMUNICATION_ERROR;
|
||||
} else {
|
||||
enabled = OSDisableInterrupts();
|
||||
@@ -2741,13 +2741,13 @@ BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback)
|
||||
return success;
|
||||
}
|
||||
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback) {
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback) {
|
||||
BOOL success;
|
||||
WPADCommand command;
|
||||
|
||||
command.reportID = RPTID_SET_DATA_REPORT_MODE;
|
||||
command.dataLength = RPT12_SIZE;
|
||||
command.dataBuf[RPT12_CONT_REPORT] = continuous ? 0 : 4; // Always continuous reporting
|
||||
command.dataBuf[RPT12_CONT_REPORT] = unk ? 0 : 4; // Always continuous reporting
|
||||
command.cmdCB = pCallback;
|
||||
|
||||
switch (format) {
|
||||
|
||||
@@ -111,8 +111,8 @@ static void initExtension(s32 chan) {
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat,
|
||||
p_wpd->continuous, abortInitExtension);
|
||||
p_wpd->encStatus = 1;
|
||||
p_wpd->unk_0x98E, abortInitExtension);
|
||||
p_wpd->unk_0x98D = 1;
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0x55, 0x04a400f0,
|
||||
abortInitExtension);
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0, 0x04a400fb,
|
||||
@@ -127,7 +127,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
if (result != WPAD_ERR_NONE) {
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
p_wpd->encStatus = 0;
|
||||
p_wpd->unk_0x98D = 0;
|
||||
if (result == WPAD_ERR_NO_CONTROLLER) {
|
||||
type = WPAD_DEV_NOT_FOUND;
|
||||
}
|
||||
@@ -142,7 +142,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
else {
|
||||
DEBUGPrint("detaching extension during initialization.\n");
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
return;
|
||||
}
|
||||
p_wpd->devType = (u8)type;
|
||||
@@ -509,7 +509,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
}
|
||||
} else {
|
||||
if (isExtEncMain(_devType[chan])) {
|
||||
p_wpd->encStatus = 2;
|
||||
p_wpd->unk_0x98D = 2;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKey(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -517,7 +517,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey + 12, 4, 0x4A4004C, abortInitExtension);
|
||||
WPADiSendReadData(cmdq, p_wpd->wmReadDataBuf, 32, 0x4A40020, p_wpd->extensionCB);
|
||||
} else {
|
||||
p_wpd->encStatus = 3;
|
||||
p_wpd->unk_0x98D = 3;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKeyFor3rd(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -651,7 +651,7 @@ void __a1_20_status_report(u8 chan, u8* data) {
|
||||
p_wpd->devMode = 0;
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
|
||||
if (attach) {
|
||||
if (p_wpd->extensionCB) {
|
||||
@@ -741,11 +741,11 @@ void __a1_21_user_data(u8 chan, u8* data) {
|
||||
DEBUGPrint("length : %d\n", p_wpd->wmReadLength);
|
||||
status = (p_wpd->wmReadHadError < 0) ? WPAD_ERR_TRANSFER : 0;
|
||||
DEBUGPrint("i2c = %04x\n", i2c);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->encStatus);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->unk_0x98D);
|
||||
|
||||
if (i2c == 0x04a4) {
|
||||
DEBUGPrint("Access to extension register.\n");
|
||||
if (p_wpd->encStatus == 2 || p_wpd->encStatus == 3) {
|
||||
if (p_wpd->unk_0x98D == 2 || p_wpd->unk_0x98D == 3) {
|
||||
DEBUGPrint("Decode!!!!\n");
|
||||
DEBUGPrint(" len = %d, addr = %04x\n", len, base);
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
|
||||
u32 buffer32[0xFB00];
|
||||
}; // 0x00
|
||||
|
||||
u32 size; // 0x3EC00
|
||||
u32 offset; // 0x3EC04
|
||||
u32 unk_0x3EC00;
|
||||
u32 unk_0x3EC04;
|
||||
BOOL allocated; // 0x3EC08
|
||||
u8 unk_0x3EC0C[0x34];
|
||||
} CDBCryptBuf;
|
||||
|
||||
@@ -19,7 +19,7 @@ typedef struct _CDBRecordFile {
|
||||
#else
|
||||
u8 unk_0x00[0x1C - 0x00];
|
||||
#endif
|
||||
int allocFlag; // 0x1C
|
||||
int unk_0x1C;
|
||||
CDBAttr attr; // 0x20
|
||||
CDBBridgeFile bridgeFile; // 0x42C
|
||||
u8 unk_0x434[0x438 - 0x434];
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#ifdef NWC24_MSG_READ
|
||||
u32 headerSize;
|
||||
#elif defined(NWC24_MBOX_CTRL) || defined(NWC24_MSG_COMMIT)
|
||||
u32 headerSize; // 0x10
|
||||
u32 unk_0x10;
|
||||
#else
|
||||
u8 unk_0x10[0x4];
|
||||
#endif
|
||||
@@ -46,8 +46,8 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#endif
|
||||
u32 date; // 0x28
|
||||
u32 receivedDate; // 0x2C
|
||||
NWC24Data fromData; // 0x30
|
||||
NWC24Data toData; // 0x38
|
||||
NWC24Data unk_0x30;
|
||||
NWC24Data unk_0x38;
|
||||
NWC24Data subject; // 0x40
|
||||
NWC24Data text; // 0x48
|
||||
NWC24Data unk_0x50;
|
||||
@@ -73,7 +73,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
};
|
||||
u32 raw;
|
||||
} msgBoardFlags; // 0xCC
|
||||
NWC24Data extraData; // 0xD0
|
||||
NWC24Data unk_0xD0;
|
||||
NWC24Data faceData; // 0xD8
|
||||
NWC24Data altName; // 0xE0
|
||||
u32 textSize; // 0xE4
|
||||
|
||||
@@ -26,9 +26,9 @@ extern struct NWC24Work {
|
||||
|
||||
u8 configData[1024]; // 0x1300
|
||||
|
||||
u8 sendMbcHeader[128]; // 0x1700
|
||||
u8 recvMbcHeader[128]; // 0x1780
|
||||
u8 mbcEntry[256]; // 0x1800
|
||||
u8 unk_0x1700[128]; // 0x1700
|
||||
u8 unk_0x1780[128]; // 0x1780
|
||||
u8 unk_0x1800[256]; // 0x1800
|
||||
u8 base64Work[256]; // 0x1900
|
||||
u8 unk_0x1A00[4096]; // 0x1A00
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ void CDBRecordInstanceInit(CDBRecordFile* recordFile, CDBRecord* record, int typ
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
recordFile->used = 1;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->allocFlag = type;
|
||||
recordFile->unk_0x1C = type;
|
||||
recordFile->database = record->unk_0x00;
|
||||
CDBAttrInit(&recordFile->attr);
|
||||
CDBRecordKeyCopy(&recordFile->key, &record->key);
|
||||
@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
goto open_result_ready;
|
||||
open_location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
} else {
|
||||
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return err;
|
||||
}
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 = 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->size, NULL);
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
} else {
|
||||
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return result;
|
||||
}
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -310,7 +310,7 @@ CDBErr CDBRecordWrite_(CDBRecord* record, void* buffer, u32 size) {
|
||||
CDBReportError("can't write data in the record; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
if ((recordFile->unk_0x1C & 2) == 0) {
|
||||
CDBReportError("can't write data in the record; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
@@ -687,7 +687,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
if ((s32)recordFile == 0) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (recordFile->allocFlag == 1) {
|
||||
if (recordFile->unk_0x1C == 1) {
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if ((s32)buffer == 0) {
|
||||
@@ -699,7 +699,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
tempFile = record->file;
|
||||
if ((s32)tempFile == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (tempFile->allocFlag == 1) {
|
||||
} else if (tempFile->unk_0x1C == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetWiiId(&tempFile->attr, CDBGetWiiId());
|
||||
@@ -713,7 +713,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrInitIV(&((CDBRecordFile*)record->file)->attr);
|
||||
@@ -727,7 +727,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetKeyStr(&((CDBRecordFile*)record->file)->attr, key);
|
||||
|
||||
@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
u32 unk = cryptBuf->size - cryptBuf->offset;
|
||||
if (cryptBuf->size < unk) {
|
||||
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
|
||||
if (cryptBuf->unk_0x3EC00 < 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->offset], unk);
|
||||
cryptBuf->offset += unk;
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
|
||||
cryptBuf->unk_0x3EC04 += 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->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset += offset;
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_END: {
|
||||
cryptBuf->offset = (cryptBuf->size - 1) - offset;
|
||||
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_CUR: {
|
||||
cryptBuf->offset += offset;
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
return cryptBuf->offset - sizeof(CDBAttrBuf);
|
||||
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ CDBErr CDBRecordFree(CDBRecord* record) {
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
*(u32*)&recordFile->unk_0x00[0x18] = 0;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->allocFlag = 0;
|
||||
recordFile->unk_0x1C = 0;
|
||||
record->file = NULL;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
}
|
||||
|
||||
@@ -23,7 +23,8 @@ static int ReadHeaderChar(const NHTTPResponseInfo* response, NHTTPi_HDRBUFLIST**
|
||||
}
|
||||
|
||||
static int LowerCase(int character) {
|
||||
return ((character >= 'A') & (character <= 'Z')) ? character + 32 : character;
|
||||
if((character>='A') & (character<='Z')) character+=32;
|
||||
return character;
|
||||
}
|
||||
|
||||
s32 NHTTPi_findNextLineHdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, s32* colon, s32* newlineLength) {
|
||||
@@ -75,17 +76,15 @@ 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;
|
||||
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;
|
||||
}
|
||||
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;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ static NWC24Err ClearMBCEntry(MBCHeader* header, NWC24File* file, u32 offset);
|
||||
static NWC24Err MountVFMBox(NWC24MBoxType type);
|
||||
static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entry);
|
||||
static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* msg) NO_INLINE;
|
||||
BOOL NWC24iIsMsgObjReadable(MBCEntry* entry) NO_INLINE;
|
||||
BOOL NWC24iIsMsgObjReadable(const MBCEntry* entry) NO_INLINE;
|
||||
NWC24Err NWC24CreateVF(const char* path, u32 size);
|
||||
|
||||
static inline NWC24Err MakeCtrlPath(char* path, NWC24MBoxType type) {
|
||||
@@ -170,7 +170,7 @@ NWC24Err NWC24GetMsgObj(NWC24MsgObj* msg, NWC24MBoxType type, u32 id) {
|
||||
u32 count = 0;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
memset(entry, 0, sizeof(*entry));
|
||||
if (id == 0)
|
||||
return NWC24_ERR_HIDDEN;
|
||||
@@ -221,7 +221,7 @@ NWC24Err NWC24GetMsgObj(NWC24MsgObj* msg, NWC24MBoxType type, u32 id) {
|
||||
return result;
|
||||
}
|
||||
|
||||
BOOL NWC24iIsMsgObjReadable(MBCEntry* entry) {
|
||||
BOOL NWC24iIsMsgObjReadable(const MBCEntry* entry) {
|
||||
if (!(entry->type & 0x200000))
|
||||
return FALSE;
|
||||
if (entry->type & 0xFE000000)
|
||||
@@ -251,7 +251,7 @@ NWC24Err NWC24GetMsgIdList(NWC24MBoxType type, u32* ids, u32 maxLength) {
|
||||
MBCEntry* entry;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
err = GetCachedMBCHeader(type, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -307,11 +307,11 @@ NWC24Err NWC24iOpenMBox(void) {
|
||||
NWC24File recvFile, sendFile;
|
||||
char* path = NWC24WorkP->pathWork;
|
||||
NWC24Err err;
|
||||
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
|
||||
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
|
||||
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_SEND, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
|
||||
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
|
||||
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_RECV, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -340,11 +340,11 @@ NWC24Err NWC24iInitMBox(void) {
|
||||
NWC24File recvFile, sendFile;
|
||||
NWC24Err recvResult, sendResult, err, sendStatus;
|
||||
char* path = NWC24WorkP->pathWork;
|
||||
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
|
||||
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
|
||||
sendResult = CreateCtrlFile(NWC24_MBOX_TYPE_SEND, FALSE);
|
||||
if (sendResult < 0)
|
||||
return sendResult;
|
||||
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
|
||||
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
|
||||
recvResult = CreateCtrlFile(NWC24_MBOX_TYPE_RECV, FALSE);
|
||||
if (recvResult < 0)
|
||||
return recvResult;
|
||||
@@ -616,11 +616,11 @@ static NWC24Err CreateCtrlFile(NWC24MBoxType type, BOOL force) {
|
||||
err = MakeCtrlPath(path, type);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
|
||||
header = (MBCHeader*)NWC24WorkP->unk_0x1700;
|
||||
else if (type == NWC24_MBOX_TYPE_RECV)
|
||||
header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
|
||||
header = (MBCHeader*)NWC24WorkP->unk_0x1780;
|
||||
else
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
result = err;
|
||||
@@ -676,7 +676,7 @@ static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
|
||||
NWC24Err err, deleteResult, closeResult;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
err = GetCachedMBCHeader(type, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -754,7 +754,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
NWC24Err clearResult, deleteResult;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
return NWC24_OK;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
for (offset = 128; offset < header->fileSize; offset += 128) {
|
||||
if (count >= header->numMessages)
|
||||
break;
|
||||
@@ -783,7 +783,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
continue;
|
||||
}
|
||||
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
|
||||
entry->flags == msg->headerSize && (s32)entry->date == (s32)msg->date) {
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
|
||||
duplicateId = entry->msgId;
|
||||
duplicateOffset = offset;
|
||||
continue;
|
||||
@@ -809,9 +809,9 @@ static NWC24Err GetCachedMBCHeader(NWC24MBoxType type, MBCHeader** header) {
|
||||
char* path;
|
||||
NWC24Err err = NWC24_OK, closeResult;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
*header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
|
||||
*header = (MBCHeader*)NWC24WorkP->unk_0x1700;
|
||||
else if (type == NWC24_MBOX_TYPE_RECV)
|
||||
*header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
|
||||
*header = (MBCHeader*)NWC24WorkP->unk_0x1780;
|
||||
else {
|
||||
*header = NULL;
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
@@ -874,7 +874,7 @@ static NWC24Err InitMBCHeader(MBCHeader* header, NWC24MBoxType type) {
|
||||
|
||||
static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NWC24File* file) {
|
||||
u32 offset = header->freeOffset;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
u32 next;
|
||||
NWC24Err err;
|
||||
if (offset == 0)
|
||||
@@ -906,7 +906,7 @@ static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NW
|
||||
}
|
||||
|
||||
static NWC24Err ClearMBCEntry(MBCHeader* header, NWC24File* file, u32 offset) {
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
NWC24Err err = NWC24FSeek(file, offset, NWC24_SEEK_BEG);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -947,8 +947,8 @@ static NWC24Err MountVFMBox(NWC24MBoxType type) {
|
||||
}
|
||||
|
||||
static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entry) {
|
||||
u32 field1 = ((u32)msg->fromData.ptr & 0xFFFFF) | (msg->fromData.size << 20);
|
||||
u32 field2 = ((u32)msg->toData.ptr & 0xFFFFF) | (msg->toData.size << 20);
|
||||
u32 field1 = ((u32)msg->unk_0x30.ptr & 0xFFFFF) | (msg->unk_0x30.size << 20);
|
||||
u32 field2 = ((u32)msg->unk_0x38.ptr & 0xFFFFF) | (msg->unk_0x38.size << 20);
|
||||
u32 field3 = ((u32)msg->subject.ptr & 0xFFFFF) | (msg->subject.size << 20);
|
||||
u32 field4 = ((u32)msg->unk_0x50.ptr & 0xFFFFF) | (msg->unk_0x50.size << 20);
|
||||
u32 field5 = ((u32)msg->unk_0x58.ptr & 0xFFFFF) | (msg->unk_0x58.size << 20);
|
||||
@@ -956,7 +956,7 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
|
||||
entry->type = msg->type;
|
||||
entry->length = msg->length;
|
||||
entry->appId = msg->appId;
|
||||
entry->flags = msg->headerSize;
|
||||
entry->flags = msg->unk_0x10;
|
||||
entry->tag = msg->tag;
|
||||
entry->ledPattern = msg->ledPattern;
|
||||
entry->crc = msg->unk_0x1C;
|
||||
@@ -1003,7 +1003,7 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->type = entry->type;
|
||||
msg->length = entry->length;
|
||||
msg->appId = entry->appId;
|
||||
msg->headerSize = entry->flags;
|
||||
msg->unk_0x10 = entry->flags;
|
||||
msg->tag = entry->tag;
|
||||
msg->ledPattern = entry->ledPattern;
|
||||
msg->unk_0x1C = entry->crc;
|
||||
@@ -1019,10 +1019,10 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->textSize = entry->textSize;
|
||||
msg->dwcId = entry->dwcId;
|
||||
msg->iconNew = entry->iconNew;
|
||||
msg->fromData.ptr = (void*)offset1;
|
||||
msg->fromData.size = size1;
|
||||
msg->toData.ptr = (void*)offset2;
|
||||
msg->toData.size = size2;
|
||||
msg->unk_0x30.ptr = (void*)offset1;
|
||||
msg->unk_0x30.size = size1;
|
||||
msg->unk_0x38.ptr = (void*)offset2;
|
||||
msg->unk_0x38.size = size2;
|
||||
msg->subject.ptr = (void*)offset3;
|
||||
msg->subject.size = size3;
|
||||
msg->unk_0x50.ptr = (void*)offset4;
|
||||
|
||||
@@ -243,11 +243,11 @@ static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg) {
|
||||
|
||||
static inline NWC24Err WriteExtraFields(NWC24MsgObjPrivate* msg) {
|
||||
NWC24Err err;
|
||||
if (msg->extraData.size == 0)
|
||||
if (msg->unk_0xD0.size == 0)
|
||||
return NWC24_OK;
|
||||
err = NWC24FWrite(msg->extraData.ptr, msg->extraData.size, m_pFile);
|
||||
err = NWC24FWrite(msg->unk_0xD0.ptr, msg->unk_0xD0.size, m_pFile);
|
||||
if (err == NWC24_OK)
|
||||
msg->length += msg->extraData.size;
|
||||
msg->length += msg->unk_0xD0.size;
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -330,7 +330,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteString(msg, buffer));
|
||||
if (msg->type & 0x10000) {
|
||||
msg->headerSize = msg->length;
|
||||
msg->unk_0x10 = msg->length;
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
|
||||
@@ -339,7 +339,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteContentTypeField(msg));
|
||||
if (!(msg->type & 0x10000))
|
||||
msg->headerSize = msg->length;
|
||||
msg->unk_0x10 = msg->length;
|
||||
text.ptr = (const void*)msg->length;
|
||||
{ NWC24Err textResult = WritePlainText(msg);
|
||||
err = textResult == NWC24_ERR_NULL ? NWC24_OK : textResult; }
|
||||
@@ -577,7 +577,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strncat(buffer, "From: ", 1022);
|
||||
address = buffer + 6;
|
||||
msg->fromData.ptr = (const void*)(msg->length + 6);
|
||||
msg->unk_0x30.ptr = (const void*)(msg->length + 6);
|
||||
type = 1;
|
||||
if (msg->type & 0x100000)
|
||||
type = 2;
|
||||
@@ -596,7 +596,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total;
|
||||
msg->fromData.size = msg->length - (u32)msg->fromData.ptr - 2;
|
||||
msg->unk_0x30.size = msg->length - (u32)msg->unk_0x30.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
@@ -612,7 +612,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
cursor += 4;
|
||||
index = 0;
|
||||
total = 4;
|
||||
msg->toData.ptr = (const void*)(msg->length + 4);
|
||||
msg->unk_0x38.ptr = (const void*)(msg->length + 4);
|
||||
remaining = 1018;
|
||||
for (; index < msg->numTo; ++index) {
|
||||
err = SynthesizeAddrStr(&msg->toAddrs[index], msg->type, cursor, remaining, &length);
|
||||
@@ -641,7 +641,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total + 2, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total + 2;
|
||||
msg->toData.size = msg->length - (u32)msg->toData.ptr - 2;
|
||||
msg->unk_0x38.size = msg->length - (u32)msg->unk_0x38.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
@@ -769,14 +769,19 @@ static NWC24Err WriteMIMEAttachHeader(NWC24MsgObjPrivate* msg, u32 index) {
|
||||
char* buffer;
|
||||
const char* mime;
|
||||
const char* suffix;
|
||||
int mimeLength;
|
||||
s32 typeLength, encodingLength, dispositionLength, mimeLength;
|
||||
s32 first, second, third, total;
|
||||
NWC24Err err;
|
||||
Mail_memset(NWC24WorkP->stringWork, 0, 1024);
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
mime = NWC24GetMIMETypeStr(msg->attachedType[index]);
|
||||
suffix = NWC24iGetMIMETypeSuffix(msg->attachedType[index]);
|
||||
mimeLength = (Mail_strlen(ContentTypeA) + Mail_strlen(ContentTxEncA)) + Mail_strlen(ContentDispA) + Mail_strlen(mime) + 4;
|
||||
encodingLength = Mail_strlen(ContentTxEncA);
|
||||
typeLength = Mail_strlen(ContentTypeA);
|
||||
dispositionLength = Mail_strlen(ContentDispA);
|
||||
typeLength += encodingLength;
|
||||
mimeLength = Mail_strlen(mime);
|
||||
mimeLength = (dispositionLength + typeLength) + mimeLength + 4;
|
||||
if (mimeLength >= 1024)
|
||||
return NWC24_ERR_NOMEM;
|
||||
first = Mail_sprintf(buffer, (char*)ContentTypeA, mime, (char)('a' + index), msg->msgId, suffix);
|
||||
|
||||
@@ -73,11 +73,11 @@ NWC24Err NWC24InitMsgObj(NWC24MsgObj* msg, NWC24MsgType type) {
|
||||
msgObj->attachedType[i] = NWC24_TEXT_PLAIN;
|
||||
}
|
||||
|
||||
NWC24Data_Init(&msgObj->fromData);
|
||||
NWC24Data_Init(&msgObj->toData);
|
||||
NWC24Data_Init(&msgObj->unk_0x30);
|
||||
NWC24Data_Init(&msgObj->unk_0x38);
|
||||
NWC24Data_Init(&msgObj->unk_0x50);
|
||||
NWC24Data_Init(&msgObj->unk_0x58);
|
||||
NWC24Data_Init(&msgObj->extraData);
|
||||
NWC24Data_Init(&msgObj->unk_0xD0);
|
||||
NWC24Data_Init(&msgObj->faceData);
|
||||
NWC24Data_Init(&msgObj->altName);
|
||||
|
||||
|
||||
@@ -289,7 +289,7 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
default:
|
||||
return result;
|
||||
}
|
||||
if (privateMsg->fromData.size == 0)
|
||||
if (privateMsg->unk_0x30.size == 0)
|
||||
return NWC24_ERR_NULL;
|
||||
result = NWC24iMBoxOpenStoredMsg(type, privateMsg->msgId, &file);
|
||||
switch (result) {
|
||||
@@ -300,9 +300,9 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
}
|
||||
result = NWC24FStreamInit(&stream, &file, 0, privateMsg->length, buffer, 1024);
|
||||
if (result == NWC24_OK) {
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->fromData.ptr);
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->unk_0x30.ptr);
|
||||
if (result == NWC24_OK)
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->fromData.size, 0, address, capacity);
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->unk_0x30.size, 0, address, capacity);
|
||||
}
|
||||
closeResult = NWC24iMBoxCloseMsg(&file);
|
||||
if (result != NWC24_OK)
|
||||
|
||||
@@ -101,7 +101,7 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
|
||||
int size;
|
||||
int result;
|
||||
InterfaceOption* request;
|
||||
const InterfaceCommand* command;
|
||||
InterfaceCommand* command;
|
||||
int* returnedLength;
|
||||
u8* reply;
|
||||
if ((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
|
||||
@@ -112,7 +112,7 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
command=&request->command;
|
||||
request->command.level=level; request->command.option=option;
|
||||
command->level=level; command->option=option;
|
||||
returnedLength=&((InterfaceLength*)(command + 1))->length;
|
||||
reply=(u8*)((InterfaceLength*)returnedLength + 1);
|
||||
*returnedLength=OptionLength(length);
|
||||
|
||||
@@ -930,13 +930,13 @@ namespace ipl {
|
||||
math::VEC3 translate(mpLayout->FindPaneByName("N_Memo")->GetTranslate());
|
||||
|
||||
mURLProc.clear_prev_drawing();
|
||||
mURLProc.setMemoTranslateY(translate.y);
|
||||
mURLProc.setUnk_0x44(translate.y);
|
||||
|
||||
bool result = false;
|
||||
if (mState == STATE_NORMAL && mScroller.is_busy() == FALSE) {
|
||||
result = true;
|
||||
}
|
||||
mURLProc.setFocusEnabled(result);
|
||||
mURLProc.setUnk_0x53(result);
|
||||
|
||||
if (translate.y < 500.0f) {
|
||||
mpLayout->draw("N_Header");
|
||||
@@ -983,8 +983,8 @@ namespace ipl {
|
||||
mpLayout->draw("ReplyMask");
|
||||
}
|
||||
|
||||
if (!mURLProc.getColorPass()) {
|
||||
mURLProc.setColorPass(1);
|
||||
if (!mURLProc.getUnk_0x50()) {
|
||||
mURLProc.setUnk_0x50(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1512,7 +1512,7 @@ namespace ipl {
|
||||
mURLProc.init();
|
||||
|
||||
if (mpBoardObj->mLetterType == BoardObject::TYPE_MEMO) {
|
||||
mURLProc.setHitYOffset(8.0f);
|
||||
mURLProc.setUnk_0x40(8.0f);
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("T_Letter");
|
||||
|
||||
@@ -15,16 +15,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::init() {
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
mbColorPass = 0;
|
||||
mbFocusEnabled = 1;
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
unk_0x50 = 0;
|
||||
unk_0x53 = 1;
|
||||
|
||||
mHitYOffset = 0.0f;
|
||||
mMemoTranslateY = 0.0f;
|
||||
unk_0x40 = 0.0f;
|
||||
unk_0x44 = 0.0f;
|
||||
|
||||
mCurTagNo = 0;
|
||||
mSelectedTagNo = -1;
|
||||
unk_0x48 = 0;
|
||||
unk_0x4C = -1;
|
||||
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
mConData[i].valid = false;
|
||||
@@ -60,14 +60,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::clear_prev_drawing() {
|
||||
mCurTagNo = 0;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
unk_0x48 = 0;
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
}
|
||||
|
||||
nw4r::ut::Operation UrlProcessor::Process(u16 code, nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
if (code == SEPERATOR || code == (u16)'\n') {
|
||||
if (mbColorPass == 0) {
|
||||
if (unk_0x50 == 0) {
|
||||
make_collision(context, code);
|
||||
} else if (code == SEPERATOR) {
|
||||
parse(context);
|
||||
@@ -78,42 +78,42 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::make_collision(nw4r::ut::PrintContext<wchar_t>* context, u16 code) {
|
||||
if (code == SEPERATOR) {
|
||||
if (mbInTag == 0) {
|
||||
if (unk_0x51 == 0) {
|
||||
url_collision* const url_col = new (System::getMem2App(), 4) url_collision();
|
||||
line_collision* const line_col = new (System::getMem2App(), 4) line_collision();
|
||||
|
||||
url_col->mTagNo = mCurTagNo;
|
||||
url_col->mpStart = (wchar_t*)context->str;
|
||||
url_col->unk_0x00 = unk_0x48;
|
||||
url_col->unk_0x04 = (wchar_t*)context->str;
|
||||
|
||||
line_col->mLeft = context->writer->GetCursorX();
|
||||
line_col->unk_0x00 = context->writer->GetCursorX();
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
nw4r::ut::List_Append(&mUrlCollisions, url_col);
|
||||
|
||||
mbInTag = 1;
|
||||
unk_0x51 = 1;
|
||||
} else {
|
||||
void* url_col_raw = nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
void* line_col_raw = nw4r::ut::List_GetPrev(&((url_collision*)url_col_raw)->mLineCollisions, NULL);
|
||||
url_collision* url_col = (url_collision*)url_col_raw;
|
||||
line_collision* line_col = (line_collision*)line_col_raw;
|
||||
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
|
||||
url_col->mpEnd = (wchar_t*)context->str;
|
||||
url_col->unk_0x08 = (wchar_t*)context->str;
|
||||
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
}
|
||||
} else {
|
||||
if (mbInTag != 0) {
|
||||
if (unk_0x51 != 0) {
|
||||
url_collision* url_col = (url_collision*)nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
line_collision* line_col = (line_collision*)nw4r::ut::List_GetPrev(&url_col->mLineCollisions, NULL);
|
||||
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
|
||||
line_col = new (System::getMem2App(), 4) line_collision();
|
||||
line_col->mLeft = -208.0f;
|
||||
line_col->unk_0x00 = -208.0f;
|
||||
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
}
|
||||
@@ -122,41 +122,41 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::parse(nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
f32 curY = context->writer->GetCursorY();
|
||||
if (mbInTag == 0) {
|
||||
if (mSelectedTagNo == mCurTagNo) {
|
||||
if (unk_0x51 == 0) {
|
||||
if (unk_0x4C == unk_0x48) {
|
||||
context->writer->SetTextColor(0xFFE664FF);
|
||||
} else if (mbFocusEnabled != 0 && is_focused()) {
|
||||
} else if (unk_0x53 != 0 && is_focused()) {
|
||||
context->writer->SetCursorY(curY - 2.0f);
|
||||
context->writer->SetTextColor(0xF06E28FF);
|
||||
mbHoverOffset = 1;
|
||||
unk_0x52 = 1;
|
||||
} else {
|
||||
context->writer->SetTextColor(0x34BEEDFF);
|
||||
}
|
||||
mbInTag = 1;
|
||||
unk_0x51 = 1;
|
||||
} else {
|
||||
if (mbHoverOffset != 0) {
|
||||
if (unk_0x52 != 0) {
|
||||
context->writer->SetCursorY(2.0f + curY);
|
||||
mbHoverOffset = 0;
|
||||
unk_0x52 = 0;
|
||||
}
|
||||
|
||||
context->writer->SetTextColor(0x646464FF);
|
||||
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
}
|
||||
}
|
||||
|
||||
BOOL UrlProcessor::is_focused() const {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
if (mCurTagNo == get_focused_tagno(i)) {
|
||||
if (unk_0x48 == get_focused_tagno(i)) {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void UrlProcessor::select(int tagNo) {
|
||||
mSelectedTagNo = tagNo;
|
||||
void UrlProcessor::select(int unk) {
|
||||
unk_0x4C = unk;
|
||||
}
|
||||
|
||||
int UrlProcessor::get_focused_tagno(int chan) const {
|
||||
@@ -174,13 +174,13 @@ namespace ipl {
|
||||
|
||||
while (url_col = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, url_col), url_col != NULL) {
|
||||
while (line_col = (line_collision*)nw4r::ut::List_GetNext(&url_col->mLineCollisions, line_col), line_col != NULL) {
|
||||
f32 left = line_col->mLeft - var_f28;
|
||||
f32 right = var_f28 + line_col->mRight;
|
||||
f32 temp_f0 = ((mMemoTranslateY + mHitYOffset) - line_col->mY);
|
||||
f32 left = line_col->unk_0x00 - var_f28;
|
||||
f32 right = var_f28 + line_col->unk_0x04;
|
||||
f32 temp_f0 = ((unk_0x44 + unk_0x40) - line_col->unk_0x08);
|
||||
f32 top = (var_f29 + temp_f0) - var_f28;
|
||||
f32 bottom = var_f28 + (var_f30 + temp_f0);
|
||||
if (left <= var_f31 && var_f31 <= right && top <= -pos.y && -pos.y <= bottom) {
|
||||
return url_col->mTagNo;
|
||||
return url_col->unk_0x00;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -194,7 +194,7 @@ namespace ipl {
|
||||
url_collision* url_col = NULL;
|
||||
|
||||
while (got = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, got), got != NULL) {
|
||||
if (got->mTagNo == mSelectedTagNo) {
|
||||
if (got->unk_0x00 == unk_0x4C) {
|
||||
url_col = got;
|
||||
break;
|
||||
}
|
||||
@@ -210,10 +210,10 @@ namespace ipl {
|
||||
|
||||
int chIdx2 = 0;
|
||||
int chIdx = 0;
|
||||
u32 count = (u32)url_col->mpEnd - (u32)url_col->mpStart;
|
||||
u32 count = (u32)url_col->unk_0x08 - (u32)url_col->unk_0x04;
|
||||
count >>= 1;
|
||||
for (u32 i = 0; i < count; i++) {
|
||||
wchar_t wch = url_col->mpStart[i];
|
||||
wchar_t wch = url_col->unk_0x04[i];
|
||||
if (wch != SEPERATOR && chIdx2 < 0x200) {
|
||||
url[chIdx2++] = wch;
|
||||
}
|
||||
@@ -226,9 +226,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
UrlProcessor::url_collision::url_collision() {
|
||||
mTagNo = 0;
|
||||
mpStart = NULL;
|
||||
mpEnd = NULL;
|
||||
unk_0x00 = 0;
|
||||
unk_0x04 = NULL;
|
||||
unk_0x08 = NULL;
|
||||
nw4r::ut::List_Init(&mLineCollisions, offsetof(line_collision, mLinkList));
|
||||
}
|
||||
|
||||
|
||||
@@ -638,7 +638,7 @@ namespace ipl {
|
||||
void ChannelObj::setLangPane(const layout::Object* layout) {
|
||||
int lang = System::getLanguage();
|
||||
const char* langGroup = scLangGroups[lang];
|
||||
char langCodeBuf[10][4] = {""};
|
||||
char langCodeBuf[40] = "";
|
||||
|
||||
bool foundLangGroup = false;
|
||||
|
||||
@@ -648,7 +648,7 @@ namespace ipl {
|
||||
} else {
|
||||
bool isNonRsoGroup = true;
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
char name[8];
|
||||
char name[6];
|
||||
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,15 +680,16 @@ namespace ipl {
|
||||
} else {
|
||||
s32 region = System::getRegion();
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
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);
|
||||
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);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1901,59 +1901,64 @@ namespace ipl {
|
||||
nw4r::ut::Rect projRect;
|
||||
System::getProjectionRect(&projRect);
|
||||
GXRenderModeObj* rMode = System::getRenderModeObj();
|
||||
f32 scissorX;
|
||||
f32 scissorY;
|
||||
f32 scissorWidth;
|
||||
f32 scissorHeight;
|
||||
u16 fbWidth;
|
||||
u16 efbHeight;
|
||||
f32 var_f29;
|
||||
f32 var_f30;
|
||||
f32 var_f31;
|
||||
f32 var_f1;
|
||||
u16 var_r0;
|
||||
u16 var_r3;
|
||||
if (mState == STATE_NORMAL_FADE_ZOOM || mState == STATE_NORMAL_DONE_FADE_ZOOM || mState == STATE_NORMAL_RESTART) {
|
||||
nw4r::math::MTX44 mtx;
|
||||
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;
|
||||
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;
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
} else {
|
||||
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_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;
|
||||
}
|
||||
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) {
|
||||
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) {
|
||||
GXSetScissor(0, 0, 0, 0);
|
||||
} else {
|
||||
if (scissorX < 0.0f) {
|
||||
scissorWidth += scissorX;
|
||||
scissorX = 0.0f;
|
||||
if (var_f31 < 0.0f) {
|
||||
var_f29 += var_f31;
|
||||
var_f31 = 0.0f;
|
||||
}
|
||||
if (scissorY < 0.0f) {
|
||||
scissorHeight += scissorY;
|
||||
scissorY = 0.0f;
|
||||
if (var_f30 < 0.0f) {
|
||||
var_f1 += var_f30;
|
||||
var_f30 = 0.0f;
|
||||
}
|
||||
if ((scissorX + scissorWidth) > 1705.0f) {
|
||||
scissorWidth -= (scissorX + scissorWidth) - 1705.0f;
|
||||
if ((var_f31 + var_f29) > 1705.0f) {
|
||||
var_f29 -= (var_f31 + var_f29) - 1705.0f;
|
||||
}
|
||||
if ((scissorY + scissorHeight) > 1705.0f) {
|
||||
scissorHeight -= (scissorY + scissorHeight) - 1705.0f;
|
||||
if ((var_f30 + var_f1) > 1705.0f) {
|
||||
var_f1 -= (var_f30 + var_f1) - 1705.0f;
|
||||
}
|
||||
GXSetScissor(scissorX, scissorY, scissorWidth, scissorHeight);
|
||||
GXSetScissor(var_f31, var_f30, var_f29, var_f1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <private/os.h>
|
||||
#include <private/wpad.h>
|
||||
|
||||
|
||||
#pragma dont_instantiate ipl::math::HermiteIntp<float>
|
||||
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
@@ -648,7 +648,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
goto scn_continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,16 +25,16 @@ typedef struct {
|
||||
undefined4 result;
|
||||
undefined4 errCode;
|
||||
HTTPTestState httpTestState;
|
||||
undefined4 natState;
|
||||
undefined4 gsAvailable;
|
||||
undefined4 natTimedOut;
|
||||
undefined4 natFailed;
|
||||
undefined4 unk_0x030;
|
||||
undefined4 unk_0x034;
|
||||
undefined4 unk_0x038;
|
||||
undefined4 unk_0x03c;
|
||||
OSTime detectStartTime;
|
||||
NHTTPConnection httpConnection;
|
||||
NHTTPRequest* httpRequest;
|
||||
NHTTPResponse* httpResponse;
|
||||
NCDProxyProfile proxy;
|
||||
void* httpBuf;
|
||||
void* unk_0x7f0;
|
||||
NAT nat;
|
||||
} StaticSession;
|
||||
|
||||
@@ -64,14 +64,14 @@ void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
g_session.result = 0xFF00;
|
||||
g_session.errCode = 0;
|
||||
g_session.httpTestState = HTTP_TEST_NOT_STARTED;
|
||||
g_session.natState = 0;
|
||||
g_session.unk_0x030 = 0;
|
||||
g_session.detectStartTime = 0;
|
||||
g_session.httpConnection = 0;
|
||||
g_session.httpRequest = 0;
|
||||
g_session.httpResponse = NULL;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natTimedOut = 0;
|
||||
g_session.natFailed = 1;
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x038 = 0;
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.proxy = *proxy;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ int IPLContestProcess() {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
|
||||
OSReport("[error] Failed to start up NHTTP.\n");
|
||||
} else {
|
||||
g_session.httpBuf = IPLContestAlloc(0x400);
|
||||
g_session.unk_0x7f0 = IPLContestAlloc(0x400);
|
||||
g_session.httpTestState = HTTP_TEST_STARTED;
|
||||
OSReport("Starting HTTP conectting test.\n");
|
||||
}
|
||||
@@ -108,7 +108,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case HTTP_TEST_STARTED: {
|
||||
g_session.httpRequest =
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.httpBuf, 0x400, sNHTTPReqCallback, 0);
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.unk_0x7f0, 0x400, sNHTTPReqCallback, 0);
|
||||
if (g_session.httpRequest == 0) {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
g_session.result |= 4;
|
||||
@@ -156,9 +156,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -176,9 +176,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -198,11 +198,11 @@ int IPLContestProcess() {
|
||||
OSReport("Port mapping detectioning test has been skipped.\n");
|
||||
|
||||
} else
|
||||
switch (g_session.natState) {
|
||||
switch (g_session.unk_0x030) {
|
||||
case 0: {
|
||||
gsiMemoryCallbacksSet(IPLContestGSMalloc, IPLContestGSFree, IPLContestGSRealloc, IPLContestGSMemalign);
|
||||
GSIStartAvailableCheckA("wiinat");
|
||||
g_session.natState = 1;
|
||||
g_session.unk_0x030 = 1;
|
||||
OSReport("Starting GameSpy available check.\n");
|
||||
break;
|
||||
}
|
||||
@@ -212,14 +212,14 @@ int IPLContestProcess() {
|
||||
break;
|
||||
}
|
||||
case GSIACAvailable: {
|
||||
g_session.gsAvailable = 1;
|
||||
g_session.natState = 2;
|
||||
g_session.unk_0x034 = 1;
|
||||
g_session.unk_0x030 = 2;
|
||||
OSReport("GameSpy server is currently available.\n");
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natState = 5;
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x030 = 5;
|
||||
OSReport("GameSpy server is currently unavailable.\n");
|
||||
break;
|
||||
}
|
||||
@@ -228,7 +228,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case 2: {
|
||||
NNStartNatDetection(onNatDetectionDone);
|
||||
g_session.natState = 3;
|
||||
g_session.unk_0x030 = 3;
|
||||
OSReport("Port mapping detectioning test has been started.\n");
|
||||
g_session.detectStartTime = OSGetTime();
|
||||
break;
|
||||
@@ -238,8 +238,8 @@ int IPLContestProcess() {
|
||||
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000)) {
|
||||
break;
|
||||
}
|
||||
g_session.natState = 5;
|
||||
g_session.natTimedOut = 1;
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.unk_0x038 = 1;
|
||||
OSReport("[error] NAT timeout.\n");
|
||||
break;
|
||||
}
|
||||
@@ -289,10 +289,10 @@ int IPLGetNATSupportCode(int conntype) {
|
||||
|
||||
nat = g_session.nat;
|
||||
|
||||
if (g_session.gsAvailable != 0) {
|
||||
if (g_session.natTimedOut != 0) {
|
||||
if (g_session.unk_0x034 != 0) {
|
||||
if (g_session.unk_0x038 != 0) {
|
||||
code = 11180;
|
||||
} else if (g_session.natFailed != 0) {
|
||||
} else if (g_session.unk_0x03c != 0) {
|
||||
code = 11170;
|
||||
} else {
|
||||
if (nat.mappingScheme == 0 && nat.mappings[2].publicPort == nat.mappings[1].publicPort * 2 - nat.mappings[0].publicPort) {
|
||||
@@ -464,10 +464,10 @@ void sNHTTPCleanupCallback() {
|
||||
void onNatDetectionDone(gsi_bool success, NAT nat) {
|
||||
if (success) {
|
||||
g_session.nat = nat;
|
||||
g_session.natFailed = 0;
|
||||
g_session.unk_0x03c = 0;
|
||||
} else {
|
||||
g_session.natFailed = 1;
|
||||
g_session.unk_0x03c = 1;
|
||||
}
|
||||
g_session.natState = 4;
|
||||
g_session.unk_0x030 = 4;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(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 (mAnimWait == 1) {
|
||||
if (unk_0x54 == 1) {
|
||||
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
|
||||
reset_gui();
|
||||
mAnimWait = 0;
|
||||
unk_0x54 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -347,7 +347,7 @@ namespace ipl {
|
||||
switch (animNo) {
|
||||
case IDANIM_HELP_BTN_CLICK: {
|
||||
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
|
||||
mAnimWait = 1;
|
||||
unk_0x54 = 1;
|
||||
break;
|
||||
}
|
||||
case IDANIM_ARROW_RIGHT_CLICK: {
|
||||
|
||||
@@ -729,11 +729,8 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
|
||||
default:
|
||||
if (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
|
||||
return;
|
||||
case false:
|
||||
break;
|
||||
}
|
||||
setDialogMessage(1, 0);
|
||||
int result = mpSDWorker->get_async_result();
|
||||
@@ -784,15 +781,11 @@ namespace ipl {
|
||||
enqueueLoadNotice();
|
||||
}
|
||||
} else {
|
||||
u32 titleId;
|
||||
u32 titleIndex;
|
||||
int channelIndex;
|
||||
int channelCount;
|
||||
channelCount = 0;
|
||||
channelIndex = 0;
|
||||
titleIndex = 0;
|
||||
int channelCount = 0;
|
||||
int channelIndex = 0;
|
||||
u32 titleIndex = 0;
|
||||
for (; titleIndex < mSDTitleCount; ++titleIndex) {
|
||||
titleId = mpSDTitleInfo[titleIndex].titleId;
|
||||
u32 titleId = mpSDTitleInfo[titleIndex].titleId;
|
||||
if (titleId != 0x48415A41) {
|
||||
++channelCount;
|
||||
mpChannelTitleIds[channelIndex++] = titleId;
|
||||
|
||||
@@ -353,7 +353,7 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
mWpadStopTick = OSGetTick();
|
||||
}
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped() &&
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isReceivingIdle())) {
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isUnk0xA31())) {
|
||||
OSReport("NWC24 Scheduler stopped.\n");
|
||||
NandSDWorker* worker = mpChannelSelect->getWorker();
|
||||
if (mNextScene == 17) {
|
||||
|
||||
@@ -1647,10 +1647,7 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
SONtoHs(option->length);
|
||||
optionValue = option->value;
|
||||
}
|
||||
if (optionValue == NULL || optionType != 0x101) {
|
||||
break;
|
||||
}
|
||||
{
|
||||
if (optionValue != NULL && optionType == 0x101) {
|
||||
AtermProgress progress;
|
||||
u32 authenticationTime = (u32)(OSGetTime() /
|
||||
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
|
||||
@@ -1903,7 +1900,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 = (u8*)(destination + blockOffset / 2);
|
||||
outputBlock = destinationBytes + blockOffset;
|
||||
memcpy(stateBytes + 8, outputBlock, 8);
|
||||
ATERMAesEncryptBlock(expandedKey, rounds, stateBytes, stateBytes);
|
||||
counter.value = (u64)(s64)blockIndex + passBase;
|
||||
|
||||
@@ -30,10 +30,12 @@ namespace ipl {
|
||||
namespace scene {
|
||||
extern "C" MEMAllocator sRakuAllocator;
|
||||
MEMAllocator sRakuAllocator;
|
||||
extern "C" RakuProgress sRakuStatus;
|
||||
RakuProgress sRakuStatus;
|
||||
extern "C" RakuConfiguration sRakuConfiguration;
|
||||
RakuConfiguration sRakuConfiguration;
|
||||
struct RakuStatus {
|
||||
RakuProgress progress;
|
||||
RakuConfiguration configuration;
|
||||
};
|
||||
extern "C" RakuStatus sRakuStatus;
|
||||
RakuStatus sRakuStatus;
|
||||
extern "C" OSMessageQueue sRakuMsgQueue;
|
||||
OSMessageQueue sRakuMsgQueue;
|
||||
static u32 startTimeHigh = 0;
|
||||
@@ -59,7 +61,8 @@ public:
|
||||
virtual ~RakuRakuThread();
|
||||
virtual void* Run();
|
||||
virtual void unk_0x2C() = 0;
|
||||
static void syncRakuProgress(RakuProgress* progress);
|
||||
void syncRakuProgress();
|
||||
static void progressCallback(RakuProgress* progress);
|
||||
void destroy();
|
||||
int start();
|
||||
int getState();
|
||||
@@ -76,15 +79,19 @@ private:
|
||||
MEMHeapHandle mHeap;
|
||||
};
|
||||
|
||||
void RakuRakuThread::syncRakuProgress(RakuProgress* progress) {
|
||||
void RakuRakuThread::syncRakuProgress() {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
sRakuStatus = *progress;
|
||||
sRakuStatus.progress = *(RakuProgress*)this;
|
||||
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) {
|
||||
@@ -141,14 +148,14 @@ int RakuRakuThread::start() {
|
||||
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
|
||||
active = true;
|
||||
mFinished = 0;
|
||||
memset(&sRakuConfiguration, 0, sizeof(RakuConfiguration));
|
||||
memset(&sRakuStatus, 0, sizeof(RakuProgress));
|
||||
memset(&sRakuStatus.configuration, 0, sizeof(RakuConfiguration));
|
||||
memset(&sRakuStatus.progress, 0, sizeof(RakuProgress));
|
||||
SOLibraryConfig socketConfig;
|
||||
socketConfig.alloc = RakuSocketAlloc;
|
||||
socketConfig.free = RakuSocketFree;
|
||||
SOInit(&socketConfig);
|
||||
ATERMi_ApConfigStart(mPriority, 200,
|
||||
syncRakuProgress,
|
||||
progressCallback,
|
||||
RakuAtermAlloc, RakuAtermFree, 4096);
|
||||
if (!mRunning) {
|
||||
mRunning = 1;
|
||||
@@ -200,7 +207,7 @@ int RakuRakuThread::getState() {
|
||||
return 0;
|
||||
}
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
switch (sRakuStatus.state) {
|
||||
switch (sRakuStatus.progress.state) {
|
||||
case 1: displayState = 1; break;
|
||||
case 2: displayState = 2; break;
|
||||
case 3: displayState = 2; break;
|
||||
@@ -222,30 +229,6 @@ 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) {
|
||||
@@ -253,29 +236,49 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
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;
|
||||
}
|
||||
SOFinish();
|
||||
active = false;
|
||||
destroy();
|
||||
} else {
|
||||
s32 state = sRakuStatus.progress.state;
|
||||
if ((u32)(state - 6) > 1) {
|
||||
return 0;
|
||||
}
|
||||
if (!mFinished) {
|
||||
if (state == 6) {
|
||||
ATERMi_ApConfigGetResult(&sRakuStatus.configuration);
|
||||
printInfo();
|
||||
}
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
return 0;
|
||||
}
|
||||
SOFinish();
|
||||
active = false;
|
||||
destroy();
|
||||
if (config != NULL) {
|
||||
memcpy(config->ssid, sRakuConfiguration.ssid, 32);
|
||||
config->ssidLength = strlen(sRakuConfiguration.ssid);
|
||||
copyRakuPrivacy(config, &sRakuConfiguration);
|
||||
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);
|
||||
}
|
||||
}
|
||||
if (result != NULL) {
|
||||
*result = sRakuStatus.result;
|
||||
*result = sRakuStatus.progress.result;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -15,10 +15,10 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
|
||||
mQueueCapacity = 64;
|
||||
mQueueCount = 0;
|
||||
mQueueRead = 0;
|
||||
mQueueWrite = 0;
|
||||
unk_0x264 = 64;
|
||||
unk_0x268 = 0;
|
||||
unk_0x26C = 0;
|
||||
unk_0x270 = 0;
|
||||
mSettingArg = arg;
|
||||
mpLayout = NULL;
|
||||
mpLayoutFile = NULL;
|
||||
@@ -81,9 +81,9 @@ namespace ipl {
|
||||
|
||||
FaderSceneCommand SettingButton::calcNormal() {
|
||||
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mQueueCount != 0) {
|
||||
CmdEntry entry = mCmdQueue[mQueueRead];
|
||||
switch (entry.command) {
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
|
||||
Unk unk = unk_0x64[unk_0x26C];
|
||||
switch (unk.command) {
|
||||
case CMD_SHOW_BTN: {
|
||||
showBtn();
|
||||
break;
|
||||
@@ -93,16 +93,16 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case CMD_SET_TEXT: {
|
||||
setText(entry.msgID);
|
||||
setText(unk.msgID);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (mQueueCount != 0) {
|
||||
if (++mQueueRead >= mQueueCapacity) {
|
||||
mQueueRead = 0;
|
||||
if (unk_0x268 != 0) {
|
||||
if (++unk_0x26C >= unk_0x264) {
|
||||
unk_0x26C = 0;
|
||||
}
|
||||
mQueueCount--;
|
||||
unk_0x268--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,16 +225,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingButton::reserve(int command, u32 msgId) {
|
||||
if (mQueueCapacity != mQueueCount) {
|
||||
int writeIdx = mQueueWrite;
|
||||
mCmdQueue[writeIdx].command = command;
|
||||
mCmdQueue[writeIdx].msgID = msgId;
|
||||
mQueueWrite++;
|
||||
if (unk_0x264 != unk_0x268) {
|
||||
int unk = unk_0x270;
|
||||
unk_0x64[unk].command = command;
|
||||
unk_0x64[unk].msgID = msgId;
|
||||
unk_0x270++;
|
||||
|
||||
if (mQueueWrite >= mQueueCapacity) {
|
||||
mQueueWrite = 0;
|
||||
if (unk_0x270 >= unk_0x264) {
|
||||
unk_0x270 = 0;
|
||||
}
|
||||
mQueueCount++;
|
||||
unk_0x268++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
namespace ipl {
|
||||
namespace bs2 {
|
||||
Manager::Manager(EGG::Heap* pHeap)
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), mbTickEnabled(true), mbUpdateRequested(false), mbAbortRequested(false), mbRestartRequested(false),
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), unk_0x0C(true), unk_0x0D(false), unk_0x0E(false), unk_0x0F(false),
|
||||
mbIsDiagDisc(false), mbIncludesSeatTitles(false), mbHasBanner(FALSE), mUnlockedState(BS2_STT_NO_DISK), mbStartUpdate(false),
|
||||
mEntries(NULL), mEntrySize(1), mEntryOffset(0) {
|
||||
mpBannerBuffer = new (pHeap, DEFAULT_ALIGN) u8[BS2_DEFAULT_BANNER_SIZE];
|
||||
@@ -30,13 +30,13 @@ namespace ipl {
|
||||
return mIPLState;
|
||||
}
|
||||
|
||||
if (mbRestartRequested && !System::isNandFull()) {
|
||||
if (unk_0x0F && !System::isNandFull()) {
|
||||
BS2RestartStateMachine();
|
||||
|
||||
mbTickEnabled = true;
|
||||
unk_0x0C = true;
|
||||
mIPLState = IPL_STATE_NO_DISK;
|
||||
mbRestartRequested = false;
|
||||
} else if (mbTickEnabled) {
|
||||
unk_0x0F = false;
|
||||
} else if (unk_0x0C) {
|
||||
BOOL old = OSDisableInterrupts();
|
||||
|
||||
mState = BS2Tick();
|
||||
@@ -51,7 +51,7 @@ namespace ipl {
|
||||
|
||||
if (mbIsDiagDisc && System::isRsrcLoaded()) {
|
||||
__WPADReconnect(TRUE);
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
bootNewSystem();
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::startUpdate() {
|
||||
mbUpdateRequested = true;
|
||||
unk_0x0D = true;
|
||||
mbStartUpdate = true;
|
||||
mPrevEntry = 0;
|
||||
mPrevFound = 0;
|
||||
@@ -88,11 +88,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::reserveRVLGame() {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
}
|
||||
|
||||
void Manager::reserveGCGame() {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
}
|
||||
|
||||
void Manager::startRVLGame() {
|
||||
@@ -103,13 +103,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::abort() {
|
||||
mbAbortRequested = true;
|
||||
mbRestartRequested = false;
|
||||
unk_0x0E = true;
|
||||
unk_0x0F = false;
|
||||
}
|
||||
|
||||
void Manager::restart() {
|
||||
mbAbortRequested = false;
|
||||
mbRestartRequested = true;
|
||||
unk_0x0E = false;
|
||||
unk_0x0F = true;
|
||||
|
||||
System::checkNandOverFlowFlagAsync();
|
||||
}
|
||||
@@ -195,7 +195,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BS2_STT_64: {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
break;
|
||||
}
|
||||
@@ -216,25 +216,25 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::execTick(BS2State state) {
|
||||
if (mbUpdateRequested) {
|
||||
if (unk_0x0D) {
|
||||
if (state == BS2_STT_UPDATE_DISK) {
|
||||
BS2StartUpdate();
|
||||
} else {
|
||||
mbStartUpdate = false;
|
||||
}
|
||||
} else if (mbAbortRequested) {
|
||||
} else if (unk_0x0E) {
|
||||
if (state == BS2_STT_NO_DISK || state == BS2_STT_COVER_OPEN || state == BS2_STT_55 || state == BS2_STT_WRONG_DISK ||
|
||||
state == BS2_STT_66 || state == BS2_STT_67 || state == BS2_STT_68 || state == BS2_STT_FATAL_ERROR ||
|
||||
state == BS2_STT_UPDATE_FAILED || state == BS2_STT_DIRTY_DISK) {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
} else {
|
||||
BS2AbortStateMachine();
|
||||
}
|
||||
}
|
||||
|
||||
mbUpdateRequested = false;
|
||||
mbAbortRequested = false;
|
||||
unk_0x0D = false;
|
||||
unk_0x0E = false;
|
||||
}
|
||||
|
||||
void Manager::updateTick() {
|
||||
|
||||
@@ -46,17 +46,17 @@ namespace ipl {
|
||||
}
|
||||
if (mButton != 0) {
|
||||
if (down(BTN_INTERACT)) {
|
||||
mDecideHoldCount++;
|
||||
unk_0x08++;
|
||||
} else {
|
||||
mDecideHoldCount = 0;
|
||||
unk_0x08 = 0;
|
||||
mButton = 0;
|
||||
}
|
||||
} else {
|
||||
mDecideHoldCount = 0;
|
||||
unk_0x08 = 0;
|
||||
}
|
||||
} else {
|
||||
mButton = 0;
|
||||
mDecideHoldCount = 0;
|
||||
unk_0x08 = 0;
|
||||
}
|
||||
|
||||
switch (mRumbleType) {
|
||||
@@ -109,7 +109,7 @@ namespace ipl {
|
||||
return NULL;
|
||||
}
|
||||
int ipl::controller::Base::decide() const {
|
||||
return mDecideHoldCount == 5;
|
||||
return unk_0x08 == 5;
|
||||
}
|
||||
int ipl::controller::Base::rumble(int type) {
|
||||
int ret = FALSE;
|
||||
@@ -130,44 +130,44 @@ namespace ipl {
|
||||
}
|
||||
void ipl::controller::Revolution::read() {
|
||||
if (!isValidDpd()) {
|
||||
mpStatus->pos.y = 1.0f / 0.0f;
|
||||
mpStatus->pos.x = 1.0f / 0.0f;
|
||||
mpStatus->speed = 0.0f;
|
||||
mpStatus->vec.y = 0.0f;
|
||||
mpStatus->vec.x = 0.0f;
|
||||
unk_0x20->pos.y = 1.0f / 0.0f;
|
||||
unk_0x20->pos.x = 1.0f / 0.0f;
|
||||
unk_0x20->speed = 0.0f;
|
||||
unk_0x20->vec.y = 0.0f;
|
||||
unk_0x20->vec.x = 0.0f;
|
||||
}
|
||||
|
||||
mbPrevPinch = mbPinch;
|
||||
unk_0x1E = unk_0x1D;
|
||||
if (isValidBtn()) {
|
||||
if (mbPrevPinch == 0) {
|
||||
if (unk_0x1E == 0) {
|
||||
if (down(0x800) && down(0x400)) {
|
||||
mbPinch = 1;
|
||||
unk_0x1D = 1;
|
||||
}
|
||||
} else if (!down(0x800) || !down(0x400)) {
|
||||
mbPinch = 0;
|
||||
unk_0x1D = 0;
|
||||
}
|
||||
} else {
|
||||
mbPinch = 0;
|
||||
unk_0x1D = 0;
|
||||
}
|
||||
|
||||
Base::read();
|
||||
}
|
||||
bool ipl::controller::Revolution::isValidDpd() const {
|
||||
if (mbForceInvalid != 0) {
|
||||
if (unk_0x1C != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (mpStatus->wpad_err == 0 || mpStatus->wpad_err == -7) && mpStatus->dpd_valid_fg != 0;
|
||||
return (unk_0x20->wpad_err == 0 || unk_0x20->wpad_err == -7) && unk_0x20->dpd_valid_fg != 0;
|
||||
}
|
||||
bool ipl::controller::Revolution::isValidBtn() const {
|
||||
u8 val = mpStatus->wpad_err;
|
||||
u8 val = unk_0x20->wpad_err;
|
||||
|
||||
return (u8)(val + 7) <= 7 && ((1 << (val + 7)) & 0xA1) != 0;
|
||||
}
|
||||
bool ipl::controller::Revolution::down(u32 mButton) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (mpStatus->hold & (mButton & 0xFFFF)) {
|
||||
if (unk_0x20->hold & (mButton & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
@@ -177,7 +177,7 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getDpdProjectionPos() const {
|
||||
math::VEC2 ret;
|
||||
Vec2 dest;
|
||||
Vec2 src = {mpStatus->pos.x, mpStatus->pos.y};
|
||||
Vec2 src = {unk_0x20->pos.x, unk_0x20->pos.y};
|
||||
nw4r::ut::Rect nw4r_rect; // constructor shouldn't be inlined
|
||||
Rect kpad_rect;
|
||||
|
||||
@@ -216,9 +216,9 @@ namespace ipl {
|
||||
y = fy;
|
||||
}
|
||||
ipl::controller::Classic::Classic(int arg0, KPADStatus& arg1) : Revolution(arg0, arg1) {
|
||||
mClassicCursor.x = 0.01f;
|
||||
mClassicCursor.y = 0.01f;
|
||||
mClassicCursorTimer = 0;
|
||||
unk_0x24.x = 0.01f;
|
||||
unk_0x24.y = 0.01f;
|
||||
unk_0x2C = 0;
|
||||
}
|
||||
ipl::controller::Base::~Base() {
|
||||
}
|
||||
@@ -230,32 +230,32 @@ namespace ipl {
|
||||
}
|
||||
void ipl::controller::Classic::read() {
|
||||
if (!Revolution::isValidDpd()) {
|
||||
math::VEC2 lstick(mpStatus->ex_status.cl.lstick.x, mpStatus->ex_status.cl.lstick.y);
|
||||
math::VEC2 lstick(unk_0x20->ex_status.cl.lstick.x, unk_0x20->ex_status.cl.lstick.y);
|
||||
|
||||
if (lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f) {
|
||||
mClassicCursor.x = math::abs_clamp(mClassicCursor.x + mpStatus->ex_status.cl.lstick.x * 0.05f, 1.8f);
|
||||
mClassicCursor.y = math::abs_clamp(mClassicCursor.y - mpStatus->ex_status.cl.lstick.y * 0.05f, 1.2f);
|
||||
unk_0x24.x = math::abs_clamp(unk_0x24.x + unk_0x20->ex_status.cl.lstick.x * 0.05f, 1.8f);
|
||||
unk_0x24.y = math::abs_clamp(unk_0x24.y - unk_0x20->ex_status.cl.lstick.y * 0.05f, 1.2f);
|
||||
}
|
||||
|
||||
math::VEC2 rstick = math::VEC2(mpStatus->ex_status.cl.rstick.x, mpStatus->ex_status.cl.rstick.y);
|
||||
math::VEC2 rstick = math::VEC2(unk_0x20->ex_status.cl.rstick.x, unk_0x20->ex_status.cl.rstick.y);
|
||||
if (getClassicHoldFlag() != 0 || lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f ||
|
||||
rstick.x * rstick.x + rstick.y * rstick.y > 0.0036f) {
|
||||
mClassicCursorTimer = 180;
|
||||
unk_0x2C = 180;
|
||||
}
|
||||
|
||||
if (--mClassicCursorTimer < 0) {
|
||||
mClassicCursorTimer = 0;
|
||||
if (--unk_0x2C < 0) {
|
||||
unk_0x2C = 0;
|
||||
}
|
||||
} else {
|
||||
mClassicCursor.y = 0.01f;
|
||||
mClassicCursor.x = 0.01f;
|
||||
mClassicCursorTimer = 0;
|
||||
unk_0x24.y = 0.01f;
|
||||
unk_0x24.x = 0.01f;
|
||||
unk_0x2C = 0;
|
||||
}
|
||||
|
||||
Revolution::read();
|
||||
}
|
||||
int ipl::controller::Classic::getClassicHoldFlag() const {
|
||||
return mpStatus->ex_status.cl.hold;
|
||||
return unk_0x20->ex_status.cl.hold;
|
||||
}
|
||||
template <>
|
||||
f32 ipl::math::abs_clamp<f32>(const f32& x, const f32& y) {
|
||||
@@ -270,7 +270,7 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getHorizon() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(mpStatus->horizon.x, mpStatus->horizon.y);
|
||||
ret.set(unk_0x20->horizon.x, unk_0x20->horizon.y);
|
||||
} else {
|
||||
ret.x = 1.0f;
|
||||
ret.y = -0.2679492f;
|
||||
@@ -280,9 +280,9 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getDpdPos() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(mpStatus->pos.x, mpStatus->pos.y);
|
||||
} else if (mClassicCursorTimer != 0) {
|
||||
ret = mClassicCursor;
|
||||
ret.set(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
} else if (unk_0x2C != 0) {
|
||||
ret = unk_0x24;
|
||||
} else {
|
||||
ret.x = (1.0f / 0.0f);
|
||||
ret.y = (1.0f / 0.0f);
|
||||
@@ -296,9 +296,9 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getDpdProjectionPos() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(mpStatus->pos.x, mpStatus->pos.y);
|
||||
} else if (mClassicCursorTimer != 0) {
|
||||
ret = mClassicCursor;
|
||||
ret.set(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
} else if (unk_0x2C != 0) {
|
||||
ret = unk_0x24;
|
||||
} else {
|
||||
ret.set(1.0f / 0.0f, 1.0f / 0.0f);
|
||||
}
|
||||
@@ -454,7 +454,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return -1;
|
||||
}
|
||||
void ipl::controller::Base::setForceInvalid(bool flag) {
|
||||
mbForceInvalid = flag;
|
||||
unk_0x1C = flag;
|
||||
}
|
||||
int ipl::controller::Base::getType() const {
|
||||
return mType;
|
||||
@@ -463,65 +463,65 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return mChan;
|
||||
}
|
||||
KPADStatus* ipl::controller::Revolution::getKPADStatus() const {
|
||||
return mpStatus;
|
||||
return unk_0x20;
|
||||
}
|
||||
f32 ipl::controller::Revolution::getDpdDistance() const {
|
||||
return mpStatus->dist;
|
||||
return unk_0x20->dist;
|
||||
}
|
||||
int ipl::controller::Revolution::getReleaseFlag() const {
|
||||
return mpStatus->release;
|
||||
return unk_0x20->release;
|
||||
}
|
||||
int ipl::controller::Revolution::getTrigFlag() const {
|
||||
return mpStatus->trig;
|
||||
return unk_0x20->trig;
|
||||
}
|
||||
int ipl::controller::Revolution::getHoldFlag() const {
|
||||
return mpStatus->hold;
|
||||
return unk_0x20->hold;
|
||||
}
|
||||
int ipl::controller::Revolution::pinchOffTrg() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && mbPinch == 0 && mbPrevPinch != 0) {
|
||||
if (isValidBtn() && unk_0x1D == 0 && unk_0x1E != 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
int ipl::controller::Revolution::pinch() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && mbPinch != 0) {
|
||||
if (isValidBtn() && unk_0x1D != 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
int ipl::controller::Revolution::pinchTrg() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && mbPinch != 0 && mbPrevPinch == 0) {
|
||||
if (isValidBtn() && unk_0x1D != 0 && unk_0x1E == 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
bool ipl::controller::Revolution::repeat(u32 button) const {
|
||||
return down(button) && (mpStatus->hold & 0x80000000) != 0;
|
||||
return down(button) && (unk_0x20->hold & 0x80000000) != 0;
|
||||
}
|
||||
BOOL ipl::controller::Classic::isValidDpdClassic() const {
|
||||
return mClassicCursorTimer != 0;
|
||||
return unk_0x2C != 0;
|
||||
}
|
||||
bool ipl::controller::Classic::isValidDpd() const {
|
||||
if (mbForceInvalid != 0) {
|
||||
if (unk_0x1C != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (Revolution::isValidDpd() != 0) || (mClassicCursorTimer != 0);
|
||||
return (Revolution::isValidDpd() != 0) || (unk_0x2C != 0);
|
||||
}
|
||||
int ipl::controller::Classic::getClassicReleaseFlag() const {
|
||||
return mpStatus->ex_status.cl.release;
|
||||
return unk_0x20->ex_status.cl.release;
|
||||
}
|
||||
int ipl::controller::Classic::getClassicTrigFlag() const {
|
||||
return mpStatus->ex_status.cl.trig;
|
||||
return unk_0x20->ex_status.cl.trig;
|
||||
}
|
||||
bool ipl::controller::Classic::upTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
KPADStatus* status = mpStatus;
|
||||
KPADStatus* status = unk_0x20;
|
||||
if ((status->release & (button & 0xFFFF)) == 0) {
|
||||
if ((status->ex_status.cl.release & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
@@ -537,7 +537,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
KPADStatus* status = mpStatus;
|
||||
KPADStatus* status = unk_0x20;
|
||||
if ((status->trig & (button & 0xFFFF)) == 0) {
|
||||
if ((status->ex_status.cl.trig & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
@@ -553,8 +553,8 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
if ((mpStatus->hold & (button & 0xFFFF)) == 0) {
|
||||
if ((mpStatus->ex_status.cl.hold & (button >> 16)) == 0) {
|
||||
if ((unk_0x20->hold & (button & 0xFFFF)) == 0) {
|
||||
if ((unk_0x20->ex_status.cl.hold & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
}
|
||||
}
|
||||
@@ -565,15 +565,15 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return ret;
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getHorizon() const {
|
||||
return math::VEC2(mpStatus->horizon.x, mpStatus->horizon.y);
|
||||
return math::VEC2(unk_0x20->horizon.x, unk_0x20->horizon.y);
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getDpdPos() const {
|
||||
return math::VEC2(mpStatus->pos.x, mpStatus->pos.y);
|
||||
return math::VEC2(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
}
|
||||
bool ipl::controller::Revolution::upTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (mpStatus->release & (button & 0xFFFF)) {
|
||||
if (unk_0x20->release & (button & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
@@ -582,7 +582,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ipl::controller::Revolution::downTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (mpStatus->trig & (button & 0xFFFF)) {
|
||||
if (unk_0x20->trig & (button & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,9 +152,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
Revolution::Revolution(int chan, int type, KPADStatus& status) : Base(chan, type, status) {
|
||||
mbPinch = 0;
|
||||
mbPrevPinch = 0;
|
||||
mpStatus = &status;
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &status;
|
||||
}
|
||||
|
||||
Interface* Manager::getMasterController() {
|
||||
|
||||
@@ -43,13 +43,13 @@ namespace ipl {
|
||||
mMessageID = msgId;
|
||||
|
||||
// Debug related? (seems to be incomplete; unused)
|
||||
mArg2 = arg2;
|
||||
mArg3 = arg3;
|
||||
unk_0x0C = arg2;
|
||||
unk_0x10 = arg3;
|
||||
if (arg1) {
|
||||
strncpy(mArg1, arg1, sizeof(mArg1));
|
||||
mArg1[sizeof(mArg1) - 1] = 0;
|
||||
strncpy(unk_0x14, arg1, sizeof(unk_0x14));
|
||||
unk_0x14[sizeof(unk_0x14) - 1] = 0;
|
||||
} else {
|
||||
memset(mArg1, 0, sizeof(mArg1));
|
||||
memset(unk_0x14, 0, sizeof(unk_0x14));
|
||||
}
|
||||
|
||||
curThread = OSGetCurrentThread();
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace ipl {
|
||||
(((mLastError > NWC24_ERR_FILE_OPEN || mLastError < NWC24_ERR_FILE_OTHER) && mLastError != NWC24_ERR_NAND_CORRUPT) && \
|
||||
(mLastError != NWC24_ERR_FILE_EXISTS && mLastError != NWC24_ERR_INTERNAL_VF && mLastError != NWC24_ERR_FILE_BROKEN))
|
||||
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), mbReceiving(false), mbReceivePaused(false), mbNewTitleTblReady(false) {
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), unk_0xA31(false), mbReceivePaused(false), unk_0xA33(false) {
|
||||
OSInitMutex(&mLock);
|
||||
OSInitMutex(&mAutoLock);
|
||||
|
||||
@@ -526,7 +526,7 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
mbReceiving = true;
|
||||
unk_0xA31 = true;
|
||||
|
||||
NWC24UserId myUserId;
|
||||
getMyUserId(&myUserId);
|
||||
@@ -910,8 +910,8 @@ namespace ipl {
|
||||
|
||||
close();
|
||||
|
||||
mbNewTitleTblReady = true;
|
||||
mbReceiving = false;
|
||||
unk_0xA33 = true;
|
||||
unk_0xA31 = false;
|
||||
}
|
||||
|
||||
void Manager::addDlTask() {
|
||||
@@ -996,7 +996,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL Manager::getNewTitleTbl(u32* titleTbl) const {
|
||||
if (!mbNewTitleTblReady) {
|
||||
if (!unk_0xA33) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace ipl {
|
||||
if (System::getPostmanManager()->IsUnknown() ||
|
||||
(System::getSceneManager() != NULL && System::getScene(SCENE_ADDRESS) != NULL)) {
|
||||
if (System::getNwc24Manager() != NULL && !System::isNandFull()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1194,9 +1194,8 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
|
||||
}
|
||||
}
|
||||
code = request->dcTable[bitCount];
|
||||
magnitude = (difference & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
|
||||
code = (s32)code >> 24;
|
||||
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
|
||||
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (difference & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
|
||||
request) == ODH_ERROR_80000004) {
|
||||
return ODH_ERROR_80000004;
|
||||
}
|
||||
|
||||
@@ -1225,9 +1224,8 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
|
||||
}
|
||||
}
|
||||
code = request->acTable[bitCount];
|
||||
magnitude = (runLength & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
|
||||
code = (s32)code >> 24;
|
||||
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
|
||||
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (runLength & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
|
||||
request) == ODH_ERROR_80000004) {
|
||||
return ODH_ERROR_80000004;
|
||||
}
|
||||
|
||||
@@ -1246,9 +1244,8 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
|
||||
}
|
||||
}
|
||||
code = request->dcTable[bitCount];
|
||||
magnitude = (value & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
|
||||
code = (s32)code >> 24;
|
||||
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
|
||||
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (value & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
|
||||
request) == ODH_ERROR_80000004) {
|
||||
return ODH_ERROR_80000004;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6265,927 +6265,3 @@ forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
## Max continuation fz10h: fresh branch audit
|
||||
Initial HEAD 2050ad7616acfcb7752e5a6da8b7f44f22c6cafd. Fresh branch, clean source; previous quantization and page-offset gains already landed. All further gains measured from this HEAD.
|
||||
Pool first libs/RVL_SDK/src/vi/vi: POOL IDENTICAL up to 7 (mine=7 base=7)
|
||||
Pool first libs/RVLMiddleware/eZiText/src/clib/zi8dawg: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Pool first src/iplwww/www_wiisetting: POOL IDENTICAL up to 72 (mine=72 base=72)
|
||||
Pool first libs/RVLMiddleware/eZiText/src/clib/zi8getc2: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Pool first src/keyboard/MyTiManager: POOL IDENTICAL up to 7 (mine=7 base=7)
|
||||
Pool first src/system/odh: POOL IDENTICAL up to 10 (mine=10 base=10)
|
||||
Pool first libs/RevoEX/src/nwc24/NWC24Download: POOL IDENTICAL up to 3 (mine=3 base=3)
|
||||
Pool first src/scene/address/iplAddress: POOL IDENTICAL up to 81 (mine=81 base=81)
|
||||
Pool first libs/RVL_SDK/src/fa/driver/sd_drv: POOL IDENTICAL up to 46 (mine=46 base=46)
|
||||
|
||||
Fz10h structural diagnosis VIInit: fetched origin; unit identical to verified baseline origin source; 99.7929%; 338/338 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h structural diagnosis VIInit: fetched origin; unit identical to verified baseline origin source; 99.7929%; 338/338 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
VIInit | fz10h initial clipping dedicated helper frac_accumulator | 335/338 instructions, structural/exact (117, 225)
|
||||
|
||||
VIInit | fz10h initial clipping dedicated helper coefficient_branch | 340/338 instructions, structural/exact (118, 196)
|
||||
|
||||
VIInit | fz10h initial clipping dedicated helper height_halfword | 335/338 instructions, structural/exact (114, 225)
|
||||
|
||||
VIInit | fz10h initial clipping dedicated helper top_helper | 337/338 instructions, structural/exact (104, 224)
|
||||
|
||||
VIInit | fz10h initial clipping dedicated helper bottom_helper | 337/338 instructions, structural/exact (109, 223)
|
||||
|
||||
Fz10h structural diagnosis Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue: fetched origin; unit identical to verified baseline origin source; 99.86043%; 609/609 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0xd0(r1)') / ('stwu', 'r1, -0xd0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h VI clone correction: the initial five cloned-helper trials preceded the original file-local MIN/MAX/CLAMP definitions, so those tokens were compiled as unresolved function calls. They are invalid semantic trials and excluded from attempt counts. Every trial was restored; repeat with separate local macro names that expand to the original clamp expressions.
|
||||
|
||||
Fz10h structural diagnosis VIInit: fetched origin; unit identical to verified baseline origin source; 99.7929%; 338/338 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
VIInit | fz10h initial clipping genuine macro expansion frac_accumulator | 338/338 instructions, structural/exact (0, 14)
|
||||
|
||||
VIInit | fz10h initial clipping genuine macro expansion coefficient_branch | 341/338 instructions, structural/exact (33, 166)
|
||||
|
||||
VIInit | fz10h initial clipping genuine macro expansion height_halfword | 338/338 instructions, structural/exact (32, 73)
|
||||
|
||||
VIInit | fz10h initial clipping genuine macro expansion top_helper | 338/338 instructions, structural/exact (3, 33)
|
||||
|
||||
VIInit | fz10h initial clipping genuine macro expansion bottom_helper | 338/338 instructions, structural/exact (18, 57)
|
||||
|
||||
Fz10h structural diagnosis Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue: fetched origin; unit identical to verified baseline origin source; 99.86043%; 609/609 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0xd0(r1)') / ('stwu', 'r1, -0xd0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h genuine security/country helper boundaries mask_full | 609/609 instructions, structural/exact (0, 9)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h genuine security/country helper boundaries country_ref | 609/609 instructions, structural/exact (0, 14)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h genuine security/country helper boundaries mask_full_country | 609/609 instructions, structural/exact (0, 9)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h genuine security/country helper boundaries mask_result_country | 609/609 instructions, structural/exact (0, 9)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h country loop positive comparison and prefix increment | 609/609 instructions, structural/exact (0, 14)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h country accepted index advanced before narrowing assignment | 609/609 instructions, structural/exact (0, 14)
|
||||
|
||||
Fz10h structural diagnosis Zi8GetDataSignature: fetched origin; unit identical to verified baseline origin source; 99.347824%; 69/69 instructions, structural/exact (0, 9); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Zi8GetDataSignature | fz10h immutable destination pointer | 69/69 instructions, structural/exact (0, 9)
|
||||
|
||||
Zi8GetDataSignature | fz10h immutable query input parameters | 69/69 instructions, structural/exact (0, 9)
|
||||
|
||||
Zi8GetDataSignature | fz10h destination array formal | 69/69 instructions, structural/exact (0, 9)
|
||||
|
||||
Zi8GetDataSignature | fz10h query address preserved as const scalar until table count returns | 73/69 instructions, structural/exact (8, 68)
|
||||
|
||||
Fz10h Zi8MatchROMdata1 skip proof: fetched origin; dawg source identical to live main; function already 100%, ctxdiff 128/128 instructions and diffs 0. Unit 6/6 exact, code 4868, data 120. No duplicate source trials.
|
||||
|
||||
Zi8GetDataSignature | fz10h finished capacity parameter reused for validated signature length | 70/69 instructions, structural/exact (11, 32)
|
||||
|
||||
Zi8GetDataSignature | fz10h validated destination pointer advanced to terminating byte | 70/69 instructions, structural/exact (6, 25)
|
||||
|
||||
Zi8GetDataSignature | fz10h table selection switch preserves format-error exit and query order | 70/69 instructions, structural/exact (3, 63)
|
||||
|
||||
Fz10h structural diagnosis Zi8IsDupWChar: fetched origin; unit identical to verified baseline origin source; 99.36508%; 63/63 instructions, structural/exact (0, 8); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Zi8IsDupWChar | fz10h immutable search character formal | 66/63 instructions, structural/exact (6, 54)
|
||||
|
||||
Zi8IsDupWChar | fz10h search snapshot scoped with positive bound and matching operand order | 67/63 instructions, structural/exact (12, 65)
|
||||
|
||||
Zi8IsDupWChar | fz10h duplicate result initialized only after empty-buffer return | 63/63 instructions, structural/exact (3, 22)
|
||||
|
||||
Zi8IsDupWChar | fz10h completed search index reused for wrap-size decision | 63/63 instructions, structural/exact (0, 23)
|
||||
|
||||
Zi8IsDupWChar | fz10h completed search index reused for actual append slot | 63/63 instructions, structural/exact (4, 26)
|
||||
|
||||
Zi8IsDupWChar | fz10h byte buffer count update expressed as prefix sequence | 63/63 instructions, structural/exact (2, 11)
|
||||
|
||||
Zi8IsDupWChar | fz10h duplicate return explicitly narrows its boolean result | 63/63 instructions, structural/exact (1, 8)
|
||||
|
||||
Fz10h structural diagnosis Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue: fetched origin; unit identical to verified baseline origin source; 99.86043%; 609/609 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0xd0(r1)') / ('stwu', 'r1, -0xd0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h European index return helper with preserving failed-search state | 612/609 instructions, structural/exact (26, 46)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h European helper initialized index formal | 612/609 instructions, structural/exact (26, 46)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h European helper explicit immutable settings input | 612/609 instructions, structural/exact (26, 46)
|
||||
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | fz10h European helper completed index accumulator returned | 612/609 instructions, structural/exact (24, 46)
|
||||
|
||||
Fz10h structural diagnosis VIInit: fetched origin; unit identical to verified baseline origin source; 99.7929%; 338/338 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch VIInit: (0, 14)
|
||||
```text
|
||||
declaration block:
|
||||
u16 displayConfig;
|
||||
u32 __VIDVDStopFlag_Enable_old;
|
||||
s32 format;
|
||||
u32 value;
|
||||
u32 tv;
|
||||
u32 bootromTv;
|
||||
start (0, 14)
|
||||
best (0, 14) after 36 builds; source restored; best order was:
|
||||
u16 displayConfig;
|
||||
u32 __VIDVDStopFlag_Enable_old;
|
||||
s32 format;
|
||||
u32 value;
|
||||
u32 tv;
|
||||
u32 bootromTv;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue: fetched origin; unit identical to verified baseline origin source; 99.86043%; 609/609 instructions, structural/exact (0, 14); stack ('stwu', 'r1, -0xd0(r1)') / ('stwu', 'r1, -0xd0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue: (0, 14)
|
||||
```text
|
||||
declaration block:
|
||||
int retVal;
|
||||
int strPropIdx;
|
||||
start (0, 14)
|
||||
best (0, 14) after 2 builds; source restored; best order was:
|
||||
int retVal;
|
||||
int strPropIdx;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis Zi8GetDataSignature: fetched origin; unit identical to verified baseline origin source; 99.347824%; 69/69 instructions, structural/exact (0, 9); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch Zi8GetDataSignature: (0, 9)
|
||||
```text
|
||||
declaration block:
|
||||
ziU8* signature;
|
||||
ziU16 length;
|
||||
start (0, 9)
|
||||
best (0, 9) after 2 builds; source restored; best order was:
|
||||
ziU8* signature;
|
||||
ziU16 length;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis Zi8IsDupWChar: fetched origin; unit identical to verified baseline origin source; 99.36508%; 63/63 instructions, structural/exact (0, 8); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch Zi8IsDupWChar: (0, 8)
|
||||
```text
|
||||
declaration block:
|
||||
ziBool duplicate;
|
||||
ziU16* buffer;
|
||||
unsigned int index;
|
||||
start (0, 8)
|
||||
best (0, 8) after 6 builds; source restored; best order was:
|
||||
ziBool duplicate;
|
||||
ziU16* buffer;
|
||||
unsigned int index;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci: fetched origin; unit identical to verified baseline origin source; 98.63636%; 77/77 instructions, structural/exact (0, 18); stack ('stwu', 'r1, -0x50(r1)') / ('stwu', 'r1, -0x50(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci | fz10h dimension rounding retained inside complete inline helper | 76/77 instructions, structural/exact (5, 57)
|
||||
|
||||
cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci | fz10h dimension remainder retained as initialized local | 77/77 instructions, structural/exact (0, 19)
|
||||
|
||||
cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci | fz10h chroma plane area held once before the two plane pointers | 77/77 instructions, structural/exact (0, 30)
|
||||
|
||||
cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci | fz10h dimension aligned by seven-bit addition and mask | 73/77 instructions, structural/exact (8, 56)
|
||||
|
||||
Fz10h structural diagnosis LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli: fetched origin; unit identical to verified baseline origin source; 98.08219%; 146/146 instructions, structural/exact (2, 12); stack ('stwu', 'r1, -0x60(r1)') / ('stwu', 'r1, -0x60(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli | fz10h RGB565 byte assembly a single high-first integer expression | 146/146 instructions, structural/exact (2, 12)
|
||||
|
||||
LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli | fz10h YCbCr samples captured before the floating conversion arithmetic | 146/146 instructions, structural/exact (2, 12)
|
||||
|
||||
LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli | fz10h integer conversion sums accumulate blue and green before red | 146/146 instructions, structural/exact (12, 20)
|
||||
|
||||
Fz10h structural diagnosis huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest: fetched origin; unit identical to verified baseline origin source; 99.07976%; 163/163 instructions, structural/exact (0, 18); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h Huffman payload OR operand before shifted prefix | 163/163 instructions, structural/exact (0, 21)
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h signed coefficient halfword consumed directly at both DC and AC reads | 160/163 instructions, structural/exact (10, 142)
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h finished magnitude temporary used for mask before each bit emission | 163/163 instructions, structural/exact (0, 18)
|
||||
|
||||
Fz10h structural diagnosis cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii: fetched origin; unit identical to verified baseline origin source; 99.67186%; 899/899 instructions, structural/exact (0, 43); stack ('stwu', 'r1, -0x50(r1)') / ('stwu', 'r1, -0x50(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii | fz10h block row bytes derived from initialized row stride | 899/899 instructions, structural/exact (3, 48)
|
||||
|
||||
cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii | fz10h natural-order coefficient read follows immutable mapped-index snapshot | 899/899 instructions, structural/exact (0, 43)
|
||||
|
||||
cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii | fz10h block stride twice initialized row stride | 899/899 instructions, structural/exact (0, 43)
|
||||
|
||||
Fz10h structural diagnosis huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl: fetched origin; unit identical to verified baseline origin source; 95.57189%; 306/306 instructions, structural/exact (0, 171); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl | fz10h signed Huffman reconstruction complements mask before value OR | 306/306 instructions, structural/exact (0, 171)
|
||||
|
||||
huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl | fz10h decoded coefficient pointer assignment consumes counted index | 306/306 instructions, structural/exact (0, 171)
|
||||
|
||||
huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl | fz10h DC maximum bit length selected with initialized conditional | 306/306 instructions, structural/exact (12, 148)
|
||||
|
||||
Fz10h MyTiManager data relocation/type audit:
|
||||
.data source/target 980/984; entire source prefix byte-equal True; sorted relocation equality False (177/170); remaining 4 bytes all zero True.
|
||||
@8346: target 0x0/0x19, source no named counterpart
|
||||
@8347: target 0x20/0x10, source no named counterpart
|
||||
@8369: target 0x30/0x11, source no named counterpart
|
||||
@8385: target 0x44/0x16, source no named counterpart
|
||||
@8386: target 0x5c/0x19, source no named counterpart
|
||||
@8402: target 0x78/0x16, source no named counterpart
|
||||
@8410: target 0x90/0x11, source no named counterpart
|
||||
__vt__Q49textinput6extend2bg4Base: target 0xa8/0x10, source 0xa8/0x10
|
||||
__vt__Q49textinput6extend4memo18DisappearMemoState: target 0xb8/0x58, source 0xb8/0x58
|
||||
__vt__Q49textinput6extend4memo13EditMemoState: target 0x110/0x58, source 0x110/0x58
|
||||
__vt__Q49textinput6extend4memo15AppearMemoState: target 0x168/0x58, source 0x168/0x58
|
||||
__vt__Q49textinput6extend4memo13DispMemoState: target 0x1c0/0x58, source 0x1c0/0x58
|
||||
__vt__Q49textinput6extend4memo5State: target 0x218/0x58, source 0x218/0x58
|
||||
__vt__Q49textinput6extend4memo7Manager: target 0x270/0x140, source 0x270/0x140
|
||||
lbl_816681E8: target 0x3b0/0x28, source no named counterpart
|
||||
Manager vtable offset 0x270, type layout 80 words = 0x140 bytes, ends 0x3b0; final slots relocate to createMemoInputForm/createLetterInputForm/createBigTextInputForm/createBG. Every real vtable already pairs by name/size. Separate lbl_816681E8 at 0x3b0 has size 0x28, no outgoing relocations, and no proven real type or incoming target reference. No rename or extent correction is justified; no symbols, addresses, section totals or source data were changed.
|
||||
|
||||
Fz10h structural diagnosis NWC24InitDlTask: fetched origin; unit identical to verified baseline origin source; 98.923615%; 144/144 instructions, structural/exact (0, 31); stack ('stwu', 'r1, -0x60(r1)') / ('stwu', 'r1, -0x60(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
NWC24InitDlTask | fz10h home identifier parsing complete helper caller-owned path | 144/144 instructions, structural/exact (0, 31)
|
||||
|
||||
NWC24InitDlTask | fz10h home identifier parsing complete helper helper-owned path | 144/144 instructions, structural/exact (0, 31)
|
||||
|
||||
NWC24InitDlTask | fz10h content filename branch directly uses complete type predicate | 139/144 instructions, structural/exact (9, 93)
|
||||
|
||||
Fz10h structural diagnosis NWC24IterateDlTask: fetched origin; unit identical to verified baseline origin source; 99.303795%; 79/79 instructions, structural/exact (0, 10); stack ('lwz', 'r5, 0(0)') / ('lwz', 'r5, 0(0)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
NWC24IterateDlTask | fz10h iteration bound and advancement expressed as for loop | 79/79 instructions, structural/exact (0, 10)
|
||||
|
||||
NWC24IterateDlTask | fz10h loop success and failed-entry paths explicitly complementary | 80/79 instructions, structural/exact (6, 26)
|
||||
|
||||
NWC24IterateDlTask | fz10h completed bound temporary reused for current header maximum | 79/79 instructions, structural/exact (0, 10)
|
||||
|
||||
Fz10h structural diagnosis NWC24UpdateDlTask: fetched origin; unit identical to verified baseline origin source; 95.00395%; 249/253 instructions, structural/exact (19, 250); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
NWC24UpdateDlTask | fz10h current access-time helper delayed initialized result | 249/253 instructions, structural/exact (19, 250)
|
||||
|
||||
NWC24UpdateDlTask | fz10h complete inline update owns universal-time acquisition | 248/253 instructions, structural/exact (14, 145)
|
||||
|
||||
NWC24UpdateDlTask | fz10h complete inline update retry loop positive exit | 254/253 instructions, structural/exact (21, 142)
|
||||
|
||||
NWC24UpdateDlTask | fz10h complete inline update header snapshot after sentinel guard | 256/253 instructions, structural/exact (16, 207)
|
||||
|
||||
Fz10h current MyTi weak-data qualification: main now emits __vt__Q39textinput4util9Animation, STB_WEAK, 36 bytes at .data+0x3b0 with seven relocations to startAnm/calc/getValue/isActive/setSEFlag/isSEFlag/stop. The original target tail remains 40 zero bytes with no relocations, so only the first 944 bytes and their 170 relocations pair structurally; the extra source weak vtable is linker-deduplicated data and is ignored as required. Its placement alone does not prove the unreferenced target lbl_816681E8 names it. No rename/extent edit.
|
||||
|
||||
Fz10h structural diagnosis start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface: fetched origin; unit identical to verified baseline origin source; 99.34978%; 222/223 instructions, structural/exact (4, 200); stack ('stwu', 'r1, -0x40(r1)') / ('stwu', 'r1, -0x40(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface | fz10h nested mode switches with complete drag image helper icon first | 224/223 instructions, structural/exact (12, 98)
|
||||
|
||||
start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface | fz10h nested mode switches with complete drag image helper pane first | 224/223 instructions, structural/exact (12, 98)
|
||||
|
||||
start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface | fz10h nested mode switches drag image helper texture pointer | 224/223 instructions, structural/exact (12, 98)
|
||||
|
||||
start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface | fz10h nested mode switches icon image pointer captured at the copy boundary | 223/223 instructions, structural/exact (0, 7)
|
||||
|
||||
Fz10h structural diagnosis onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface: fetched origin; unit identical to verified baseline origin source; 97.662964%; 271/270 instructions, structural/exact (18, 152); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface | fz10h controller null and button trigger expressed as a nested positive case | 271/270 instructions, structural/exact (18, 152)
|
||||
|
||||
onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface | fz10h pane component captured before its name query | 271/270 instructions, structural/exact (18, 152)
|
||||
|
||||
onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface | fz10h drag controller identity has explicit short-circuit null arm | 281/270 instructions, structural/exact (41, 130)
|
||||
|
||||
Fz10h structural diagnosis movePane_onDrag__Q33ipl5scene7AddressFv: fetched origin; unit identical to verified baseline origin source; 95.70968%; 154/155 instructions, structural/exact (7, 104); stack ('stwu', 'r1, -0x90(r1)') / ('stwu', 'r1, -0x90(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h character-width loop exposes increment after actual font width call | 154/155 instructions, structural/exact (7, 104)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h projection scale consumed from initialized local in both offset branches | 140/155 instructions, structural/exact (45, 103)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h base position plus width captured as actual right edge | 154/155 instructions, structural/exact (7, 104)
|
||||
|
||||
Fz10h structural diagnosis update__Q33ipl5scene15FriendListCacheFUlPCwUx: fetched origin; unit identical to verified baseline origin source; 81.35%; 36/40 instructions, structural/exact (19, 34); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
update__Q33ipl5scene15FriendListCacheFUlPCwUx | fz10h friend name uses reference independent of final record address | 37/40 instructions, structural/exact (7, 32)
|
||||
|
||||
update__Q33ipl5scene15FriendListCacheFUlPCwUx | fz10h only name pointer retained through clear and copy calls | 38/40 instructions, structural/exact (7, 33)
|
||||
|
||||
update__Q33ipl5scene15FriendListCacheFUlPCwUx | fz10h record pointer scope ends before manager query | 37/40 instructions, structural/exact (7, 32)
|
||||
|
||||
Fz10h structural diagnosis movePane_onDrag__Q33ipl5scene7AddressFv: fetched origin; unit identical to verified baseline origin source; 95.70968%; 154/155 instructions, structural/exact (7, 104); stack ('stwu', 'r1, -0x90(r1)') / ('stwu', 'r1, -0x90(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h movePane target branch proof: target null TextBox/name branches jump past the extra 0.01f addition (0x50d0/0x50dc -> 0x514c), but baseline source adds it unconditionally. Move the margin into the successful font-width branch before any register-only tuning.
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h margin only inside the successful text-width branch | 154/155 instructions, structural/exact (5, 104)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h margin branch consumes name address only after TextBox null check | 153/155 instructions, structural/exact (4, 100)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h margin branch and name consumption explicit right-edge product local | 153/155 instructions, structural/exact (4, 100)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h margin branch begins with name and text-box pointers declared together | 154/155 instructions, structural/exact (5, 104)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h complete nullable text-width helper with actual margin 0 | 154/155 instructions, structural/exact (5, 104)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h complete nullable text-width helper with actual margin 1 | 154/155 instructions, structural/exact (5, 104)
|
||||
|
||||
Fz10h structural diagnosis NWC24iCheckDlHeaderConsistency: fetched origin; unit identical to verified baseline origin source; 98.77358%; 212/212 instructions, structural/exact (2, 3); stack ('stwu', 'r1, -0x2c0(r1)') / ('stwu', 'r1, -0x2c0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h structural diagnosis NWC24iCheckDlHeaderConsistency: fetched origin; unit identical to verified baseline origin source; 98.77358%; 212/212 instructions, structural/exact (2, 3); stack ('stwu', 'r1, -0x2c0(r1)') / ('stwu', 'r1, -0x2c0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
NWC24iCheckDlHeaderConsistency | fz10h task pointer assigned after parameter snapshots | 212/212 instructions, structural/exact (2, 3)
|
||||
|
||||
NWC24iCheckDlHeaderConsistency | fz10h repair predicate short-circuit expressed as sequential continues | 212/212 instructions, structural/exact (2, 3)
|
||||
|
||||
NWC24iCheckDlHeaderConsistency | fz10h iteration count converted into explicit loop advancement | 214/212 instructions, structural/exact (8, 178)
|
||||
|
||||
Fz10h structural diagnosis AddTaskInternal: fetched origin; unit identical to verified baseline origin source; 97.7182%; 398/401 instructions, structural/exact (20, 323); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
AddTaskInternal | fz10h URL helper local pointer assignment after header validation | 398/401 instructions, structural/exact (20, 323)
|
||||
|
||||
AddTaskInternal | fz10h URL helper positive scheme branches in preserved string order | 399/401 instructions, structural/exact (24, 106)
|
||||
|
||||
AddTaskInternal | fz10h URL helper sentinel guard before count check | 398/401 instructions, structural/exact (25, 328)
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_init: fetched origin; unit identical to verified baseline origin source; 92.326385%; 144/144 instructions, structural/exact (18, 31); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
pfd_sddrv_init | fz10h null disk expressed by unsigned pointer-size value | 144/144 instructions, structural/exact (18, 31)
|
||||
|
||||
pfd_sddrv_init | fz10h already initialized return expressed as positive disk mismatch branch | 144/144 instructions, structural/exact (18, 31)
|
||||
|
||||
pfd_sddrv_init | fz10h disk binding and initialization flag completed through alias to driver state | 144/144 instructions, structural/exact (18, 31)
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_finalize: fetched origin; unit identical to verified baseline origin source; 92.63158%; 57/57 instructions, structural/exact (6, 4); stack ('stwu', 'r1, -0x10(r1)') / ('stwu', 'r1, -0x10(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
pfd_sddrv_finalize | fz10h final flags use existing immutable-info accessor boundary | 57/57 instructions, structural/exact (6, 4)
|
||||
|
||||
pfd_sddrv_finalize | fz10h final flags completed through genuine local state alias | 57/57 instructions, structural/exact (6, 4)
|
||||
|
||||
pfd_sddrv_finalize | fz10h final flags assignment consumes result temporary after unmount completes | 57/57 instructions, structural/exact (6, 4)
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_get_total_sectors: fetched origin; unit identical to verified baseline origin source; 99.5%; 80/80 instructions, structural/exact (0, 6); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
pfd_sddrv_get_total_sectors | fz10h validated exponent adjusted in its own halfword local before shifting | 80/80 instructions, structural/exact (0, 6)
|
||||
|
||||
pfd_sddrv_get_total_sectors | fz10h factor consumed as direct halfword shifted expression | 80/80 instructions, structural/exact (3, 10)
|
||||
|
||||
pfd_sddrv_get_total_sectors | fz10h finished block size local reused for factor exponent | 80/80 instructions, structural/exact (0, 6)
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_store_mbr_buf: fetched origin; unit identical to verified baseline origin source; 99.75247%; 202/202 instructions, structural/exact (0, 9); stack ('stwu', 'r1, -0x40(r1)') / ('stwu', 'r1, -0x40(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
pfd_sddrv_store_mbr_buf | fz10h requested sector temporary receives CHS sectors per cylinder after table lookup | 202/202 instructions, structural/exact (0, 18)
|
||||
|
||||
pfd_sddrv_store_mbr_buf | fz10h geometry operands load root entries before fat copies | 202/202 instructions, structural/exact (0, 9)
|
||||
|
||||
pfd_sddrv_store_mbr_buf | fz10h completed table iteration index receives partition start value | 202/202 instructions, structural/exact (0, 13)
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_build_fat32_mbr_bpb: fetched origin; unit identical to verified baseline origin source; 94.75225%; 230/222 instructions, structural/exact (24, 122); stack ('stwu', 'r1, -0x40(r1)') / ('stwu', 'r1, -0x40(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
pfd_sddrv_build_fat32_mbr_bpb | fz10h reserved helper consumes genuine memset destination return | 229/222 instructions, structural/exact (23, 122)
|
||||
|
||||
pfd_sddrv_build_fat32_mbr_bpb | fz10h reserved helper takes typed boot-sector pointer | 230/222 instructions, structural/exact (26, 122)
|
||||
|
||||
pfd_sddrv_build_fat32_mbr_bpb | fz10h reserved helper positive null guard with actual status local | 230/222 instructions, structural/exact (24, 122)
|
||||
|
||||
Fz10h structural diagnosis movePane_onDrag__Q33ipl5scene7AddressFv: fetched origin; unit identical to verified baseline origin source; 95.70968%; 154/155 instructions, structural/exact (7, 104); stack ('stwu', 'r1, -0x90(r1)') / ('stwu', 'r1, -0x90(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text nested positive boolean switches | 160/155 instructions, structural/exact (12, 117)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text nested negative boolean switches | 158/155 instructions, structural/exact (10, 114)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text inner boolean switch with outer positive guard | 157/155 instructions, structural/exact (6, 103)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text inner switch consumes base translation for right edge | 158/155 instructions, structural/exact (8, 104)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text inner switch consumes projection x for right edge | 158/155 instructions, structural/exact (8, 104)
|
||||
|
||||
Fz10h structural diagnosis NWC24iCheckDlHeaderConsistency: fetched origin; unit identical to verified baseline origin source; 98.77358%; 212/212 instructions, structural/exact (2, 3); stack ('stwu', 'r1, -0x2c0(r1)') / ('stwu', 'r1, -0x2c0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
NWC24iCheckDlHeaderConsistency | fz10h complete consistency helper task workspace first | 212/212 instructions, structural/exact (5, 6)
|
||||
|
||||
NWC24iCheckDlHeaderConsistency | fz10h complete consistency helper header then workspace | 212/212 instructions, structural/exact (5, 6)
|
||||
|
||||
NWC24iCheckDlHeaderConsistency | fz10h complete consistency helper repair then workspace | 212/212 instructions, structural/exact (5, 6)
|
||||
|
||||
NWC24iCheckDlHeaderConsistency | fz10h complete consistency helper workspace last | 212/212 instructions, structural/exact (5, 6)
|
||||
|
||||
Fz10h structural diagnosis huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest: fetched origin; unit identical to verified baseline origin source; 99.07976%; 163/163 instructions, structural/exact (0, 18); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h complete Huffman emit helper actual low-bit payload first | 163/163 instructions, structural/exact (0, 21)
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h complete Huffman emit helper actual prefix first | 163/163 instructions, structural/exact (0, 18)
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h complete Huffman emit helper value formal before code | 163/163 instructions, structural/exact (0, 21)
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h completed magnitude becomes payload and code becomes prefix length | 163/163 instructions, structural/exact (0, 9)
|
||||
|
||||
Fz10h structural diagnosis movePane_onDrag__Q33ipl5scene7AddressFv: fetched origin; unit identical to verified baseline origin source; 95.70968%; 154/155 instructions, structural/exact (7, 104); stack ('stwu', 'r1, -0x90(r1)') / ('stwu', 'r1, -0x90(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text pointer switches preserve default branches | 153/155 instructions, structural/exact (4, 100)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text single-pass loop with early exits | 153/155 instructions, structural/exact (4, 100)
|
||||
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | fz10h nullable text negative guards and positive else bodies | 153/155 instructions, structural/exact (4, 100)
|
||||
|
||||
Fz10h structural diagnosis huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest: fetched origin; unit identical to verified baseline origin source; 99.07976%; 163/163 instructions, structural/exact (0, 18); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest | fz10h consumed code prefix length with actual payload first OR operand | 163/163 instructions, structural/exact (0, 0)
|
||||
|
||||
Fz10h exact gain: huffmanCoder payload is computed using the finished magnitude temporary, payload first in the OR, and code is consumed as its prefix length before EmitBit. This fixes all 18 original differences, including the code/payload registers and OR operands. Fresh ctxdiff 163/163, diffs 0; exact-name objdiff 100%; string pool 10/10 identical. No real function, data extent, symbol name, compiler flags, or inline assembly changed.
|
||||
Fz10h full clean ODH gate before committing gain:
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/system/odh] pool: IDENTICAL
|
||||
[src/system/odh] objdiff: code 8972/14684 data 6360/6360 functions 24/28 fuzzy 99.4457 linked code 0
|
||||
[src/system/odh] instruction-exact functions: 24/28
|
||||
[src/system/odh] section .data size 464 match 100.0
|
||||
[src/system/odh] section .rodata size 5856 match 100.0
|
||||
[src/system/odh] section .sdata2 size 40 match 100.0
|
||||
[src/system/odh] section .text size 14684 match 99.445656
|
||||
[src/system/odh] below 100: cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci 98.63636
|
||||
[src/system/odh] below 100: LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli 98.08219
|
||||
[src/system/odh] below 100: cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii 99.67186
|
||||
[src/system/odh] below 100: huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl 95.57189
|
||||
[src/system/odh] baseline: code 8320/14684 data 6360 functions 23 fuzzy 99.4048
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.46720 -> 90.48897
|
||||
global fuzzy_match_percent: 99.56565 -> 99.56587
|
||||
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
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci: fetched origin; unit identical to verified baseline origin source; 98.63636%; 77/77 instructions, structural/exact (0, 18); stack ('stwu', 'r1, -0x50(r1)') / ('stwu', 'r1, -0x50(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci: (0, 18)
|
||||
```text
|
||||
declaration block:
|
||||
u32 paddedWidth;
|
||||
u16 width;
|
||||
u16 height;
|
||||
u8* workPlane;
|
||||
int sourceStride;
|
||||
u8* crPlane;
|
||||
u8* cbPlane;
|
||||
u16* dimensions;
|
||||
int rowIndex;
|
||||
int i;
|
||||
u16 dimension;
|
||||
u16 paddedDimensions[2];
|
||||
start (0, 18)
|
||||
best (0, 18) after 80 builds; source restored; best order was:
|
||||
u32 paddedWidth;
|
||||
u16 width;
|
||||
u16 height;
|
||||
u8* workPlane;
|
||||
int sourceStride;
|
||||
u8* crPlane;
|
||||
u8* cbPlane;
|
||||
u16* dimensions;
|
||||
int rowIndex;
|
||||
int i;
|
||||
u16 dimension;
|
||||
u16 paddedDimensions[2];
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli: fetched origin; unit identical to verified baseline origin source; 98.08219%; 146/146 instructions, structural/exact (2, 12); stack ('stwu', 'r1, -0x60(r1)') / ('stwu', 'r1, -0x60(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli: (2, 12)
|
||||
```text
|
||||
declaration block:
|
||||
u32 planeSize = (u32)width * (u32)height;
|
||||
const s32* table = (const s32*)conversionTable;
|
||||
u32 pixelIndex = 0;
|
||||
start (2, 12)
|
||||
best (2, 12) after 6 builds; source restored; best order was:
|
||||
u32 planeSize = (u32)width * (u32)height;
|
||||
const s32* table = (const s32*)conversionTable;
|
||||
u32 pixelIndex = 0;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii: fetched origin; unit identical to verified baseline origin source; 99.67186%; 899/899 instructions, structural/exact (0, 43); stack ('stwu', 'r1, -0x50(r1)') / ('stwu', 'r1, -0x50(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii: (0, 43)
|
||||
```text
|
||||
declaration block:
|
||||
int blockStride;
|
||||
int workBufferSize = workSize;
|
||||
u8 xSampling;
|
||||
u8 coefficientIndex;
|
||||
u16 blockWidth;
|
||||
int blockRowStride;
|
||||
int planeOffset;
|
||||
u32 sourceLimit = srcSize;
|
||||
int statusOrOffset;
|
||||
u16 blockX;
|
||||
int rowStride;
|
||||
int blockRowSize;
|
||||
int naturalIndex;
|
||||
int requiredBlockEnd;
|
||||
start (0, 43)
|
||||
best (0, 43) after 80 builds; source restored; best order was:
|
||||
int blockStride;
|
||||
int workBufferSize = workSize;
|
||||
u8 xSampling;
|
||||
u8 coefficientIndex;
|
||||
u16 blockWidth;
|
||||
int blockRowStride;
|
||||
int planeOffset;
|
||||
u32 sourceLimit = srcSize;
|
||||
int statusOrOffset;
|
||||
u16 blockX;
|
||||
int rowStride;
|
||||
int blockRowSize;
|
||||
int naturalIndex;
|
||||
int requiredBlockEnd;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl: fetched origin; unit identical to verified baseline origin source; 95.57189%; 306/306 instructions, structural/exact (0, 171); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl: (0, 171)
|
||||
```text
|
||||
declaration block:
|
||||
u32 bitBuffer;
|
||||
u32 tableCount;
|
||||
s32 decodeResult;
|
||||
int bitIndex;
|
||||
s32 maximumBitLength;
|
||||
int maxHuffmanBits;
|
||||
u16 tableEntry;
|
||||
s32 valueCategory;
|
||||
u32 tableIndex;
|
||||
u32 magnitudeMask;
|
||||
int bytesConsumed;
|
||||
u8* sourceCursor;
|
||||
u32 decodedSymbol;
|
||||
u32 bitCountAndMask;
|
||||
start (0, 171)
|
||||
best (0, 171) after 80 builds; source restored; best order was:
|
||||
u32 bitBuffer;
|
||||
u32 tableCount;
|
||||
s32 decodeResult;
|
||||
int bitIndex;
|
||||
s32 maximumBitLength;
|
||||
int maxHuffmanBits;
|
||||
u16 tableEntry;
|
||||
s32 valueCategory;
|
||||
u32 tableIndex;
|
||||
u32 magnitudeMask;
|
||||
int bytesConsumed;
|
||||
u8* sourceCursor;
|
||||
u32 decodedSymbol;
|
||||
u32 bitCountAndMask;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis NWC24InitDlTask: fetched origin; unit identical to verified baseline origin source; 98.923615%; 144/144 instructions, structural/exact (0, 31); stack ('stwu', 'r1, -0x60(r1)') / ('stwu', 'r1, -0x60(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch NWC24InitDlTask: (0, 31)
|
||||
```text
|
||||
declaration block:
|
||||
char homePath[64] = {0};
|
||||
u32 nwc24IdHigh;
|
||||
u32 nwc24IdLow;
|
||||
DlTaskData* task;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
BOOL allowed;
|
||||
BOOL useContentFile;
|
||||
start (0, 31)
|
||||
best (0, 31) after 57 builds; source restored; best order was:
|
||||
char homePath[64] = {0};
|
||||
u32 nwc24IdHigh;
|
||||
u32 nwc24IdLow;
|
||||
DlTaskData* task;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
BOOL allowed;
|
||||
BOOL useContentFile;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis NWC24IterateDlTask: fetched origin; unit identical to verified baseline origin source; 99.303795%; 79/79 instructions, structural/exact (0, 10); stack ('lwz', 'r5, 0(0)') / ('lwz', 'r5, 0(0)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch NWC24IterateDlTask: (0, 10)
|
||||
```text
|
||||
declaration block:
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Work* work;
|
||||
u16 taskId;
|
||||
u16 maxTaskCount;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
start (0, 10)
|
||||
best (0, 10) after 31 builds; source restored; best order was:
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Work* work;
|
||||
u16 taskId;
|
||||
u16 maxTaskCount;
|
||||
DlTaskListHeader* header;
|
||||
NWC24Err result;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis NWC24UpdateDlTask: fetched origin; unit identical to verified baseline origin source; 95.00395%; 249/253 instructions, structural/exact (19, 250); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch NWC24UpdateDlTask: (19, 250)
|
||||
```text
|
||||
declaration block:
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header;
|
||||
u16 taskId;
|
||||
OSTime universalTime;
|
||||
NWC24Err result;
|
||||
start (19, 250)
|
||||
best (19, 250) after 21 builds; source restored; best order was:
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header;
|
||||
u16 taskId;
|
||||
OSTime universalTime;
|
||||
NWC24Err result;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis NWC24iCheckDlHeaderConsistency: fetched origin; unit identical to verified baseline origin source; 98.77358%; 212/212 instructions, structural/exact (2, 3); stack ('stwu', 'r1, -0x2c0(r1)') / ('stwu', 'r1, -0x2c0(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch NWC24iCheckDlHeaderConsistency (score-only: insufficient independent leading declarations or call/declaration dependency): (2, 3)
|
||||
```text
|
||||
structural 2 exact 3
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis AddTaskInternal: fetched origin; unit identical to verified baseline origin source; 97.7182%; 398/401 instructions, structural/exact (20, 323); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch AddTaskInternal: (20, 323)
|
||||
```text
|
||||
declaration block:
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
start (20, 323)
|
||||
best (20, 323) after 2 builds; source restored; best order was:
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface: fetched origin; unit identical to verified baseline origin source; 99.34978%; 222/223 instructions, structural/exact (4, 200); stack ('stwu', 'r1, -0x40(r1)') / ('stwu', 'r1, -0x40(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface (score-only: insufficient independent leading declarations or call/declaration dependency): (4, 200)
|
||||
```text
|
||||
structural 4 exact 200
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface: fetched origin; unit identical to verified baseline origin source; 97.662964%; 271/270 instructions, structural/exact (18, 152); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface (score-only: insufficient independent leading declarations or call/declaration dependency): (18, 152)
|
||||
```text
|
||||
structural 18 exact 152
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis movePane_onDrag__Q33ipl5scene7AddressFv: fetched origin; unit identical to verified baseline origin source; 95.70968%; 154/155 instructions, structural/exact (7, 104); stack ('stwu', 'r1, -0x90(r1)') / ('stwu', 'r1, -0x90(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch movePane_onDrag__Q33ipl5scene7AddressFv (score-only: insufficient independent leading declarations or call/declaration dependency): (7, 104)
|
||||
```text
|
||||
structural 7 exact 104
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis update__Q33ipl5scene15FriendListCacheFUlPCwUx: fetched origin; unit identical to verified baseline origin source; 81.35%; 36/40 instructions, structural/exact (19, 34); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch update__Q33ipl5scene15FriendListCacheFUlPCwUx (score-only: insufficient independent leading declarations or call/declaration dependency): (19, 34)
|
||||
```text
|
||||
structural 19 exact 34
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_init: fetched origin; unit identical to verified baseline origin source; 92.326385%; 144/144 instructions, structural/exact (18, 31); stack ('stwu', 'r1, -0x20(r1)') / ('stwu', 'r1, -0x20(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch pfd_sddrv_init: (18, 31)
|
||||
```text
|
||||
declaration block:
|
||||
s32 sd_result;
|
||||
SDDev* device;
|
||||
u32 status;
|
||||
start (18, 31)
|
||||
best (18, 31) after 6 builds; source restored; best order was:
|
||||
s32 sd_result;
|
||||
SDDev* device;
|
||||
u32 status;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_finalize: fetched origin; unit identical to verified baseline origin source; 92.63158%; 57/57 instructions, structural/exact (6, 4); stack ('stwu', 'r1, -0x10(r1)') / ('stwu', 'r1, -0x10(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch pfd_sddrv_finalize (score-only: insufficient independent leading declarations or call/declaration dependency): (6, 4)
|
||||
```text
|
||||
structural 6 exact 4
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_get_total_sectors: fetched origin; unit identical to verified baseline origin source; 99.5%; 80/80 instructions, structural/exact (0, 6); stack ('stwu', 'r1, -0x30(r1)') / ('stwu', 'r1, -0x30(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch pfd_sddrv_get_total_sectors: (0, 6)
|
||||
```text
|
||||
declaration block:
|
||||
s32 result;
|
||||
u32 csd[4];
|
||||
u32 c_size;
|
||||
u32 cluster_blocks;
|
||||
u32 read_block_length;
|
||||
u16 multiplier;
|
||||
u16 minimum_multiplier;
|
||||
u16 max_multiplier;
|
||||
u16 read_block_size;
|
||||
u16 multiplier_factor;
|
||||
start (0, 6)
|
||||
best (0, 6) after 80 builds; source restored; best order was:
|
||||
s32 result;
|
||||
u32 csd[4];
|
||||
u32 c_size;
|
||||
u32 cluster_blocks;
|
||||
u32 read_block_length;
|
||||
u16 multiplier;
|
||||
u16 minimum_multiplier;
|
||||
u16 max_multiplier;
|
||||
u16 read_block_size;
|
||||
u16 multiplier_factor;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_store_mbr_buf: fetched origin; unit identical to verified baseline origin source; 99.75247%; 202/202 instructions, structural/exact (0, 9); stack ('stwu', 'r1, -0x40(r1)') / ('stwu', 'r1, -0x40(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch pfd_sddrv_store_mbr_buf: (0, 9)
|
||||
```text
|
||||
declaration block:
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u8 partition_type;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 start_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u16 end_cylinder;
|
||||
start (0, 9)
|
||||
best (0, 9) after 80 builds; source restored; best order was:
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u8 partition_type;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 start_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u16 end_cylinder;
|
||||
```
|
||||
|
||||
Fz10h structural diagnosis pfd_sddrv_build_fat32_mbr_bpb: fetched origin; unit identical to verified baseline origin source; 94.75225%; 230/222 instructions, structural/exact (24, 122); stack ('stwu', 'r1, -0x40(r1)') / ('stwu', 'r1, -0x40(r1)'). Target/source disasm and ctxdiff saved in /tmp.
|
||||
|
||||
Fz10h register allocation last, official declsearch pfd_sddrv_build_fat32_mbr_bpb: (24, 122)
|
||||
```text
|
||||
declaration block:
|
||||
PFD_SDDRV_FORMAT_DATA format_data;
|
||||
s32 result;
|
||||
start (24, 122)
|
||||
best (24, 122) after 2 builds; source restored; best order was:
|
||||
PFD_SDDRV_FORMAT_DATA format_data;
|
||||
s32 result;
|
||||
```
|
||||
|
||||
## Fz10h final completion audit
|
||||
Instruction-exact / matched code bytes / matched data bytes before -> after:
|
||||
libs/RVL_SDK/src/vi/vi: 29/30 / 9944 / 1944 -> 29/30 / 9944 / 1944
|
||||
libs/RVLMiddleware/eZiText/src/clib/zi8dawg: 6/6 / 4868 / 120 -> 6/6 / 4868 / 120
|
||||
src/iplwww/www_wiisetting: 20/21 / 3740 / 3856 -> 20/21 / 3740 / 3856
|
||||
libs/RVLMiddleware/eZiText/src/clib/zi8getc2: 15/17 / 6360 / 332 -> 15/17 / 6360 / 332
|
||||
src/keyboard/MyTiManager: 91/91 / 20196 / 148 -> 91/91 / 20196 / 148
|
||||
src/system/odh: 23/28 / 8320 / 6360 -> 24/28 / 8972 / 6360
|
||||
libs/RevoEX/src/nwc24/NWC24Download: 25/30 / 8140 / 80 -> 25/30 / 8140 / 80
|
||||
src/scene/address/iplAddress: 96/101 / 21236 / 1964 -> 96/101 / 21236 / 1964
|
||||
libs/RVL_SDK/src/fa/driver/sd_drv: 21/26 / 8940 / 3592 -> 21/26 / 8940 / 3592
|
||||
Remaining functions; distinct successful fz10h source trials (invalid macro clones and declsearch permutations excluded):
|
||||
VIInit | 99.7929% | height/top clipping/shared-zero register cycle; 338/338, frame 0x30 | 5 valid distinct source attempts; final structural/exact (0, 14).
|
||||
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | 99.86043% | security buffer/count and European-country loop index registers; 609/609, frame 0xd0 | 10 valid distinct source attempts; final structural/exact (0, 14).
|
||||
Zi8GetDataSignature | 99.347824% | destination/language/signature saved-register cycle; 69/69, frame 0x30 | 7 valid distinct source attempts; final structural/exact (0, 9).
|
||||
Zi8IsDupWChar | 99.36508% | character/duplicate saved-register swap; 63/63, frame 0x20 | 7 valid distinct source attempts; final structural/exact (0, 8).
|
||||
cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci | 98.63636% | padding temporary and chroma/table saved-register cycles; 77/77, frame 0x50 | 4 valid distinct source attempts; final structural/exact (0, 18).
|
||||
LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli | 98.08219% | floating-constant load scheduling and RGB source/pixel registers; 146/146, frame 0x60 | 3 valid distinct source attempts; final structural/exact (2, 12).
|
||||
cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii | 99.67186% | row/block stride and block offset registers and operand order; 899/899, frame 0x50 | 3 valid distinct source attempts; final structural/exact (0, 43).
|
||||
huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl | 95.57189% | Huffman traversal, bit buffer, mask and coefficient register allocation; 306/306, frame 0x30 | 3 valid distinct source attempts; final structural/exact (0, 171).
|
||||
NWC24InitDlTask | 98.923615% | home identifier, task/header and validation saved-register allocation; 144/144, frame 0x60 | 3 valid distinct source attempts; final structural/exact (0, 31).
|
||||
NWC24IterateDlTask | 99.303795% | entry/header/index registers; 79/79, leaf | 3 valid distinct source attempts; final structural/exact (0, 10).
|
||||
NWC24UpdateDlTask | 95.00395% | inline helper lifetime adds saved register/frame and different retry branch; 249/253, frame 0x30 versus 0x20 | 4 valid distinct source attempts; final structural/exact (19, 250).
|
||||
NWC24iCheckDlHeaderConsistency | 98.77358% | workspace address scheduled after parameter copies; only prologue instructions 5-7 differ, 212/212, frame 0x2c0 | 7 valid distinct source attempts; final structural/exact (2, 3).
|
||||
AddTaskInternal | 97.7182% | URL validation and purge/update helper branches; 398/401, frame 0x30 | 3 valid distinct source attempts; final structural/exact (20, 323).
|
||||
start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface | 99.34978% | state/mode guard branch; correct nested switches give 223/223 with seven icon/pane register differences | 4 valid distinct source attempts; final structural/exact (4, 200).
|
||||
onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface | 97.662964% | controller/null guards and saved-register frame; 271/270, frame 0x20 versus 0x30 | 3 valid distinct source attempts; final structural/exact (18, 152).
|
||||
movePane_onDrag__Q33ipl5scene7AddressFv | 95.70968% | text null-guard branches, successful-branch margin, projection floating scheduling; 154/155, frame 0x90; corrected margin trials remain fuzzy | 17 valid distinct source attempts; final structural/exact (7, 104).
|
||||
update__Q33ipl5scene15FriendListCacheFUlPCwUx | 81.35% | friend record address retained across calls instead of recalculated; 36/40, frame 0x20 | 3 valid distinct source attempts; final structural/exact (19, 34).
|
||||
pfd_sddrv_init | 92.326385% | null comparison, same-disk return and state-store scheduling; 144/144, frame 0x20 | 3 valid distinct source attempts; final structural/exact (18, 31).
|
||||
pfd_sddrv_finalize | 92.63158% | flag-mask and media-clear store scheduling; four differences, 57/57, frame 0x10 | 3 valid distinct source attempts; final structural/exact (6, 4).
|
||||
pfd_sddrv_get_total_sectors | 99.5% | factor/exponent registers; six differences, 80/80, frame 0x30 | 3 valid distinct source attempts; final structural/exact (0, 6).
|
||||
pfd_sddrv_store_mbr_buf | 99.75247% | geometry product and start-sector register swap; nine differences, 202/202, frame 0x40 | 3 valid distinct source attempts; final structural/exact (0, 9).
|
||||
pfd_sddrv_build_fat32_mbr_bpb | 94.75225% | reserved-sector inline null guard and retained error tail; 230/222, frame 0x40 | 3 valid distinct source attempts; final structural/exact (24, 122).
|
||||
OPEN FUNCTION AUDIT PASS: 22 remaining functions each have at least three distinct successful-build source trials this round. Final official declsearch followed structural/helper/operand trials. Dawg was already exact in fetched main and was skipped. Every non-exact source trial was restored.
|
||||
Gain commit 276d3c02: huffmanCoder only, ODH 23 -> 24 instruction-exact, code 8320 -> 8972; no data or configuration edits.
|
||||
Uncertainty: MyTiManager unreferenced 40-byte target tail ownership remains unproven. Source weak Animation vtable emission is ignored. No unjustified data rename or extent change.
|
||||
Final full non-quick gate over all nine owned units, verbatim:
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/vi/vi] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/vi/vi] objdiff: code 9944/11296 data 1944/1944 functions 29/30 fuzzy 99.9752 linked code 0
|
||||
[libs/RVL_SDK/src/vi/vi] instruction-exact functions: 29/30
|
||||
[libs/RVL_SDK/src/vi/vi] section .bss size 368 match 100.0
|
||||
[libs/RVL_SDK/src/vi/vi] section .data size 1368 match 100.0
|
||||
[libs/RVL_SDK/src/vi/vi] section .sbss size 176 match 100.0
|
||||
[libs/RVL_SDK/src/vi/vi] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/vi/vi] section .text size 11296 match 99.97521
|
||||
[libs/RVL_SDK/src/vi/vi] below 100: VIInit 99.7929
|
||||
[libs/RVL_SDK/src/vi/vi] baseline: code 9944/11296 data 1944 functions 29 fuzzy 99.9752
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8dawg] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8dawg] objdiff: code 4868/4868 data 120/120 functions 6/6 fuzzy 100.0000 linked code 4868
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8dawg] instruction-exact functions: 6/6
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8dawg] section .text size 4868 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8dawg] section extab size 48 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8dawg] section extabindex size 72 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8dawg] baseline: code 4868/4868 data 120 functions 6 fuzzy 100.0000
|
||||
[src/iplwww/www_wiisetting] pool: IDENTICAL
|
||||
[src/iplwww/www_wiisetting] objdiff: code 3740/6176 data 3856/3856 functions 20/21 fuzzy 99.9450 linked code 0
|
||||
[src/iplwww/www_wiisetting] instruction-exact functions: 20/21
|
||||
[src/iplwww/www_wiisetting] section .bss size 104 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .data size 2576 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .rodata size 792 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .sbss size 32 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .sdata size 320 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .sdata2 size 32 match 100.0
|
||||
[src/iplwww/www_wiisetting] section .text size 6176 match 99.94495
|
||||
[src/iplwww/www_wiisetting] below 100: Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue 99.86043
|
||||
[src/iplwww/www_wiisetting] baseline: code 3740/6176 data 3856 functions 20 fuzzy 99.9450
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] objdiff: code 6360/6888 data 332/332 functions 15/17 fuzzy 99.9506 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] instruction-exact functions: 15/17
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] section .data size 80 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] section .rodata size 16 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] section .sbss2 size 8 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] section .sdata2 size 8 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] section .text size 6888 match 99.95064
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] section extab size 88 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] section extabindex size 132 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] below 100: Zi8GetDataSignature 99.347824
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] below 100: Zi8IsDupWChar 99.36508
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8getc2] baseline: code 6360/6888 data 332 functions 15 fuzzy 99.9506
|
||||
[src/keyboard/MyTiManager] pool: IDENTICAL
|
||||
[src/keyboard/MyTiManager] objdiff: code 20196/20196 data 148/1132 functions 91/91 fuzzy 100.0000 linked code 20196
|
||||
[src/keyboard/MyTiManager] instruction-exact functions: 91/91
|
||||
[src/keyboard/MyTiManager] section .bss size 72 match 100.0
|
||||
[src/keyboard/MyTiManager] section .ctors size 4 match 100.0
|
||||
[src/keyboard/MyTiManager] section .data size 984 match 99.79633
|
||||
[src/keyboard/MyTiManager] section .sbss size 16 match 100.0
|
||||
[src/keyboard/MyTiManager] section .sdata size 24 match 100.0
|
||||
[src/keyboard/MyTiManager] section .sdata2 size 32 match 100.0
|
||||
[src/keyboard/MyTiManager] section .text size 20196 match 100.0
|
||||
[src/keyboard/MyTiManager] baseline: code 20196/20196 data 148 functions 91 fuzzy 100.0000
|
||||
[src/system/odh] pool: IDENTICAL
|
||||
[src/system/odh] objdiff: code 8972/14684 data 6360/6360 functions 24/28 fuzzy 99.4457 linked code 0
|
||||
[src/system/odh] instruction-exact functions: 24/28
|
||||
[src/system/odh] section .data size 464 match 100.0
|
||||
[src/system/odh] section .rodata size 5856 match 100.0
|
||||
[src/system/odh] section .sdata2 size 40 match 100.0
|
||||
[src/system/odh] section .text size 14684 match 99.445656
|
||||
[src/system/odh] below 100: cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci 98.63636
|
||||
[src/system/odh] below 100: LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli 98.08219
|
||||
[src/system/odh] below 100: cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii 99.67186
|
||||
[src/system/odh] below 100: huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl 95.57189
|
||||
[src/system/odh] baseline: code 8320/14684 data 6360 functions 23 fuzzy 99.4048
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 8140/12496 data 80/80 functions 25/30 fuzzy 99.1521 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 25/30
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 99.15205
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 99.303795
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 95.00395
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 97.7182
|
||||
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 8140/12496 data 80 functions 25 fuzzy 99.1521
|
||||
[src/scene/address/iplAddress] pool: IDENTICAL
|
||||
[src/scene/address/iplAddress] objdiff: code 21236/23988 data 1964/1964 functions 97/101 fuzzy 99.6353 linked code 0
|
||||
[src/scene/address/iplAddress] instruction-exact functions: 96/101
|
||||
[src/scene/address/iplAddress] section .ctors size 4 match 100.0
|
||||
[src/scene/address/iplAddress] section .data size 1880 match 100.0
|
||||
[src/scene/address/iplAddress] section .rodata size 24 match 100.0
|
||||
[src/scene/address/iplAddress] section .sbss size 8 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata size 16 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata2 size 32 match 100.0
|
||||
[src/scene/address/iplAddress] section .text size 23988 match 99.635315
|
||||
[src/scene/address/iplAddress] below 100: start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.34978
|
||||
[src/scene/address/iplAddress] below 100: onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 97.662964
|
||||
[src/scene/address/iplAddress] below 100: movePane_onDrag__Q33ipl5scene7AddressFv 95.70968
|
||||
[src/scene/address/iplAddress] below 100: update__Q33ipl5scene15FriendListCacheFUlPCwUx 81.35
|
||||
[src/scene/address/iplAddress] baseline: code 21236/23988 data 1964 functions 97 fuzzy 99.6353
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] objdiff: code 8940/11760 data 3592/3592 functions 21/26 fuzzy 99.0544 linked code 0
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] instruction-exact functions: 21/26
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] section .bss size 608 match 100.0
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] section .data size 2576 match 100.0
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] section .rodata size 368 match 100.0
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] section .sbss size 40 match 100.0
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] section .text size 11760 match 99.05442
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] below 100: pfd_sddrv_init 92.326385
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] below 100: pfd_sddrv_finalize 92.63158
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] below 100: pfd_sddrv_get_total_sectors 99.5
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] below 100: pfd_sddrv_store_mbr_buf 99.75247
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] below 100: pfd_sddrv_build_fat32_mbr_bpb 94.75225
|
||||
[libs/RVL_SDK/src/fa/driver/sd_drv] baseline: code 8940/11760 data 3592 functions 21 fuzzy 99.0544
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.46720 -> 90.48897
|
||||
global fuzzy_match_percent: 99.56565 -> 99.56587
|
||||
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
|
||||
```
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1490,259 +1490,3 @@ Final authority lines:
|
||||
[libs/RVL_SDK/src/kpad/KPAD] instruction-exact functions: 21/29
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
# Round 6: HIGH, fresh structural investigation
|
||||
Fresh baseline after building all owned objects; pools address57/57, SD101/101, KPAD0/0 identical. Data already100% in all three; no unmatched data-name gap to rename. Prior medium source trials were restored, so this round checks different local types, scopes, inline helper boundaries and operand lifetimes.
|
||||
|
||||
## src/scene/address/iplAddressEdit create__Q33ipl5scene11AddressEditFv
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (19, 323) structural/positional differences; instructions 820/820
|
||||
Remote source equals freshly built baseline; still open 97.44634%. Structural diagnosis: 820 instructions and identical frame; literal-base/boardFile saved-register inversion dominates. Inspect structural differences before hoisting declarations: constructor inline boundaries, vector initialization and switch dispatch.
|
||||
- ordinary TextBalloon allocation with separately declared position: (49, 803) structural/positional; instructions 804/820; restored.
|
||||
- retain event objects through EventHandler base views: (19, 323) structural/positional; instructions 820/820; restored.
|
||||
- keep animation variable local to each mode arm: (19, 323) structural/positional; instructions 820/820; restored.
|
||||
- ordinary balloon new with a constructor argument vector temporary: (37, 803) structural/positional; instructions 808/820; candidate kept.
|
||||
- ordinary balloon new with named margin locals before allocation: (23, 331) structural/positional; instructions 818/820; restored.
|
||||
- mutable text-buffer views through mode initialization: (19, 323) structural/positional; instructions 820/820; restored.
|
||||
|
||||
## src/scene/address/iplAddressEdit get_friendinfo__Q33ipl5scene11AddressEditFv
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (10, 68) structural/positional differences; instructions 82/84
|
||||
Remote source equals freshly built baseline; still open 88.03571%. Structural diagnosis: Frame0x440 versus target0x450 follows missing two held text addresses; locals are actual arrays. Inspect memcpy argument alias class and UTF16 helper lifetime before declaration coloring.
|
||||
Frame diagnosis correction from disasm_fn: target frame is0x420, source also0x420;0x148/0x150 are code extents, not frame sizes. No extent overlap.
|
||||
- explicit first-element addresses for both text buffers: (10, 68) structural/positional; instructions 82/84; restored.
|
||||
- retain complete text array pointers before pane calls: (10, 68) structural/positional; instructions 82/84; restored.
|
||||
- use mutable views of copied friend and string fields: (10, 39) structural/positional; instructions 83/84; restored.
|
||||
|
||||
## src/scene/address/iplAddressEdit update_friendinfo__Q33ipl5scene11AddressEditFv
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (2, 2) structural/positional differences; instructions 38/38
|
||||
Remote source equals freshly built baseline; still open 99.42105%. Structural diagnosis: Same frame and38 instructions; source/destination addi ordering at memcpy is the only difference. Check typed memcpy argument views before declaration search.
|
||||
Corrected prior-round diagnosis: relocation-resolved disasm proves the differing argument pair is wcsncpy(name), not memcpy(CreateID). Prior memcpy-only trials did not touch this mismatch.
|
||||
- name copy reads through a const String view: (2, 2) structural/positional; instructions 38/38; restored.
|
||||
- evaluate named source text before destination text: (2, 2) structural/positional; instructions 38/38; restored.
|
||||
- typed destination wchar array rather than source array decay: (2, 2) structural/positional; instructions 38/38; restored.
|
||||
|
||||
## src/scene/address/iplAddressEdit set_err_msg__Q33ipl5scene11AddressEditFPwUl8NWC24Err
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (1, 30) structural/positional differences; instructions 76/75
|
||||
Remote source equals freshly built baseline; still open 98.666664%. Structural diagnosis: 76/75 instructions, extra safe default message initialization. Retain defined behavior for unsupported NWC24 errors. Test exhaustive known-error branch layout without undefined/uninitialized state.
|
||||
- normalize unrecognized errors to the existing server fallback before dispatch: (8, 37) structural/positional; instructions 83/75; restored.
|
||||
- initialize the safe fallback in the explicit default branch: (4, 22) structural/positional; instructions 77/75; restored.
|
||||
- compute the supported network fallback directly with a boolean choice: (18, 47) structural/positional; instructions 65/75; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect create__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (4, 39) structural/positional differences; instructions 145/146
|
||||
Remote source equals freshly built baseline; still open 97.73972%. Structural diagnosis: 145/146; identical0x20 frame, target keeps BS2 global reload at loop entry. Compare basic block placement rather than tick arithmetic; all heap construction instructions align.
|
||||
- poll using equality-first completion and a continue arm: (9, 40) structural/positional; instructions 145/146; restored.
|
||||
- inline polling-state helper returning manager readiness: (4, 39) structural/positional; instructions 145/146; restored.
|
||||
- inline update helper separates manager argument from polling getter: (4, 39) structural/positional; instructions 145/146; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (4, 143) structural/positional differences; instructions 170/171
|
||||
Remote source equals freshly built baseline; still open 99.15205%. Structural diagnosis: 170/171, beq-plus-unconditional-branch result dispatch and error-compaction register order. Build branch arms from parsed brace boundaries, retaining common refresh in place.
|
||||
Corrected prior-round diagnosis: relocation-resolved target confirms the extra beq8/unconditional-return branch is the OSGetTime delay gate, not async-result dispatch. Result tests already match.
|
||||
- switch the elapsed-time boolean into the normal continuation: (0, 6) structural/positional; instructions 171/171; candidate kept.
|
||||
- declare scanned title before compaction counters: (0, 6) structural/positional; instructions 171/171; candidate kept.
|
||||
- compaction count uses the same unsigned type as title count: (1, 6) structural/positional; instructions 171/171; restored.
|
||||
- signed SDK count keeps native comparison width: (0, 6) structural/positional; instructions 171/171; restored.
|
||||
- write compacted title before advancing accepted count: (0, 6) structural/positional; instructions 171/171; restored.
|
||||
- separate destination-index advancement from the title store: (0, 6) structural/positional; instructions 171/171; restored.
|
||||
- Register-only declaration search on compaction title/count/index block: declaration block: | u32 titleId; | int channelCount = 0; | int channelIndex = 0; | u32 titleIndex = 0; | start (0, 6) | improved (0, 4) | best (0, 4) after 16 builds; kept in source: | u32 titleId; | u32 titleIndex = 0; | int channelIndex = 0; | int channelCount = 0; |
|
||||
- separate compaction declarations from zero assignments in target order: (0, 0) structural/positional; instructions 171/171; candidate kept.
|
||||
Exact handleSDTitleListResult: corrected the time-gate dispatch, then separated compaction declarations from assignments. Register search found the type/index/count order; preserving count/index/title zero assignments removed all6 differences. ctxdiff171/171 diffs0; exact-name objdiff100; all-unit quick gatePASS, data100%, pools identical,0 regressions/forbidden/readability. SD121 ->122; code28728 ->29412.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (2, 4) structural/positional differences; instructions 101/101
|
||||
After local exact commit160e985a, remote duplicate checks compare origin/main source against original round baseline0c06b01c, not modified HEAD. origin/main5518cb16 has no owned-unit diff.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (2, 4) structural/positional differences; instructions 101/101
|
||||
Remote source equals freshly built baseline; still open 97.81188%. Structural diagnosis: 101/101 and same frame; compare count-store versus requirement load ordering, then native signed arithmetic and legal signed counterpart views.
|
||||
- native signed intermediate for bounded accepted-title count: (2, 4) structural/positional; instructions 101/101; restored.
|
||||
- count uses a legal signed counterpart view for alias analysis: (2, 4) structural/positional; instructions 101/101; restored.
|
||||
- inline usage predicate with scalar input values: (24, 40) structural/positional; instructions 104/101; restored.
|
||||
- inline accepted-count update isolates the store boundary: (2, 4) structural/positional; instructions 101/101; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main 5518cb16fda3091c727d974aacf477a2cf89b74a. Initial assembly diagnosis: (2, 4) structural/positional differences; instructions 102/102
|
||||
Remote source equals freshly built baseline; still open 97.833336%. Structural diagnosis: 102/102. Same post-memcpy count/threshold scheduling as forward scan, confirmed by instruction diff; compare native intermediate type, inline store helper and a fixed-size requirement view.
|
||||
- native signed next-count local in reverse scan: (2, 4) structural/positional; instructions 102/102; restored.
|
||||
- inline count update using an output reference: (2, 4) structural/positional; instructions 102/102; restored.
|
||||
- two-element readonly usage view in reverse scan: (2, 4) structural/positional; instructions 102/102; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main bc303bc36e5ea826ef9da39d6e9c9ed9c79e4ba9. Initial assembly diagnosis: (2, 22) structural/positional differences; instructions 126/126
|
||||
Remote source equals freshly built baseline; still open 97.29365%. Structural diagnosis: 126/126; u64 titleId allocated after page/order counters causes saved-register inversion; count/store scheduling also differs. Hoist the real title ID separately before trying declaration coloring.
|
||||
- declare loaded title ID before traversal counters: (2, 7) structural/positional; instructions 126/126; restored.
|
||||
- explicit page-row view when looking up the channel entry: (2, 22) structural/positional; instructions 126/126; restored.
|
||||
- native signed next-count local in page-ordered scan: (2, 22) structural/positional; instructions 126/126; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl
|
||||
Fetch origin/main bc303bc36e5ea826ef9da39d6e9c9ed9c79e4ba9. Initial assembly diagnosis: (8, 16) structural/positional differences; instructions 361/361
|
||||
Remote source equals freshly built baseline; still open 97.55125%. Structural diagnosis: 361/361, four repeated count/store/threshold windows; no string or data difference. Test real intermediate width and mutable/aggregate read views, then reject any non-exact result.
|
||||
- native next-count locals for all special-channel append sites: (8, 16) structural/positional; instructions 361/361; restored.
|
||||
- fixed-size readonly second-usage view for special title scans: (8, 16) structural/positional; instructions 361/361; restored.
|
||||
- inline output-reference increments at special-channel boundaries: (8, 16) structural/positional; instructions 361/361; restored.
|
||||
Expanded volatility proof audit includes adjacent stfs/lfs and stfd/lfd, as well as stw/lwz; same-address store/reload pairs []. No unjustified volatile added.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv
|
||||
Fetch origin/main 9077ef8c7a1ab5bf7605f439ed621214b97999e3. Initial assembly diagnosis: (2, 2) structural/positional differences; instructions 35/35
|
||||
Remote source equals freshly built baseline; still open 99.65714%. Structural diagnosis: 35/35. Target obtains Mem2App before SaveData receiver; compare readonly receiver helper and combined heap-before-flag lifetimes, no pointer-global mutation or volatility.
|
||||
- readonly save-manager input at inline flush boundary: (2, 2) structural/positional; instructions 35/35; restored.
|
||||
- heap declaration precedes the flag update with assignment at flush: (2, 2) structural/positional; instructions 35/35; restored.
|
||||
- application heap retained across the animation initialization: (15, 29) structural/positional; instructions 36/35; restored.
|
||||
|
||||
## src/scene/sdChannelSelect/iplSDChannelSelect setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj
|
||||
Fetch origin/main 2050ad7616acfcb7752e5a6da8b7f44f22c6cafd. Initial assembly diagnosis: (23, 68) structural/positional differences; instructions 233/233
|
||||
Remote source equals freshly built baseline; still open 93.4721%. Structural diagnosis: 233/233; matrix-call inputs are register differences, but framebuffer width/height conversion order and widthScale lifetime change scheduling. Target keeps projection width in f29, ours keeps its quotient there; remove quotient local first.
|
||||
- use the projection quotient directly in horizontal scissor arithmetic: (36, 71) structural/positional; instructions 233/233; restored.
|
||||
- compute framebuffer horizontal conversion before vertical arithmetic: (29, 64) structural/positional; instructions 233/233; restored.
|
||||
- keep framebuffer dimensions in unsigned arithmetic-width locals: (23, 68) structural/positional; instructions 233/233; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADGetProjectionPos
|
||||
Fetch origin/main 2050ad7616acfcb7752e5a6da8b7f44f22c6cafd. Initial assembly diagnosis: (0, 9) structural/positional differences; instructions 19/19
|
||||
Remote source equals freshly built baseline; still open 96.57895%. Structural diagnosis: Leaf19/19, no frame/branches. Target coalesces double correction in f0 and uses coefficient-first aspect multiplication. Combine those operand choices before declaration coloring.
|
||||
- coefficient-first aspect and inline double correction product: (0, 10) structural/positional; instructions 19/19; restored.
|
||||
- reuse each calibration coefficient in its own product local: build failed e/private/bte -DNDEBUG=1 -DTARGET_RVL -ipa file -fp_contract off -lang=c -MMD -c libs/RVL_SDK/src/kpad/KPAD.c -o build/43U/src/libs/RVL_SDK/src/kpad && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/kpad/KPAD.d build/43U/src/libs/RVL_SDK/src/kpad/KPAD.d ### mwcceppc.exe Compiler: # File: libs\RVL_SDK\src\kpad\KPAD.c # ------------------------------------- # 360: f32 x = src->x * halfHeight; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. ; restored.
|
||||
- separate declarations then reuse calibrated scalar products: (0, 14) structural/positional; instructions 19/19; candidate kept.
|
||||
- give the shared aspect coefficient its own scalar lifetime: (0, 13) structural/positional; instructions 19/19; candidate kept.
|
||||
- Register-only last, reused-coefficient declaration search: declaration block: | f64 scaled; | f32 height; | f32 halfHeight; | f32 x; | f32 y; | f32 aspect; | start (0, 13) | improved (0, 11) | best (0, 11) after 40 builds; kept in source: | f32 aspect; | f32 height; | f32 halfHeight; | f32 x; | f32 y; | f64 scaled; |
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADSetSensorHeight
|
||||
Fetch origin/main 2050ad7616acfcb7752e5a6da8b7f44f22c6cafd. Initial assembly diagnosis: (0, 7) structural/positional differences; instructions 52/52
|
||||
Remote source equals freshly built baseline; still open 99.23077%. Structural diagnosis: 52/52,0 normalized differences. Base literal r4/r3 and zero/squared-height register coloring remain. Separate base and channel adjustment and compare min branch before declaration search.
|
||||
- initialize base state then apply the channel index: (4, 9) structural/positional; instructions 52/52; restored.
|
||||
- state address initialized in the leading declaration block: (0, 7) structural/positional; instructions 52/52; restored.
|
||||
- select the limiting extent with an explicit comparison arm: (2, 9) structural/positional; instructions 52/52; restored.
|
||||
- native int channel formal with a translation-unit-only declaration guard: (0, 7) structural/positional; instructions 52/52; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD calc_acc_horizon
|
||||
Fetch origin/main 2050ad7616acfcb7752e5a6da8b7f44f22c6cafd. Initial assembly diagnosis: (2, 35) structural/positional differences; instructions 101/101
|
||||
Remote source equals freshly built baseline; still open 97.27723%. Structural diagnosis: 101/101; raw .long floating compares inflate normalized score, but geometry math and branch targets align. Replace pairs of flattened scalar locals by meaningful Vec2 intermediates, preserving operation order.
|
||||
- group normalized acceleration components in a Vec2 local: (28, 91) structural/positional; instructions 105/101; restored.
|
||||
- group the smoothed horizon candidate in a Vec2 local: (23, 77) structural/positional; instructions 97/101; restored.
|
||||
- group normalized output axis components in a Vec2 local: (23, 78) structural/positional; instructions 103/101; restored.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD read_kpad_acc
|
||||
Fetch origin/main 2050ad7616acfcb7752e5a6da8b7f44f22c6cafd. Initial assembly diagnosis: (16, 66) structural/positional differences; instructions 400/400
|
||||
Remote source equals freshly built baseline; still open 98.15%. Structural diagnosis: 400/400; clamp/smoothing inline helper boundaries determine FP temporaries. Test parameter order and a scalar-only smoothing helper, rather than merely reordering caller vector declarations.
|
||||
Structural correction before helpers: ctxdiff also shows two opposite error/device/format branch forms at206..212; isolate these before FP temporary experiments.
|
||||
- separate error/device guards and switch the two extension formats: (15, 63) structural/positional; instructions 400/400; candidate kept.
|
||||
- keep each accepted format as a distinct switch break arm: (15, 63) structural/positional; instructions 400/400; candidate kept.
|
||||
- switch the accepted-format boolean with default return first: (22, 230) structural/positional; instructions 404/400; candidate kept.
|
||||
- single-format switch only when the primary format is absent: (12, 60) structural/positional; instructions 400/400; candidate kept.
|
||||
- reuse the smoothing magnitude local through its absolute-value branch: (63, 302) structural/positional; instructions 394/400; restored.
|
||||
- declare smoothing magnitude before signed delta then assign in original order: (7, 25) structural/positional; instructions 400/400; kept.
|
||||
- assign smoothing magnitude directly in both sign branches: (1, 1) structural/positional; instructions 400/400; kept.
|
||||
- preserve unsigned comparison in the fallback format switch: (1, 1) structural/positional; instructions 400/400; restored.
|
||||
- boolean fallback-format dispatch keeps the comparison unsigned: (12, 197) structural/positional; instructions 403/400; restored.
|
||||
- two explicit accepted-format branches share the extension block: (10, 194) structural/positional; instructions 399/400; restored.
|
||||
- unsigned SDK-format case constant in the fallback switch: (1, 1) structural/positional; instructions 400/400; restored.
|
||||
- byte-relative fallback-format switch: (10, 198) structural/positional; instructions 401/400; restored.
|
||||
- accept either extension format through a single-pass block: (10, 194) structural/positional; instructions 399/400; restored.
|
||||
- place extension acceleration in the positive accepted-format branch: (12, 197) structural/positional; instructions 399/400; restored.
|
||||
- explicit unsupported-format else returns from extension branch: (12, 197) structural/positional; instructions 399/400; restored.
|
||||
- native unsigned switch discriminant for the byte format: (1, 1) structural/positional; instructions 400/400; restored.
|
||||
read_kpad_acc best partial400/400 differs only instruction210: cmpwi r0,5 versus target cmplwi r0,5. All60 original FP differences removed by declaring magnitude before delta and explicit sign branches; separate error/device guards plus nested format switch fixed branch form. Unsigned casts, case constant, positive-if/else and single-pass accepted-format alternatives did not remove the final comparator difference. Exact-only policy: restored partial source; reproducible candidate saved /tmp/fz16r6.readacc.near.c, not committed.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD select_1obj_first
|
||||
Fetch origin/main c1183780c2b53e044f91775b29b580d306e4423e. Initial assembly diagnosis: (2, 26) structural/positional differences; instructions 109/109
|
||||
Remote source equals freshly built baseline; still open 98.348625%. Structural diagnosis: 109/109, source/target branch and frame align; register/operand differences reside in geometry scalar setup and paired candidate coordinates. Compare a reused tangent basis and scalar candidate variables before declaration search.
|
||||
- separate all seven geometry and traversal declarations from assignments: (2, 26) structural/positional; instructions 109/109; candidate kept.
|
||||
- declare candidate vectors before loading their scalar center coordinates: (2, 26) structural/positional; instructions 109/109; candidate kept.
|
||||
- treat the candidate-array boundary as a readonly object pointer: (2, 26) structural/positional; instructions 109/109; restored.
|
||||
- Register-only last, separated traversal/candidate block search: declaration block: | KPADDPDObject* object; | KPADDPDObject* end; | f32 scale; | f32 productX; | f32 productY; | f32 offsetX; | f32 offsetY; | start (2, 26) | best (2, 26) after 52 builds; source restored; best order was: | KPADDPDObject* object; | KPADDPDObject* end; | f32 scale; | f32 productX; | f32 productY; | f32 offsetX; | f32 offsetY; |
|
||||
- Register-only last, separated traversal/candidate block search: declaration block: | Vec2 leftPosition; | Vec2 rightPosition; | f32 x; | f32 y; | start (2, 26) | improved (2, 24) | best (2, 24) after 16 builds; kept in source: | Vec2 leftPosition; | f32 y; | f32 x; | Vec2 rightPosition; |
|
||||
|
||||
Verified frame/extent audit (authoritative corrections to any earlier guessed frame):
|
||||
create__Q33ipl5scene11AddressEditFv: extent 0x414..0x10e4 <= next 0x10e4; source/target first instruction (('stwu', 'r1, -0x60(r1)'), ('stwu', 'r1, -0x60(r1)'))
|
||||
get_friendinfo__Q33ipl5scene11AddressEditFv: extent 0x5604..0x5754 <= next 0x5754; source/target first instruction (('stwu', 'r1, -0x420(r1)'), ('stwu', 'r1, -0x420(r1)'))
|
||||
update_friendinfo__Q33ipl5scene11AddressEditFv: extent 0x5798..0x5830 <= next 0x5830; source/target first instruction (('stwu', 'r1, -0x10(r1)'), ('stwu', 'r1, -0x10(r1)'))
|
||||
set_err_msg__Q33ipl5scene11AddressEditFPwUl8NWC24Err: extent 0x6690..0x67bc <= next 0x67bc; source/target first instruction (('stwu', 'r1, -0x60(r1)'), ('stwu', 'r1, -0x60(r1)'))
|
||||
create__Q33ipl5scene15SDChannelSelectFv: extent 0x478..0x6c0 <= next 0x6c0; source/target first instruction (('stwu', 'r1, -0x20(r1)'), ('stwu', 'r1, -0x20(r1)'))
|
||||
handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv: extent 0x14d8..0x1784 <= next 0x1784; source/target first instruction (('stwu', 'r1, -0x30(r1)'), ('stwu', 'r1, -0x30(r1)'))
|
||||
collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl: extent 0x25a4..0x2738 <= next 0x2738; source/target first instruction (('stwu', 'r1, -0x40(r1)'), ('stwu', 'r1, -0x40(r1)'))
|
||||
collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl: extent 0x2738..0x28d0 <= next 0x28d0; source/target first instruction (('stwu', 'r1, -0x40(r1)'), ('stwu', 'r1, -0x40(r1)'))
|
||||
collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl: extent 0x28d0..0x2ac8 <= next 0x2ac8; source/target first instruction (('stwu', 'r1, -0x60(r1)'), ('stwu', 'r1, -0x60(r1)'))
|
||||
collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl: extent 0x2ac8..0x306c <= next 0x306c; source/target first instruction (('stwu', 'r1, -0x80(r1)'), ('stwu', 'r1, -0x80(r1)'))
|
||||
flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv: extent 0x31d0..0x325c <= next 0x325c; source/target first instruction (('stwu', 'r1, -0x10(r1)'), ('stwu', 'r1, -0x10(r1)'))
|
||||
setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj: extent 0x5d40..0x60e4 <= next 0x60e4; source/target first instruction (('stwu', 'r1, -0xe0(r1)'), ('stwu', 'r1, -0xe0(r1)'))
|
||||
KPADGetProjectionPos: extent 0x430..0x47c <= next 0x47c; source/target first instruction (('lfs', 'f3, 0xc(r5)'), ('lfs', 'f3, 0xc(r5)'))
|
||||
KPADSetSensorHeight: extent 0x47c..0x54c <= next 0x54c; source/target first instruction (('stwu', 'r1, -0x30(r1)'), ('stwu', 'r1, -0x30(r1)'))
|
||||
calc_acc_horizon: extent 0x6e0..0x874 <= next 0x874; source/target first instruction (('stwu', 'r1, -0x30(r1)'), ('stwu', 'r1, -0x30(r1)'))
|
||||
read_kpad_acc: extent 0x998..0xfd8 <= next 0xfd8; source/target first instruction (('stwu', 'r1, -0x50(r1)'), ('stwu', 'r1, -0x50(r1)'))
|
||||
select_1obj_first: extent 0x13e8..0x159c <= next 0x159c; source/target first instruction (('stwu', 'r1, -0x20(r1)'), ('stwu', 'r1, -0x20(r1)'))
|
||||
calc_dpd_variable: extent 0x1710..0x1af8 <= next 0x1af8; source/target first instruction (('stwu', 'r1, -0x20(r1)'), ('stwu', 'r1, -0x20(r1)'))
|
||||
KPADRead: extent 0x2514..0x2c40 <= next 0x2c40; source/target first instruction (('stwu', 'r1, -0xc0(r1)'), ('stwu', 'r1, -0xc0(r1)'))
|
||||
KPADInit: extent 0x2c40..0x2f24 <= next 0x2f24; source/target first instruction (('stwu', 'r1, -0x90(r1)'), ('stwu', 'r1, -0x90(r1)'))
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD calc_dpd_variable
|
||||
Fetch origin/main c1183780c2b53e044f91775b29b580d306e4423e. Initial assembly diagnosis: (14, 45) structural/positional differences; instructions 250/250
|
||||
Remote source equals freshly built baseline; still open 94.82%. Structural diagnosis: 250/250; target rotation multiplies direction components first, while ours uses tangent first; a distance-filter ternary also introduces a transient f1. Apply the explicit sign-branch lever established on read_kpad_acc before register search.
|
||||
- direction-first horizontal rotation products in positional projection: (12, 40) structural/positional; instructions 250/250; candidate kept.
|
||||
- distance-filter sign branches assign its magnitude local directly: (12, 40) structural/positional; instructions 250/250; candidate kept.
|
||||
- separate positional rotation/average declarations from assignments: (17, 41) structural/positional; instructions 250/250; candidate kept.
|
||||
- Register search after operand/sign-branch trials, block f32 magnitude;: declaration block: | f32 magnitude; | f32 dx; | f32 next; | start (17, 41) | best (17, 41) after 6 builds; source restored; best order was: | f32 magnitude; | f32 dx; | f32 next; |
|
||||
- Register search after operand/sign-branch trials, block f32 rotatedY;: declaration block: | f32 rotatedY; | f32 rotatedX; | f32 scaleX; | f32 scaleY; | start (17, 41) | improved (12, 40) | best (12, 40) after 13 builds; kept in source: | f32 rotatedX; | f32 rotatedY; | f32 scaleX; | f32 scaleY; |
|
||||
Extended PPC diagnostic decodes unsupported floating compares and paired-single save/load instructions in /tmp only; no source/target bytes or repository tools changed. It separates register differences from real load/branch scheduling:
|
||||
KPADGetProjectionPos decoded structure/register score (0, 9)
|
||||
KPADSetSensorHeight decoded structure/register score (0, 7)
|
||||
calc_acc_horizon decoded structure/register score (0, 35)
|
||||
read_kpad_acc decoded structure/register score (5, 66)
|
||||
select_1obj_first decoded structure/register score (0, 26)
|
||||
calc_dpd_variable decoded structure/register score (13, 45)
|
||||
KPADRead decoded structure/register score (11, 89)
|
||||
KPADInit decoded structure/register score (6, 81)
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADRead
|
||||
Fetch origin/main ff90063ef9623d776c62711aeb89c7a225f7a3b5. Initial assembly diagnosis: (11, 89) structural/positional differences; instructions 459/459
|
||||
Remote source equals freshly built baseline; still open 97.52723%. Structural diagnosis: 459/459,0xc0 frame. Target copyOutput computes available*0x84 then subtracts0x84; ours computes (available-1)*0x84. Correct pointer-expression grouping and computation placement before register search.
|
||||
- form the output endpoint before subtracting one status: (46, 284) structural/positional; instructions 459/459; candidate kept.
|
||||
- initialize the output endpoint then decrement as a separate pointer operation: (46, 284) structural/positional; instructions 459/459; candidate kept.
|
||||
- copy older samples using a one-past cursor and the previous status slot: (75, 284) structural/positional; instructions 459/459; candidate kept.
|
||||
- prepare count and output endpoint before calculating the ring start: (40, 282) structural/positional; instructions 459/459; candidate kept.
|
||||
- signed available count matches the public signed return value: (11, 89) structural/positional; instructions 459/459; candidate kept.
|
||||
- signed count endpoint followed by status-pointer subtraction: (46, 284) structural/positional; instructions 459/459; restored.
|
||||
KPADRead structural trials: pointer-first endpoint forms computed available*0x84 as desired but increased source frame0xc0 ->0xd0 and shifted callee-save coloring; hoisting endpoint/count and using signed available did not cure it. Original0xc0 frame/459 instructions restored; register-only search deferred because cursor scheduling remains structural.
|
||||
|
||||
## libs/RVL_SDK/src/kpad/KPAD KPADInit
|
||||
Fetch origin/main 0d9b03878228a086954abc59b964164b0f7db5f2. Initial assembly diagnosis: (9, 81) structural/positional differences; instructions 185/185
|
||||
Remote source equals freshly built baseline; still open 96.51351%. Structural diagnosis: 185/185,0x90 frame; target constructs the40000 repeat delay earlier than ours, plus saved FP coloring. Name the real default delay, then compare matrix base and squared-diagonal temporaries before declaration search.
|
||||
- name and initialize the default repeat delay before controller setup: (9, 81) structural/positional; instructions 185/185; candidate kept.
|
||||
- initialize the first matrix element through the shared matrix pointer: (31, 110) structural/positional; instructions 185/185; restored.
|
||||
- name the sensor-diagonal square before the square-root boundary: (9, 81) structural/positional; instructions 185/185; candidate kept.
|
||||
- Register-only last on sixteen real scalar/pointer declarations with decoded PPC comparisons: declaration block: | KPADInside* kpad; | f32 distanceValue; | f32 sensorDistance; | f32 diagonalSquared; | f32 rotationElement; | f32 referenceWidth; | f32 referenceHeight; | f32 objectInterval; | f32 zero; | f32 degreesToRadians; | f32 one; | f32* matrix; | u32 i; | s32 chan; | BOOL enabled; | u16 repeatDelay; | start (6, 81) | improved (6, 70) | improved (6, 66) | improved (6, 62) | improved (6, 54) | improved (6, 51) | best (6, 51) after 388 builds; kept in source: | f32 referenceHeight; | f32 objectInterval; | f32 sensorDistance; | f32 diagonalSquared; | f32 rotationElement; | f32 referenceWidth; | KPADInside* kpad; | f32 distanceValue; | f32 zero; | f32 degreesToRadians; | f32 one; | u32 i; | f32* matrix; | s32 chan; | BOOL enabled; | u16 repeatDelay; |
|
||||
- share the named unit value with sensitivity initialization: (8, 51) structural/positional; instructions 185/185; candidate kept.
|
||||
KPADInit declaration search improved81 ->51 differences after388 builds, but early repeat-constant/global-base scheduling remained6 decoded structural differences. Sharing a named unit scalar with sensitivity initialization did not improve it. Partial source restored; source/target retain0x90 frame and185 instructions.
|
||||
|
||||
Pre-full-gate completeness audit: freshly regenerated report lists19 remaining non-matching functions; every one has >=3 successfully built distinct source trials in this HIGH round; failed build excluded.86 successful function trials and531 declaration-search builds logged; all non-exact candidates restored.
|
||||
|
||||
## Round6 final full clean gate and remaining-function audit
|
||||
Full non-quick gate over all3 units PASS; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; all pools identical;0 regressions,0 forbidden additions,0 readability warnings. Owned data100%, no symbol name/extent edits. Remaining function ELF extents end before/equal next symbol. Stack adjacent store/reload proof pairs []; no definition-level volatile justified.
|
||||
src/scene/address/iplAddressEdit: fresh exact 90 ->90/94; code 23044 ->23044/27112; data 2560 ->2560/2560.
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect: fresh exact 121 ->122/129; code 28728 ->29412/33828; data 2960 ->2960/2960.
|
||||
libs/RVL_SDK/src/kpad/KPAD: fresh exact 21 ->21/29; code 6756 ->6756/13056; data 8032 ->8032/8032.
|
||||
One exact SD title-result match committed160e985a this round. All unaccepted source/header experiments restored; the exact SD time-gate/compaction change and attempts log retained. None of the remaining functions is claimed complete. Every remaining function has at least3 successfully built distinct source trials this HIGH round, failed builds excluded. Uncertainty remains on unsupported NWC24 error defaults and compiler register/load scheduling; safe message initialization retained. All per-function fetches used the shared git lock; remote owned source equals fresh baseline0c06b01c throughout. Extents/data names untouched; no duplicate owned remote match.
|
||||
- src/scene/address/iplAddressEdit create__Q33ipl5scene11AddressEditFv 97.44634%; 6 successful distinct source trials; balloon construction null-guard/temporary boundary and retained name-pointer lifetimes; same820 instructions.
|
||||
- src/scene/address/iplAddressEdit get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571%; 3 successful distinct source trials; text-array addresses folded until after pane lookup; target retains pointers across lookup,82/84.
|
||||
- src/scene/address/iplAddressEdit update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105%; 3 successful distinct source trials; wcsncpy name-source versus destination address evaluation order,38/38; prior memcpy diagnosis corrected by resolved relocation.
|
||||
- src/scene/address/iplAddressEdit set_err_msg__Q33ipl5scene11AddressEditFPwUl8NWC24Err 98.666664%; 3 successful distinct source trials; extra safe default initialization; target appears to leave messageId undefined for unhandled error,76/75.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect create__Q33ipl5scene15SDChannelSelectFv 97.73972%; 3 successful distinct source trials; BS2 polling body omits separate manager reload,145/146; loop/inline getter boundaries remain.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188%; 4 successful distinct source trials; threshold load hoisted before count store,101/101.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336%; 3 successful distinct source trials; threshold load hoisted before count store,102/102.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.29365%; 3 successful distinct source trials; threshold/count schedule plus loop coloring,126/126.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125%; 3 successful distinct source trials; four repeated threshold/count schedules,361/361.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714%; 3 successful distinct source trials; save manager/heap argument load order,35/35.
|
||||
- src/scene/sdChannelSelect/iplSDChannelSelect setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj 93.4721%; 3 successful distinct source trials; matrix/scissor floating operand scheduling and temporaries,233/233.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADGetProjectionPos 96.57895%; 3 successful distinct source trials; floating coefficient registers and multiply operands,19/19; reused-coefficient declaration search best11 differences versus original9; all partial variants restored.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADSetSensorHeight 99.23077%; 4 successful distinct source trials; base-array register r4 versusr3 plus zero/squared-height float registers,52/52; native int index views unchanged.
|
||||
- libs/RVL_SDK/src/kpad/KPAD calc_acc_horizon 97.27723%; 3 successful distinct source trials; magnitude/interpolation and circle float-register lifetimes,101/101; Vec2 grouping produced97/103/105 instructions versus target101 and was restored; original35 FP differences remain.
|
||||
- libs/RVL_SDK/src/kpad/KPAD read_kpad_acc 98.15%; 16 successful distinct source trials; original branch/FP-helper differences remain; best structural/helper reconstruction400/400 had only cmpwi versus cmplwi at fallback-format comparison, restored pending exactness.
|
||||
- libs/RVL_SDK/src/kpad/KPAD select_1obj_first 98.348625%; 3 successful distinct source trials; geometry floating lifetimes and paired stores,109/109; separated declaration search best24 versus original26 differences, restored.
|
||||
- libs/RVL_SDK/src/kpad/KPAD calc_dpd_variable 94.82%; 3 successful distinct source trials; smoothing/projected geometry floating scheduling,250/250; direction-first operand variation best40 versus original45 differences, restored.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADRead 97.52723%; 6 successful distinct source trials; sample loop/polling temporaries and branch scheduling,459/459.
|
||||
- libs/RVL_SDK/src/kpad/KPAD KPADInit 96.51351%; 4 successful distinct source trials; controller/ring initialization and floating scheduling,185/185; sixteen-local search best51 versus original81 differences after388 builds, restored.
|
||||
Final authority lines:
|
||||
```
|
||||
[src/scene/address/iplAddressEdit] instruction-exact functions: 90/94
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] instruction-exact functions: 122/129
|
||||
[libs/RVL_SDK/src/kpad/KPAD] instruction-exact functions: 21/29
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -455,755 +455,3 @@ GATE PASS
|
||||
```
|
||||
|
||||
HIGH before -> after, instruction-exact/code/data bytes: zi8cgetc 5/4168/144 -> 5/4168/144; zmtkey 3/1488/60 -> 3/1488/60; zconvert 3/1380/112 -> 3/1380/112; tiPcKeyboard 140/28064/18548 -> 140/28064/18564. The gate passes, DOL SHA1 is exact, no regressions. The required instruction-exact count increase is still unmet. The retained data correction makes keyboard data 100% without changing section size or any code.
|
||||
|
||||
## MAX continuation, 2026-10-02
|
||||
|
||||
HEAD 5518cb16fda3091c727d974aacf477a2cf89b74a; fetched origin/main; owned sources and symbol config equal origin/main. No source changes carried from XHIGH. Parked zmtkey/zconvert/tiPcKeyboard excluded.
|
||||
|
||||
Baseline quick gate:
|
||||
```
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] objdiff: code 4168/47816 data 144/536 functions 5/8 fuzzy 96.4008 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] instruction-exact functions: 5/8
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .data size 392 match None
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sbss2 size 8 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .sdata2 size 16 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section .text size 47816 match 96.40079
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extab size 48 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] section extabindex size 72 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: ZiMatchZHSpelling 98.80165
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: zi8InternalGetZH 95.99054
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] below 100: Zi8GetElementCount 99.347824
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zi8cgetc] baseline: code 4168/47816 data 144 functions 5 fuzzy 96.4008
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] objdiff: code 10376/10604 data 192/192 functions 24/25 fuzzy 99.8491 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] instruction-exact functions: 24/25
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .data size 168 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .text size 10604 match 99.84911
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] below 100: NWC24iIsMsgObjReadable 92.98245
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] baseline: code 10376/10604 data 192 functions 24 fuzzy 99.8491
|
||||
[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
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.40604 -> 90.40604
|
||||
global fuzzy_match_percent: 99.56056 -> 99.56056
|
||||
global complete_code_percent: 70.30611 -> 70.30611
|
||||
global matched_data_percent: 99.36596 -> 99.36596
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
All three pools checked first: IDENTICAL (0/0, 8/8, 0/0).
|
||||
|
||||
MAX spelling diagnosis: 121/121 instructions, same 0x130 frame, array positions 0x88/0x8, branch operands and inline call boundaries. Only consistent coloring differs: candidate r27->r28, spelling r22->r23, length parameter r23->r24, work r28->r29, match r29->r27, candidateLength r24->r22. Function extent 0x1e4 ends exactly at next engine. No immediate stack store/reload; volatile unproven and excluded.
|
||||
|
||||
- MAX sM01 ZiMatchZHSpelling: keep candidate length as declared unsigned word returned by the counting helper; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM02 ZiMatchZHSpelling: keep prefix status as unsigned integer Boolean; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM03 ZiMatchZHSpelling: keep both prefix status and candidate count unsigned; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM04 ZiMatchZHSpelling: compute candidate length through a signed count conversion; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM05 ZiMatchZHSpelling: reuse prefix index as candidate length after prefix comparison; insns 122/121, structural/exact diffs (4, 92), fuzzy 97.31405, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX sM06 ZiMatchZHSpelling: initialize candidate cursor from incoming candidate before initial length call; insns 122/121, structural/exact diffs (1, 116), fuzzy 97.975204, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX sM07 ZiMatchZHSpelling: hold candidate length as signed long; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM08 ZiMatchZHSpelling: scope candidate length around both prefix and phonetic processing; insns 125/121, structural/exact diffs (16, 123), fuzzy 91.818184, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- MAX sM09 ZiMatchZHSpelling: use caller-saved count result with a signed helper return declaration; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM10 ZiMatchZHSpelling: use a Boolean-byte prefix status with explicit full-word return; insns 122/121, structural/exact diffs (4, 98), fuzzy 97.06612, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX sM11 ZiMatchZHSpelling: use halfword candidate character count; insns 121/121, structural/exact diffs (1, 29), fuzzy 98.34711, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM12 ZiMatchZHSpelling: use narrow candidate character count matching space-helper argument; insns 121/121, structural/exact diffs (1, 29), fuzzy 98.34711, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM13 ZiMatchZHSpelling: reuse incoming candidate for phonetic traversal instead of a second pointer; insns 121/121, structural/exact diffs (0, 31), fuzzy 98.67769, code 4168, data 96. Restored pending gates.
|
||||
|
||||
- MAX sM14 ZiMatchZHSpelling: reuse incoming spelling for phonetic traversal instead of a second pointer; insns 121/121, structural/exact diffs (0, 34), fuzzy 98.59504, code 4168, data 96. Restored pending gates.
|
||||
|
||||
- MAX sM15 ZiMatchZHSpelling: derive prefix failure status from the compared candidate character; insns 134/121, structural/exact diffs (23, 122), fuzzy 87.181816, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- MAX sM16 ZiMatchZHSpelling: scope candidate length to initial declaration and prefix status separately; insns 125/121, structural/exact diffs (16, 123), fuzzy 91.818184, code 4168, data 24. Restored pending gates.
|
||||
|
||||
MAX spelling declaration search after 16 source trials: declaration block: | ziWChar* candidateCursor; | ziWChar* spellingCursor; | int index; | int matches; | int candidateLength; | ziWChar spacedSpelling[64]; | ziWChar spacedCandidate[64]; | start (0, 29) | best (0, 29) after 52 builds; source restored; best order was: | ziWChar* candidateCursor; | ziWChar* spellingCursor; | int index; | int matches; | int candidateLength; | ziWChar spacedSpelling[64]; | ziWChar spacedCandidate[64]; |
|
||||
|
||||
MAX engine diagnosis: target/source 10676/10676 instructions, frame 0x4e0 and all local stack offsets identical. No neighbour overlap (0xa6d0 ends at Zi8NewMatchPhonetic). After branch-aware alignment and register normalization, the known residual structural stream comprises 12 extra and 10 missing return-register copies plus two missing halfword conversions. These are real code-generation differences; the four generated switch-table relocations refer into this inexact function, so their .data gap is code work. Prior width/cast correction alone grows by two instructions.
|
||||
|
||||
- MAX gM01 zi8InternalGetZH: spell traditional charset result as an explicit nonzero bit test; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM02 zi8InternalGetZH: invert traditional charset branch around the shared range reset; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM03 zi8InternalGetZH: perform traditional charset short-circuit through nested negative guard; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM04 zi8InternalGetZH: make component cursor a const pointer to const record data for read-only traversal; BUILD FAIL ext/src/clib/zi8cgetc.d build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zi8cgetc.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zi8cgetc.c # ------------------------------------------------------- # 757: componentTable = componentCursor; # Error: ^ # (10209) illegal implicit conversion from 'const unsigned char *' to # 'unsigned char *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- MAX gM05 zi8InternalGetZH: give component cursor definition volatile storage shown by immediate stack reload after assignment; BUILD FAIL ddleware/eZiText/src/clib/zi8cgetc.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zi8cgetc.c # ------------------------------------------------------- # 2106: &componentIndex, &componentCursor, work)) { # Error: ^ # (10209) illegal implicit conversion from 'unsigned char *volatile *' to # 'unsigned char **' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- MAX gM06 zi8InternalGetZH: give frequency cursor definition volatile storage shown by immediate stack reload after table call; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM07 zi8InternalGetZH: narrow paired code returns and order masks on the left; insns 10678/10676, structural/exact diffs (10222, 10519), fuzzy 96.090294, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX gM08 zi8InternalGetZH: consume counted table address through one assignment to both cursor and table; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM09 zi8InternalGetZH: emit context character after advancing the emitted-word count separately; insns 10673/10676, structural/exact diffs (9040, 10045), fuzzy 95.96759, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX gM11 zi8InternalGetZH: use signed full-word result for phonetic-code interface without changing casts; insns 10676/10676, structural/exact diffs (9080, 10068), fuzzy 95.99054, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM12 zi8InternalGetZH: declare phonetic and context record tables as const input arrays; BUILD FAIL are/eZiText/src/clib/zi8cgetc.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zi8cgetc.c # ------------------------------------------------------- # 874: match.phon[0], match.phon2[0], charset, work)) candidateStatus = 1; # Error: ^ # (10209) illegal implicit conversion from 'const unsigned char *' to # 'void *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- MAX gM10 zi8InternalGetZH: keep options parameter read-only in engine and private phonetic helper; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM13 zi8InternalGetZH: group all match scalars at their first use through initialized local declarations; insns 10676/10676, structural/exact diffs (7830, 9407), fuzzy 96.202415, code 4168, data 144. Restored pending gates.
|
||||
|
||||
MAX retained gM08: combine cursor/table initialization into the natural chained assignment. The two pointers intentionally receive the same dictionary address. Engine fuzzy 95.99054 -> 96.27482, instruction count still 10676/10676; no new exact function. Quick authority gate PASS, all exact functions preserved, data 144/536 unchanged, pool identical, DOL exact, no regressions/forbidden/readability failures.
|
||||
|
||||
```
|
||||
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.4008
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.40604 -> 90.40604
|
||||
global fuzzy_match_percent: 99.56056 -> 99.56462
|
||||
global complete_code_percent: 70.30611 -> 70.30611
|
||||
global matched_data_percent: 99.36596 -> 99.36596
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
- MAX gM14 zi8InternalGetZH: on chained-table baseline, narrow both paired phonetic codes to target halfword width; insns 10678/10676, structural/exact diffs (8713, 9803), fuzzy 96.492134, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX gM15 zi8InternalGetZH: narrow paired codes and express simplified charset as separate branches; insns 10678/10676, structural/exact diffs (7258, 9196), fuzzy 96.048615, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX gM16 zi8InternalGetZH: narrow paired codes and express traditional charset as separate branches; insns 10678/10676, structural/exact diffs (7250, 9196), fuzzy 96.048615, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX gM17 zi8InternalGetZH: keep all table addresses as byte-pointer interface returns within this unit; BUILD FAIL zi8cgetc.d build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zi8cgetc.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zi8cgetc.c # ------------------------------------------------------- # 2648: phoneticOffsets = Zi8GetTableAddress(1, 13, work); # Error: ^ # (10209) illegal implicit conversion from 'unsigned char *' to # 'unsigned short *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- MAX gM18 zi8InternalGetZH: use native int return for secondary matcher while preserving byte truncation; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM19 zi8InternalGetZH: chained initialization of frequency table and its starting cursor; insns 10682/10676, structural/exact diffs (10304, 10644), fuzzy 95.96422, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- MAX gM20 zi8InternalGetZH: replace phrase-pattern union integer member with native unsigned-long member; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM21 zi8InternalGetZH: correct phonetic-code return to ziU16 on chained table baseline; insns 10678/10676, structural/exact diffs (8713, 9803), fuzzy 96.492134, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX gM22 zi8InternalGetZH: use explicit narrow conversion at every returned format-version test; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM23 zi8InternalGetZH: split successful table presence and format-version conditions into nested checks; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM24 zi8InternalGetZH: spell primary matcher branch failure with an explicit byte comparison; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM25 zi8InternalGetZH: scope the option pointer as a read-only local view; BUILD FAIL ibs/RVLMiddleware/eZiText/src/clib/zi8cgetc.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zi8cgetc.c # ------------------------------------------------------- # 2312: charsetFilter, output, work)) goto engine_finish; # Error: ^ # (10209) illegal implicit conversion from 'const struct *' to # 'struct *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- MAX gM04 zi8InternalGetZH: make component cursor a const pointer to const record data for read-only traversal; BUILD FAIL bs/RVLMiddleware/eZiText/src/clib/zi8cgetc.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zi8cgetc.c # ------------------------------------------------------- # 756: tTable = componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work); # Error: ^ # (10209) illegal implicit conversion from 'const unsigned char *' to # 'unsigned char *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- MAX gM05 zi8InternalGetZH: give component cursor definition volatile storage shown by immediate stack reload after assignment; insns 10676/10676, structural/exact diffs (7556, 9311), fuzzy 96.27482, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX gM12 zi8InternalGetZH: declare phonetic and context record tables as const input arrays; BUILD FAIL eware/eZiText/src/clib/zi8cgetc.d ### mwcceppc.exe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zi8cgetc.c # ------------------------------------------------------- # 1619: phraseOrdinal, &candidateOrdinal, 0, work)) continue; # Error: ^ # (10209) illegal implicit conversion from 'const unsigned char *' to # 'unsigned char *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
MAX GetElementCount diagnosis: source/target 115/115 instructions, 0x230 frame and array/separator offsets identical, branch forms and all operand orders equal. Consistent count/elementCount r28/r27 swap gives 13 differences. No store followed immediately by reload at helper boundary (the saved separator reload follows a call), so no volatile. Extent 0x1cc reaches next symbol exactly. Prior return-elementIndex variation had one return-register difference, worth following with explicit count synchronization and initialization-order trials. Fetched origin/main again; still open.
|
||||
|
||||
- MAX cM01 Zi8GetElementCount: return the consumed-input index equivalent to the separately counted inputs; insns 115/115, structural/exact diffs (0, 1), fuzzy 99.95652, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX cM02 Zi8GetElementCount: synchronize consumed count from input index at return; insns 116/115, structural/exact diffs (3, 22), fuzzy 98.434784, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX cM03 Zi8GetElementCount: assign returned count from consumed index in the return expression; insns 116/115, structural/exact diffs (3, 22), fuzzy 98.434784, code 4168, data 72. Restored pending gates.
|
||||
|
||||
- MAX cM04 Zi8GetElementCount: initialize input traversal before result count in the chained zero assignment; insns 115/115, structural/exact diffs (0, 14), fuzzy 99.26087, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX cM05 Zi8GetElementCount: initialize result count last in source order of the chain; insns 115/115, structural/exact diffs (0, 14), fuzzy 99.21739, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX cM06 Zi8GetElementCount: start chained input indices at zero through result count assignment; insns 115/115, structural/exact diffs (0, 14), fuzzy 99.21739, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX cM07 Zi8GetElementCount: hold input element index as wider unsigned integer with explicit byte reads; insns 115/115, structural/exact diffs (1, 13), fuzzy 98.86957, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX cM08 Zi8GetElementCount: preserve incoming element limit as a const local byte; insns 116/115, structural/exact diffs (1, 108), fuzzy 98.478264, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- MAX cM09 Zi8GetElementCount: derive count through consumed index only when the loop exits through its limit; insns 121/115, structural/exact diffs (9, 32), fuzzy 93.347824, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- MAX cM10 Zi8GetElementCount: restore saved separator through an ordinary scalar instead of single-field state; insns 113/115, structural/exact diffs (8, 106), fuzzy 97.48695, code 4168, data 24. Restored pending gates.
|
||||
|
||||
- MAX cM11 Zi8GetElementCount: split the input-limit and character-remaining loop conditions without changing order; insns 115/115, structural/exact diffs (10, 56), fuzzy 92.17391, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX cM12 Zi8GetElementCount: return promoted consumed count through an enum-typed local; insns 115/115, structural/exact diffs (2, 13), fuzzy 98.391304, code 4168, data 144. Restored pending gates.
|
||||
|
||||
MAX GetElementCount declaration search: declaration block: | ziU8 spacedIndex; | ziU8 elementIndex; | ziU8 count; | ziWChar spacedElements[256]; | start (0, 13) | best (0, 13) after 13 builds; source restored; best order was: | ziU8 spacedIndex; | ziU8 elementIndex; | ziU8 count; | ziWChar spacedElements[256];
|
||||
cM01 returns the equivalent elementIndex but leaves an unused count variable; rejected as an artificial partial improvement, not retained. Explicit synchronization adds an instruction and regresses exception data. All remaining candidates restored.
|
||||
|
||||
MAX NWC24iIsMsgObjReadable diagnosis: fetched origin/main, source unchanged there; open 92.98245%. 57/57 instructions, identical 0x10 frame, same branches, calls, field offsets and expression operands after prologue. Target saves LR/r31 and copies the input before loading type; source schedules the type load/mask through those three prologue operations. No immediate stack reload or neighbour overlap (0xe4 ends at next public function). Remaining unit data already 192/192 including corrected MountInfo extent; no data changes needed. Prior readonly views and full-body helper did not change this scheduling.
|
||||
|
||||
- MAX nM01 NWC24iIsMsgObjReadable: use an opaque constant input and explicit typed readonly mailbox view; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM02 NWC24iIsMsgObjReadable: use private message-object view for common type/app/LED header fields; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM03 NWC24iIsMsgObjReadable: use signed shift of readable type bit instead of mask predicate; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM04 NWC24iIsMsgObjReadable: scope read type and subsequent validation in explicit positive branch; insns 57/57, structural/exact diffs (15, 50), fuzzy 85.789474, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM05 NWC24iIsMsgObjReadable: make first type validity mask an enum-valued flag constant; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM06 NWC24iIsMsgObjReadable: use whole unsigned type word local for initial three type predicates only; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM07 NWC24iIsMsgObjReadable: return the Boolean app-mask comparison through an explicit local result; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM08 NWC24iIsMsgObjReadable: delay independent app/LED readonly view setup until after first type test; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
MAX PFCACHE_DoWriteNumSectorAndFreeIfNeeded diagnosis: fetched origin/main, still open 98.21889%. Both 233 instructions, same 0x30 frame, same saved GPRs and all branches. Only third overlap block differs at instructions 136-144: target reloads page start, recomputes num_sector+sector despite cached r31 request end, computes last_sector before success/remaining bookkeeping; source reuses r31 and reconstructs last sector from page start + overlap. No immediate stack store/reload for these scalars, so volatile is unproven. Extent 0x3a4 ends exactly at DoFlushCache. No data sections/pool in this unit. Try real signedness, input const qualification, transient-helper boundaries and range-variable structure before register search.
|
||||
|
||||
- MAX pM01 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: compute last sector using unsigned-int request operands rather than page cancellation; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM02 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: compute last sector with reversed request addition and decrement grouped into count; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM03 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: group last-sector decrement into starting sector; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM04 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: make input head pointer read-only because this routine never replaces it; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM05 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: preserve source buffer as const at every memory-copy call; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM06 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: compute overlap and last sector using unsigned-int transient arithmetic; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.53648, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM07 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: derive last sector before overlap using the page-relative count expression; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM08 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: declare half-open request end as a block-local named range value after memcpy; insns 232/233, structural/exact diffs (14, 106), fuzzy 98.62661, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM09 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: reuse existing end-buffer arithmetic without a whole-sector last variable; insns 232/233, structural/exact diffs (14, 107), fuzzy 98.45493, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM10 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: compute last sector from overlap before remainder-count mutation; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM11 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: keep overlap count in a signed integer but convert at sector bookkeeping; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM12 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: keep last-sector value in a signed integer but preserve sector subtraction; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM13 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: read page sector through const page view for both overlap calculations; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM14 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: order rest-sector update before success update in the right overlap; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM15 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: calculate the last-sector buffer offset directly as overlap minus one; insns 230/233, structural/exact diffs (17, 107), fuzzy 97.48927, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM16 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: keep overlap calculation inside a named range descriptor; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM17 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper isolates request-end calculation from overlap arithmetic; insns 234/233, structural/exact diffs (17, 108), fuzzy 97.48927, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM18 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper uses a named half-open end local; insns 234/233, structural/exact diffs (17, 108), fuzzy 97.48927, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM19 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper keeps a signed 32-bit endpoint result; insns 234/233, structural/exact diffs (17, 108), fuzzy 97.48927, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM20 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper groups count decrement before start; insns 234/233, structural/exact diffs (17, 108), fuzzy 97.48927, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM21 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper combines with direct overlap-count expression; insns 234/233, structural/exact diffs (17, 108), fuzzy 97.48927, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM22 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper receives page start and overlap instead of request input; insns 233/233, structural/exact diffs (5, 8), fuzzy 97.91846, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM23 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper isolates request-end calculation from overlap arithmetic; allow normal helper inlining at this function boundary; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM24 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper uses a named half-open end local; allow normal helper inlining at this function boundary; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM25 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper keeps a signed 32-bit endpoint result; allow normal helper inlining at this function boundary; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM26 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper groups count decrement before start; allow normal helper inlining at this function boundary; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM27 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper combines with direct overlap-count expression; allow normal helper inlining at this function boundary; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM28 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: inline last-sector helper receives page start and overlap instead of request input; allow normal helper inlining at this function boundary; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM29 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression num_sector - (p_page->sector - sector); insns 234/233, structural/exact diffs (15, 107), fuzzy 97.74678, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM30 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression (sector - p_page->sector) + num_sector; insns 234/233, structural/exact diffs (16, 107), fuzzy 97.6824, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM31 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression num_sector + (sector - p_page->sector); insns 234/233, structural/exact diffs (16, 107), fuzzy 97.6824, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression p_page->size - (p_page->sector + (p_page->size - num_sector) - sector); insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM33 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression p_page->size + (num_sector + sector - (p_page->sector + p_page->size)); insns 234/233, structural/exact diffs (16, 107), fuzzy 97.6824, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM34 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression (num_sector + sector - (p_page->sector + p_page->size)) + p_page->size; insns 234/233, structural/exact diffs (16, 107), fuzzy 97.6824, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM35 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression num_sector - (p_page->sector + p_page->size - sector) + p_page->size; insns 234/233, structural/exact diffs (16, 107), fuzzy 97.6824, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM36 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: use natural equivalent sector-overlap expression (num_sector - p_page->sector) + sector; insns 234/233, structural/exact diffs (16, 107), fuzzy 97.6824, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX nM09 NWC24iIsMsgObjReadable: match a mutable mailbox-entry input view rather than the guessed const formal; insns 57/57, structural/exact diffs (0, 0), fuzzy 100.0, code 10604, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM10 NWC24iIsMsgObjReadable: use a readonly pointer value to the mutable mailbox entry; insns 57/57, structural/exact diffs (0, 0), fuzzy 100.0, code 10604, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM11 NWC24iIsMsgObjReadable: retain full entry constness while qualifying pointer value itself; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM12 NWC24iIsMsgObjReadable: introduce a common typed header view with the proven shared leading fields; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM13 NWC24iIsMsgObjReadable: use an inline common-header validation helper for the first readable type bit only; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
- MAX nM14 NWC24iIsMsgObjReadable: keep the app-id equality operation in its own inline read-only view helper; insns 57/57, structural/exact diffs (4, 5), fuzzy 92.98245, code 10376, data 192. Restored pending gates.
|
||||
|
||||
MAX exact nM09: NWC24iIsMsgObjReadable input was guessed pointer-to-const; the target was compiled with mutable MBCEntry*. Removing const only from this function declaration and definition moves the first type load/mask after LR/r31 saves exactly as target. 57/57 instructions, ctxdiff 0, 100% objdiff; whole unit 24/25 -> 25/25, code 10376/10604 -> 10604/10604, data unchanged 192/192. nM10 pointer-value const is also exact; use simpler nM09. All call sites already pass mutable MBCEntry*, no shared header change. Quick gate PASS, DOL exact, pools identical and zero regressions.
|
||||
|
||||
```
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] objdiff: code 10604/10604 data 192/192 functions 25/25 fuzzy 100.0000 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] instruction-exact functions: 25/25
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .data size 168 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .text size 10604 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] baseline: code 10376/10604 data 192 functions 24 fuzzy 99.8491
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.40604 -> 90.41365
|
||||
global fuzzy_match_percent: 99.56056 -> 99.56516
|
||||
global complete_code_percent: 70.30611 -> 70.30611
|
||||
global matched_data_percent: 99.36596 -> 99.36596
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
- MAX pM37 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: match a mutable source-buffer formal from the older cache API; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM38 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: read volume geometry through a const formal and retain explicit mutable driver call; insns 233/233, structural/exact diffs (17, 62), fuzzy 92.44635, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM39 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: model memory-copy source as a mutable opaque pointer in this unit only; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM40 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: scope overlap and last-sector locals directly in the partial-page branch; BUILD FAIL "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/fa/pf_cache.d build/43U/src/libs/RVL_SDK/src/fa/pf_cache.d ### mwcceppc.exe Compiler: # File: libs\RVL_SDK\src\fa\pf_cache.c # --------------------------------------- # 610: pf_u32 num_overlap = p_page->size - ((p_page->sector + p_page->size) - (num_sector + sector)); # Error: ^^^^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed. . Restored pending gates.
|
||||
|
||||
- MAX pM40 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: scope overlap and last-sector locals directly in the partial-page branch; insns 233/233, structural/exact diffs (4, 9), fuzzy 98.21889, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM41 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: scope an initialized last requested sector after the copy; insns 232/233, structural/exact diffs (15, 228), fuzzy 95.40772, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM42 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: derive a half-open request endpoint with wide intermediate arithmetic; insns 235/233, structural/exact diffs (17, 229), fuzzy 94.356224, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX pM43 PFCACHE_DoWriteNumSectorAndFreeIfNeeded: derive overlap and last sector from a wide request endpoint local; insns 237/233, structural/exact diffs (15, 235), fuzzy 93.042915, code 6464, data None. Restored pending gates.
|
||||
|
||||
- MAX sM17 ZiMatchZHSpelling: declare candidate input const at the function definition and convert only for legacy helpers; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM18 ZiMatchZHSpelling: declare spelling input const at the function definition and convert only for legacy helper; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM19 ZiMatchZHSpelling: declare both candidate and spelling input arrays readonly; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM20 ZiMatchZHSpelling: give count helper a readonly word prototype while keeping matching input mutable; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM21 ZiMatchZHSpelling: give readonly candidate and count helper consistent const-qualified word types; insns 121/121, structural/exact diffs (0, 29), fuzzy 98.80165, code 4168, data 144. Restored pending gates.
|
||||
|
||||
- MAX sM22 ZiMatchZHSpelling: declare initial candidate length immutable after its one assignment; insns 121/121, structural/exact diffs (2, 30), fuzzy 97.19009, code 4168, data 144. Restored pending gates.
|
||||
|
||||
MAX cache structural follow-up: 43 distinct natural source trials, plus compiler-rejected unscoped declaration attempt. Mutable-buffer and readonly-head views preserve 9 differences; readonly volume regresses allocation/scheduling (62 differences). The closest fuzzy alternative pM08 has 232/233 instructions and greater branch-aware structural distance (14 vs 4), so reject it rather than trade the target instruction structure for a percentage gain. Wider arithmetic adds real instructions and is rejected. All cache source trials restored. No stack proof permits volatile.
|
||||
|
||||
MAX spelling follow-up after mailbox input-qualifier match: formal const candidate/spelling, consistent readonly count-helper prototype, and initialized immutable candidate length were all compiled. Const views reproduce the same 29 register differences. Local count scope changes instruction structure. Source restored; no proven volatile local evidence.
|
||||
|
||||
MAX final data proof: zi8cgetc .data is exactly 392 bytes in both objects, four compiler-generated switch tables, all 98 relocations resolve inside zi8InternalGetZH. No ordinary data symbol needs a real-name rename; these remain code work. Exception sections and the 16-byte constants/8-byte zero object are exact. NWC24MBoxCtrl has byte-identical ordinary strings and real MountInfo extent, matched data192/192; extracted trailing alignment remains unowned in source sections. pf_cache has no allocated non-code sections. No config or shared-header changes made.
|
||||
|
||||
MAX cache declaration search after structural/type/helper trials: declaration block: | PF_CACHE_PAGE* p_page = PF_NULL; | pf_s32 err; | pf_u32 num_rest_sector = num_sector; | pf_u8* p_sbuf; | pf_u8* p_ebuf; | pf_u32 num_overlap; | pf_u32 last_sector; | start (4, 9) | best (4, 9) after 52 builds; source restored; best order was: | PF_CACHE_PAGE* p_page = PF_NULL; | pf_s32 err; | pf_u32 num_rest_sector = num_sector; | pf_u8* p_sbuf; | pf_u8* p_ebuf; | pf_u32 num_overlap; | pf_u32 last_sector;
|
||||
MAX coverage ZiMatchZHSpelling: 22 distinct successfully compiled source trials.
|
||||
MAX coverage zi8InternalGetZH: 21 distinct successfully compiled source trials.
|
||||
MAX coverage Zi8GetElementCount: 12 distinct successfully compiled source trials.
|
||||
MAX coverage NWC24iIsMsgObjReadable: 14 distinct successfully compiled source trials.
|
||||
MAX coverage PFCACHE_DoWriteNumSectorAndFreeIfNeeded: 43 distinct successfully compiled source trials.
|
||||
|
||||
Coverage complete: no untried owned function. NWC24iIsMsgObjReadable is exact and committed; all other mailbox trials restored. pf_cache source byte-identical to its MAX start. Spelling/GetElementCount source unchanged. The sole retained engine change is one natural chained table/cursor assignment; the engine remains open, and structural return-copy/conversion differences are not labelled a pure register tie.
|
||||
|
||||
MAX final full (non-quick) gate, all three owned 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.4008
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] pool: IDENTICAL
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] objdiff: code 10604/10604 data 192/192 functions 25/25 fuzzy 100.0000 linked code 0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] instruction-exact functions: 25/25
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .data size 168 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .sdata size 16 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] section .text size 10604 match 100.0
|
||||
[libs/RevoEX/src/nwc24/NWC24MBoxCtrl] baseline: code 10376/10604 data 192 functions 24 fuzzy 99.8491
|
||||
[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
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 90.40604 -> 90.41365
|
||||
global fuzzy_match_percent: 99.56056 -> 99.56516
|
||||
global complete_code_percent: 70.30611 -> 70.30611
|
||||
global matched_data_percent: 99.36596 -> 99.36596
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
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.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,89 +0,0 @@
|
||||
# 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
@@ -1,46 +0,0 @@
|
||||
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
|
||||
@@ -1,21 +0,0 @@
|
||||
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
|
||||
@@ -1,20 +0,0 @@
|
||||
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
|
||||
@@ -1,34 +0,0 @@
|
||||
# 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.
|
||||
Reference in New Issue
Block a user