Compare commits
1 Commits
cleanup/co
...
mslmisc-cl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
449fb9a66e |
19
.github/workflows/readme-progress.yml
vendored
19
.github/workflows/readme-progress.yml
vendored
@@ -2,8 +2,6 @@ name: README progress
|
||||
|
||||
# runs on the self-hosted runner on cole's server so it doesn't use hosted minutes.
|
||||
# only push/schedule/manual triggers, never pull_request, so fork PRs can't reach this machine.
|
||||
# README progress is written inside each landing commit by the orchestrator, so this job never commits;
|
||||
# it only rebuilds and publishes the current numbers to the job summary.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
@@ -17,7 +15,7 @@ concurrency:
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
progress:
|
||||
@@ -50,8 +48,15 @@ jobs:
|
||||
- name: Report
|
||||
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
|
||||
|
||||
- name: Summary
|
||||
- name: Update README
|
||||
run: python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
|
||||
- name: Commit
|
||||
run: |
|
||||
python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
sed -n '/progress:start/,/progress:end/p' README.md >> "$GITHUB_STEP_SUMMARY"
|
||||
git checkout -- README.md
|
||||
if git diff --quiet README.md; then exit 0; fi
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add README.md
|
||||
git commit -m "docs: update progress [skip ci]"
|
||||
git pull --rebase origin main || { git rebase --abort; echo "main moved, next run will update"; exit 0; }
|
||||
git push origin HEAD:main
|
||||
|
||||
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.59% | 90.81% | 71.43% | 99.37% |
|
||||
| 99.54% | 89.91% | 69.31% | 99.37% |
|
||||
|
||||
units 956/1027 complete, functions 12365/12563 matched.
|
||||
units 949/1027 complete, functions 12326/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
|
||||
|
||||
@@ -44,7 +44,7 @@ UpdateDiskID = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
|
||||
TicketViewsBuf = .bss:0x810ADF80; // type:object size:0x3600 scope:local align:32
|
||||
Flags0 = .bss:0x810B1580; // type:object size:0x800 scope:local
|
||||
Flags1 = .bss:0x810B1D80; // type:object size:0x800 scope:local
|
||||
Thread = .bss:0x810B2580; // type:object size:0x318 scope:local
|
||||
Thread = .bss:0x810B2580; // type:object size:0x1318 scope:local
|
||||
UpdateHeader0 = .bss:0x810B38A0; // type:object size:0x20 scope:local
|
||||
UpdateHeader1 = .bss:0x810B38C0; // type:object size:0x20 scope:local
|
||||
viewsBuf = .bss:0x810B38E0; // type:object size:0x3600 scope:local
|
||||
@@ -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
|
||||
@@ -104,7 +103,7 @@ AtermThread = .bss:0x810C0958; // type:object size:0x318 scope:local align:32
|
||||
Voices = .bss:0x810C0C80; // type:object size:0x1800 data:4byte
|
||||
sZeroMem = .bss:0x810C2480; // type:object size:0x100 data:byte
|
||||
s_player_thread_stack = .bss:0x810C2580; // type:object size:0x4000 scope:local
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0xC
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0x10
|
||||
layoutGatherDestructorRecord = .bss:0x810C6590; // type:object size:0xC data:4byte
|
||||
unInputedWCharColorDestructorRecord = .bss:0x810C659C; // type:object size:0xC data:4byte
|
||||
charColorDestructorRecord = .bss:0x810C65A8; // type:object size:0xC data:4byte
|
||||
@@ -4577,9 +4576,9 @@ enqueueNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB254; // type:
|
||||
enqueueLoadNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB308; // type:function size:0x5C
|
||||
enqueuePageNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB364; // type:function size:0x5C
|
||||
enqueueResultNotice__Q33ipl5scene15SDChannelSelectFUl = .text:0x813DB3C0; // type:function size:0x5C
|
||||
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB41C; // type:function size:0x5C
|
||||
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUlUlUlUl = .text:0x813DB41C; // type:function size:0x5C
|
||||
enqueueMoveNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB478; // type:function size:0x5C
|
||||
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB4D4; // type:function size:0x5C
|
||||
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUlUlUlUl = .text:0x813DB4D4; // type:function size:0x5C
|
||||
enqueueErrorNotice__Q33ipl5scene15SDChannelSelectFUlUl = .text:0x813DB530; // type:function size:0x5C
|
||||
enqueueCommandNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB58C; // type:function size:0x60
|
||||
enqueueDeleteNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB5EC; // type:function size:0x60
|
||||
@@ -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
|
||||
@@ -23835,7 +23829,7 @@ result$1126 = .sbss:0x81698E48; // type:object size:0x4 data:4byte
|
||||
soState = .sbss:0x81698E50; // type:object size:0x1 scope:local data:byte
|
||||
soError = .sbss:0x81698E54; // type:object size:0x4 scope:local data:4byte
|
||||
soRegistered = .sbss:0x81698E58; // type:object size:0x4 scope:local data:4byte
|
||||
soSocketRegistered = .sbss:0x81698E60; // type:object size:0x4 scope:local data:4byte
|
||||
soSocketRegistered = .sbss:0x81698E60; // type:object size:0x8 scope:local data:4byte
|
||||
sslRegistered = .sbss:0x81698E68; // type:object size:0x4 scope:local data:4byte
|
||||
l_initialized = .sbss:0x81698E6C; // type:object size:0x4 scope:local data:4byte
|
||||
VFipf_sys_set = .sbss:0x81698E70; // type:object size:0x4 scope:global data:4byte
|
||||
|
||||
20
configure.py
20
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"]),
|
||||
]
|
||||
@@ -927,7 +927,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiPkData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -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", [
|
||||
@@ -1212,7 +1212,7 @@ config.libs = [
|
||||
Object(NonMatching, "exif/exif_parse.c"),
|
||||
|
||||
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
||||
Object(Matching, "reschange/idct_resolution_change_var.c"),
|
||||
Object(NonMatching, "reschange/idct_resolution_change_var.c"),
|
||||
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
@@ -1695,8 +1695,8 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_cluster.c"),
|
||||
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_entry_iterator.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"),
|
||||
|
||||
@@ -55,7 +55,7 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -203,9 +203,9 @@ namespace ipl {
|
||||
bool enqueueLoadNotice();
|
||||
bool enqueuePageNotice();
|
||||
bool enqueueResultNotice(u32 result);
|
||||
bool enqueueChannelNotice(u64 titleId, u32 value);
|
||||
bool enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value);
|
||||
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueStateNotice(u64 titleId, u32 state);
|
||||
bool enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state);
|
||||
bool enqueueErrorNotice(u32 page, u32 index);
|
||||
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
||||
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -38,19 +38,6 @@ namespace EGG {
|
||||
|
||||
virtual void calc(); // 0x30
|
||||
|
||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x34
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x38
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x3C
|
||||
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x48
|
||||
|
||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x50
|
||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x50
|
||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x58
|
||||
#else
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x34
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x38
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName) NO_INLINE {
|
||||
@@ -79,7 +66,6 @@ namespace EGG {
|
||||
u32 id = changeNameToId(pName);
|
||||
return mSoundArchivePlayer.HoldSound(pHandle, id);
|
||||
} // 0x58
|
||||
#endif
|
||||
|
||||
u32 changeNameToId(const char* pName) { return mpArchive->ConvertLabelStringToSoundId(pName); }
|
||||
const char* changeIdToName(u32 id) { return mpArchive->GetSoundLabelString(id); }
|
||||
|
||||
@@ -19,10 +19,6 @@ namespace EGG {
|
||||
|
||||
~SoundHeapMgr() { destroySoundHeap(); }
|
||||
|
||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
virtual bool loadState(s32 id); // 0x08
|
||||
virtual s32 getCurrentLevel(); // 0x0C
|
||||
#else
|
||||
virtual bool loadState(s32 id) {
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
|
||||
@@ -39,7 +35,6 @@ namespace EGG {
|
||||
} // 0x08
|
||||
|
||||
virtual s32 getCurrentLevel() { return mHeap.GetCurrentLevel(); } // 0x0C
|
||||
#endif
|
||||
|
||||
s32 saveState() { return mHeap.SaveState(); }
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#define EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
|
||||
#include <egg/core.h>
|
||||
|
||||
namespace EGG {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -19,13 +19,8 @@ namespace nw4r {
|
||||
template <typename T>
|
||||
class AutoLock : private NonCopyable {
|
||||
public:
|
||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
explicit AutoLock(T& rLockObj);
|
||||
~AutoLock();
|
||||
#else
|
||||
explicit AutoLock(T& rLockObj) : mLockObj(rLockObj) { Lock(rLockObj); }
|
||||
~AutoLock() { Unlock(mLockObj); }
|
||||
#endif
|
||||
|
||||
private:
|
||||
T& mLockObj; // 0x00
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -10,12 +10,14 @@ static TMCHuffmanEntry readHuffmanEntry(const TMCHuffmanEntry* entries, u32 inde
|
||||
return entries[index];
|
||||
}
|
||||
|
||||
static void readHuffmanLimit(const TMCHuffmanEntry* entries, TMCHuffmanEntry* limit) {
|
||||
limit->bitLength = entries->bitLength;
|
||||
limit->symbol = entries->symbol;
|
||||
static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
|
||||
TMCHuffmanEntry limit;
|
||||
limit.bitLength = entries->bitLength;
|
||||
limit.symbol = entries->symbol;
|
||||
return limit;
|
||||
}
|
||||
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
@@ -49,21 +51,17 @@ static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table,
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
readHuffmanLimit(entry, limit);
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
{
|
||||
u32 relativeCode = code - entry->bitLength;
|
||||
u32 symbolIndex = relativeCode + entry->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
@@ -96,26 +94,18 @@ static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, co
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
readHuffmanLimit(entry, limit);
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
{
|
||||
u32 relativeCode = code - entry->bitLength;
|
||||
u32 symbolIndex = relativeCode + entry->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
||||
TMCHuffmanEntry dcEntry;
|
||||
TMCHuffmanEntry dcDecoded;
|
||||
TMCHuffmanEntry dcLimit;
|
||||
TMCHuffmanEntry acDecoded;
|
||||
TMCHuffmanEntry acLimit;
|
||||
u8* huff_sym;
|
||||
const TMCHuffmanEntry* ac_fast;
|
||||
s32 idx;
|
||||
@@ -157,7 +147,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
} else {
|
||||
huff_sym = work->pDCHuffSym;
|
||||
huff_tbl = work->pDCHuffTbl;
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &dcLimit, &dcDecoded);
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -217,7 +207,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
bit_pos = work->bitCount;
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &acLimit, &acDecoded);
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ static u16 readU16(const u8* p, u16 byteOrder) {
|
||||
}
|
||||
|
||||
static u16 readExifU16(const u8* data, u16 byteOrder) {
|
||||
u16 value = data[0] | data[1] << 8;
|
||||
u32 value = data[0] | data[1] << 8;
|
||||
if (byteOrder == 0x4949) {
|
||||
return (u16)value;
|
||||
}
|
||||
@@ -246,9 +246,9 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
u32 ifdOffset;
|
||||
const u8* entries;
|
||||
u16 remaining;
|
||||
u16 index;
|
||||
s32 entriesSize;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
pInfo->thumbnailData = (u8*)data;
|
||||
pInfo->dataEnd = (u8*)data + size;
|
||||
pInfo->nextIfdOffset = 0;
|
||||
@@ -339,7 +339,7 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
|
||||
s32 tag;
|
||||
u16 tag;
|
||||
u16 type;
|
||||
|
||||
tag = readU16(entry, byteOrder);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -57,14 +57,15 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
|
||||
|
||||
{
|
||||
u32 idx = 3;
|
||||
s32* column = tmp + 3;
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
u8* bp = conv_row_ptr + idx;
|
||||
|
||||
a = tmp[idx] + 0x40000;
|
||||
b = tmp[idx + 8];
|
||||
d = tmp[idx + 24];
|
||||
c = tmp[idx + 16];
|
||||
a = column[0] + 0x40000;
|
||||
b = column[8];
|
||||
d = column[24];
|
||||
c = column[16];
|
||||
|
||||
evsum = a + c;
|
||||
cd = a - c;
|
||||
@@ -78,6 +79,7 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
|
||||
bp[pitch * 2] = clampU8((cd - rot) >> 11);
|
||||
bp[pitch * 4 - pitch] = clampU8((evsum - oddrot) >> 11);
|
||||
|
||||
column--;
|
||||
idx -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -166,23 +166,23 @@ s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 red;
|
||||
s8 crValue;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* texture;
|
||||
s32 height;
|
||||
s32 column;
|
||||
s32 yEnd;
|
||||
s32 xEnd;
|
||||
s32 green;
|
||||
s32 yEnd;
|
||||
s32 column;
|
||||
s32 tileWidth;
|
||||
s32 blueOffset;
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s8 crValue;
|
||||
s32 red;
|
||||
s32 chromaSkip;
|
||||
s32 width;
|
||||
s32 cbValue;
|
||||
@@ -216,7 +216,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
cbValue = (s8)*cb++;
|
||||
crValue = (s8)*cr++;
|
||||
redOffset = (crValue * 359) >> 8;
|
||||
greenOffset = -(crValue * 183 + cbValue * 88) >> 8;
|
||||
greenOffset = -(cbValue * 88 + crValue * 183) >> 8;
|
||||
blueOffset = (cbValue * 454) >> 8;
|
||||
}
|
||||
{
|
||||
@@ -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;
|
||||
@@ -285,20 +285,20 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
s32 xEnd;
|
||||
u8* texture;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 column;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 tileWidth;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 lumaSkip;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 lumaSkip;
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s8 crValue;
|
||||
@@ -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;
|
||||
@@ -366,11 +366,11 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
|
||||
static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
s32 lumaSkip;
|
||||
s32 blue;
|
||||
s32 cbValue;
|
||||
s32 tileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u16* output;
|
||||
s32 xEnd;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
@@ -379,7 +379,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 red;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
u16* output;
|
||||
s32 yEnd;
|
||||
s32 redOffset;
|
||||
s32 tileRow;
|
||||
@@ -387,7 +387,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 blueOffset;
|
||||
s32 value;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
s32 lumaSkip;
|
||||
s32 crValue;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -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 | 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;
|
||||
@@ -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 | 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;
|
||||
@@ -441,21 +441,21 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 blue;
|
||||
u16* output;
|
||||
s32 xEnd;
|
||||
s32 column;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 tileWidth;
|
||||
u8* luminance;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
u8* cb;
|
||||
u8* texture;
|
||||
s32 column;
|
||||
s32 chromaSkip;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 lumaSkip;
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s32 crValue;
|
||||
s32 redOffset;
|
||||
@@ -463,7 +463,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 blueOffset;
|
||||
s32 value;
|
||||
s32 red;
|
||||
s32 lumaSkip;
|
||||
s32 blue;
|
||||
s32 green;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -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 | 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;
|
||||
@@ -517,19 +517,19 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 tileRow;
|
||||
s32 blue;
|
||||
s8 crValue;
|
||||
s32 chromaSkip;
|
||||
u8* luminance;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* texture;
|
||||
s32 xEnd;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
s32 blueOffset;
|
||||
u8* texture;
|
||||
s32 lumaSkip;
|
||||
s32 yEnd;
|
||||
s32 xEnd;
|
||||
s32 tileRow;
|
||||
s32 value;
|
||||
s32 column;
|
||||
u8* cr;
|
||||
@@ -538,7 +538,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 redOffset;
|
||||
u8* cb;
|
||||
u16* output;
|
||||
s32 blueOffset;
|
||||
s32 green;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
|
||||
@@ -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;
|
||||
@@ -620,11 +620,11 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* luminance = work->convBuf + 4;
|
||||
u8* cb = work->convBuf + 260;
|
||||
s32 width;
|
||||
u8* cr = work->convBuf + 324;
|
||||
TMCCJPEGDecState* state = work->pState;
|
||||
s32 tileWidth = (state->convWidth >> 2) << 1;
|
||||
u8* texture = state->pTexBuffer;
|
||||
u8* cr = work->convBuf + 324;
|
||||
s32 width;
|
||||
s32 height;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
@@ -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;
|
||||
@@ -686,7 +686,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
|
||||
static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 column;
|
||||
s32 redOffset;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 lumaSkip;
|
||||
@@ -695,7 +695,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 height;
|
||||
s32 column;
|
||||
s32 tileRow;
|
||||
s32 chromaSkip;
|
||||
s32 width;
|
||||
s32 xEnd;
|
||||
@@ -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 | 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;
|
||||
@@ -770,7 +770,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
u16* output;
|
||||
s32 lumaSkip;
|
||||
s32 blue;
|
||||
u8* texture;
|
||||
s32 tileRow;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
@@ -783,7 +783,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 greenOffset;
|
||||
s32 yEnd;
|
||||
s32 cbValue;
|
||||
s32 tileRow;
|
||||
u8* texture;
|
||||
s32 blueOffset;
|
||||
s32 red;
|
||||
s8 crValue;
|
||||
@@ -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 | 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;
|
||||
@@ -856,20 +856,20 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
|
||||
static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 tileWidth;
|
||||
s32 tileRow;
|
||||
s32 rowSkip;
|
||||
u8* texture;
|
||||
s32 xEnd;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 crValue;
|
||||
s8 crValue;
|
||||
s32 height;
|
||||
s32 width;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 rowSkip;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
u8* texture;
|
||||
s32 row;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
@@ -899,7 +899,7 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||
red = value + ((crValue * 359) >> 8);
|
||||
blue = value + ((cbValue * 454) >> 8);
|
||||
if ((red | green | 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;
|
||||
|
||||
@@ -171,7 +171,9 @@ s32 TMCJPEGDEC_set_converterY8U8V8(TMCCJPEGDecWork* work) {
|
||||
static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 rowSkip;
|
||||
u8* output;
|
||||
s32 chromaXEnd;
|
||||
u32 tileRow;
|
||||
u32 chromaTileWidth;
|
||||
s32 chromaYEnd;
|
||||
u8* lumaTexture;
|
||||
TMCCJPEGDecState* state;
|
||||
@@ -214,17 +216,17 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
luminance += rowSkip;
|
||||
}
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
x = (u32)x >> 2;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -233,6 +235,7 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -247,9 +250,9 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 width;
|
||||
s32 tileOffset;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -284,13 +287,13 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 2;
|
||||
width = (width + 3) >> 2;
|
||||
xEnd = x + width;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + height;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -303,7 +306,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 +319,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,22 +344,24 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -368,9 +376,9 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 width;
|
||||
s32 tileOffset;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -405,13 +413,13 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + height;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -420,21 +428,23 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaXEnd;
|
||||
s32 chromaYEnd;
|
||||
u8* lumaTexture;
|
||||
s32 height;
|
||||
u32 chromaTileWidth;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
u8* cbTexture;
|
||||
s32 row;
|
||||
u8* crTexture;
|
||||
s32 xEnd;
|
||||
u8* crTexture;
|
||||
u32 tileWidth;
|
||||
u8* cb;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 yEnd;
|
||||
s32 width;
|
||||
u8* cr;
|
||||
u32 tileWidth;
|
||||
s32 row;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -460,14 +470,14 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
y = (u32)y >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -476,6 +486,7 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -486,13 +497,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 width;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 yEnd;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -528,13 +539,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + ((height + 1) >> 1);
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 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;
|
||||
|
||||
@@ -796,11 +796,11 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
if (remaining != 0) {
|
||||
remaining--;
|
||||
} else {
|
||||
totalCandidates = totalCandidates + 1;
|
||||
totalCandidates++;
|
||||
if (options->countOnly == '\0') {
|
||||
*output++ = spellingBuffer[spellingIndex];
|
||||
*output++ = 0;
|
||||
candidateCount = candidateCount + 1;
|
||||
candidateCount++;
|
||||
}
|
||||
else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||
@@ -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;
|
||||
}
|
||||
@@ -1000,10 +1001,10 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
}
|
||||
if (Zi8IsDupWordW(output,(ziU8)phoneticIndex,work) == 0) {
|
||||
if (remaining == 0) {
|
||||
totalCandidates = totalCandidates + 1;
|
||||
totalCandidates++;
|
||||
if (options->countOnly == 0) {
|
||||
output += phoneticIndex + 1;
|
||||
++candidateCount;
|
||||
candidateCount++;
|
||||
} 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 {
|
||||
|
||||
@@ -72,11 +72,7 @@ struct DVDCommandBlock {
|
||||
DVDCommandBlock* prev; // 0x04
|
||||
|
||||
u32 command; // 0x08
|
||||
#ifdef BS2_MACH_VOLATILE_DVD_STATE
|
||||
volatile s32 state;
|
||||
#else
|
||||
s32 state; // 0x0C
|
||||
#endif
|
||||
|
||||
u32 offset; // 0x10
|
||||
u32 length; // 0x14
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -511,8 +511,8 @@ pf_s32 PFENT_ITER_FindCluster(PF_DIR_ENT* p_ent, pf_u32 cluster, pf_bool* p_is_f
|
||||
iter.ffd.cluster_link.buffer = PF_NULL;
|
||||
iter.log2_entries_per_sector = p_ent->p_vol->bpb.log2_bytes_per_sector - 5;
|
||||
iter.file_sector_index = sector_index;
|
||||
iter.offset_mask = (1U << iter.log2_entries_per_sector) - 1;
|
||||
entries_per_sector = 1U << iter.log2_entries_per_sector;
|
||||
entries_per_sector = 1 << iter.log2_entries_per_sector;
|
||||
iter.offset_mask = entries_per_sector - 1;
|
||||
iter.p_vol = p_ent->p_vol;
|
||||
iter.sector = p_ent->entry_sector;
|
||||
iter.offset = p_ent->entry_offset;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -276,15 +276,14 @@ static inline f32 object_interval_distance(f32 interval) {
|
||||
const f32 sensorIntervalConversion = 0.383864f;
|
||||
|
||||
static void reset_kpad(KPADInside* kpad) {
|
||||
f32 sensorDistance;
|
||||
f32 upperY;
|
||||
f32 distanceValue;
|
||||
f32 zero;
|
||||
f32 upperY;
|
||||
f32 sensorDistance;
|
||||
f32 lowerY;
|
||||
f32 one;
|
||||
f32 negativeOne;
|
||||
KPADDPDObject* object;
|
||||
f32 calibratedDistance;
|
||||
negativeOne = -1.0f;
|
||||
one = 1.0f;
|
||||
zero = 0.0f;
|
||||
@@ -300,9 +299,8 @@ static void reset_kpad(KPADInside* kpad) {
|
||||
kpad->value508 = negativeOne / kp_err_dist_speed;
|
||||
kpad->value50C = kp_ah_circle_radius * kp_ah_circle_radius;
|
||||
kpad->value514 = kp_err_dist_min;
|
||||
calibratedDistance = kp_dist_vv1;
|
||||
distanceValue = calibratedDistance / sensorDistance;
|
||||
kpad->value510 = calibratedDistance;
|
||||
distanceValue = kp_dist_vv1 / sensorDistance;
|
||||
kpad->value510 = kp_dist_vv1;
|
||||
kpad->status.release = 0;
|
||||
kpad->status.trig = 0;
|
||||
kpad->status.hold = 0;
|
||||
@@ -856,33 +854,26 @@ static s8 select_1obj_continue(KPADInside* kpad) {
|
||||
}
|
||||
*matchedCandidate = *source;
|
||||
{
|
||||
f32 distance;
|
||||
f32 normY;
|
||||
f32 vertical;
|
||||
f32 directionY;
|
||||
f32 axisX = kpad->horizonTangent.x;
|
||||
f32 normX = kpad->horizonAxis.x;
|
||||
f32 axisY = kpad->horizonTangent.y;
|
||||
f32 normY = kpad->horizonAxis.y;
|
||||
f32 distance = kpad->dpdObjectDistance;
|
||||
f32 horizontal = axisX * normX;
|
||||
f32 vertical = axisY * normX;
|
||||
f32 offsetX;
|
||||
f32 axisY;
|
||||
f32 horizontal;
|
||||
f32 axisX;
|
||||
f32 directionX;
|
||||
f32 normX;
|
||||
f32 directionY;
|
||||
f32 offsetY;
|
||||
f32 tangentY;
|
||||
f32 tangentX;
|
||||
axisX = kpad->horizonTangent.x;
|
||||
normX = kpad->horizonAxis.x;
|
||||
axisY = kpad->horizonTangent.y;
|
||||
normY = kpad->horizonAxis.y;
|
||||
distance = kpad->dpdObjectDistance;
|
||||
horizontal = axisX * normX;
|
||||
vertical = axisY * normX;
|
||||
tangentY = axisY * normY;
|
||||
tangentX = axisX * normY;
|
||||
directionX = horizontal + tangentY;
|
||||
directionY = vertical - tangentX;
|
||||
offsetX = distance * directionX;
|
||||
offsetX = directionX * distance;
|
||||
kpad->dpdObjectDirection.x = directionX;
|
||||
offsetY = distance * directionY;
|
||||
offsetY = directionY * distance;
|
||||
kpad->dpdObjectDirection.y = directionY;
|
||||
if (matchedCandidate == kpad->dpdState.candidates) {
|
||||
kpad->dpdState.candidates[1].x = matchedCandidate->x + offsetX;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -120,11 +120,10 @@ NWC24Err NWC24iMinutesToOSCalendarTime(OSCalendarTime* calendar, s32 minutes) {
|
||||
NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* date) {
|
||||
BOOL isLeapYear;
|
||||
s32 days;
|
||||
const u16 year = date->year;
|
||||
|
||||
isLeapYear = 0;
|
||||
|
||||
calendar->year = year;
|
||||
calendar->year = date->year;
|
||||
calendar->mon = date->month - 1;
|
||||
calendar->mday = date->day;
|
||||
calendar->hour = date->hour;
|
||||
@@ -133,7 +132,7 @@ NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* d
|
||||
calendar->msec = 0;
|
||||
calendar->usec = 0;
|
||||
calendar->yday = date->day + DAYS_OF_YEAR[date->month - 1] - 1;
|
||||
if (((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)) {
|
||||
if (((date->year % 4 == 0 && date->year % 100 != 0) || date->year % 400 == 0)) {
|
||||
isLeapYear = 1;
|
||||
}
|
||||
if (isLeapYear && date->month > 2) {
|
||||
@@ -228,9 +227,8 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
|
||||
for (;;) {
|
||||
s32 previousDays;
|
||||
u8 currentMonth;
|
||||
const u8* parsedMonth = month;
|
||||
previousDays = days;
|
||||
currentMonth = *parsedMonth;
|
||||
currentMonth = *month;
|
||||
if (currentMonth == 2 && IsLeapYear(*year)) {
|
||||
days -= 29;
|
||||
} else {
|
||||
|
||||
@@ -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; }
|
||||
@@ -430,17 +430,14 @@ static NWC24Err CheckMsgObject(const NWC24MsgObjPrivate* msg) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline u32 Base64StorageSize(const u32* byteCount) {
|
||||
return (*byteCount * 4 + 2) / 3 + *byteCount / 57 * 2 + 4;
|
||||
}
|
||||
|
||||
static NWC24Err CheckMsgBoxSpace(const NWC24MsgObjPrivate* msg, NWC24MBoxType type) {
|
||||
u32 total = 0;
|
||||
u32 textSize = 0;
|
||||
s32 index;
|
||||
NWC24Err err;
|
||||
for (index = 0; index < msg->numAttached; ++index) {
|
||||
total += Base64StorageSize(&msg->attachedSize[index]);
|
||||
u32 size = msg->attachedSize[index];
|
||||
total += (size * 4 + 2) / 3 + size / 57 * 2 + 4;
|
||||
}
|
||||
switch (msg->encoding) {
|
||||
case NWC24_ENC_7BIT:
|
||||
@@ -577,7 +574,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 +593,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 +609,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 +638,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 +766,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)
|
||||
|
||||
@@ -817,7 +817,6 @@ done:
|
||||
|
||||
NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 subjectSize, NWC24EncodingRegion region, u16 alternative, u8* work,
|
||||
u32 workSize, NWC24Charset charset, char* charsetName) {
|
||||
const u8* encodedInput = work;
|
||||
u8* second;
|
||||
u32 secondSize;
|
||||
u32 workHalf;
|
||||
@@ -845,7 +844,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
{
|
||||
sourceOffset = subjectLength;
|
||||
@@ -873,7 +872,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
|
||||
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
sourceOffset += subjectLength;
|
||||
total = total + outputLength - 1;
|
||||
|
||||
@@ -138,9 +138,9 @@ int SOGetSockName(int socket, void* address) {
|
||||
int size;
|
||||
int result;
|
||||
s32 rm;
|
||||
NameRequest* request;
|
||||
SOSockAddr* reply;
|
||||
SOSockAddr* addr;
|
||||
SOSockAddr* reply;
|
||||
NameRequest* request;
|
||||
addr=address;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#define BS2_MACH_VOLATILE_DVD_STATE
|
||||
#define BS2_MACH_FIVE_ARG_READ
|
||||
#include "BS2/BS2.h"
|
||||
#include "BS2/BS2BringUp.h"
|
||||
@@ -65,7 +64,7 @@ volatile int CacheFailed = 0;
|
||||
volatile int RegionValid = 0;
|
||||
volatile int NandPending = 0;
|
||||
vu32 CancelNand = 0;
|
||||
vu32 LowReadResult = 0;
|
||||
u32 LowReadResult = 0;
|
||||
u32 CacheCommandComplete = 0;
|
||||
u32 AudioBufferUnconfigured = 0;
|
||||
u64 ResetTime = 0;
|
||||
@@ -578,7 +577,7 @@ void BS2StartGame() {
|
||||
u32 (*entry)(void);
|
||||
|
||||
StartingGame = TRUE;
|
||||
while (CoverBlock.state != DVD_STATE_IDLE) {
|
||||
while (DVDGetCommandBlockStatus(&CoverBlock) != DVD_STATE_IDLE) {
|
||||
}
|
||||
|
||||
BS2Report("BS2StartGame(1)\n");
|
||||
@@ -678,6 +677,8 @@ void BS2StartGame() {
|
||||
LowReadResult = 0;
|
||||
DVDLowReadDiskID(&DiskID, (DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
|
||||
status = LowReadResult;
|
||||
@@ -692,6 +693,8 @@ void BS2StartGame() {
|
||||
LowReadResult = 0;
|
||||
DVDLowRequestError((DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
|
||||
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
|
||||
@@ -726,6 +729,8 @@ disk_done:
|
||||
(DVDLowCallback)callback);
|
||||
}
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
|
||||
status = LowReadResult;
|
||||
@@ -743,6 +748,8 @@ disk_done:
|
||||
LowReadResult = 0;
|
||||
DVDLowRequestError((DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
|
||||
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
|
||||
|
||||
@@ -9,10 +9,14 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
typedef struct UpdateThreadData {
|
||||
OSThread thread;
|
||||
u8 stack[4096];
|
||||
} UpdateThreadData;
|
||||
|
||||
static u32 Flags0[BS2_UPDATE_ENTRY_COUNT] = {0};
|
||||
static u32 Flags1[BS2_UPDATE_ENTRY_COUNT] = {0};
|
||||
static OSThread Thread = {0};
|
||||
static u8 ThreadStack[4096] = {0};
|
||||
static UpdateThreadData Thread = {0};
|
||||
static BS2UpdateHeader UpdateHeader0 ALIGN32 = {0};
|
||||
static BS2UpdateHeader UpdateHeader1 ALIGN32 = {0};
|
||||
|
||||
@@ -35,7 +39,7 @@ static u32 UpdateImportResult = 0;
|
||||
u32 StartUpdate = 0;
|
||||
u32 CancelUpdate = 0;
|
||||
static u32 UpdateProgress = 0;
|
||||
static volatile s32 rc = 0;
|
||||
static s32 rc = 0;
|
||||
static u64 VersionIOS = 0;
|
||||
static u32 VersionMEM2 = 0;
|
||||
static u32 VersionES = 0;
|
||||
@@ -72,9 +76,9 @@ void BS2UpdateInit(void* allocator) {
|
||||
memset(EntriesToImport, 0, 0x40000);
|
||||
memset(Flags1, 0, sizeof(Flags1));
|
||||
BS2Report("Create update thread\n");
|
||||
OSCreateThread(&Thread, UpdateThread, NULL, ThreadStack + sizeof(ThreadStack),
|
||||
sizeof(ThreadStack), 31, 1);
|
||||
OSResumeThread(&Thread);
|
||||
OSCreateThread(&Thread.thread, UpdateThread, NULL, Thread.stack + sizeof(Thread.stack),
|
||||
sizeof(Thread.stack), 31, 1);
|
||||
OSResumeThread(&Thread.thread);
|
||||
}
|
||||
|
||||
static void* UpdateThread(void* argument) {
|
||||
|
||||
@@ -64,7 +64,6 @@ public:
|
||||
class AppearMemoState : public State {
|
||||
public:
|
||||
AppearMemoState() : mTime(0.0f) {}
|
||||
virtual ~AppearMemoState();
|
||||
Manager::StateType getStateType();
|
||||
void create();
|
||||
void init();
|
||||
@@ -1230,8 +1229,6 @@ Manager::StateType EditMemoState::getStateType() {
|
||||
|
||||
inline State::~State() {}
|
||||
|
||||
AppearMemoState::~AppearMemoState() {}
|
||||
|
||||
Manager::StateType AppearMemoState::getStateType() {
|
||||
return Manager::ST_Appearing;
|
||||
}
|
||||
@@ -1245,48 +1242,3 @@ Manager::StateType DispMemoState::getStateType() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data) {
|
||||
mfStartPoint = start;
|
||||
mfEndPoint = end;
|
||||
mfAnimationTime = duration;
|
||||
mfCurrentFrame = 0.0f;
|
||||
mbInAnimation = true;
|
||||
mpAnimObserver = observer;
|
||||
mpData = data;
|
||||
mbSE = false;
|
||||
if (observer) observer->onAnmEvent(AnimObserver::AE_0, data);
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::calc() {
|
||||
if (mbInAnimation) {
|
||||
if (mfCurrentFrame < mfAnimationTime) {
|
||||
mfCurrentFrame = 1.0f + mfCurrentFrame;
|
||||
} else {
|
||||
if (mbInAnimation && mpAnimObserver) {
|
||||
mpAnimObserver->onAnmEvent(AnimObserver::AE_1, mpData);
|
||||
}
|
||||
mbInAnimation = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline f32 textinput::util::Animation::getValue() {
|
||||
return hermiteInterporation(mfCurrentFrame, 0.0f, mfStartPoint, 0.0f, mfAnimationTime, mfEndPoint, 0.0f);
|
||||
}
|
||||
|
||||
inline bool textinput::util::Animation::isActive() {
|
||||
return mbInAnimation;
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::setSEFlag(bool flag) {
|
||||
mbSE = flag;
|
||||
}
|
||||
|
||||
inline bool textinput::util::Animation::isSEFlag() {
|
||||
return mbSE;
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::stop() {
|
||||
mbInAnimation = false;
|
||||
}
|
||||
|
||||
@@ -220,12 +220,13 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
mpPaneManager->setAllComponentTriggerTarget(false);
|
||||
mpPaneManager->setAllBoundingBoxComponentTriggerTarget(true);
|
||||
|
||||
const PaneAnimation* paneTable = csPaneToAnimationInSign;
|
||||
const char* forceName;
|
||||
u32 animationCount;
|
||||
u32 paneIndex = 0;
|
||||
for (; paneIndex < 25; ++paneIndex) {
|
||||
do {
|
||||
AnmPane* pane = NULL;
|
||||
const PaneAnimation& paneInfo = csPaneToAnimationInSign[paneIndex & 0xFFFF];
|
||||
const PaneAnimation& paneInfo = paneTable[paneIndex & 0xFFFF];
|
||||
switch (paneInfo.type) {
|
||||
case 2: {
|
||||
void* paneBuffer = MEMAllocFromAllocator(allocator, sizeof(CellPhoneSignButtonPane));
|
||||
@@ -249,18 +250,18 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
animationCount = paneInfo.animationCount;
|
||||
u16 animationIndex = 0;
|
||||
while (animationIndex < animationCount) {
|
||||
const AnimationFile* const& animation = paneInfo.animations[animationIndex];
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation->name);
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, paneInfo.animations[animationIndex]->name);
|
||||
AnimTransformPane* transform = static_cast<AnimTransformPane*>(
|
||||
getLayout()->CreateAnimTransform(resource, mpMultiArcResourceAccessor));
|
||||
if (forceName != NULL) {
|
||||
pane->forceAddAnimation(allocator, animation->id, transform, forceName, false, true);
|
||||
pane->forceAddAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, forceName, false, true);
|
||||
} else {
|
||||
pane->addAnimation(allocator, animation->id, transform, false, true);
|
||||
pane->addAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, false, true);
|
||||
}
|
||||
++animationIndex;
|
||||
}
|
||||
}
|
||||
++paneIndex;
|
||||
} while (paneIndex < 25);
|
||||
init();
|
||||
}
|
||||
|
||||
|
||||
@@ -111,13 +111,12 @@ void WithZi::init() {
|
||||
|
||||
void WithZi::clearCandidates() {
|
||||
if (mbDictionaryOpen != 0) {
|
||||
u16* const candidates = CandidatesBuffer;
|
||||
mInputLength = 0;
|
||||
mCandidateCount = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(candidates, 0, 0x200);
|
||||
memset(candidates + 0x100, 0, 0x1fe);
|
||||
memset(candidates + 0x200, 0, 0x200);
|
||||
memset(CandidatesBuffer, 0, 0x200);
|
||||
memset(CandidatesBuffer + 0x100, 0, 0x1fe);
|
||||
memset(CandidatesBuffer + 0x200, 0, 0x200);
|
||||
memset(CandidatedWord, 0, 0x1400);
|
||||
memset(&mSearch, 0, sizeof(mSearch) + sizeof(mSearchState));
|
||||
mSearch.language = getPredictLanguage();
|
||||
@@ -126,7 +125,7 @@ void WithZi::clearCandidates() {
|
||||
mSearch.context = 1;
|
||||
mSearch.getOptions = 0x81;
|
||||
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&candidates[0x200]);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
|
||||
mSearch.maxCandidates = 0x28;
|
||||
mSearch.elementCount = 0;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -511,14 +510,12 @@ scanDone:
|
||||
}
|
||||
|
||||
u32 WithZi::setElementBuffer() {
|
||||
u16* elements;
|
||||
u16* candidates;
|
||||
u16 inputCharacter;
|
||||
u32 count = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
|
||||
elements = ElementBuffer;
|
||||
candidates = CandidatesBuffer;
|
||||
u16* elements = ElementBuffer;
|
||||
u16* candidates = CandidatesBuffer;
|
||||
u16 inputCharacter;
|
||||
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
|
||||
u16 index = count;
|
||||
elements[index] = inputCharacter;
|
||||
|
||||
@@ -1557,15 +1557,6 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline math::VEC2 scaledPageOffset(const math::VEC2& source, f32 factor) {
|
||||
const f32 vertical = source.y * factor;
|
||||
const f32 horizontal = source.x * factor;
|
||||
math::VEC2 scaled;
|
||||
scaled.y = vertical;
|
||||
scaled.x = horizontal;
|
||||
return scaled;
|
||||
}
|
||||
|
||||
void Address::onPreviousPage() {
|
||||
switch (mState) {
|
||||
case STATE_NORMAL:
|
||||
@@ -1595,7 +1586,10 @@ namespace ipl {
|
||||
mPage = PAGE_MAX - 1;
|
||||
mNextPageNum = 0;
|
||||
mbCover = false;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), scaledPageOffset(sPageOffset, PAGE_MAX));
|
||||
math::VEC2 offset;
|
||||
offset.y = sPageOffset.y * PAGE_MAX;
|
||||
offset.x = sPageOffset.x * PAGE_MAX;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
mpLayout->getAnim(4)->setAnmType(0);
|
||||
mpLayout->getAnim(4)->play();
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
|
||||
@@ -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: {
|
||||
|
||||
@@ -69,13 +69,6 @@ namespace ipl {
|
||||
SDMemory::~SDMemory() {}
|
||||
|
||||
void SDMemory::create(EGG::Heap* heap, nand::LayoutFile* layoutFile, SDChannelSelect* channelSelect) {
|
||||
s32 cachedTitleCount;
|
||||
const savedata::Manager* saveData;
|
||||
nw4r::lyt::TextBox* textBox;
|
||||
layout::Animator* scrollAnimator;
|
||||
ControlPaneEventHandler* controlEvent;
|
||||
TitlePaneEventHandler* titleEvent;
|
||||
DialogPaneEventHandler* dialogEvent;
|
||||
mpSDChannelSelect = channelSelect;
|
||||
|
||||
mpMainLayout = new layout::Object(heap, layoutFile, "arc", "mn_DialogWindow_ChChange_a.brlyt");
|
||||
@@ -96,7 +89,7 @@ namespace ipl {
|
||||
mpMainLayout->getAnim(5)->initAnmFrame();
|
||||
mpMainLayout->getAnim(8)->initAnmFrame();
|
||||
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
|
||||
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
|
||||
textBox->SetString(System::getMessage(0xB0));
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_05"));
|
||||
textBox->SetString(System::getMessage(0xBB));
|
||||
@@ -150,8 +143,8 @@ namespace ipl {
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_07"));
|
||||
textBox->SetString(System::getMessage(0xBA));
|
||||
|
||||
saveData = System::getSaveData();
|
||||
cachedTitleCount = 0;
|
||||
const savedata::Manager* saveData = System::getSaveData();
|
||||
s32 cachedTitleCount = 0;
|
||||
for (s32 i = 0; i < 48; ++i) {
|
||||
if (saveData->getTitleCacheEntry(i) == 0) {
|
||||
break;
|
||||
@@ -160,12 +153,10 @@ namespace ipl {
|
||||
}
|
||||
if (cachedTitleCount >= 5) {
|
||||
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(false);
|
||||
nw4r::lyt::Pane* expandedButton = mpTitleLayout->FindPaneByName("N_Btn_4");
|
||||
expandedButton->SetVisible(true);
|
||||
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(true);
|
||||
mDisplayMode = 4;
|
||||
} else {
|
||||
nw4r::lyt::Pane* compactButton = mpTitleLayout->FindPaneByName("N_Btn_3");
|
||||
compactButton->SetVisible(true);
|
||||
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(true);
|
||||
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(false);
|
||||
mDisplayMode = 3;
|
||||
}
|
||||
@@ -204,7 +195,7 @@ namespace ipl {
|
||||
mpDialogLayout->getAnim(11)->initAnmFrame();
|
||||
mpDialogLayout->getAnim(8)->initAnmFrame();
|
||||
mpDialogLayout->getAnim(18)->initAnmFrame();
|
||||
scrollAnimator = mpDialogLayout->getAnim(18);
|
||||
layout::Animator* scrollAnimator = mpDialogLayout->getAnim(18);
|
||||
scrollAnimator->initFrame();
|
||||
scrollAnimator->restart();
|
||||
|
||||
@@ -219,7 +210,7 @@ namespace ipl {
|
||||
mpDialogLayout->finishBinding();
|
||||
mpProgressLayout->getAnim(0)->initAnmFrame();
|
||||
|
||||
controlEvent = new ControlPaneEventHandler(this);
|
||||
ControlPaneEventHandler* controlEvent = new ControlPaneEventHandler(this);
|
||||
mpPaneManagers[0] = new gui::PaneManager(controlEvent, mpMainLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[0]->setupScene(mpMainLayout);
|
||||
mpPaneManagers[0]->setAllComponentTriggerTarget(false);
|
||||
@@ -227,7 +218,7 @@ namespace ipl {
|
||||
mpPaneManagers[0]->setTriggerTarget(mpMainLayout->FindPaneByName(sControlPaneNames[i]), true);
|
||||
}
|
||||
|
||||
titleEvent = new TitlePaneEventHandler(this);
|
||||
TitlePaneEventHandler* titleEvent = new TitlePaneEventHandler(this);
|
||||
mpPaneManagers[1] = new gui::PaneManager(titleEvent, mpTitleLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[1]->setupScene(mpTitleLayout);
|
||||
mpPaneManagers[1]->setAllComponentTriggerTarget(false);
|
||||
@@ -242,7 +233,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
dialogEvent = new DialogPaneEventHandler(this);
|
||||
DialogPaneEventHandler* dialogEvent = new DialogPaneEventHandler(this);
|
||||
mpPaneManagers[2] = new gui::PaneManager(dialogEvent, mpDialogLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[2]->setupScene(mpDialogLayout);
|
||||
mpPaneManagers[2]->setAllComponentTriggerTarget(false);
|
||||
|
||||
@@ -335,7 +335,7 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueChannelNotice(u64 titleId, u32 value) {
|
||||
bool SDChannelSelect::enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -344,7 +344,7 @@ namespace ipl {
|
||||
command.type = 10;
|
||||
command.arguments.values[0] = value;
|
||||
command.arguments.values[1] = (u32)&mFirstTitleCount;
|
||||
command.titleId = titleId;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -363,7 +363,7 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueStateNotice(u64 titleId, u32 state) {
|
||||
bool SDChannelSelect::enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -372,7 +372,7 @@ namespace ipl {
|
||||
command.type = 7;
|
||||
command.arguments.values[0] = state;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = titleId;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -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;
|
||||
@@ -3465,11 +3458,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
|
||||
switch (event) {
|
||||
default: return;
|
||||
case 0: break;
|
||||
}
|
||||
{
|
||||
if (event == 0) {
|
||||
if (mpScene->mState == 1) {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_OUT) {
|
||||
if (con != NULL) {
|
||||
@@ -3515,6 +3504,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
@@ -736,7 +736,8 @@ extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene) {
|
||||
if (channel->mStateFlags == 3) {
|
||||
scene->mState = 26;
|
||||
scene->mErrorMessage = 0xaf;
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(scene->mTitleId, reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(0, static_cast<u32>(scene->mTitleId >> 32),
|
||||
static_cast<u32>(scene->mTitleId), reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
scene->mState = 20;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
@@ -825,7 +826,8 @@ extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene) {
|
||||
ESTitleId temporaryTitle = SCGetTmpTitleID();
|
||||
if (temporaryTitle && scene->mTitleId != temporaryTitle) {
|
||||
if (System::isReceiveScheduleStopped()) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(temporaryTitle, 1)) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(0, static_cast<u32>(temporaryTitle >> 32),
|
||||
static_cast<u32>(temporaryTitle), 1)) {
|
||||
scene->mState = 16;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
|
||||
@@ -34,7 +34,7 @@ struct AOSSAccessPoint {
|
||||
u8 bssid[6];
|
||||
u16 capabilities;
|
||||
u32 rateCount;
|
||||
u8 rates[16];
|
||||
u8 rates[12];
|
||||
u32 beaconPeriod;
|
||||
u32 mode;
|
||||
};
|
||||
@@ -84,7 +84,7 @@ void* AOSSi_Alloc(u32 size) {
|
||||
}
|
||||
|
||||
void AOSSi_Free(void* block) {
|
||||
if (releaseMemory) {
|
||||
if (releaseMemory != NULL) {
|
||||
releaseMemory(0, block, 0);
|
||||
}
|
||||
}
|
||||
@@ -129,15 +129,15 @@ int AOSSi_EndLocal(void) {
|
||||
int AOSSi_WLANGetBSSList(struct AOSSAccessPointList** output) {
|
||||
int result = -1;
|
||||
int startupRetries = 0;
|
||||
WDScanParam scan ATTRIBUTE_ALIGN(32);
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
int scanRetries = 0;
|
||||
int cleanupRetries = 0;
|
||||
int unlockRetries = 0;
|
||||
int driver;
|
||||
u8* buffer;
|
||||
int cleanupRetries = 0;
|
||||
int scanRetries = 0;
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
WDScanParam scan;
|
||||
u8 macAddress[6];
|
||||
if (!allocateMemory || !releaseMemory) {
|
||||
if (allocateMemory == NULL || releaseMemory == NULL) {
|
||||
return -1;
|
||||
}
|
||||
driver = NCDLockWirelessDriver();
|
||||
@@ -157,7 +157,7 @@ startup:
|
||||
memcpy(macAddress, info.MAC, 6);
|
||||
}
|
||||
buffer = AOSSi_Alloc(0x3200);
|
||||
if (buffer) {
|
||||
if (buffer != NULL) {
|
||||
memset(buffer, 0, 0x3200);
|
||||
scan.channelBit = info.enableChannel;
|
||||
scan.maxChannelTime = 40;
|
||||
@@ -178,37 +178,37 @@ startup:
|
||||
count = *(u16*)buffer;
|
||||
if (count != 0) {
|
||||
list = AOSSi_Alloc(sizeof(*list) + (count - 1) * sizeof(struct AOSSAccessPoint));
|
||||
if (!list) {
|
||||
if (list == NULL) {
|
||||
result = -1;
|
||||
break;
|
||||
}
|
||||
list->count = count;
|
||||
descriptor = (WDBssDesc*)&buffer[2];
|
||||
for (index = 0; index < count; ++index) {
|
||||
struct AOSSAccessPoint* accessPoint = &list->accessPoints[index];
|
||||
int rate;
|
||||
int rateCount;
|
||||
list->accessPoints[index].ssidLength = descriptor->ssidLength;
|
||||
memcpy(list->accessPoints[index].ssid, descriptor->ssid, 32);
|
||||
list->accessPoints[index].channel = descriptor->channel;
|
||||
memcpy(list->accessPoints[index].bssid, descriptor->bssid, 6);
|
||||
rateCount = 0;
|
||||
int rateCount = 0;
|
||||
accessPoint->ssidLength = descriptor->ssidLength;
|
||||
memcpy(accessPoint->ssid, descriptor->ssid, 32);
|
||||
accessPoint->channel = descriptor->channel;
|
||||
memcpy(accessPoint->bssid, descriptor->bssid, 6);
|
||||
for (rate = 0; rate < 12; ++rate) {
|
||||
if (descriptor->rateSet.support & supportedRates[rate].mask) {
|
||||
list->accessPoints[index].rates[rateCount] = supportedRates[rate].value;
|
||||
accessPoint->rates[rateCount] = supportedRates[rate].value;
|
||||
if (descriptor->rateSet.basic & supportedRates[rate].mask) {
|
||||
list->accessPoints[index].rates[rateCount] |= 128;
|
||||
accessPoint->rates[rateCount] |= 128;
|
||||
}
|
||||
++rateCount;
|
||||
}
|
||||
}
|
||||
list->accessPoints[index].rateCount = rateCount;
|
||||
list->accessPoints[index].beaconPeriod = descriptor->beaconPeriod;
|
||||
accessPoint->rateCount = rateCount;
|
||||
accessPoint->beaconPeriod = descriptor->beaconPeriod;
|
||||
if ((descriptor->capabilities & 3) == 1) {
|
||||
list->accessPoints[index].mode = 1;
|
||||
accessPoint->mode = 1;
|
||||
} else if ((descriptor->capabilities & 3) == 2) {
|
||||
list->accessPoints[index].mode = 2;
|
||||
accessPoint->mode = 2;
|
||||
} else {
|
||||
list->accessPoints[index].mode = 0;
|
||||
accessPoint->mode = 0;
|
||||
}
|
||||
descriptor = (WDBssDesc*)((u16*)descriptor + descriptor->length);
|
||||
}
|
||||
@@ -222,7 +222,7 @@ startup:
|
||||
}
|
||||
if (++scanRetries > 10) {
|
||||
list = AOSSi_Alloc(sizeof(*list));
|
||||
if (!list) {
|
||||
if (list == NULL) {
|
||||
result = -1;
|
||||
break;
|
||||
}
|
||||
@@ -236,29 +236,31 @@ startup:
|
||||
AOSSi_Free(buffer);
|
||||
}
|
||||
cleanup:
|
||||
while (WD_Cleanup() != 0) {
|
||||
if (WD_Cleanup() != 0) {
|
||||
if (cleanupRetries > 10) {
|
||||
result = -1;
|
||||
goto unlock;
|
||||
}
|
||||
++cleanupRetries;
|
||||
AOSSi_SleepMs(10);
|
||||
goto cleanup;
|
||||
}
|
||||
unlock:
|
||||
while (NCDUnlockWirelessDriver(driver) != 0) {
|
||||
if (NCDUnlockWirelessDriver(driver) != 0) {
|
||||
if (unlockRetries > 10) {
|
||||
result = -1;
|
||||
break;
|
||||
return -1;
|
||||
}
|
||||
++unlockRetries;
|
||||
AOSSi_SleepMs(10);
|
||||
goto unlock;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionStatus* status) {
|
||||
int retries = 0;
|
||||
int result;
|
||||
int result = 0;
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
NCDIfConfig* interfaceConfig = &AOSSi_NcdIfConfig;
|
||||
NCDIpConfig* ipConfig;
|
||||
@@ -286,7 +288,6 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
interfaceConfig->netif.wireless.config.manual.ssidLength = (u8)connection->ssidLength;
|
||||
memcpy(interfaceConfig->netif.wireless.config.manual.ssid, connection->ssid, connection->ssidLength);
|
||||
result = 0;
|
||||
ipConfig = &AOSSi_NcdIpConfig;
|
||||
memset(ipConfig, 0, sizeof(*ipConfig));
|
||||
ipConfig->adjust.maxTransferUnit = 1300;
|
||||
@@ -320,14 +321,13 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
}
|
||||
if (result == 0) {
|
||||
u32 ssidLength;
|
||||
status->connected = 1;
|
||||
if (WD_GetInfo(&info) == 0) {
|
||||
status->channel = info.channel;
|
||||
}
|
||||
ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
|
||||
status->ssidLength = ssidLength;
|
||||
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid, ssidLength);
|
||||
status->ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
|
||||
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid,
|
||||
interfaceConfig->netif.wireless.config.manual.ssidLength);
|
||||
} else {
|
||||
status->connected = 0;
|
||||
}
|
||||
|
||||
@@ -763,7 +763,7 @@ unlock_driver:
|
||||
int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
|
||||
u32* changedIndex) {
|
||||
u32 previousIndex;
|
||||
u32 currentIndex;
|
||||
u32 currentIndex = 0;
|
||||
int found = 0;
|
||||
int result = 0;
|
||||
u32 ssidLength;
|
||||
@@ -774,7 +774,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
AtermApRecord* previousRecord = previousRecords->entries;
|
||||
|
||||
|
||||
currentIndex = 0;
|
||||
for (; currentIndex < currentRecords->count; currentIndex++) {
|
||||
AtermSsidBuffer ssidName;
|
||||
ssidName.clear.word0 = 0;
|
||||
@@ -817,6 +816,8 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
int currentHasAoss;
|
||||
int previousHasAoss;
|
||||
|
||||
previousHasAoss = 0;
|
||||
currentHasAoss = 0;
|
||||
aossSsidName.clear.word0 = 0;
|
||||
aossSsidName.clear.word1 = 0;
|
||||
aossSsidName.clear.word2 = 0;
|
||||
@@ -826,8 +827,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
aossSsidName.clear.word6 = 0;
|
||||
aossSsidName.clear.word7 = 0;
|
||||
aossSsidName.clear.finalWord = 0;
|
||||
currentHasAoss = 0;
|
||||
previousHasAoss = 0;
|
||||
|
||||
currentRecord = currentRecords->entries;
|
||||
previousRecord = previousRecords->entries;
|
||||
@@ -1647,10 +1646,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));
|
||||
@@ -1874,13 +1870,13 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
|
||||
union { u64 value; u8 bytes[8]; } counter;
|
||||
u32 initialValue[2];
|
||||
u8* outputBlock;
|
||||
s32 blockIndex;
|
||||
s32 blockOffset;
|
||||
u8* destinationBytes;
|
||||
const u8* sourceBytes;
|
||||
s32 pass;
|
||||
s32 blockCount;
|
||||
u32 rounds;
|
||||
s32 blockOffset;
|
||||
s32 blockCount;
|
||||
s32 pass;
|
||||
s32 blockIndex;
|
||||
int result = 1;
|
||||
|
||||
initialValue[1] = 0xA6A6A6A6;
|
||||
@@ -1899,11 +1895,11 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
|
||||
memcpy(destinationBytes + 8, sourceBytes, length);
|
||||
memcpy(block.bytes, initialValue, sizeof(initialValue));
|
||||
for (pass = 0; pass < 6; pass++) {
|
||||
for (blockIndex = 1, blockOffset = 8; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
|
||||
for (blockOffset = 8, blockIndex = 1; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -914,8 +914,7 @@ void CArGBAOdh::cdj_c_setQuantizationTable(SArCDJ_OdhMaster* master, u32 quality
|
||||
for (i = 0; i < 64; i++) {
|
||||
temp = ((const u16*)gArAANScales)[i];
|
||||
temp *= quantization[table * 64 + i];
|
||||
temp = 0x4000000 / temp;
|
||||
master->quantizationTables[table * 64 + i] = temp;
|
||||
master->quantizationTables[table * 64 + i] = 0x4000000 / temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1194,9 +1193,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 +1223,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 +1243,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
@@ -3498,446 +3498,3 @@ Continuation final data recheck: exact ELF names are extab/extabindex without le
|
||||
Continuation final validation starting: clean non-quick all-six gate, owned source diff only PF directory implementation and focus vector specialization; four exact commits d4976af8,0035e899,d5de7189,9170cd3e. Full open list audited8 functions, each>=3 logged distinct successful forms. No speculative FA/zko/keyboard source/header/config changes retained; preexisting untracked reports untouched.
|
||||
Continuation final Ax count discrepancy independently proven after clean build: checkFile__19AxAdpcmSimplePlayerFPvUl has identical372 raw function bytes, but gate odiff emits different CR1 branch display targets. Objdiff13/13/code3088/data6476/DOL linked100%; raw instruction count12/13 is the existing disassembly-normalization false negative, not an open function or a new match. [(31, "('beq', -951)", "('beq', -747)"), (69, "('ble', -1103)", "('ble', -899)")]
|
||||
Continuation final full non-quick all-six GATE PASS: build/DOL exact26116613f624061ba99c8d1a299aaa6efa85670d, pools identical, regressions0,forbidden0,readability0. PF35/38→38/38,code11704→18976,data40/40; focus88/89→89/89,code19772→20332,data2576/2576. Eight remaining names re-listed from fresh report and all have>=3 successful distinct logged forms. Detailed exact before/after, all remaining names/scores/structural reasons, data relocation proof and verbatim unit lines in fz1.next.report.md; full transcript fz1.next.final-gate.txt.
|
||||
|
||||
## Round2 continuation 2026-10-02, new leaves after #808
|
||||
Round2 initial all-seven quick GATE PASS, clean tracked tree, HEAD d6997b0cb9e97fbd2befc07a85c87c74d625f068, origin dce9e0732de42eec307e3af3fef64b6c57b20fc2. DOL hash exact; regressions0, forbidden0, readability0. Current report corrects CHANSVm starting count to221/233. AOSS raw gate15/21 vs objdiff16/21 will be audited independently. Prior untracked artifacts preserved.
|
||||
Round2 baseline libs/RVL_SDK/src/fa/api/FAAttach {'fuzzy_match_percent': 99.36, 'total_code': '500', 'total_data': '240', 'matched_data': '240', 'matched_data_percent': 100.0, 'total_functions': 1, 'total_units': 1}
|
||||
Round2 first pool libs/RVL_SDK/src/fa/api/FAAttach: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Round2 baseline libs/RVLMiddleware/eZiText/src/clib/zkokeyp {'fuzzy_match_percent': 98.65385, 'total_code': '5200', 'matched_code': '332', 'matched_code_percent': 6.3846154, 'total_data': '180', 'matched_data': '96', 'matched_data_percent': 53.333336, 'total_functions': 7, 'matched_functions': 1, 'matched_functions_percent': 14.285715, 'total_units': 1}
|
||||
Round2 first pool libs/RVLMiddleware/eZiText/src/clib/zkokeyp: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Round2 baseline src/system/iplKeyboard {'fuzzy_match_percent': 98.73506, 'total_code': '6024', 'matched_code': '4752', 'matched_code_percent': 78.88447, 'total_data': '1184', 'matched_data': '1184', 'matched_data_percent': 100.0, 'total_functions': 32, 'matched_functions': 31, 'matched_functions_percent': 96.875, 'total_units': 1}
|
||||
Round2 first pool src/system/iplKeyboard: POOL IDENTICAL up to 28 (mine=28 base=28)
|
||||
Round2 baseline src/BS2/BS2Update {'fuzzy_match_percent': 91.660416, 'total_code': '4052', 'matched_code': '112', 'matched_code_percent': 2.7640672, 'total_data': '10488', 'matched_data': '10488', 'matched_data_percent': 100.0, 'total_functions': 10, 'matched_functions': 8, 'matched_functions_percent': 80.0, 'total_units': 1}
|
||||
Round2 first pool src/BS2/BS2Update: POOL IDENTICAL up to 55 (mine=55 base=55)
|
||||
Round2 baseline src/channelScript/CHANSVm {'fuzzy_match_percent': 99.364426, 'total_code': '53564', 'matched_code': '37608', 'matched_code_percent': 70.211334, 'total_data': '6904', 'matched_data': '6904', 'matched_data_percent': 100.0, 'total_functions': 233, 'matched_functions': 221, 'matched_functions_percent': 94.849785, 'total_units': 1}
|
||||
Round2 first pool src/channelScript/CHANSVm: POOL IDENTICAL up to 125 (mine=125 base=125)
|
||||
Round2 baseline src/BS2/BS2Mach {'fuzzy_match_percent': 97.82756, 'total_code': '16980', 'matched_code': '4940', 'matched_code_percent': 29.093052, 'total_data': '158528', 'matched_data': '155504', 'matched_data_percent': 98.092445, 'total_functions': 29, 'matched_functions': 24, 'matched_functions_percent': 82.75862, 'total_units': 1}
|
||||
Round2 first pool src/BS2/BS2Mach: POOL IDENTICAL up to 91 (mine=91 base=91)
|
||||
Round2 baseline src/scene/setting/AOSS {'fuzzy_match_percent': 96.777916, 'total_code': '16192', 'matched_code': '6436', 'matched_code_percent': 39.748024, 'total_data': '3928', 'matched_data': '3928', 'matched_data_percent': 100.0, 'total_functions': 21, 'matched_functions': 16, 'matched_functions_percent': 76.190475, 'total_units': 1}
|
||||
Round2 first pool src/scene/setting/AOSS: POOL IDENTICAL up to 1 (mine=1 base=1)
|
||||
Round2 FAAttach origin fetched; source identical to origin/main and not exact. Pool identical/data240/240; symbol0x815e7c84 size0x1f4 ends before nextfunction. Target/source frame0x80 and125/125, branches/helpers/storage aligned; only10 operands at drive-index conversion/table-base allocation. Actual pdm_api callee uses u16 partition index, source declaration u32. No proven volatile local: request reload occurs after external media call, not immediate store. Test const input/read-only table helper boundaries and true prototype before declaration search.
|
||||
Round2 FAAttach | const NAND path view | sha256=608271445100 | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach | correct partition index prototype | sha256=2e04e890e6f6 | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach | byte-sized device ABI | sha256=d215744d9a3c | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach | attached table const view | sha256=51ab8bbe6cfd | structural/exact=(9, 58); instructions=126/125; 14: ('b', '416') -> ('b', '412'); 18: ('b', '400') -> ('b', '396'); 24: ('b', '376') -> ('b', '372'); 31: ('b', '348') -> ('b', '344'); 42: ('b', '304') -> ('b', '300'); 50: ('b', '272') -> ('b', '268'); 73: ('b', '180') -> ('b', '176'); 74: ('lwz', 'r6, 0x10(r1)') -> ('lbz', 'r0, 8(r31)'); 76: ('lbz', 'r0, 8(r6)') -> ('extsb', 'r3, r0'); 77: ('extsb', 'r3, r0') -> ('addi', 'r0, r3, -0x41'); 78: ('addi', 'r5, r3, -0x41') -> ('bgt', '120'); 79: ('bgt', '120') -> ('lis', 'r5, 0')
|
||||
Round2 FAAttach | attached table const reference view | sha256=0025e29eeeab | BUILD FAILED & "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/fa/api/FAAttach.d build/43U/src/libs/RVL_SDK/src/fa/api/FAAttach.d ### mwcceppc.exe Compiler: # File: libs\RVL_SDK\src\fa\api\FAAttach.c # ------------------------------------------- # 83: attached = request.table; # Error: ^ # (10179) illegal assignment to constant # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 FAAttach | const input view for drive only | sha256=481ef68be8c4 | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach | disk loaded as independent genuine value before table writes | sha256=7842e28e8f52 | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach | same-index stores owned by read-only inline table helper | sha256=e0d2e4da684f | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach | explicit native unsigned character displacement | sha256=9855b6dd0768 | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach | drive character local and delayed index | sha256=994248c3fc80 | structural/exact=(0, 10); instructions=125/125; 77: ('addi', 'r5, r3, -0x41') -> ('addi', 'r0, r3, -0x41'); 79: ('lis', 'r4, 0') -> ('lis', 'r5, 0'); 80: ('lwz', 'r0, 8(r1)') -> ('lwz', 'r3, 8(r1)'); 81: ('slwi', 'r5, r5, 2') -> ('slwi', 'r6, r0, 2'); 82: ('lis', 'r3, 0') -> ('lis', 'r4, 0'); 83: ('addi', 'r4, r4, 0') -> ('addi', 'r5, r5, 0'); 85: ('stwx', 'r0, r4, r5') -> ('stwx', 'r3, r5, r6'); 86: ('addi', 'r3, r3, 0') -> ('addi', 'r4, r4, 0'); 88: ('stwx', 'r0, r3, r5') -> ('stwx', 'r0, r4, r6'); 110: ('slwi', 'r5, r5, 2') -> ('slwi', 'r5, r0, 2')
|
||||
Round2 FAAttach: batch 9 successful distinct builds/10 forms, best=(0, 10).
|
||||
Round2 FAAttach ten compiled context/prototype/type forms no improvement, index allocation only. Declsearch last60 cap (actual23 evaluations), no improvement; original readable source restored.
|
||||
Round2 Zi8_8148302C origin fetched and source unchanged; pool first already identical. Frame0x30/count59 aligned; six operands exchange work parameter r29/r27 with loaded table value. Actual key char bytes7/8 of9-byte entry, no layout overlap or forced reload. Test const table/typed record/narrow value/helper ownership, then declsearch.
|
||||
Round2 Zi8_8148302C | read-only Korean table input | sha256=2891a6c41b97 | structural/exact=(0, 6); instructions=59/59; 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 12: ('mr', 'r5, r27') -> ('mr', 'r5, r29'); 32: ('clrlwi', 'r29, r0, 0x10') -> ('clrlwi', 'r27, r0, 0x10'); 34: ('cmplw', 'r29, r0') -> ('cmplw', 'r27, r0'); 38: ('mr', 'r4, r27') -> ('mr', 'r4, r29'); 49: ('mr', 'r4, r27') -> ('mr', 'r4, r29')
|
||||
Round2 Zi8_8148302C | read-only typed Korean table pointer | sha256=db32ca9de5b0 | structural/exact=(6, 50); instructions=58/59; 6: ('stw', 'r4, 0xc(r1)') -> ('mr', 'r30, r4'); 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 8: ('lwz', 'r30, 0xc(r1)') -> ('li', 'r3, 0x12'); 9: ('li', 'r3, 0x12') -> ('clrlwi', 'r3, r3, 0x18'); 10: ('clrlwi', 'r3, r3, 0x18') -> ('li', 'r4, 9'); 11: ('li', 'r4, 9') -> ('clrlwi', 'r4, r4, 0x18'); 12: ('clrlwi', 'r4, r4, 0x18') -> ('mr', 'r5, r29'); 13: ('mr', 'r5, r27') -> ('bl', '0'); 14: ('bl', '0') -> ('mr', 'r28, r3'); 15: ('mr', 'r28, r3') -> ('li', 'r31, 0'); 16: ('li', 'r31, 0') -> ('b', '108'); 17: ('b', '100') -> ('clrlwi', 'r0, r31, 0x10')
|
||||
Round2 Zi8_8148302C | narrow native table value with native loop counter | sha256=0bc0a90aa49b | structural/exact=(0, 6); instructions=59/59; 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 12: ('mr', 'r5, r27') -> ('mr', 'r5, r29'); 32: ('clrlwi', 'r29, r0, 0x10') -> ('clrlwi', 'r27, r0, 0x10'); 34: ('cmplw', 'r29, r0') -> ('cmplw', 'r27, r0'); 38: ('mr', 'r4, r27') -> ('mr', 'r4, r29'); 49: ('mr', 'r4, r27') -> ('mr', 'r4, r29')
|
||||
Round2 Zi8_8148302C | lexical value local owned by scan body | sha256=25088f4ee783 | structural/exact=(6, 57); instructions=62/59; 5: ('mr', 'r31, r1') -> ('sth', 'r3, 8(r1)'); 6: ('sth', 'r3, 8(r31)') -> ('mr', 'r30, r4'); 7: ('mr', 'r29, r4') -> ('mr', 'r29, r5'); 8: ('mr', 'r26, r5') -> ('li', 'r3, 0x12'); 9: ('li', 'r3, 0x12') -> ('clrlwi', 'r3, r3, 0x18'); 10: ('clrlwi', 'r3, r3, 0x18') -> ('li', 'r4, 9'); 11: ('li', 'r4, 9') -> ('clrlwi', 'r4, r4, 0x18'); 12: ('clrlwi', 'r4, r4, 0x18') -> ('mr', 'r5, r29'); 13: ('mr', 'r5, r26') -> ('bl', '0'); 14: ('bl', '0') -> ('mr', 'r28, r3'); 15: ('mr', 'r28, r3') -> ('li', 'r31, 0'); 16: ('li', 'r30, 0') -> ('b', '108')
|
||||
Round2 Zi8_8148302C | table-key-first equality | sha256=f963182c8ffe | structural/exact=(0, 6); instructions=59/59; 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 12: ('mr', 'r5, r27') -> ('mr', 'r5, r29'); 32: ('clrlwi', 'r29, r0, 0x10') -> ('clrlwi', 'r27, r0, 0x10'); 34: ('cmplw', 'r0, r29') -> ('cmplw', 'r27, r0'); 38: ('mr', 'r4, r27') -> ('mr', 'r4, r29'); 49: ('mr', 'r4, r27') -> ('mr', 'r4, r29')
|
||||
Round2 Zi8_8148302C: batch 5 successful distinct builds/5 forms, best=(0, 6).
|
||||
Round2 Zi8_81483264 source matches origin, frame0x20/count41 aligned, metadata/running byte-index r31/r30 swapped; no missing operations or store-reload/local volatility evidence. Test native loop values with byte addressing and true mutable/const metadata views.
|
||||
Round2 Zi8_81483264 | native ziU32 loop with byte-range addressing | sha256=12af37593e6d | structural/exact=(0, 8); instructions=41/41; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 8: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 17: ('li', 'r31, 0') -> ('li', 'r30, 0'); 20: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 21: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 24: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 25: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 26: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_81483264 | native ziS32 loop with byte-range addressing | sha256=cbf8c0525070 | structural/exact=(0, 8); instructions=41/41; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 8: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 17: ('li', 'r31, 0') -> ('li', 'r30, 0'); 20: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 21: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 24: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 25: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 26: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_81483264 | native ziU16 loop with byte-range addressing | sha256=655d500c01d2 | structural/exact=(0, 8); instructions=41/41; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 8: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 17: ('li', 'r31, 0') -> ('li', 'r30, 0'); 20: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 21: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 24: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 25: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 26: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_81483264 | mutable metadata parameter pointer | sha256=6e4e334b9dd7 | structural/exact=(0, 8); instructions=41/41; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 8: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 17: ('li', 'r31, 0') -> ('li', 'r30, 0'); 20: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 21: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 24: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 25: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 26: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_81483264 | unsigned zero literal store | sha256=943c8b977aff | structural/exact=(0, 8); instructions=41/41; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 8: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 17: ('li', 'r31, 0') -> ('li', 'r30, 0'); 20: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 21: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 24: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 25: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 26: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_81483264 | metadata copy owned by body | sha256=1e0466f3630a | structural/exact=(2, 35); instructions=42/41; 6: ('stw', 'r3, 8(r1)') -> ('mr', 'r31, r3'); 8: ('lwz', 'r31, 8(r1)') -> ('lwz', 'r0, 0x24(r31)'); 9: ('lwz', 'r0, 0x24(r31)') -> ('cmpwi', 'r0, 0'); 10: ('cmpwi', 'r0, 0') -> ('bne', '28'); 11: ('bne', '28') -> ('li', 'r3, 0x164'); 12: ('li', 'r3, 0x164') -> ('clrlwi', 'r3, r3, 0x10'); 13: ('clrlwi', 'r3, r3, 0x10') -> ('mr', 'r4, r29'); 14: ('mr', 'r4, r29') -> ('bl', '0'); 15: ('bl', '0') -> ('li', 'r3, 1'); 16: ('li', 'r3, 1') -> ('b', '72'); 17: ('b', '72') -> ('li', 'r30, 0'); 18: ('li', 'r30, 0') -> ('b', '28')
|
||||
Round2 Zi8_81483264: batch 6 successful distinct builds/6 forms, best=(0, 8).
|
||||
Round2 Zi8_81483308 origin fetched unchanged, 58/58/frame0x20; count pointer/live loop-value register exchange only9 diffs, scratch field layout confirmed0x24 and max count0x1c; test const metadata/native counter/explicit count increment and loop form. Store-byte then clrlwi uses same result without reload; no definition-level volatile proof.
|
||||
Round2 Zi8_81483308 | read-only metadata with mutable scratch | sha256=41a54b1afbc1 | structural/exact=(0, 9); instructions=58/58; 7: ('mr', 'r29, r5') -> ('mr', 'r30, r5'); 22: ('li', 'r30, 0') -> ('li', 'r29, 0'); 26: ('clrlwi', 'r0, r30, 0x18') -> ('clrlwi', 'r0, r29, 0x18'); 33: ('addi', 'r30, r30, 1') -> ('addi', 'r29, r29, 1'); 34: ('clrlwi', 'r3, r30, 0x18') -> ('clrlwi', 'r3, r29, 0x18'); 39: ('lbz', 'r0, 0(r29)') -> ('lbz', 'r0, 0(r30)'); 42: ('lbz', 'r3, 0(r29)') -> ('lbz', 'r3, 0(r30)'); 44: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)'); 50: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)')
|
||||
Round2 Zi8_81483308 | native ziU32 scan with byte-range access | sha256=8ea4bba87fbf | structural/exact=(0, 9); instructions=58/58; 7: ('mr', 'r29, r5') -> ('mr', 'r30, r5'); 22: ('li', 'r30, 0') -> ('li', 'r29, 0'); 26: ('clrlwi', 'r0, r30, 0x18') -> ('clrlwi', 'r0, r29, 0x18'); 33: ('addi', 'r30, r30, 1') -> ('addi', 'r29, r29, 1'); 34: ('clrlwi', 'r3, r30, 0x18') -> ('clrlwi', 'r3, r29, 0x18'); 39: ('lbz', 'r0, 0(r29)') -> ('lbz', 'r0, 0(r30)'); 42: ('lbz', 'r3, 0(r29)') -> ('lbz', 'r3, 0(r30)'); 44: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)'); 50: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)')
|
||||
Round2 Zi8_81483308 | native ziS32 scan with byte-range access | sha256=8a54c51def5f | structural/exact=(0, 9); instructions=58/58; 7: ('mr', 'r29, r5') -> ('mr', 'r30, r5'); 22: ('li', 'r30, 0') -> ('li', 'r29, 0'); 26: ('clrlwi', 'r0, r30, 0x18') -> ('clrlwi', 'r0, r29, 0x18'); 33: ('addi', 'r30, r30, 1') -> ('addi', 'r29, r29, 1'); 34: ('clrlwi', 'r3, r30, 0x18') -> ('clrlwi', 'r3, r29, 0x18'); 39: ('lbz', 'r0, 0(r29)') -> ('lbz', 'r0, 0(r30)'); 42: ('lbz', 'r3, 0(r29)') -> ('lbz', 'r3, 0(r30)'); 44: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)'); 50: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)')
|
||||
Round2 Zi8_81483308 | count increment separated from wrap condition | sha256=4aafa1b25da8 | structural/exact=(3, 16); instructions=59/58; 21: ('b', '128') -> ('b', '124'); 32: ('b', '84') -> ('b', '80'); 45: ('lbz', 'r0, 0(r30)') -> ('clrlwi', 'r3, r0, 0x18'); 46: ('clrlwi', 'r3, r0, 0x18') -> ('lbz', 'r0, 0x1c(r31)'); 47: ('lbz', 'r0, 0x1c(r31)') -> ('cmplw', 'r3, r0'); 48: ('cmplw', 'r3, r0') -> ('blt', '12'); 49: ('blt', '12') -> ('li', 'r0, 0'); 50: ('li', 'r0, 0') -> ('stb', 'r0, 0(r30)'); 51: ('stb', 'r0, 0(r30)') -> ('li', 'r3, 0'); 52: ('li', 'r3, 0') -> ('addi', 'r11, r1, 0x20'); 53: ('addi', 'r11, r1, 0x20') -> ('bl', '0'); 54: ('bl', '0') -> ('lwz', 'r0, 0x24(r1)')
|
||||
Round2 Zi8_81483308 | deduplicating scan while-loop | sha256=24371db878a4 | structural/exact=(0, 9); instructions=58/58; 7: ('mr', 'r29, r5') -> ('mr', 'r30, r5'); 22: ('li', 'r30, 0') -> ('li', 'r29, 0'); 26: ('clrlwi', 'r0, r30, 0x18') -> ('clrlwi', 'r0, r29, 0x18'); 33: ('addi', 'r30, r30, 1') -> ('addi', 'r29, r29, 1'); 34: ('clrlwi', 'r3, r30, 0x18') -> ('clrlwi', 'r3, r29, 0x18'); 39: ('lbz', 'r0, 0(r29)') -> ('lbz', 'r0, 0(r30)'); 42: ('lbz', 'r3, 0(r29)') -> ('lbz', 'r3, 0(r30)'); 44: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)'); 50: ('stb', 'r0, 0(r29)') -> ('stb', 'r0, 0(r30)')
|
||||
Round2 Zi8_81483308: batch 5 successful distinct builds/5 forms, best=(0, 9).
|
||||
Round2 Zi8_814833F0 fetch/remote no source changes; frame0x20/count47 equal,8 metadata/index register differences; volatile not warranted. Three native pointer/type forms plus condition/while form, then declsearch score-only; leading declaration group onlyone real variable so no artificial extra declarations introduced for permutation.
|
||||
Round2 Zi8_814833F0 | mutable metadata input view | sha256=6daf3a59140a | structural/exact=(0, 8); instructions=47/47; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 13: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 22: ('li', 'r31, 0') -> ('li', 'r30, 0'); 26: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 27: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 34: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 35: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 36: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_814833F0 | native ziU32 scan byte addressing | sha256=fd1d52cd56a1 | structural/exact=(0, 8); instructions=47/47; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 13: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 22: ('li', 'r31, 0') -> ('li', 'r30, 0'); 26: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 27: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 34: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 35: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 36: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_814833F0 | native ziS32 scan byte addressing | sha256=c83d8e8362f0 | structural/exact=(0, 8); instructions=47/47; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 13: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 22: ('li', 'r31, 0') -> ('li', 'r30, 0'); 26: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 27: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 34: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 35: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 36: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_814833F0 | loop limit first operand | sha256=32131520e148 | structural/exact=(6, 21); instructions=48/47; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 13: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 21: ('b', '80') -> ('b', '76'); 22: ('li', 'r31, 0') -> ('li', 'r30, 0'); 26: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 27: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 33: ('b', '32') -> ('b', '28'); 34: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 35: ('lbz', 'r0, 0x1c(r30)') -> ('clrlwi', 'r3, r30, 0x18'); 36: ('clrlwi', 'r3, r0, 0x18') -> ('lbz', 'r0, 0x1c(r31)'); 37: ('clrlwi', 'r0, r31, 0x18') -> ('cmplw', 'r3, r0'); 38: ('cmplw', 'r3, r0') -> ('blt', '-56')
|
||||
Round2 Zi8_814833F0 | loop as while preserving key-first load | sha256=2a6ab7806faf | structural/exact=(0, 8); instructions=47/47; 6: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 13: ('lwz', 'r0, 0x24(r30)') -> ('lwz', 'r0, 0x24(r31)'); 22: ('li', 'r31, 0') -> ('li', 'r30, 0'); 26: ('lwz', 'r3, 0x24(r30)') -> ('lwz', 'r3, 0x24(r31)'); 27: ('clrlwi', 'r0, r31, 0x18') -> ('clrlwi', 'r0, r30, 0x18'); 34: ('addi', 'r31, r31, 1') -> ('addi', 'r30, r30, 1'); 35: ('clrlwi', 'r3, r31, 0x18') -> ('clrlwi', 'r3, r30, 0x18'); 36: ('lbz', 'r0, 0x1c(r30)') -> ('lbz', 'r0, 0x1c(r31)')
|
||||
Round2 Zi8_814833F0: batch 5 successful distinct builds/5 forms, best=(0, 8).
|
||||
Round2 Zi8_814834AC origin refreshed unchanged. Frame0x50 target343/source344: zero-word/lastbyte assignment produces one extra narrowing; target uses same literalzero r0 for stw1c/stb20. Direct typed array character reads add table before offset while target adds offset first. Candidate cursor/work pointer allocation is21 residual differences. Investigate packed-key initialization/real byte-width/type and offset-first record address before register permutation. No immediate re-read proof for volatile.
|
||||
Round2 declaration checks z1 six evaluations no gain; z2/z3 initial score-only failed because ninja not inPATH, rerun explicitly NINJA succeeded(0,8)/(0,9); z4 score(0,8). Single genuine leading declaration in z2,z3,z4 precludes meaningful permutation; no synthetic declarations added.
|
||||
Round2 Zi8_814834AC | five packed key bytes assigned independently | sha256=9f09980ac48a | structural/exact=(8, 328); instructions=350/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 15: ('stb', 'r0, 0x1c(r1)') -> ('stw', 'r0, 0x1c(r1)'); 16: ('li', 'r0, 0') -> ('stb', 'r0, 0x20(r1)'); 17: ('stb', 'r0, 0x1d(r1)') -> ('li', 'r3, 0x64'); 18: ('li', 'r0, 0') -> ('clrlwi', 'r3, r3, 0x10'); 19: ('stb', 'r0, 0x1e(r1)') -> ('mr', 'r4, r26'); 20: ('li', 'r0, 0') -> ('bl', '0'); 21: ('stb', 'r0, 0x1f(r1)') -> ('lbz', 'r0, 0xc(r31)'); 22: ('li', 'r0, 0') -> ('cmpwi', 'r0, 0'); 23: ('stb', 'r0, 0x20(r1)') -> ('bne', '256'); 24: ('li', 'r3, 0x64') -> ('lhz', 'r3, 0(r29)'); 25: ('clrlwi', 'r3, r3, 0x10') -> ('lbz', 'r0, 0(r30)')
|
||||
Round2 Zi8_814834AC | five packed key bytes share literal-zero chain | sha256=d2939318e85e | structural/exact=(5, 329); instructions=346/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 15: ('stb', 'r0, 0x20(r1)') -> ('stw', 'r0, 0x1c(r1)'); 16: ('stb', 'r0, 0x1f(r1)') -> ('stb', 'r0, 0x20(r1)'); 17: ('stb', 'r0, 0x1e(r1)') -> ('li', 'r3, 0x64'); 18: ('stb', 'r0, 0x1d(r1)') -> ('clrlwi', 'r3, r3, 0x10'); 19: ('stb', 'r0, 0x1c(r1)') -> ('mr', 'r4, r26'); 20: ('li', 'r3, 0x64') -> ('bl', '0'); 21: ('clrlwi', 'r3, r3, 0x10') -> ('lbz', 'r0, 0xc(r31)'); 22: ('mr', 'r4, r25') -> ('cmpwi', 'r0, 0'); 23: ('bl', '0') -> ('bne', '256'); 24: ('lbz', 'r0, 0xc(r31)') -> ('lhz', 'r3, 0(r29)'); 25: ('cmpwi', 'r0, 0') -> ('lbz', 'r0, 0(r30)')
|
||||
Round2 Zi8_814834AC | word/last-byte assignment separated | sha256=39acce3774c9 | structural/exact=(1, 329); instructions=344/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 16: ('li', 'r0, 0') -> ('stb', 'r0, 0x20(r1)'); 17: ('stb', 'r0, 0x20(r1)') -> ('li', 'r3, 0x64'); 18: ('li', 'r3, 0x64') -> ('clrlwi', 'r3, r3, 0x10'); 19: ('clrlwi', 'r3, r3, 0x10') -> ('mr', 'r4, r26'); 20: ('mr', 'r4, r25') -> ('bl', '0'); 21: ('bl', '0') -> ('lbz', 'r0, 0xc(r31)'); 22: ('lbz', 'r0, 0xc(r31)') -> ('cmpwi', 'r0, 0'); 23: ('cmpwi', 'r0, 0') -> ('bne', '256'); 24: ('bne', '256') -> ('lhz', 'r3, 0(r29)'); 25: ('lhz', 'r3, 0(r29)') -> ('lbz', 'r0, 0(r30)'); 26: ('lbz', 'r0, 0(r30)') -> ('cmpw', 'r3, r0')
|
||||
Round2 Zi8_814834AC | signed packed-key native first word | sha256=21be1bac081e | structural/exact=(1, 329); instructions=344/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 16: ('clrlwi', 'r0, r0, 0x18') -> ('stb', 'r0, 0x20(r1)'); 17: ('stb', 'r0, 0x20(r1)') -> ('li', 'r3, 0x64'); 18: ('li', 'r3, 0x64') -> ('clrlwi', 'r3, r3, 0x10'); 19: ('clrlwi', 'r3, r3, 0x10') -> ('mr', 'r4, r26'); 20: ('mr', 'r4, r25') -> ('bl', '0'); 21: ('bl', '0') -> ('lbz', 'r0, 0xc(r31)'); 22: ('lbz', 'r0, 0xc(r31)') -> ('cmpwi', 'r0, 0'); 23: ('cmpwi', 'r0, 0') -> ('bne', '256'); 24: ('bne', '256') -> ('lhz', 'r3, 0(r29)'); 25: ('lhz', 'r3, 0(r29)') -> ('lbz', 'r0, 0(r30)'); 26: ('lbz', 'r0, 0(r30)') -> ('cmpw', 'r3, r0')
|
||||
Round2 Zi8_814834AC | packed-key clearing from actual zero loop index | sha256=700ff95a9d7e | structural/exact=(2, 23); instructions=343/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 14: ('stw', 'r27, 0x1c(r1)') -> ('li', 'r0, 0'); 15: ('clrlwi', 'r0, r27, 0x18') -> ('stw', 'r0, 0x1c(r1)'); 19: ('mr', 'r4, r25') -> ('mr', 'r4, r26'); 35: ('mr', 'r6, r25') -> ('mr', 'r6, r26'); 56: ('mr', 'r6, r25') -> ('mr', 'r6, r26'); 97: ('mr', 'r5, r25') -> ('mr', 'r5, r26'); 103: ('mr', 'r5, r25') -> ('mr', 'r5, r26'); 111: ('mr', 'r4, r25') -> ('mr', 'r4, r26'); 120: ('mr', 'r4, r25') -> ('mr', 'r4, r26'); 128: ('mr', 'r5, r25') -> ('mr', 'r5, r26'); 204: ('add', 'r3, r4, r3') -> ('add', 'r3, r3, r4')
|
||||
Round2 Zi8_814834AC | packed key byte-first chain ziU32 | sha256=efd0a012fc0a | structural/exact=(3, 330); instructions=344/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 15: ('stb', 'r0, 0x20(r1)') -> ('stw', 'r0, 0x1c(r1)'); 16: ('clrlwi', 'r0, r0, 0x18') -> ('stb', 'r0, 0x20(r1)'); 17: ('stw', 'r0, 0x1c(r1)') -> ('li', 'r3, 0x64'); 18: ('li', 'r3, 0x64') -> ('clrlwi', 'r3, r3, 0x10'); 19: ('clrlwi', 'r3, r3, 0x10') -> ('mr', 'r4, r26'); 20: ('mr', 'r4, r25') -> ('bl', '0'); 21: ('bl', '0') -> ('lbz', 'r0, 0xc(r31)'); 22: ('lbz', 'r0, 0xc(r31)') -> ('cmpwi', 'r0, 0'); 23: ('cmpwi', 'r0, 0') -> ('bne', '256'); 24: ('bne', '256') -> ('lhz', 'r3, 0(r29)'); 25: ('lhz', 'r3, 0(r29)') -> ('lbz', 'r0, 0(r30)')
|
||||
Round2 Zi8_814834AC | packed key byte-first chain ziS32 | sha256=d69bda3f5fe0 | structural/exact=(3, 330); instructions=344/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 15: ('stb', 'r0, 0x20(r1)') -> ('stw', 'r0, 0x1c(r1)'); 16: ('clrlwi', 'r0, r0, 0x18') -> ('stb', 'r0, 0x20(r1)'); 17: ('stw', 'r0, 0x1c(r1)') -> ('li', 'r3, 0x64'); 18: ('li', 'r3, 0x64') -> ('clrlwi', 'r3, r3, 0x10'); 19: ('clrlwi', 'r3, r3, 0x10') -> ('mr', 'r4, r26'); 20: ('mr', 'r4, r25') -> ('bl', '0'); 21: ('bl', '0') -> ('lbz', 'r0, 0xc(r31)'); 22: ('lbz', 'r0, 0xc(r31)') -> ('cmpwi', 'r0, 0'); 23: ('cmpwi', 'r0, 0') -> ('bne', '256'); 24: ('bne', '256') -> ('lhz', 'r3, 0(r29)'); 25: ('lhz', 'r3, 0(r29)') -> ('lbz', 'r0, 0(r30)')
|
||||
Round2 Zi8_814834AC | read-only metadata parameter with writable candidates | sha256=444b1f865b16 | BUILD FAILED xe Compiler: # File: libs\RVLMiddleware\eZiText\src\clib\zkokeyp.c # ------------------------------------------------------ # 148: Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK); # Error: ^ # (10209) illegal implicit conversion from 'const struct _ziGetParam *' to # 'struct _ziGetParam *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 Zi8_814834AC | offset before table in direct character reads | sha256=3e577d9912a3 | structural/exact=(1, 329); instructions=344/343; 9: ('mr', 'r25, r7') -> ('mr', 'r26, r7'); 16: ('clrlwi', 'r0, r0, 0x18') -> ('stb', 'r0, 0x20(r1)'); 17: ('stb', 'r0, 0x20(r1)') -> ('li', 'r3, 0x64'); 18: ('li', 'r3, 0x64') -> ('clrlwi', 'r3, r3, 0x10'); 19: ('clrlwi', 'r3, r3, 0x10') -> ('mr', 'r4, r26'); 20: ('mr', 'r4, r25') -> ('bl', '0'); 21: ('bl', '0') -> ('lbz', 'r0, 0xc(r31)'); 22: ('lbz', 'r0, 0xc(r31)') -> ('cmpwi', 'r0, 0'); 23: ('cmpwi', 'r0, 0') -> ('bne', '256'); 24: ('bne', '256') -> ('lhz', 'r3, 0(r29)'); 25: ('lhz', 'r3, 0(r29)') -> ('lbz', 'r0, 0(r30)'); 26: ('lbz', 'r0, 0(r30)') -> ('cmpw', 'r3, r0')
|
||||
Round2 Zi8_814834AC: batch 8 successful distinct builds/9 forms, best=(1, 329).
|
||||
Round2 Zi8GetKOcandidates remote checked before start; source unchanged, frame0x60; source673,target669, four excess instructions from initialization/halfword return narrowing/postincrement. Actual9-byte key entry reads have offset/table association different and integer scratch types may be incorrect. Target has no immediate stack store/reload without work between; volatile not justified. Try const options, actual typed records, packed-key clearing, expression association and candidate append boundary before score-only declaration analysis.
|
||||
Round2 Zi8GetKOcandidates | read-only candidate options pointer | sha256=c5a7263b380e | structural/exact=(30, 645); instructions=673/669; 11: ('li', 'r3, 0') -> ('li', 'r0, 0'); 12: ('stw', 'r3, 0x2c(r1)') -> ('stw', 'r0, 0x2c(r1)'); 15: ('li', 'r3, 0') -> ('stb', 'r0, 0x3c(r1)'); 16: ('stb', 'r3, 0x3c(r1)') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stb', 'r0, 0xe(r1)'); 18: ('stb', 'r0, 0xe(r1)') -> ('li', 'r0, 0'); 19: ('li', 'r0, 0') -> ('stb', 'r0, 0xd(r1)'); 20: ('stb', 'r0, 0xd(r1)') -> ('li', 'r0, 0'); 21: ('li', 'r0, 0') -> ('stb', 'r0, 0xc(r1)'); 22: ('stb', 'r0, 0xc(r1)') -> ('li', 'r0, 0'); 23: ('li', 'r0, 0') -> ('stb', 'r0, 0xb(r1)'); 24: ('stb', 'r0, 0xb(r1)') -> ('lhz', 'r0, 0x1e(r31)')
|
||||
Round2 Zi8GetKOcandidates | packed-key clearing shared zero-expression | sha256=f88df10b6355 | structural/exact=(30, 645); instructions=673/669; 11: ('li', 'r3, 0') -> ('li', 'r0, 0'); 12: ('stw', 'r3, 0x2c(r1)') -> ('stw', 'r0, 0x2c(r1)'); 15: ('clrlwi', 'r3, r0, 0x18') -> ('stb', 'r0, 0x3c(r1)'); 16: ('stb', 'r3, 0x3c(r1)') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stb', 'r0, 0xe(r1)'); 18: ('stb', 'r0, 0xe(r1)') -> ('li', 'r0, 0'); 19: ('li', 'r0, 0') -> ('stb', 'r0, 0xd(r1)'); 20: ('stb', 'r0, 0xd(r1)') -> ('li', 'r0, 0'); 21: ('li', 'r0, 0') -> ('stb', 'r0, 0xc(r1)'); 22: ('stb', 'r0, 0xc(r1)') -> ('li', 'r0, 0'); 23: ('li', 'r0, 0') -> ('stb', 'r0, 0xb(r1)'); 24: ('stb', 'r0, 0xb(r1)') -> ('lhz', 'r0, 0x1e(r31)')
|
||||
Round2 Zi8GetKOcandidates | key table indexed as actual typed records | sha256=c8994c4e8b10 | structural/exact=(19, 602); instructions=667/669; 15: ('li', 'r0, 0') -> ('stb', 'r0, 0x3c(r1)'); 16: ('stb', 'r0, 0x3c(r1)') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stb', 'r0, 0xe(r1)'); 18: ('stb', 'r0, 0xe(r1)') -> ('li', 'r0, 0'); 19: ('li', 'r0, 0') -> ('stb', 'r0, 0xd(r1)'); 20: ('stb', 'r0, 0xd(r1)') -> ('li', 'r0, 0'); 21: ('li', 'r0, 0') -> ('stb', 'r0, 0xc(r1)'); 22: ('stb', 'r0, 0xc(r1)') -> ('li', 'r0, 0'); 23: ('li', 'r0, 0') -> ('stb', 'r0, 0xb(r1)'); 24: ('stb', 'r0, 0xb(r1)') -> ('lhz', 'r0, 0x1e(r31)'); 25: ('lhz', 'r3, 0x1e(r31)') -> ('sth', 'r0, 0x10(r1)'); 26: ('sth', 'r3, 0x10(r1)') -> ('li', 'r0, 0')
|
||||
Round2 Zi8GetKOcandidates | word offset bitwise association changed | sha256=0e9679e104d6 | structural/exact=(14, 639); instructions=670/669; 15: ('li', 'r0, 0') -> ('stb', 'r0, 0x3c(r1)'); 16: ('stb', 'r0, 0x3c(r1)') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stb', 'r0, 0xe(r1)'); 18: ('stb', 'r0, 0xe(r1)') -> ('li', 'r0, 0'); 19: ('li', 'r0, 0') -> ('stb', 'r0, 0xd(r1)'); 20: ('stb', 'r0, 0xd(r1)') -> ('li', 'r0, 0'); 21: ('li', 'r0, 0') -> ('stb', 'r0, 0xc(r1)'); 22: ('stb', 'r0, 0xc(r1)') -> ('li', 'r0, 0'); 23: ('li', 'r0, 0') -> ('stb', 'r0, 0xb(r1)'); 24: ('stb', 'r0, 0xb(r1)') -> ('lhz', 'r0, 0x1e(r31)'); 25: ('lhz', 'r0, 0x1e(r31)') -> ('sth', 'r0, 0x10(r1)'); 26: ('sth', 'r0, 0x10(r1)') -> ('li', 'r0, 0')
|
||||
Round2 Zi8GetKOcandidates | candidate append separated from index update | sha256=84b575fea440 | structural/exact=(37, 648); instructions=674/669; 15: ('li', 'r0, 0') -> ('stb', 'r0, 0x3c(r1)'); 16: ('stb', 'r0, 0x3c(r1)') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stb', 'r0, 0xe(r1)'); 18: ('stb', 'r0, 0xe(r1)') -> ('li', 'r0, 0'); 19: ('li', 'r0, 0') -> ('stb', 'r0, 0xd(r1)'); 20: ('stb', 'r0, 0xd(r1)') -> ('li', 'r0, 0'); 21: ('li', 'r0, 0') -> ('stb', 'r0, 0xc(r1)'); 22: ('stb', 'r0, 0xc(r1)') -> ('li', 'r0, 0'); 23: ('li', 'r0, 0') -> ('stb', 'r0, 0xb(r1)'); 24: ('stb', 'r0, 0xb(r1)') -> ('lhz', 'r0, 0x1e(r31)'); 25: ('lhz', 'r0, 0x1e(r31)') -> ('sth', 'r0, 0x10(r1)'); 26: ('sth', 'r0, 0x10(r1)') -> ('li', 'r0, 0')
|
||||
Round2 Zi8GetKOcandidates | native compact lookup index in scratch struct | sha256=704a01f531d6 | structural/exact=(30, 637); instructions=670/669; 15: ('li', 'r0, 0') -> ('stb', 'r0, 0x3c(r1)'); 16: ('stb', 'r0, 0x3c(r1)') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stb', 'r0, 0xe(r1)'); 18: ('stb', 'r0, 0xe(r1)') -> ('li', 'r0, 0'); 19: ('li', 'r0, 0') -> ('stb', 'r0, 0xd(r1)'); 20: ('stb', 'r0, 0xd(r1)') -> ('li', 'r0, 0'); 21: ('li', 'r0, 0') -> ('stb', 'r0, 0xc(r1)'); 22: ('stb', 'r0, 0xc(r1)') -> ('li', 'r0, 0'); 23: ('li', 'r0, 0') -> ('stb', 'r0, 0xb(r1)'); 24: ('stb', 'r0, 0xb(r1)') -> ('lhz', 'r0, 0x1e(r31)'); 25: ('lhz', 'r0, 0x1e(r31)') -> ('sth', 'r0, 0x10(r1)'); 26: ('sth', 'r0, 0x10(r1)') -> ('li', 'r0, 0')
|
||||
Round2 Zi8GetKOcandidates: batch 6 successful distinct builds/6 forms, best=(14, 639).
|
||||
Round2 zko all six open functions revisited with3+ compiled forms each; z5 declaration13 evaluations no gain, z6 structural30 after restored source. Data is .data40/extab56 exact and extabindex84 still differing only code-size words, no real object renames justified.
|
||||
Round2 keyboard origin fetched source and shared headers unchanged. Target/source frame0x270/318instructions; early inline LinkListNode new-result boundary adds oneMR before constructor, OEM index is really10+i while source advances independent counter; returned MemoSetting byte8 aggregate has three copies in differing stack declaration order. No immediate re-read after stores, volatile not justified. Test read-only bindings/actual array member, temporary const reference and initialization boundary before declaration search.
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap | const buffer pointer object and const allocated link binding | sha256=f2150decc883 | structural/exact=(41, 246); instructions=317/318; 5: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 6: ('lwz', 'r30, 0xa0(r4)') -> ('lwz', 'r29, 0xa0(r4)'); 7: ('lis', 'r27, 0') -> ('lis', 'r31, 0'); 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 11: ('addi', 'r27, r27, 0') -> ('addi', 'r31, r31, 0'); 20: ('mr', 'r4, r30') -> ('mr', 'r4, r29'); 23: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 28: ('mr', 'r31, r3') -> ('mr', 'r30, r3'); 31: ('mr', 'r31, r3') -> ('mr', 'r30, r3'); 32: ('mr', 'r3, r31') -> ('mr', 'r3, r30'); 39: ('lis', 'r30, 0') -> ('lis', 'r29, 0')
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap | read-only dictionary array view | sha256=92fef992b2bc | structural/exact=(54, 300); instructions=312/318; 5: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 6: ('lwz', 'r31, 0xa0(r4)') -> ('lwz', 'r29, 0xa0(r4)'); 7: ('lis', 'r27, 0') -> ('lis', 'r31, 0'); 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 11: ('addi', 'r27, r27, 0') -> ('addi', 'r31, r31, 0'); 15: ('mr', 'r30, r3') -> ('beq', '16'); 16: ('beq', '16') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stw', 'r0, 0(r3)'); 18: ('stw', 'r0, 0(r3)') -> ('stw', 'r0, 4(r3)'); 19: ('stw', 'r0, 4(r3)') -> ('mr', 'r26, r3'); 20: ('mr', 'r3, r30') -> ('mr', 'r4, r29')
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap | dictionary pair indexed through actual OEM array | sha256=95ff9ddc5ba3 | structural/exact=(47, 308); instructions=310/318; 5: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 6: ('lwz', 'r31, 0xa0(r4)') -> ('lwz', 'r29, 0xa0(r4)'); 7: ('lis', 'r27, 0') -> ('lis', 'r31, 0'); 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 11: ('addi', 'r27, r27, 0') -> ('addi', 'r31, r31, 0'); 15: ('mr', 'r30, r3') -> ('beq', '16'); 16: ('beq', '16') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stw', 'r0, 0(r3)'); 18: ('stw', 'r0, 0(r3)') -> ('stw', 'r0, 4(r3)'); 19: ('stw', 'r0, 4(r3)') -> ('mr', 'r26, r3'); 20: ('mr', 'r3, r30') -> ('mr', 'r4, r29')
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap | dictionary index association explicitly native offset | sha256=b13ff6a34738 | structural/exact=(47, 308); instructions=310/318; 5: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 6: ('lwz', 'r31, 0xa0(r4)') -> ('lwz', 'r29, 0xa0(r4)'); 7: ('lis', 'r27, 0') -> ('lis', 'r31, 0'); 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 11: ('addi', 'r27, r27, 0') -> ('addi', 'r31, r31, 0'); 15: ('mr', 'r30, r3') -> ('beq', '16'); 16: ('beq', '16') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stw', 'r0, 0(r3)'); 18: ('stw', 'r0, 0(r3)') -> ('stw', 'r0, 4(r3)'); 19: ('stw', 'r0, 4(r3)') -> ('mr', 'r26, r3'); 20: ('mr', 'r3, r30') -> ('mr', 'r4, r29')
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap | memo returned setting as const lifetime-bound value | sha256=72987b036a33 | structural/exact=(63, 286); instructions=311/318; 5: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 6: ('lwz', 'r31, 0xa0(r4)') -> ('lwz', 'r29, 0xa0(r4)'); 7: ('lis', 'r27, 0') -> ('lis', 'r31, 0'); 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 11: ('addi', 'r27, r27, 0') -> ('addi', 'r31, r31, 0'); 15: ('mr', 'r30, r3') -> ('beq', '16'); 16: ('beq', '16') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stw', 'r0, 0(r3)'); 18: ('stw', 'r0, 0(r3)') -> ('stw', 'r0, 4(r3)'); 19: ('stw', 'r0, 4(r3)') -> ('mr', 'r26, r3'); 20: ('mr', 'r3, r30') -> ('mr', 'r4, r29')
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap | memo returned setting native initialization | sha256=f8c46f3d53ba | structural/exact=(63, 286); instructions=311/318; 5: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 6: ('lwz', 'r31, 0xa0(r4)') -> ('lwz', 'r29, 0xa0(r4)'); 7: ('lis', 'r27, 0') -> ('lis', 'r31, 0'); 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 11: ('addi', 'r27, r27, 0') -> ('addi', 'r31, r31, 0'); 15: ('mr', 'r30, r3') -> ('beq', '16'); 16: ('beq', '16') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stw', 'r0, 0(r3)'); 18: ('stw', 'r0, 0(r3)') -> ('stw', 'r0, 4(r3)'); 19: ('stw', 'r0, 4(r3)') -> ('mr', 'r26, r3'); 20: ('mr', 'r3, r30') -> ('mr', 'r4, r29')
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap | allocation first results owned by inline resource creation helper | sha256=9c1639058155 | structural/exact=(42, 210); instructions=318/318; 5: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 6: ('lwz', 'r31, 0xa0(r4)') -> ('lwz', 'r29, 0xa0(r4)'); 7: ('lis', 'r27, 0') -> ('lis', 'r31, 0'); 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r4, r29') -> ('mr', 'r4, r28'); 11: ('addi', 'r27, r27, 0') -> ('addi', 'r31, r31, 0'); 15: ('mr', 'r30, r3') -> ('beq', '16'); 16: ('beq', '16') -> ('li', 'r0, 0'); 17: ('li', 'r0, 0') -> ('stw', 'r0, 0(r3)'); 18: ('stw', 'r0, 0(r3)') -> ('stw', 'r0, 4(r3)'); 19: ('stw', 'r0, 4(r3)') -> ('mr', 'r26, r3'); 20: ('mr', 'r3, r30') -> ('mr', 'r4, r29')
|
||||
Round2 create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap: batch 7 successful distinct builds/7 forms, best=(41, 246).
|
||||
Round2 BS2UpdateInit origin fetched, unchanged and pool55 identical/data10488exact. Structural frame target20/source10,71/72; target anchors all .bss through Flags0, source uses separateFlags1 andThread. Reloc proof targetlis/addi Flags0 then Flags1 offset800, thread1000 and stack2318; target/source .bss real objects identical positions/sizes Flags0(0,800),Flags1(800,800),Thread(1000,1318),headers2320/2340. Source explicit zero initializers can prevent common base grouping; remove redundant initializer forms before frame/register tuning; no type/layout padding or new objects.
|
||||
Round2 BS2UpdateInit | all update static buffers implicitly zero-initialized | sha256=5d3d29a40ea3 | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | flags and thread implicit initialization | sha256=ef319e0791ef | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | flag arrays implicit initialization | sha256=b3153a682f44 | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | thread stack start passed through named actual array pointer | sha256=a7625f743651 | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | native void pointer allocator const binding | sha256=e2e74408fb91 | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit: batch 5 successful distinct builds/5 forms, best=(19, 65).
|
||||
Round2 BS2UpdateInit | two flag banks modeled as true parallel table | sha256=f4953347b171 | structural/exact=(20, 52); instructions=72/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | two flag banks explicitly zero-initialized parallel table | sha256=997519f7fc6d | structural/exact=(20, 52); instructions=72/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | typed second-bank pointer retained across thread initialization | sha256=cb9c49b14156 | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit: batch 3 successful distinct builds/3 forms, best=(19, 65).
|
||||
Round2 UpdateThread origin fetched; target913/source902/framef0 same. Global-base grouping and13cached values differs, import suffix/read/branch scheduling adds11 net target instructions. Test read-only scan scope, cached zero initialization, bounded area calculation and read-result ownership. Init eight meaningful forms no exact gain (parallel flag-bank aggregate experiment restored, no data/config changes); score-only confirms structure20/exact52.
|
||||
Round2 UpdateThread | read-only disc entries in scanning scopes | sha256=7555f6228a22 | structural/exact=(113, 742); instructions=903/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread | actual output-field zero values initialized from shared selection state | sha256=c854959c2250 | structural/exact=(109, 744); instructions=902/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread | explicit block count after bound check | sha256=a00de633bd91 | structural/exact=(111, 744); instructions=902/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread | DVDRead result consumed through existing signed import status | sha256=50dfbd49764b | structural/exact=(109, 744); instructions=902/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread | missing-file state initialized before update control globals | sha256=841229d91732 | structural/exact=(110, 885); instructions=901/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r21, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 14: ('stw', 'r21, 0(0)') -> ('stw', 'r0, 0(0)'); 15: ('li', 'r20, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r30, 0') -> ('li', 'r17, 0'); 17: ('li', 'r19, 0') -> ('li', 'r30, 0'); 18: ('stw', 'r21, 0(0)') -> ('stw', 'r0, 0(0)')
|
||||
Round2 UpdateThread: batch 5 successful distinct builds/5 forms, best=(109, 744).
|
||||
Round2 UpdateThread decisive target proof: d5c stw r3,rc; d60 addi string; d64 lwz r4,rc; no intervening call/write. Same e48→e50; plus reload after BS2Report atd70/e5c and before logging. rc is a genuine import result global; definition-level volatile warranted. Source currentlystatic nonvolatile and cached across report/branch causes six missing reloads. Test actual targetglobal scope and direct import assignment forms.
|
||||
Round2 UpdateThread | volatile import result proven by target immediate reload | sha256=c27d9de0bdc4 | structural/exact=(97, 745); instructions=904/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread | externally visible volatile import result matching target symbol | sha256=3c8e6e3c2bba | structural/exact=(97, 745); instructions=904/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread | externally visible nonvolatile import result as alias control | sha256=ea5be7c9d930 | structural/exact=(109, 744); instructions=902/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread | volatile result assigned directly from import branch | sha256=fe9af6227641 | structural/exact=(115, 746); instructions=906/913; 5: ('lis', 'r23, 0') -> ('lis', 'r22, 0'); 6: ('lis', 'r22, 0') -> ('lis', 'r21, 0'); 7: ('addi', 'r23, r23, 0') -> ('addi', 'r22, r22, 0'); 8: ('addi', 'r22, r22, 0') -> ('addi', 'r21, r21, 0'); 9: ('addi', 'r3, r23, 0x6e') -> ('addi', 'r3, r22, 0x6e'); 12: ('li', 'r0, 0') -> ('li', 'r15, 0'); 13: ('addi', 'r3, r1, 0x20') -> ('li', 'r0, 0'); 15: ('li', 'r21, 0') -> ('addi', 'r3, r1, 0x20'); 16: ('li', 'r20, 0') -> ('li', 'r17, 0'); 19: ('li', 'r19, 0') -> ('li', 'r18, 0'); 20: ('li', 'r18, 0') -> ('li', 'r19, 0'); 21: ('li', 'r17, 0') -> ('li', 'r20, 0')
|
||||
Round2 UpdateThread: batch 4 successful distinct builds/4 forms, best=(97, 745).
|
||||
Round2 BS2UpdateInit | flag buffers external storage grouping control | sha256=d754a3e1f4da | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | thread storage external ownership control | sha256=36e67b3fff77 | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit | flag count enum fields native int type | sha256=5d142fbf1e2c | BUILD FAILED 2/BS2Update.c -o build/43U/src/src/BS2 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/BS2/BS2Update.d build/43U/src/src/BS2/BS2Update.d ### mwcceppc.exe Compiler: # File: src\BS2\BS2Update.c # ---------------------------- # 418: pFlags = Flags1; # Error: ^ # (10209) illegal implicit conversion from 'int[512]' to # 'unsigned long *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 BS2UpdateInit | thread stack actual pointer evaluated in output helper | sha256=a130a9fa2893 | structural/exact=(19, 65); instructions=71/72; 0: ('stwu', 'r1, -0x10(r1)') -> ('stwu', 'r1, -0x20(r1)'); 2: ('stw', 'r0, 0x14(r1)') -> ('stw', 'r0, 0x24(r1)'); 3: ('stw', 'r31, 0xc(r1)') -> ('addi', 'r11, r1, 0x20'); 4: ('lis', 'r31, 0') -> ('bl', '0'); 5: ('addi', 'r31, r31, 0') -> ('lis', 'r31, 0'); 6: ('stw', 'r30, 8(r1)') -> ('lis', 'r30, 0'); 7: ('mr', 'r30, r3') -> ('addi', 'r31, r31, 0'); 8: ('addi', 'r3, r31, 0') -> ('mr', 'r29, r3'); 9: ('crclr', 'cr1eq') -> ('addi', 'r30, r30, 0'); 10: ('bl', '0') -> ('addi', 'r3, r31, 0'); 11: ('bl', '0') -> ('crclr', 'cr1eq'); 12: ('stw', 'r3, 0(0)') -> ('bl', '0')
|
||||
Round2 BS2UpdateInit: batch 3 successful distinct builds/4 forms, best=(19, 65).
|
||||
Round2 BS2Init structural root: targetstack argument is Flags0+0x1318 then +0x1000, while Thread starts0x1000 and actual OSThread size0x318. Current fabricated UpdateThreadData merged genuine thread and stack into one4888byte symbol, so onlytwo static .bss objects referenced byInit and MWCC does not group base; target three real objects Thread,stack,Flags1 use commonBSSanchor. Split actual OSThread and real4096byte stack, preserving exact positions/size/alignment. Config Thread extent currently0x1318 absorbed stack neighbour; if source validates target, correct extent to OSThread0x318 and leave stackbytes unowned per data contract. No padding/dummy object added: stackpassedtoOSCreateThread.
|
||||
Round2 BS2UpdateInit | real OSThread and independent stack object | sha256=a74c5a173d77 | structural/exact=(3, 3); instructions=72/72; 54: ('addi', 'r6, r30, 0x1358') -> ('addi', 'r6, r30, 0x1318'); 56: ('addi', 'r3, r30, 0x1040') -> ('addi', 'r3, r30, 0x1000'); 64: ('addi', 'r3, r30, 0x1040') -> ('addi', 'r3, r30, 0x1000')
|
||||
Round2 BS2UpdateInit | OSThread and independent initialized stack | sha256=40360ec7491a | structural/exact=(0, 0); instructions=72/72;
|
||||
Round2 BS2UpdateInit: batch 2 successful distinct builds/3 forms, best=(0, 0).
|
||||
Round2 data extent proof BS2Update Thread0x810b2580: OSCreateThread/OSResumeThread pointer has actualOSThread size0x318; independent stack starts0x810b2898 (=bssbase+1318) with4096byte end2318, proven targettwoaddi+1318,+1000. Correct onlyThread extent1318→318, same address/section9056, stackbytes unowned. Initialized real OSThread + ThreadStack independently produced BS2Init72/72 diffs0 (improvement8/10→9/10); original8exact helpers unchanged, pool55identical.
|
||||
Round2 BS2Init quick GATE PASS9/10/code400/4052/data10488/10488, pool identical, DOLexact, regressions0 forbidden0 readability0. Actual independent thread/stack objects restoredcommonBSSbase and72/72 diffs0; data extent corrected keptBSSsection9056/total10488. Commit readable structural fix now; UpdateThread remainsopen with3+freshcompiledforms, revisit resultvolatile and declaration order after otherownedleaves.
|
||||
Round2 CHANSVm origin fetched and owned file/headers unchanged (current221/233). Pool125identical/data6904exact. CHANSVmConvertToFloatFromStr target83/83/frame70; only two scheduled instructions swapped: initialized end-pointer store8 vs inputtypecmp3. Inline CHANSVmParseFloat wrongly mutableinput despite read-only access; test const helper parameter, pointer binding and caller condition boundaries.
|
||||
Round2 CHANSVmConvertToFloatFromStr | read-only parse input object | sha256=08f3842e7fed | structural/exact=(2, 2); instructions=83/83; 16: ('cmplwi', 'r0, 3') -> ('stw', 'r30, 8(r1)'); 17: ('stw', 'r30, 8(r1)') -> ('cmplwi', 'r0, 3')
|
||||
Round2 CHANSVmConvertToFloatFromStr | const parsed string view inside parse helper | sha256=7163e9791055 | structural/exact=(2, 2); instructions=83/83; 16: ('cmplwi', 'r0, 3') -> ('stw', 'r30, 8(r1)'); 17: ('stw', 'r30, 8(r1)') -> ('cmplwi', 'r0, 3')
|
||||
Round2 CHANSVmConvertToFloatFromStr | nested result/null parse condition | sha256=03a767b8c651 | structural/exact=(2, 2); instructions=83/83; 16: ('cmplwi', 'r0, 3') -> ('stw', 'r30, 8(r1)'); 17: ('stw', 'r30, 8(r1)') -> ('cmplwi', 'r0, 3')
|
||||
Round2 CHANSVmConvertToFloatFromStr: batch 3 successful distinct builds/3 forms, best=(2, 2).
|
||||
Round2 CHANSVmConvertToFloatFromStr | parse input type assignment follows initialized end pointer | sha256=429af9638645 | structural/exact=(2, 3); instructions=83/83; 14: ('li', 'r30, 0') -> ('lbz', 'r0, 8(r28)'); 15: ('stw', 'r30, 8(r1)') -> ('li', 'r30, 0'); 16: ('lbz', 'r0, 8(r28)') -> ('stw', 'r30, 8(r1)')
|
||||
Round2 CHANSVmConvertToFloatFromStr | native input type cached after pointer initialization | sha256=4df3aac7819d | structural/exact=(2, 3); instructions=83/83; 14: ('li', 'r30, 0') -> ('lbz', 'r0, 8(r28)'); 15: ('stw', 'r30, 8(r1)') -> ('li', 'r30, 0'); 16: ('lbz', 'r0, 8(r28)') -> ('stw', 'r30, 8(r1)')
|
||||
Round2 CHANSVmConvertToFloatFromStr | initialized end pointer declared before cached type | sha256=65d5dbcb0128 | structural/exact=(2, 3); instructions=83/83; 14: ('li', 'r30, 0') -> ('lbz', 'r0, 8(r28)'); 15: ('stw', 'r30, 8(r1)') -> ('li', 'r30, 0'); 16: ('lbz', 'r0, 8(r28)') -> ('stw', 'r30, 8(r1)')
|
||||
Round2 CHANSVmConvertToFloatFromStr: batch 3 successful distinct builds/3 forms, best=(2, 3).
|
||||
Round2 VmDateDtor origin fetched; target91/91 frame80, seven scheduling diffs in snprintf stack-year store and weekday/monthname loads, no type/layout/branch difference. Calendar input/result objectsread-only at formatcall; actual variadic arguments day and month containmutable pointertables. Test constcalendarview, right-argument explicit temporaries and constantpointertabledefinition (data relocation pool must hold).
|
||||
Round2 VmDateDtor | read-only calendar view for format arguments | sha256=5890ad8cc104 | structural/exact=(33, 84); instructions=98/91; 5: ('lis', 'r29, 0') -> ('lis', 'r31, 0'); 6: ('addi', 'r28, r1, 0x30') -> ('addi', 'r30, r1, 0x30'); 7: ('mr', 'r30, r3') -> ('mr', 'r28, r3'); 8: ('mr', 'r31, r5') -> ('mr', 'r29, r5'); 9: ('mr', 'r3, r28') -> ('mr', 'r3, r30'); 10: ('addi', 'r29, r29, 0') -> ('addi', 'r31, r31, 0'); 14: ('mr', 'r3, r30') -> ('mr', 'r3, r28'); 15: ('mr', 'r4, r28') -> ('mr', 'r4, r30'); 18: ('beq', '264') -> ('beq', '236'); 21: ('blt', '252') -> ('blt', '224'); 23: ('bgt', '244') -> ('bgt', '216'); 24: ('lwz', 'r0, 0x34(r1)') -> ('lwz', 'r10, 0x34(r1)')
|
||||
Round2 VmDateDtor | month value computed before weekday in format call | sha256=bf4f69063da0 | structural/exact=(5, 7); instructions=91/91; 57: ('addi', 'r4, r31, 0xb34') -> ('addi', 'r3, r31, 0xb50'); 58: ('stw', 'r6, 0xc(r1)') -> ('lwzx', 'r7, r3, r0'); 59: ('addi', 'r3, r31, 0xb50') -> ('addi', 'r4, r31, 0xb34'); 60: ('lwzx', 'r6, r4, r5') -> ('stw', 'r6, 0xc(r1)'); 61: ('addi', 'r5, r31, 0xb80') -> ('addi', 'r3, r1, 0x10'); 62: ('lwzx', 'r7, r3, r0') -> ('lwzx', 'r6, r4, r5'); 63: ('addi', 'r3, r1, 0x10') -> ('addi', 'r5, r31, 0xb80')
|
||||
Round2 VmDateDtor | month then weekday genuine names | sha256=9dffea3bac3c | structural/exact=(5, 7); instructions=91/91; 57: ('addi', 'r4, r31, 0xb34') -> ('addi', 'r3, r31, 0xb50'); 58: ('stw', 'r6, 0xc(r1)') -> ('lwzx', 'r7, r3, r0'); 59: ('addi', 'r3, r31, 0xb50') -> ('addi', 'r4, r31, 0xb34'); 60: ('lwzx', 'r6, r4, r5') -> ('stw', 'r6, 0xc(r1)'); 61: ('addi', 'r5, r31, 0xb80') -> ('addi', 'r3, r1, 0x10'); 62: ('lwzx', 'r7, r3, r0') -> ('lwzx', 'r6, r4, r5'); 63: ('addi', 'r3, r1, 0x10') -> ('addi', 'r5, r31, 0xb80')
|
||||
Round2 VmDateDtor | immutable date name table pointer entries | sha256=4b9ea23221ca | structural/exact=(28, 87); instructions=92/91; 5: ('addi', 'r31, r1, 0x30') -> ('lis', 'r31, 0'); 6: ('mr', 'r29, r3') -> ('addi', 'r30, r1, 0x30'); 7: ('mr', 'r30, r5') -> ('mr', 'r28, r3'); 8: ('li', 'r4, 0') -> ('mr', 'r29, r5'); 9: ('mr', 'r3, r31') -> ('mr', 'r3, r30'); 10: ('li', 'r5, 0x28') -> ('addi', 'r31, r31, 0'); 11: ('bl', '0') -> ('li', 'r4, 0'); 12: ('mr', 'r3, r29') -> ('li', 'r5, 0x28'); 13: ('mr', 'r4, r31') -> ('bl', '0'); 14: ('bl', '0') -> ('mr', 'r3, r28'); 15: ('cmpwi', 'r3, 0') -> ('mr', 'r4, r30'); 16: ('beq', '248') -> ('bl', '0')
|
||||
Round2 VmDateDtor: batch 4 successful distinct builds/4 forms, best=(5, 7).
|
||||
Round2 VmStringReplace target/source132/frame40 exact structure,40 operands (parameters/live parent/search/replacement buffers and cursors). Read-only byte inputs falsely mutable vmString type; constbyteview and native payload boundary/lengthload order checked before full scalar/pointer declaration search. Source untouched on remote fetch; no volatile/extent issue. Float6forms+13decl builds and Date4forms no exactgain; no retainedchanges.
|
||||
Round2 VmStringReplace | read-only parent/search/replacement byte views | sha256=aa94c28cf28d | structural/exact=(0, 40); instructions=132/132; 6: ('mr', 'r29, r3') -> ('mr', 'r27, r3'); 8: ('mr', 'r30, r5') -> ('mr', 'r28, r5'); 15: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 18: ('mr', 'r31, r3') -> ('mr', 'r29, r3'); 19: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 23: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 26: ('cmpwi', 'r31, 0') -> ('cmpwi', 'r29, 0'); 30: ('lwz', 'r4, 0(r19)') -> ('lwz', 'r5, 0(r19)'); 31: ('lwz', 'r5, 0(r31)') -> ('lwz', 'r4, 0(r29)'); 32: ('lwz', 'r24, 4(r4)') -> ('lwz', 'r25, 4(r5)'); 34: ('lwz', 'r31, 4(r5)') -> ('lwz', 'r23, 4(r4)'); 35: ('lwz', 'r27, 0(r4)') -> ('lwz', 'r31, 0(r5)')
|
||||
Round2 VmStringReplace | replacement value read before its byte pointer | sha256=a01cf7e5088a | structural/exact=(2, 41); instructions=132/132; 6: ('mr', 'r29, r3') -> ('mr', 'r27, r3'); 8: ('mr', 'r30, r5') -> ('mr', 'r28, r5'); 15: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 18: ('mr', 'r31, r3') -> ('mr', 'r29, r3'); 19: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 23: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 26: ('cmpwi', 'r31, 0') -> ('cmpwi', 'r29, 0'); 30: ('lwz', 'r4, 0(r19)') -> ('lwz', 'r5, 0(r19)'); 31: ('lwz', 'r5, 0(r31)') -> ('lwz', 'r4, 0(r29)'); 32: ('lwz', 'r24, 4(r4)') -> ('lwz', 'r25, 4(r5)'); 34: ('lwz', 'r31, 4(r5)') -> ('lwz', 'r23, 4(r4)'); 35: ('lwz', 'r27, 0(r4)') -> ('lwz', 'r31, 0(r5)')
|
||||
Round2 VmStringReplace | parent and argument payload pointers cached explicitly | sha256=19afbc885014 | BUILD FAILED /channelScript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 3101: const vmStringObjVal* parentValue = VmParentObj->value.string_v; # Error: ^^^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 VmStringReplace | two-pass replacement do loop | sha256=3bf16a71ce35 | structural/exact=(11, 68); instructions=133/132; 6: ('mr', 'r29, r3') -> ('mr', 'r27, r3'); 8: ('mr', 'r30, r5') -> ('mr', 'r28, r5'); 11: ('blt', '432') -> ('blt', '428'); 15: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 18: ('mr', 'r31, r3') -> ('mr', 'r29, r3'); 19: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 23: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 26: ('cmpwi', 'r31, 0') -> ('cmpwi', 'r29, 0'); 27: ('beq', '368') -> ('beq', '364'); 29: ('beq', '360') -> ('beq', '356'); 30: ('lwz', 'r4, 0(r19)') -> ('lwz', 'r5, 0(r19)'); 31: ('lwz', 'r5, 0(r31)') -> ('lwz', 'r4, 0(r29)')
|
||||
Round2 VmStringReplace: batch 3 successful distinct builds/4 forms, best=(0, 40).
|
||||
Round2 Replace declaration search180 then211 further evaluations reaches genuine register-only plateau40→28, no exactgain. Restored preexperiment code to keep minimal exact changes. Every4successful bodyforms logged before search.
|
||||
Round2 VmStringSplit origin refreshed unchanged; target/source222/frame50 aligned,66 register operands,16true locals including addressable arrayCount. Input bytes read-only; test const inputs, delimiter/parent load-order and two-pass loop boundary, before declaration search without reordering addressable object. No symbol overlap or provenvolatile reload.
|
||||
Round2 VmStringSplit | read-only source and delimiter byte pointers | sha256=72e0cff367ca | structural/exact=(0, 66); instructions=222/222; 6: ('mr', 'r28, r4') -> ('mr', 'r29, r4'); 9: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 17: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 23: ('li', 'r31, -1') -> ('li', 'r30, -1'); 45: ('mr', 'r31, r4') -> ('mr', 'r30, r4'); 47: ('lwz', 'r4, 0(r30)') -> ('lwz', 'r3, 0(r31)'); 48: ('lwz', 'r3, 0(r28)') -> ('lwz', 'r4, 0(r29)'); 49: ('lwz', 'r23, 4(r4)') -> ('lwz', 'r22, 4(r3)'); 50: ('lwz', 'r30, 0(r3)') -> ('lwz', 'r31, 0(r4)'); 51: ('cmpwi', 'r23, 0') -> ('cmpwi', 'r22, 0'); 52: ('lwz', 'r25, 0(r4)') -> ('lwz', 'r21, 0(r3)'); 53: ('lwz', 'r24, 4(r3)') -> ('lwz', 'r24, 4(r4)')
|
||||
Round2 VmStringSplit | delimiter payload before parent payload addressing | sha256=7a9f5b516bc4 | structural/exact=(0, 76); instructions=222/222; 8: ('mr', 'r28, r3') -> ('mr', 'r27, r3'); 9: ('mr', 'r30, r5') -> ('mr', 'r28, r5'); 13: ('mr', 'r3, r28') -> ('mr', 'r3, r27'); 17: ('mr', 'r27, r3') -> ('mr', 'r31, r3'); 22: ('lwz', 'r3, 0x60(r28)') -> ('lwz', 'r3, 0x60(r27)'); 23: ('li', 'r31, -1') -> ('li', 'r30, -1'); 27: ('mr', 'r3, r28') -> ('mr', 'r3, r27'); 31: ('mr', 'r3, r28') -> ('mr', 'r3, r27'); 45: ('mr', 'r31, r4') -> ('mr', 'r30, r4'); 47: ('lwz', 'r4, 0(r27)') -> ('lwz', 'r3, 0(r31)'); 48: ('lwz', 'r3, 0(r29)') -> ('lwz', 'r4, 0(r29)'); 49: ('lwz', 'r22, 4(r4)') -> ('lwz', 'r22, 4(r3)')
|
||||
Round2 VmStringSplit | two-pass output uses do loop | sha256=fe795bfbc4a7 | structural/exact=(12, 139); instructions=223/222; 6: ('mr', 'r28, r4') -> ('mr', 'r29, r4'); 9: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 17: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 21: ('b', '500') -> ('b', '496'); 23: ('li', 'r31, -1') -> ('li', 'r30, -1'); 45: ('mr', 'r31, r4') -> ('mr', 'r30, r4'); 46: ('beq', '400') -> ('beq', '396'); 47: ('lwz', 'r4, 0(r30)') -> ('lwz', 'r3, 0(r31)'); 48: ('lwz', 'r3, 0(r28)') -> ('lwz', 'r4, 0(r29)'); 49: ('lwz', 'r22, 4(r4)') -> ('lwz', 'r22, 4(r3)'); 50: ('lwz', 'r30, 0(r3)') -> ('lwz', 'r31, 0(r4)'); 52: ('lwz', 'r24, 0(r4)') -> ('lwz', 'r21, 0(r3)')
|
||||
Round2 VmStringSplit | element allocation and null guard split | sha256=233a5a3b36c6 | structural/exact=(0, 66); instructions=222/222; 6: ('mr', 'r28, r4') -> ('mr', 'r29, r4'); 9: ('mr', 'r29, r5') -> ('mr', 'r28, r5'); 17: ('mr', 'r30, r3') -> ('mr', 'r31, r3'); 23: ('li', 'r31, -1') -> ('li', 'r30, -1'); 45: ('mr', 'r31, r4') -> ('mr', 'r30, r4'); 47: ('lwz', 'r4, 0(r30)') -> ('lwz', 'r3, 0(r31)'); 48: ('lwz', 'r3, 0(r28)') -> ('lwz', 'r4, 0(r29)'); 49: ('lwz', 'r23, 4(r4)') -> ('lwz', 'r22, 4(r3)'); 50: ('lwz', 'r30, 0(r3)') -> ('lwz', 'r31, 0(r4)'); 51: ('cmpwi', 'r23, 0') -> ('cmpwi', 'r22, 0'); 52: ('lwz', 'r25, 0(r4)') -> ('lwz', 'r21, 0(r3)'); 53: ('lwz', 'r24, 4(r3)') -> ('lwz', 'r24, 4(r4)')
|
||||
Round2 VmStringSplit: batch 4 successful distinct builds/4 forms, best=(0, 66).
|
||||
Round2 Split fourcompiledcontextforms, full16-variable declaration search220 improves66→34; structural0 but no exactstate, restoredsource. Addressable arrayCount order remainscorrectinallscalar permutations; no header/otherTU output change.
|
||||
Round2 CHANSVmFormatString origin fetched unchanged,431/431/frame110; only13 registers exchange isEscaped stringvalue and litLen temporaryobject handles lateinstringformat. Existing pad0[8] is an actual UTF16 character buffer used atchar_body, misleading name/type; model as u16characterData[4] and fields. Other forms read-only formatbytes/native status/typed stringvalue boundary; declaration search last.
|
||||
Round2 CHANSVmFormatString | actual UTF16 character data instead of misleading pad name | sha256=35e8f3afaf9c | structural/exact=(0, 13); instructions=431/431; 305: ('addi', 'r14, r1, 8') -> ('addi', 'r18, r1, 8'); 306: ('li', 'r18, 0') -> ('li', 'r14, 0'); 328: ('rlwinm', 'r14, r0, 0, 0, 0x1e') -> ('rlwinm', 'r18, r0, 0, 0, 0x1e'); 329: ('addi', 'r7, r14, 2') -> ('addi', 'r7, r18, 2'); 332: ('mr', 'r18, r3') -> ('mr', 'r14, r3'); 335: ('mr', 'r5, r14') -> ('mr', 'r5, r18'); 337: ('lwz', 'r14, 0(r4)') -> ('lwz', 'r18, 0(r4)'); 340: ('mr', 'r3, r14') -> ('mr', 'r3, r18'); 367: ('mr', 'r6, r14') -> ('mr', 'r6, r18'); 371: ('mr', 'r14, r3') -> ('mr', 'r18, r3'); 373: ('cmpwi', 'r18, 0') -> ('cmpwi', 'r14, 0'); 376: ('mr', 'r4, r18') -> ('mr', 'r4, r14')
|
||||
Round2 CHANSVmFormatString | read-only format input bytes | sha256=374910e7f6e4 | structural/exact=(0, 13); instructions=431/431; 305: ('addi', 'r14, r1, 8') -> ('addi', 'r18, r1, 8'); 306: ('li', 'r18, 0') -> ('li', 'r14, 0'); 328: ('rlwinm', 'r14, r0, 0, 0, 0x1e') -> ('rlwinm', 'r18, r0, 0, 0, 0x1e'); 329: ('addi', 'r7, r14, 2') -> ('addi', 'r7, r18, 2'); 332: ('mr', 'r18, r3') -> ('mr', 'r14, r3'); 335: ('mr', 'r5, r14') -> ('mr', 'r5, r18'); 337: ('lwz', 'r14, 0(r4)') -> ('lwz', 'r18, 0(r4)'); 340: ('mr', 'r3, r14') -> ('mr', 'r3, r18'); 367: ('mr', 'r6, r14') -> ('mr', 'r6, r18'); 371: ('mr', 'r14, r3') -> ('mr', 'r18, r3'); 373: ('cmpwi', 'r18, 0') -> ('cmpwi', 'r14, 0'); 376: ('mr', 'r4, r18') -> ('mr', 'r4, r14')
|
||||
Round2 CHANSVmFormatString | format cleanup length native signed count | sha256=5aac250ffc0c | structural/exact=(0, 13); instructions=431/431; 305: ('addi', 'r14, r1, 8') -> ('addi', 'r18, r1, 8'); 306: ('li', 'r18, 0') -> ('li', 'r14, 0'); 328: ('rlwinm', 'r14, r0, 0, 0, 0x1e') -> ('rlwinm', 'r18, r0, 0, 0, 0x1e'); 329: ('addi', 'r7, r14, 2') -> ('addi', 'r7, r18, 2'); 332: ('mr', 'r18, r3') -> ('mr', 'r14, r3'); 335: ('mr', 'r5, r14') -> ('mr', 'r5, r18'); 337: ('lwz', 'r14, 0(r4)') -> ('lwz', 'r18, 0(r4)'); 340: ('mr', 'r3, r14') -> ('mr', 'r3, r18'); 367: ('mr', 'r6, r14') -> ('mr', 'r6, r18'); 371: ('mr', 'r14, r3') -> ('mr', 'r18, r3'); 373: ('cmpwi', 'r18, 0') -> ('cmpwi', 'r14, 0'); 376: ('mr', 'r4, r18') -> ('mr', 'r4, r14')
|
||||
Round2 CHANSVmFormatString | typed string pointer local owns formatting call value | sha256=d56992b899da | BUILD FAILED & "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 3681: const void* stringData = (const void*)isEscaped; # Error: ^^^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 CHANSVmFormatString: batch 3 successful distinct builds/4 forms, best=(0, 13).
|
||||
Round2 FormatString4compiledforms and130+2decl evaluations unchanged13registers. Swapping twoobviouslength/value scalar declarations alone doesnotalterallocation; source restored, no pad object introduced (originalpad0 actuallyusedcharacter storage).
|
||||
Round2 VmBlobGetHexString origin fetched unchanged;82/82 frame30,14 operands exchange outputoffset r5/r7 with digitvalue. Source contains parallelidentical counters destOff/i inadditionloopcounter, typedreadonlyinputs checked before trying singlecursor/pointercursor/countdown and innerdeclaration search.
|
||||
Round2 VmBlobGetHexString | read-only byte/hex table input views | sha256=ddc996824301 | structural/exact=(0, 14); instructions=82/82; 46: ('li', 'r7, 0') -> ('li', 'r4, 0'); 48: ('li', 'r4, 0') -> ('li', 'r5, 0'); 54: ('lbz', 'r5, 0(r6)') -> ('lbz', 'r7, 0(r6)'); 55: ('addi', 'r0, r7, 1') -> ('addi', 'r0, r5, 1'); 57: ('addi', 'r7, r7, 2') -> ('addi', 'r5, r5, 2'); 58: ('rlwinm', 'r5, r5, 0x1c, 0x1c, 0x1f') -> ('rlwinm', 'r7, r7, 0x1c, 0x1c, 0x1f'); 59: ('lbzx', 'r5, r8, r5') -> ('lbzx', 'r7, r8, r7'); 60: ('extsb', 'r5, r5') -> ('extsb', 'r7, r7'); 61: ('sthx', 'r5, r3, r4') -> ('sthx', 'r7, r3, r4'); 63: ('lbz', 'r5, 0(r6)') -> ('lbz', 'r7, 0(r6)'); 65: ('clrlwi', 'r5, r5, 0x1c') -> ('clrlwi', 'r7, r7, 0x1c'); 66: ('lbzx', 'r5, r8, r5') -> ('lbzx', 'r7, r8, r7')
|
||||
Round2 VmBlobGetHexString | two destination slots owned by a single character cursor | sha256=3b7d7f9e8e5b | structural/exact=(0, 14); instructions=82/82; 46: ('li', 'r7, 0') -> ('li', 'r4, 0'); 48: ('li', 'r4, 0') -> ('li', 'r5, 0'); 54: ('lbz', 'r5, 0(r6)') -> ('lbz', 'r7, 0(r6)'); 55: ('addi', 'r0, r7, 1') -> ('addi', 'r0, r5, 1'); 57: ('addi', 'r7, r7, 2') -> ('addi', 'r5, r5, 2'); 58: ('rlwinm', 'r5, r5, 0x1c, 0x1c, 0x1f') -> ('rlwinm', 'r7, r7, 0x1c, 0x1c, 0x1f'); 59: ('lbzx', 'r5, r8, r5') -> ('lbzx', 'r7, r8, r7'); 60: ('extsb', 'r5, r5') -> ('extsb', 'r7, r7'); 61: ('sthx', 'r5, r3, r4') -> ('sthx', 'r7, r3, r4'); 63: ('lbz', 'r5, 0(r6)') -> ('lbz', 'r7, 0(r6)'); 65: ('clrlwi', 'r5, r5, 0x1c') -> ('clrlwi', 'r7, r7, 0x1c'); 66: ('lbzx', 'r5, r8, r5') -> ('lbzx', 'r7, r8, r7')
|
||||
Round2 VmBlobGetHexString | hex output as pointer cursor | sha256=ba96984d9ffb | structural/exact=(14, 40); instructions=77/82; 21: ('b', '200') -> ('b', '220'); 34: ('beq', '144') -> ('beq', '164'); 42: ('beq', '112') -> ('beq', '132'); 45: ('lwz', 'r4, 8(r30)') -> ('lwz', 'r6, 8(r30)'); 46: ('lwz', 'r0, 0(r30)') -> ('li', 'r4, 0'); 47: ('lwz', 'r5, 0(0)') -> ('lwz', 'r0, 0(r30)'); 48: ('add', 'r4, r4, r0') -> ('li', 'r5, 0'); 49: ('mtctr', 'r31') -> ('lwz', 'r8, 0(0)'); 50: ('cmplwi', 'r31, 0') -> ('add', 'r6, r6, r0'); 51: ('ble', '56') -> ('mtctr', 'r31'); 52: ('lbz', 'r0, 0(r4)') -> ('cmplwi', 'r31, 0'); 53: ('rlwinm', 'r0, r0, 0x1c, 0x1c, 0x1f') -> ('ble', '68')
|
||||
Round2 VmBlobGetHexString | loop remaining-byte countdown | sha256=b44396ed09fb | structural/exact=(2, 16); instructions=82/82; 46: ('li', 'r7, 0') -> ('li', 'r4, 0'); 48: ('li', 'r4, 0') -> ('li', 'r5, 0'); 52: ('cmpwi', 'r31, 0') -> ('cmplwi', 'r31, 0'); 53: ('beq', '68') -> ('ble', '68'); 54: ('lbz', 'r5, 0(r6)') -> ('lbz', 'r7, 0(r6)'); 55: ('addi', 'r0, r7, 1') -> ('addi', 'r0, r5, 1'); 57: ('addi', 'r7, r7, 2') -> ('addi', 'r5, r5, 2'); 58: ('rlwinm', 'r5, r5, 0x1c, 0x1c, 0x1f') -> ('rlwinm', 'r7, r7, 0x1c, 0x1c, 0x1f'); 59: ('lbzx', 'r5, r8, r5') -> ('lbzx', 'r7, r8, r7'); 60: ('extsb', 'r5, r5') -> ('extsb', 'r7, r7'); 61: ('sthx', 'r5, r3, r4') -> ('sthx', 'r7, r3, r4'); 63: ('lbz', 'r5, 0(r6)') -> ('lbz', 'r7, 0(r6)')
|
||||
Round2 VmBlobGetHexString: batch 4 successful distinct builds/4 forms, best=(0, 14).
|
||||
Round2 CHANSVmFormatString | string temporary object declared before its byte length | sha256=1e11f0cfef40 | structural/exact=(0, 13); instructions=431/431; 305: ('addi', 'r14, r1, 8') -> ('addi', 'r18, r1, 8'); 306: ('li', 'r18, 0') -> ('li', 'r14, 0'); 328: ('rlwinm', 'r14, r0, 0, 0, 0x1e') -> ('rlwinm', 'r18, r0, 0, 0, 0x1e'); 329: ('addi', 'r7, r14, 2') -> ('addi', 'r7, r18, 2'); 332: ('mr', 'r18, r3') -> ('mr', 'r14, r3'); 335: ('mr', 'r5, r14') -> ('mr', 'r5, r18'); 337: ('lwz', 'r14, 0(r4)') -> ('lwz', 'r18, 0(r4)'); 340: ('mr', 'r3, r14') -> ('mr', 'r3, r18'); 367: ('mr', 'r6, r14') -> ('mr', 'r6, r18'); 371: ('mr', 'r14, r3') -> ('mr', 'r18, r3'); 373: ('cmpwi', 'r18, 0') -> ('cmpwi', 'r14, 0'); 376: ('mr', 'r4, r18') -> ('mr', 'r4, r14')
|
||||
Round2 CHANSVmFormatString | string temporary declared after byte length in same block | sha256=fa71454a401a | structural/exact=(0, 13); instructions=431/431; 305: ('addi', 'r14, r1, 8') -> ('addi', 'r18, r1, 8'); 306: ('li', 'r18, 0') -> ('li', 'r14, 0'); 328: ('rlwinm', 'r14, r0, 0, 0, 0x1e') -> ('rlwinm', 'r18, r0, 0, 0, 0x1e'); 329: ('addi', 'r7, r14, 2') -> ('addi', 'r7, r18, 2'); 332: ('mr', 'r18, r3') -> ('mr', 'r14, r3'); 335: ('mr', 'r5, r14') -> ('mr', 'r5, r18'); 337: ('lwz', 'r14, 0(r4)') -> ('lwz', 'r18, 0(r4)'); 340: ('mr', 'r3, r14') -> ('mr', 'r3, r18'); 367: ('mr', 'r6, r14') -> ('mr', 'r6, r18'); 371: ('mr', 'r14, r3') -> ('mr', 'r18, r3'); 373: ('cmpwi', 'r18, 0') -> ('cmpwi', 'r14, 0'); 376: ('mr', 'r4, r18') -> ('mr', 'r4, r14')
|
||||
Round2 CHANSVmFormatString | temporary string has a native object-typed cleanup handle | sha256=44c34f32e929 | structural/exact=(0, 13); instructions=431/431; 305: ('addi', 'r14, r1, 8') -> ('addi', 'r18, r1, 8'); 306: ('li', 'r18, 0') -> ('li', 'r14, 0'); 328: ('rlwinm', 'r14, r0, 0, 0, 0x1e') -> ('rlwinm', 'r18, r0, 0, 0, 0x1e'); 329: ('addi', 'r7, r14, 2') -> ('addi', 'r7, r18, 2'); 332: ('mr', 'r18, r3') -> ('mr', 'r14, r3'); 335: ('mr', 'r5, r14') -> ('mr', 'r5, r18'); 337: ('lwz', 'r14, 0(r4)') -> ('lwz', 'r18, 0(r4)'); 340: ('mr', 'r3, r14') -> ('mr', 'r3, r18'); 367: ('mr', 'r6, r14') -> ('mr', 'r6, r18'); 371: ('mr', 'r14, r3') -> ('mr', 'r18, r3'); 373: ('cmpwi', 'r18, 0') -> ('cmpwi', 'r14, 0'); 376: ('mr', 'r4, r18') -> ('mr', 'r4, r14')
|
||||
Round2 CHANSVmFormatString: batch 3 successful distinct builds/3 forms, best=(0, 13).
|
||||
Round2 FormatString further structural hypothesis: late two-register exchange actually begins with lexical objLen and nested nObj declarations (not leading litLen/isEscaped variables); test same-block object-before-length, object-after-length and genuine typed object cleanup handle. Hex4compiledforms+52innerdeclaration attempts unchanged14operands; restored.
|
||||
Round2 VmBlobPackCommon fresh origincheck no changes. Target668/668/frameb0,244 mostlyallocation operands; actual packmodeboolean andconstinputblob/string/cachedobjectgetter boundaries differ. No missing store/reload proof or symboloverlap. Test these source-type/prototype and explicit loadorder forms before27localdeclarationgroup permutation.
|
||||
Round2 VmBlobPackCommon | boolean packing-mode parameter | sha256=6e27af4a9ba9 | structural/exact=(0, 244); instructions=668/668; 5: ('mr', 'r26, r3') -> ('mr', 'r30, r3'); 8: ('mr', 'r27, r6') -> ('mr', 'r31, r6'); 10: ('mr', 'r31, r3') -> ('mr', 'r21, r3'); 11: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 15: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 20: ('mr', 'r30, r3') -> ('mr', 'r20, r3'); 23: ('srwi', 'r29, r3, 1') -> ('srwi', 'r19, r3, 1'); 24: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 28: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 31: ('cmpwi', 'r30, 0') -> ('cmpwi', 'r20, 0'); 32: ('mr', 'r28, r3') -> ('mr', 'r18, r3'); 36: ('cmpwi', 'r27, 0') -> ('cmpwi', 'r31, 0')
|
||||
Round2 VmBlobPackCommon | source blobs and string bytes readonly during copy | sha256=0e20fc008740 | BUILD FAILED src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 5397: CHANSVmStrCpyToU8FromU16(dest, srcData, charCount); # 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.
|
||||
Round2 VmBlobPackCommon | native signed format length | sha256=2720410dec4e | structural/exact=(0, 244); instructions=668/668; 5: ('mr', 'r26, r3') -> ('mr', 'r30, r3'); 8: ('mr', 'r27, r6') -> ('mr', 'r31, r6'); 10: ('mr', 'r31, r3') -> ('mr', 'r21, r3'); 11: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 15: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 20: ('mr', 'r30, r3') -> ('mr', 'r20, r3'); 23: ('srwi', 'r29, r3, 1') -> ('srwi', 'r19, r3, 1'); 24: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 28: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 31: ('cmpwi', 'r30, 0') -> ('cmpwi', 'r20, 0'); 32: ('mr', 'r28, r3') -> ('mr', 'r18, r3'); 36: ('cmpwi', 'r27, 0') -> ('cmpwi', 'r31, 0')
|
||||
Round2 VmBlobPackCommon | readonly object header getter prototype | sha256=ced3ca908ad0 | structural/exact=(0, 244); instructions=668/668; 5: ('mr', 'r26, r3') -> ('mr', 'r30, r3'); 8: ('mr', 'r27, r6') -> ('mr', 'r31, r6'); 10: ('mr', 'r31, r3') -> ('mr', 'r21, r3'); 11: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 15: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 20: ('mr', 'r30, r3') -> ('mr', 'r20, r3'); 23: ('srwi', 'r29, r3, 1') -> ('srwi', 'r19, r3, 1'); 24: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 28: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 31: ('cmpwi', 'r30, 0') -> ('cmpwi', 'r20, 0'); 32: ('mr', 'r28, r3') -> ('mr', 'r18, r3'); 36: ('cmpwi', 'r27, 0') -> ('cmpwi', 'r31, 0')
|
||||
Round2 VmBlobPackCommon | cache actual blob data count before source offset | sha256=49b2dd2afcd3 | structural/exact=(0, 244); instructions=668/668; 5: ('mr', 'r26, r3') -> ('mr', 'r30, r3'); 8: ('mr', 'r27, r6') -> ('mr', 'r31, r6'); 10: ('mr', 'r31, r3') -> ('mr', 'r21, r3'); 11: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 15: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 20: ('mr', 'r30, r3') -> ('mr', 'r20, r3'); 23: ('srwi', 'r29, r3, 1') -> ('srwi', 'r19, r3, 1'); 24: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 28: ('mr', 'r3, r26') -> ('mr', 'r3, r30'); 31: ('cmpwi', 'r30, 0') -> ('cmpwi', 'r20, 0'); 32: ('mr', 'r28, r3') -> ('mr', 'r18, r3'); 36: ('cmpwi', 'r27, 0') -> ('cmpwi', 'r31, 0')
|
||||
Round2 VmBlobPackCommon: batch 4 successful distinct builds/5 forms, best=(0, 244).
|
||||
Round2 capacity-error continuation: restored only Pack declaration-search fuzzy best242 versus244; no exact result; quick gate allseven PASS with committed BS2Init gain, regressions0/forbidden0/readability0. Pack140 compiled declaration permutations logged in /tmp/fz1.r2.vm-pack.decl.txt; four distinct successful structural sourceforms also logged, all rejected/no retained VM edits.
|
||||
Round2 VmBlobUnpack: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 VmBlobUnpack | format string readonly pointer and getter cast | sha256=99071e73b333 | structural/exact=(0, 141); instructions=517/517; 9: ('mr', 'r24, r3') -> ('mr', 'r25, r3'); 17: ('mr', 'r18, r3') -> ('mr', 'r19, r3'); 19: ('mr', 'r23, r3') -> ('mr', 'r21, r3'); 20: ('mr', 'r3, r18') -> ('mr', 'r3, r19'); 22: ('cmpwi', 'r24, 0') -> ('cmpwi', 'r25, 0'); 23: ('srwi', 'r22, r3, 1') -> ('srwi', 'r20, r3, 1'); 25: ('cmpwi', 'r23, 0') -> ('cmpwi', 'r21, 0'); 29: ('lwz', 'r25, 0(r24)') -> ('lwz', 'r23, 0(r25)'); 30: ('li', 'r26, 0') -> ('li', 'r22, 0'); 35: ('mr', 'r7, r23') -> ('mr', 'r7, r21'); 36: ('mr', 'r8, r22') -> ('mr', 'r8, r20'); 66: ('lwz', 'r0, 4(r24)') -> ('lwz', 'r0, 4(r25)')
|
||||
Round2 VmBlobUnpack | packing parser signed counts explicitly decoded from unsigned field | sha256=becb7a7f45ca | structural/exact=(1, 142); instructions=517/517; 9: ('mr', 'r24, r3') -> ('mr', 'r25, r3'); 17: ('mr', 'r18, r3') -> ('mr', 'r19, r3'); 19: ('mr', 'r23, r3') -> ('mr', 'r21, r3'); 20: ('mr', 'r3, r18') -> ('mr', 'r3, r19'); 22: ('cmpwi', 'r24, 0') -> ('cmpwi', 'r25, 0'); 23: ('srwi', 'r22, r3, 1') -> ('srwi', 'r20, r3, 1'); 25: ('cmpwi', 'r23, 0') -> ('cmpwi', 'r21, 0'); 29: ('lwz', 'r25, 0(r24)') -> ('lwz', 'r23, 0(r25)'); 30: ('li', 'r26, 0') -> ('li', 'r22, 0'); 35: ('mr', 'r7, r23') -> ('mr', 'r7, r21'); 36: ('mr', 'r8, r22') -> ('mr', 'r8, r20'); 66: ('lwz', 'r0, 4(r24)') -> ('lwz', 'r0, 4(r25)')
|
||||
Round2 VmBlobUnpack | native signed inner iteration index | sha256=2f000b72e0e3 | structural/exact=(1, 141); instructions=517/517; 9: ('mr', 'r24, r3') -> ('mr', 'r25, r3'); 17: ('mr', 'r18, r3') -> ('mr', 'r19, r3'); 19: ('mr', 'r23, r3') -> ('mr', 'r21, r3'); 20: ('mr', 'r3, r18') -> ('mr', 'r3, r19'); 22: ('cmpwi', 'r24, 0') -> ('cmpwi', 'r25, 0'); 23: ('srwi', 'r22, r3, 1') -> ('srwi', 'r20, r3, 1'); 25: ('cmpwi', 'r23, 0') -> ('cmpwi', 'r21, 0'); 29: ('lwz', 'r25, 0(r24)') -> ('lwz', 'r23, 0(r25)'); 30: ('li', 'r26, 0') -> ('li', 'r22, 0'); 35: ('mr', 'r7, r23') -> ('mr', 'r7, r21'); 36: ('mr', 'r8, r22') -> ('mr', 'r8, r20'); 66: ('lwz', 'r0, 4(r24)') -> ('lwz', 'r0, 4(r25)')
|
||||
Round2 VmBlobUnpack | unpack storage initialized through native 64-bit word | sha256=b240d8ab078b | structural/exact=(0, 141); instructions=517/517; 9: ('mr', 'r24, r3') -> ('mr', 'r25, r3'); 17: ('mr', 'r18, r3') -> ('mr', 'r19, r3'); 19: ('mr', 'r23, r3') -> ('mr', 'r21, r3'); 20: ('mr', 'r3, r18') -> ('mr', 'r3, r19'); 22: ('cmpwi', 'r24, 0') -> ('cmpwi', 'r25, 0'); 23: ('srwi', 'r22, r3, 1') -> ('srwi', 'r20, r3, 1'); 25: ('cmpwi', 'r23, 0') -> ('cmpwi', 'r21, 0'); 29: ('lwz', 'r25, 0(r24)') -> ('lwz', 'r23, 0(r25)'); 30: ('li', 'r26, 0') -> ('li', 'r22, 0'); 35: ('mr', 'r7, r23') -> ('mr', 'r7, r21'); 36: ('mr', 'r8, r22') -> ('mr', 'r8, r20'); 66: ('lwz', 'r0, 4(r24)') -> ('lwz', 'r0, 4(r25)')
|
||||
Round2 VmBlobUnpack | cursor-count initialization chain | sha256=c705da6cafe9 | structural/exact=(0, 141); instructions=517/517; 9: ('mr', 'r24, r3') -> ('mr', 'r25, r3'); 17: ('mr', 'r18, r3') -> ('mr', 'r19, r3'); 19: ('mr', 'r23, r3') -> ('mr', 'r21, r3'); 20: ('mr', 'r3, r18') -> ('mr', 'r3, r19'); 22: ('cmpwi', 'r24, 0') -> ('cmpwi', 'r25, 0'); 23: ('srwi', 'r22, r3, 1') -> ('srwi', 'r20, r3, 1'); 25: ('cmpwi', 'r23, 0') -> ('cmpwi', 'r21, 0'); 29: ('lwz', 'r25, 0(r24)') -> ('lwz', 'r23, 0(r25)'); 30: ('li', 'r26, 0') -> ('li', 'r22, 0'); 35: ('mr', 'r7, r23') -> ('mr', 'r7, r21'); 36: ('mr', 'r8, r22') -> ('mr', 'r8, r20'); 66: ('lwz', 'r0, 4(r24)') -> ('lwz', 'r0, 4(r25)')
|
||||
Round2 VmBlobUnpack: batch 5 successful distinct builds/5 forms, best=(0, 141).
|
||||
Round2 VmBlobUnpack structural check: frame/count aligned517, 141 allocation operands across two format passes; blob itself mutated (offset advances), cannot make whole object const. Tested readonly format, unsigned parser output/signed decode, native signed iterator, 64-bit storage init and counter chain before100decl trials. DS improved only127operands, no exact, restored.
|
||||
Round2 VmWinEmuWrite: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 VmWinEmuWrite | conversion object readonly binding | sha256=341758d05b4c | structural/exact=(0, 5); instructions=67/67; 13: ('mr', 'r29, r3') -> ('mr', 'r27, r3'); 23: ('rlwinm', 'r27, r0, 0, 0, 0x1e') -> ('rlwinm', 'r29, r0, 0, 0, 0x1e'); 25: ('subf', 'r3, r28, r27') -> ('subf', 'r3, r28, r29'); 36: ('lwz', 'r5, 0(r29)') -> ('lwz', 'r5, 0(r27)'); 58: ('cmplw', 'r28, r27') -> ('cmplw', 'r28, r29')
|
||||
Round2 VmWinEmuWrite | constant string payload cached separately | sha256=5631775d8bae | structural/exact=(6, 54); instructions=65/67; 13: ('beq', '180') -> ('mr', 'r27, r3'); 14: ('lbz', 'r0, 8(r3)') -> ('beq', '184'); 15: ('cmplwi', 'r0, 3') -> ('lbz', 'r0, 8(r3)'); 16: ('bne', '168') -> ('cmplwi', 'r0, 3'); 17: ('lwz', 'r29, 0(r3)') -> ('bne', '172'); 18: ('li', 'r28, 0') -> ('lwz', 'r3, 0(r3)'); 19: ('li', 'r30, 0x80') -> ('li', 'r28, 0'); 20: ('li', 'r31, 0') -> ('li', 'r30, 0x80'); 21: ('lwz', 'r0, 4(r29)') -> ('li', 'r31, 0'); 22: ('rlwinm', 'r27, r0, 0, 0, 0x1e') -> ('lwz', 'r0, 4(r3)'); 23: ('b', '132') -> ('rlwinm', 'r29, r0, 0, 0, 0x1e'); 24: ('subf', 'r3, r28, r27') -> ('b', '136')
|
||||
Round2 VmWinEmuWrite | length loop checked before offset initialization | sha256=f9fe5d39bf08 | structural/exact=(0, 5); instructions=67/67; 13: ('mr', 'r29, r3') -> ('mr', 'r27, r3'); 23: ('rlwinm', 'r27, r0, 0, 0, 0x1e') -> ('rlwinm', 'r29, r0, 0, 0, 0x1e'); 25: ('subf', 'r3, r28, r27') -> ('subf', 'r3, r28, r29'); 36: ('lwz', 'r5, 0(r29)') -> ('lwz', 'r5, 0(r27)'); 58: ('cmplw', 'r28, r27') -> ('cmplw', 'r28, r29')
|
||||
Round2 VmWinEmuWrite | data pointer advances typed UTF16 cursor | sha256=ee4e6b0fdc48 | structural/exact=(11, 47); instructions=66/67; 13: ('beq', '184') -> ('mr', 'r27, r3'); 14: ('lbz', 'r0, 8(r3)') -> ('beq', '184'); 15: ('cmplwi', 'r0, 3') -> ('lbz', 'r0, 8(r3)'); 16: ('bne', '172') -> ('cmplwi', 'r0, 3'); 17: ('lwz', 'r3, 0(r3)') -> ('bne', '172'); 18: ('li', 'r29, 0') -> ('lwz', 'r3, 0(r3)'); 19: ('li', 'r30, 0x80') -> ('li', 'r28, 0'); 20: ('li', 'r31, 0') -> ('li', 'r30, 0x80'); 21: ('lwz', 'r0, 4(r3)') -> ('li', 'r31, 0'); 22: ('lwz', 'r27, 0(r3)') -> ('lwz', 'r0, 4(r3)'); 23: ('rlwinm', 'r28, r0, 0, 0, 0x1e') -> ('rlwinm', 'r29, r0, 0, 0, 0x1e'); 24: ('b', '132') -> ('b', '136')
|
||||
Round2 VmWinEmuWrite: batch 4 successful distinct builds/4 forms, best=(0, 5).
|
||||
Round2 VmWinEmuWrite structural frame/count67aligned, only five object/length register differences. Readonly inputobject/payload, loadorder and typedcursor forms before three-leading-local permutation; no forced reload or frame-layout evidence.
|
||||
Round2 CHANSVmAddExe: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 CHANSVmAddExe | third argument actual module type word instead of context pointer | sha256=8c716defbed6 | structural/exact=(0, 16); instructions=254/254; 5: ('lwz', 'r29, 0x28(r3)') -> ('lwz', 'r27, 0x28(r3)'); 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 9: ('lwz', 'r28, 8(r29)') -> ('lwz', 'r28, 8(r27)'); 10: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 21: ('lbz', 'r0, 0xc(r29)') -> ('lbz', 'r0, 0xc(r27)'); 22: ('cmplw', 'r0, r27') -> ('cmplw', 'r0, r29'); 26: ('lbz', 'r0, 4(r29)') -> ('lbz', 'r0, 4(r27)'); 40: ('addi', 'r31, r29, 0x20') -> ('addi', 'r31, r27, 0x20'); 43: ('stw', 'r3, 0x20(r29)') -> ('stw', 'r3, 0x20(r27)'); 44: ('stw', 'r0, 0x24(r29)') -> ('stw', 'r0, 0x24(r27)'); 45: ('stw', 'r29, 0x28(r29)') -> ('stw', 'r27, 0x28(r27)'); 46: ('lwz', 'r0, 0x30(r29)') -> ('lwz', 'r0, 0x30(r27)')
|
||||
Round2 CHANSVmAddExe | module header input readonly view until executable conversion | sha256=9a8d8a908d48 | structural/exact=(0, 16); instructions=254/254; 5: ('lwz', 'r29, 0x28(r3)') -> ('lwz', 'r27, 0x28(r3)'); 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 9: ('lwz', 'r28, 8(r29)') -> ('lwz', 'r28, 8(r27)'); 10: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 21: ('lbz', 'r0, 0xc(r29)') -> ('lbz', 'r0, 0xc(r27)'); 22: ('cmplw', 'r0, r27') -> ('cmplw', 'r0, r29'); 26: ('lbz', 'r0, 4(r29)') -> ('lbz', 'r0, 4(r27)'); 40: ('addi', 'r31, r29, 0x20') -> ('addi', 'r31, r27, 0x20'); 43: ('stw', 'r3, 0x20(r29)') -> ('stw', 'r3, 0x20(r27)'); 44: ('stw', 'r0, 0x24(r29)') -> ('stw', 'r0, 0x24(r27)'); 45: ('stw', 'r29, 0x28(r29)') -> ('stw', 'r27, 0x28(r27)'); 46: ('lwz', 'r0, 0x30(r29)') -> ('lwz', 'r0, 0x30(r27)')
|
||||
Round2 CHANSVmAddExe | module begins through actual trailing member | sha256=3e2759673a29 | structural/exact=(7, 26); instructions=254/254; 5: ('lwz', 'r29, 0x28(r3)') -> ('lwz', 'r27, 0x28(r3)'); 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 9: ('lwz', 'r31, 8(r29)') -> ('lwz', 'r28, 8(r27)'); 10: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 15: ('cmplwi', 'r31, 0x80') -> ('cmplwi', 'r28, 0x80'); 17: ('clrlwi.', 'r0, r31, 0x1b') -> ('clrlwi.', 'r0, r28, 0x1b'); 21: ('lbz', 'r0, 0xc(r29)') -> ('lbz', 'r0, 0xc(r27)'); 22: ('cmplw', 'r0, r27') -> ('cmplw', 'r0, r29'); 26: ('lbz', 'r0, 4(r29)') -> ('lbz', 'r0, 4(r27)'); 33: ('cmplw', 'r3, r31') -> ('cmplw', 'r3, r28'); 38: ('addi', 'r0, r31, -0x20') -> ('li', 'r3, 0'); 39: ('li', 'r3, 0') -> ('addi', 'r0, r28, -0x20')
|
||||
Round2 CHANSVmAddExe | instruction image type readonly incoming context binding | sha256=404541f37563 | BUILD FAILED File: src\channelScript\CHANSVm.c # ------------------------------------ # 6277: CHANSVmAddExe(CHANSVm* vm, vmS32 unk0, const CHANSVm* execCtx) { # Error: ^ # (10563) identifier 'CHANSVmAddExe(struct CHANSVm *, long, struct CHANSVm # *)' redeclared as 'long (struct CHANSVm *, long, const struct CHANSVm *)' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 CHANSVmAddExe | method address association name plus table base first | sha256=b52274aa9f42 | structural/exact=(14, 85); instructions=253/254; 5: ('lwz', 'r29, 0x28(r3)') -> ('lwz', 'r27, 0x28(r3)'); 7: ('mr', 'r27, r5') -> ('mr', 'r29, r5'); 9: ('lwz', 'r28, 8(r29)') -> ('lwz', 'r28, 8(r27)'); 10: ('mr', 'r3, r29') -> ('mr', 'r3, r27'); 20: ('b', '908') -> ('b', '912'); 21: ('lbz', 'r0, 0xc(r29)') -> ('lbz', 'r0, 0xc(r27)'); 22: ('cmplw', 'r0, r27') -> ('cmplw', 'r0, r29'); 25: ('b', '888') -> ('b', '892'); 26: ('lbz', 'r0, 4(r29)') -> ('lbz', 'r0, 4(r27)'); 30: ('b', '868') -> ('b', '872'); 36: ('b', '844') -> ('b', '848'); 40: ('addi', 'r31, r29, 0x20') -> ('addi', 'r31, r27, 0x20')
|
||||
Round2 CHANSVmAddExe: batch 4 successful distinct builds/5 forms, best=(0, 16).
|
||||
Round2 CHANSVmAddExe: actual third input is module type word (only compared to ModuleHeader.type), tested TU-guarded corrected prototype, readonly header/context, real trailing member boundary and address association. Four successful sourceforms, one const-pointer prototype conflicting build excluded. Target254aligned/frame30 only16 operands; DS52real declaration permutations no gain, restored all source/header.
|
||||
Round2 CHANSVmLinkModules: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 CHANSVmLinkModules | dispatch table readonly input view | sha256=f6487c020611 | structural/exact=(0, 43); instructions=189/189; 13: ('lwz', 'r25, 0x18(r3)') -> ('lwz', 'r23, 0x18(r3)'); 22: ('stw', 'r25, 4(r3)') -> ('stw', 'r23, 4(r3)'); 23: ('lwz', 'r27, 0x40(r25)') -> ('lwz', 'r25, 0x40(r23)'); 24: ('lwz', 'r23, 0x38(r22)') -> ('lwz', 'r26, 0x38(r22)'); 26: ('li', 'r26, 0') -> ('li', 'r27, 0'); 30: ('lwz', 'r5, 0x14(r23)') -> ('lwz', 'r5, 0x14(r26)'); 31: ('lwzx', 'r6, r27, r21') -> ('lwzx', 'r6, r25, r21'); 35: ('lwz', 'r0, 4(r25)') -> ('lwz', 'r0, 4(r23)'); 36: ('add', 'r4, r27, r3') -> ('add', 'r4, r25, r3'); 38: ('add', 'r0, r25, r0') -> ('add', 'r0, r23, r0'); 44: ('addi', 'r3, r23, 0x18') -> ('addi', 'r3, r26, 0x18'); 48: ('lwz', 'r0, 0x18(r25)') -> ('lwz', 'r0, 0x18(r23)')
|
||||
Round2 CHANSVmLinkModules | entry copied with constant ownership | sha256=6a95dd865434 | structural/exact=(0, 43); instructions=189/189; 13: ('lwz', 'r25, 0x18(r3)') -> ('lwz', 'r23, 0x18(r3)'); 22: ('stw', 'r25, 4(r3)') -> ('stw', 'r23, 4(r3)'); 23: ('lwz', 'r27, 0x40(r25)') -> ('lwz', 'r25, 0x40(r23)'); 24: ('lwz', 'r23, 0x38(r22)') -> ('lwz', 'r26, 0x38(r22)'); 26: ('li', 'r26, 0') -> ('li', 'r27, 0'); 30: ('lwz', 'r5, 0x14(r23)') -> ('lwz', 'r5, 0x14(r26)'); 31: ('lwzx', 'r6, r27, r21') -> ('lwzx', 'r6, r25, r21'); 35: ('lwz', 'r0, 4(r25)') -> ('lwz', 'r0, 4(r23)'); 36: ('add', 'r4, r27, r3') -> ('add', 'r4, r25, r3'); 38: ('add', 'r0, r25, r0') -> ('add', 'r0, r23, r0'); 44: ('addi', 'r3, r23, 0x18') -> ('addi', 'r3, r26, 0x18'); 48: ('lwz', 'r0, 0x18(r25)') -> ('lwz', 'r0, 0x18(r23)')
|
||||
Round2 CHANSVmLinkModules | entry inspected through readonly pointer | sha256=ceeb13825353 | structural/exact=(8, 52); instructions=189/189; 13: ('lwz', 'r25, 0x18(r3)') -> ('lwz', 'r23, 0x18(r3)'); 22: ('stw', 'r25, 4(r3)') -> ('stw', 'r23, 4(r3)'); 23: ('lwz', 'r27, 0x40(r25)') -> ('lwz', 'r25, 0x40(r23)'); 24: ('lwz', 'r23, 0x38(r22)') -> ('lwz', 'r26, 0x38(r22)'); 26: ('li', 'r26, 0') -> ('li', 'r27, 0'); 30: ('lwz', 'r5, 0x14(r23)') -> ('lwz', 'r5, 0x14(r26)'); 31: ('cmpwi', 'r5, 0') -> ('lwzx', 'r6, r25, r21'); 32: ('beq', '116') -> ('cmpwi', 'r5, 0'); 33: ('lwzx', 'r6, r27, r21') -> ('beq', '112'); 34: ('lwz', 'r0, 4(r25)') -> ('clrlwi', 'r3, r6, 8'); 35: ('clrlwi', 'r3, r6, 8') -> ('lwz', 'r0, 4(r23)'); 36: ('add', 'r4, r27, r3') -> ('add', 'r4, r25, r3')
|
||||
Round2 CHANSVmLinkModules | module index native signed count | sha256=c16a928e5687 | structural/exact=(1, 44); instructions=189/189; 13: ('lwz', 'r25, 0x18(r3)') -> ('lwz', 'r23, 0x18(r3)'); 22: ('stw', 'r25, 4(r3)') -> ('stw', 'r23, 4(r3)'); 23: ('lwz', 'r27, 0x40(r25)') -> ('lwz', 'r25, 0x40(r23)'); 24: ('lwz', 'r23, 0x38(r22)') -> ('lwz', 'r26, 0x38(r22)'); 26: ('li', 'r26, 0') -> ('li', 'r27, 0'); 30: ('lwz', 'r5, 0x14(r23)') -> ('lwz', 'r5, 0x14(r26)'); 31: ('lwzx', 'r6, r27, r21') -> ('lwzx', 'r6, r25, r21'); 35: ('lwz', 'r0, 4(r25)') -> ('lwz', 'r0, 4(r23)'); 36: ('add', 'r4, r27, r3') -> ('add', 'r4, r25, r3'); 38: ('add', 'r0, r25, r0') -> ('add', 'r0, r23, r0'); 44: ('addi', 'r3, r23, 0x18') -> ('addi', 'r3, r26, 0x18'); 48: ('lwz', 'r0, 0x18(r25)') -> ('lwz', 'r0, 0x18(r23)')
|
||||
Round2 CHANSVmLinkModules: batch 4 successful distinct builds/4 forms, best=(0, 43).
|
||||
Round2 CHANSVmLinkModules structural diagnosis:189/189frame30 aligned,43 allocation operands. DispatchEntry8-byte temporary is not reloaded after a self store; target single direct field loads, no volatility proof. Read-only table/value/pointer entry boundary and signed loop count before real local declaration search.
|
||||
Round2 CHANSVmStep: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 CHANSVmStep: target1253instructions/framef0, source count aligned but default step branch incorrectly modeled as branchless +=(count==0), loop target first jumps to cmp/countpostdecrement at1237 rather than source do/count!=1. Test real branch/default and top-tested loop forms before scalar register declarations.
|
||||
Round2 LinkModules four structural forms+13decl builds no exact, restored; no source/header retained.
|
||||
Round2 CHANSVmStep | default step count explicit branch | sha256=b4399d1d991c | structural/exact=(60, 1229); instructions=1254/1253; 12: ('lis', 'r27, 0') -> ('lis', 'r28, 0'); 15: ('addi', 'r27, r27, 0') -> ('addi', 'r28, r28, 0'); 22: ('lis', 'r31, 0') -> ('lfd', 'f31, 0(0)'); 23: ('lfd', 'f31, 0(0)') -> ('addi', 'r24, r1, 0x30'); 25: ('addi', 'r28, r1, 0x30') -> ('li', 'r29, 0'); 26: ('addi', 'r31, r31, 0') -> ('li', 'r30, -2'); 27: ('li', 'r29, 0') -> ('b', '4840'); 28: ('li', 'r30, -2') -> ('lbz', 'r0, 0x4d(r15)'); 29: ('lbz', 'r0, 0x4d(r15)') -> ('cmpwi', 'r0, 0'); 30: ('cmpwi', 'r0, 0') -> ('beq', '32'); 31: ('beq', '32') -> ('lbz', 'r0, 0x4e(r15)'); 32: ('lbz', 'r0, 0x4e(r15)') -> ('cmpwi', 'r0, 0')
|
||||
Round2 CHANSVmStep | step loop has precondition and post decrement | sha256=0346de841d6e | structural/exact=(60, 1229); instructions=1255/1253; 12: ('lis', 'r27, 0') -> ('lis', 'r28, 0'); 15: ('addi', 'r27, r27, 0') -> ('addi', 'r28, r28, 0'); 22: ('lis', 'r31, 0') -> ('lfd', 'f31, 0(0)'); 23: ('lfd', 'f31, 0(0)') -> ('addi', 'r24, r1, 0x30'); 25: ('addi', 'r28, r1, 0x30') -> ('li', 'r29, 0'); 26: ('addi', 'r31, r31, 0') -> ('li', 'r30, -2'); 27: ('li', 'r29, 0') -> ('b', '4840'); 28: ('li', 'r30, -2') -> ('lbz', 'r0, 0x4d(r15)'); 29: ('b', '4844') -> ('cmpwi', 'r0, 0'); 30: ('lbz', 'r0, 0x4d(r15)') -> ('beq', '32'); 31: ('cmpwi', 'r0, 0') -> ('lbz', 'r0, 0x4e(r15)'); 32: ('beq', '32') -> ('cmpwi', 'r0, 0')
|
||||
Round2 CHANSVmStep | step count and top tested loop use positive bound | sha256=6e6bf40c3894 | structural/exact=(61, 1229); instructions=1255/1253; 12: ('lis', 'r27, 0') -> ('lis', 'r28, 0'); 15: ('addi', 'r27, r27, 0') -> ('addi', 'r28, r28, 0'); 22: ('lis', 'r31, 0') -> ('lfd', 'f31, 0(0)'); 23: ('lfd', 'f31, 0(0)') -> ('addi', 'r24, r1, 0x30'); 25: ('addi', 'r28, r1, 0x30') -> ('li', 'r29, 0'); 26: ('addi', 'r31, r31, 0') -> ('li', 'r30, -2'); 27: ('li', 'r29, 0') -> ('b', '4840'); 28: ('li', 'r30, -2') -> ('lbz', 'r0, 0x4d(r15)'); 29: ('b', '4844') -> ('cmpwi', 'r0, 0'); 30: ('lbz', 'r0, 0x4d(r15)') -> ('beq', '32'); 31: ('cmpwi', 'r0, 0') -> ('lbz', 'r0, 0x4e(r15)'); 32: ('beq', '32') -> ('cmpwi', 'r0, 0')
|
||||
Round2 CHANSVmStep | step default branch and top checked post decrement | sha256=1b0ecff39694 | structural/exact=(57, 1229); instructions=1255/1253; 12: ('lis', 'r27, 0') -> ('lis', 'r28, 0'); 15: ('addi', 'r27, r27, 0') -> ('addi', 'r28, r28, 0'); 22: ('lis', 'r31, 0') -> ('lfd', 'f31, 0(0)'); 23: ('lfd', 'f31, 0(0)') -> ('addi', 'r24, r1, 0x30'); 25: ('addi', 'r28, r1, 0x30') -> ('li', 'r29, 0'); 26: ('addi', 'r31, r31, 0') -> ('li', 'r30, -2'); 27: ('li', 'r29, 0') -> ('b', '4840'); 28: ('li', 'r30, -2') -> ('lbz', 'r0, 0x4d(r15)'); 29: ('b', '4840') -> ('cmpwi', 'r0, 0'); 30: ('lbz', 'r0, 0x4d(r15)') -> ('beq', '32'); 31: ('cmpwi', 'r0, 0') -> ('lbz', 'r0, 0x4e(r15)'); 32: ('beq', '32') -> ('cmpwi', 'r0, 0')
|
||||
Round2 CHANSVmStep | scratch operand initialization precedes default branch | sha256=a2a8f3fb20b4 | structural/exact=(68, 1238); instructions=1254/1253; 11: ('lis', 'r27, 0') -> ('cmpwi', 'r4, 0'); 12: ('mr', 'r15, r3') -> ('lis', 'r28, 0'); 13: ('mr', 'r16, r4') -> ('mr', 'r15, r3'); 14: ('addi', 'r3, r1, 0x60') -> ('mr', 'r16, r4'); 15: ('addi', 'r27, r27, 0') -> ('addi', 'r28, r28, 0'); 16: ('li', 'r4, 0') -> ('bne', '8'); 17: ('li', 'r5, 0x10') -> ('li', 'r16, 1'); 18: ('bl', '0') -> ('addi', 'r3, r1, 0x60'); 19: ('cmpwi', 'r16, 0') -> ('li', 'r4, 0'); 20: ('bne', '8') -> ('li', 'r5, 0x10'); 21: ('li', 'r16, 1') -> ('bl', '0'); 22: ('lis', 'r31, 0') -> ('lfd', 'f31, 0(0)')
|
||||
Round2 CHANSVmStep: batch 5 successful distinct builds/5 forms, best=(57, 1229).
|
||||
Round2 CHANSVmStep five successfully built branch/loop forms +13declaration swaps did not produce exact (structural57best vs baseline65; frameunchanged, loop entry and floatconstant base remain); original restored. VM twelve remainingfunctions all have>=3successfully built distinct sourceform attempts this round.
|
||||
Round2 Run: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 Run target43instructions/no frame, source11: target handoff explicitly wipes r0,r2,r3,r5,r7..r31,sp, setsLRtoentry and CTRcacheline loop with dcbz/dcbf. Targetfunctionsize0xac ends exactlynext symbol. StandardC cannot encode fixed-register reset/stackzero or directLRhandoff under noasm/register rule; test native operand order/loop/callback boundaries, preserve real function. Pool112identical first.
|
||||
Round2 Run | cache zero/flush effective-address operands in native order | sha256=12fddd98dd1b | BUILD FAILED src/BS2/BS2Mach.c -o build/43U/src/src/BS2 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/BS2/BS2Mach.d build/43U/src/src/BS2/BS2Mach.d ### mwcceppc.exe Compiler: # File: src\BS2\BS2Mach.c # -------------------------- # 247: __dcbz(0, block); # Error: ^ # (10209) illegal implicit conversion from 'unsigned char *' to # 'int' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 Run | counted while loop with explicit block decrement | sha256=74b86955990e | structural/exact=(40, 42); instructions=11/43; 1: ('cmpwi', 'r5, 0') -> ('mtlr', 'r3'); 2: ('beq', '20') -> ('li', 'r0, 0'); 3: ('dcbz', '0, r4') -> ('li', 'r2, 0'); 4: ('dcbf', '0, r4') -> ('li', 'r3, 0'); 5: ('addi', 'r4, r4, 0x20') -> ('li', 'r5, 0'); 6: ('bdnz', '-12') -> ('li', 'r7, 0'); 7: ('mr', 'r12, r3') -> ('li', 'r8, 0'); 8: ('mr', 'r3, r6') -> ('li', 'r9, 0'); 9: ('mtctr', 'r12') -> ('li', 'r10, 0'); 10: ('bctr', '') -> ('li', 'r11, 0')
|
||||
Round2 Run | entry point cached as real typed callback | sha256=1b3e7d53e350 | structural/exact=(40, 42); instructions=11/43; 1: ('cmpwi', 'r5, 0') -> ('mtlr', 'r3'); 2: ('beq', '20') -> ('li', 'r0, 0'); 3: ('dcbz', '0, r4') -> ('li', 'r2, 0'); 4: ('dcbf', '0, r4') -> ('li', 'r3, 0'); 5: ('addi', 'r4, r4, 0x20') -> ('li', 'r5, 0'); 6: ('bdnz', '-12') -> ('li', 'r7, 0'); 7: ('mr', 'r12, r3') -> ('li', 'r8, 0'); 8: ('mr', 'r3, r6') -> ('li', 'r9, 0'); 9: ('mtctr', 'r12') -> ('li', 'r10, 0'); 10: ('bctr', '') -> ('li', 'r11, 0')
|
||||
Round2 Run | cache-line cursor derived from iteration count | sha256=1a24113d1601 | structural/exact=(40, 42); instructions=11/43; 1: ('cmplwi', 'r5, 0') -> ('mtlr', 'r3'); 2: ('ble', '20') -> ('li', 'r0, 0'); 3: ('dcbz', '0, r4') -> ('li', 'r2, 0'); 4: ('dcbf', '0, r4') -> ('li', 'r3, 0'); 5: ('addi', 'r4, r4, 0x20') -> ('li', 'r5, 0'); 6: ('bdnz', '-12') -> ('li', 'r7, 0'); 7: ('mr', 'r12, r3') -> ('li', 'r8, 0'); 8: ('mr', 'r3, r6') -> ('li', 'r9, 0'); 9: ('mtctr', 'r12') -> ('li', 'r10, 0'); 10: ('bctr', '') -> ('li', 'r11, 0')
|
||||
Round2 Run: batch 3 successful distinct builds/4 forms, best=(40, 42).
|
||||
Round2 BS2StartGame: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 BS2StartGame | proven async flags volatile definitions and direct state polling | sha256=c2532e31b6d8 | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | polling through native readonly inline DVD accessor | sha256=b24e111aa15a | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | polling through local readonly DVD block view | sha256=37d3424b8e1f | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | low-level disk error native comparison form | sha256=88c7f2286e08 | structural/exact=(31, 163); instructions=400/393; 12: ('bl', '0') -> ('lwz', 'r0, 0xc(r3)'); 13: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r0, 0'); 14: ('bne', '-12') -> ('bne', '-8'); 224: ('b', '12') -> ('lwz', 'r0, 0(0)'); 225: ('bl', '0') -> ('cmpwi', 'r0, 0'); 226: ('bl', '0') -> ('beq', '-8'); 227: ('lwz', 'r4, 0(0)') -> ('lwz', 'r0, 0(0)'); 228: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r0, 2'); 229: ('beq', '-16') -> ('beq', '20'); 230: ('cmpwi', 'r4, 2') -> ('bge', '144'); 231: ('beq', '16') -> ('cmpwi', 'r0, 1'); 232: ('cmpwi', 'r4, 1') -> ('bge', '148')
|
||||
Round2 BS2StartGame: batch 4 successful distinct builds/4 forms, best=(4, 10).
|
||||
Round2 BS2StartGame structural proof: target393/source401/frame50. Target CoverBlock+0xc repeatedly loaded with no intervening call (dde0/dde8); four LowReadResult empty polls1130/117c/1290/12e8 and extra113c/129c reads after exit prove definition-levelvolatile. Source wrongly calls DVDGetCommandBlockStatus and twointerrupt calls each poll. Test TU-guarded volatile SDKstatefield, volatile callback flag, direct conststate/helper boundaries; no use-sitecasts.
|
||||
Round2 BS2StartGame | native DVD direct polling without volatile field qualification | sha256=6063994e5529 | structural/exact=(7, 14); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('addi', 'r3, r29, 0x840') -> ('addi', 'r29, r29, 0'); 10: ('stw', 'r0, 0(0)') -> ('addi', 'r30, r30, 0'); 11: ('lwz', 'r0, 0xc(r3)') -> ('addi', 'r3, r29, 0x840'); 12: ('addi', 'r30, r30, 0') -> ('lwz', 'r0, 0xc(r3)'); 14: ('bne', '-4') -> ('bne', '-8'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1')
|
||||
Round2 BS2StartGame | three real MMIO address/value/mask declaration order diBits/diValue/diAddr | sha256=c2532e31b6d8 | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | three real MMIO address/value/mask declaration order diBits/diAddr/diValue | sha256=d3d189baaea6 | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | three real MMIO address/value/mask declaration order diValue/diBits/diAddr | sha256=aa9db61e2a1f | structural/exact=(4, 12); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 365: ('li', 'r4, 2') -> ('li', 'r0, 2'); 366: ('lwz', 'r0, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 367: ('ori', 'r4, r4, 4') -> ('ori', 'r0, r0, 4'); 368: ('ori', 'r0, r0, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r0, r4') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | three real MMIO address/value/mask declaration order diValue/diAddr/diBits | sha256=97eccb9d3715 | structural/exact=(4, 12); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 365: ('li', 'r4, 2') -> ('li', 'r0, 2'); 366: ('lwz', 'r0, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 367: ('ori', 'r4, r4, 4') -> ('ori', 'r0, r0, 4'); 368: ('ori', 'r0, r0, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r0, r4') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | three real MMIO address/value/mask declaration order diAddr/diBits/diValue | sha256=843f25a1b64b | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | three real MMIO address/value/mask declaration order diAddr/diValue/diBits | sha256=95d5b060c495 | structural/exact=(4, 12); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 365: ('li', 'r4, 2') -> ('li', 'r0, 2'); 366: ('lwz', 'r0, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 367: ('ori', 'r4, r4, 4') -> ('ori', 'r0, r0, 4'); 368: ('ori', 'r0, r0, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r0, r4') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | native legacy DI mask expression owns accumulated value | sha256=7bfd5bb69ee8 | structural/exact=(9, 35); instructions=390/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 363: ('beq', '24') -> ('beq', '36'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 365: ('lwz', 'r0, 0x3024(r3)') -> ('li', 'r0, 2'); 366: ('ori', 'r0, r0, 7') -> ('lwz', 'r3, 0x3024(r4)'); 367: ('stw', 'r0, 0x3024(r3)') -> ('ori', 'r0, r0, 4'); 368: ('bl', '0') -> ('ori', 'r3, r3, 1'); 369: ('bl', '0') -> ('or', 'r0, r3, r0')
|
||||
Round2 BS2StartGame | CoverBlock pointer declared in polling block after StartingGame store | sha256=3290f961807a | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | DVD state poll modeled as do/read/conditional repeat | sha256=c5e23009b152 | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame: batch 10 successful distinct builds/10 forms, best=(4, 10).
|
||||
Round2 BS2StartGame | CoverBlock explicitly zero-initialized native DVD object | sha256=811a63690dbd | structural/exact=(6, 13); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 11: ('addi', 'r3, r29, 0') -> ('addi', 'r3, r29, 0x840'); 25: ('addi', 'r3, r29, 0x860') -> ('addi', 'r3, r29, 0x870'); 27: ('addi', 'r5, r29, 0x8ec') -> ('addi', 'r5, r29, 0x8fc'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0')
|
||||
Round2 BS2StartGame | native poll input is const-qualified in helper definition | sha256=7ce608a2755d | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | MMIO value variables initialized where first used | sha256=9e92a5d734eb | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r4, r0') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame | MMIO bit accumulation in explicit value expression | sha256=9131e8571320 | structural/exact=(4, 10); instructions=393/393; 5: ('lis', 'r29, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r29, 0'); 7: ('addi', 'r29, r29, 0') -> ('lis', 'r30, 0'); 8: ('lis', 'r30, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r29, r29, 0'); 364: ('lis', 'r3, -0x3400') -> ('lis', 'r4, -0x3400'); 366: ('lwz', 'r4, 0x3024(r3)') -> ('lwz', 'r3, 0x3024(r4)'); 368: ('ori', 'r4, r4, 1') -> ('ori', 'r3, r3, 1'); 369: ('or', 'r0, r0, r4') -> ('or', 'r0, r3, r0'); 370: ('stw', 'r0, 0x3024(r3)') -> ('stw', 'r0, 0x3024(r4)')
|
||||
Round2 BS2StartGame: batch 4 successful distinct builds/4 forms, best=(4, 10).
|
||||
Round2 BS2StartGCGame: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 BS2StartGCGame | proven asynchronous DVD state field polled inline | sha256=7abff1b2dfc8 | structural/exact=(4, 9); instructions=228/228; 5: ('lis', 'r30, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r30, 0'); 7: ('addi', 'r30, r30, 0') -> ('lis', 'r31, 0'); 8: ('lis', 'r31, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r30, r30, 0'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7'); 69: ('mullw', 'r0, r7, r6') -> ('mullw', 'r0, r5, r6'); 70: ('mullw', 'r4, r7, r5') -> ('mullw', 'r4, r5, r7')
|
||||
Round2 BS2StartGCGame | readonly native DVD polling helper boundary | sha256=f69999f3ea49 | structural/exact=(4, 9); instructions=228/228; 5: ('lis', 'r30, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r30, 0'); 7: ('addi', 'r30, r30, 0') -> ('lis', 'r31, 0'); 8: ('lis', 'r31, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r30, r30, 0'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7'); 69: ('mullw', 'r0, r7, r6') -> ('mullw', 'r0, r5, r6'); 70: ('mullw', 'r4, r7, r5') -> ('mullw', 'r4, r5, r7')
|
||||
Round2 BS2StartGCGame | DVD idle polling comparison operand order | sha256=5e41b683aab6 | structural/exact=(2, 7); instructions=228/228; 12: ('bl', '0') -> ('lwz', 'r0, 0xc(r3)'); 13: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r0, 0'); 14: ('bne', '-12') -> ('bne', '-8'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7'); 69: ('mullw', 'r0, r7, r6') -> ('mullw', 'r0, r5, r6'); 70: ('mullw', 'r4, r7, r5') -> ('mullw', 'r4, r5, r7')
|
||||
Round2 BS2StartGCGame | RTC tick multiplication native frequency-first association | sha256=615eeee1267e | structural/exact=(2, 11); instructions=228/228; 12: ('bl', '0') -> ('lwz', 'r0, 0xc(r3)'); 13: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r0, 0'); 14: ('bne', '-12') -> ('bne', '-8'); 61: ('lwz', 'r0, 0xc(r1)') -> ('lwz', 'r5, 0xc(r1)'); 62: ('lwz', 'r4, 0xf8(r4)') -> ('lwz', 'r0, 0xf8(r4)'); 64: ('add', 'r5, r0, r3') -> ('add', 'r7, r5, r3'); 65: ('srwi', 'r7, r4, 2') -> ('srwi', 'r5, r0, 2'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7'); 69: ('mullw', 'r0, r7, r6') -> ('mullw', 'r0, r5, r6'); 70: ('mullw', 'r4, r7, r5') -> ('mullw', 'r4, r5, r7')
|
||||
Round2 BS2StartGCGame | RTC tick multiplication two explicit wide operands | sha256=fe9e622f15a6 | structural/exact=(2, 11); instructions=228/228; 12: ('bl', '0') -> ('lwz', 'r0, 0xc(r3)'); 13: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r0, 0'); 14: ('bne', '-12') -> ('bne', '-8'); 61: ('lwz', 'r0, 0xc(r1)') -> ('lwz', 'r5, 0xc(r1)'); 62: ('lwz', 'r4, 0xf8(r4)') -> ('lwz', 'r0, 0xf8(r4)'); 64: ('add', 'r5, r0, r3') -> ('add', 'r7, r5, r3'); 65: ('srwi', 'r7, r4, 2') -> ('srwi', 'r5, r0, 2'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7'); 69: ('mullw', 'r0, r7, r6') -> ('mullw', 'r0, r5, r6'); 70: ('mullw', 'r4, r7, r5') -> ('mullw', 'r4, r5, r7')
|
||||
Round2 BS2StartGCGame: batch 5 successful distinct builds/5 forms, best=(2, 7).
|
||||
Round2 BS2StartGCGame | actual asynchronous CoverBlock object volatile, native API pointer qualification | sha256=fd8413fa41e5 | structural/exact=(4, 13); instructions=228/228; 5: ('lis', 'r30, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r30, 0'); 7: ('addi', 'r30, r30, 0') -> ('lis', 'r31, 0'); 8: ('lis', 'r31, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r30, r30, 0'); 61: ('lwz', 'r0, 0xc(r1)') -> ('lwz', 'r5, 0xc(r1)'); 62: ('lwz', 'r4, 0xf8(r4)') -> ('lwz', 'r0, 0xf8(r4)'); 64: ('add', 'r5, r0, r3') -> ('add', 'r7, r5, r3'); 65: ('srwi', 'r7, r4, 2') -> ('srwi', 'r5, r0, 2'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7'); 69: ('mullw', 'r0, r7, r6') -> ('mullw', 'r0, r5, r6')
|
||||
Round2 BS2StartGCGame | same asynchronous object explicitly initialized | sha256=69336c56a54d | structural/exact=(6, 16); instructions=228/228; 5: ('lis', 'r30, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r30, 0'); 7: ('addi', 'r30, r30, 0') -> ('lis', 'r31, 0'); 8: ('lis', 'r31, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r30, r30, 0'); 11: ('addi', 'r3, r30, 0') -> ('addi', 'r3, r30, 0x840'); 61: ('lwz', 'r0, 0xc(r1)') -> ('lwz', 'r5, 0xc(r1)'); 62: ('lwz', 'r4, 0xf8(r4)') -> ('lwz', 'r0, 0xf8(r4)'); 64: ('add', 'r5, r0, r3') -> ('add', 'r7, r5, r3'); 65: ('srwi', 'r7, r4, 2') -> ('srwi', 'r5, r0, 2'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7')
|
||||
Round2 BS2StartGCGame | same asynchronous object polled through readonly typed inline accessor | sha256=743e85bf57b9 | structural/exact=(4, 13); instructions=228/228; 5: ('lis', 'r30, 0') -> ('li', 'r0, 1'); 6: ('li', 'r0, 1') -> ('lis', 'r30, 0'); 7: ('addi', 'r30, r30, 0') -> ('lis', 'r31, 0'); 8: ('lis', 'r31, 0') -> ('stw', 'r0, 0(0)'); 9: ('stw', 'r0, 0(0)') -> ('addi', 'r30, r30, 0'); 61: ('lwz', 'r0, 0xc(r1)') -> ('lwz', 'r5, 0xc(r1)'); 62: ('lwz', 'r4, 0xf8(r4)') -> ('lwz', 'r0, 0xf8(r4)'); 64: ('add', 'r5, r0, r3') -> ('add', 'r7, r5, r3'); 65: ('srwi', 'r7, r4, 2') -> ('srwi', 'r5, r0, 2'); 66: ('mulhwu', 'r3, r7, r5') -> ('mulhwu', 'r3, r5, r7'); 67: ('mullw', 'r4, r6, r5') -> ('mullw', 'r4, r6, r7'); 69: ('mullw', 'r0, r7, r6') -> ('mullw', 'r0, r5, r6')
|
||||
Round2 BS2StartGCGame: batch 3 successful distinct builds/3 forms, best=(4, 13).
|
||||
Round2 CheckBS2CommandStatus: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 CheckBS2CommandStatus | NAND pending stored before inline partition-size arithmetic | sha256=a11333c9c103 | structural/exact=(2, 4); instructions=406/406; 173: ('li', 'r3, 1') -> ('li', 'r6, 1'); 175: ('stw', 'r3, 0(0)') -> ('stw', 'r6, 0(0)'); 178: ('stw', 'r3, 0(0)') -> ('lwz', 'r3, 0(r4)'); 179: ('lwz', 'r3, 0(r4)') -> ('stw', 'r6, 0(0)')
|
||||
Round2 CheckBS2CommandStatus | partition count read through real constant TOC view | sha256=8d97409ca488 | structural/exact=(2, 2); instructions=406/406; 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r6, 0(0)') -> ('slwi', 'r3, r3, 3')
|
||||
Round2 CheckBS2CommandStatus | partition byte length owned by native temporary | sha256=b5dc3f0dce1f | BUILD FAILED /43U/src/src/BS2 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/BS2/BS2Mach.d build/43U/src/src/BS2/BS2Mach.d ### mwcceppc.exe Compiler: # File: src\BS2\BS2Mach.c # -------------------------- # 1136: u32 partitionBytes = ((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo); # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 CheckBS2CommandStatus | partition extent arithmetic through actual entry pointer difference | sha256=397ca5ef6f91 | structural/exact=(2, 2); instructions=406/406; 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r6, 0(0)') -> ('slwi', 'r3, r3, 3')
|
||||
Round2 CheckBS2CommandStatus: batch 3 successful distinct builds/4 forms, best=(2, 2).
|
||||
Round2 CheckBS2CommandStatus | cache size explicit value assignment instead of compound assignment | sha256=a505c4b8eb6e | structural/exact=(2, 9); instructions=406/406; 174: ('lwz', 'r5, 0(0)') -> ('lwz', 'r4, 0(0)'); 177: ('lwz', 'r3, 0(0)') -> ('lwz', 'r5, 0(0)'); 178: ('lwz', 'r4, 0(r5)') -> ('lwz', 'r3, 0(r4)'); 179: ('slwi', 'r4, r4, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r6, 0(0)') -> ('slwi', 'r3, r3, 3'); 181: ('addi', 'r4, r4, 0x1f') -> ('addi', 'r3, r3, 0x1f'); 182: ('rlwinm', 'r4, r4, 0, 0, 0x1a') -> ('rlwinm', 'r3, r3, 0, 0, 0x1a'); 183: ('add', 'r3, r3, r4') -> ('add', 'r3, r5, r3'); 194: ('lwz', 'r0, 0(r5)') -> ('lwz', 'r0, 0(r4)')
|
||||
Round2 CheckBS2CommandStatus | TOC count held before cached size accumulation | sha256=ae075242cb7d | BUILD FAILED src/BS2/BS2Mach.c -o build/43U/src/src/BS2 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/BS2/BS2Mach.d build/43U/src/src/BS2/BS2Mach.d ### mwcceppc.exe Compiler: # File: src\BS2\BS2Mach.c # -------------------------- # 1135: u32 partitionCount = ((DVDGameTOC *)DataToc)->partitionCount; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 CheckBS2CommandStatus | TOC extent held before flags and size store | sha256=8f7f40834c70 | BUILD FAILED /43U/src/src/BS2 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/BS2/BS2Mach.d build/43U/src/src/BS2/BS2Mach.d ### mwcceppc.exe Compiler: # File: src\BS2\BS2Mach.c # -------------------------- # 1135: u32 partitionBytes = ((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo); # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 CheckBS2CommandStatus | partition data extent through native readonly inline helper | sha256=275a12fe9f3a | structural/exact=(4, 12); instructions=406/406; 173: ('li', 'r5, 1') -> ('li', 'r6, 1'); 174: ('lwz', 'r6, 0(0)') -> ('lwz', 'r4, 0(0)'); 175: ('stw', 'r5, 0(0)') -> ('stw', 'r6, 0(0)'); 177: ('lwz', 'r3, 0(0)') -> ('lwz', 'r5, 0(0)'); 178: ('lwz', 'r4, 0(r6)') -> ('lwz', 'r3, 0(r4)'); 179: ('slwi', 'r4, r4, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r5, 0(0)') -> ('slwi', 'r3, r3, 3'); 181: ('addi', 'r4, r4, 0x1f') -> ('addi', 'r3, r3, 0x1f'); 182: ('rlwinm', 'r4, r4, 0, 0, 0x1a') -> ('rlwinm', 'r3, r3, 0, 0, 0x1a'); 183: ('addi', 'r4, r4, 0x20') -> ('add', 'r3, r5, r3'); 184: ('add', 'r3, r3, r4') -> ('addi', 'r3, r3, 0x20'); 194: ('lwz', 'r0, 0(r6)') -> ('lwz', 'r0, 0(r4)')
|
||||
Round2 CheckBS2CommandStatus | cache command flag and length compound expression | sha256=2e5970994232 | structural/exact=(4, 12); instructions=406/406; 173: ('li', 'r4, 1') -> ('li', 'r6, 1'); 174: ('lwz', 'r5, 0(0)') -> ('lwz', 'r4, 0(0)'); 175: ('stw', 'r4, 0(0)') -> ('stw', 'r6, 0(0)'); 177: ('lwz', 'r3, 0(0)') -> ('lwz', 'r5, 0(0)'); 178: ('stw', 'r4, 0(0)') -> ('lwz', 'r3, 0(r4)'); 179: ('lwz', 'r4, 0(r5)') -> ('stw', 'r6, 0(0)'); 180: ('slwi', 'r4, r4, 3') -> ('slwi', 'r3, r3, 3'); 181: ('addi', 'r4, r4, 0x1f') -> ('addi', 'r3, r3, 0x1f'); 182: ('rlwinm', 'r4, r4, 0, 0, 0x1a') -> ('rlwinm', 'r3, r3, 0, 0, 0x1a'); 183: ('addi', 'r4, r4, 0x20') -> ('add', 'r3, r5, r3'); 184: ('add', 'r3, r3, r4') -> ('addi', 'r3, r3, 0x20'); 194: ('lwz', 'r0, 0(r5)') -> ('lwz', 'r0, 0(r4)')
|
||||
Round2 CheckBS2CommandStatus: batch 3 successful distinct builds/5 forms, best=(2, 9).
|
||||
Round2 BS2Tick: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 CheckBS2CommandStatus406/406frame20 single scheduled pair slwi(count,3)/storeCacheCommandComplete. Flags not immediately reloaded, no volatile proof. Four initial+five expression/TOC-helper boundaries, no exactgain; original restored. Round2 BS2StartGCGame source228aligned, inline field vs external call plus native64-bit frequency-times-seconds operand allocation. Five initial+three globalvolatilecontext forms tested; scalar DS120attempts evidence /tmp/fz1.r2.mach-gc.decl.txt. Neither matched; use originalpolymorphic SDKprototype until exactqualified candidate.
|
||||
Round2 BS2Tick target1940/source1934/framea0; early0x80000000 hardware/boot-header base sharing saves six extra loads vs target; cache/progress store scheduling and loader callback output-local order. Investigate typed hardware input/three real loader output locals, callback boundary and title prefix interpretation before declarations.
|
||||
Round2 BS2Tick | loader outputs represented as three independent addressable locals | sha256=eca81a26dbb4 | structural/exact=(169, 1664); instructions=1934/1940; 14: ('bgt', '7624') -> ('bgt', '7648'); 38: ('li', 'r27, 0') -> ('li', 'r4, 1'); 39: ('addi', 'r5, r29, 0x9c0') -> ('addi', 'r6, r30, 0x30d4'); 40: ('addi', 'r3, r29, 0x840') -> ('li', 'r27, 0'); 41: ('addi', 'r0, r30, 0x30d4') -> ('addi', 'r5, r29, 0x9c0'); 42: ('stw', 'r27, 0x3a0(r5)') -> ('stw', 'r6, 0(0)'); 43: ('li', 'r4, 1') -> ('addi', 'r3, r29, 0x840'); 44: ('stw', 'r0, 0(0)') -> ('stw', 'r27, 0x3a0(r5)'); 50: ('stw', 'r27, 0xc(r3)') -> ('lwz', 'r0, 0(0)'); 51: ('lwz', 'r0, 0(0)') -> ('stw', 'r4, 0(0)'); 52: ('stw', 'r4, 0(0)') -> ('cmpwi', 'r0, 0'); 53: ('cmpwi', 'r0, 0') -> ('stw', 'r27, 0xc(r3)')
|
||||
Round2 BS2Tick | disc header hardware fields accessed through actual readonly disk type | sha256=d780d8f8c64d | BUILD FAILED _dep.py build/43U/src/src/BS2/BS2Mach.d build/43U/src/src/BS2/BS2Mach.d ### mwcceppc.exe Compiler: # File: src\BS2\BS2Mach.c # -------------------------- # 1392: if ((((const DVDDiskID *)0x80000000)->wiiMagic & 0xf0000000) == 0) # Error: ^ # (10393) 'wiiMagic' is not a member of class 'struct DVDDiskID' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 BS2Tick | pending transfer counter reset before progress pointer definition | sha256=8f90cc1c4c18 | structural/exact=(136, 1673); instructions=1934/1940; 14: ('bgt', '7624') -> ('bgt', '7648'); 37: ('lis', 'r27, -0x8000') -> ('lis', 'r30, -0x8000'); 38: ('li', 'r30, 0') -> ('li', 'r4, 1'); 39: ('addi', 'r5, r29, 0x9c0') -> ('addi', 'r6, r30, 0x30d4'); 40: ('addi', 'r3, r29, 0x840') -> ('li', 'r27, 0'); 41: ('addi', 'r0, r27, 0x30d4') -> ('addi', 'r5, r29, 0x9c0'); 42: ('stw', 'r30, 0x3a0(r5)') -> ('stw', 'r6, 0(0)'); 43: ('li', 'r4, 1') -> ('addi', 'r3, r29, 0x840'); 44: ('stw', 'r0, 0(0)') -> ('stw', 'r27, 0x3a0(r5)'); 45: ('stw', 'r30, 0x4dc0(r5)') -> ('stw', 'r27, 0x4dc0(r5)'); 46: ('stw', 'r30, 0x5de0(r5)') -> ('stw', 'r27, 0x5de0(r5)'); 47: ('stw', 'r30, 0x30d4(r27)') -> ('stw', 'r27, 0x30d4(r30)')
|
||||
Round2 BS2Tick | loader-output argument order cached through actual callback type | sha256=3ea3041a46ec | structural/exact=(136, 1665); instructions=1934/1940; 14: ('bgt', '7624') -> ('bgt', '7648'); 38: ('li', 'r27, 0') -> ('li', 'r4, 1'); 39: ('addi', 'r5, r29, 0x9c0') -> ('addi', 'r6, r30, 0x30d4'); 40: ('addi', 'r3, r29, 0x840') -> ('li', 'r27, 0'); 41: ('addi', 'r0, r30, 0x30d4') -> ('addi', 'r5, r29, 0x9c0'); 42: ('stw', 'r27, 0x3a0(r5)') -> ('stw', 'r6, 0(0)'); 43: ('li', 'r4, 1') -> ('addi', 'r3, r29, 0x840'); 44: ('stw', 'r0, 0(0)') -> ('stw', 'r27, 0x3a0(r5)'); 50: ('stw', 'r27, 0xc(r3)') -> ('lwz', 'r0, 0(0)'); 51: ('lwz', 'r0, 0(0)') -> ('stw', 'r4, 0(0)'); 52: ('stw', 'r4, 0(0)') -> ('cmpwi', 'r0, 0'); 53: ('cmpwi', 'r0, 0') -> ('stw', 'r27, 0xc(r3)')
|
||||
Round2 BS2Tick | native title prefix signed character interpretation | sha256=7bf88e91e6ce | structural/exact=(106, 1681); instructions=1937/1940; 14: ('bgt', '7636') -> ('bgt', '7648'); 38: ('li', 'r27, 0') -> ('li', 'r4, 1'); 39: ('addi', 'r5, r29, 0x9c0') -> ('addi', 'r6, r30, 0x30d4'); 40: ('addi', 'r3, r29, 0x840') -> ('li', 'r27, 0'); 41: ('addi', 'r0, r30, 0x30d4') -> ('addi', 'r5, r29, 0x9c0'); 42: ('stw', 'r27, 0x3a0(r5)') -> ('stw', 'r6, 0(0)'); 43: ('li', 'r4, 1') -> ('addi', 'r3, r29, 0x840'); 44: ('stw', 'r0, 0(0)') -> ('stw', 'r27, 0x3a0(r5)'); 50: ('stw', 'r27, 0xc(r3)') -> ('lwz', 'r0, 0(0)'); 51: ('lwz', 'r0, 0(0)') -> ('stw', 'r4, 0(0)'); 52: ('stw', 'r4, 0(0)') -> ('cmpwi', 'r0, 0'); 53: ('cmpwi', 'r0, 0') -> ('stw', 'r27, 0xc(r3)')
|
||||
Round2 BS2Tick: batch 4 successful distinct builds/5 forms, best=(106, 1681).
|
||||
Round2 CheckBS2CommandStatus | native count/old-size value block initialization order 0 | sha256=d4a6269f0ecc | structural/exact=(2, 6); instructions=406/406; 173: ('li', 'r5, 1') -> ('li', 'r6, 1'); 175: ('stw', 'r5, 0(0)') -> ('stw', 'r6, 0(0)'); 177: ('lwz', 'r6, 0(0)') -> ('lwz', 'r5, 0(0)'); 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r5, 0(0)') -> ('slwi', 'r3, r3, 3'); 183: ('add', 'r3, r6, r3') -> ('add', 'r3, r5, r3')
|
||||
Round2 CheckBS2CommandStatus | native count/old-size value block initialization order 1 | sha256=6fd7596ecfdd | structural/exact=(2, 6); instructions=406/406; 173: ('li', 'r5, 1') -> ('li', 'r6, 1'); 175: ('stw', 'r5, 0(0)') -> ('stw', 'r6, 0(0)'); 177: ('lwz', 'r6, 0(0)') -> ('lwz', 'r5, 0(0)'); 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r5, 0(0)') -> ('slwi', 'r3, r3, 3'); 183: ('add', 'r3, r6, r3') -> ('add', 'r3, r5, r3')
|
||||
Round2 CheckBS2CommandStatus | readonly TOC field snapshot before command flag | sha256=f45ddce59fdc | structural/exact=(2, 9); instructions=406/406; 173: ('li', 'r5, 1') -> ('li', 'r6, 1'); 174: ('lwz', 'r6, 0(0)') -> ('lwz', 'r4, 0(0)'); 175: ('stw', 'r5, 0(0)') -> ('stw', 'r6, 0(0)'); 177: ('lwz', 'r4, 0(0)') -> ('lwz', 'r5, 0(0)'); 178: ('lwz', 'r3, 0(r6)') -> ('lwz', 'r3, 0(r4)'); 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r5, 0(0)') -> ('slwi', 'r3, r3, 3'); 183: ('add', 'r3, r4, r3') -> ('add', 'r3, r5, r3'); 194: ('lwz', 'r0, 0(r6)') -> ('lwz', 'r0, 0(r4)')
|
||||
Round2 CheckBS2CommandStatus | partition byte extent computed before command flag store | sha256=b31826fb52d4 | structural/exact=(2, 7); instructions=406/406; 174: ('lwz', 'r5, 0(0)') -> ('lwz', 'r4, 0(0)'); 177: ('lwz', 'r4, 0(0)') -> ('lwz', 'r5, 0(0)'); 178: ('lwz', 'r3, 0(r5)') -> ('lwz', 'r3, 0(r4)'); 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r6, 0(0)') -> ('slwi', 'r3, r3, 3'); 183: ('add', 'r3, r4, r3') -> ('add', 'r3, r5, r3'); 194: ('lwz', 'r0, 0(r5)') -> ('lwz', 'r0, 0(r4)')
|
||||
Round2 CheckBS2CommandStatus: batch 4 successful distinct builds/4 forms, best=(2, 6).
|
||||
Round2 AOSS_Init_old: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 AOSS_Init_old | two independent actual timeout constants, trailing padding unmodeled | sha256=d1fefb8e620a | structural/exact=(1130, 1300); instructions=1574/1584; 8: ('lis', 'r4, 1') -> ('lhz', 'r4, 0(0)'); 10: ('addi', 'r5, r4, -1') -> ('lhz', 'r5, 0(0)'); 12: ('sth', 'r5, 0x28(r1)') -> ('sth', 'r4, 0x28(r1)'); 14: ('li', 'r21, 0') -> ('li', 'r19, 0'); 45: ('lha', 'r19, 0x10e(r15)') -> ('lha', 'r20, 0x10e(r15)'); 46: ('cmpwi', 'r19, -1') -> ('cmpwi', 'r20, -1'); 48: ('li', 'r19, 0x7d0') -> ('li', 'r20, 0x7d0'); 54: ('lis', 'r14, 0') -> ('lis', 'r16, 0'); 56: ('addi', 'r3, r14, 0') -> ('addi', 'r3, r16, 0'); 62: ('stw', 'r0, 0(r14)') -> ('stw', 'r0, 0(r16)'); 63: ('addi', 'r5, r14, 0') -> ('addi', 'r5, r16, 0'); 65: ('li', 'r14, 0') -> ('li', 'r16, 0')
|
||||
Round2 AOSS_Init_old | default limits directly assigned independent timeout constants | sha256=99fa30ae88c5 | structural/exact=(1130, 1300); instructions=1574/1584; 8: ('lis', 'r4, 1') -> ('lhz', 'r4, 0(0)'); 10: ('addi', 'r5, r4, -1') -> ('lhz', 'r5, 0(0)'); 12: ('sth', 'r5, 0x28(r1)') -> ('sth', 'r4, 0x28(r1)'); 14: ('li', 'r21, 0') -> ('li', 'r19, 0'); 45: ('lha', 'r19, 0x10e(r15)') -> ('lha', 'r20, 0x10e(r15)'); 46: ('cmpwi', 'r19, -1') -> ('cmpwi', 'r20, -1'); 48: ('li', 'r19, 0x7d0') -> ('li', 'r20, 0x7d0'); 54: ('lis', 'r14, 0') -> ('lis', 'r16, 0'); 56: ('addi', 'r3, r14, 0') -> ('addi', 'r3, r16, 0'); 62: ('stw', 'r0, 0(r14)') -> ('stw', 'r0, 0(r16)'); 63: ('addi', 'r5, r14, 0') -> ('addi', 'r5, r16, 0'); 65: ('li', 'r14, 0') -> ('li', 'r16, 0')
|
||||
Round2 AOSS_Init_old | connection timeout initialized before response temporary | sha256=26b6e4cbe949 | structural/exact=(1141, 1524); instructions=1575/1584; 8: ('li', 'r4, 0') -> ('lhz', 'r4, 0(0)'); 10: ('lhz', 'r6, 2(r4)') -> ('lhz', 'r5, 0(0)'); 12: ('lhz', 'r5, 0(0)') -> ('sth', 'r4, 0x28(r1)'); 14: ('sth', 'r6, 0x2a(r1)') -> ('li', 'r19, 0'); 15: ('li', 'r21, 0') -> ('li', 'r4, 0'); 16: ('li', 'r4, 0') -> ('sth', 'r5, 0x2a(r1)'); 17: ('sth', 'r5, 0x28(r1)') -> ('li', 'r5, 0x18'); 18: ('li', 'r5, 0x18') -> ('stw', 'r0, 0x24(r1)'); 19: ('stw', 'r0, 0x24(r1)') -> ('stw', 'r0, 0x20(r1)'); 20: ('stw', 'r0, 0x20(r1)') -> ('bl', '0'); 21: ('bl', '0') -> ('lha', 'r0, 0x106(r15)'); 22: ('lha', 'r0, 0x106(r15)') -> ('cmpwi', 'r0, -1')
|
||||
Round2 AOSS_Init_old | initial limits are two signed-short native scalars | sha256=04f7b9ef6eb3 | structural/exact=(1141, 1524); instructions=1575/1584; 8: ('li', 'r4, 0') -> ('lhz', 'r4, 0(0)'); 10: ('lha', 'r6, 2(r4)') -> ('lhz', 'r5, 0(0)'); 12: ('lha', 'r5, 0(0)') -> ('sth', 'r4, 0x28(r1)'); 14: ('sth', 'r6, 0x2a(r1)') -> ('li', 'r19, 0'); 15: ('li', 'r21, 0') -> ('li', 'r4, 0'); 16: ('li', 'r4, 0') -> ('sth', 'r5, 0x2a(r1)'); 17: ('sth', 'r5, 0x28(r1)') -> ('li', 'r5, 0x18'); 18: ('li', 'r5, 0x18') -> ('stw', 'r0, 0x24(r1)'); 19: ('stw', 'r0, 0x24(r1)') -> ('stw', 'r0, 0x20(r1)'); 20: ('stw', 'r0, 0x20(r1)') -> ('bl', '0'); 21: ('bl', '0') -> ('lha', 'r0, 0x106(r15)'); 22: ('lha', 'r0, 0x106(r15)') -> ('cmpwi', 'r0, -1')
|
||||
Round2 AOSS_Init_old | message packet uses read-only cached packet words | sha256=a524b49b017f | BUILD FAILED thon3" tools/transform_dep.py build/43U/src/src/scene/setting/AOSS.d build/43U/src/src/scene/setting/AOSS.d ### mwcceppc.exe Compiler: # File: src\scene\setting\AOSS.c # --------------------------------- # 974: packetWords->initialLength = receivedLength; # Error: ^ # (10179) illegal assignment to constant # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 AOSS_Init_old: batch 4 successful distinct builds/5 forms, best=(1130, 1300).
|
||||
Round2 AOSS Init structural proof: target .sdata2 bytesffffffff00000000 are two independent load targets (lhz offsets20/28 relocated lbl_81694c78/7a); source samebytes one8-byte array causes shared base and 2(r4) load. Tested separate nativeconstant definitions and initialization order/narrowtypes beforedeclarations. Input has writable status/flags, whole const parameter unwarranted. First five forms compiled, no match, additional real single-value option-array form follows. No metadata renames/extents retained.
|
||||
Round2 AOSS_Init_old | two independent actual timeout constants, trailing padding unmodeled | sha256=d1fefb8e620a | structural/exact=(1130, 1300); instructions=1574/1584; 8: ('lis', 'r4, 1') -> ('lhz', 'r4, 0(0)'); 10: ('addi', 'r5, r4, -1') -> ('lhz', 'r5, 0(0)'); 12: ('sth', 'r5, 0x28(r1)') -> ('sth', 'r4, 0x28(r1)'); 14: ('li', 'r21, 0') -> ('li', 'r19, 0'); 45: ('lha', 'r19, 0x10e(r15)') -> ('lha', 'r20, 0x10e(r15)'); 46: ('cmpwi', 'r19, -1') -> ('cmpwi', 'r20, -1'); 48: ('li', 'r19, 0x7d0') -> ('li', 'r20, 0x7d0'); 54: ('lis', 'r14, 0') -> ('lis', 'r16, 0'); 56: ('addi', 'r3, r14, 0') -> ('addi', 'r3, r16, 0'); 62: ('stw', 'r0, 0(r14)') -> ('stw', 'r0, 0(r16)'); 63: ('addi', 'r5, r14, 0') -> ('addi', 'r5, r16, 0'); 65: ('li', 'r14, 0') -> ('li', 'r16, 0')
|
||||
Round2 AOSS_Init_old | default limits directly assigned independent timeout constants | sha256=99fa30ae88c5 | structural/exact=(1130, 1300); instructions=1574/1584; 8: ('lis', 'r4, 1') -> ('lhz', 'r4, 0(0)'); 10: ('addi', 'r5, r4, -1') -> ('lhz', 'r5, 0(0)'); 12: ('sth', 'r5, 0x28(r1)') -> ('sth', 'r4, 0x28(r1)'); 14: ('li', 'r21, 0') -> ('li', 'r19, 0'); 45: ('lha', 'r19, 0x10e(r15)') -> ('lha', 'r20, 0x10e(r15)'); 46: ('cmpwi', 'r19, -1') -> ('cmpwi', 'r20, -1'); 48: ('li', 'r19, 0x7d0') -> ('li', 'r20, 0x7d0'); 54: ('lis', 'r14, 0') -> ('lis', 'r16, 0'); 56: ('addi', 'r3, r14, 0') -> ('addi', 'r3, r16, 0'); 62: ('stw', 'r0, 0(r14)') -> ('stw', 'r0, 0(r16)'); 63: ('addi', 'r5, r14, 0') -> ('addi', 'r5, r16, 0'); 65: ('li', 'r14, 0') -> ('li', 'r16, 0')
|
||||
Round2 AOSS_Init_old | connection timeout initialized before response temporary | sha256=26b6e4cbe949 | structural/exact=(1141, 1524); instructions=1575/1584; 8: ('li', 'r4, 0') -> ('lhz', 'r4, 0(0)'); 10: ('lhz', 'r6, 2(r4)') -> ('lhz', 'r5, 0(0)'); 12: ('lhz', 'r5, 0(0)') -> ('sth', 'r4, 0x28(r1)'); 14: ('sth', 'r6, 0x2a(r1)') -> ('li', 'r19, 0'); 15: ('li', 'r21, 0') -> ('li', 'r4, 0'); 16: ('li', 'r4, 0') -> ('sth', 'r5, 0x2a(r1)'); 17: ('sth', 'r5, 0x28(r1)') -> ('li', 'r5, 0x18'); 18: ('li', 'r5, 0x18') -> ('stw', 'r0, 0x24(r1)'); 19: ('stw', 'r0, 0x24(r1)') -> ('stw', 'r0, 0x20(r1)'); 20: ('stw', 'r0, 0x20(r1)') -> ('bl', '0'); 21: ('bl', '0') -> ('lha', 'r0, 0x106(r15)'); 22: ('lha', 'r0, 0x106(r15)') -> ('cmpwi', 'r0, -1')
|
||||
Round2 AOSS_Init_old | initial limits are two signed-short native scalars | sha256=04f7b9ef6eb3 | structural/exact=(1141, 1524); instructions=1575/1584; 8: ('li', 'r4, 0') -> ('lhz', 'r4, 0(0)'); 10: ('lha', 'r6, 2(r4)') -> ('lhz', 'r5, 0(0)'); 12: ('lha', 'r5, 0(0)') -> ('sth', 'r4, 0x28(r1)'); 14: ('sth', 'r6, 0x2a(r1)') -> ('li', 'r19, 0'); 15: ('li', 'r21, 0') -> ('li', 'r4, 0'); 16: ('li', 'r4, 0') -> ('sth', 'r5, 0x2a(r1)'); 17: ('sth', 'r5, 0x28(r1)') -> ('li', 'r5, 0x18'); 18: ('li', 'r5, 0x18') -> ('stw', 'r0, 0x24(r1)'); 19: ('stw', 'r0, 0x24(r1)') -> ('stw', 'r0, 0x20(r1)'); 20: ('stw', 'r0, 0x20(r1)') -> ('bl', '0'); 21: ('bl', '0') -> ('lha', 'r0, 0x106(r15)'); 22: ('lha', 'r0, 0x106(r15)') -> ('cmpwi', 'r0, -1')
|
||||
Round2 AOSS_Init_old | message packet uses read-only cached packet words | sha256=a524b49b017f | BUILD FAILED thon3" tools/transform_dep.py build/43U/src/src/scene/setting/AOSS.d build/43U/src/src/scene/setting/AOSS.d ### mwcceppc.exe Compiler: # File: src\scene\setting\AOSS.c # --------------------------------- # 974: packetWords->initialLength = receivedLength; # Error: ^ # (10179) illegal assignment to constant # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 AOSS_Init_old | two real single-value option arrays with normal compiler alignment | sha256=c28d18e24089 | structural/exact=(1128, 1297); instructions=1574/1584; 14: ('li', 'r21, 0') -> ('li', 'r19, 0'); 45: ('lha', 'r19, 0x10e(r15)') -> ('lha', 'r20, 0x10e(r15)'); 46: ('cmpwi', 'r19, -1') -> ('cmpwi', 'r20, -1'); 48: ('li', 'r19, 0x7d0') -> ('li', 'r20, 0x7d0'); 54: ('lis', 'r14, 0') -> ('lis', 'r16, 0'); 56: ('addi', 'r3, r14, 0') -> ('addi', 'r3, r16, 0'); 62: ('stw', 'r0, 0(r14)') -> ('stw', 'r0, 0(r16)'); 63: ('addi', 'r5, r14, 0') -> ('addi', 'r5, r16, 0'); 65: ('li', 'r14, 0') -> ('li', 'r16, 0'); 75: ('stw', 'r14, 0xc(r5)') -> ('stw', 'r16, 0xc(r5)'); 77: ('stb', 'r14, 0x18(r5)') -> ('stb', 'r16, 0x18(r5)'); 87: ('stw', 'r14, 0(0)') -> ('stw', 'r16, 0(0)')
|
||||
Round2 AOSS_Init_old: batch 5 successful distinct builds/6 forms, best=(1128, 1297).
|
||||
Round2 AOSS raw gatecount audit: AOSSParseNetworkSettings is objdiff100, identical symbolbytes and declsearch score(0,0); odiff incorrectly rebases CR1 bgt/ble/blt immediates by source/targetfunctionoffsetdelta36. This explains raw15/21 versusobjdiff16/21; no source or functionmetadata change permitted to aligntooloffset.
|
||||
Round2 AOSS_Init_old | two real timeout fields of readonly defaults record | sha256=fee3110e5a6a | structural/exact=(1141, 1524); instructions=1575/1584; 8: ('li', 'r4, 0') -> ('lhz', 'r4, 0(0)'); 10: ('lhz', 'r6, 2(r4)') -> ('lhz', 'r5, 0(0)'); 12: ('lhz', 'r5, 0(0)') -> ('sth', 'r4, 0x28(r1)'); 14: ('sth', 'r6, 0x2a(r1)') -> ('li', 'r19, 0'); 15: ('li', 'r21, 0') -> ('li', 'r4, 0'); 16: ('li', 'r4, 0') -> ('sth', 'r5, 0x2a(r1)'); 17: ('sth', 'r5, 0x28(r1)') -> ('li', 'r5, 0x18'); 18: ('li', 'r5, 0x18') -> ('stw', 'r0, 0x24(r1)'); 19: ('stw', 'r0, 0x24(r1)') -> ('stw', 'r0, 0x20(r1)'); 20: ('stw', 'r0, 0x20(r1)') -> ('bl', '0'); 21: ('bl', '0') -> ('lha', 'r0, 0x106(r15)'); 22: ('lha', 'r0, 0x106(r15)') -> ('cmpwi', 'r0, -1')
|
||||
Round2 AOSS_Init_old | timeout defaults as constant wait-limit pair inside initialization scope | sha256=d5e704407dc8 | structural/exact=(1130, 1300); instructions=1574/1584; 8: ('lis', 'r4, 1') -> ('lhz', 'r4, 0(0)'); 10: ('addi', 'r5, r4, -1') -> ('lhz', 'r5, 0(0)'); 12: ('sth', 'r5, 0x28(r1)') -> ('sth', 'r4, 0x28(r1)'); 14: ('li', 'r21, 0') -> ('li', 'r19, 0'); 45: ('lha', 'r19, 0x10e(r15)') -> ('lha', 'r20, 0x10e(r15)'); 46: ('cmpwi', 'r19, -1') -> ('cmpwi', 'r20, -1'); 48: ('li', 'r19, 0x7d0') -> ('li', 'r20, 0x7d0'); 54: ('lis', 'r14, 0') -> ('lis', 'r16, 0'); 56: ('addi', 'r3, r14, 0') -> ('addi', 'r3, r16, 0'); 62: ('stw', 'r0, 0(r14)') -> ('stw', 'r0, 0(r16)'); 63: ('addi', 'r5, r14, 0') -> ('addi', 'r5, r16, 0'); 65: ('li', 'r14, 0') -> ('li', 'r16, 0')
|
||||
Round2 AOSS_Init_old: batch 2 successful distinct builds/2 forms, best=(1130, 1300).
|
||||
Round2 AOSSDecryptMessage: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 AOSSDecryptMessage:321/321/frame60 register/key-state allocation89differences; encrypted payload read only until finalmessagecopy, schedulefields keep actuallayouti/j/bytes/length. No directselfstore-immediate reload evidence for volatile; test readonly payload, loopcursorownership/narrowchecksum/bytepermutation and sumoperand order beforedeclarations.
|
||||
Round2 AOSSDecryptMessage | encrypted input payload readonly through decryption | sha256=4321a35508f6 | BUILD FAILED c/scene/setting/AOSS.d build/43U/src/src/scene/setting/AOSS.d ### mwcceppc.exe Compiler: # File: src\scene\setting\AOSS.c # --------------------------------- # 1928: memcpy(encrypted, decryptedData, dataLength); # Error: ^ # (10209) illegal implicit conversion from 'const struct # AOSSEncryptedPayload *' to # 'void *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 AOSSDecryptMessage | key scheduling source cursor owned by loop pointer directly | sha256=96417fe6c137 | structural/exact=(0, 87); instructions=321/321; 59: ('lbz', 'r30, 0xe(r26)') -> ('lbz', 'r31, 0xe(r26)'); 69: ('lis', 'r31, 0') -> ('lis', 'r30, 0'); 71: ('addi', 'r3, r31, 0') -> ('addi', 'r3, r30, 0'); 74: ('addi', 'r31, r31, 0') -> ('addi', 'r30, r30, 0'); 76: ('addi', 'r3, r31, 2') -> ('addi', 'r3, r30, 2'); 79: ('mr', 'r4, r31') -> ('mr', 'r4, r30'); 93: ('lwz', 'r8, 0x1c(r1)') -> ('lwz', 'r7, 0x1c(r1)'); 94: ('addi', 'r7, r4, 1') -> ('addi', 'r6, r4, 1'); 95: ('lwz', 'r4, 0x18(r1)') -> ('lwz', 'r8, 0x18(r1)'); 96: ('divwu', 'r6, r7, r8') -> ('divwu', 'r4, r6, r7'); 98: ('mullw', 'r6, r6, r8') -> ('mullw', 'r4, r4, r7'); 99: ('subf', 'r6, r6, r7') -> ('subf', 'r4, r4, r6')
|
||||
Round2 AOSSDecryptMessage | stream-key sum operands use native index order | sha256=4e00f471d291 | structural/exact=(0, 87); instructions=321/321; 59: ('lbz', 'r30, 0xe(r26)') -> ('lbz', 'r31, 0xe(r26)'); 69: ('lis', 'r31, 0') -> ('lis', 'r30, 0'); 71: ('addi', 'r3, r31, 0') -> ('addi', 'r3, r30, 0'); 74: ('addi', 'r31, r31, 0') -> ('addi', 'r30, r30, 0'); 76: ('addi', 'r3, r31, 2') -> ('addi', 'r3, r30, 2'); 79: ('mr', 'r4, r31') -> ('mr', 'r4, r30'); 93: ('lwz', 'r8, 0x1c(r1)') -> ('lwz', 'r7, 0x1c(r1)'); 94: ('addi', 'r7, r4, 1') -> ('addi', 'r6, r4, 1'); 95: ('lwz', 'r4, 0x18(r1)') -> ('lwz', 'r8, 0x18(r1)'); 96: ('divwu', 'r6, r7, r8') -> ('divwu', 'r4, r6, r7'); 98: ('mullw', 'r6, r6, r8') -> ('mullw', 'r4, r4, r7'); 99: ('subf', 'r6, r6, r7') -> ('subf', 'r4, r4, r6')
|
||||
Round2 AOSSDecryptMessage | checksum byte uses native narrow value type | sha256=4dde6ad6fac9 | structural/exact=(0, 87); instructions=321/321; 59: ('lbz', 'r30, 0xe(r26)') -> ('lbz', 'r31, 0xe(r26)'); 69: ('lis', 'r31, 0') -> ('lis', 'r30, 0'); 71: ('addi', 'r3, r31, 0') -> ('addi', 'r3, r30, 0'); 74: ('addi', 'r31, r31, 0') -> ('addi', 'r30, r30, 0'); 76: ('addi', 'r3, r31, 2') -> ('addi', 'r3, r30, 2'); 79: ('mr', 'r4, r31') -> ('mr', 'r4, r30'); 93: ('lwz', 'r8, 0x1c(r1)') -> ('lwz', 'r7, 0x1c(r1)'); 94: ('addi', 'r7, r4, 1') -> ('addi', 'r6, r4, 1'); 95: ('lwz', 'r4, 0x18(r1)') -> ('lwz', 'r8, 0x18(r1)'); 96: ('divwu', 'r6, r7, r8') -> ('divwu', 'r4, r6, r7'); 98: ('mullw', 'r6, r6, r8') -> ('mullw', 'r4, r4, r7'); 99: ('subf', 'r6, r6, r7') -> ('subf', 'r4, r4, r6')
|
||||
Round2 AOSSDecryptMessage | key permutation bytes use native byte values | sha256=4282296fdb97 | structural/exact=(0, 87); instructions=321/321; 59: ('lbz', 'r30, 0xe(r26)') -> ('lbz', 'r31, 0xe(r26)'); 69: ('lis', 'r31, 0') -> ('lis', 'r30, 0'); 71: ('addi', 'r3, r31, 0') -> ('addi', 'r3, r30, 0'); 74: ('addi', 'r31, r31, 0') -> ('addi', 'r30, r30, 0'); 76: ('addi', 'r3, r31, 2') -> ('addi', 'r3, r30, 2'); 79: ('mr', 'r4, r31') -> ('mr', 'r4, r30'); 93: ('lwz', 'r8, 0x1c(r1)') -> ('lwz', 'r7, 0x1c(r1)'); 94: ('addi', 'r7, r4, 1') -> ('addi', 'r6, r4, 1'); 95: ('lwz', 'r4, 0x18(r1)') -> ('lwz', 'r8, 0x18(r1)'); 96: ('divwu', 'r6, r7, r8') -> ('divwu', 'r4, r6, r7'); 98: ('mullw', 'r6, r6, r8') -> ('mullw', 'r4, r4, r7'); 99: ('subf', 'r6, r6, r7') -> ('subf', 'r4, r4, r6')
|
||||
Round2 AOSSDecryptMessage: batch 4 successful distinct builds/5 forms, best=(0, 87).
|
||||
Round2 AOSSApplyAuthOptions: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 AuthOptions target/source114same/frame40; config andnetwork_data parameter types are opaque despite native record indexing, nestedresponse readonly correct. Targetflags/mainstate and config subrecord registers exchange. Test realtypedinputs with source-only prototypes, parameterremaining-length ownership, constrecord traversal and scancondition before leadingdeclaration permutations; no immediate volatile reload proof.
|
||||
Round2 Decrypt four successful distinct sourceforms+110decl builds unchanged87allocationoperands; encrypted const view failed because endcopy overwritespayload, correctly rejected. Init seven successful distinct structuralforms and100decl builds no exact; two1-element option arrays reproduce first14instructions but latercounts/branch/globalallocation stillopen. OriginalAOSSsource restored.
|
||||
Round2 AOSSApplyAuthOptions | remaining option count handled by original signed parameter | sha256=4310f4855759 | structural/exact=(0, 32); instructions=114/114; 7: ('mr', 'r31, r5') -> ('mr', 'r24, r5'); 10: ('li', 'r29, 0') -> ('li', 'r30, 0'); 14: ('mr', 'r28, r4') -> ('mr', 'r31, r4'); 15: ('li', 'r30, 0') -> ('li', 'r29, 0'); 16: ('lbz', 'r3, 0(r28)') -> ('lbz', 'r3, 0(r31)'); 17: ('lbzx', 'r0, r30, r27') -> ('lbzx', 'r0, r29, r27'); 20: ('lhz', 'r3, 2(r28)') -> ('lhz', 'r3, 2(r31)'); 24: ('subf.', 'r31, r0, r31') -> ('subf.', 'r24, r0, r24'); 25: ('add', 'r28, r28, r0') -> ('add', 'r31, r31, r0'); 29: ('lhz', 'r3, 2(r28)') -> ('lhz', 'r3, 2(r31)'); 30: ('addi', 'r24, r28, 4') -> ('addi', 'r31, r31, 4'); 34: ('clrlwi', 'r31, r3, 0x10') -> ('clrlwi', 'r24, r3, 0x10')
|
||||
Round2 AOSSApplyAuthOptions | configuration pointer and record index native typed input | sha256=b630f2f015bd | structural/exact=(0, 22); instructions=114/114; 6: ('mr', 'r24, r5') -> ('mr', 'r27, r3'); 7: ('mr', 'r27, r3') -> ('mr', 'r24, r5'); 14: ('mr', 'r29, r4') -> ('mr', 'r31, r4'); 15: ('li', 'r31, 0') -> ('li', 'r29, 0'); 16: ('lbz', 'r3, 0(r29)') -> ('lbz', 'r3, 0(r31)'); 17: ('lbzx', 'r0, r31, r27') -> ('lbzx', 'r0, r29, r27'); 20: ('lhz', 'r3, 2(r29)') -> ('lhz', 'r3, 2(r31)'); 25: ('add', 'r29, r29, r0') -> ('add', 'r31, r31, r0'); 29: ('lhz', 'r3, 2(r29)') -> ('lhz', 'r3, 2(r31)'); 30: ('addi', 'r24, r29, 4') -> ('addi', 'r31, r31, 4'); 34: ('clrlwi', 'r31, r3, 0x10') -> ('clrlwi', 'r24, r3, 0x10'); 42: ('lbz', 'r0, 0(r24)') -> ('lbz', 'r0, 0(r31)')
|
||||
Round2 AOSSApplyAuthOptions | option traversal pointer arithmetic uses const byte field view | sha256=d305eaea3fd9 | structural/exact=(0, 22); instructions=114/114; 6: ('mr', 'r24, r5') -> ('mr', 'r27, r3'); 7: ('mr', 'r27, r3') -> ('mr', 'r24, r5'); 14: ('mr', 'r29, r4') -> ('mr', 'r31, r4'); 15: ('li', 'r31, 0') -> ('li', 'r29, 0'); 16: ('lbz', 'r3, 0(r29)') -> ('lbz', 'r3, 0(r31)'); 17: ('lbzx', 'r0, r31, r27') -> ('lbzx', 'r0, r29, r27'); 20: ('lhz', 'r3, 2(r29)') -> ('lhz', 'r3, 2(r31)'); 25: ('add', 'r29, r29, r0') -> ('add', 'r31, r31, r0'); 29: ('lhz', 'r3, 2(r29)') -> ('lhz', 'r3, 2(r31)'); 30: ('addi', 'r24, r29, 4') -> ('addi', 'r31, r31, 4'); 34: ('clrlwi', 'r31, r3, 0x10') -> ('clrlwi', 'r24, r3, 0x10'); 42: ('lbz', 'r0, 0(r24)') -> ('lbz', 'r0, 0(r31)')
|
||||
Round2 AOSSApplyAuthOptions | network data real typed record input | sha256=abc8edc83705 | BUILD FAILED /43U/src/src/scene/setting/AOSS.d ### mwcceppc.exe Compiler: # File: src\scene\setting\AOSS.c # --------------------------------- # 1760: s_networkBuffer); # Error: ^ # (10209) illegal implicit conversion from 'unsigned char[640]' to # 'struct AOSSNetworkBufferRecord *' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
|
||||
Round2 AOSSApplyAuthOptions | response scan is condition checked loop | sha256=f63188160d82 | structural/exact=(11, 104); instructions=115/114; 6: ('mr', 'r24, r5') -> ('mr', 'r27, r3'); 7: ('mr', 'r27, r3') -> ('mr', 'r24, r5'); 13: ('b', '384') -> ('b', '380'); 14: ('mr', 'r29, r4') -> ('mr', 'r31, r4'); 15: ('li', 'r31, 0') -> ('li', 'r29, 0'); 16: ('b', '40') -> ('lbz', 'r3, 0(r31)'); 17: ('lhz', 'r3, 2(r29)') -> ('lbzx', 'r0, r29, r27'); 18: ('bl', '0') -> ('cmplw', 'r3, r0'); 19: ('clrlwi', 'r3, r3, 0x10') -> ('beq', '40'); 20: ('addi', 'r0, r3, 4') -> ('lhz', 'r3, 2(r31)'); 21: ('subf.', 'r24, r0, r24') -> ('bl', '0'); 22: ('add', 'r29, r29, r0') -> ('clrlwi', 'r3, r3, 0x10')
|
||||
Round2 AOSSApplyAuthOptions: batch 4 successful distinct builds/5 forms, best=(0, 22).
|
||||
Round2 AOSSSendHelloRequest: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 HelloRequest271target273frame60; aggregate construction groups socket/8Bhello/8Baccesspoint/key-schedule whereas targetglobalCRC/keyaddresshoisting distinct. Test real independentlocals/constrequest/CRCcursor/streamsum and explicit initialized actualglobals beforedeclaration tuning. No paddingobject/no handplaceddata introduced; globalinitializer trials must preserve older exactfunctions or be rejected.
|
||||
Round2 AOSSSendHelloRequest | request input read-only native record view | sha256=7f4dcc4f0825 | structural/exact=(33, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest | independent addressable hello/key/socket objects at true local boundaries | sha256=2793307cff78 | structural/exact=(39, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest | checksum XOR uses native accumulator ordering | sha256=db43841851de | structural/exact=(33, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest | stream permutation sum matches index-first operand ownership | sha256=481f074b3c56 | structural/exact=(33, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest | CRC table address spelled as first typed array element | sha256=023abe987191 | structural/exact=(33, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest: batch 5 successful distinct builds/5 forms, best=(33, 254).
|
||||
Round2 AOSSSendHelloRequest | real CRC table explicitly zero-initialized at definition | sha256=2bf3fcbc7aad | structural/exact=(31, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest | real packet state explicitly zero-initialized at definition | sha256=586bd44de7e5 | structural/exact=(31, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest | CRC input hello bytes through readonly pointer helper | sha256=9962f24d328e | structural/exact=(33, 254); instructions=271/273; 5: ('lis', 'r31, 0') -> ('lwz', 'r28, 0(0)'); 6: ('lwz', 'r29, 0(0)') -> ('mr', 'r26, r4'); 7: ('mr', 'r25, r4') -> ('mr', 'r27, r5'); 8: ('mr', 'r26, r5') -> ('addi', 'r3, r1, 0x18'); 9: ('addi', 'r31, r31, 0') -> ('li', 'r30, 0'); 10: ('addi', 'r3, r1, 0x18') -> ('li', 'r29, 0'); 11: ('li', 'r30, 0') -> ('li', 'r4, 0'); 12: ('li', 'r27, 0') -> ('li', 'r5, 8'); 13: ('li', 'r4, 0') -> ('bl', '0'); 14: ('li', 'r5, 8') -> ('mr', 'r3, r28'); 15: ('bl', '0') -> ('li', 'r4, 0'); 16: ('mr', 'r3, r29') -> ('li', 'r5, 0x5dc')
|
||||
Round2 AOSSSendHelloRequest: batch 3 successful distinct builds/3 forms, best=(31, 254).
|
||||
Round2 AOSSXorBufferWithKey: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 XorBuffer147/147frame40; stable34allocation operands in eightfold-unrolled XOR loop, targetpacket readr6/keyreadr0 then result/keytemporaryowned byr0 whereas sourcevalueowned byr6. Pointerpair offsets derive mask and packet separately; no layout/frame/branch/volatile cause. Test actualreadonlykeyproto, expressiontemporary ownership and native loopforms beforedeclaration permutation. CR1remaining odiff2branchdiffs are relocation-position artifacts, use byte-relativedeclsearch for authority as well.
|
||||
Round2 AOSSXorBufferWithKey | actual key input is readonly in definition and prototype | sha256=695218a93235 | structural/exact=(10, 108); instructions=146/147; 18: ('b', '488') -> ('b', '492'); 27: ('b', '452') -> ('b', '456'); 39: ('ble', '48') -> ('ble', '52'); 40: ('lbzx', 'r0, r23, r5') -> ('stb', 'r6, 0(r3)'); 42: ('addi', 'r5, r5, 1') -> ('lbzx', 'r0, r23, r5'); 43: ('xor', 'r0, r4, r0') -> ('addi', 'r5, r5, 1'); 45: ('stb', 'r0, 0(r3)') -> ('xor', 'r0, r4, r0'); 46: ('blt', '8') -> ('stb', 'r0, 0(r3)'); 47: ('li', 'r5, 0') -> ('blt', '8'); 48: ('addi', 'r6, r6, 1') -> ('li', 'r5, 0'); 49: ('addi', 'r3, r3, 1') -> ('addi', 'r6, r6, 1'); 50: ('bdnz', '-40') -> ('addi', 'r3, r3, 1')
|
||||
Round2 AOSSXorBufferWithKey | round increment and wrap condition explicit branch | sha256=e01703301227 | structural/exact=(1, 35); instructions=147/147; 47: ('bne', '8') -> ('blt', '8'); 72: ('add', 'r4, r28, r3') -> ('add', 'r4, r26, r3'); 74: ('add', 'r5, r26, r3') -> ('add', 'r5, r28, r3'); 75: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 76: ('stbx', 'r6, r28, r3') -> ('stbx', 'r0, r28, r3'); 78: ('lbz', 'r6, 1(r4)') -> ('lbz', 'r6, 1(r5)'); 79: ('lbz', 'r0, 1(r5)') -> ('lbz', 'r0, 1(r4)'); 80: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 81: ('stb', 'r6, 1(r4)') -> ('stb', 'r0, 1(r5)'); 82: ('lbz', 'r6, 2(r4)') -> ('lbz', 'r6, 2(r5)'); 83: ('lbz', 'r0, 2(r5)') -> ('lbz', 'r0, 2(r4)'); 84: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0')
|
||||
Round2 AOSSXorBufferWithKey | key XOR one expression, byte index converted once | sha256=750b339435c6 | structural/exact=(10, 108); instructions=146/147; 18: ('b', '488') -> ('b', '492'); 27: ('b', '452') -> ('b', '456'); 39: ('ble', '48') -> ('ble', '52'); 40: ('lbzx', 'r0, r23, r5') -> ('stb', 'r6, 0(r3)'); 42: ('addi', 'r5, r5, 1') -> ('lbzx', 'r0, r23, r5'); 43: ('xor', 'r0, r4, r0') -> ('addi', 'r5, r5, 1'); 45: ('stb', 'r0, 0(r3)') -> ('xor', 'r0, r4, r0'); 46: ('blt', '8') -> ('stb', 'r0, 0(r3)'); 47: ('li', 'r5, 0') -> ('blt', '8'); 48: ('addi', 'r6, r6, 1') -> ('li', 'r5, 0'); 49: ('addi', 'r3, r3, 1') -> ('addi', 'r6, r6, 1'); 50: ('bdnz', '-40') -> ('addi', 'r3, r3, 1')
|
||||
Round2 AOSSXorBufferWithKey | XOR data loop uses native word temporary | sha256=50a8881ff009 | structural/exact=(0, 34); instructions=147/147; 72: ('add', 'r4, r28, r3') -> ('add', 'r4, r26, r3'); 74: ('add', 'r5, r26, r3') -> ('add', 'r5, r28, r3'); 75: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 76: ('stbx', 'r6, r28, r3') -> ('stbx', 'r0, r28, r3'); 78: ('lbz', 'r6, 1(r4)') -> ('lbz', 'r6, 1(r5)'); 79: ('lbz', 'r0, 1(r5)') -> ('lbz', 'r0, 1(r4)'); 80: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 81: ('stb', 'r6, 1(r4)') -> ('stb', 'r0, 1(r5)'); 82: ('lbz', 'r6, 2(r4)') -> ('lbz', 'r6, 2(r5)'); 83: ('lbz', 'r0, 2(r5)') -> ('lbz', 'r0, 2(r4)'); 84: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 85: ('stb', 'r6, 2(r4)') -> ('stb', 'r0, 2(r5)')
|
||||
Round2 AOSSXorBufferWithKey | two rounds use while countdown instead of indexed for | sha256=0981c40d746e | structural/exact=(0, 34); instructions=147/147; 72: ('add', 'r4, r28, r3') -> ('add', 'r4, r26, r3'); 74: ('add', 'r5, r26, r3') -> ('add', 'r5, r28, r3'); 75: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 76: ('stbx', 'r6, r28, r3') -> ('stbx', 'r0, r28, r3'); 78: ('lbz', 'r6, 1(r4)') -> ('lbz', 'r6, 1(r5)'); 79: ('lbz', 'r0, 1(r5)') -> ('lbz', 'r0, 1(r4)'); 80: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 81: ('stb', 'r6, 1(r4)') -> ('stb', 'r0, 1(r5)'); 82: ('lbz', 'r6, 2(r4)') -> ('lbz', 'r6, 2(r5)'); 83: ('lbz', 'r0, 2(r5)') -> ('lbz', 'r0, 2(r4)'); 84: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 85: ('stb', 'r6, 2(r4)') -> ('stb', 'r0, 2(r5)')
|
||||
Round2 AOSSXorBufferWithKey: batch 5 successful distinct builds/5 forms, best=(0, 34).
|
||||
Round2 AOSSXorBufferWithKey | XOR key byte before packet byte assignment | sha256=4938055e9878 | structural/exact=(0, 44); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r26, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r3, r28, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r26, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey | key byte temporary owns XOR operation | sha256=1ec11fc5b93e | structural/exact=(0, 44); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r26, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r3, r28, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r26, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey | packet update uses compound XOR with key byte | sha256=5a3158161867 | structural/exact=(0, 44); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r28, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r3, r26, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r26, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r28, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey | two actual byte operands loaded in key-first order | sha256=3dc7dece7182 | structural/exact=(0, 44); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r26, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r3, r28, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r26, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey: batch 4 successful distinct builds/4 forms, best=(0, 44).
|
||||
Round2 AOSSXorBufferWithKey | mask temporary receives packet-first XOR expression | sha256=714ce570fa34 | structural/exact=(0, 44); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r26, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r4, r26, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r3, r28, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey | mask temporary updated by compound packet XOR | sha256=1e06425245d4 | structural/exact=(0, 29); instructions=147/147; 71: ('lbzx', 'r6, r26, r3') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r5, r26, r3') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r3') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r28, r3') -> ('add', 'r5, r28, r3'); 75: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 76: ('stbx', 'r6, r28, r3') -> ('stbx', 'r0, r28, r3'); 80: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 81: ('stb', 'r6, 1(r4)') -> ('stb', 'r0, 1(r5)'); 84: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 85: ('stb', 'r6, 2(r4)') -> ('stb', 'r0, 2(r5)'); 88: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 89: ('stb', 'r6, 3(r4)') -> ('stb', 'r0, 3(r5)')
|
||||
Round2 AOSSXorBufferWithKey | XOR expression through genuine temporary result byte | sha256=f5d2fcbe5726 | structural/exact=(0, 37); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r28, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r4, r26, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r26, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r3, r28, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey | native word mask temporary receives packet-first XOR | sha256=4211561c066f | structural/exact=(0, 29); instructions=147/147; 71: ('lbzx', 'r6, r26, r3') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r5, r26, r3') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r3') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r28, r3') -> ('add', 'r5, r28, r3'); 75: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 76: ('stbx', 'r6, r28, r3') -> ('stbx', 'r0, r28, r3'); 80: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 81: ('stb', 'r6, 1(r4)') -> ('stb', 'r0, 1(r5)'); 84: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 85: ('stb', 'r6, 2(r4)') -> ('stb', 'r0, 2(r5)'); 88: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 89: ('stb', 'r6, 3(r4)') -> ('stb', 'r0, 3(r5)')
|
||||
Round2 AOSSXorBufferWithKey: batch 4 successful distinct builds/4 forms, best=(0, 29).
|
||||
Round2 AOSSXorBufferWithKey | actual XOR temporary lifetime belongs to whole routine | sha256=b8c9d53a3db5 | structural/exact=(0, 37); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r28, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r4, r26, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r26, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r3, r28, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey | mask temporary lifetime belongs to whole routine | sha256=e17b50add43e | structural/exact=(0, 29); instructions=147/147; 71: ('lbzx', 'r6, r26, r3') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r5, r26, r3') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r3') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r28, r3') -> ('add', 'r5, r28, r3'); 75: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 76: ('stbx', 'r6, r28, r3') -> ('stbx', 'r0, r28, r3'); 80: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 81: ('stb', 'r6, 1(r4)') -> ('stb', 'r0, 1(r5)'); 84: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 85: ('stb', 'r6, 2(r4)') -> ('stb', 'r0, 2(r5)'); 88: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 89: ('stb', 'r6, 3(r4)') -> ('stb', 'r0, 3(r5)')
|
||||
Round2 AOSSXorBufferWithKey | mask word lifetime belongs to whole routine | sha256=55918ef99ba8 | structural/exact=(0, 29); instructions=147/147; 71: ('lbzx', 'r6, r26, r3') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r5, r26, r3') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r28, r3') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r4, r28, r3') -> ('add', 'r5, r28, r3'); 75: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 76: ('stbx', 'r6, r28, r3') -> ('stbx', 'r0, r28, r3'); 80: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 81: ('stb', 'r6, 1(r4)') -> ('stb', 'r0, 1(r5)'); 84: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 85: ('stb', 'r6, 2(r4)') -> ('stb', 'r0, 2(r5)'); 88: ('xor', 'r6, r6, r0') -> ('xor', 'r0, r6, r0'); 89: ('stb', 'r6, 3(r4)') -> ('stb', 'r0, 3(r5)')
|
||||
Round2 AOSSXorBufferWithKey | separate XOR inputs scoped at native round boundary | sha256=4df2f2ecc10b | structural/exact=(0, 37); instructions=147/147; 53: ('li', 'r5, 0') -> ('li', 'r3, 0'); 56: ('addi', 'r3, r29, -8') -> ('addi', 'r4, r29, -8'); 58: ('li', 'r4, 0') -> ('li', 'r5, 0'); 63: ('li', 'r4, 1') -> ('li', 'r5, 1'); 64: ('cmpwi', 'r4, 0') -> ('cmpwi', 'r5, 0'); 66: ('addi', 'r0, r3, 7') -> ('addi', 'r0, r4, 7'); 69: ('cmpwi', 'r3, 0') -> ('cmpwi', 'r4, 0'); 71: ('lbzx', 'r6, r28, r5') -> ('lbzx', 'r6, r28, r3'); 72: ('add', 'r4, r26, r5') -> ('add', 'r4, r26, r3'); 73: ('lbzx', 'r0, r26, r5') -> ('lbzx', 'r0, r26, r3'); 74: ('add', 'r3, r28, r5') -> ('add', 'r5, r28, r3'); 76: ('stbx', 'r0, r28, r5') -> ('stbx', 'r0, r28, r3')
|
||||
Round2 AOSSXorBufferWithKey: batch 4 successful distinct builds/4 forms, best=(0, 29).
|
||||
Round2 CheckBS2CommandStatus | real TOC pointer global and native assigned record | sha256=17d0c46590ff | structural/exact=(2, 2); instructions=406/406; 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r6, 0(0)') -> ('slwi', 'r3, r3, 3')
|
||||
Round2 CheckBS2CommandStatus | typed TOC field access without integer-cast alias barrier | sha256=ac01c3438aaa | structural/exact=(2, 2); instructions=406/406; 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r6, 0(0)') -> ('slwi', 'r3, r3, 3')
|
||||
Round2 CheckBS2CommandStatus | typed TOC pointer with readonly field view in status checker | sha256=c0e1b31b8c16 | structural/exact=(2, 2); instructions=406/406; 179: ('slwi', 'r3, r3, 3') -> ('stw', 'r6, 0(0)'); 180: ('stw', 'r6, 0(0)') -> ('slwi', 'r3, r3, 3')
|
||||
Round2 CheckBS2CommandStatus: batch 3 successful distinct builds/3 forms, best=(2, 2).
|
||||
Round2 CheckStatus additional real global-TOC pointer/field alias forms attempted; if noexact restore. Mach structure polling corrections remain provisional: new counts393/393 and98.72774 vs95.496185, gate PASS/zero regressions, but noinstruction-exact gain yet; no other state/prototype/global volatility is inferred without target proof.
|
||||
Round2 AOSSXorBufferWithKey | actual byte-mask loop inline helper const u8* form0 | sha256=eda88437cb80 | structural/exact=(79, 134); instructions=81/147; 0: ('stwu', 'r1, -0x30(r1)') -> ('stwu', 'r1, -0x40(r1)'); 2: ('stw', 'r0, 0x34(r1)') -> ('stw', 'r0, 0x44(r1)'); 3: ('addi', 'r11, r1, 0x30') -> ('addi', 'r11, r1, 0x40'); 6: ('mr', 'r28, r3') -> ('mr', 'r21, r3'); 8: ('mr', 'r29, r4') -> ('mr', 'r22, r4'); 9: ('srawi', 'r26, r0, 1') -> ('srawi', 'r29, r0, 1'); 10: ('mr', 'r30, r5') -> ('mr', 'r23, r5'); 11: ('mr', 'r31, r6') -> ('mr', 'r24, r6'); 12: ('mr', 'r3, r26') -> ('mr', 'r3, r29'); 15: ('mr', 'r23, r3') -> ('mr', 'r26, r3'); 18: ('b', '228') -> ('b', '492'); 19: ('mr', 'r3, r29') -> ('mr', 'r3, r22')
|
||||
Round2 AOSSXorBufferWithKey | actual byte-mask loop inline helper const u8* form1 | sha256=01186387dc93 | structural/exact=(79, 134); instructions=81/147; 0: ('stwu', 'r1, -0x30(r1)') -> ('stwu', 'r1, -0x40(r1)'); 2: ('stw', 'r0, 0x34(r1)') -> ('stw', 'r0, 0x44(r1)'); 3: ('addi', 'r11, r1, 0x30') -> ('addi', 'r11, r1, 0x40'); 6: ('mr', 'r28, r3') -> ('mr', 'r21, r3'); 8: ('mr', 'r29, r4') -> ('mr', 'r22, r4'); 9: ('srawi', 'r26, r0, 1') -> ('srawi', 'r29, r0, 1'); 10: ('mr', 'r30, r5') -> ('mr', 'r23, r5'); 11: ('mr', 'r31, r6') -> ('mr', 'r24, r6'); 12: ('mr', 'r3, r26') -> ('mr', 'r3, r29'); 15: ('mr', 'r23, r3') -> ('mr', 'r26, r3'); 18: ('b', '228') -> ('b', '492'); 19: ('mr', 'r3, r29') -> ('mr', 'r3, r22')
|
||||
Round2 AOSSXorBufferWithKey | actual byte-mask loop inline helper u8* form0 | sha256=dba668a0c733 | structural/exact=(79, 134); instructions=81/147; 0: ('stwu', 'r1, -0x30(r1)') -> ('stwu', 'r1, -0x40(r1)'); 2: ('stw', 'r0, 0x34(r1)') -> ('stw', 'r0, 0x44(r1)'); 3: ('addi', 'r11, r1, 0x30') -> ('addi', 'r11, r1, 0x40'); 6: ('mr', 'r28, r3') -> ('mr', 'r21, r3'); 8: ('mr', 'r29, r4') -> ('mr', 'r22, r4'); 9: ('srawi', 'r26, r0, 1') -> ('srawi', 'r29, r0, 1'); 10: ('mr', 'r30, r5') -> ('mr', 'r23, r5'); 11: ('mr', 'r31, r6') -> ('mr', 'r24, r6'); 12: ('mr', 'r3, r26') -> ('mr', 'r3, r29'); 15: ('mr', 'r23, r3') -> ('mr', 'r26, r3'); 18: ('b', '228') -> ('b', '492'); 19: ('mr', 'r3, r29') -> ('mr', 'r3, r22')
|
||||
Round2 AOSSXorBufferWithKey | actual byte-mask loop inline helper u8* form1 | sha256=8878506955d0 | structural/exact=(79, 134); instructions=81/147; 0: ('stwu', 'r1, -0x30(r1)') -> ('stwu', 'r1, -0x40(r1)'); 2: ('stw', 'r0, 0x34(r1)') -> ('stw', 'r0, 0x44(r1)'); 3: ('addi', 'r11, r1, 0x30') -> ('addi', 'r11, r1, 0x40'); 6: ('mr', 'r28, r3') -> ('mr', 'r21, r3'); 8: ('mr', 'r29, r4') -> ('mr', 'r22, r4'); 9: ('srawi', 'r26, r0, 1') -> ('srawi', 'r29, r0, 1'); 10: ('mr', 'r30, r5') -> ('mr', 'r23, r5'); 11: ('mr', 'r31, r6') -> ('mr', 'r24, r6'); 12: ('mr', 'r3, r26') -> ('mr', 'r3, r29'); 15: ('mr', 'r23, r3') -> ('mr', 'r26, r3'); 18: ('b', '228') -> ('b', '492'); 19: ('mr', 'r3, r29') -> ('mr', 'r3, r22')
|
||||
Round2 AOSSXorBufferWithKey: batch 4 successful distinct builds/4 forms, best=(79, 134).
|
||||
Round2 closing searches: UpdateThread100 leading-local declarations improved only743→729operand differences (structural109 unchanged); discarded permutations and restored committed Init match. Hello8successfully compiled sourceforms +90broad/50proper scalar declarationsearch no exact; original restored. Xor21successfully built expression/type/inline-boundary/scope forms, baseline118declarations and mask-temp118declarations: best29register differences vs baseline34, no exact; restored baseline. No new source/helper/data definitions retained in AOSS.
|
||||
Round2 provisional kept source is only faithful BS2StartGame async poll correction: target393/393, remainingfive initial lis/store scheduling andfive MMIO value/address register operands. TU-only DVD state volatile field and globalLowReadResult are justified by targetempty polls and immediate rereads; no other unit sees qualifiedfield. This is explicitly fuzzy structural progress, not an exact function. Final gate will decide retention; primary exact gain BS2UpdateInit already committed fcbd5a29.
|
||||
Round2 final open-function completeness audit (fresh report; compiled source SHA variants counted, build failures excluded):
|
||||
Round2 open libs/RVL_SDK/src/fa/api/FAAttach::FAAttach 99.36%; 9 distinct successful source forms; instructions[125, 125]; structural/operand(0, 10).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_8148302C 99.49152%; 5 distinct successful source forms; instructions[59, 59]; structural/operand(0, 6).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483264 98.902435%; 6 distinct successful source forms; instructions[41, 41]; structural/operand(0, 8).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483308 99.13793%; 5 distinct successful source forms; instructions[58, 58]; structural/operand(0, 9).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814833F0 99.04256%; 5 distinct successful source forms; instructions[47, 47]; structural/operand(0, 8).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814834AC 99.3586%; 8 distinct successful source forms; instructions[344, 343]; structural/operand(1, 329).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8GetKOcandidates 97.96712%; 6 distinct successful source forms; instructions[673, 669]; structural/operand(30, 645).
|
||||
Round2 open src/system/iplKeyboard::create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap 94.00944%; 7 distinct successful source forms; instructions[318, 318]; structural/operand(42, 210).
|
||||
Round2 open src/BS2/BS2Update::UpdateThread 92.33406%; 9 distinct successful source forms; instructions[902, 913]; structural/operand(109, 744).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmConvertToFloatFromStr 97.59036%; 6 distinct successful source forms; instructions[83, 83]; structural/operand(2, 2).
|
||||
Round2 open src/channelScript/CHANSVm::VmDateDtor 94.96703%; 4 distinct successful source forms; instructions[91, 91]; structural/operand(5, 7).
|
||||
Round2 open src/channelScript/CHANSVm::VmStringReplace 97.878784%; 3 distinct successful source forms; instructions[132, 132]; structural/operand(0, 40).
|
||||
Round2 open src/channelScript/CHANSVm::VmStringSplit 98.04054%; 4 distinct successful source forms; instructions[222, 222]; structural/operand(0, 66).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmFormatString 99.84919%; 6 distinct successful source forms; instructions[431, 431]; structural/operand(0, 13).
|
||||
Round2 open src/channelScript/CHANSVm::VmBlobGetHexString 98.71951%; 4 distinct successful source forms; instructions[82, 82]; structural/operand(0, 14).
|
||||
Round2 open src/channelScript/CHANSVm::VmBlobPackCommon 97.949104%; 4 distinct successful source forms; instructions[668, 668]; structural/operand(0, 244).
|
||||
Round2 open src/channelScript/CHANSVm::VmBlobUnpack 98.452614%; 5 distinct successful source forms; instructions[517, 517]; structural/operand(0, 141).
|
||||
Round2 open src/channelScript/CHANSVm::VmWinEmuWrite 99.62687%; 4 distinct successful source forms; instructions[67, 67]; structural/operand(0, 5).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmAddExe 99.625984%; 4 distinct successful source forms; instructions[254, 254]; structural/operand(0, 16).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmLinkModules 98.677246%; 4 distinct successful source forms; instructions[189, 189]; structural/operand(0, 43).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmStep 96.46608%; 5 distinct successful source forms; instructions[1253, 1253]; structural/operand(65, 313).
|
||||
Round2 open src/BS2/BS2Mach::Run 16.744186%; 3 distinct successful source forms; instructions[11, 43]; structural/operand(40, 42).
|
||||
Round2 open src/BS2/BS2Mach::BS2StartGame 98.72774%; 17 distinct successful source forms; instructions[393, 393]; structural/operand(4, 10).
|
||||
Round2 open src/BS2/BS2Mach::BS2StartGCGame 99.5614%; 8 distinct successful source forms; instructions[228, 228]; structural/operand(2, 7).
|
||||
Round2 open src/BS2/BS2Mach::CheckBS2CommandStatus 99.50739%; 13 distinct successful source forms; instructions[406, 406]; structural/operand(2, 2).
|
||||
Round2 open src/BS2/BS2Mach::BS2Tick 98.230415%; 4 distinct successful source forms; instructions[1934, 1940]; structural/operand(136, 1665).
|
||||
Round2 open src/scene/setting/AOSS::AOSS_Init_old 93.78725%; 7 distinct successful source forms; instructions[1575, 1584]; structural/operand(1141, 1524).
|
||||
Round2 open src/scene/setting/AOSS::AOSSDecryptMessage 97.74143%; 4 distinct successful source forms; instructions[321, 321]; structural/operand(0, 87).
|
||||
Round2 open src/scene/setting/AOSS::AOSSApplyAuthOptions 98.77193%; 4 distinct successful source forms; instructions[114, 114]; structural/operand(0, 22).
|
||||
Round2 open src/scene/setting/AOSS::AOSSSendHelloRequest 92.190475%; 8 distinct successful source forms; instructions[271, 273]; structural/operand(33, 254).
|
||||
Round2 open src/scene/setting/AOSS::AOSSXorBufferWithKey 98.605446%; 21 distinct successful source forms; instructions[147, 147]; structural/operand(0, 34).
|
||||
Round2 audit 31 remaining functions, all>=3=True; data pairing/extent proof recorded per unit; all failed/fuzzy-only declaration permutations restored.
|
||||
Round2 pre-final seven-unit gate PASS: unchanged data/exact counts outside Init; global regressions0, forbidden0, readability0, full DOL SHA1 exact. Retain structurally proven asynchronous poll correction (fuzzy98.72774, not matched), discard all other search source edits. All31 remainingopenfunctions have3..21 distinct successfully compiled source forms in fresh audit.
|
||||
Round2 UpdateThread: fetched origin b6687e9ff9e0; remote owned source/context unchanged, existing nonexact status confirmed.
|
||||
Round2 final context revisit: current independently initialized thread/stack changes common BSS context; revisit proven rc immediate rereads with original signed type preserved (earlier four unsigned/global variants were before Init context fix). Target d5c store→d64lwz (onlyaddi between), e48store→e50lwz, with no interveningcall, proves definition staticvolatile s32 rc. Freshfetch no externalowned changes. Test and gate before retaining.
|
||||
Round2 UpdateThread | signed static callback result has proven definition-level volatile | sha256=9b3d4fb5df52 | structural/exact=(97, 745); instructions=904/913; exact Init preserved and real rereads restored.
|
||||
Round2 signed rc qualification gate PASS: UpdateThread92.33406→93.59803, two real immediate reloads restored904/913, Init remains exact9/10/code400 and data10488; all baseline exactfunctions preserved, global regressions0/forbidden0/readability0. Retain proven qualifier as structural partial progress, not a second exact function. Last all-seven clean gate will be rerun after this source change.
|
||||
Round2 final open-function completeness audit (fresh report; compiled source SHA variants counted, build failures excluded):
|
||||
Round2 open libs/RVL_SDK/src/fa/api/FAAttach::FAAttach 99.36%; 9 distinct successful source forms; instructions[125, 125]; structural/operand(0, 10).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_8148302C 99.49152%; 5 distinct successful source forms; instructions[59, 59]; structural/operand(0, 6).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483264 98.902435%; 6 distinct successful source forms; instructions[41, 41]; structural/operand(0, 8).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483308 99.13793%; 5 distinct successful source forms; instructions[58, 58]; structural/operand(0, 9).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814833F0 99.04256%; 5 distinct successful source forms; instructions[47, 47]; structural/operand(0, 8).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814834AC 99.3586%; 8 distinct successful source forms; instructions[344, 343]; structural/operand(1, 329).
|
||||
Round2 open libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8GetKOcandidates 97.96712%; 6 distinct successful source forms; instructions[673, 669]; structural/operand(30, 645).
|
||||
Round2 open src/system/iplKeyboard::create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap 94.00944%; 7 distinct successful source forms; instructions[318, 318]; structural/operand(42, 210).
|
||||
Round2 open src/BS2/BS2Update::UpdateThread 93.59803%; 10 distinct successful source forms; instructions[904, 913]; structural/operand(97, 745).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmConvertToFloatFromStr 97.59036%; 6 distinct successful source forms; instructions[83, 83]; structural/operand(2, 2).
|
||||
Round2 open src/channelScript/CHANSVm::VmDateDtor 94.96703%; 4 distinct successful source forms; instructions[91, 91]; structural/operand(5, 7).
|
||||
Round2 open src/channelScript/CHANSVm::VmStringReplace 97.878784%; 3 distinct successful source forms; instructions[132, 132]; structural/operand(0, 40).
|
||||
Round2 open src/channelScript/CHANSVm::VmStringSplit 98.04054%; 4 distinct successful source forms; instructions[222, 222]; structural/operand(0, 66).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmFormatString 99.84919%; 6 distinct successful source forms; instructions[431, 431]; structural/operand(0, 13).
|
||||
Round2 open src/channelScript/CHANSVm::VmBlobGetHexString 98.71951%; 4 distinct successful source forms; instructions[82, 82]; structural/operand(0, 14).
|
||||
Round2 open src/channelScript/CHANSVm::VmBlobPackCommon 97.949104%; 4 distinct successful source forms; instructions[668, 668]; structural/operand(0, 244).
|
||||
Round2 open src/channelScript/CHANSVm::VmBlobUnpack 98.452614%; 5 distinct successful source forms; instructions[517, 517]; structural/operand(0, 141).
|
||||
Round2 open src/channelScript/CHANSVm::VmWinEmuWrite 99.62687%; 4 distinct successful source forms; instructions[67, 67]; structural/operand(0, 5).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmAddExe 99.625984%; 4 distinct successful source forms; instructions[254, 254]; structural/operand(0, 16).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmLinkModules 98.677246%; 4 distinct successful source forms; instructions[189, 189]; structural/operand(0, 43).
|
||||
Round2 open src/channelScript/CHANSVm::CHANSVmStep 96.46608%; 5 distinct successful source forms; instructions[1253, 1253]; structural/operand(65, 313).
|
||||
Round2 open src/BS2/BS2Mach::Run 16.744186%; 3 distinct successful source forms; instructions[11, 43]; structural/operand(40, 42).
|
||||
Round2 open src/BS2/BS2Mach::BS2StartGame 98.72774%; 17 distinct successful source forms; instructions[393, 393]; structural/operand(4, 10).
|
||||
Round2 open src/BS2/BS2Mach::BS2StartGCGame 99.5614%; 8 distinct successful source forms; instructions[228, 228]; structural/operand(2, 7).
|
||||
Round2 open src/BS2/BS2Mach::CheckBS2CommandStatus 99.50739%; 13 distinct successful source forms; instructions[406, 406]; structural/operand(2, 2).
|
||||
Round2 open src/BS2/BS2Mach::BS2Tick 98.230415%; 4 distinct successful source forms; instructions[1934, 1940]; structural/operand(136, 1665).
|
||||
Round2 open src/scene/setting/AOSS::AOSS_Init_old 93.78725%; 7 distinct successful source forms; instructions[1575, 1584]; structural/operand(1141, 1524).
|
||||
Round2 open src/scene/setting/AOSS::AOSSDecryptMessage 97.74143%; 4 distinct successful source forms; instructions[321, 321]; structural/operand(0, 87).
|
||||
Round2 open src/scene/setting/AOSS::AOSSApplyAuthOptions 98.77193%; 4 distinct successful source forms; instructions[114, 114]; structural/operand(0, 22).
|
||||
Round2 open src/scene/setting/AOSS::AOSSSendHelloRequest 92.190475%; 8 distinct successful source forms; instructions[271, 273]; structural/operand(33, 254).
|
||||
Round2 open src/scene/setting/AOSS::AOSSXorBufferWithKey 98.605446%; 21 distinct successful source forms; instructions[147, 147]; structural/operand(0, 34).
|
||||
Round2 audit 31 remaining functions, all>=3=True; data pairing/extent proof recorded per unit; all failed/fuzzy-only declaration permutations restored.
|
||||
Round2 final full nonquick gate across allseven units PASS after final source change; clean 43U build/DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; zero global regressions, forbidden additions, readability warnings. Instruction-exact BS2Update8→9, code112→400, data10488unchanged. Only one newly exact function, BS2UpdateInit; Thread and DVD polling improvements remain fuzzy and are reported as such.
|
||||
Round2 final original ELF neighbour audit: all nonzero function extents in allseven owned objects do not overlap nextdistinct symbol; UpdateThread and AOSS_Init_old both terminate at real epilogueblr. No functionextent changed. The only extentcorrection is dataThread0x1318→0x318 with OSThread/stack-pointer relocation proof above.
|
||||
Round2 source commits: fcbd5a29 exact Init/Thread data extent; 9ab3eb81 target-proven DVD state/poll partial; ce9cff4f target-proven signed rc reload partial. Final detailed artifact tools/decomp-assist/fz1.r2.report.md and complete raw gate tools/decomp-assist/fz1.r2.final-gate.txt. Existing untracked earlier artifacts untouched.
|
||||
|
||||
@@ -1,107 +0,0 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] objdiff: code None/500 data 240/240 functions 0/1 fuzzy 99.3600 linked code 0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] instruction-exact functions: 0/1
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .bss size 208 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .data size 24 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .sdata size 8 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .text size 500 match 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] below 100: FAAttach 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] baseline: code None/500 data 240 functions 0 fuzzy 99.3600
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] objdiff: code 332/5200 data 96/180 functions 1/7 fuzzy 98.6539 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] instruction-exact functions: 1/7
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .data size 40 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .text size 5200 match 98.65385
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extab size 56 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extabindex size 84 match 97.61904
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_8148302C 99.49152
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483264 98.902435
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483308 99.13793
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814833F0 99.04256
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814834AC 99.3586
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8GetKOcandidates 97.96712
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] baseline: code 332/5200 data 96 functions 1 fuzzy 98.6539
|
||||
[src/system/iplKeyboard] pool: IDENTICAL
|
||||
[src/system/iplKeyboard] objdiff: code 4752/6024 data 1184/1184 functions 31/32 fuzzy 98.7351 linked code 0
|
||||
[src/system/iplKeyboard] instruction-exact functions: 31/32
|
||||
[src/system/iplKeyboard] section .data size 1168 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata2 size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .text size 6024 match 98.73506
|
||||
[src/system/iplKeyboard] below 100: create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap 94.00944
|
||||
[src/system/iplKeyboard] baseline: code 4752/6024 data 1184 functions 31 fuzzy 98.7351
|
||||
[src/BS2/BS2Update] pool: IDENTICAL
|
||||
[src/BS2/BS2Update] objdiff: code 400/4052 data 10488/10488 functions 9/10 fuzzy 94.2300 linked code 0
|
||||
[src/BS2/BS2Update] instruction-exact functions: 9/10
|
||||
[src/BS2/BS2Update] section .bss size 9056 match 100.0
|
||||
[src/BS2/BS2Update] section .data size 1328 match 100.0
|
||||
[src/BS2/BS2Update] section .sbss size 80 match 100.0
|
||||
[src/BS2/BS2Update] section .sdata size 24 match 100.0
|
||||
[src/BS2/BS2Update] section .text size 4052 match 94.23001
|
||||
[src/BS2/BS2Update] below 100: UpdateThread 93.59803
|
||||
[src/BS2/BS2Update] baseline: code 112/4052 data 10488 functions 8 fuzzy 91.6604
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 37608/53564 data 6904/6904 functions 221/233 fuzzy 99.3644 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 221/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
|
||||
[src/channelScript/CHANSVm] section .text size 53564 match 99.364426
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmConvertToFloatFromStr 97.59036
|
||||
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
|
||||
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
|
||||
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmFormatString 99.84919
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.625984
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.46608
|
||||
[src/channelScript/CHANSVm] baseline: code 37608/53564 data 6904 functions 221 fuzzy 99.3644
|
||||
[src/BS2/BS2Mach] pool: IDENTICAL
|
||||
[src/BS2/BS2Mach] objdiff: code 4940/16980 data 155504/158528 functions 24/29 fuzzy 98.1595 linked code 0
|
||||
[src/BS2/BS2Mach] instruction-exact functions: 24/29
|
||||
[src/BS2/BS2Mach] section .bss size 155232 match 100.0
|
||||
[src/BS2/BS2Mach] section .data size 3024 match None
|
||||
[src/BS2/BS2Mach] section .sbss size 240 match 100.0
|
||||
[src/BS2/BS2Mach] section .sdata size 32 match 100.0
|
||||
[src/BS2/BS2Mach] section .text size 16980 match 98.159485
|
||||
[src/BS2/BS2Mach] below 100: Run 16.744186
|
||||
[src/BS2/BS2Mach] below 100: BS2StartGame 98.72774
|
||||
[src/BS2/BS2Mach] below 100: BS2StartGCGame 99.5614
|
||||
[src/BS2/BS2Mach] below 100: CheckBS2CommandStatus 99.50739
|
||||
[src/BS2/BS2Mach] below 100: BS2Tick 98.230415
|
||||
[src/BS2/BS2Mach] baseline: code 4940/16980 data 155504 functions 24 fuzzy 97.8276
|
||||
[src/scene/setting/AOSS] pool: IDENTICAL
|
||||
[src/scene/setting/AOSS] objdiff: code 6436/16192 data 3928/3928 functions 16/21 fuzzy 96.7779 linked code 0
|
||||
[src/scene/setting/AOSS] instruction-exact functions: 15/21
|
||||
[src/scene/setting/AOSS] section .bss size 3496 match 100.0
|
||||
[src/scene/setting/AOSS] section .data size 368 match 100.0
|
||||
[src/scene/setting/AOSS] section .sbss size 32 match 100.0
|
||||
[src/scene/setting/AOSS] section .sdata size 24 match 100.0
|
||||
[src/scene/setting/AOSS] section .sdata2 size 8 match 100.0
|
||||
[src/scene/setting/AOSS] section .text size 16192 match 96.777916
|
||||
[src/scene/setting/AOSS] below 100: AOSS_Init_old 93.78725
|
||||
[src/scene/setting/AOSS] below 100: AOSSDecryptMessage 97.74143
|
||||
[src/scene/setting/AOSS] below 100: AOSSApplyAuthOptions 98.77193
|
||||
[src/scene/setting/AOSS] below 100: AOSSSendHelloRequest 92.190475
|
||||
[src/scene/setting/AOSS] below 100: AOSSXorBufferWithKey 98.605446
|
||||
[src/scene/setting/AOSS] baseline: code 6436/16192 data 3928 functions 16 fuzzy 96.7779
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 89.64909 -> 89.65871
|
||||
global fuzzy_match_percent: 99.53278 -> 99.53815
|
||||
global complete_code_percent: 67.39544 -> 67.39544
|
||||
global matched_data_percent: 99.36508 -> 99.36508
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
review note: libs/RVL_SDK/include/revolution/dvd.h: volatile object declaration (orchestrator checks the target really re-reads it) (+1 net), e.g. volatile s32 state;
|
||||
review note: src/BS2/BS2Mach.c: volatile object declaration (orchestrator checks the target really re-reads it) (+1 net), e.g. vu32 LowReadResult = 0;
|
||||
review note: src/BS2/BS2Update.c: volatile object declaration (orchestrator checks the target really re-reads it) (+1 net), e.g. static volatile s32 rc = 0;
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
@@ -1,129 +0,0 @@
|
||||
# Fuzzy lane round 2, final verified handoff
|
||||
|
||||
One new exact function: `BS2UpdateInit`. Two additional target-proven volatile/poll corrections improve fuzzy code, and remain non-matching. All 31 remaining functions have at least three distinct successfully compiled source forms logged; build failures do not count.
|
||||
|
||||
Final full gate (no `--quick`; clean build):
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] objdiff: code None/500 data 240/240 functions 0/1 fuzzy 99.3600 linked code 0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] instruction-exact functions: 0/1
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] objdiff: code 332/5200 data 96/180 functions 1/7 fuzzy 98.6539 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] instruction-exact functions: 1/7
|
||||
[src/system/iplKeyboard] objdiff: code 4752/6024 data 1184/1184 functions 31/32 fuzzy 98.7351 linked code 0
|
||||
[src/system/iplKeyboard] instruction-exact functions: 31/32
|
||||
[src/BS2/BS2Update] objdiff: code 400/4052 data 10488/10488 functions 9/10 fuzzy 94.2300 linked code 0
|
||||
[src/BS2/BS2Update] instruction-exact functions: 9/10
|
||||
[src/channelScript/CHANSVm] objdiff: code 37608/53564 data 6904/6904 functions 221/233 fuzzy 99.3644 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 221/233
|
||||
[src/BS2/BS2Mach] objdiff: code 4940/16980 data 155504/158528 functions 24/29 fuzzy 98.1595 linked code 0
|
||||
[src/BS2/BS2Mach] instruction-exact functions: 24/29
|
||||
[src/scene/setting/AOSS] objdiff: code 6436/16192 data 3928/3928 functions 16/21 fuzzy 96.7779 linked code 0
|
||||
[src/scene/setting/AOSS] instruction-exact functions: 15/21
|
||||
regressions vs baseline: 0
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
Before -> after (matched code/data bytes; denominators unchanged):
|
||||
|
||||
| Unit | Raw gate exact functions | Objdiff exact functions | Code bytes | Data bytes |
|
||||
|---|---|---|---|---|
|
||||
| `libs/RVL_SDK/src/fa/api/FAAttach` | 0/1 -> 0/1 | 0/1 -> 0/1 | 0 -> 0 / 500 | 240 -> 240 / 240 |
|
||||
| `libs/RVLMiddleware/eZiText/src/clib/zkokeyp` | 1/7 -> 1/7 | 1/7 -> 1/7 | 332 -> 332 / 5200 | 96 -> 96 / 180 |
|
||||
| `src/system/iplKeyboard` | 31/32 -> 31/32 | 31/32 -> 31/32 | 4752 -> 4752 / 6024 | 1184 -> 1184 / 1184 |
|
||||
| `src/BS2/BS2Update` | 8/10 -> 9/10 | 8/10 -> 9/10 | 112 -> 400 / 4052 | 10488 -> 10488 / 10488 |
|
||||
| `src/channelScript/CHANSVm` | 221/233 -> 221/233 | 221/233 -> 221/233 | 37608 -> 37608 / 53564 | 6904 -> 6904 / 6904 |
|
||||
| `src/BS2/BS2Mach` | 24/29 -> 24/29 | 24/29 -> 24/29 | 4940 -> 4940 / 16980 | 155504 -> 155504 / 158528 |
|
||||
| `src/scene/setting/AOSS` | 15/21 -> 15/21 | 16/21 -> 16/21 | 6436 -> 6436 / 16192 | 3928 -> 3928 / 3928 |
|
||||
|
||||
Remaining functions (one line each; successful distinct source forms are additional to declaration permutations):
|
||||
|
||||
- `libs/RVL_SDK/src/fa/api/FAAttach::FAAttach` — 99.36%; Drive index narrowing and attached-table base register allocation; 125/125 instructions. 9 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_8148302C` — 99.49152%; Work pointer and key-table value registers exchange; 59/59. 5 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483264` — 98.902435%; Parameter/metadata and byte iteration index registers exchange; 41/41. 6 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483308` — 99.13793%; Count pointer and running counter registers exchange; 58/58. 5 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814833F0` — 99.04256%; Metadata pointer and candidate index registers exchange; 47/47. 5 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814834AC` — 99.3586%; Zero initialization chain emits an extra clrlwi; addressing/register operands also differ; 344/343. 8 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8GetKOcandidates` — 97.96712%; Candidate loop boundaries, helper return narrowing and temporary scheduling; 673/669. 6 source forms.
|
||||
- `src/system/iplKeyboard::create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap` — 94.00944%; Inline resource-node constructor boundary, OEM dictionary index and MemoSetting stack copy order; 318/318. 7 source forms.
|
||||
- `src/BS2/BS2Update::UpdateThread` — 93.59803%; Import/scan branch and store scheduling, common bases and temporaries; proven rc reloads restored, nine target instructions still absent; 904/913. 10 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmConvertToFloatFromStr` — 97.59036%; End pointer initialization store and object-type compare occur in opposite order; 83/83. 6 source forms.
|
||||
- `src/channelScript/CHANSVm::VmDateDtor` — 94.96703%; Variadic date argument and year stack-store scheduling; 91/91. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::VmStringReplace` — 97.878784%; Search/replacement lengths and live cursor register allocation; 132/132. 3 source forms.
|
||||
- `src/channelScript/CHANSVm::VmStringSplit` — 98.04054%; Delimiter/parent cursor and result array register allocation; 222/222. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmFormatString` — 99.84919%; Two temporary object/string-length registers exchange late in the formatter; 431/431. 6 source forms.
|
||||
- `src/channelScript/CHANSVm::VmBlobGetHexString` — 98.71951%; Output offset and decoded hex digit registers exchange; 82/82. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::VmBlobPackCommon` — 97.949104%; Packing mode, format and copy-loop temporary register allocation; 668/668. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::VmBlobUnpack` — 98.452614%; Two-pass format parser and blob cursor/count register allocation; 517/517. 5 source forms.
|
||||
- `src/channelScript/CHANSVm::VmWinEmuWrite` — 99.62687%; String object and total byte-length registers exchange; 67/67. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmAddExe` — 99.625984%; Module header and executable type argument registers exchange, plus address operand order; 254/254. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmLinkModules` — 98.677246%; Dispatch/module/index and global-list pointer registers exchange; 189/189. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmStep` — 96.46608%; Default step count and loop-entry branch form, floating constant bases and opcode temporaries; 1253/1253. 5 source forms.
|
||||
- `src/BS2/BS2Mach::Run` — 16.744186%; Target explicitly clears fixed GPRs and the stack pointer and enters via LR; ordinary C cache-loop/callback forms cannot encode that handoff under the no-asm constraint; 11/43. 3 source forms.
|
||||
- `src/BS2/BS2Mach::BS2StartGame` — 98.72774%; Five initial base/store scheduling operands and five legacy DI address/value register operands remain after fixing all polling loops; 393/393. 17 source forms.
|
||||
- `src/BS2/BS2Mach::BS2StartGCGame` — 99.5614%; External DVD getter call versus inline state load, and wide tick multiplication operand allocation; 228/228. 8 source forms.
|
||||
- `src/BS2/BS2Mach::CheckBS2CommandStatus` — 99.50739%; Partition-count slwi and CacheCommandComplete store occur in opposite order; 406/406. 13 source forms.
|
||||
- `src/BS2/BS2Mach::BS2Tick` — 98.230415%; Boot/hardware address-base sharing, progress-store scheduling and loader output scope; six target instructions absent; 1934/1940. 4 source forms.
|
||||
- `src/scene/setting/AOSS::AOSS_Init_old` — 93.78725%; Timeout default loads share an array base instead of independent references; local/global allocation and initialization/branch scheduling also differ; 1575/1584. 7 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSDecryptMessage` — 97.74143%; Checksum and key schedule/state/input/output cursor registers exchange; 321/321. 4 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSApplyAuthOptions` — 98.77193%; Authentication flags and configuration subrecord pointers use different registers; 114/114. 4 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSSendHelloRequest` — 92.190475%; Common CRC/key-state base hoisting and packet/key/socket local boundaries differ; 271/273. 8 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSXorBufferWithKey` — 98.605446%; Unrolled XOR result ownership and packet/mask address register allocation; 147/147. 21 source forms.
|
||||
|
||||
Data proof and limits:
|
||||
|
||||
- `BS2Update`: `Thread` at 0x810B2580 is an OSThread of size 0x318; target OSCreateThread uses a separate 4096-byte stack starting at thread+0x318. Corrected only the data extent from 0x1318 to 0x318, kept the address and full .bss section size 9056, and left stack bytes unowned. Separate real, initialized thread/stack objects produce 72/72 identical Init instructions and preserve data 10488/10488.
|
||||
- `zkokeyp`: .data and .extab bytes match. .extabindex has two differing real function-size words (1376/1372 and 2692/2676), corresponding to the two remaining functions with extra instructions. No data rename/extent fix can legitimately conceal that.
|
||||
- `BS2Mach`: the first 3020 .data bytes are identical, followed by four zero alignment bytes in the target. Anonymous string/table symbols have no authorized real source object name to pair. Two jump table relocation sets also refer into non-matching functions. Data remains 155504/158528; no invented names, pinned literals or padding objects were added.
|
||||
- Other owned units retain 100% objdiff data. No weak inline/vtable data was suppressed. No other symbol rename or extent correction was made.
|
||||
|
||||
Target proof for qualifiers:
|
||||
|
||||
- DVD state field: repeated target CoverBlock.state reads at 0xDE0 with a back edge from 0xDE8 and no call. Qualification is guarded by BS2_MACH_VOLATILE_DVD_STATE, defined only by BS2Mach.c; all other translation units compile the original header field.
|
||||
- LowReadResult: empty repeated polls at 0x1130/0x117C/0x1290/0x12E8, with further loads at 0x113C/0x129C immediately after poll exits. The previous interrupt calls were absent from target code.
|
||||
- Static signed rc: target store at 0xD5C followed by load at 0xD64, and store at 0xE48 followed by load at 0xE50, with no intervening call. Signed volatile restores two real reads. No use-site volatile cast was added.
|
||||
|
||||
Uncertainties:
|
||||
|
||||
- AOSSParseNetworkSettings is objdiff 100%, byte-identical, and declaration-tool score (0,0). The gate uses odiff, which incorrectly rebases its CR1 conditional branches by the 36-byte function-position delta. The raw gate consequently prints 15/21, while objdiff and bytes prove 16/21. Raw output is preserved verbatim above; source/metadata were not changed to manipulate this metric.
|
||||
- Remaining allocation/scheduling causes are hypotheses supported by target diffs and unsuccessful source experiments, not claims that the original source is known.
|
||||
- Run needs the fixed-register handoff described above; no forbidden assembly or fabricated match was attempted.
|
||||
|
||||
Files changed and source commits:
|
||||
|
||||
```text
|
||||
fcbd5a298408059adaf22d29cecb21b9a9cfa301
|
||||
match update thread creation and object extent
|
||||
|
||||
config/43U/symbols.txt
|
||||
src/BS2/BS2Update.c
|
||||
tools/decomp-assist/fz1.attempts.md
|
||||
```
|
||||
|
||||
```text
|
||||
9ab3eb8183594c3a940d7bbb147de7e3c085bca0
|
||||
restore dvd callback polling
|
||||
|
||||
libs/RVL_SDK/include/revolution/dvd.h
|
||||
src/BS2/BS2Mach.c
|
||||
tools/decomp-assist/fz1.attempts.md
|
||||
```
|
||||
|
||||
```text
|
||||
ce9cff4fa6c2d03310c780b1592d02c49bc6c367
|
||||
preserve update result reloads
|
||||
|
||||
src/BS2/BS2Update.c
|
||||
tools/decomp-assist/fz1.attempts.md
|
||||
```
|
||||
|
||||
Verification artifacts:
|
||||
|
||||
- `tools/decomp-assist/fz1.attempts.md` — structural diagnoses, source variant hashes/results, proofs and final all-open audit.
|
||||
- `tools/decomp-assist/fz1.r2.final-gate.txt` — complete final clean gate output.
|
||||
- `tools/decomp-assist/fz1.r2.report.md` — this report.
|
||||
|
||||
No push, PR, branch switch, rebase, other worktree mutation or subagent was used. Earlier untracked artifacts were left untouched.
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user