Compare commits

...

40 Commits

Author SHA1 Message Date
coah
5314ae39e8 Match CHANS integer parser with a read-only input object 2026-10-02 05:05:46 -05:00
github-actions[bot]
86cda2adbe docs: update progress [skip ci] 2026-10-02 10:01:15 +00:00
coah
0d1fa438ba Match HTTP socket send with a const request view and link (#790) 2026-10-02 05:00:25 -05:00
github-actions[bot]
343fa90f9b docs: update progress [skip ci] 2026-10-02 09:59:04 +00:00
coah
ed52b1987e data(ziswordw, zi8uwd data 100%) (data-d11e) (worker d8fd359e) (#791) 2026-10-02 04:57:57 -05:00
github-actions[bot]
00f44a924b docs: update progress [skip ci] 2026-10-02 09:53:45 +00:00
coah
d494f44516 match(NWC24Mime 16/16) (fz7c) (worker 112576fc) (#789) 2026-10-02 04:52:29 -05:00
github-actions[bot]
5439b99f38 docs: update progress [skip ci] 2026-10-02 09:49:58 +00:00
coah
4ccc441d7e data(iplSDChannelTitle, tiCandidateBox data 100%) (data-d15b) (worker 1e30e292) (#788) 2026-10-02 04:48:32 -05:00
github-actions[bot]
4264e5ff51 docs: update progress [skip ci] 2026-10-02 09:44:23 +00:00
coah
f182215e66 match(NHTTP_socket_RVL 9/10, lyt_window data) (fz2e) (worker 3f0262d6) (#787) 2026-10-02 04:42:46 -05:00
github-actions[bot]
fe6a45c09a docs: update progress [skip ci] 2026-10-02 09:21:35 +00:00
coah
f07dd4a6ca match(NWC24Mime 15/16) (fz7b) (worker b676b7bc) (#786) 2026-10-02 04:20:07 -05:00
github-actions[bot]
65cd387bcb docs: update progress [skip ci] 2026-10-02 09:07:11 +00:00
coah
d0c3d43000 match(vi 29/30) (fz10) (worker 2323903b) (#785) 2026-10-02 04:05:45 -05:00
github-actions[bot]
a2abf24854 docs: update progress [skip ci] 2026-10-02 09:01:43 +00:00
coah
1ce1b0458a Link matched USB access-point thread natively (#784) 2026-10-02 04:00:56 -05:00
github-actions[bot]
0e37502750 docs: update progress [skip ci] 2026-10-02 09:00:50 +00:00
coah
78d6827757 Link matched board scene natively (#783) 2026-10-02 03:58:42 -05:00
coah
b0fbec3f25 Link matched HMAC and socket-information units (#782) 2026-10-02 03:58:34 -05:00
coah
d34e09d5dc match(iplUSBAPThread 7/7, iplSDChannelObj 37/38) (fz1d) (worker bb4dde27) (#781) 2026-10-02 03:54:27 -05:00
github-actions[bot]
7cce8859c3 docs: update progress [skip ci] 2026-10-02 08:51:16 +00:00
coah
711ee737f9 match(zi8pud2 6/8; zidawg1 data 100%, structure) (data-d11d) (worker 41cd3236) (#780) 2026-10-02 03:49:46 -05:00
github-actions[bot]
82def66db6 docs: update progress [skip ci] 2026-10-02 08:49:06 +00:00
coah
2039813ccf match(iplBoard 94/94) (fz2d) (worker 0e765719) (#779) 2026-10-02 03:47:50 -05:00
github-actions[bot]
eabfb0cde9 docs: update progress [skip ci] 2026-10-02 08:47:14 +00:00
coah
2cc9824045 match(hmac 3/3, SOInformation 4/4) (fz8) (worker 4ecc5f21) (#778) 2026-10-02 03:46:04 -05:00
github-actions[bot]
6f90840464 docs: update progress [skip ci] 2026-10-02 08:45:35 +00:00
coah
0978b074b8 data(tiInputForm, tiKeyboard data 100%) (data-d4c) (worker a49df763) (#777) 2026-10-02 03:44:38 -05:00
github-actions[bot]
252e40e22f docs: update progress [skip ci] 2026-10-02 08:44:10 +00:00
coah
2230741db8 match(NWC24Mime 13/16) (fz7) (worker 3a4b90c9) (#776) 2026-10-02 03:43:07 -05:00
github-actions[bot]
f3adacfe3d docs: update progress [skip ci] 2026-10-02 08:39:36 +00:00
coah
1cd71c6903 Describe existing MetroTRK trap entries as sized functions (#775) 2026-10-02 03:38:51 -05:00
github-actions[bot]
7b64914abb docs: update progress [skip ci] 2026-10-02 08:23:28 +00:00
devin-ai-integration[bot]
199de6f6c0 Link bannerSound/AxAdpcmPlayer (clean subset) (#774)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: coah80 <usernamecole7@gmail.com>
2026-10-02 03:22:37 -05:00
github-actions[bot]
513c2a869e docs: update progress [skip ci] 2026-10-02 08:07:20 +00:00
coah
24b6645572 match(SOOption 3/4, pf_volume 34/37) (fz3c) (worker f024666b) (#773) 2026-10-02 03:06:10 -05:00
github-actions[bot]
9536177edd docs: update progress [skip ci] 2026-10-02 08:01:44 +00:00
coah
81325e667c Restore SDK path function emission order and native linking (#772) 2026-10-02 03:00:54 -05:00
coah
51d5dc519b Refresh completion code total after removing overlapping extent (#771) 2026-10-02 02:57:20 -05:00
39 changed files with 8649 additions and 607 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.48% | 88.74% | 64.70% | 98.77% |
| 99.52% | 89.10% | 66.03% | 99.37% |
units 932/1027 complete, functions 12274/12563 matched.
units 939/1027 complete, functions 12297/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -4798,8 +4798,8 @@ iplSDChannelTitle_setPaneMessage = .text:0x813E8D14; // type:function size:0xB8
iplSDChannelTitle_loadBannerMetaFiles = .text:0x813E8DCC; // type:function size:0xA4
iplSDChannelTitle_fetchTmdViewTask = .text:0x813E8E70; // type:function size:0x94
iplSDChannelTitle_passesParentalCheck = .text:0x813E8F04; // type:function size:0x100
iplSDChannelTitle_onTitlePaneEvent = .text:0x813E9004; // type:function size:0x2E8
iplSDChannelTitle_onTitleButtonEvent = .text:0x813E92EC; // type:function size:0x17C
onEvent__Q33ipl5scene23SDTitlePaneEventHandlerFUlUlPv = .text:0x813E9004; // type:function size:0x2E8
onEventDerived__Q33ipl5scene25SDTitleButtonEventHandlerFUlUlPCQ33ipl10controller9Interface = .text:0x813E92EC; // type:function size:0x17C
startResetting__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9468; // type:function size:0xC
@20@__dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9474; // type:function size:0x8
__ct__Q33ipl5scene8SDButtonFPQ23EGG4Heap = .text:0x813E947C; // type:function size:0x9C
@@ -13802,10 +13802,10 @@ __ieee754_sqrt = .text:0x8160CD34; // type:function size:0x248
nan = .text:0x8160CF7C; // type:function size:0x4
sqrt = .text:0x8160CF80; // type:function size:0x4
GetTRKConnected = .text:0x8160CF84; // type:function size:0x10
TRKAccessFile = .text:0x8160CFA0; // type:function
TRKOpenFile = .text:0x8160CFA8; // type:function
TRKCloseFile = .text:0x8160CFB0; // type:function
TRKPositionFile = .text:0x8160CFB8; // type:function
TRKAccessFile = .text:0x8160CFA0; // type:function size:0x8
TRKOpenFile = .text:0x8160CFA8; // type:function size:0x8
TRKCloseFile = .text:0x8160CFB0; // type:function size:0x8
TRKPositionFile = .text:0x8160CFB8; // type:function size:0x8
__TRK_write_console = .text:0x8160CFC0; // type:function size:0xBC
__read_console = .text:0x8160D07C; // type:function size:0xBC
EnableMetroTRKInterrupts = .text:0x8160D138; // type:function size:0x20
@@ -16990,34 +16990,66 @@ lbl_81654F23 = .data:0x81654F23; // type:object size:0x12 data:string
lbl_81654F35 = .data:0x81654F35; // type:object size:0x19 data:string
lbl_81654F4E = .data:0x81654F4E; // type:object size:0x26 data:string
lbl_81654F74 = .data:0x81654F74; // type:object size:0x1F data:string
lbl_81654F98 = .data:0x81654F98; // type:object size:0xC data:string
lbl_81654FA4 = .data:0x81654FA4; // type:object size:0xC data:string
lbl_81654FB0 = .data:0x81654FB0; // type:object size:0xD data:string
lbl_81654FBD = .data:0x81654FBD; // type:object size:0xD data:string
lbl_81654FCA = .data:0x81654FCA; // type:object size:0xC data:string
lbl_81654FD6 = .data:0x81654FD6; // type:object size:0xC data:string
lbl_81654FE2 = .data:0x81654FE2; // type:object size:0x26
lbl_81655008 = .data:0x81655008; // type:object size:0x2B data:string
lbl_81655033 = .data:0x81655033; // type:object size:0x29 data:string
lbl_8165505C = .data:0x8165505C; // type:object size:0x2A data:string
lbl_81655086 = .data:0x81655086; // type:object size:0x24 data:string
lbl_816550AA = .data:0x816550AA; // type:object size:0x23 data:string
lbl_816550CD = .data:0x816550CD; // type:object size:0x3F
lbl_8165510C = .data:0x8165510C; // type:object size:0xD data:string
lbl_81655119 = .data:0x81655119; // type:object size:0x13 data:string
lbl_8165512C = .data:0x8165512C; // type:object size:0x12 data:string
lbl_81655140 = .data:0x81655140; // type:object size:0x3C
lbl_8165517C = .data:0x8165517C; // type:object size:0x120
jumptable_8165529C = .data:0x8165529C; // type:object size:0x7C scope:local
lbl_81655318 = .data:0x81655318; // type:object size:0xB2
lbl_816553CA = .data:0x816553CA; // type:object size:0x34
lbl_816553FE = .data:0x816553FE; // type:object size:0xB data:string
lbl_81655409 = .data:0x81655409; // type:object size:0x10 data:string
lbl_81655419 = .data:0x81655419; // type:object size:0x14 data:string
lbl_8165542D = .data:0x8165542D; // type:object size:0x14 data:string
lbl_81655441 = .data:0x81655441; // type:object size:0x12 data:string
lbl_81655453 = .data:0x81655453; // type:object size:0xF data:string
lbl_81655462 = .data:0x81655462; // type:object size:0x62
@18027 = .data:0x81654F98; // type:object size:0xC scope:local data:string
@18028 = .data:0x81654FA4; // type:object size:0xC scope:local data:string
@18029 = .data:0x81654FB0; // type:object size:0xD scope:local data:string
@18030 = .data:0x81654FBD; // type:object size:0xD scope:local data:string
@18031 = .data:0x81654FCA; // type:object size:0xC scope:local data:string
@18032 = .data:0x81654FD6; // type:object size:0xC scope:local data:string
@18033 = .data:0x81654FE2; // type:object size:0x9 scope:local data:string
sButtonGroups__Q23ipl5scene = .data:0x81654FEC; // type:object size:0x1C scope:local
@18034 = .data:0x81655008; // type:object size:0x2B scope:local data:string
@18035 = .data:0x81655033; // type:object size:0x29 scope:local data:string
@18036 = .data:0x8165505C; // type:object size:0x2A scope:local data:string
@18037 = .data:0x81655086; // type:object size:0x24 scope:local data:string
@18038 = .data:0x816550AA; // type:object size:0x23 scope:local data:string
@18039 = .data:0x816550CD; // type:object size:0x24 scope:local data:string
sButtonAnimationNames__Q23ipl5scene = .data:0x816550F4; // type:object size:0x18 scope:local
@18040 = .data:0x8165510C; // type:object size:0xD scope:local data:string
@18041 = .data:0x81655119; // type:object size:0x13 scope:local data:string
@18042 = .data:0x8165512C; // type:object size:0x12 scope:local data:string
sBannerAnimationNames__Q23ipl5scene = .data:0x81655140; // type:object size:0xC scope:local
sTexturePaneNames__Q23ipl5scene = .data:0x8165514C; // type:object size:0x30 scope:local
@22820 = .data:0x8165517C; // type:object size:0xE scope:local data:string
@22960 = .data:0x8165518A; // type:object size:0x1D scope:local data:string
@22961 = .data:0x816551A7; // type:object size:0xB scope:local data:string
@22962 = .data:0x816551B2; // type:object size:0xB scope:local data:string
@22963 = .data:0x816551BD; // type:object size:0xB scope:local data:string
@22964 = .data:0x816551C8; // type:object size:0x1C scope:local data:string
@22965 = .data:0x816551E4; // type:object size:0x23 scope:local data:string
@22966 = .data:0x81655207; // type:object size:0x25 scope:local data:string
@22967 = .data:0x8165522C; // type:object size:0xB scope:local data:string
@22968 = .data:0x81655237; // type:object size:0x20 scope:local data:string
@22970 = .data:0x81655257; // type:object size:0x21 scope:local data:string
@22972 = .data:0x81655278; // type:object size:0xD scope:local data:string
@22975 = .data:0x81655285; // type:object size:0xB scope:local data:string
@22976 = .data:0x81655290; // type:object size:0xC scope:local data:string
@23080 = .data:0x8165529C; // type:object size:0x7C scope:local
@23094 = .data:0x81655318; // type:object size:0xF scope:local data:string
@23172 = .data:0x81655327; // type:object size:0x1A scope:local data:string
@23173 = .data:0x81655341; // type:object size:0x1C scope:local data:string
@23174 = .data:0x8165535D; // type:object size:0xF scope:local data:string
@23175 = .data:0x8165536C; // type:object size:0xE scope:local data:string
@23176 = .data:0x8165537A; // type:object size:0x19 scope:local data:string
@23177 = .data:0x81655393; // type:object size:0xA scope:local data:string
@23178 = .data:0x8165539D; // type:object size:0xB scope:local data:string
@23179 = .data:0x816553A8; // type:object size:0x14 scope:local data:string
@23181 = .data:0x816553BC; // type:object size:0xE scope:local data:string
@23314 = .data:0x816553CA; // type:object size:0xD scope:local data:string
@23343 = .data:0x816553D7; // type:object size:0xB scope:local data:string
@23344 = .data:0x816553E2; // type:object size:0xB scope:local data:string
@23345 = .data:0x816553ED; // type:object size:0x11 scope:local data:string
@23366 = .data:0x816553FE; // type:object size:0xB scope:local data:string
@23587 = .data:0x81655409; // type:object size:0x10 scope:local data:string
@23645 = .data:0x81655419; // type:object size:0x14 scope:local data:string
@23769 = .data:0x8165542D; // type:object size:0x14 scope:local data:string
@23878 = .data:0x81655441; // type:object size:0x12 scope:local data:string
@23964 = .data:0x81655453; // type:object size:0xF scope:local data:string
@24191 = .data:0x81655462; // type:object size:0x16 scope:local data:string
@24247 = .data:0x81655478; // type:object size:0x10 scope:local data:string
@24248 = .data:0x81655488; // type:object size:0x14 scope:local data:string
@24249 = .data:0x8165549C; // type:object size:0xF scope:local data:string
@24250 = .data:0x816554AB; // type:object size:0x16 scope:local data:string
__vt__Q33ipl5scene25SDTitleButtonEventHandler = .data:0x816554C4; // type:object size:0x1C
__vt__Q33ipl5scene23SDTitlePaneEventHandler = .data:0x816554E0; // type:object size:0x18
__vt__Q33ipl5scene14SDChannelTitle = .data:0x816554F8; // type:object size:0x68
@@ -17597,7 +17629,7 @@ __vt__Q49textinput8keyboard13cellphonetype12EventHandler = .data:0x8165C758; //
__vt__Q49textinput8keyboard13cellphonetype4Base = .data:0x8165C778; // type:object size:0xA8
scP_txtScrll_UP = .data:0x8165C820; // type:object size:0xE data:string
scP_txtScrll_DOWN = .data:0x8165C830; // type:object size:0x10 data:string
lbl_8165C840 = .data:0x8165C840; // type:object size:0x80
csButtonAnimations__Q29textinput9inputform = .data:0x8165C840; // type:object size:0x80
scN_JPNUSAEUR = .data:0x8165C8C0; // type:object size:0xC data:string
scN_separateBarAll = .data:0x8165C8CC; // type:object size:0x11 data:string
scT_2l_TextBox = .data:0x8165C8E0; // type:object size:0xD data:string
@@ -17608,28 +17640,30 @@ scT_title_textKOR = .data:0x8165C928; // type:object size:0x10 data:string
scN_separateBarCHN = .data:0x8165C938; // type:object size:0x11 data:string
scT_2l_TextBoxCHN = .data:0x8165C950; // type:object size:0x10 data:string
scT_title_textCHN = .data:0x8165C960; // type:object size:0x10 data:string
lbl_8165C970 = .data:0x8165C970; // type:object size:0x20 data:2byte
jumptable_8165C990 = .data:0x8165C990; // type:object size:0xA0 scope:local
jumptable_8165CA30 = .data:0x8165CA30; // type:object size:0x28 scope:local
jumptable_8165CA58 = .data:0x8165CA58; // type:object size:0x34 scope:local
jumptable_8165CA8C = .data:0x8165CA8C; // type:object size:0xC0 scope:local
jumptable_8165CB4C = .data:0x8165CB4C; // type:object size:0x94 scope:local
lbl_8165CBE0 = .data:0x8165CBE0; // type:object size:0x34
lbl_8165CC14 = .data:0x8165CC14; // type:object size:0xE data:string
lbl_8165CC28 = .data:0x8165CC28; // type:object size:0x24
lbl_8165CC4C = .data:0x8165CC4C; // type:object size:0xD data:string
jumptable_8165CC5C = .data:0x8165CC5C; // type:object size:0x1C scope:local
@6599 = .data:0x8165C970; // type:object size:0x20 data:2byte
@13162 = .data:0x8165C990; // type:object size:0xA0 scope:local
@13178 = .data:0x8165CA30; // type:object size:0x28 scope:local
@13457 = .data:0x8165CA58; // type:object size:0x34 scope:local
@13456 = .data:0x8165CA8C; // type:object size:0xC0 scope:local
@13510 = .data:0x8165CB4C; // type:object size:0x94 scope:local
@13512 = .data:0x8165CBE0; // type:object size:0xD data:string
@13580 = .data:0x8165CBF0; // type:object size:0x22 scope:local data:string
@13639 = .data:0x8165CC14; // type:object size:0xE data:string
@13640 = .data:0x8165CC28; // type:object size:0x10 data:string
@13654 = .data:0x8165CC38; // type:object size:0x11 scope:local data:string
@13724 = .data:0x8165CC4C; // type:object size:0xD data:string
@14933 = .data:0x8165CC5C; // type:object size:0x1C scope:local
__vt__Q39textinput9inputform19NormalButtonAnmPane = .data:0x8165CC78; // type:object size:0x2C
__vt__Q39textinput9inputform7AnmPane = .data:0x8165CCA4; // type:object size:0x2C
__vt__Q39textinput9inputform12EventHandler = .data:0x8165CCD0; // type:object size:0x20
__vt__Q39textinput9inputform12LayoutByNW4R = .data:0x8165CCF0; // type:object size:0x240
__vt__Q39textinput9inputform4Base = .data:0x8165CF30; // type:object size:0x1A8
__vt__Q39textinput9inputform10EditBuffer = .data:0x8165D0D8; // type:object size:0x10
__vt__Q39textinput9inputform10EditBuffer = .data:0x8165D0D8; // type:object size:0xC
__vt__Q39textinput8tistring8WithAtok = .data:0x8165D0E8; // type:object size:0x140
__vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x30
__vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x14
__vt__Q39textinput4util9Animation = .data:0x8165D258; // type:object size:0x24
lbl_8165D258 = .data:0x8165D27C; // type:object size:0xD data:string
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x44
@STRING@onOutOfLength__Q29textinput13EventObserverFv = .data:0x8165D27C; // type:object size:0xD scope:local data:string
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x41 data:string
scT_prdc_Text_00 = .data:0x8165D2D0; // type:object size:0xF data:string
scP_prdc_scrl_Left = .data:0x8165D2E0; // type:object size:0x11 data:string
scCandidatePaneData = .data:0x8165D2F8; // type:object size:0x68C
@@ -17638,47 +17672,47 @@ scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
jumptable_8165DA48 = .data:0x8165DA48; // type:object size:0x1C scope:local
lbl_8165DA64 = .data:0x8165DA64; // type:object size:0xF data:string
lbl_8165DA74 = .data:0x8165DA74; // type:object size:0xF data:string
lbl_8165DA84 = .data:0x8165DA84; // type:object size:0xF data:string
lbl_8165DA94 = .data:0x8165DA94; // type:object size:0xF data:string
lbl_8165DAA4 = .data:0x8165DAA4; // type:object size:0xF data:string
lbl_8165DAB4 = .data:0x8165DAB4; // type:object size:0xF data:string
lbl_8165DAC4 = .data:0x8165DAC4; // type:object size:0xF data:string
lbl_8165DAD4 = .data:0x8165DAD4; // type:object size:0xF data:string
lbl_8165DAE4 = .data:0x8165DAE4; // type:object size:0xF data:string
lbl_8165DAF4 = .data:0x8165DAF4; // type:object size:0xF data:string
lbl_8165DB04 = .data:0x8165DB04; // type:object size:0xF data:string
lbl_8165DB14 = .data:0x8165DB14; // type:object size:0xF data:string
lbl_8165DB24 = .data:0x8165DB24; // type:object size:0xF data:string
lbl_8165DB34 = .data:0x8165DB34; // type:object size:0xF data:string
lbl_8165DB44 = .data:0x8165DB44; // type:object size:0xF data:string
lbl_8165DB54 = .data:0x8165DB54; // type:object size:0xF data:string
lbl_8165DB64 = .data:0x8165DB64; // type:object size:0xF data:string
lbl_8165DB74 = .data:0x8165DB74; // type:object size:0xF data:string
lbl_8165DB84 = .data:0x8165DB84; // type:object size:0xF data:string
lbl_8165DB94 = .data:0x8165DB94; // type:object size:0xF data:string
lbl_8165DBA4 = .data:0x8165DBA4; // type:object size:0xF data:string
lbl_8165DBB4 = .data:0x8165DBB4; // type:object size:0xF data:string
lbl_8165DBC4 = .data:0x8165DBC4; // type:object size:0xF data:string
lbl_8165DBD4 = .data:0x8165DBD4; // type:object size:0xF data:string
lbl_8165DBE4 = .data:0x8165DBE4; // type:object size:0xF data:string
lbl_8165DBF4 = .data:0x8165DBF4; // type:object size:0xF data:string
lbl_8165DC04 = .data:0x8165DC04; // type:object size:0xF data:string
lbl_8165DC14 = .data:0x8165DC14; // type:object size:0xF data:string
lbl_8165DC24 = .data:0x8165DC24; // type:object size:0xF data:string
lbl_8165DC34 = .data:0x8165DC34; // type:object size:0xF data:string
lbl_8165DC44 = .data:0x8165DC44; // type:object size:0xF data:string
lbl_8165DC54 = .data:0x8165DC54; // type:object size:0xF data:string
lbl_8165DC64 = .data:0x8165DC64; // type:object size:0xF data:string
lbl_8165DC74 = .data:0x8165DC74; // type:object size:0xF data:string
lbl_8165DC84 = .data:0x8165DC84; // type:object size:0xF data:string
lbl_8165DC94 = .data:0x8165DC94; // type:object size:0xF data:string
lbl_8165DCA4 = .data:0x8165DCA4; // type:object size:0xF data:string
lbl_8165DCB4 = .data:0x8165DCB4; // type:object size:0xF data:string
lbl_8165DCC4 = .data:0x8165DCC4; // type:object size:0xF data:string
lbl_8165DCD4 = .data:0x8165DCD4; // type:object size:0xF data:string
@10530 = .data:0x8165DA48; // type:object size:0x1C scope:local
@6761 = .data:0x8165DA64; // type:object size:0xF scope:local data:string
@6762 = .data:0x8165DA74; // type:object size:0xF scope:local data:string
@6763 = .data:0x8165DA84; // type:object size:0xF scope:local data:string
@6764 = .data:0x8165DA94; // type:object size:0xF scope:local data:string
@6765 = .data:0x8165DAA4; // type:object size:0xF scope:local data:string
@6766 = .data:0x8165DAB4; // type:object size:0xF scope:local data:string
@6767 = .data:0x8165DAC4; // type:object size:0xF scope:local data:string
@6768 = .data:0x8165DAD4; // type:object size:0xF scope:local data:string
@6769 = .data:0x8165DAE4; // type:object size:0xF scope:local data:string
@6770 = .data:0x8165DAF4; // type:object size:0xF scope:local data:string
@6771 = .data:0x8165DB04; // type:object size:0xF scope:local data:string
@6772 = .data:0x8165DB14; // type:object size:0xF scope:local data:string
@6773 = .data:0x8165DB24; // type:object size:0xF scope:local data:string
@6774 = .data:0x8165DB34; // type:object size:0xF scope:local data:string
@6775 = .data:0x8165DB44; // type:object size:0xF scope:local data:string
@6776 = .data:0x8165DB54; // type:object size:0xF scope:local data:string
@6777 = .data:0x8165DB64; // type:object size:0xF scope:local data:string
@6778 = .data:0x8165DB74; // type:object size:0xF scope:local data:string
@6779 = .data:0x8165DB84; // type:object size:0xF scope:local data:string
@6782 = .data:0x8165DB94; // type:object size:0xF scope:local data:string
@6783 = .data:0x8165DBA4; // type:object size:0xF scope:local data:string
@6784 = .data:0x8165DBB4; // type:object size:0xF scope:local data:string
@6785 = .data:0x8165DBC4; // type:object size:0xF scope:local data:string
@6786 = .data:0x8165DBD4; // type:object size:0xF scope:local data:string
@6787 = .data:0x8165DBE4; // type:object size:0xF scope:local data:string
@6788 = .data:0x8165DBF4; // type:object size:0xF scope:local data:string
@6789 = .data:0x8165DC04; // type:object size:0xF scope:local data:string
@6790 = .data:0x8165DC14; // type:object size:0xF scope:local data:string
@6791 = .data:0x8165DC24; // type:object size:0xF scope:local data:string
@6792 = .data:0x8165DC34; // type:object size:0xF scope:local data:string
@6793 = .data:0x8165DC44; // type:object size:0xF scope:local data:string
@6794 = .data:0x8165DC54; // type:object size:0xF scope:local data:string
@6795 = .data:0x8165DC64; // type:object size:0xF scope:local data:string
@6796 = .data:0x8165DC74; // type:object size:0xF scope:local data:string
@6797 = .data:0x8165DC84; // type:object size:0xF scope:local data:string
@6798 = .data:0x8165DC94; // type:object size:0xF scope:local data:string
@6799 = .data:0x8165DCA4; // type:object size:0xF scope:local data:string
@6800 = .data:0x8165DCB4; // type:object size:0xF scope:local data:string
@6801 = .data:0x8165DCC4; // type:object size:0xF scope:local data:string
@10601 = .data:0x8165DCD4; // type:object size:0xF scope:local data:string
__vt__Q39textinput12candidatebox13PredictWindow = .data:0x8165DCE4; // type:object size:0x2C
__vt__Q39textinput12candidatebox12OnOffAnmPane = .data:0x8165DD10; // type:object size:0x2C
__vt__Q39textinput12candidatebox22CandidateScrollAnmPane = .data:0x8165DD3C; // type:object size:0x2C
@@ -17780,18 +17814,18 @@ __vt__Q39textinput11nw4rmanager6Layout = .data:0x8165F818; // type:object size:0
__vt__Q39textinput11nw4rmanager8PaneFifo = .data:0x8165F890; // type:object size:0x1C scope:weak
__vt__Q39textinput11nw4rmanager13AnimPaneGroup = .data:0x8165F8AC; // type:object size:0x1C
__vt__Q39textinput11nw4rmanager7AnmPane = .data:0x8165F8C8; // type:object size:0x24
lbl_8165F8F0 = .data:0x8165F8F0; // type:object size:0xD data:string
lbl_8165F900 = .data:0x8165F900; // type:object size:0x1B data:string
lbl_8165F920 = .data:0x8165F920; // type:object size:0x18 data:string
lbl_8165F938 = .data:0x8165F938; // type:object size:0x16 data:string
lbl_8165F950 = .data:0x8165F950; // type:object size:0x1B data:string
lbl_8165F96C = .data:0x8165F96C; // type:object size:0x16 data:string
lbl_8165F988 = .data:0x8165F988; // type:object size:0x18 data:string
lbl_8165F9A0 = .data:0x8165F9A0; // type:object size:0x16 data:string
@8031 = .data:0x8165F8F0; // type:object size:0xD data:string
@8076 = .data:0x8165F900; // type:object size:0x1B data:string
@8086 = .data:0x8165F920; // type:object size:0x18 data:string
@8090 = .data:0x8165F938; // type:object size:0x16 data:string
@8115 = .data:0x8165F950; // type:object size:0x1B data:string
@8148 = .data:0x8165F96C; // type:object size:0x16 data:string
@8156 = .data:0x8165F988; // type:object size:0x18 data:string
@8168 = .data:0x8165F9A0; // type:object size:0x16 data:string
__vt__Q29textinput7Manager = .data:0x8165F9B8; // type:object size:0xD0
__vt__Q49textinput8keyboard10signwindow6Sample = .data:0x8165FA88; // type:object size:0x110
__vt__Q49textinput8keyboard10signwindow6Sample = .data:0x8165FA88; // type:object size:0x10C
__vt__Q39textinput11predictlang6Sample = .data:0x8165FB98; // type:object size:0xE0
__vt__Q39textinput11predictlang4Base = .data:0x8165FC78; // type:object size:0x28
__vt__Q39textinput11predictlang4Base = .data:0x8165FC78; // type:object size:0x24
__vt__Q39textinput7toolbar6Sample = .data:0x8165FCA0; // type:object size:0xD0
__vt__Q39textinput9inputform6Sample = .data:0x8165FD70; // type:object size:0x240
__vt__Q39textinput12candidatebox6Sample = .data:0x8165FFB0; // type:object size:0x130
@@ -18004,13 +18038,13 @@ csCNKeyboard__Q39textinput8keyboard6pctype = .data:0x81667850; // type:object si
@196 = .data:0x81667C78; // type:object size:0x10 scope:local data:wstring
cLanguageIndependentString__Q29textinput15langindependent = .data:0x81667C88; // type:object size:0x190
__vt__Q29textinput15CommandReceiver = .data:0x81667E18; // type:object size:0x20
lbl_81667E38 = .data:0x81667E38; // type:object size:0x19 data:string
lbl_81667E58 = .data:0x81667E58; // type:object size:0x10 data:string
lbl_81667E68 = .data:0x81667E68; // type:object size:0x11 data:string
lbl_81667E7C = .data:0x81667E7C; // type:object size:0x16 data:string
lbl_81667E94 = .data:0x81667E94; // type:object size:0x19 data:string
lbl_81667EB0 = .data:0x81667EB0; // type:object size:0x16 data:string
lbl_81667EC8 = .data:0x81667EC8; // type:object size:0x11 data:string
@8346 = .data:0x81667E38; // type:object size:0x19 data:string
@8347 = .data:0x81667E58; // type:object size:0x10 data:string
@8369 = .data:0x81667E68; // type:object size:0x11 data:string
@8385 = .data:0x81667E7C; // type:object size:0x16 data:string
@8386 = .data:0x81667E94; // type:object size:0x19 data:string
@8402 = .data:0x81667EB0; // type:object size:0x16 data:string
@8410 = .data:0x81667EC8; // type:object size:0x11 data:string
__vt__Q49textinput6extend2bg4Base = .data:0x81667EE0; // type:object size:0x10
__vt__Q49textinput6extend4memo18DisappearMemoState = .data:0x81667EF0; // type:object size:0x58
__vt__Q49textinput6extend4memo13EditMemoState = .data:0x81667F48; // type:object size:0x58
@@ -20725,15 +20759,12 @@ lbl_81694B4C = .sdata2:0x81694B4C; // type:object size:0x4 align:4 data:float
lbl_81694B50 = .sdata2:0x81694B50; // type:object size:0x4 align:4 data:float
lbl_81694B58 = .sdata2:0x81694B58; // type:object size:0x8 align:8 data:double
sMissingTitle__Q23ipl5scene = .sdata2:0x81694B60; // type:object size:0x8 data:wstring
lbl_81694B68 = .sdata2:0x81694B68; // type:object size:0x4 align:4 data:float
lbl_81694B6C = .sdata2:0x81694B6C; // type:object size:0x4 align:4 data:float
lbl_81694B70 = .sdata2:0x81694B70; // type:object size:0x4 align:4 data:float
lbl_81694B74 = .sdata2:0x81694B74; // type:object size:0x1 data:byte
lbl_81694B75 = .sdata2:0x81694B75; // type:object size:0x1 data:byte
lbl_81694B76 = .sdata2:0x81694B76; // type:object size:0x1 data:byte
lbl_81694B77 = .sdata2:0x81694B77; // type:object size:0x1 data:byte
lbl_81694B78 = .sdata2:0x81694B78; // type:object size:0x8 align:8 data:double
lbl_81694B80 = .sdata2:0x81694B80; // type:object size:0x4 align:4 data:float
@22804 = .sdata2:0x81694B68; // type:object size:0x4 scope:local align:4 data:float
@22973 = .sdata2:0x81694B6C; // type:object size:0x4 scope:local align:4 data:float
@22974 = .sdata2:0x81694B70; // type:object size:0x4 scope:local align:4 data:float
@18592 = .sdata2:0x81694B74; // type:object size:0x4 scope:local data:byte
@23648 = .sdata2:0x81694B78; // type:object size:0x8 scope:local align:8 data:double
@24146 = .sdata2:0x81694B80; // type:object size:0x4 scope:local align:4 data:float
scBalloonMsg__Q23ipl5scene = .sdata2:0x81694B88; // type:object size:0x8 scope:local
@11491 = .sdata2:0x81694B90; // type:object size:0x4 scope:local align:4 data:float
@11492 = .sdata2:0x81694B94; // type:object size:0x4 scope:local align:4 data:float
@@ -20812,9 +20843,9 @@ lbl_81694C98 = .sdata2:0x81694C98; // type:object size:0x4 align:4 data:float
lbl_81694C9C = .sdata2:0x81694C9C; // type:object size:0x4 align:4 data:float
lbl_81694CA0 = .sdata2:0x81694CA0; // type:object size:0x4 align:4 data:float
lbl_81694CA8 = .sdata2:0x81694CA8; // type:object size:0x8 align:8 data:double
lbl_81694CB0 = .sdata2:0x81694CB0; // type:object size:0x4 align:4 data:float
lbl_81694CB4 = .sdata2:0x81694CB4; // type:object size:0x4 align:4 data:float
lbl_81694CB8 = .sdata2:0x81694CB8; // type:object size:0x8 align:8 data:double
@4196 = .sdata2:0x81694CB0; // type:object size:0x4 align:4 data:float
@4197 = .sdata2:0x81694CB4; // type:object size:0x4 align:4 data:float
@4202 = .sdata2:0x81694CB8; // type:object size:0x8 align:8 data:double
@3511 = .sdata2:0x81694CC0; // type:object size:0x4 scope:local align:4 data:float
@3561 = .sdata2:0x81694CC4; // type:object size:0x4 scope:local align:4 data:float
@3625 = .sdata2:0x81694CC8; // type:object size:0x8 scope:local align:8 data:double
@@ -21244,7 +21275,7 @@ lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x1 data:byte
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
@@ -22452,7 +22483,7 @@ scBtnSoundType__Q23ipl5scene = .sdata:0x81697258; // type:object size:0x8 scope:
@12749 = .sdata:0x8169727C; // type:object size:0x5 scope:local data:string
lbl_81697288 = .sdata:0x81697288; // type:object size:0x2
lbl_8169728A = .sdata:0x8169728A; // type:object size:0x4 data:string
lbl_81697290 = .sdata:0x81697290; // type:object size:0x4
voiceVe$3399 = .sdata:0x81697290; // type:object size:0x4
@4605 = .sdata:0x81697298; // type:object size:0x4 scope:local data:string
lbl_816972A0 = .sdata:0x816972A0; // type:object size:0x8
lbl_816972A8 = .sdata:0x816972A8; // type:object size:0x8 data:wstring
@@ -23741,7 +23772,7 @@ csZiStringColorRight__Q29textinput9inputform = .sbss:0x81698D10; // type:object
csUnderlateColor__Q29textinput9inputform = .sbss:0x81698D14; // type:object size:0x4 data:4byte
csUnInputedWCharColorSpace__Q29textinput9inputform = .sbss:0x81698D18; // type:object size:0x4 data:4byte
sfColorPhase__Q29textinput9inputform = .sbss:0x81698D1C; // type:object size:0x4 align:4 data:float
lbl_81698D20 = .sbss:0x81698D20; // type:object size:0x4 data:4byte
defaultEventObserver__9textinput = .sbss:0x81698D20; // type:object size:0x4 data:4byte
s_dakuten_map__Q29textinput4util = .sbss:0x81698D28; // type:object size:0x8 scope:local data:4byte
s_handaku_map__Q29textinput4util = .sbss:0x81698D30; // type:object size:0x8 scope:local data:4byte
s_small_map__Q29textinput4util = .sbss:0x81698D38; // type:object size:0x8 scope:local data:4byte

View File

@@ -738,7 +738,7 @@ config.libs = [
]
),
IPLSection("board", [
Object(Equivalent, "scene/board/iplBoard.cpp"),
Object(Matching, "scene/board/iplBoard.cpp"),
Object(Matching, "scene/board/iplBoardObject.cpp"),
Object(Matching, "scene/board/iplBoardSD.cpp"),
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
@@ -874,7 +874,7 @@ config.libs = [
Object(Matching, "scene/setting/iplParental.cpp"),
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
Object(Matching, "scene/setting/iplUSBAP.cpp"),
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
Object(NonMatching, "scene/setting/AOSSLink.c"),
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
@@ -901,7 +901,7 @@ config.libs = [
),
IPLSection("bannerSound", [
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
Object(Equivalent, "bannerSound/AxAdpcmPlayer.cpp"),
Object(Matching, "bannerSound/AxAdpcmPlayer.cpp"),
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
]
@@ -1045,7 +1045,7 @@ config.libs = [
Object(Matching, "net/crc.c"),
Object(NonMatching, "net/md5.c"),
Object(Matching, "net/sha1.c"),
Object(NonMatching, "net/hmac.c"),
Object(Matching, "net/hmac.c"),
Object(Matching, "net/neterrorcode.c"),
Object(Matching, "net/NETVersion.c"),
Object(NonMatching, "net/aes.c"),
@@ -1060,7 +1060,7 @@ config.libs = [
Object(NonMatching, "nhttp/NHTTP_recvbuf.c"),
Object(Matching, "nhttp/NHTTP_request.c"),
Object(Matching, "nhttp/NHTTP_response.c"),
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
Object(Matching, "nhttp/NHTTP_socket_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_thread.c"),
Object(Matching, "nhttp/d_nhttp_private.c"),
@@ -1097,7 +1097,7 @@ config.libs = [
RevoEXLib("so", [
Object(Matching, "so/SOCommon.c"),
Object(NonMatching, "so/SOBasic.c"),
Object(NonMatching, "so/SOInformation.c"),
Object(Matching, "so/SOInformation.c"),
Object(NonMatching, "so/SOOption.c"),
]
),
@@ -1702,7 +1702,7 @@ config.libs = [
Object(Matching, "fa/pf_fat32.c"),
Object(Matching, "fa/pf_fatfs.c"),
Object(Matching, "fa/pf_file.c"),
Object(NonMatching, "fa/pf_path.c"),
Object(Matching, "fa/pf_path.c"),
Object(Matching, "fa/pf_sector.c"),
Object(NonMatching, "fa/pf_volume.c"),
Object(Matching, "fa/pf_volume_apiadd.c"),

View File

@@ -65,7 +65,11 @@ namespace ipl {
virtual BOOL isReady() const { return FALSE; }
/** @brief If the user can power off/reset the system */
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual BOOL isResetAcceptable() { return TRUE; }
#else
virtual BOOL isResetAcceptable() const { return TRUE; }
#endif
/** @brief The scene running code when powering off/resetting the system */
virtual void startResetting() {}
/** @brief If the scene has finished its powering off/resetting task */

View File

@@ -1,32 +1,45 @@
// Yes, versions other than 4.3U align by 8.
#if defined(VERSION_43U)
#pragma function_align 32
#else
#pragma function_align 8
#endif // VERSION_43U
#endif
#include <TRK_Hollywood_Revolution.h>
#pragma force_active on
// Encapsulating function to get the file to align properly
asm void __targsupp() {
// clang-format off
#ifdef __MWERKS__
// clang-format off
asm DSIOResult TRKAccessFile(MessageCommandID cmd, unsigned int handle, int* count, unsigned char* buffer) {
#ifdef __MWERKS__
nofralloc
entry TRKAccessFile
twi 31, r0, 0
blr
entry TRKOpenFile
twi 31, r0, 0
blr
entry TRKCloseFile
twi 31, r0, 0
blr
entry TRKPositionFile
twi 31, r0, 0
blr
#endif // __MWERKS__
// clang-format on
twi 31, r0, 0
blr
#endif
}
#pragma function_align 8
asm DSIOResult TRKOpenFile() {
#ifdef __MWERKS__
nofralloc
twi 31, r0, 0
blr
#endif
}
asm DSIOResult TRKCloseFile() {
#ifdef __MWERKS__
nofralloc
twi 31, r0, 0
blr
#endif
}
asm DSIOResult TRKPositionFile() {
#ifdef __MWERKS__
nofralloc
twi 31, r0, 0
blr
#endif
}
// clang-format on

View File

@@ -1,13 +1,13 @@
#include <nw4r/db/assert.h>
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;
extern "C" const u8 scLytFatalColorR;
extern "C" const u8 scLytFatalColorG;
extern "C" const u8 scLytFatalColorB;
extern "C" const u8 scLytFatalColorA;
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#undef NW4R_ASSERT
#define NW4R_ASSERT(x) \
#define NW4R_GLOBAL_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
@@ -17,6 +17,15 @@ extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system
} \
}
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {255, 255, 255, 0}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
} \
}
#include <nw4r/lyt/window.h>
#include <nw4r/lyt/common.h>
@@ -488,7 +497,7 @@ namespace nw4r {
}
Material* Window::GetFrameMaterial(u32 frameIdx) const {
NW4R_ASSERT(frameIdx < WINDOWFRAME_MAX);
NW4R_GLOBAL_ASSERT(frameIdx < WINDOWFRAME_MAX);
if (frameIdx >= mFrameNum) {
return NULL;
}
@@ -501,3 +510,8 @@ namespace nw4r {
}
} // namespace lyt
} // namespace nw4r
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;

View File

@@ -49,22 +49,25 @@ void Zi8CopyZHSpelling(ziU8* source, ziWChar* output, ziU16 capacity, int size,
}
}
}
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option ZI_NEED_WORK) {
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option, struct __zi8_work_data_s* __zi8_work_data) {
ziU8 previous;
previous = ZI_WORK->pdRemoveOpt;
ZI_WORK->pdRemoveOpt = option;
previous = __zi8_work_data->pdRemoveOpt;
__zi8_work_data->pdRemoveOpt = option;
Zi8LogError(100, __zi8_work_data);
return previous;
}
ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziWChar* spelling, ziU16 spellingCapacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
int fallback = 0;
ziU8* bytePattern;
ziWChar folded;
ziU32 entrySize;
int wordSize, copied;
ziPudSection* section;
int wordSize;
int copied;
ziU8* word;
int index;
int fallback = 0;
ziU32 entrySize;
ziPudHeader* table;
ziPudSection* section;
ziU8* byteOutput;
if (!(ZI_WORK->pudCount <= 16 && ZI_WORK->pudCount != 0 && ZI_WORK->pudTable[ZI_WORK->pudCount - 1] != 0)) {
Zi8LogError(0x4B0, __zi8_work_data);
return 0;
@@ -78,8 +81,8 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
index = 0;
while (index < table->languageCount) {
if (section->language == language) break;
index++;
section++;
index++;
}
if (index >= table->languageCount) {
Zi8LogError(0x4F6, __zi8_work_data);
@@ -100,18 +103,20 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
entrySize = wordSize;
if (language == 1) {
if (ZI_WORK->unk_0x17 > *word) goto next;
entrySize = wordSize - 1;
wordSize--;
entrySize--;
word++;
wordSize = ZiGetZHWordSize((ziWChar*)word, entrySize);
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && wordSize > length && word[length] == 0x20) goto matchText;
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && length < wordSize && word[length] == 0x20) goto matchText;
if ((ziS32)length > (ziS32)wordSize || (complete != 0 && wordSize != length) || (complete == 0 && wordSize == length)) {
next:
ZI_WORK->unk_0x318++;
word += entrySize;
} else {
if (language == 1) {
bytePattern = (ziU8*)pattern;
for (index = 0; index < length; index++) {
if (word[index] != ((ziU8*)pattern)[index]) goto next;
if (word[index] != bytePattern[index]) goto next;
}
goto matched;
}
@@ -134,11 +139,13 @@ matched:
return 1;
}
if (language == 1) {
byteOutput = (ziU8*)output;
index = 0;
for (copied = 0; index < (ziS32)wordSize && copied < capacity; copied++) {
((ziU8*)output)[index] = word[index];
((ziU8*)output)[index + 1] = word[index + 1];
index += 2;
byteOutput[index] = word[index];
index++;
byteOutput[index] = word[index];
index++;
}
Zi8CopyZHSpelling(word, spelling, spellingCapacity, entrySize, wordSize);
} else {
@@ -168,16 +175,16 @@ matched:
}
}
}
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation, struct __zi8_work_data_s* __zi8_work_data) {
ziU32 result;
if (continuation == 0) ZI_WORK->pudCount = 1;
if (continuation == 0) __zi8_work_data->pudCount = 1;
for (;;) {
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
if ((ziU8)result != 0) break;
if (++ZI_WORK->pudCount <= 16) {
if (++__zi8_work_data->pudCount <= 16) {
continuation = 0;
} else {
ZI_WORK->pudCount = 1;
__zi8_work_data->pudCount = 1;
break;
}
}

View File

@@ -87,23 +87,23 @@ void Zi8_8148047C(ziPtr __zi8_work_data) {
ZI_WORK->uwdList = 0;
}
ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
ziWChar folded;
int fallback = 0;
int visited = 0;
int prefixLength;
int position, previousOffset;
ziU32 size;
ziU8 entryLanguage;
ziU32 entryLength;
ziUserDictionary* dictionary;
ziU8* cursor;
ziU8* begin;
int fallback = 0;
ziU8* boundary;
ziU8* end;
ziUserWord* candidate;
ziUserWord* previous;
ziUserWord* result;
ziUserDictionary* dictionary;
int firstSegment;
ziU32 size;
int entryLength;
int entryLanguage;
int previousOffset;
int visited = 0;
ziU8* begin;
ziWChar folded;
ziU8* text;
int position;
int prefixLength;
Zi8LogError(100, __zi8_work_data);
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
Zi8ReplaceLastError(0x19C, __zi8_work_data);
@@ -111,16 +111,17 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
}
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
if (continuation != 0) {
result = Zi8_814803F4(__zi8_work_data);
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
entryLength = 0;
if (result != 0) {
entryLanguage = result->language;
entryLength = result->length;
if (text != 0) {
language = ((ziUserWord*)text)->language;
entryLength = ((ziUserWord*)text)->length;
if (entryLength >= capacity) {
Zi8_8148047C(__zi8_work_data);
return 0;
}
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
text = ((ziUserWord*)text)->text;
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
}
return entryLength;
}
@@ -130,13 +131,16 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
else {
prefixLength = 0;
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
for (position = currentLength - 2; position >= 0;) {
if (currentWord[position] == 0x20) break;
position--;
prefixLength++;
}
position++;
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
else {
ZI_WORK->unk_0x140 = 1;
ZI_WORK->unk_0x141[0] = prefixLength + 5;
ZI_WORK->unk_0x141[prefixLength + 4] = prefixLength + 5;
ZI_WORK->unk_0x141[prefixLength + 4] = ZI_WORK->unk_0x141[0] = prefixLength + 5;
ZI_WORK->unk_0x141[1] = language;
ZI_WORK->unk_0x141[2] = prefixLength;
previousOffset = 4;
@@ -157,43 +161,49 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
}
if (ZI_WORK->unk_0x140 == 0 && length == 0) return 0;
rescan:
begin = dictionary->entries + dictionary->current;
begin = cursor = dictionary->entries + dictionary->current;
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
end = (ziU8*)dictionary + dictionary->end + 7;
cursor = begin;
if (begin < boundary) firstSegment = 1;
else firstSegment = 0;
while (firstSegment ? cursor < boundary : cursor < end) {
while ((cursor < boundary && firstSegment) || (cursor < end && !firstSegment)) {
size = *cursor;
candidate = (ziUserWord*)cursor;
position = visited++;
if ((ziS32)ZI_WORK->unk_0x13C <= position && (size & 0xC0) == 0) {
if ((ziS32)ZI_WORK->unk_0x13C > visited++ || (((ziUserWord*)cursor)->size & 0xC0) != 0) {
next:
cursor += size;
if (cursor > end) {
if (firstSegment) break;
firstSegment = 1;
size = cursor - end - 1;
cursor = dictionary->entries + size;
}
} else {
previous = (ziUserWord*)(cursor + size);
if ((ziU8*)previous > end) previous = (ziUserWord*)(cursor + ((ziU8*)dictionary - end) + 7);
entryLanguage = candidate->language;
entryLength = candidate->length;
if (entryLanguage == language && length <= entryLength && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
text = &((ziUserWord*)cursor)->language;
entryLanguage = *text++;
entryLength = *text++;
text++;
if (entryLanguage == language && entryLength >= length && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
for (position = 0; position < length; position++) {
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF010) {
folded = Zi8ConvertUC2WC(candidate->text[position], language, __zi8_work_data);
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF010) {
if (pattern[position] != Zi8ConvertUC2Key(text[position], language, __zi8_work_data)) goto next;
} else {
folded = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
if (folded != pattern[position] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[position])) goto next;
} else if (pattern[position] != Zi8ConvertUC2Key(candidate->text[position], language, __zi8_work_data)) goto next;
}
}
if (ZI_WORK->unk_0x140 != 0) {
if (ZI_WORK->unk_0x141[0] != previous->size || ZI_WORK->unk_0x141[1] != previous->language || ZI_WORK->unk_0x141[2] != previous->length) goto next;
for (position = 4; position < ZI_WORK->unk_0x141[2] + 4; position++) {
if (ZI_WORK->unk_0x141[position] != ((ziU8*)previous)[position] && ZI_WORK->unk_0x184[position] != ((ziU8*)previous)[position]) goto next;
prefixLength = 4;
position = ZI_WORK->unk_0x141[2] + 4;
for (; prefixLength < position; prefixLength++) {
if (ZI_WORK->unk_0x141[prefixLength] != ((ziU8*)previous)[prefixLength] && ZI_WORK->unk_0x184[prefixLength] != ((ziU8*)previous)[prefixLength]) goto next;
}
}
Zi8_81480224(candidate, __zi8_work_data);
Zi8_81480224((ziUserWord*)cursor, __zi8_work_data);
}
}
next:
cursor += size;
if (end < cursor) {
if (firstSegment) break;
firstSegment = 1;
cursor = dictionary->entries + (cursor - end - 1);
goto next;
}
}
if (ZI_WORK->unk_0x140 != 0 && length != 0) {
@@ -201,23 +211,24 @@ next:
visited = 0;
goto rescan;
}
if (complete == 1 && length != 0 && continuation == 0) {
if (length == 1 && complete != 0 && continuation == 0) {
complete = 0;
fallback = 1;
visited = 0;
goto rescan;
}
}
result = Zi8_814803F4(__zi8_work_data);
entryLength = 0;
if (result != 0) {
entryLanguage = result->language;
entryLength = result->length;
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
if (text != 0) {
language = ((ziUserWord*)text)->language;
entryLength = ((ziUserWord*)text)->length;
if (entryLength >= capacity) {
Zi8_8148047C(__zi8_work_data);
return 0;
}
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
text = ((ziUserWord*)text)->text;
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
return entryLength;
}
return entryLength;
return 0;
}

View File

@@ -1,7 +1,7 @@
#include <zi8clib/zierror.h>
#include <zi8clib/zitypes.h>
extern ziU16 nodeHeaderTable[16];
extern const ziU16 nodeHeaderTable[16];
ziU32 ZiDAWGGetChild(ziU32 node) {
ziU32 base;
@@ -22,8 +22,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
node += offset;
if (((ziU32)header & 2) != 0) {
if ((*(ziU8*)node & 0x80) != 0) {
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
offset += *((ziU8*)node + 2);
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + *((ziU8*)node + 2) + 0x8000;
} else {
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
offset += (ziU32)*((ziU8*)node + 1);
@@ -43,9 +42,9 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
}
ziU8* ZiDAWGGetSibling(ziU8* cursor) {
ziU16 header;
ziU8* node;
ziS32 depth;
ziU8* node;
ziU16 header;
ziS32 offset;
depth = 0;
@@ -127,7 +126,7 @@ ziU8 ZiDAWGgetEOWattribute(ziU32 node) {
return (nodeHeaderTable[*(ziU8*)node >> 4] & 0x10) > 0;
}
ziU32 ZiDAWGgetCHARattribute(ziPtr context, ziU32 node, ziPtr __zi8_work_data) {
ziU32 ZiDAWGgetCHARattribute(zi8DawgCtx* context, ziU32 node, ziPtr __zi8_work_data) {
ziU8 key;
ziU32 attribute;
@@ -137,15 +136,15 @@ ziU32 ZiDAWGgetCHARattribute(ziPtr context, ziU32 node, ziPtr __zi8_work_data) {
key = (ziU32)*(ziU8*)node & 0xf;
}
if (key > ((zi8DawgCtx*)context)->cap) {
if (key > context->cap) {
Zi8LogError(0x138b, __zi8_work_data);
return 0;
}
attribute = key << 24;
attribute |= ((ziU8*)((zi8DawgCtx*)context)->p0C)[key] << 16;
attribute += ((ziU32)((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2] & 0xFFFF) << 8;
attribute += ((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2 + 1];
attribute |= ((ziU8*)context->p0C)[key] << 16;
attribute |= (((ziU32)((ziU8*)context->p08)[key * 2] & 0xFFFF) << 8) +
((ziU8*)context->p08 + key * 2)[1];
Zi8LogError(0x64, __zi8_work_data);
return attribute;
}
@@ -158,9 +157,9 @@ ziU32 ZiDAWGGetGraph(ziPtr context) {
ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
ziU32 graph;
ziS32 result;
ziU32 end;
ziU8 depth;
ziU32 end;
ziS32 result;
graph = ZiDAWGGetGraph(context);
result = 0;
@@ -203,7 +202,7 @@ checkEntry:
break;
}
end = (ziU32)(entry + (((ziU16)entry[0] << 8) + entry[1]) * 10 + 10);
end = (((ziU16)entry[0] << 8) + entry[1]) * 10 + ((ziU32)entry + 10);
entry += 10;
depth++;
keys++;

View File

@@ -26,28 +26,22 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
int offset;
ziU8 group;
ziU8 remaining;
ziU16 value;
ziWChar* cursor;
ziSearchState search;
ziChineseEntry* table = 0;
ziU8* baseData = 0;
ziU8 group = 0;
ziU8 remaining = 0;
ziU16 value = 0;
ziGetParam request;
ziWChar ordinals[65];
int count;
int unmatched;
int countLeft;
ziChineseEntry* entry;
ziChineseEntry* table;
ziWChar* cursor;
ziU8* data;
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
ziU32 savedFormats = ZI_WORK->unk_0x1410;
ziU8 savedCount = ZI_WORK->unk_0x1418;
search.flags = 0;
search.word = 0;
search.length = 0;
search.position = 0;
search.capacity = 0;
search.options = 0;
ziSearchState search = {0};
Zi8LogError(100, __zi8_work_data);
if (word == 0 || *word == 0) {
Zi8ReplaceLastError(300, __zi8_work_data);
@@ -59,8 +53,8 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
}
((ziU8*)&search.length)[0] = count;
((ziU8*)&search.flags)[2] = 1;
((ziU16*)&search.capacity)[0] = 64;
search.word = word;
((ziU16*)&search.capacity)[0] = 64;
request.language = language;
request.getMode = 0;
request.subLanguage = 7;
@@ -84,65 +78,70 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
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 = 1;
else ZI_WORK->unk_0x1418 = 2;
} 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->unk_0x1410 = savedFormats;
ZI_WORK->unk_0x1418 = savedCount;
if (count != 0) return 1;
}
if (language == 1) {
if (language != 1) {
Zi8ReplaceLastError(0x26C, __zi8_work_data);
return 0;
}
{
count = 0;
do {
while (word[count] != 0) {
ordinals[count] = Zi8Uni2Ord(word[count], __zi8_work_data);
if (ordinals[count] == 0xFFFF) return 0;
count++;
if (count == 64) return 0;
} while (word[count] != 0);
}
{
if (count == 1) return 1;
count--;
if (count-- == 1) return 1;
ordinals[count] |= 0x8000;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
table = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data);
entry = table + ordinals[0];
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
data += ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
baseData = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
baseData += ((entry->offsetHigh & 15) << 16 | (entry->offsetLow[1] | (entry->offsetLow[0] << 8)));
data = baseData;
if (ZI_WORK->cangjieEnabled != 0) {
switch (*data & 7) {
case 2:
offset = 2;
countLeft = 2;
break;
case 3:
case 4:
offset = 3;
countLeft = 3;
break;
case 5:
offset = 4;
countLeft = 4;
break;
default:
offset = 1;
countLeft = 1;
break;
}
data += offset;
data += countLeft;
}
if ((*data & 0x80) == 0) return 0;
group = 0;
data += ((*data & 0x7F) >> 4) + 1;
if ((*data & 0x80) != 0) {
group = 0;
data += ((*data & 0x7F) >> 4) + 1;
} else return 0;
while ((group & 0x80) == 0) {
group = *data++;
for (remaining = group & 15; remaining != 0; remaining--) {
unmatched = count;
countLeft = count;
cursor = ordinals;
while (unmatched > 0) {
value = data[0] | (data[1] << 8);
while (countLeft > 0) {
value = (data[1] << 8) | data[0];
data += 2;
cursor++;
if (value != *cursor) break;
unmatched--;
countLeft--;
if (value & 0x8000) break;
}
if (unmatched == 0) return 1;
if (countLeft == 0) return 1;
if (!(value & 0x8000)) {
data++;
while (!(*data & 0x80)) data += 2;
@@ -153,7 +152,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
Zi8LogError(0x2BD, __zi8_work_data);
return 0;
}
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
}
return 0;
}
ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {

View File

@@ -321,41 +321,7 @@ pf_u32 PFPATH_DoMatchFileNameWithPattern(pf_u16 c_name, PF_FILE_NAME_ITER* p_nam
return 1;
}
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name) {
pf_u16 c_name;
pf_u16 c_pat;
PF_FILE_NAME_ITER name;
PF_STR pattern;
pf_bool result;
result = PF_TRUE;
name.buf = file_name;
name.current = 0;
name.kind = is_long_name;
name.index = 0;
pattern = *p_pattern;
if (PFSTR_GetCodeMode(p_pattern) == 1) {
if (is_long_name == PF_FALSE && (pf_vol_set.setting & 0x02) == 0x02 && PFPATH_CheckExtShortNameSignature(&pattern) == 1) {
result = PFPATH_CheckExtShortNameSignature(&pattern);
if (result == 1) {
name.index += 2;
pattern.p_head += 2;
}
}
} else if ((pf_vol_set.setting & 0x02) == 0x02 && is_long_name == PF_FALSE &&
PFSTR_StrNCmp(p_pattern, (pf_s8*)".", 1, 0, 1) != 0 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"..", 1, 0, 2) != 0 &&
PFPATH_CheckExtShortName(p_pattern, 1, PF_FALSE) == 0) {
result = PF_FALSE;
}
if (result == PF_TRUE) {
c_name = PFPATH_GetNextCharOfFileName(&name);
c_pat = PFPATH_GetNextCharOfPattern(&pattern, is_long_name);
result = PFPATH_DoMatchFileNameWithPattern(c_name, &name, c_pat, &pattern, is_long_name);
}
return result;
}
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name);
pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* matched_end) {
pf_u32 read_char;
@@ -577,6 +543,42 @@ PF_VOLUME* PFPATH_GetVolumeFromPath(PF_STR* p_path) {
return p_vol;
}
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name) {
pf_u16 c_name;
pf_u16 c_pat;
PF_FILE_NAME_ITER name;
PF_STR pattern;
pf_bool result;
result = PF_TRUE;
name.buf = file_name;
name.current = 0;
name.kind = is_long_name;
name.index = 0;
pattern = *p_pattern;
if (PFSTR_GetCodeMode(p_pattern) == 1) {
if (is_long_name == PF_FALSE && (pf_vol_set.setting & 0x02) == 0x02 && PFPATH_CheckExtShortNameSignature(&pattern) == 1) {
result = PFPATH_CheckExtShortNameSignature(&pattern);
if (result == 1) {
name.index += 2;
pattern.p_head += 2;
}
}
} else if ((pf_vol_set.setting & 0x02) == 0x02 && is_long_name == PF_FALSE &&
PFSTR_StrNCmp(p_pattern, (pf_s8*)".", 1, 0, 1) != 0 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"..", 1, 0, 2) != 0 &&
PFPATH_CheckExtShortName(p_pattern, 1, PF_FALSE) == 0) {
result = PF_FALSE;
}
if (result == PF_TRUE) {
c_name = PFPATH_GetNextCharOfFileName(&name);
c_pat = PFPATH_GetNextCharOfPattern(&pattern, is_long_name);
result = PFPATH_DoMatchFileNameWithPattern(c_name, &name, c_pat, &pattern, is_long_name);
}
return result;
}
pf_s32 PFPATH_putShortName(pf_u8* pDirEntry, const pf_s8* short_name, pf_u8 attr) {
pf_s32 i = 0;

View File

@@ -226,7 +226,6 @@ PFVOL_SET pf_vol_set;
static s8 default_volume_label[12] = "NO NAME ";
static const u8 deleted_entry_mark[8] = {0xE5};
extern s32 PFDRV_mount(PFVOL_VOLUME* volume);
extern s32 PFDRV_unmount(PFVOL_VOLUME* volume, u32 mode);
extern s32 PFDRV_format(PFVOL_VOLUME* volume, const u8* format_options);
@@ -372,8 +371,13 @@ static inline s32 finalize_volume(PFVOL_VOLUME* volume) {
if (error != 0) { return error; }
return 0;
}
static inline s32 copy_codeset(const PFVOL_CHARCODE* code_set) {
pf_vol_set.codeset = *code_set;
static inline s32 copy_codeset(PFVOL_CHARCODE* code_set) {
pf_vol_set.codeset.oem2unicode = code_set->oem2unicode;
pf_vol_set.codeset.unicode2oem = code_set->unicode2oem;
pf_vol_set.codeset.oem_char_width = code_set->oem_char_width;
pf_vol_set.codeset.is_oem_mb_char = code_set->is_oem_mb_char;
pf_vol_set.codeset.unicode_char_width = code_set->unicode_char_width;
pf_vol_set.codeset.is_unicode_mb_char = code_set->is_unicode_mb_char;
return 0;
}
s32 PFVOL_DoMountVolume(PFVOL_VOLUME* volume) {
@@ -1458,7 +1462,7 @@ s32 PFVOL_getvolcfg(s8 drive, u32* config) {
return 0;
}
s32 PFVOL_setcode(const PFVOL_CHARCODE* code_set) {
s32 PFVOL_setcode(PFVOL_CHARCODE* code_set) {
if (pf_vol_set.num_mounted_volumes > 0) {
pf_vol_set.last_error = 36;
return 36;

View File

@@ -1167,9 +1167,9 @@ u32 VIGetRetraceCount(void)
static u32 getCurrentHalfLine(void)
{
u32 horizontalCount;
u32 previousVerticalCount;
u32 verticalCount;
u32 previousVerticalCount;
u32 horizontalCount;
verticalCount = __VIRegs[22] & 0x7FF;
for (;;) {
@@ -1180,7 +1180,7 @@ static u32 getCurrentHalfLine(void)
break;
}
}
return ((horizontalCount - 1) / CurrTiming->hlw) + ((verticalCount - 1) * 2);
return ((verticalCount - 1) * 2) + ((horizontalCount - 1) / CurrTiming->hlw);
}
static u32 getCurrentFieldEvenOdd(void)

View File

@@ -19,15 +19,23 @@ typedef struct HMACContext {
u8 key[64];
} HMACContext;
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
u8 innerKey[64];
static inline void BeginDigest(HMACContext* context, u8 mask) {
u8 blockKey[64];
u32 i;
u32 keyLength;
void* work = context->digestContext;
const char* function = "NETHMACInit";
keyLength = context->keyLength;
for (i = 0; i < keyLength; ++i) blockKey[i] = context->key[i] ^ mask;
memset(blockKey + keyLength, mask, context->interface.blockSize - keyLength);
context->interface.init(work);
context->interface.update(work, blockKey, context->interface.blockSize);
}
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
void* work = context->digestContext;
context->interface = *interface;
if (context->interface.contextSize > 96 || context->interface.blockSize > 64) {
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, function);
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, __FUNCTION__);
OSReport("specified interface needs too large workmemory.");
OSReport("\n");
return;
@@ -41,11 +49,7 @@ void NETHMACInit(HMACContext* context, const DigestInterface* interface, const v
context->interface.getDigest(work, context->key);
context->keyLength = context->interface.digestSize;
}
keyLength = context->keyLength;
for (i=0; i<keyLength; ++i) innerKey[i] = context->key[i] ^ 0x36;
memset(innerKey + keyLength, 0x36, context->interface.blockSize - keyLength);
context->interface.init(context->digestContext);
context->interface.update(context->digestContext, innerKey, context->interface.blockSize);
BeginDigest(context, 0x36);
}
void NETHMACUpdate(HMACContext* context, const void* data, u32 length) {
@@ -54,16 +58,9 @@ void NETHMACUpdate(HMACContext* context, const void* data, u32 length) {
void NETHMACGetDigest(HMACContext* context, void* digest) {
u8 innerDigest[64];
u8 outerKey[64];
u32 i;
u32 keyLength;
void* work = context->digestContext;
context->interface.getDigest(work, innerDigest);
keyLength = context->keyLength;
for (i=0; i<keyLength; ++i) outerKey[i] = context->key[i] ^ 0x5c;
memset(outerKey + keyLength, 0x5c, context->interface.blockSize - keyLength);
context->interface.init(context->digestContext);
context->interface.update(context->digestContext, outerKey, context->interface.blockSize);
BeginDigest(context, 0x5c);
context->interface.update(work, innerDigest, context->interface.digestSize);
context->interface.getDigest(work, digest);
}

View File

@@ -95,7 +95,7 @@ s32 NHTTPi_SocRecv_sub(NHTTPConnectionInfo* connection, s32 socket, void* data,
} else return result;
}
if(connection->recvBufDataLen!=0) {
if((u32)length>connection->recvBufDataLen) length=connection->recvBufDataLen;
length = (u32)length > connection->recvBufDataLen ? connection->recvBufDataLen : length;
NHTTPi_memcpy(data,buffer+connection->recvBufOffset,length);
connection->recvBufDataLen-=length;
if(connection->recvBufDataLen==0) {
@@ -168,7 +168,7 @@ s32 NHTTPi_SocSend_sub(s32 socket, const char* data, u32 length, s32 flags) {
return sent;
}
s32 NHTTPi_SocSend(NHTTPRequestInfo* request, s32 socket, const char* data, s32 length, s32 flags) {
s32 NHTTPi_SocSend(const NHTTPRequestInfo* request, s32 socket, const void* data, s32 length, s32 flags) {
s32 result;
SSLId ssl=request->sslId;
if(ssl>0) result=SSLWrite(ssl,data,length);

View File

@@ -82,7 +82,7 @@ s32 NHTTPi_ReceivedCallback(void* mutex, NHTTPConnectionInfo* connection);
void NHTTPi_NotifyCompletion(NHTTPConnectionInfo* connection);
void NHTTPi_SetVirtualContentLength(NHTTPConnectionInfo* connection, u32 length);
BOOL NHTTPi_isRecvBufFull(NHTTPResponseInfo* response, s32 offset);
s32 NHTTPi_SocSend(NHTTPRequestInfo* request, s32 socket, const void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocSend(const NHTTPRequestInfo* request, s32 socket, const void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocRecv(void* mutex, NHTTPRequestInfo* request, s32 socket, void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocClose(void* mutex, NHTTPRequestInfo* request, s32 socket);
s32 NHTTPi_SocOpen(NHTTPRequestInfo* request);

View File

@@ -176,7 +176,8 @@ s32 ConvertDateToDays(u16 year, u8 month, u8 day) {
}
validDate:
daysOfYear = day - 1 + DAYS_OF_YEAR[month - 1];
daysOfYear = day - 1;
daysOfYear += DAYS_OF_YEAR[month - 1];
if (month >= 3) {
isLeapYear = 0;
if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) {
@@ -206,31 +207,40 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
for (;;) {
u16 currentYear = *year;
s32 previousDays = days;
BOOL leapYear = (currentYear % 4 == 0 && currentYear % 100 != 0) || currentYear % 400 == 0;
BOOL leapYear = TRUE;
BOOL commonLeapYear = FALSE;
if (currentYear % 4 == 0 && currentYear % 100 != 0) {
commonLeapYear = TRUE;
}
if (!commonLeapYear && currentYear % 400 != 0) {
leapYear = FALSE;
}
days -= 365 + (leapYear != FALSE);
if (days < 0) {
days = previousDays;
break;
}
*year = *year + 1;
*year += 1;
continue;
}
for (;;) {
s32 previousDays = days;
if (*month == 2) {
BOOL leapYear = IsLeapYear(*year);
if (leapYear) {
days -= 29;
} else {
days -= DAYS_OF_MONTH[*month - 1];
}
s32 previousDays;
u8 currentMonth;
previousDays = days;
currentMonth = *month;
if (currentMonth == 2 && IsLeapYear(*year)) {
days -= 29;
} else {
days -= DAYS_OF_MONTH[*month - 1];
days -= DAYS_OF_MONTH[currentMonth - 1];
}
if (days < 0) {
*day += previousDays;
return;
if (days >= 0) {
*month += 1;
} else {
days = previousDays;
break;
}
*month = *month + 1;
}
*day += days;
}

View File

@@ -231,11 +231,11 @@ static NWC24Err QEncode(char* encoded, u32 encodedCapacity, u32* encodedSize, u8
}
static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, char* encoded, u32 encodedSize, u32* encodedSizeOut, int flags) {
u32 decodedOffset = 0;
u32 encodedOffset;
u32 decodedOffset = 0;
u8 value = 0;
char* input;
char* output;
u8 value = 0;
NWC24Err result = NWC24_OK;
if (decoded == NULL)
@@ -255,7 +255,7 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
input = encoded;
output = decoded;
for (encodedOffset = 0; encodedOffset < encodedSize; encodedOffset++) {
if (decodedCapacity <= decodedOffset) {
if (decodedOffset >= decodedCapacity) {
result = NWC24_ERR_OVERFLOW;
break;
}
@@ -265,15 +265,15 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
decodedOffset++;
} else if (*input == '=' && encodedOffset + 2 < encodedSize) {
BOOL validHex = TRUE;
u32 inputAfterEqual = encodedOffset + 1;
char* current = ++input;
if (*current == ' ' || *current == '\t') {
char* next = current + 1;
input++;
encodedOffset++;
if (*input == ' ' || *input == '\t') {
char* next = input + 1;
u32 scan = 1;
while (inputAfterEqual + scan + 1 < encodedSize) {
while (encodedOffset + scan + 1 < encodedSize) {
if (*next == '\r' && next[1] == '\n') {
inputAfterEqual += scan;
current = next;
encodedOffset += scan;
input = next;
break;
}
if (*next != ' ' && *next != '\t') {
@@ -283,29 +283,27 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
scan++;
}
}
if (*current == '\r' && current[1] == '\n') {
current += 2;
encodedOffset = inputAfterEqual + 1;
input = current;
if (*input == '\r' && input[1] == '\n') {
input += 2;
encodedOffset++;
} else {
int high = Util_xtoi(*current);
int high = Util_xtoi(*input);
int low;
if (high >= 0) {
value = (high & 0x0F) << 4;
}
if (high < 0) { validHex = FALSE; }
low = Util_xtoi(current[1]);
low = Util_xtoi(input[1]);
if (low >= 0) {
value |= low & 0x0F;
}
if (low < 0) { validHex = FALSE; }
current += 2;
input += 2;
if (validHex) {
*output++ = (char)value;
decodedOffset++;
}
encodedOffset = inputAfterEqual + 1;
input = current;
encodedOffset++;
}
} else {
*output++ = *input++;
@@ -501,22 +499,42 @@ static BOOL CopyWithoutLinearWhiteSpaces(char* output, int* outputSize, char* in
}
static inline char* FindMarker(char* input, u32 size, const char* marker) {
u32 markerLength = Mail_strlen(marker);
u32 offset;
u32 markerLength;
markerLength = Mail_strlen(marker);
for (offset = 0; offset <= size; offset++) {
char* current = input + offset;
if (Mail_strncmp(current, marker, markerLength) == 0)
return current;
return input + offset;
}
return NULL;
}
static inline char* FindMarkerAfterPrefix(char* input, u32 size, u32 prefix, const char* marker) {
u32 markerLength = Mail_strlen(marker);
char* current = input + prefix;
char* current;
u32 offset;
u32 markerLength;
markerLength = Mail_strlen(marker);
current = input + prefix;
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(current, marker, markerLength) == 0) {
return input + offset + prefix;
return input + prefix + offset;
}
current++;
}
return NULL;
}
static inline char* FindEncodingMarker(char* encoded, u32 size) {
u32 offset;
u32 markerLength;
const char* marker;
char* current;
marker = "?";
markerLength = Mail_strlen(marker);
current = encoded;
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(current, marker, markerLength) == 0) {
return encoded + offset;
}
current++;
}
@@ -524,14 +542,28 @@ static inline char* FindMarkerAfterPrefix(char* input, u32 size, u32 prefix, con
}
static inline NWC24Err ExtractWordEncoding(char* encoding, u32* encodingSize, char* encoded, u32 encodedSize) {
char* delimiter = FindMarkerAfterPrefix(encoded, encodedSize, 0, "?");
char* delimiter = FindEncodingMarker(encoded, encodedSize);
if (delimiter == NULL) { return NWC24_ERR_INVALID_VALUE; }
*encoding = delimiter[1];
*encodingSize = 2;
return NWC24_OK;
}
static inline BOOL IsLinearWhitespaceOnly(char* text, u32 size) {
u32 offset;
BOOL whitespaceOnly;
whitespaceOnly = TRUE;
for (offset = 0; offset < size && text[offset] != '\0'; offset++) {
char value = text[offset];
if (value != ' ' && value != '\t' && value != '\r' && value != '\n') {
whitespaceOnly = FALSE;
}
}
return whitespaceOnly;
}
static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded, u32 decodedCapacity, u32* decodedSize, char* encoded,
u32 encodedSize, u32* encodedSizeOut) {
char encoding;
char* encodedWord;
u32 consumedSize;
u32 decodedLength;
@@ -548,7 +580,6 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
if (encodedSizeOut != NULL) { *encodedSizeOut = 0; }
encodedWord = FindMarker(encoded, encodedSize, "=?");
if (encodedWord == encoded) {
char encoding;
result = ExtractCharset(charsetData, charsetCapacity, &consumedSize, encodedWord, encodedSize);
if (result != NWC24_OK) { return result; }
encodedLength = consumedSize;
@@ -574,15 +605,7 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
}
decodedLength = localSize;
if (encodedWord != NULL) {
BOOL whitespaceOnly = TRUE;
u32 offset;
for (offset = 0; offset < localSize && decoded[offset] != '\0'; offset++) {
char value = decoded[offset];
if (value != ' ' && value != '\t' && value != '\r' && value != '\n') {
whitespaceOnly = FALSE;
}
}
if (whitespaceOnly) {
if (IsLinearWhitespaceOnly(decoded, localSize)) {
*decoded = '\0';
decodedLength = 1;
}
@@ -695,8 +718,9 @@ static NWC24Err ExtractCharset(char* charset, u32 charsetCapacity, u32* charsetS
return NWC24_OK;
}
static inline char* FindMarkerOffsetPrefix(char* input, u32 size, u32 prefix, const char* marker) {
u32 markerLength = Mail_strlen(marker);
u32 offset;
u32 markerLength;
markerLength = Mail_strlen(marker);
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(input + offset + prefix, marker, markerLength) == 0) {
return input + prefix + offset;

View File

@@ -408,8 +408,10 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
return result;
}
length = privateMsg->textSize;
if (length == 0)
length = privateMsg->text.size;
switch (length) {
case 0: length = privateMsg->text.size; break;
default: break;
}
if (length == 0)
return NWC24_ERR_NULL;
if (length > capacity - 1) {
@@ -468,11 +470,11 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
}
close:
closeResult = NWC24iMBoxCloseMsg(&file);
if (result == NWC24_OK)
result = closeResult;
if (result == NWC24_OK)
result = overflow;
return result;
if (result != NWC24_OK)
closeResult = result;
if (closeResult != NWC24_OK)
overflow = closeResult;
return overflow;
}
NWC24Err NWC24ReadMsgAttached(const NWC24MsgObj* msg, u32 index, u8* output, u32 capacity) {

View File

@@ -816,9 +816,9 @@ done:
NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 subjectSize, NWC24EncodingRegion region, u16 alternative, u8* work,
u32 workSize, NWC24Charset charset, char* charsetName) {
u32 workHalf;
u32 secondSize;
u8* second;
u32 secondSize;
u32 workHalf;
u32 subjectLength;
u32 lineLength;
u32 sourceOffset;
@@ -827,18 +827,22 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
u32 charsetLength;
NWC24Err result;
workHalf = workSize >> 1;
secondSize = workSize - workHalf;
second = work + workHalf;
second = work + (workSize >> 1);
secondSize = workSize - (workSize >> 1);
charsetLength = strlen(charsetName);
lineLength = ((0x36 - charsetLength) * 3) >> 2;
if (lineLength > workHalf) {
if (lineLength > (workSize >> 1)) {
result = NWC24_ERR_OVERFLOW;
} else {
workHalf = lineLength + 1;
subjectLength = subjectSize;
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject, &subjectLength, charsetName, 0x40, region, alternative);
switch (result) { case NWC24_OK: case NWC24_ERR_OVERFLOW: break; default: goto done; }
if (result != NWC24_OK) {
switch (result) {
case NWC24_ERR_OVERFLOW: break;
default: goto done;
}
}
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
switch (result) { case NWC24_OK: break; default: goto done; }
{
@@ -849,7 +853,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
charsetLength = strlen(charsetName);
lineLength = (((0x3E - charsetLength) * 3) >> 2) + 1;
total = outputLength - 1;
for (; sourceOffset < subjectSize; sourceOffset += subjectLength) {
for (; sourceOffset < subjectSize;) {
subjectLength = subjectSize - sourceOffset;
workHalf = lineLength;
if (secondSize - total < 3) {
@@ -861,9 +865,15 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
second[total++] = ' ';
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject + sourceOffset, &subjectLength, charsetName, 0x40, region,
alternative);
switch (result) { case NWC24_OK: case NWC24_ERR_OVERFLOW: break; default: goto done; }
if (result != NWC24_OK) {
switch (result) {
case NWC24_ERR_OVERFLOW: break;
default: goto done;
}
}
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;
}
result = NWC24SetMsgSubject(msg, (char*)second, total);

View File

@@ -47,95 +47,130 @@ s32 SOGetHostID(void) {
return address;
}
SOHostEnt* SOGetHostByName(const char* name) {
static inline int GetHostReply(const char* name, s32* rm, SOHostEnt** host) {
HostReply* reply;
int length;
char* request;
int result;
int size;
int length;
SOHostEnt* host;
if (!name) return -28;
length = strlen(name);
size = (length + 32) & ~31;
request = SOiAlloc(12, size);
reply = SOiGetSysWork()->host;
if (!request) return -49;
strcpy(request, name);
result = IOS_Ioctl(*rm, 17, request, length + 1, reply, 0x460);
if (result >= 0) {
int displacement = (int)reply->nameStorage - (int)reply->host.name;
u8** address = reply->addresses;
while (*address) { *address += displacement; ++address; }
reply->host.aliases = (char**)((u8*)reply->host.aliases + displacement);
*host = &reply->host;
reply->host.name += displacement;
reply->host.addrList = (u8**)((u8*)reply->host.addrList + displacement);
}
SOiFree(12, request, size);
return result;
}
SOHostEnt* SOGetHostByName(const char* name) {
SOHostEnt* host = NULL;
s32 rm;
char* request;
host = NULL;
if((result=SOiPrepare(NULL,&rm))==0) {
if(!name) result=-28;
else {
length=strlen(name);
size=(length+32)&~31;
request=SOiAlloc(12,size);
reply=SOiGetSysWork()->host;
if(!request) result=-49;
else {
strcpy(request,name);
result=IOS_Ioctl(rm,17,request,length+1,reply,0x460);
if(result>=0) {
int displacement=(int)reply->nameStorage-(int)reply->host.name;
u8** address=reply->addresses;
while(*address) { *address+=displacement; ++address; }
reply->host.aliases=(char**)((u8*)reply->host.aliases+displacement);
host=&reply->host;
reply->host.name+=displacement;
reply->host.addrList=(u8**)((u8*)reply->host.addrList+displacement);
}
SOiFree(12,request,size);
}
}
SOiConclude(NULL,result);
int result;
if ((result = SOiPrepare(NULL, &rm)) == 0) {
result = GetHostReply(name, &rm, &host);
SOiConclude(NULL, result);
}
return host;
}
static int NameSize(const char* name) { return name ? strlen(name)+1 : 0; }
static inline int NameSize(const char* name) {
if (name == NULL) {
return 0;
} else {
return strlen(name) + 1;
}
}
static inline int NameLength(const char* name) {
if (name == NULL) {
return 0;
} else {
return strlen(name);
}
}
static inline int ServiceSize(const char* node, const char* service) {
if (service == NULL) {
return 0;
} else {
return strlen(node) + 1;
}
}
static inline int GetAddressReply(const char* nodeName, const char* servName, const SOAddrInfo* hints,
SOAddrInfo** resultInfo, s32* rm) {
SOAddrInfo* requestHints;
AddrInfoRequest* request;
char* service;
int nodeLength;
AddrInfoReply* reply;
int size;
char* node;
int serviceLength;
int result;
serviceLength = ServiceSize(nodeName, servName);
nodeLength = NameSize(nodeName);
size=(((nodeLength+31)&~31)+((serviceLength+31)&~31)+95)&~31;
request=SOiAlloc(12,size);
if(!request) result=-49;
else {
reply=SOiAlloc(10,0x840);
if(!reply) { SOiFree(12,request,size); result=-49; }
else {
node=(char*)request->storage;
service=node+((NameSize(nodeName)+31)&~31);
requestHints=(SOAddrInfo*)(service+((ServiceSize(nodeName, servName)+31)&~31));
if(nodeName) strcpy(node,nodeName);
request->vectors[0].base=nodeName ? (u8*)node : NULL;
request->vectors[0].length=NameLength(nodeName);
if(servName) strcpy(service,servName);
request->vectors[1].base=servName ? (u8*)service : NULL;
request->vectors[1].length=NameLength(servName);
if(hints) memcpy(requestHints,hints,32);
else memset(requestHints,0,32);
if(requestHints->family==0) requestHints->family=2;
if(requestHints->family==23) {
*resultInfo=NULL; result=-68; SOiFree(10,reply,0x840);
} else {
request->vectors[2].base=(u8*)requestHints; request->vectors[2].length=32;
request->vectors[3].base=(u8*)reply; request->vectors[3].length=0x834;
result=IOS_Ioctlv(*rm,24,3,1,request->vectors);
if(result>=0) {
SOAddrInfo* entry=reply->entries;
u8* address=reply->addresses;
*resultInfo=entry;
while(entry) {
entry->addr=address;
if(entry->next) entry->next=entry+1;
entry=entry->next;
address+=28;
}
} else { *resultInfo=NULL; SOiFree(10,reply,0x840); }
}
SOiFree(12,request,size);
}
}
return result;
}
int SOGetAddrInfo(const char* nodeName, const char* servName, const SOAddrInfo* hints, SOAddrInfo** resultInfo) {
s32 rm;
int result,size;
AddrInfoRequest* request;
AddrInfoReply* reply;
char* node;
char* service;
SOAddrInfo* requestHints;
if((result=SOiPrepare(NULL,&rm))==0) {
size=(((NameSize(nodeName)+31)&~31)+((servName ? strlen(nodeName)+32 : 31)&~31)+95)&~31;
request=SOiAlloc(12,size);
if(!request) result=-49;
else {
reply=SOiAlloc(10,0x840);
if(!reply) { SOiFree(12,request,size); result=-49; }
else {
node=(char*)request->storage;
service=node+((NameSize(nodeName)+31)&~31);
requestHints=(SOAddrInfo*)(service+((servName ? strlen(nodeName)+32 : 31)&~31));
if(nodeName) strcpy(node,nodeName);
request->vectors[0].base=nodeName ? (u8*)node : NULL;
request->vectors[0].length=nodeName ? strlen(nodeName) : 0;
if(servName) strcpy(service,servName);
request->vectors[1].base=servName ? (u8*)service : NULL;
request->vectors[1].length=servName ? strlen(servName) : 0;
if(hints) memcpy(requestHints,hints,32);
else memset(requestHints,0,32);
if(requestHints->family==0) requestHints->family=2;
if(requestHints->family==23) {
*resultInfo=NULL; result=-68; SOiFree(10,reply,0x840);
} else {
request->vectors[2].base=(u8*)requestHints; request->vectors[2].length=32;
request->vectors[3].base=(u8*)reply; request->vectors[3].length=0x834;
result=IOS_Ioctlv(rm,24,3,1,request->vectors);
if(result>=0) {
SOAddrInfo* entry=reply->entries;
u8* address=reply->addresses;
*resultInfo=entry;
while(entry) {
entry->addr=address;
if(entry->next) entry->next=entry+1;
entry=entry->next;
address+=28;
}
} else { *resultInfo=NULL; SOiFree(10,reply,0x840); }
}
SOiFree(12,request,size);
}
}
result=SOiConclude(NULL,result);
int result;
if ((result = SOiPrepare(NULL, &rm)) == 0) {
result = GetAddressReply(nodeName, servName, hints, resultInfo, &rm);
result = SOiConclude(NULL, result);
}
return result;
}

View File

@@ -17,14 +17,19 @@ typedef struct SocketOption {
u8 value[20];
} SocketOption;
typedef struct InterfaceCommand { int level; int option; } InterfaceCommand;
typedef union InterfaceCommand {
struct { int level; int option; };
u8 bytes[32];
} InterfaceCommand;
typedef union InterfaceLength {
int length;
u8 bytes[32];
} InterfaceLength;
typedef struct InterfaceOption {
IOSIoVector vectors[4];
union {
InterfaceCommand command;
u8 commandBlock[32];
};
InterfaceCommand command;
union {
int length;
u8 lengthBlock[32];
@@ -34,10 +39,7 @@ typedef struct InterfaceOption {
typedef struct InterfaceSetting {
IOSIoVector vectors[4];
union {
InterfaceCommand command;
u8 commandBlock[32];
};
InterfaceCommand command;
u8 value[1];
} InterfaceSetting;
@@ -96,9 +98,9 @@ static int OptionLength(int* length) {
int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int* length) {
s32 rm;
int temporary;
InterfaceOption* request;
int result;
int size;
int result;
InterfaceOption* request;
InterfaceCommand* command;
int* returnedLength;
u8* reply;
@@ -111,8 +113,8 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
else {
command=&request->command;
command->level=level; command->option=option;
returnedLength=&request->length;
reply=request->value;
returnedLength=&((InterfaceLength*)(command + 1))->length;
reply=(u8*)((InterfaceLength*)returnedLength + 1);
*returnedLength=OptionLength(length);
request->vectors[0].base=(u8*)command;
request->vectors[0].length=8;
@@ -138,9 +140,9 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
int SOSetInterfaceOpt(void* interface, int level, int option, const void* value, int length) {
s32 rm;
int temporary;
InterfaceSetting* request;
int result;
int size;
int result;
InterfaceSetting* request;
InterfaceCommand* command;
u8* reply;
if ((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
@@ -152,7 +154,7 @@ int SOSetInterfaceOpt(void* interface, int level, int option, const void* value,
else {
command=&request->command;
command->level=level; command->option=option;
reply=request->value;
reply=(u8*)(command + 1);
if(value) memcpy(reply,value,length);
else memset(reply,0,length);
request->vectors[0].base=(u8*)command; request->vectors[0].length=8;

View File

@@ -205,7 +205,7 @@ void AxAdpcmSimplePlayer::init() {
}
int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
Header* head = mpBNSBuffer = (Header*)data;
mpBNSBuffer = (Header*)data;
sSysPauseFlag = false;
@@ -224,7 +224,6 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
ChannelInfo* chanInfoBufB[2];
ChannelInfo* chanInfoBufA[2];
AdpcmCoeffs** pCoeffsBufB = NULL;
int i;
u32* channelStartOffsets;
INFOBlock* infoBlock;
@@ -240,13 +239,13 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
int chanCount;
{
if (head->byteOrder != 0xFEFF) {
if (((Header*)data)->byteOrder != 0xFEFF) {
chanCount = 0;
goto clean_up;
}
infoBlock = ADD_OFFSET(INFOBlock, data, head->infoHead.offset);
dataBlock = ADD_OFFSET(DATABlock, data, head->dataHead.offset);
infoBlock = ADD_OFFSET(INFOBlock, data, ((Header*)data)->infoHead.offset);
dataBlock = ADD_OFFSET(DATABlock, data, ((Header*)data)->dataHead.offset);
if (infoBlock->head.sig != 'INFO') {
chanCount = 0;
goto clean_up;
@@ -268,8 +267,6 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
pChanInfoBufB = chanInfoBufB;
pChanDataBuf = chanDataBuf;
pCoeffsBufA = coeffsBufA;
pCoeffsBufB = coeffsBufB;
pAxvpbBuf = axVoiceBuf;
for (i = 0; chanCount = infoBlock->channelCount, i < chanCount; i++) {
int chanStartOffs = channelStartOffsets[i];
ChannelInfo* chanInfo = ADD_OFFSET(ChannelInfo, infoBlockDataBase, chanStartOffs);
@@ -278,8 +275,9 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
pChanInfoBufB[i] = chanInfo;
pChanDataBuf[i] = ADD_OFFSET(void, dataBlockDataBase, chanInfo->dataOff);
pCoeffsBufA[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
pCoeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
coeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
pAxvpbBuf = axVoiceBuf;
pAxvpbBuf[i] = AXAcquireVoice(0x1f, VoiceCallback, 0);
if (pAxvpbBuf[i] == NULL) {
chanCount = 0;
@@ -312,37 +310,33 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
axAddr.currentAddressHi = (u32)currAddr >> 0x10;
axAddr.currentAddressLo = (u32)currAddr & 0xFFFF;
axAdpcm.a[0][0] = pCoeffsBufB[i]->a[0][0];
axAdpcm.a[0][1] = pCoeffsBufB[i]->a[0][1];
axAdpcm.a[1][0] = pCoeffsBufB[i]->a[1][0];
axAdpcm.a[1][1] = pCoeffsBufB[i]->a[1][1];
axAdpcm.a[2][0] = pCoeffsBufB[i]->a[2][0];
axAdpcm.a[2][1] = pCoeffsBufB[i]->a[2][1];
axAdpcm.a[3][0] = pCoeffsBufB[i]->a[3][0];
axAdpcm.a[3][1] = pCoeffsBufB[i]->a[3][1];
axAdpcm.a[4][0] = pCoeffsBufB[i]->a[4][0];
axAdpcm.a[4][1] = pCoeffsBufB[i]->a[4][1];
axAdpcm.a[5][0] = pCoeffsBufB[i]->a[5][0];
axAdpcm.a[5][1] = pCoeffsBufB[i]->a[5][1];
axAdpcm.a[6][0] = pCoeffsBufB[i]->a[6][0];
axAdpcm.a[6][1] = pCoeffsBufB[i]->a[6][1];
axAdpcm.a[7][0] = pCoeffsBufB[i]->a[7][0];
axAdpcm.a[7][1] = pCoeffsBufB[i]->a[7][1];
axAdpcm.gain = pCoeffsBufB[i]->cfg.gain;
axAdpcm.pred_scale = pCoeffsBufB[i]->cfg.predScale;
axAdpcm.yn1 = pCoeffsBufB[i]->cfg.yn1;
axAdpcm.yn2 = pCoeffsBufB[i]->cfg.yn2;
axAdpcm.a[0][0] = coeffsBufB[i]->a[0][0];
axAdpcm.a[0][1] = coeffsBufB[i]->a[0][1];
axAdpcm.a[1][0] = coeffsBufB[i]->a[1][0];
axAdpcm.a[1][1] = coeffsBufB[i]->a[1][1];
axAdpcm.a[2][0] = coeffsBufB[i]->a[2][0];
axAdpcm.a[2][1] = coeffsBufB[i]->a[2][1];
axAdpcm.a[3][0] = coeffsBufB[i]->a[3][0];
axAdpcm.a[3][1] = coeffsBufB[i]->a[3][1];
axAdpcm.a[4][0] = coeffsBufB[i]->a[4][0];
axAdpcm.a[4][1] = coeffsBufB[i]->a[4][1];
axAdpcm.a[5][0] = coeffsBufB[i]->a[5][0];
axAdpcm.a[5][1] = coeffsBufB[i]->a[5][1];
axAdpcm.a[6][0] = coeffsBufB[i]->a[6][0];
axAdpcm.a[6][1] = coeffsBufB[i]->a[6][1];
axAdpcm.a[7][0] = coeffsBufB[i]->a[7][0];
axAdpcm.a[7][1] = coeffsBufB[i]->a[7][1];
axAdpcm.gain = coeffsBufB[i]->cfg.gain;
axAdpcm.pred_scale = coeffsBufB[i]->cfg.predScale;
axAdpcm.yn1 = coeffsBufB[i]->cfg.yn1;
axAdpcm.yn2 = coeffsBufB[i]->cfg.yn2;
u32 ratio = infoBlock->sampleRate / 32000.0f * 65536.0f;
axSrc.ratioHi = ratio >> 16;
axSrc.ratioLo = ratio & 0xFFFF;
axSrc.currentAddressFrac = 0;
axSrc.last_samples[0] = 0;
axSrc.last_samples[1] = 0;
axSrc.last_samples[2] = 0;
axSrc.last_samples[3] = 0;
axSrc.last_samples[3] = axSrc.last_samples[2] = axSrc.last_samples[1] = axSrc.last_samples[0] = axSrc.currentAddressFrac = 0;
AXVPB* vpbA = axVoiceBuf[i];
AXVPB* vpbA = pAxvpbBuf[i];
AXSetVoiceType(vpbA, 0);
AXSetVoiceAddr(vpbA, &axAddr);
AXSetVoiceAdpcm(vpbA, &axAdpcm);
@@ -359,7 +353,7 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
Voices[vpbA->index].getMix()->vL = 0;
}
}
AXVPB* vpbB = axVoiceBuf[i];
AXVPB* vpbB = pAxvpbBuf[i];
AXSetVoiceMix(vpbB, Voices[vpbA->index].getMix());
static AXPBVE voiceVe = {32768, 0};
AXSetVoiceVe(vpbB, &voiceVe);

View File

@@ -619,7 +619,7 @@ vmFloat VmIntToFloat(vmU64 integer) {
return result;
}
static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
static s32 CHANSVmParseInt(const CHANSVmObjHdr* obj, s32 base, u64* out) {
u8 type = obj->type;
u32 stringLength;
u32 charCount;

View File

@@ -22,7 +22,9 @@ namespace textinput {
#pragma section sconst_type ".sdata"
extern "C" const char* scCommonTextAnimName = scT_prdc_Text_00;
extern "C" const char* scCommonScrollAnimName = scP_prdc_scrl_Left;
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 1};
#pragma explicit_zero_data on
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 0};
#pragma explicit_zero_data reset
extern "C" const char scP_OnBtn[8] = "P_OnBtn";
extern "C" const char scB_OnBtn[8] = "B_OnBtn";
#pragma pop

View File

@@ -429,32 +429,38 @@ namespace ipl {
}
BOOL Board::appendRecord(CDBRecord* record) {
CDBRecordKey recordKey;
utility::Date recordDate;
int recordDay;
int recordMin;
int recordHour;
u32 recordGC = 0;
struct RecordReadState {
BOOL recordInterrupts;
u32 dataSize;
BOOL waitInterrupts;
BOOL slotInterrupts;
int recordSecond;
int recordMin;
int recordHour;
u32 recordGC;
CDBId cdbId;
char recordType[8];
utility::Date recordDate;
CDBRecordKey recordKey;
} state;
state.recordGC = 0;
cdb::Manager* cdbManager = System::getCdbManager();
struct InterruptState {
BOOL first;
BOOL second;
BOOL third;
BOOL result;
} interrupts;
interrupts.result = TRUE;
char recordType[8] = "";
BOOL result = TRUE;
state.recordType[0] = 0;
state.recordType[1] = 0;
state.recordType[2] = 0;
state.recordType[3] = 0;
state.recordType[4] = 0;
state.recordType[5] = 0;
state.recordType[6] = 0;
state.recordType[7] = 0;
// Get record metadata
CDBRecordGetCalendarTimeForce(record, &recordDate.year, &recordDate.month, &recordDate.day, &recordHour, &recordMin, &recordDay);
CDBRecordGetKeyForce(record, &recordKey);
CDBRecordGetTypeForce(record, recordType);
CDBRecordGetGameCodeForce(record, (char*)&recordGC);
CDBRecordGetCalendarTimeForce(record, &state.recordDate.year, &state.recordDate.month, &state.recordDate.day,
&state.recordHour, &state.recordMin, &state.recordSecond);
CDBRecordGetKeyForce(record, &state.recordKey);
CDBRecordGetTypeForce(record, state.recordType);
CDBRecordGetGameCodeForce(record, (char*)&state.recordGC);
if (mbReading == true && mSearchRecord_Prev.created) {
mbReading = false;
@@ -462,34 +468,34 @@ namespace ipl {
}
// Verify record
if (!cdbManager->isValidType(recordType)) {
if (!cdbManager->isValidType(state.recordType)) {
return TRUE;
}
if (is_already_read(recordKey.keyString)) {
if (is_already_read(state.recordKey.keyString)) {
return TRUE;
}
if (is_exist_keytbl(recordKey.keyString)) {
if (is_exist_keytbl(state.recordKey.keyString)) {
return TRUE;
}
recordDate.month++;
if (!(recordDate == mCurrentDate)) {
state.recordDate.month++;
if (!(state.recordDate == mCurrentDate)) {
goto error;
}
// Find any free space to put the object on screen
interrupts.first = OSDisableInterrupts();
state.slotInterrupts = OSDisableInterrupts();
BOOL exist = is_exist_diff_date();
BoardObject* obj = mObjList.getNextFree();
OSRestoreInterrupts(interrupts.first);
OSRestoreInterrupts(state.slotInterrupts);
if (obj == NULL && exist) {
while (obj == NULL) {
OSSleepMilliseconds((OSTime)1);
interrupts.second = OSDisableInterrupts();
state.waitInterrupts = OSDisableInterrupts();
obj = mObjList.getNextFree();
OSRestoreInterrupts(interrupts.second);
OSRestoreInterrupts(state.waitInterrupts);
}
}
@@ -506,61 +512,59 @@ namespace ipl {
// Get CDB metadata
u32 dataSize;
if (!cdbManager->getDataSize(record, &dataSize)) {
if (!cdbManager->getDataSize(record, &state.dataSize)) {
return TRUE;
}
if (dataSize > 0x32000) {
if (state.dataSize > 0x32000) {
return TRUE;
}
CDBId cdbId;
if (!System::getCdbManager()->getCDBId(record, &cdbId)) {
if (!System::getCdbManager()->getCDBId(record, &state.cdbId)) {
return TRUE;
}
// Read CDB metadata
u8* rbrData = new (obj->mpHeap, DEFAULT_ALIGN) u8[dataSize];
u8* rbrData = new (obj->mpHeap, DEFAULT_ALIGN) u8[state.dataSize];
if (rbrData == NULL) {
return FALSE;
}
if (!cdbManager->read(record, rbrData, dataSize)) {
if (!cdbManager->read(record, rbrData, state.dataSize)) {
delete[] rbrData;
goto close;
}
interrupts.result = TRUE;
result = TRUE;
if (((RBRHeader*)rbrData)->magic == RBR_MAGIC && cdbManager->isValidHeader((RBRHeader*)rbrData)) {
interrupts.third = OSDisableInterrupts();
state.recordInterrupts = OSDisableInterrupts();
if (recordDate == mCurrentDate) {
if (state.recordDate == mCurrentDate) {
if (mbReading == true && mSearchRecord_Prev.created) {
mbReading = false;
delete[] rbrData;
OSRestoreInterrupts(interrupts.third);
OSRestoreInterrupts(state.recordInterrupts);
return FALSE;
}
// Create on screen object
obj->create(mpLayoutFile, rbrData, recordGC, cdbId, recordKey, recordDate);
obj->create(mpLayoutFile, rbrData, state.recordGC, state.cdbId, state.recordKey, state.recordDate);
mObjList.append(obj);
CDBRecordGetCalendarTimeForce(record, &mSearchRecord_Next.year, &mSearchRecord_Next.month, &mSearchRecord_Next.day,
&mSearchRecord_Next.hour, &mSearchRecord_Next.min, &mSearchRecord_Next.sec);
memcpy(&mSearchRecord_Next.key, &recordKey, sizeof(CDBRecordKey));
memcpy(&mSearchRecord_Next.key, &state.recordKey, sizeof(CDBRecordKey));
mSearchRecord_Next.created = true;
if (mSearchRecord_Prev.created == false) {
memcpy(&mSearchRecord_Prev, &mSearchRecord_Next, sizeof(SearchRecord));
}
} else {
interrupts.result = FALSE;
result = FALSE;
delete[] rbrData;
}
OSRestoreInterrupts(interrupts.third);
OSRestoreInterrupts(state.recordInterrupts);
} else {
delete[] rbrData;
}
@@ -584,13 +588,13 @@ namespace ipl {
show_ricon();
}
interrupts.result = FALSE;
result = FALSE;
goto out;
error:
interrupts.result = FALSE;
result = FALSE;
out:
return interrupts.result;
return result;
}
void Board::stt_wait_cdb_init() {

View File

@@ -66,7 +66,7 @@ namespace ipl {
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) NO_INLINE;
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) NO_INLINE;
@@ -255,15 +255,15 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) {
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout) {
int lang = System::getLanguage();
const char* langGroup = scLangGroups[lang];
char availableLanguages[10][4] = {};
bool languageFound = false;
for (nw4r::lyt::GroupList::Iterator it = layout->GetGroupList().GetBeginIter();
it != layout->GetGroupList().GetEndIter(); it++) {
for (nw4r::lyt::GroupList::Iterator it = layout->getNW4RLyt()->GetGroupContainer()->GetGroupList().GetBeginIter();
it != layout->getNW4RLyt()->GetGroupContainer()->GetGroupList().GetEndIter(); it++) {
if (strcmp(it->GetName(), langGroup) == 0) {
languageFound = true;
} else {
@@ -295,7 +295,7 @@ namespace ipl {
}
if (languageFound) {
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
nw4r::lyt::Group* group = layout->getNW4RLyt()->GetGroupContainer()->FindGroupByName(langGroup);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
@@ -305,7 +305,7 @@ namespace ipl {
for (int i = 0; i < channel::MAX_ANIMS; i++) {
if (scRegionGroups[region][i] != NULL) {
if (strcmp(scRegionGroups[region][i], availableLanguages[scLangLookup[region][i]]) == 0) {
nw4r::lyt::Group* group = layout->FindGroupByName(scRegionGroups[region][i]);
nw4r::lyt::Group* group = layout->getNW4RLyt()->GetGroupContainer()->FindGroupByName(scRegionGroups[region][i]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);

View File

@@ -1465,8 +1465,9 @@ extern "C" BOOL iplSDChannelTitle_passesParentalCheck(SDChannelTitle* scene, EST
return TRUE;
}
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
SDTitlePaneEventHandler* handler = this;
const controller::Interface* controller = static_cast<const controller::Interface*>(data);
const char* paneName = handler->getPane(component)->GetName();
switch (event) {
case ::gui::EventHandler::ON_TRIG: {
@@ -1524,8 +1525,8 @@ extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* hand
}
}
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
SDTitleButtonEventHandler* handler = this;
const char* name = handler->getPane(component)->GetName();
switch (event) {
case 0:
@@ -1555,12 +1556,14 @@ void SDChannelTitle::startResetting() {
snd::getSystem()->resetAllSound();
}
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
iplSDChannelTitle_onTitleButtonEvent(this, component, event, controller);
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
handler->onEventDerived(component, event, controller);
}
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
iplSDChannelTitle_onTitlePaneEvent(this, component, event, static_cast<const controller::Interface*>(data));
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
handler->onEvent(component, event, const_cast<controller::Interface*>(controller));
}
}

View File

@@ -3,7 +3,7 @@
#include "utility/iplCharacterCode.h"
extern "C" {
BOOL USBAPStartRegistration(void*, void*, u32, u32, void*, void (*)(int), u16*, u8*);
BOOL USBAPStartRegistration(u64, u32, u32, void*, void (*)(int), u16*, u8*);
BOOL USBAPCancelRegistration();
BOOL USBAPIsThreadTerminated();
}
@@ -40,7 +40,7 @@ void USBAPRegisterCallback(int result) {
void USBAPThread::Init(unsigned short* buffer, unsigned char* accessPoints) {
int priority = OSGetThreadPriority(OSGetCurrentThread()) + 1;
if (USBAPStartRegistration(NULL, NULL, priority,
if (USBAPStartRegistration(0, priority,
0, this, USBAPRegisterCallback, buffer, accessPoints) == 1) {
OSReport("Registration started\n");
}

View File

@@ -10,7 +10,7 @@ from pathlib import Path
EXPECTED_DOL_SHA1 = "26116613f624061ba99c8d1a299aaa6efa85670d"
EXPECTED_TOTAL_UNITS = 1027
EXPECTED_TOTAL_CODE = 2995188
EXPECTED_TOTAL_CODE = 2995176
EXPECTED_TOTAL_DATA = 1832684
EXPECTED_TOTAL_FUNCTIONS = 12563
INTEGER_PATTERN = re.compile(r"-?(0|[1-9][0-9]*)\Z")

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -265,3 +265,125 @@ GATE PASS
```
Accepted improvement commits: 2348596d (real float-reference setter), fff3e072 (Color ownership), 8532b7bf (DestructorChain ownership).
## High continuation: name/extent pairing (new origin/main branch)
Starting data: tiInputForm 1036/3772, tiKeyboard 12/2708, MyTiManager 148/1132. Instruction-exact counts 216/221, 62/62, 91/91. Fetched origin before unit work; owned source equals origin/main and the full baseline quick gate passes. Prior three distinct attempts for each open tiInputForm function are retained above. User explicitly permits proven real-object extent corrections, leaving alignment bytes unowned without changing addresses, split ranges or section totals. Earlier claims that extra weak tables inherently prevented data matching were premature; rechecking symbol pairing with this new evidence.
tiKeyboard pool identical (8 strings); source unchanged on origin/main after fetch.
- 0x8165FA88 signwindow::Sample vtable extent 272 -> 268: source class compiler table is 268 bytes; all 61 outgoing virtual/thunk relocations agree at their relative offsets, and target's final four bytes are zero alignment without a relocation; the next table still begins at 0x8165FB98.
- 0x8165FC78 predictlang::Base vtable extent 40 -> 36: compiler table is the two header words plus seven real virtual slots (36 bytes); all seven target relocations agree, and trailing four bytes are zero alignment; the next table remains 0x8165FCA0.
- 0x81698D20 lbl_81698D20 -> defaultEventObserver__9textinput, same 4-byte extent: constructor loads this singleton when observer is NULL, and static init stores the allocated EventObserver pointer through the same target address; source loads/stores defaultEventObserver__9textinput.
The extent-only trial passed with no regression but .data stayed 99.117645% because all eight pooled literals still had anonymous extraction names instead of actual compiler literal symbols. Each verified literal is now named with its actual compiler-owned name; future compiler numbering may change, but objdiff matches compiler-generated literals by bytes/relocations, not the numeric counter.
- 0x8165F8F0 lbl_8165F8F0 -> @8031, same 13 bytes: compiler-pooled literal b'T_title_text'; target references setTitleText__Q29textinput7ManagerFPw .text+0x117A, setTitleText__Q29textinput7ManagerFPw .text+0x1192; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F900 lbl_8165F900 -> @8076, same 27 bytes: compiler-pooled literal b'fs_VK_ascii_keytop_a.brlyt'; target references createPCTypeKeyboard__Q29textinput7ManagerFv .text+0x147E, createPCTypeKeyboard__Q29textinput7ManagerFv .text+0x148E; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F920 lbl_8165F920 -> @8086, same 24 bytes: compiler-pooled literal b'fs_VK_cellPhone_a.brlyt'; target references createCellPhoneTypeKeyboard__Q29textinput7ManagerFv .text+0x15C6, createCellPhoneTypeKeyboard__Q29textinput7ManagerFv .text+0x15D2; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F938 lbl_8165F938 -> @8090, same 22 bytes: compiler-pooled literal b'fs_VK_textBox_a.brlyt'; target references createInputForm__Q29textinput7ManagerFv .text+0x1652, createInputForm__Q29textinput7ManagerFv .text+0x1662; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F950 lbl_8165F950 -> @8115, same 27 bytes: compiler-pooled literal b'fs_VK_predictInput_a.brlyt'; target references createCandidateBox__Q29textinput7ManagerFv .text+0x16F2, createCandidateBox__Q29textinput7ManagerFv .text+0x1702; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F96C lbl_8165F96C -> @8148, same 22 bytes: compiler-pooled literal b'fs_VK_toolbar_a.brlyt'; target references createToolBar__Q29textinput7ManagerFv .text+0x1886, createToolBar__Q29textinput7ManagerFv .text+0x1896; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F988 lbl_8165F988 -> @8156, same 24 bytes: compiler-pooled literal b'fs_prdicSelWidw_a.brlyt'; target references createPredictLanguageDialog__Q29textinput7ManagerFv .text+0x1932, createPredictLanguageDialog__Q29textinput7ManagerFv .text+0x1942; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F9A0 lbl_8165F9A0 -> @8168, same 22 bytes: compiler-pooled literal b'fs_signWindow_a.brlyt'; target references createSignWindow__Q29textinput7ManagerFv .text+0x1A36, createSignWindow__Q29textinput7ManagerFv .text+0x1A42; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
tiKeyboard all-unit quick gate PASS: matched_data 12 -> 2708/2708, every owned non-text section 100%, instruction-exact 62/62 unchanged; zero regressions, correct retail DOL hash. Actual pooled literal identities plus proven vtable extents resolve pairing; extra compiler-emitted weak tables do not prevent the named-symbol route from reaching 100%.
tiInputForm pool identical (20 strings), fetched origin and confirmed owned source unchanged. Symbol pairing corrections, all within its .data split 0x8165C820..0x8165D2D0; every address and section/split total remains unchanged:
- 0x8165C990 jumptable_8165C990 -> @13162, extent 160 -> 160: 40-entry real switch table, all 40 outgoing relocation targets and addends agree with the source compiler table; references ToIndependentClass__Q39textinput9inputform13DeadKeyStreamFw .text+0x4F2 -> data+0x170; ToIndependentClass__Q39textinput9inputform13DeadKeyStreamFw .text+0x4FA -> data+0x170.
- 0x8165CA30 jumptable_8165CA30 -> @13178, extent 40 -> 40: 10-entry real switch table, all 10 outgoing relocation targets and addends agree with the source compiler table; references setLanguage__Q39textinput9inputform4BaseFQ29textinput8Language .text+0xBFA -> data+0x210; setLanguage__Q39textinput9inputform4BaseFQ29textinput8Language .text+0xC02 -> data+0x210.
- 0x8165CA58 jumptable_8165CA58 -> @13457, extent 52 -> 52: 13-entry real switch table, all 13 outgoing relocation targets and addends agree with the source compiler table; references onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x28D2 -> data+0x238; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x28DA -> data+0x238.
- 0x8165CA8C jumptable_8165CA8C -> @13456, extent 192 -> 192: 48-entry real switch table, all 48 outgoing relocation targets and addends agree with the source compiler table; references onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xEB2 -> data+0x26C; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xEBA -> data+0x26C.
- 0x8165CB4C jumptable_8165CB4C -> @13510, extent 148 -> 148: 37-entry real switch table, all 37 outgoing relocation targets and addends agree with the source compiler table; references onHKBCtrlCode__Q39textinput9inputform4BaseFQ29textinput7HVKCodeUl .text+0x65B2 -> data+0x32C; onHKBCtrlCode__Q39textinput9inputform4BaseFQ29textinput7HVKCodeUl .text+0x65BA -> data+0x32C.
- 0x8165CC5C jumptable_8165CC5C -> @14933, extent 28 -> 28: 7-entry real switch table, all 7 outgoing relocation targets and addends agree with the source compiler table; references onAnmEvent__Q39textinput9inputform19NormalButtonAnmPaneFQ49textinput11nw4rmanager7AnmPane12AnmPaneEvent .text+0xC09A -> data+0x43C; onAnmEvent__Q39textinput9inputform19NormalButtonAnmPaneFQ49textinput11nw4rmanager7AnmPane12AnmPaneEvent .text+0xC0A2 -> data+0x43C.
- 0x8165C840 lbl_8165C840 -> csButtonAnimations__Q29textinput9inputform, extent 128 -> 128: two ButtonAnimations structs (64 bytes each), exact bytes and 18 outgoing relocations to pane names and animation-file objects; references __sinit_\tiInputForm_cpp .text+0xC50A -> data+0x20; __sinit_\tiInputForm_cpp .text+0xC512 -> data+0x20.
- 0x8165C970 lbl_8165C970 -> @6599, extent 32 -> 32: compiler-owned constant b'\x00\xa4\x00\xac\x00\xaf\x00\xb2\x00\xb3\x00\xb6\x00\xb8\x00\xb9\x00\xbc\x00\xbd\x00\xbe\x00\xd0\x00\xde\x00\xf0\x00\xfe\x00\x00', exact 32 bytes; references onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xFF2 -> data+0x150; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xFFA -> data+0x150; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x1436 -> data+0x150; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x143E -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x965A -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x9662 -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x97C2 -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x97CA -> data+0x150.
- 0x8165CBE0 lbl_8165CBE0 -> @13512, extent 52 -> 13: compiler-owned constant b'T_2l_TextBox\x00', exact 13 bytes; references __ct__Q39textinput9inputform12LayoutByNW4RFPQ29textinput7ManagerPQ34nw4r3lyt24MultiArcResourceAccessorPCcPQ29textinput13EventObserverPCc .text+0x9A3E -> data+0x3C0; __ct__Q39textinput9inputform12LayoutByNW4RFPQ29textinput7ManagerPQ34nw4r3lyt24MultiArcResourceAccessorPCcPQ29textinput13EventObserverPCc .text+0x9A56 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9BA -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9BE -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9C2 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9CA -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9E2 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAA26 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAA2A -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB1A -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB1E -> data+0x3C0.
- 0x8165CBF0 recover @13580, 34 bytes previously absorbed into lbl_8165CBE0: separate compiler literal b'RevoIpl_RodinNTLGProM_32_I4.brfnt\x00'; references none in this unit.
- 0x8165CC14 lbl_8165CC14 -> @13639, extent 14 -> 14: compiler-owned constant b'P_txtScrll_UP\x00', exact 14 bytes; references init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA22A -> data+0x3F4; init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA236 -> data+0x3F4.
- 0x8165CC28 lbl_8165CC28 -> @13640, extent 36 -> 16: compiler-owned constant b'P_txtScrll_DOWN\x00', exact 16 bytes; references init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA25A -> data+0x408; init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA266 -> data+0x408.
- 0x8165CC38 recover @13654, 17 bytes previously absorbed into lbl_8165CC28: separate compiler literal b'N_separateBarAll\x00'; references none in this unit.
- 0x8165CC4C lbl_8165CC4C -> @13724, extent 13 -> 13: compiler-owned constant b'T_title_text\x00', exact 13 bytes; references setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB6E -> data+0x42C; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB7A -> data+0x42C; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB96 -> data+0x42C.
- 0x8165D0D8 __vt__Q39textinput9inputform10EditBuffer -> __vt__Q39textinput9inputform10EditBuffer, extent 16 -> 12: real compiler vtable is 12 bytes, 1 method/thunk relocation slots; target trailing 4 bytes are zero and contain no relocation; references __dt__Q39textinput9inputform10EditBufferFv .text+0x2A -> data+0x8B8; __dt__Q39textinput9inputform10EditBufferFv .text+0x2E -> data+0x8B8.
- 0x8165D228 __vt__Q29textinput4Base -> __vt__Q29textinput4Base, extent 48 -> 20: real compiler vtable is 20 bytes, 3 method/thunk relocation slots; target trailing 28 bytes are zero and contain no relocation; references none in this unit.
- 0x8165D27C lbl_8165D258 -> @STRING@onOutOfLength__Q29textinput13EventObserverFv, extent 13 -> 13: function-generated string b'OutOfLength\n', actual literal extent 13, target final 0 bytes zero alignment; references none in this unit.
- 0x8165D28C @STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl -> @STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl, extent 68 -> 65: function-generated string b'Error#004\nAn error has occurred.\nThe system files are corrupted.', actual literal extent 65, target final 3 bytes zero alignment; references none in this unit.
Initial tiInputForm name-pairing trial reached data 3772/3772 but the gate rejected its DOL hash. Isolated the cause to making the duplicate OutOfLength literal globally visible under the inline function-generated name: iplSystem already owns a global literal under that exact name at 0x81634699. Restoring only the old literal name restored the retail hash, proving the other changes preserve it. The source inline literal is translation-unit compiler-owned data; extract this duplicate as scope:local with its actual source symbol name to preserve the existing global literal's binding. All 43U object symbol tables were checked: no other unit refers to the old lbl_8165D258 symbol. No address/extent/content changes; no real function or public API scope changed.
Neighbour-literal relocation/type proofs strengthened by target disassembly: LayoutByNW4R::create establishes r30 from the .data base relocation, then instruction .text+0x9D6C passes r30+0x3D0 to the resource accessor to load RevoIpl_RodinNTLGProM_32_I4.brfnt; this independently proves the 34-byte literal at 0x8165CBF0 rather than relying on byte similarity alone. LayoutByNW4R::calc at .text+0xA6BC passes the .data base+0x418 to its virtual setVisible for N_separateBarAll, proving the distinct 17-byte object at 0x8165CC38. Both remain ordinary compiler-pooled source literals.
tiInputForm corrected local-string trial passes the all-unit quick gate: every non-text section 100%, matched_data 1036 -> 3772/3772, instruction-exact 216/221 unchanged, no regressions, correct retail DOL hash. All extra weak tables remain genuine compiler output and require no suppression.
MyTiManager: fetched origin, owned source unchanged; pool identical (7 strings). Recover each compiler literal identity, preserving all extents:
- 0x81667E38 lbl_81667E38 -> @8346, same 25 bytes: compiler literal b'WiiBitmapFontType2.brfnt\x00'; relocation loads createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9BA, createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9CE, createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAE2, createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAF6, __sinit_\MyTiManager_cpp .text+0x4E22, __sinit_\MyTiManager_cpp .text+0x4E26.
- 0x81667E58 lbl_81667E58 -> @8347, same 16 bytes: compiler literal b'my_Memo_a.brlyt\x00'; relocation loads createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9BE, createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9D2.
- 0x81667E68 lbl_81667E68 -> @8369, same 17 bytes: compiler literal b'my_LetterL.brlyt\x00'; relocation loads createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAE6, createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAFA.
- 0x81667E7C lbl_81667E7C -> @8385, same 22 bytes: compiler literal b'fs_VK_textBox_a.brlyt\x00'; relocation loads createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC22, createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC36.
- 0x81667E94 lbl_81667E94 -> @8386, same 25 bytes: compiler literal b'WiiBitmapFontType1.brfnt\x00'; relocation loads createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC26, createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC3A, createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC82, createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC96.
- 0x81667EB0 lbl_81667EB0 -> @8402, same 22 bytes: compiler literal b'fs_VK_textBox_b.brlyt\x00'; relocation loads createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC7E, createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC92.
- 0x81667EC8 lbl_81667EC8 -> @8410, same 17 bytes: compiler literal b'fs_VK_bg_a.brlyt\x00'; relocation loads createBG__Q49textinput6extend4memo7ManagerFv .text+0xCF2, createBG__Q49textinput6extend4memo7ManagerFv .text+0xCFA.
MyTiManager literal identities pass the all-unit quick gate with no regressions and preserved DOL hash. All seven genuine pooled literal objects now pair by compiler identity, while every retained vtable has the real exact method slots. Unit matched_data remains 148/1132 because the target-only lbl_816681E8 object is still unpaired. It is 40 zero bytes at 0x816681E8..0x81668210, after the 320-byte Manager vtable; source .data ends at offset 0x3B0. No incoming relocation in any original 43U object and no outgoing relocation prove a real type or name for those bytes. No source object was fabricated, no hidden flag added, no zero-size annotation or symbol deletion used to force the score. Remaining extent/ownership is explicitly uncertain. This commit improves real symbol pairing, not the unit's aggregate data measure.
Advisory literal_reference_diff.py over all three units, --all-functions: 35 arguments checked in 373 analyzed functions, no candidates/errors; LayoutByNW4R::create skipped because source/target function sizes differ. This is additional literal evidence, not proof for the unknown zero tail.
## Continuation final verification
Final full gate ran without --quick and rebuilt from a clean 43U build. tiInputForm data 1036 -> 3772/3772 and tiKeyboard 12 -> 2708/2708 now reach the entire data goal; MyTiManager remains 148/1132, with .data 97.92531% and only the unpaired 40-byte tail requiring ownership/type evidence. No code bodies were changed in this continuation. Instruction-exact counts remain 216/221, 62/62 and 91/91; code bytes remain 46980/50656, 8368/8368 and 20196/20196. Checked every changed symbols.txt annotation: all 70 removed/added lines belong to the three assigned split ranges. All section totals stay unchanged.
Open-function completeness audit: calcCursorPos, LayoutByNW4R::create and LayoutByNW4R::setLanguage each have the three distinct source-level attempts recorded earlier in this same log; all were restored and remain open only for code work. Every function in tiKeyboard and MyTiManager is already exact. The two additional objdiff-100% tiInputForm functions excluded from instruction-exact counts are unchanged, preserving the baseline definition.
Tool-source evidence for the pairing method: the installed objdiff-cli is v3.4.5. Its official [find_symbol implementation](https://github.com/encounter/objdiff/blob/v3.4.5/objdiff-core/src/diff/mod.rs#L690) pairs compiler-generated literal/table symbols by exact bytes and relocations, independent of their numeric counters. [diff_generic_section](https://github.com/encounter/objdiff/blob/v3.4.5/objdiff-core/src/diff/data.rs#L511) requires every target-owned symbol to pair at 100%; extra source weak symbols do not prevent this route. The seven now-paired MyTiManager literals and every genuine retained vtable are exact, but the unknown target-owned 40-byte object is still unpaired; it was left intact.
Accepted commits: a6c8a274 (tiKeyboard data 100%), 4ba13948 (tiInputForm data 100%), 78403153 (MyTiManager's seven compiler literal identities, without an aggregate gain).
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiInputForm] pool: IDENTICAL
[src/keyboard/tiInputForm] objdiff: code 46980/50656 data 3772/3772 functions 218/221 fuzzy 99.5781 linked code 0
[src/keyboard/tiInputForm] instruction-exact functions: 216/221
[src/keyboard/tiInputForm] section .bss size 96 match 100.0
[src/keyboard/tiInputForm] section .ctors size 4 match 100.0
[src/keyboard/tiInputForm] section .data size 2736 match 100.0
[src/keyboard/tiInputForm] section .rodata size 760 match 100.0
[src/keyboard/tiInputForm] section .sbss size 32 match 100.0
[src/keyboard/tiInputForm] section .sdata size 40 match 100.0
[src/keyboard/tiInputForm] section .sdata2 size 104 match 100.0
[src/keyboard/tiInputForm] section .text size 50656 match 99.578094
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 91.622696
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 95.02809
[src/keyboard/tiInputForm] below 100: setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language 96.44726
[src/keyboard/tiInputForm] baseline: code 46980/50656 data 1036 functions 218 fuzzy 99.5781
[src/keyboard/tiKeyboard] pool: IDENTICAL
[src/keyboard/tiKeyboard] objdiff: code 8368/8368 data 2708/2708 functions 62/62 fuzzy 100.0000 linked code 8368
[src/keyboard/tiKeyboard] instruction-exact functions: 62/62
[src/keyboard/tiKeyboard] section .ctors size 4 match 100.0
[src/keyboard/tiKeyboard] section .data size 2696 match 100.0
[src/keyboard/tiKeyboard] section .sbss size 8 match 100.0
[src/keyboard/tiKeyboard] section .text size 8368 match 100.0
[src/keyboard/tiKeyboard] baseline: code 8368/8368 data 12 functions 62 fuzzy 100.0000
[src/keyboard/MyTiManager] pool: IDENTICAL
[src/keyboard/MyTiManager] objdiff: code 20196/20196 data 148/1132 functions 91/91 fuzzy 100.0000 linked code 0
[src/keyboard/MyTiManager] instruction-exact functions: 91/91
[src/keyboard/MyTiManager] section .bss size 72 match 100.0
[src/keyboard/MyTiManager] section .ctors size 4 match 100.0
[src/keyboard/MyTiManager] section .data size 984 match 97.92531
[src/keyboard/MyTiManager] section .sbss size 16 match 100.0
[src/keyboard/MyTiManager] section .sdata size 24 match 100.0
[src/keyboard/MyTiManager] section .sdata2 size 32 match 100.0
[src/keyboard/MyTiManager] section .text size 20196 match 100.0
[src/keyboard/MyTiManager] baseline: code 20196/20196 data 148 functions 91 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 88.70241 -> 88.70241
global fuzzy_match_percent: 99.47499 -> 99.47499
global complete_code_percent: 63.21193 -> 63.54459
global matched_data_percent: 98.77142 -> 99.06781
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: no baseline for merge-base 6ebe56bc; compared against nearest snapshotted ancestor 69c235ff (1 commits back)
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
GATE PASS
```

View File

@@ -0,0 +1,195 @@
# fz10 attempts
Baseline HEAD 0978b074. Origin fetched before investigation. Work confined to five assigned units, their proven data symbols, and this log.
## src/keyboard/MyTiManager
POOL IDENTICAL up to 7 (mine=7 base=7)
## libs/RVLMiddleware/eZiText/src/clib/zi8dawg
POOL IDENTICAL up to 0 (mine=0 base=0)
## src/iplwww/www_wiisetting
POOL IDENTICAL up to 72 (mine=72 base=72)
## libs/RVLMiddleware/eZiText/src/clib/zi8getc2
POOL IDENTICAL up to 0 (mine=0 base=0)
## libs/RVL_SDK/src/vi/vi
POOL IDENTICAL up to 7 (mine=7 base=7)
Zi8GetDataSignature | destination local alias | 70/69 instructions, structural/exact differences (4, 64)
Zi8GetDataSignature | separate table selector and length | 69/69 instructions, structural/exact differences (0, 13)
Zi8GetDataSignature | delay pointer declaration to table query | BUILD FAILED ZiText/src/clib/zi8getc2.c -o build/43U/src/libs/RVLMiddleware/eZiText/src/clib && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zi8getc2.d build/43U/src/libs/RVLMiddleware/eZiText/src/clib/zi8getc2.d
### mwcceppc.exe Compiler:
# File: libs\RVLMiddleware\eZiText\src\clib\zi8getc2.c
# -------------------------------------------------------
# 77: ziU8* signature = (ziU8*)Zi8GetTableAddress(language, (ziU8)length, work);
# Error: ^^^^
# (10141) expression syntax error
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
Zi8GetDataSignature | table address in loop block | 69/69 instructions, structural/exact differences (0, 9)
Zi8IsDupWChar | character local copy | 64/63 instructions, structural/exact differences (8, 61)
Zi8IsDupWChar | duplicate initialized declaration | 63/63 instructions, structural/exact differences (0, 8)
Zi8IsDupWChar | buffer declared with initializer | 63/63 instructions, structural/exact differences (2, 9)
Zi8IsDupWChar | loop conditional flag instead of break | 65/63 instructions, structural/exact differences (8, 42)
Zi8MatchROMdata1 | group cursor separate from input index | 129/128 instructions, structural/exact differences (11, 122)
Zi8MatchROMdata1 | declare table address at lookup | 131/128 instructions, structural/exact differences (13, 129)
Zi8MatchROMdata1 | result initialized at declaration | 128/128 instructions, structural/exact differences (0, 5)
Zi8MatchROMdata1 | while group traversal with bottom decrement | 128/128 instructions, structural/exact differences (0, 5)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | security buffer pointer after loop index | 609/609 instructions, structural/exact differences (0, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | country index declared before keyboard language | 609/609 instructions, structural/exact differences (0, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | one getter loop index for both cases | 609/609 instructions, structural/exact differences (0, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | security for body performs append | 609/609 instructions, structural/exact differences (0, 14)
__VIRetraceHandler | position horizontal declared first | 516/516 instructions, structural/exact differences (0, 11)
__VIRetraceHandler | position vertical declared first | 516/516 instructions, structural/exact differences (0, 11)
__VIRetraceHandler | position stable sample for loop | 516/516 instructions, structural/exact differences (0, 11)
VIInit | init declaration order bootrom before display config | 338/338 instructions, structural/exact differences (0, 14)
VIInit | init local value before display config | 338/338 instructions, structural/exact differences (0, 14)
VIInit | init timing extent named | 338/338 instructions, structural/exact differences (0, 14)
VIInit | init tv conditional explicit branch | 338/338 instructions, structural/exact differences (0, 14)
Zi8GetDataSignature | signature pointer as lookup state | 73/69 instructions, structural/exact differences (14, 72)
Zi8GetDataSignature | capacity copied after lookup pointer | 70/69 instructions, structural/exact differences (2, 63)
Zi8GetDataSignature | separate address and typed pointer | 69/69 instructions, structural/exact differences (0, 9)
Zi8IsDupWChar | duplicate and character grouped state | 73/63 instructions, structural/exact differences (22, 70)
Zi8IsDupWChar | buffer before duplicate initialization | 63/63 instructions, structural/exact differences (2, 9)
Zi8IsDupWChar | counted backward for loop | 63/63 instructions, structural/exact differences (0, 8)
__VIRetraceHandler | position quotient before vertical factor | 516/516 instructions, structural/exact differences (0, 11)
__VIRetraceHandler | position explicit horizontal quotient local | 516/516 instructions, structural/exact differences (0, 11)
__VIRetraceHandler | position counts decremented before halfline | 516/516 instructions, structural/exact differences (0, 11)
Zi8IsDupWChar | duplicate flag int | 63/63 instructions, structural/exact differences (1, 8)
Zi8IsDupWChar | duplicate flag unsigned int | 63/63 instructions, structural/exact differences (1, 8)
Zi8IsDupWChar | duplicate flag ziS16 | 63/63 instructions, structural/exact differences (1, 8)
Zi8IsDupWChar | duplicate flag ziU16 | 63/63 instructions, structural/exact differences (1, 8)
Zi8MatchROMdata1 | group index ziU8 | 130/128 instructions, structural/exact differences (7, 84)
Zi8MatchROMdata1 | group index ziU16 | 130/128 instructions, structural/exact differences (7, 84)
Zi8MatchROMdata1 | group index ziS32 | 128/128 instructions, structural/exact differences (0, 5)
__VIRetraceHandler | halfline vertical factor before quotient | 516/516 instructions, structural/exact differences (2, 9)
__VIRetraceHandler | halfline vertical local first | 516/516 instructions, structural/exact differences (0, 13)
__VIRetraceHandler | halfline vertical-first named result | 516/516 instructions, structural/exact differences (2, 11)
VIInit | adjust active extent named before clipping | 338/338 instructions, structural/exact differences (27, 89)
VIInit | adjust clipping overscan named | 334/338 instructions, structural/exact differences (28, 165)
VIInit | adjust swap fraction coefficient assignments | 338/338 instructions, structural/exact differences (0, 14)
__VIRetraceHandler | halfline declaration order u32 horizontalCount;,u32 verticalCount;,u32 previousVerticalCount; | 516/516 instructions, structural/exact differences (0, 13)
__VIRetraceHandler | halfline declaration order u32 previousVerticalCount;,u32 horizontalCount;,u32 verticalCount; | 516/516 instructions, structural/exact differences (0, 11)
__VIRetraceHandler | halfline declaration order u32 previousVerticalCount;,u32 verticalCount;,u32 horizontalCount; | 516/516 instructions, structural/exact differences (0, 11)
__VIRetraceHandler | halfline declaration order u32 verticalCount;,u32 horizontalCount;,u32 previousVerticalCount; | 516/516 instructions, structural/exact differences (0, 13)
__VIRetraceHandler | halfline declaration order u32 verticalCount;,u32 previousVerticalCount;,u32 horizontalCount; | 516/516 instructions, structural/exact differences (0, 13)
__VIRetraceHandler | vertical-first halfline order u32 horizontalCount;,u32 previousVerticalCount;,u32 verticalCount; | 516/516 instructions, structural/exact differences (2, 9)
__VIRetraceHandler | vertical-first halfline order u32 horizontalCount;,u32 verticalCount;,u32 previousVerticalCount; | 516/516 instructions, structural/exact differences (2, 11)
__VIRetraceHandler | vertical-first halfline order u32 previousVerticalCount;,u32 horizontalCount;,u32 verticalCount; | 516/516 instructions, structural/exact differences (2, 11)
__VIRetraceHandler | vertical-first halfline order u32 previousVerticalCount;,u32 verticalCount;,u32 horizontalCount; | 516/516 instructions, structural/exact differences (0, 8)
__VIRetraceHandler | vertical-first halfline order u32 verticalCount;,u32 horizontalCount;,u32 previousVerticalCount; | 516/516 instructions, structural/exact differences (2, 9)
__VIRetraceHandler | vertical-first halfline order u32 verticalCount;,u32 previousVerticalCount;,u32 horizontalCount; | 516/516 instructions, structural/exact differences (0, 0)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | country loop reuse property index | 609/609 instructions, structural/exact differences (0, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | security index unsigned | 609/609 instructions, structural/exact differences (1, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | security pointer function scoped | 609/609 instructions, structural/exact differences (0, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | security use cached key pointer | 609/609 instructions, structural/exact differences (0, 14)
## Structural diagnosis and data audit
Origin was fetched before the function batch; git diff HEAD origin/main for the four code leaves was empty. Initial ctxdiff results: Zi8MatchROMdata1 128/128 instructions, 5 differences, only r26/r27 allocation; Zi8GetDataSignature 69/69, 9 differences, destination/language/signature saved registers; Zi8IsDupWChar 63/63, 8 differences, character/duplicate allocation; Getter_ 609/609, 14 differences, security-buffer/index and country-loop registers; VIInit 338/338, 14 differences in inlined AdjustPosition and the shared zero constant; __VIRetraceHandler 516/516, 11 differences in inlined getCurrentHalfLine. Stack frames, branches, and helper boundaries agree in all six baseline functions. Initial position-callback experiments in retrace changed the wrong inline region and were discarded; target disassembly localized the difference to VISetRegs -> getCurrentFieldEvenOdd -> getCurrentHalfLine.
Declaration searches: zi8dawg leading locals, 2 builds, best 0 structural/5 exact differences; signature leading locals, 2 builds, best 0/9; duplicate leading locals, 6 builds, best 0/8; VIInit leading locals, 36 builds, best 0/14. No changes retained.
MyTiManager data: all 91 functions are already exact. Target .data 984 bytes, compiled .data 944 bytes. Every named vtable has the same offset, size and relocation sequence; Manager is 320 bytes at 0x270, final entries at 0x3a0, 0x3a4, 0x3a8, 0x3ac relocate to createMemoInputForm/createLetterInputForm/createBigTextInputForm/createBG. Target lbl_816681E8 is 40 zero bytes beginning at 0x3b0, without relocations, after that table. No type or incoming relocation proves a real owner, so neither its extent nor the split boundary is changed. Target .sdata positions at 0, 8, 16 correspond to source hidden/appearing/letter VEC2 constants, but .sdata already scores 100 and renaming adds no match. No speculative rename. .bss, .ctors, .sbss, .sdata, .sdata2 already score 100. Other four owned units already have 100 percent data, including exception tables, switch tables and literal pools; no data metadata changes are needed.
Accepted retrace candidate: getCurrentHalfLine declares verticalCount, previousVerticalCount, horizontalCount, and sums the vertical factor before the horizontal quotient. This produces 516/516 instructions, ctxdiff 0. Quick full build/DOL gate passed; vi improves 28 -> 29 instruction-exact functions, code 7880 -> 9944, data stays 1944; zero regressions and zero forbidden/readability findings. Clean full gate pending before commit.
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | country loop reuse byte-property index | 609/609 instructions, structural/exact differences (0, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | dummy security index reuse property index | 609/609 instructions, structural/exact differences (0, 14)
Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue | security buf assigned before strlen | 610/609 instructions, structural/exact differences (30, 379)
Zi8GetDataSignature | signature table selector byte with length unsigned | 66/69 instructions, structural/exact differences (8, 42)
Zi8GetDataSignature | signature pointer scoped to successful branch | 73/69 instructions, structural/exact differences (9, 68)
Zi8GetDataSignature | signature combined pointer length declaration block | 69/69 instructions, structural/exact differences (7, 16)
Zi8IsDupWChar | duplicate buffer append explicit count update | 64/63 instructions, structural/exact differences (4, 31)
Zi8IsDupWChar | duplicate pointer and result together scoped | 63/63 instructions, structural/exact differences (0, 8)
Zi8IsDupWChar | duplicate loop count signed | 63/63 instructions, structural/exact differences (0, 8)
VIInit | adjust fractional field unsigned byte | 338/338 instructions, structural/exact differences (0, 14)
VIInit | adjust fractional field signed halfword | 339/338 instructions, structural/exact differences (7, 160)
VIInit | adjust coefficient signed halfword | 339/338 instructions, structural/exact differences (8, 157)
VIInit | adjust fraction declared before coefficient | 338/338 instructions, structural/exact differences (0, 14)
## Final open-function audit
The first clean full gate over all five leaves passed, with the retail DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d, zero regressions, zero forbidden additions, and zero readability findings. Commit 72f78211 preserves the exact retrace result and the initial attempts record. Later trials retained no additional source changes.
Every remaining function has at least three distinct executed source-level attempts in this log: Zi8MatchROMdata1 7, Zi8GetDataSignature 10, Zi8IsDupWChar 14, Getter_ 11, VIInit 11. The failed C89 mid-block declaration is included in the record but is not needed to meet that minimum. Declaration-order trials and helper-boundary trials are separate from type, expression and control-flow changes. All unsuccessful source variants were restored, and all build products will be recreated by the final clean gate.
Remaining: Zi8MatchROMdata1 99.765625%, 128/128 instructions, 5 saved-register differences; Zi8GetDataSignature 99.347824%, 69/69, 9 saved-register differences; Zi8IsDupWChar 99.36508%, 63/63, 8 character/duplicate register differences; Getter_ 99.86043%, 609/609, 14 security-buffer/country-index register differences; VIInit 99.7929%, 338/338, 14 inline clipping/shared-zero register differences. No fuzzy-only source experiment is retained. MyTiManager's 40-byte relocation-free zero tail remains unproven; no padding, forced object, speculative data label or section boundary change was added.
Final clean full gate: GATE PASS. All five unit pools IDENTICAL. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Zero regressions, forbidden additions and readability findings. Instruction-exact counts MyTiManager 91 -> 91, zi8dawg 5 -> 5, www_wiisetting 20 -> 20, zi8getc2 15 -> 15, vi 28 -> 29. Matched code bytes 20196 -> 20196, 4356 -> 4356, 3740 -> 3740, 6360 -> 6360, 7880 -> 9944; matched data bytes unchanged 148, 120, 3856, 332, 1944 respectively.

View File

@@ -556,3 +556,362 @@ Before -> after instruction-exact functions / objdiff code bytes / matched data
- iplBoard: 93/94 -> 93/94; 19144 -> 19144; 896 -> 896.
- lyt_window: 20/21 -> 20/21; 9848 -> 9848; 268 -> 268.
Final full gate passes, correct DOL SHA1, zero regressions, zero net forbidden patterns and zero readability warnings. NHTTPi_SocSend_sub has 102/102 instructions and ctxdiff diffs0 after the clean build. Remaining compiler allocation/local layout fixes and the lyt_window duplicate-constant emission are unresolved. Only NHTTP_socket_RVL.c and this attempts log differ from round3 baseline; source improvement commit bf69c042.
# Round 4
Baseline 950bb0dda6ba1980970a54d6f575670f4e07aee8; fetch origin/main b84b3c0d; all six owned sources unchanged remotely.
- libs/RevoEX/src/nhttp/NHTTP_socket_RVL: POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/channelSelect/iplChannelObj: POOL IDENTICAL up to 20 (mine=20 base=20)
- src/scene/board/iplBoard: POOL IDENTICAL up to 18 (mine=18 base=18)
- libs/NW4R/src/lyt/lyt_window: POOL IDENTICAL up to 1 (mine=1 base=1)
- libs/RVLMiddleware/eZiText/src/clib/zmtkey: POOL IDENTICAL up to 0 (mine=0 base=0)
- libs/RVLMiddleware/eZiText/src/clib/zconvert: POOL IDENTICAL up to 0 (mine=0 base=0)
- Recv_sub structural diagnosis: 67/67, same0x20 frame/branches, only source-offset load and memcpy argument moves reordered at37..40; last-round temporaries did not help. This round probes operand expression and helper argument boundaries.
- NHTTPi_SocRecv_sub / r4 array subscript address for buffered source: 67/67 instructions; structural 0, positional differences 4
- NHTTPi_SocRecv_sub / r4 copy helper evaluates offset before destination: 67/67 instructions; structural 0, positional differences 4
- NHTTPi_SocRecv_sub / r4 copy helper size-first parameter ordering: 67/67 instructions; structural 0, positional differences 4
- setLangPane diagnosis:195/195; initial structural fixes are four-byte records, eight-byte name capacity and terminating fallback table/first match. Last round narrowed to four pointer-register differences. Reconstruct that candidate to inspect further loop scopes.
- Send diagnosis:43/43,0x10 frame identical; early SSL-id load scheduled after save/copy instead of before. Probe expression branch, const local and helper boundary before register search.
- NHTTPi_SocSend / r4 conditional operator chooses socket writer: 43/43 instructions; structural 2, positional differences 3
- NHTTPi_SocSend / r4 const saved SSL identifier: 43/43 instructions; structural 2, positional differences 3
- NHTTPi_SocSend / r4 inline SSL identifier accessor: 43/43 instructions; structural 2, positional differences 3
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r4 structural candidate with distinct group pointer names: 195/195 instructions; structural 0, positional differences 4
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r4 explicit pane loop scopes: 195/195 instructions; structural 0, positional differences 4
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r4 range group pointer initialized through iterator dereference type: 195/195 instructions; structural 0, positional differences 4
- appendRecord structural diagnosis:283/283, frame0x90 vs0xa0; target three interruption saves spill beside metadata. Prior read-state groups forced spills but slots differ. Probe contiguous metadata state with explicit real type-array initialization and scoped status locals.
- appendRecord__Q33ipl5scene5BoardFP10_CDBRecord / r4 metadata state type bytes explicitly cleared: 283/283 instructions; structural 12, positional differences 8
- appendRecord__Q33ipl5scene5BoardFP10_CDBRecord / r4 reverse loop clearing metadata type bytes: 284/283 instructions; structural 23, positional differences 249
- appendRecord__Q33ipl5scene5BoardFP10_CDBRecord / r4 interrupt states declared at each disabling call: 283/283 instructions; structural 52, positional differences 57
- lyt_window extent proof: scLytFatalColorA at0x81695553 is source extern C const u8 (size1) and GetFrameMaterial loads it with lbz before assembling GXColor RGBA; target recorded size5 includes four trailing section-alignment bytes. Correct size5->1; address and .sdata2 section total remain unchanged, four padding bytes unowned.
- appendRecord__Q33ipl5scene5BoardFP10_CDBRecord / r4 metadata type bytes initialized ascending: 283/283 instructions; structural 0, positional differences 0; EXACT candidate retained
- appendRecord__Q33ipl5scene5BoardFP10_CDBRecord / r4 metadata type chained assignments reversed: 283/283 instructions; structural 0, positional differences 0; EXACT candidate retained
- DrawFrame diagnosis:376/376, frame0xe0 identical; all119 surviving differences are register coloring including static flip table r31/r21 and subsequent temporary allocation. Probe geometry/quad storage boundaries before final declaration search.
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r4 quad texture coordinates passed by first element address: 376/376 instructions; structural 0, positional differences 119
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r4 geometry aggregated into local quad state: 376/376 instructions; structural 23, positional differences 142
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r4 material kept as meaningful local before texture check: 375/376 instructions; structural 8, positional differences 364
- appendRecord exact result: one RecordReadState groups all real metadata and three saved interruption flags; address-taken metadata causes the target stack storage rather than promotion. Target offsets relative to sp: third8,dataSize0xc,second0x10,first0x14,second-of-minute0x18,minute0x1c,hour0x20,gameCode0x24,CDBId0x28,type0x30,Date0x38,key0x48. All fields are consumed by real metadata/restore calls. Clearing the real eight-byte type buffer in ascending byte order reproduces target stores; no padding or dummy objects. Final readable candidate uses separate byte assignments, recordSecond name, 283/283 and ctxdiff diffs0.
### First round4 gate
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/scene/board/iplBoard] pool: IDENTICAL
[src/scene/board/iplBoard] objdiff: code 20276/20276 data 896/896 functions 94/94 fuzzy 100.0000 linked code 0
[src/scene/board/iplBoard] instruction-exact functions: 94/94
[src/scene/board/iplBoard] section .data size 744 match 100.0
[src/scene/board/iplBoard] section .rodata size 104 match 100.0
[src/scene/board/iplBoard] section .sdata size 40 match 100.0
[src/scene/board/iplBoard] section .sdata2 size 8 match 100.0
[src/scene/board/iplBoard] section .text size 20276 match 100.0
[src/scene/board/iplBoard] baseline: code 19144/20276 data 896 functions 93 fuzzy 99.8765
[libs/NW4R/src/lyt/lyt_window] pool: IDENTICAL
[libs/NW4R/src/lyt/lyt_window] objdiff: code 9848/11352 data 268/316 functions 20/21 fuzzy 99.7586 linked code 0
[libs/NW4R/src/lyt/lyt_window] instruction-exact functions: 20/21
[libs/NW4R/src/lyt/lyt_window] section .ctors size 4 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .data size 256 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sbss size 8 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sdata2 size 48 match 70.588234
[libs/NW4R/src/lyt/lyt_window] section .text size 11352 match 99.75864
[libs/NW4R/src/lyt/lyt_window] below 100: DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc 98.17819
[libs/NW4R/src/lyt/lyt_window] baseline: code 9848/11352 data 268 functions 20 fuzzy 99.7586
regressions vs baseline: 0
global matched_code_percent: 88.74257 -> 88.78037
global fuzzy_match_percent: 99.47580 -> 99.47663
global complete_code_percent: 64.69724 -> 64.69724
global matched_data_percent: 98.77142 -> 98.77142
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
GATE PASS
```
- Zi8getKeyLayout diagnosis:182/182, frame/branches/operand order identical; r26/r27 language/count still exchanged. Probe char-count assignment boundary, custom-key copy loop and pointer offset decomposition before declaration search.
- Zi8getKeyLayout / r4 character count assigned before emptiness branch: 182/182 instructions; structural 1, positional differences 17
- Zi8getKeyLayout / r4 custom-key copy as while loop: 182/182 instructions; structural 0, positional differences 16
- Zi8getKeyLayout / r4 separate skip key header and character offset: 182/182 instructions; structural 2, positional differences 20
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r4 const node iterators for visibility loops: 195/195 instructions; structural 0, positional differences 4
- Zi8ConvertUC2Key diagnosis:207/207, frame and branch skeleton identical; work/key r27/r28 exchanged. Probe mapped table addressing and valid-character loop forms before declaration search.
- Zi8ConvertUC2Key / r4 mapped character table explicit subscript address: 207/207 instructions; structural 0, positional differences 18
- Zi8ConvertUC2Key / r4 single-range exit uses explicit braces: 207/207 instructions; structural 0, positional differences 18
- Zi8ConvertUC2Key / r4 character invalid range expressed as negated valid range: 207/207 instructions; structural 0, positional differences 18
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r4 found language exits before fallback block: 195/195 instructions; structural 0, positional differences 4
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r4 explicit language fallback control labels: 195/195 instructions; structural 0, positional differences 4
### Round4 final open-function and data audit
- Recv_sub: three successful source variants, final declaration search two orders best(0,4); restored baseline, scheduling unchanged.
- Send: three successful source variants, final declaration search two orders best(2,3); restored baseline, scheduling unchanged.
- setLangPane: six successful variants after reconstructing last-round structural fix; final leading declaration search23 orders best(0,4); all fuzzy candidates restored. Original stays97.18974%, candidate's only four differences are r28/r30 group pointers. No exact result claimed. calcCursorAnim remains objdiff100; instruction counter's54/56 remains the previously documented conditional-branch normalization artifact.
- DrawFrame: three successful variants; final declaration search52 orders best(0,119); restored baseline. Texture flip/argument coloring remains unresolved.
- Zi8getKeyLayout: three successful variants; declaration search52 orders best(0,16); restored baseline.
- Zi8ConvertUC2Key: three successful variants; correct six-declaration search36 orders best(0,18); restored baseline.
- appendRecord now exact: readable interrupt field names slotInterrupts/waitInterrupts/recordInterrupts preserve283/283 and ctxdiff diffs0. No declaration search needed after resolving the structural stack layout.
- Successful-attempt audit: NHTTPi_SocRecv_sub=3, NHTTPi_SocSend=3, setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object=6, appendRecord__Q33ipl5scene5BoardFP10_CDBRecord=5, DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc=3, Zi8getKeyLayout=3, Zi8ConvertUC2Key=3. All remaining objdiff-open functions have at least three distinct successful source-level attempts this round.
- Data ownership: NHTTP has no data symbols; ChannelObj, Board, zmtkey and zconvert retain100% data, no supported rename/extent correction found. lyt_window .data/vtables are100%; .sdata2 target48 bytes vs source24 reflects16 bytes of duplicated fatal RGBA constants plus trailing alignment. Target unnamed quartets have no distinct real source objects to pair by name, so no renames justified. Four trailing bytes of scLytFatalColorA's old extent were corrected to unowned padding with the relocation/type proof above. Section addresses/totals remain unchanged. No weak vtables suppressed.
- Final advisory literal-reference audit:183 matched functions,86 arguments checked, no candidates/errors/skips. Final formatting cleanup removed a whitespace-only line and wrapped metadata call; ctxdiff remains283/283,diffs0.
## Round4 final full gate over all units
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] pool: IDENTICAL
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] objdiff: code 1700/2140 data None/None functions 8/10 fuzzy 99.5701 linked code 0
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] instruction-exact functions: 8/10
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] section .text size 2140 match 99.57009
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] below 100: NHTTPi_SocRecv_sub 99.55224
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] below 100: NHTTPi_SocSend 95.34884
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] baseline: code 1700/2140 data None functions 8 fuzzy 99.5701
[src/scene/channelSelect/iplChannelObj] pool: IDENTICAL
[src/scene/channelSelect/iplChannelObj] objdiff: code 10144/10924 data 2216/2216 functions 55/56 fuzzy 99.7993 linked code 0
[src/scene/channelSelect/iplChannelObj] instruction-exact functions: 54/56
[src/scene/channelSelect/iplChannelObj] section .data size 1240 match 100.0
[src/scene/channelSelect/iplChannelObj] section .rodata size 784 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata size 120 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata2 size 72 match 100.0
[src/scene/channelSelect/iplChannelObj] section .text size 10924 match 99.79934
[src/scene/channelSelect/iplChannelObj] below 100: setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object 97.18974
[src/scene/channelSelect/iplChannelObj] baseline: code 10144/10924 data 2216 functions 55 fuzzy 99.7993
[src/scene/board/iplBoard] pool: IDENTICAL
[src/scene/board/iplBoard] objdiff: code 20276/20276 data 896/896 functions 94/94 fuzzy 100.0000 linked code 0
[src/scene/board/iplBoard] instruction-exact functions: 94/94
[src/scene/board/iplBoard] section .data size 744 match 100.0
[src/scene/board/iplBoard] section .rodata size 104 match 100.0
[src/scene/board/iplBoard] section .sdata size 40 match 100.0
[src/scene/board/iplBoard] section .sdata2 size 8 match 100.0
[src/scene/board/iplBoard] section .text size 20276 match 100.0
[src/scene/board/iplBoard] baseline: code 19144/20276 data 896 functions 93 fuzzy 99.8765
[libs/NW4R/src/lyt/lyt_window] pool: IDENTICAL
[libs/NW4R/src/lyt/lyt_window] objdiff: code 9848/11352 data 268/316 functions 20/21 fuzzy 99.7586 linked code 0
[libs/NW4R/src/lyt/lyt_window] instruction-exact functions: 20/21
[libs/NW4R/src/lyt/lyt_window] section .ctors size 4 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .data size 256 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sbss size 8 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sdata2 size 48 match 70.588234
[libs/NW4R/src/lyt/lyt_window] section .text size 11352 match 99.75864
[libs/NW4R/src/lyt/lyt_window] below 100: DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc 98.17819
[libs/NW4R/src/lyt/lyt_window] baseline: code 9848/11352 data 268 functions 20 fuzzy 99.7586
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] objdiff: code 1488/2216 data 60/60 functions 3/4 fuzzy 99.8466 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] instruction-exact functions: 3/4
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section .text size 2216 match 99.84657
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section extab size 24 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section extabindex size 36 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] below 100: Zi8getKeyLayout 99.53297
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] baseline: code 1488/2216 data 60 functions 3 fuzzy 99.8466
[libs/RVLMiddleware/eZiText/src/clib/zconvert] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zconvert] objdiff: code 1380/2208 data 112/112 functions 3/4 fuzzy 99.8370 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] instruction-exact functions: 3/4
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section .rodata size 32 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section .text size 2208 match 99.83696
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section extab size 32 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section extabindex size 48 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] below 100: Zi8ConvertUC2Key 99.565216
[libs/RVLMiddleware/eZiText/src/clib/zconvert] baseline: code 1380/2208 data 112 functions 3 fuzzy 99.8370
regressions vs baseline: 0
global matched_code_percent: 88.74257 -> 88.78037
global fuzzy_match_percent: 99.47580 -> 99.47663
global complete_code_percent: 64.69724 -> 64.69724
global matched_data_percent: 98.77142 -> 98.77142
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
GATE PASS
```
Before -> after instruction-exact functions / objdiff matched code bytes / matched data bytes:
- NHTTP_socket_RVL:8/10->8/10 /1700->1700 /no data symbols.
- iplChannelObj:54/56->54/56 raw instruction counter,55/56->55/56 objdiff;10144->10144 /2216->2216. The calcCursorAnim counter discrepancy is unchanged.
- iplBoard:93/94->94/94 /19144->20276 /896->896. All code/data sections100%.
- lyt_window:20/21->20/21 /9848->9848 /268->268; scLytFatalColorA extent5->1, target section size48 unchanged.
- zmtkey:3/4->3/4 /1488->1488 /60->60.
- zconvert:3/4->3/4 /1380->1380 /112->112.
Remaining objdiff-open functions: NHTTPi_SocRecv_sub99.55224% scheduling;NHTTPi_SocSend95.34884% scheduling;setLangPane97.18974% original stack/branch structure (structurally corrected candidate remains four register differences);DrawFrame98.17819% coloring;Zi8getKeyLayout99.53297% language/count coloring;Zi8ConvertUC2Key99.565216% work/key coloring. All at least three successful distinct attempts this round, restored. Unresolved data emission:lyt_window16 duplicated fatal-color bytes; no evidence justifying data symbol renames.
Changed paths:src/scene/board/iplBoard.cpp,config/43U/symbols.txt,tools/decomp-assist/fz2.attempts.md. Source/extent improvement committed f70c5ddc; final descriptive field names and audit are committed separately after final GATE PASS. No untried remaining functions.
# Round 5 HIGH
Baseline 2039813ccf1a57829b76afc10f721440f09eee58; fresh fetch confirms no owned-source change in origin/main.
- libs/RevoEX/src/nhttp/NHTTP_socket_RVL: POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/channelSelect/iplChannelObj: POOL IDENTICAL up to 20 (mine=20 base=20)
- libs/NW4R/src/lyt/lyt_window: POOL IDENTICAL up to 1 (mine=1 base=1)
- libs/RVLMiddleware/eZiText/src/clib/zmtkey: POOL IDENTICAL up to 0 (mine=0 base=0)
- libs/RVLMiddleware/eZiText/src/clib/zconvert: POOL IDENTICAL up to 0 (mine=0 base=0)
- Recv_sub diagnosis:67/67,same0x20 frame/branches, only four scheduling differences around NHTTPi_memcpy. Previous statement and wrapper boundaries exhausted; inspect buffer pointer type and integer width before declaration order.
- NHTTPi_SocRecv_sub / r5 signed character receive buffer pointer: 67/67 instructions; structural 0, positional differences 4
- NHTTPi_SocRecv_sub / r5 copy arguments expressed as byte pointers and unsigned size: 67/67 instructions; structural 0, positional differences 4
- NHTTPi_SocRecv_sub / r5 buffer offset converted to signed byte displacement: 67/67 instructions; structural 0, positional differences 4
- Send diagnosis:43/43,same0x10 frame; target SSL field load occurs before r31 save, ours after. Explore field-address/const-view/structured transfer state before allocation search.
- NHTTPi_SocSend / r5 saved SSL field address: 43/43 instructions; structural 2, positional differences 3
- NHTTPi_SocSend / r5 const request view: 43/43 instructions; structural 2, positional differences 3
- NHTTPi_SocSend / r5 SSL id and result in transfer state: 43/43 instructions; structural 2, positional differences 3
- setLangPane diagnosis:195/195, original array/branch errors fixed by last-round ten four-byte records, eight-byte RSO buffer and first-match/null termination. Corrected candidate differs only group-pointer r28/r30. Probe a meaningful language selection state with different member lifetimes before register search.
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 selection state fields const char* name;,bool found;,nw4r::lyt::Group* group;: 197/195 instructions; structural 9, positional differences 99
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 selection state fields const char* name;,nw4r::lyt::Group* group;,bool found;: 197/195 instructions; structural 9, positional differences 99
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 selection state fields bool found;,const char* name;,nw4r::lyt::Group* group;: 197/195 instructions; structural 9, positional differences 99
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 selection state fields bool found;,nw4r::lyt::Group* group;,const char* name;: 197/195 instructions; structural 9, positional differences 99
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 selection state fields nw4r::lyt::Group* group;,const char* name;,bool found;: 195/195 instructions; structural 0, positional differences 31
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 selection state fields nw4r::lyt::Group* group;,bool found;,const char* name;: 195/195 instructions; structural 0, positional differences 31
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 group and numeric language state: 195/195 instructions; structural 0, positional differences 4
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 group and language name state: 195/195 instructions; structural 0, positional differences 28
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 group and found flag state: 195/195 instructions; structural 0, positional differences 31
- DrawFrame diagnosis:376/376,same0xe0 frame,float schedule and branch skeleton; flip-table pointer consumes r31 in ours and r21 in target, shifting saved arguments. Explore texture helper formal-parameter/declaration boundaries before register-only order search.
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 texture size copy before flip info: 376/376 instructions; structural 0, positional differences 119
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 groups use scalar name lookup before visibility branch: 195/195 instructions; structural 2, positional differences 6
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 group pointer recovered from reference expression: 195/195 instructions; structural 0, positional differences 4
- setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object / r5 explicit bool for fallback string comparison: 195/195 instructions; structural 0, positional differences 4
- Zi8getKeyLayout diagnosis:182/182,same stack,temporaries,branches and operands; language/tableCount exchanged between r26/r27. Explore read-only parameter qualifiers and a coherent table-read state; actual unit -O flags verified.
- Zi8getKeyLayout / r5 read-only language parameter: 182/182 instructions; structural 0, positional differences 16
- Zi8getKeyLayout / r5 read-only work pointer parameter: 182/182 instructions; structural 0, positional differences 16
- Zi8getKeyLayout / r5 table count and data address in read state: 190/182 instructions; structural 34, positional differences 156
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 texture helper flip second formal argument: 376/376 instructions; structural 0, positional differences 119
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 texture helper flip first formal argument: 376/376 instructions; structural 0, positional differences 119
- Zi8ConvertUC2Key diagnosis:207/207,same frame/control flow; work pointer and key swapped between r27/r28. Probe qualified parameters, semantic return-key type and an explicit work-context local before declaration search.
- Zi8ConvertUC2Key / r5 read-only language and work parameters: 207/207 instructions; structural 0, positional differences 18
- Zi8ConvertUC2Key / r5 key uses return-character typedef: 207/207 instructions; structural 0, positional differences 18
- Zi8ConvertUC2Key / r5 explicit work-context local for conversion calls: 213/207 instructions; structural 26, positional differences 206
- NHTTPi_SocRecv_sub / r5 buffer source derived directly from connection field: 68/67 instructions; structural 5, positional differences 35
- NHTTPi_SocRecv_sub / r5 clamp copy length through conditional expression: 67/67 instructions; structural 0, positional differences 0; EXACT candidate retained
- NHTTPi_SocRecv_sub / r5 received count assigned while selecting copy size: 67/67 instructions; structural 2, positional differences 28
- NHTTPi_SocRecv_sub / r5 receive buffer pointer const-qualified: 67/67 instructions; structural 0, positional differences 4
- Recv_sub exact: replacing the imperative clamp with a conditional assignment preserves67/67 and all branches, while changing expression scheduling to the target load/move order. No pointer alias, padding, assembly or qualifiers retained. Quick gate reports9/10, no regressions/forbidden/readability findings.
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] pool: IDENTICAL
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] objdiff: code 1968/2140 data None/None functions 9/10 fuzzy 99.6262 linked code 0
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] instruction-exact functions: 9/10
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] section .text size 2140 match 99.62617
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] below 100: NHTTPi_SocSend 95.34884
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] baseline: code 1700/2140 data None functions 8 fuzzy 99.5701
regressions vs baseline: 0
global matched_code_percent: 88.92459 -> 88.93354
global fuzzy_match_percent: 99.48913 -> 99.48917
global complete_code_percent: 65.19670 -> 65.19670
global matched_data_percent: 99.06781 -> 99.06781
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
- NHTTPi_SocSend / r5 post-call request alias saved after SSL id load: 43/43 instructions; structural 2, positional differences 3
- NHTTPi_SocSend / r5 post-call errors classified with switch: 45/43 instructions; structural 10, positional differences 23
- NHTTPi_SocSend / r5 SSL retry errors expressed as bounded range: 44/43 instructions; structural 8, positional differences 22
- NHTTPi_SocSend / r5 error classifier inline helper boundary: 43/43 instructions; structural 2, positional differences 3
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 ordinary SDK fatal-color initializer emission: 376/376 instructions; structural 0, positional differences 119
- Data emission diagnostic: standard SDK assertion emits .sdata2 44 bytes: ffffff00ffffff00ffffff00ffffff00ffffff000000000043300000000000004330000080000000ffffff00; temporary object retained only in /tmp, original source restored.
- lyt_window emission proof: target GetVtxColorElement,SetVtxColorElement,DrawFrame4/8,GetVtxColor,SetVtxColor load five distinct literal RGBA quartets at.sdata2 offsets0,4,8,12,16; GetFrameMaterial loads named scLytFatalColorR/G/B/A at40..43. Ordinary SDK GXColor literal initializers reproduce the five anonymous quartets; named channels remain used by GetFrameMaterial and their definitions follow that use, reproducing offset40. The original global-assert body is preserved; no volatile cast added and none of its original cast lines changed. No new named objects, labels, padding or metadata changes. All first44 data bytes now equal target; target's four trailing unowned alignment bytes remain unowned (extent fixed last round). Source section44 vs target48 remains natural compiler/extraction alignment, objdiff now316/316 data.
- Standard SDK assertion alone reproduces all anonymous data and20 instruction-exact functions, but removes target's named-channel relocation identities. A named-channel initializer without the existing assert body folds into immediates and regresses GetFrameMaterial. Retained variant uses literal asserts for ordinary getters/helpers and the existing global assert only for GetFrameMaterial, as target relocations prove. Code/data names remain consistent and gate has zero regressions.
### lyt_window data gate
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/NW4R/src/lyt/lyt_window] pool: IDENTICAL
[libs/NW4R/src/lyt/lyt_window] objdiff: code 9848/11352 data 316/316 functions 20/21 fuzzy 99.7586 linked code 0
[libs/NW4R/src/lyt/lyt_window] instruction-exact functions: 20/21
[libs/NW4R/src/lyt/lyt_window] section .ctors size 4 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .data size 256 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sbss size 8 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sdata2 size 48 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .text size 11352 match 99.75864
[libs/NW4R/src/lyt/lyt_window] below 100: DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc 98.17819
[libs/NW4R/src/lyt/lyt_window] baseline: code 9848/11352 data 268 functions 20 fuzzy 99.7586
regressions vs baseline: 0
global matched_code_percent: 88.92459 -> 88.93354
global fuzzy_match_percent: 99.48913 -> 99.48917
global complete_code_percent: 65.19670 -> 65.19670
global matched_data_percent: 99.06781 -> 99.07044
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 vertex-color setup flag type bool: 376/376 instructions; structural 0, positional differences 119
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 vertex-color setup flag type const u8: 379/376 instructions; structural 5, positional differences 356
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 vertex-color setup flag type const u32: 379/376 instructions; structural 4, positional differences 357
- NHTTPi_SocSend / r5 socket first SSL writer else branch: 43/43 instructions; structural 6, positional differences 11
- NHTTPi_SocSend / r5 negative error returned by conditional expression: 52/43 instructions; structural 24, positional differences 36
- NHTTPi_SocSend / r5 SSL enabled flag controls writer selection: 43/43 instructions; structural 2, positional differences 3
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 default color elements explicitly constructed: 376/376 instructions; structural 0, positional differences 119
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 white color elements initialized from packed RGBA: 376/376 instructions; structural 0, positional differences 119
- DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc / r5 white color elements initialized from channels: 384/376 instructions; structural 90, positional differences 383
- Zi8getKeyLayout / r5 semantic local names {'language': 'languageIndex'}: 182/182 instructions; structural 0, positional differences 16
- Zi8getKeyLayout / r5 semantic local names {'tableCount': 'characterTotal'}: 182/182 instructions; structural 0, positional differences 16
- Zi8getKeyLayout / r5 semantic local names {'language': 'languageIndex', 'tableCount': 'characterTotal'}: 182/182 instructions; structural 0, positional differences 16
- Zi8ConvertUC2Key / r5 semantic local names {'language': 'languageIndex'}: 207/207 instructions; structural 0, positional differences 18
- Zi8ConvertUC2Key / r5 semantic local names {'key': 'resultKey'}: 207/207 instructions; structural 0, positional differences 18
- Zi8ConvertUC2Key / r5 semantic local names {'key': 'resultKey', 'entry': 'conversionEntry'}: 207/207 instructions; structural 0, positional differences 18
### HIGH final open-function audit
- NHTTPi_SocRecv_sub now100%,67/67,ctxdiff diffs0; no register search needed after expression-level clamp solved scheduling.
- NHTTPi_SocSend:10 distinct successful source variants this round; error-control flow, typed views, helper boundary, field address and deferred pointer alias fail to move the SSL load. Last declsearch two orders best(2,3), restored.43/43,0x10 frame,three scheduling differences.
- setLangPane:12 successful source variants; coherent selection-state members change colors/temporaries but do not reach target. Last corrected structural candidate declaration search23 orders best(0,4), original source restored; original remains97.18974%, structural candidate has only four group-pointer register differences. calcCursorAnim alreadyobjdiff100 is excluded from open functions; raw instruction-count discrepancy54 vs55 is the known branch normalization artifact.
- DrawFrame:10 successful variants of helper parameters, member declarations, flag types and palette construction; last declsearch52 orders best(0,119), restored preserving accepted data emission.376/376,0xe0 frame,register coloring remains.
- Zi8getKeyLayout:6 successful variants of qualifiers/state/local identifiers; last declsearch52 orders best(0,16), restored.182/182,only language/count coloring.
- Zi8ConvertUC2Key:6 successful variants of qualifiers/key type/work context/local identifiers; last correct six-declaration search36 orders best(0,18), restored.207/207,only work/key coloring.
- All remaining functions have at least three distinct successful attempts. No new symbol renames or extents in this round: all five owned units now have100% data; lyt_window anonymous literal and named-component relocation proof is recorded above. Weak inline/vtable objects left alone; no source suppressions or shared-header edits.
- Final advisory string-reference audit:90 matched functions,57 corresponding literal arguments checked, no candidates/errors/skips. Focused source diff passes whitespace check. No config or header edits in HIGH round.
## HIGH final full gate over all five units
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] pool: IDENTICAL
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] objdiff: code 1968/2140 data None/None functions 9/10 fuzzy 99.6262 linked code 0
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] instruction-exact functions: 9/10
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] section .text size 2140 match 99.62617
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] below 100: NHTTPi_SocSend 95.34884
[libs/RevoEX/src/nhttp/NHTTP_socket_RVL] baseline: code 1700/2140 data None functions 8 fuzzy 99.5701
[src/scene/channelSelect/iplChannelObj] pool: IDENTICAL
[src/scene/channelSelect/iplChannelObj] objdiff: code 10144/10924 data 2216/2216 functions 55/56 fuzzy 99.7993 linked code 0
[src/scene/channelSelect/iplChannelObj] instruction-exact functions: 54/56
[src/scene/channelSelect/iplChannelObj] section .data size 1240 match 100.0
[src/scene/channelSelect/iplChannelObj] section .rodata size 784 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata size 120 match 100.0
[src/scene/channelSelect/iplChannelObj] section .sdata2 size 72 match 100.0
[src/scene/channelSelect/iplChannelObj] section .text size 10924 match 99.79934
[src/scene/channelSelect/iplChannelObj] below 100: setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object 97.18974
[src/scene/channelSelect/iplChannelObj] baseline: code 10144/10924 data 2216 functions 55 fuzzy 99.7993
[libs/NW4R/src/lyt/lyt_window] pool: IDENTICAL
[libs/NW4R/src/lyt/lyt_window] objdiff: code 9848/11352 data 316/316 functions 20/21 fuzzy 99.7586 linked code 0
[libs/NW4R/src/lyt/lyt_window] instruction-exact functions: 20/21
[libs/NW4R/src/lyt/lyt_window] section .ctors size 4 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .data size 256 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sbss size 8 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .sdata2 size 48 match 100.0
[libs/NW4R/src/lyt/lyt_window] section .text size 11352 match 99.75864
[libs/NW4R/src/lyt/lyt_window] below 100: DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc 98.17819
[libs/NW4R/src/lyt/lyt_window] baseline: code 9848/11352 data 268 functions 20 fuzzy 99.7586
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] objdiff: code 1488/2216 data 60/60 functions 3/4 fuzzy 99.8466 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] instruction-exact functions: 3/4
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section .text size 2216 match 99.84657
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section extab size 24 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] section extabindex size 36 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] below 100: Zi8getKeyLayout 99.53297
[libs/RVLMiddleware/eZiText/src/clib/zmtkey] baseline: code 1488/2216 data 60 functions 3 fuzzy 99.8466
[libs/RVLMiddleware/eZiText/src/clib/zconvert] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zconvert] objdiff: code 1380/2208 data 112/112 functions 3/4 fuzzy 99.8370 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] instruction-exact functions: 3/4
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section .rodata size 32 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section .text size 2208 match 99.83696
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section extab size 32 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] section extabindex size 48 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zconvert] below 100: Zi8ConvertUC2Key 99.565216
[libs/RVLMiddleware/eZiText/src/clib/zconvert] baseline: code 1380/2208 data 112 functions 3 fuzzy 99.8370
regressions vs baseline: 0
global matched_code_percent: 88.92459 -> 88.93354
global fuzzy_match_percent: 99.48913 -> 99.48917
global complete_code_percent: 65.19670 -> 65.19670
global matched_data_percent: 99.06781 -> 99.07044
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
Before -> after instruction-exact functions / objdiff matched code bytes / matched data bytes:
- NHTTP_socket_RVL:8/10->9/10 /1700->1968 /no data symbols. Clean rebuild Recv_sub67/67,ctxdiff diffs0.
- iplChannelObj:54/56->54/56 raw instruction counter (55/56->55/56 objdiff) /10144->10144 /2216->2216.
- lyt_window:20/21->20/21 /9848->9848 /268->316. All owned data now100%; first44 literal/named-channel bytes exactly match target, trailing target alignment remains unowned.
- zmtkey:3/4->3/4 /1488->1488 /60->60.
- zconvert:3/4->3/4 /1380->1380 /112->112.
Remaining: NHTTPi_SocSend95.34884%,SSL-load scheduling; setLangPane97.18974%,original structural mismatch with corrected candidate still four pointer-register differences; DrawFrame98.17819%,119 register differences; Zi8getKeyLayout99.53297%,language/count register swap; Zi8ConvertUC2Key99.565216%,work/key register swap. All have at least three distinct successful source attempts logged in HIGH round. None of the fuzzy-only experiments retained. No unsupported symbol-name/type changes, unused objects or shared-header effects.
Changed source paths:libs/RevoEX/src/nhttp/NHTTP_socket_RVL.c (c1b4f01d),libs/NW4R/src/lyt/lyt_window.cpp (218a0d5d),plus tools/decomp-assist/fz2.attempts.md. Both source improvements were committed after their quick GATE PASS; this final full gate independently verifies all five units, zero regressions, correct DOL hash, zero forbidden patterns and zero readability warnings. Remaining compiler coloring/scheduling solutions are unknown.

View File

@@ -599,3 +599,231 @@ src/keyboard/tiSignWindow POOL IDENTICAL up to 30 (mine=30 base=30)
libs/RVL_SDK/src/fa/msc/puh_msc_blk POOL IDENTICAL up to 0 (mine=0 base=0)
libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32 POOL IDENTICAL up to 0 (mine=0 base=0)
Fresh clean FAT ctxdiff155/155 diffs0. Code bytes1544->2164, exactfunctions3->4. Other exact counts unchanged. JPEG fuzzy99.03261->99.10507; declaration/direct-expression improvement remains partial. All owned data100%; no configuration/linking edits. Final full gate PASS, DOL correct, regressions0, forbidden0, readability0. Original JPEG inline-helper/copy layout remains uncertain.
# Round 3
HEAD c6c0b145f823573a643925eacc094af8547ff502 origin/main 5fe0a61af71d078b7b2da949b49a9cf30e81d66f
src/keyboard/tiSignWindow POOL IDENTICAL up to 30 (mine=30 base=30)
libs/RVL_SDK/src/fa/msc/puh_msc_blk POOL IDENTICAL up to 0 (mine=0 base=0)
libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32 POOL IDENTICAL up to 0 (mine=0 base=0)
libs/RVL_SDK/src/fa/pf_entry_iterator POOL IDENTICAL up to 0 (mine=0 base=0)
libs/RevoEX/src/so/SOOption POOL IDENTICAL up to 0 (mine=0 base=0)
src/keyboard/tiString POOL IDENTICAL up to 0 (mine=0 base=0)
libs/RVL_SDK/src/fa/pf_volume POOL IDENTICAL up to 1 (mine=1 base=1)
Round 3 create diagnosis: frame 0x50 and 221 instructions equal; branch forms/helper inlining equal; all 34 differences register allocation, including hoisted vtables and loop state. origin source unchanged.
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | r3 animation pointer temporary | BUILD FAIL i libs/RVLMiddleware/eZiText/include -i libs/RVLMiddleware/TMC_JPEG/include -i libs/RVLFaceLib/include -i libs/EGG/include -i libs/OperaWWW/include -ir libs/RVL_SDK/include/private/bte -i build/43U/include -DBUILD_VERSION=0 -DVERSION_43U -i libs/RVL_SDK/include/private/bte -DNDEBUG=1 -DTARGET_RVL -W nomissingreturn -ipa file -gccinc -fp_contract off -O4,s -enc SJIS -lang=c++ -O4,p -MMD -c src/keyboard/tiSignWindow.cpp -o build/43U/src/src/keyboard && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/keyboard/tiSignWindow.d build/43U/src/src/keyboard/tiSignWindow.d
### mwcceppc.exe Compiler:
# File: src\keyboard\tiSignWindow.cpp
# --------------------------------------
# 252: const Animation* animation = paneInfo.animations[animationIndex];
# Warning: ^^^^^^^^^
# (10349) implicit 'int' is no longer supported in C++
### mwcceppc.exe Compiler:
# 252: const Animation* animation = paneInfo.animations[animationIndex];
# Error: ^
# (10224) 'const' or '&' variable needs initializer
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | r3 move force/count into loop scope | 221/221 instructions; structural/exact differences (0, 61)
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | r3 outer for loop | 221/221 instructions; structural/exact differences (0, 34)
221/221 instructions; structural/exact differences (0, 34)
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator | r3 corrected animation temporary | 219/221 instructions; structural/exact differences (9, 91)
Round 3 pread diagnosis: 129/129 instructions, frame 0x40 identical; 10 register differences transfer_blocks and byte product. No structural/operand-order differences; origin source unchanged.
uhf_msc_blk_pread | r3 conditional transfer selection | 129/129 instructions; structural/exact differences (0, 10)
uhf_msc_blk_pread | r3 byte product scoped to success | 129/129 instructions; structural/exact differences (0, 10)
uhf_msc_blk_pread | r3 count signed temporary | 129/129 instructions; structural/exact differences (0, 10)
Round 3 JPEG diagnosis: frame/instruction counts equal (276), 12 structural differences in returned Huffman aggregate stack slots; remaining coloring differences. origin source unchanged.
TMCJPEGDEC_decode_iquant | r3 shared entry aggregate | 276/276 instructions; structural/exact differences (10, 41)
TMCJPEGDEC_decode_iquant | r3 AC aggregate declared in AC scope | 276/276 instructions; structural/exact differences (12, 46)
TMCJPEGDEC_decode_iquant | r3 reverse returned entry declaration fields loads | 276/276 instructions; structural/exact differences (18, 47)
FindCluster diagnosis: same 0xb0 frame/237 instructions, all 8 differences constant-one vs shifted entries register allocation; no branch or helper boundary differences. origin source unchanged.
PFENT_ITER_FindCluster | initialize shifted entries before iterator fields | 238/237 instructions; structural/exact differences (13, 208)
PFENT_ITER_FindCluster | use iterator start cluster as shift operand | 237/237 instructions; structural/exact differences (0, 8)
PFENT_ITER_FindCluster | sector scalar state | 237/237 instructions; structural/exact differences (0, 11)
Last-register searches: create 6 permutations no change (0,34); pread40 no change (0,10); JPEG35 no change (12,46); FindCluster35 no change (0,8).
GetLFNEntryName diagnosis: 73/73, target loop uses i*13 index strengthened to byte offset; source carries an advancing pointer and independent character index. Target terminator uses reloaded num_entry_LFNs*13. Branch/helper forms equal.
PFENT_ITER_GetLFNEntryName | indexed 13 character fragments and reloaded terminator | 76/73 instructions; structural/exact differences (26, 75)
PFENT_ITER_GetLFNEntryName | typed LFN fragment array indexed by entry | 76/73 instructions; structural/exact differences (26, 75)
PFENT_ITER_GetLFNEntryName | fragment array typedef, loop-local base initialization | 76/73 instructions; structural/exact differences (26, 75)
PFENT_ITER_GetLFNEntryName | explicit byte offset for packed LFN copies; byte-size terminator | 76/73 instructions; structural/exact differences (24, 75)
PFENT_ITER_GetLFNEntryName | packed fragment inline helper boundary | 76/73 instructions; structural/exact differences (24, 75)
SOGetInterfaceOpt diagnosis: 119/119, frame equal, target computes command/reply/length from nested payload bases; source uses direct request bases. Also register assignment/scheduling. origin source unchanged.
SOGetInterfaceOpt | construct all buffer pointers before command assignments | 119/119 instructions; structural/exact differences (5, 16)
SOGetInterfaceOpt | command fields in opposite statement order | 119/119 instructions; structural/exact differences (10, 14)
SOGetInterfaceOpt | returned length after reply assignment | 119/119 instructions; structural/exact differences (5, 16)
SOSetInterfaceOpt diagnosis: 74/74 frame/calls/branches equal; payload pointer derived from command base target, direct request source. Source stores option after reply pointer, target before. origin source unchanged.
SOSetInterfaceOpt | reply pointer before stores | 74/74 instructions; structural/exact differences (4, 14)
SOSetInterfaceOpt | reverse command assignments | 74/74 instructions; structural/exact differences (6, 19)
SOSetInterfaceOpt | request and allocation size scalar state | 74/74 instructions; structural/exact differences (4, 15)
inputChar diagnosis: target136/source125 frame0x30 same; target translate mode3 uses indexed character append with count++ and trailing NUL, source direct scalar stores. Target dead newline comparison suggests converter helper boundary. origin source unchanged.
inputChar__Q39textinput8tistring9DecolatedFw | mode3 indexed append | 125/136 instructions; structural/exact differences (18, 73)
inputChar__Q39textinput8tistring9DecolatedFw | mode3 scan append index | 137/136 instructions; structural/exact differences (17, 74)
inputChar__Q39textinput8tistring9DecolatedFw | mode3 count as conversion state | 125/136 instructions; structural/exact differences (18, 73)
p_rmvvol diagnosis: 64/64 frame0x500 equal; constant target lbz SDA21 vs source folded li0xe5. Target indicates aggregate initialization from small constant template, investigate genuine local byte array.
PFVOL_p_rmvvol | one byte local deleted marker array initializer | 64/64 instructions; structural/exact differences (0, 0)
PFVOL_p_rmvvol | array initialized from existing constant object | BUILD FAIL -maxerrors 1 -nosyspath -RTTI off -fp_contract on -str reuse -DSDK_IPL -D_REVOLUTION -DMEM_MANAGER_DIRECT -i include -i include/global -i libs/MetroTRK/include -i libs/Runtime/include -i libs/MSL/include -i libs/RVL_SDK/include -i libs/RevoEX/include -i libs/NW4R/include -i libs/RVLMiddleware/eZiText/include -i libs/RVLMiddleware/TMC_JPEG/include -i libs/RVLFaceLib/include -i libs/EGG/include -i libs/OperaWWW/include -ir libs/RVL_SDK/include/private/bte -i build/43U/include -DBUILD_VERSION=0 -DVERSION_43U -i libs/RVL_SDK/include/private/bte -DNDEBUG=1 -DTARGET_RVL -ipa file -fp_contract off -lang=c -MMD -c libs/RVL_SDK/src/fa/pf_volume.c -o build/43U/src/libs/RVL_SDK/src/fa && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RVL_SDK/src/fa/pf_volume.d build/43U/src/libs/RVL_SDK/src/fa/pf_volume.d
### mwcceppc.exe Compiler:
# File: libs\RVL_SDK\src\fa\pf_volume.c
# ----------------------------------------
# 588: u8 deleted[1] = {deleted_entry_mark[0]};
# Error: ^
# (10124) illegal constant expression
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
PFVOL_p_rmvvol | single field aggregate initializer | 64/64 instructions; structural/exact differences (0, 0)
p_rmvvol local byte-array yields exact instructions but .sdata2 is1byte versus target8byte padded extent; gate currently fails matched-data regression8. No commit until resolved.
PFVOL_p_rmvvol | read marker helper | 64/64 instructions; structural/exact differences (2, 4)
PFVOL_p_rmvvol | pointer local | 64/64 instructions; structural/exact differences (2, 4)
PFVOL_p_rmvvol | char aggregate through constant pointer | 64/64 instructions; structural/exact differences (2, 4)
attach diagnosis: 174/176 frame0x20 same. clear_mount return value allocation crosses inline boundary; target moves failure result to r0 and materializes success0 before checking. Shared helper must not regress other matched users.
PFVOL_attach | mount helper return variable declared separately | 174/176 instructions; structural/exact differences (10, 39)
PFVOL_attach | scope mount result into aggregate | 174/176 instructions; structural/exact differences (10, 39)
PFVOL_attach | error branch else form | 174/176 instructions; structural/exact differences (10, 39)
PFVOL_attach | success branch first in mount helper | 174/176 instructions; structural/exact differences (19, 39)
setcode diagnosis: 23/23 instructions; aggregate assignment loads all six pointers then stores, target alternates field load/store. Six real function pointer fields should copy individually.
PFVOL_setcode | explicit code conversion callback copies | 23/23 instructions; structural/exact differences (10, 17)
PFVOL_setcode | mutable callback table pointer with field copies | 23/23 instructions; structural/exact differences (0, 0)
setcode exact: mutable code_set pointer preserves potential alias between callback field reads and global field stores.
SOOption register search: size-before-request declarations improve GetInterface16->10 differences and SetInterface14->4; source retained. setcode23/23 exact, volume33->34; quick gate PASS with regressions0/data unchanged. p_rmvvol exact local-array candidate abandoned because data regression; existing source/data restored.
regctx diagnosis: 75/75, frame0x10 same; 15 differences free_context_index vs masked status r5/r8 allocation in unrolled three-context loop. All branch/operand/helper boundaries identical; origin source unchanged except our setcode match.
PFVOL_regctx | status declared at function scope | 75/75 instructions; structural/exact differences (0, 15)
PFVOL_regctx | free and status typed state | 75/75 instructions; structural/exact differences (0, 25)
PFVOL_regctx | status tested through stored full flags | 75/75 instructions; structural/exact differences (0, 14)
SOOption | genuine nested IPC payload layout | 119/119 instructions; structural/exact differences (5, 10); set 74/74 instructions; structural/exact differences (4, 4)
PFVOL_regctx | search state free_context_index,context_index | 75/75 instructions; structural/exact differences (0, 25)
PFVOL_regctx | search state free_context_index,error | 75/75 instructions; structural/exact differences (0, 15)
PFVOL_regctx | search state free_context_index,stat | 75/75 instructions; structural/exact differences (0, 25)
PFVOL_regctx | search state context_index,error | 75/75 instructions; structural/exact differences (0, 20)
PFVOL_regctx | search state context_index,stat | 75/75 instructions; structural/exact differences (0, 16)
PFVOL_regctx | search state error,stat | 75/75 instructions; structural/exact differences (0, 14)
PFVOL_regctx | search state free_context_index,context_index,error | 75/75 instructions; structural/exact differences (0, 25)
PFVOL_regctx | search state free_context_index,context_index,stat | 75/75 instructions; structural/exact differences (0, 25)
PFVOL_regctx | search state free_context_index,error,stat | 75/75 instructions; structural/exact differences (0, 25)
PFVOL_regctx | search state context_index,error,stat | 75/75 instructions; structural/exact differences (0, 16)
PFVOL_regctx | search state free_context_index,context_index,error,stat | 75/75 instructions; structural/exact differences (0, 25)
SOOption | typed 32-byte IPC blocks with sequential payload addressing | 119/119 instructions; structural/exact differences (0, 5); set 74/74 instructions; structural/exact differences (0, 0)
IPC block proof: target command at request+32, length at command+32, value at length+32 (set value at command+32); existing storage already reserves these 32-byte IPC blocks. Typed pointer traversal preserves allocation/layout; SetInterface 74/74 diffs0, Get119/119 structural0/exact5.
PFENT_ITER_GetLFNEntryName | byte fragment state i,index | 76/73 instructions; structural/exact differences (24, 74)
PFENT_ITER_GetLFNEntryName | byte fragment state index,err | 76/73 instructions; structural/exact differences (24, 75)
PFENT_ITER_GetLFNEntryName | byte fragment state i,index,err | 76/73 instructions; structural/exact differences (24, 74)
SOGetInterfaceOpt | option input state level,option | 119/119 instructions; structural/exact differences (0, 5)
SOGetInterfaceOpt | option input state option,level | 119/119 instructions; structural/exact differences (0, 5)
SOGetInterfaceOpt | option input state level,option,length | 119/119 instructions; structural/exact differences (0, 5)
SOGetInterfaceOpt | option input state level,option,value | 119/119 instructions; structural/exact differences (0, 5)
SOGetInterfaceOpt | random permutations 50 | best remains (0, 5)
SOGetInterfaceOpt | random permutations 100 | best remains (0, 5)
SOGetInterfaceOpt | random permutations 150 | best remains (0, 5)
SOGetInterfaceOpt | random permutations 200 | best remains (0, 5)
SOGetInterfaceOpt | random permutations 250 | best remains (0, 5)
SOGetInterfaceOpt | random permutations 300 | best remains (0, 5)
SOGetInterfaceOpt | random permutations 350 | best remains (0, 5)
SOGetInterfaceOpt | random permutations 400 | best remains (0, 5)
PFVOL_attach | ignored mount status return zero | 174/176 instructions; structural/exact differences (10, 39)
PFVOL_attach | mount helper returns void | 174/176 instructions; structural/exact differences (10, 39)
PFVOL_attach | mount check distinct status result | 174/176 instructions; structural/exact differences (10, 39)
Structural frame correction: FindCluster is0xa0, not0xb0; JPEG0x50; GetLFN/GetInterface/SetInterface0x30. Registers and frame statements verified against fresh target disassembly.
SOOption final quick gate PASS, regressions0, forbidden0/readability0, no data. SetInterface exact count2->3/code520->816; GetInterface remains99.78992 with five pure parameter-register differences after400 additional declaration permutations.
Completeness audit: all10 remaining functions have at least3 distinct successful-build source attempts in Round3; no untried open function. All seven owned data sections100%, no symbol/configuration changes. Exact p_rmvvol local-byte-array candidate reverted because7 target alignment bytes caused data regression; initializer/extent uncertain. GetLFN induction shape, inputChar converter helper, attach return helper, JPEG aggregate stack scope remain uncertain.
## Final full clean gate, Round3
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiSignWindow] pool: IDENTICAL
[src/keyboard/tiSignWindow] objdiff: code 6300/7184 data 3468/3468 functions 55/56 fuzzy 99.8914 linked code 0
[src/keyboard/tiSignWindow] instruction-exact functions: 55/56
[src/keyboard/tiSignWindow] section .ctors size 4 match 100.0
[src/keyboard/tiSignWindow] section .data size 2672 match 100.0
[src/keyboard/tiSignWindow] section .rodata size 784 match 100.0
[src/keyboard/tiSignWindow] section .sdata size 8 match 100.0
[src/keyboard/tiSignWindow] section .text size 7184 match 99.891426
[src/keyboard/tiSignWindow] below 100: create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.117645
[src/keyboard/tiSignWindow] baseline: code 6300/7184 data 3468 functions 55 fuzzy 99.8914
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] pool: IDENTICAL
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] objdiff: code 1556/2072 data 424/424 functions 10/11 fuzzy 99.8938 linked code 0
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] instruction-exact functions: 10/11
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] section .bss size 384 match 100.0
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] section .data size 32 match 100.0
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] section .sbss size 8 match 100.0
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] section .text size 2072 match 99.89382
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] below 100: uhf_msc_blk_pread 99.57365
[libs/RVL_SDK/src/fa/msc/puh_msc_blk] baseline: code 1556/2072 data 424 functions 10 fuzzy 99.8938
[libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32] pool: IDENTICAL
[libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32] objdiff: code None/1104 data None/None functions 0/1 fuzzy 99.1051 linked code 0
[libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32] instruction-exact functions: 0/1
[libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32] section .text size 1104 match 99.10507
[libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32] below 100: TMCJPEGDEC_decode_iquant 99.10507
[libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32] baseline: code None/1104 data None functions 0 fuzzy 99.1051
[libs/RVL_SDK/src/fa/pf_entry_iterator] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_entry_iterator] objdiff: code 6640/7880 data 24/24 functions 14/16 fuzzy 99.6264 linked code 0
[libs/RVL_SDK/src/fa/pf_entry_iterator] instruction-exact functions: 14/16
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .sdata size 24 match 100.0
[libs/RVL_SDK/src/fa/pf_entry_iterator] section .text size 7880 match 99.626396
[libs/RVL_SDK/src/fa/pf_entry_iterator] below 100: PFENT_ITER_FindCluster 99.81013
[libs/RVL_SDK/src/fa/pf_entry_iterator] below 100: PFENT_ITER_GetLFNEntryName 90.53425
[libs/RVL_SDK/src/fa/pf_entry_iterator] baseline: code 6640/7880 data 24 functions 14 fuzzy 99.6264
[libs/RevoEX/src/so/SOOption] pool: IDENTICAL
[libs/RevoEX/src/so/SOOption] objdiff: code 816/1292 data None/None functions 3/4 fuzzy 99.9226 linked code 0
[libs/RevoEX/src/so/SOOption] instruction-exact functions: 3/4
[libs/RevoEX/src/so/SOOption] section .text size 1292 match 99.9226
[libs/RevoEX/src/so/SOOption] below 100: SOGetInterfaceOpt 99.78992
[libs/RevoEX/src/so/SOOption] baseline: code 520/1292 data None functions 2 fuzzy 97.5759
[src/keyboard/tiString] pool: IDENTICAL
[src/keyboard/tiString] objdiff: code 4632/5176 data 288/288 functions 41/42 fuzzy 98.9629 linked code 0
[src/keyboard/tiString] instruction-exact functions: 41/42
[src/keyboard/tiString] section .data size 288 match 100.0
[src/keyboard/tiString] section .text size 5176 match 98.962906
[src/keyboard/tiString] below 100: inputChar__Q39textinput8tistring9DecolatedFw 90.132355
[src/keyboard/tiString] baseline: code 4632/5176 data 288 functions 41 fuzzy 98.9629
[libs/RVL_SDK/src/fa/pf_volume] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_volume] objdiff: code 16732/17992 data 210976/210976 functions 34/37 fuzzy 99.8755 linked code 0
[libs/RVL_SDK/src/fa/pf_volume] instruction-exact functions: 34/37
[libs/RVL_SDK/src/fa/pf_volume] section .bss size 210944 match 100.0
[libs/RVL_SDK/src/fa/pf_volume] section .data size 16 match 100.0
[libs/RVL_SDK/src/fa/pf_volume] section .sdata size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_volume] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_volume] section .text size 17992 match 99.8755
[libs/RVL_SDK/src/fa/pf_volume] below 100: PFVOL_p_rmvvol 95.9375
[libs/RVL_SDK/src/fa/pf_volume] below 100: PFVOL_attach 98.72159
[libs/RVL_SDK/src/fa/pf_volume] below 100: PFVOL_regctx 99.0
[libs/RVL_SDK/src/fa/pf_volume] baseline: code 16640/17992 data 210976 functions 33 fuzzy 99.6396
regressions vs baseline: 0
global matched_code_percent: 88.68973 -> 88.70268
global fuzzy_match_percent: 99.47443 -> 99.47685
global complete_code_percent: 63.16065 -> 63.16065
global matched_data_percent: 98.51344 -> 98.51344
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
Instruction exact functions; objdiff matched code bytes; matched data bytes, before -> after:
src/keyboard/tiSignWindow: functions 55/56 -> 55/56; code 6300 -> 6300 / 7184; data 3468 -> 3468 / 3468
libs/RVL_SDK/src/fa/msc/puh_msc_blk: functions 10/11 -> 10/11; code 1556 -> 1556 / 2072; data 424 -> 424 / 424
libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32: functions 0/1 -> 0/1; code 0 -> 0 / 1104; data 0 -> 0 / 0
libs/RVL_SDK/src/fa/pf_entry_iterator: functions 14/16 -> 14/16; code 6640 -> 6640 / 7880; data 24 -> 24 / 24
libs/RevoEX/src/so/SOOption: functions 2/4 -> 3/4; code 520 -> 816 / 1292; data 0 -> 0 / 0
src/keyboard/tiString: functions 41/42 -> 41/42; code 4632 -> 4632 / 5176; data 288 -> 288 / 288
libs/RVL_SDK/src/fa/pf_volume: functions 33/37 -> 34/37; code 16640 -> 16732 / 17992; data 210976 -> 210976 / 210976
Remaining unmatched functions, every one has >=3 distinct Round3 source experiments:
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator: 99.117645%; 34 register-only differences; vtable/loop state coloring
uhf_msc_blk_pread: 99.57365%; 10 register-only count/product differences
TMCJPEGDEC_decode_iquant: 99.10507%; 12 structural stack-slot differences in Huffman aggregate returns, plus register coloring
PFENT_ITER_FindCluster: 99.81013%; 8 register-only shifted-entry vs constant-one differences
PFENT_ITER_GetLFNEntryName: 90.53425%; pointer induction vs target byte-index loop; terminator uses count reload
SOGetInterfaceOpt: 99.78992%; 5 parameter-register coloring differences; structure now exact
inputChar__Q39textinput8tistring9DecolatedFw: 90.132355%; 125/136 instructions; mode3 conversion append/helper boundary unresolved
PFVOL_p_rmvvol: 95.9375%; folded constant vs target byte-template load; exact candidate rejected for data regression
PFVOL_attach: 98.72159%; 174/176 instructions; inline clear_mount return boundary
PFVOL_regctx: 99.0%; 15 register-only status/free-index differences
Changed source files: libs/RevoEX/src/so/SOOption.c and libs/RVL_SDK/src/fa/pf_volume.c; attempts log tools/decomp-assist/fz3.attempts.md. Commits43b95ca5/d4a8860d. No config/symbol edits. Full clean gate PASS; pool identical across7 units; regressions0, forbidden0, readability0, target DOL SHA1 preserved.

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,137 @@
# fz8 attempts
Baseline a4c84cbf537becd2cf9931d2406601a18312d0c5
All owned data already exact; no symbol changes required.
libs/RevoEX/src/net/hmac POOL IDENTICAL up to 3 (mine=3 base=3)
libs/RevoEX/src/so/SOInformation POOL IDENTICAL up to 0 (mine=0 base=0)
libs/NW4R/src/ut/ut_ArchiveFontBase POOL IDENTICAL up to 0 (mine=0 base=0)
src/scene/setting/iplRakuRakuThread POOL IDENTICAL up to 1 (mine=1 base=1)
## NETHMACInit / NETHMACGetDigest
Diagnosis: same 0x60 Init frame; GetDigest target 105 instructions vs 102. Target makes a second context pointer at pad initialization, proving an inline helper boundary. Both loops otherwise have the same unroll and branch structure.
Attempt 1: shared BeginDigest inline helper owns its key buffer and context pointer. GetDigest reaches diffs 0, Init falls from 78 diffs to 2 literal offsets.
Attempt 2: inline WarnInterface parameter emits function-name literal first, fixes pool; leaves two swapped argument setup instructions.
Attempt 3: warning format temporary gives no scheduling change.
Attempt 4: scoped function-name temporary gives no scheduling change.
Attempt 5: use MWCC __FUNCTION__ for diagnostic name. Pool identical, Init 143/143 diffs 0; GetDigest 105/105 diffs 0.
## SOGetHostByName
Diagnosis: frames 0x30 and 80/80 instructions match; remaining initial 17 diffs are registers only. Length and result share a register in target.
Attempt 1: leading declaration search, 70 builds, reduces 17 diffs to 11.
Attempt 2: coalesce length and result source variable, remains 11 diffs.
Attempt 3: scoped request/reply declarations, 28 diffs; restored.
Attempt 4: inline GetHostReply helper isolates request bookkeeping. Passing rm by value adds an early load and saved register, 81/80; pointer parameter restores 80/80.
Attempt 5: declaration search over helper locals, 16 builds, reaches 80/80 diffs 0.
## SOGetAddrInfo
Diagnosis: frame 0x40 matches, 183/185 instructions. Null branches go the opposite direction, name length helpers and evaluation order differ; request/reply registers also swapped.
Attempt 1: null-aware NameSize, NameLength, ServiceSize helpers, 185/185 with 62 diffs.
Attempt 2: explicit null-first if/else and service evaluation first, 185/185 with 28 diffs.
Attempt 3: separate serviceLength/nodeLength before alignment expression, 185/185 with 24 register-only diffs.
Attempt 4: leading declaration search, 118 builds, no improvement at 24 diffs.
Attempt 5: inline GetAddressReply helper isolates allocation bookkeeping; 185/185 with 31 register-only diffs. Helper-local declaration search follows.
Attempt 6, SOGetAddrInfo: helper declaration search, 39 builds, reaches 185/185 diffs 0. Preserves retail service-size behavior using node strlen under service null check.
## RakuRakuThread::start / finish
Diagnosis: start 97/96, finish 135/133 with 0x20/0x30 frames. Target uses one BSS base for allocator, status, queue; ours loads separate addresses. Shared globals have correct names, offsets, extents and 456/456 exact data; no rename justified.
Attempt 1, both functions: define C-linkage objects directly instead of prior extern declarations. No instruction change; restored.
Attempt 2, both functions: explicit zero initialization on those objects. No instruction change; restored.
Attempt 3, both functions: file-local C-linkage objects. No instruction change; restored.
Attempt 4, finish: positive state-range if/else instead of early return. Correct branch direction, but 136/133 and BSS-base/frame differences remain; restored.
Additional start attempt: cache allocator pointer before state check; 98/96 instructions, structural/exact (8, 65); restored.
Additional start attempt: separate created heap local from member assignment; 97/96 instructions, structural/exact (13, 88); restored.
Additional start attempt: declare socket configuration before interrupt and time locals; 97/96 instructions, structural/exact (13, 88); restored.
Additional finish attempt: cache status pointer before state check; 132/133 instructions, structural/exact (19, 75); restored.
Additional finish attempt: explicit two-state comparison rather than range subtraction; 138/133 instructions, structural/exact (38, 133); restored.
Additional finish attempt: equality-bound key loops instead of less-than loops; 135/133 instructions, structural/exact (34, 127); restored.
## Owned data audit
libs/RevoEX/src/net/hmac: baseline matched_data 104 / 104; sections .data 100.0, .sdata 100.0. No unpaired owned data symbol; no rename or extent edit.
libs/RevoEX/src/so/SOInformation: baseline matched_data 0 / 0; sections . No unpaired owned data symbol; no rename or extent edit.
libs/NW4R/src/ut/ut_ArchiveFontBase: baseline matched_data 96 / 96; sections .data 100.0, .sbss2 100.0. No unpaired owned data symbol; no rename or extent edit.
src/scene/setting/iplRakuRakuThread: baseline matched_data 456 / 456; sections .bss 100.0, .data 100.0, .sbss 100.0, .sdata 100.0. No unpaired owned data symbol; no rename or extent edit.
Latest fetched origin/main b84b3c0d579c520be71051ce33d22965cab6965d.
libs/RevoEX/src/net/hmac.c: origin/main source unchanged from initial baseline = True.
libs/RevoEX/src/so/SOInformation.c: origin/main source unchanged from initial baseline = True.
libs/NW4R/src/ut/ut_ArchiveFontBase.cpp: origin/main source unchanged from initial baseline = True.
src/scene/setting/iplRakuRakuThread.cpp: origin/main source unchanged from initial baseline = True.
## ConstructOpAnalyzeGLGR
Diagnosis: 239/239 instructions, same frame and loop/branch forms. Offset calculation scheduling differs at instructions 109-147; later register and pointer-add operand order differences. All 96 data bytes already exact.
Attempt 1: inline analyzeGroups helper around second phase; 238/239 until local pGlgr recomputation restored 239/239, structural 22 / exact 120, rejected.
Attempt 2: inline getOffsetSize scratch allocator; 239/239 structural 22 / exact 104, rejected.
Attempt 3: leading local declaration search; first 13 builds unchanged, then moved metadata locals to top and searched. No structural improvement.
Attempt 4: permute independent metadata, scratch and flags calculation statement blocks to diagnose scheduling.
Calculation order ('blocks', 'glyphs', 'scratch', 'step', 'flags'): 239/239, structural/exact (22, 99).
Calculation order ('blocks', 'glyphs', 'step', 'scratch', 'flags'): 239/239, structural/exact (19, 99).
Attempt 3 completed 577 declaration builds; best structural/exact 22/73, restored. Attempt 4 completed 120 statement orders; best 19/99, not exact.
Attempt 5 variant cache workspace before metadata: 239/239, structural/exact (25, 99).
Attempt 5 variant cache workspace after count: 239/239, structural/exact (25, 99).
Attempt 5 variant cache workspace before scratch: 239/239, structural/exact (19, 99).
Attempt 5 variant reverse commutative pointer operands: 239/239, structural/exact (19, 99).
Attempt 5 variant size flags before scratch declaration set 0: 239/239, structural/exact (19, 99).
Attempt 5 variant offset flags before scratch declaration set 0: 239/239, structural/exact (19, 99).
Attempt 5 variant size flags before scratch declaration set 1: 239/239, structural/exact (19, 72).
All ArchiveFontBase experiments restored. No additional instruction-exact function; remaining scheduling differences are structural, not solely register names.
## Completion audit before final gate
NETHMACInit and NETHMACGetDigest exact, 143/143 and 105/105 with diffs 0.
SOGetHostByName and SOGetAddrInfo exact, 80/80 and 185/185 with diffs 0.
Remaining ConstructOpAnalyzeGLGR has five logged experiment groups, including inline boundaries, scratch allocation, 577 declaration builds, 120 statement orders, workspace caches and operand reversals.
Remaining RakuRakuThread::start has six distinct logged source attempts. Remaining finish has seven. No function remains untried.
Only hmac.c, SOInformation.c and this attempts log retained changes. No configure.py, shared header or symbol changes.
## Final full gate
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/net/hmac] pool: IDENTICAL
[libs/RevoEX/src/net/hmac] objdiff: code 1008/1008 data 104/104 functions 3/3 fuzzy 100.0000 linked code 0
[libs/RevoEX/src/net/hmac] instruction-exact functions: 3/3
[libs/RevoEX/src/net/hmac] section .data size 88 match 100.0
[libs/RevoEX/src/net/hmac] section .sdata size 16 match 100.0
[libs/RevoEX/src/net/hmac] section .text size 1008 match 100.0
[libs/RevoEX/src/net/hmac] baseline: code 16/1008 data 104 functions 1 fuzzy 91.6984
[libs/RevoEX/src/so/SOInformation] pool: IDENTICAL
[libs/RevoEX/src/so/SOInformation] objdiff: code 1280/1280 data None/None functions 4/4 fuzzy 100.0000 linked code 0
[libs/RevoEX/src/so/SOInformation] instruction-exact functions: 4/4
[libs/RevoEX/src/so/SOInformation] section .text size 1280 match 100.0
[libs/RevoEX/src/so/SOInformation] baseline: code 220/1280 data None functions 2 fuzzy 92.9969
[libs/NW4R/src/ut/ut_ArchiveFontBase] pool: IDENTICAL
[libs/NW4R/src/ut/ut_ArchiveFontBase] objdiff: code 4164/5120 data 96/96 functions 22/23 fuzzy 98.1398 linked code 0
[libs/NW4R/src/ut/ut_ArchiveFontBase] instruction-exact functions: 22/23
[libs/NW4R/src/ut/ut_ArchiveFontBase] section .data size 88 match 100.0
[libs/NW4R/src/ut/ut_ArchiveFontBase] section .sbss2 size 8 match 100.0
[libs/NW4R/src/ut/ut_ArchiveFontBase] section .text size 5120 match 98.13985
[libs/NW4R/src/ut/ut_ArchiveFontBase] below 100: ConstructOpAnalyzeGLGR__Q44nw4r2ut6detail15ArchiveFontBaseFPQ54nw4r2ut6detail15ArchiveFontBase16ConstructContextPQ54nw4r2ut6detail15ArchiveFontBase18CachedStreamReader 90.03766
[libs/NW4R/src/ut/ut_ArchiveFontBase] baseline: code 4164/5120 data 96 functions 22 fuzzy 98.1398
[src/scene/setting/iplRakuRakuThread] pool: IDENTICAL
[src/scene/setting/iplRakuRakuThread] objdiff: code 1252/2168 data 456/456 functions 12/14 fuzzy 94.6900 linked code 0
[src/scene/setting/iplRakuRakuThread] instruction-exact functions: 12/14
[src/scene/setting/iplRakuRakuThread] section .bss size 296 match 100.0
[src/scene/setting/iplRakuRakuThread] section .data size 136 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sbss size 16 match 100.0
[src/scene/setting/iplRakuRakuThread] section .sdata size 8 match 100.0
[src/scene/setting/iplRakuRakuThread] section .text size 2168 match 94.69004
[src/scene/setting/iplRakuRakuThread] below 100: start__Q33ipl5scene14RakuRakuThreadFv 88.635414
[src/scene/setting/iplRakuRakuThread] below 100: finish__Q33ipl5scene14RakuRakuThreadFP11NCDApConfigPi 86.56391
[src/scene/setting/iplRakuRakuThread] baseline: code 1252/2168 data 456 functions 12 fuzzy 94.6900
regressions vs baseline: 0
global matched_code_percent: 88.70241 -> 88.77092
global fuzzy_match_percent: 99.47499 -> 99.48078
global complete_code_percent: 63.54459 -> 63.54459
global matched_data_percent: 98.77142 -> 98.77142
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
libs/RevoEX/src/net/hmac: matched_functions 1 -> 3, matched_code 16 -> 1008, matched_data 104 -> 104
libs/RevoEX/src/so/SOInformation: matched_functions 2 -> 4, matched_code 220 -> 1280, matched_data 0 -> 0
libs/NW4R/src/ut/ut_ArchiveFontBase: matched_functions 22 -> 22, matched_code 4164 -> 4164, matched_data 96 -> 96
src/scene/setting/iplRakuRakuThread: matched_functions 12 -> 12, matched_code 1252 -> 1252, matched_data 456 -> 456
NETHMACInit src 0x23c base 0x23c insns 143/143; diffs 0: [];
NETHMACGetDigest src 0x1a4 base 0x1a4 insns 105/105; diffs 0: [];
SOGetHostByName src 0x140 base 0x140 insns 80/80; diffs 0: [];
SOGetAddrInfo src 0x2e4 base 0x2e4 insns 185/185; diffs 0: [];
Final gate PASS; zero regressions, zero net forbidden patterns, zero readability warnings. Full DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.

View File

@@ -21,6 +21,15 @@ class WorkflowGuardTests(unittest.TestCase):
self.assertTrue(any("total_units" in failure for failure in failures))
self.assertTrue(any("missing categories" in failure for failure in failures))
def test_obsolete_overlapping_code_total_is_rejected(self):
failures = check_report({
"version": 2,
"measures": {"total_code": 2995188},
"units": [],
"categories": [],
})
self.assertIn("overall total_code: 2995188 != 2995176", failures)
def test_malformed_report_values_fail_without_crashing(self):
failures = check_report(
{