Compare commits

...

79 Commits

Author SHA1 Message Date
Cursor Agent
83303f84a6 data(CDBFileSystemUtils): match .sdata path separator
Replace lbl_816979E8 + .sdata section pragma with a plain
char CDBFSPathSeparator = '/' so the .sdata symbol size matches
the original (1 byte). Rename the symbol in symbols.txt to match.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 22:17:18 +00:00
coah
2368a9a774 cleanup(tiHwKeyboard): name EU/non-EU country map tables (#515)
Rename Matching-only setLanguage country lookup tables and
symbols.txt entries.
2026-10-01 17:13:57 -05:00
coah
90399bb6cf cleanup(iplDate): name calendar date pane/string labels (#518)
Matching-only renames in scene/calendar/iplDate (+ symbols.txt).
2026-10-01 17:13:54 -05:00
coah
fc831357ea CDBDatabase: convert Close and FindByKey to matching C (#491)
* CDBDatabase: convert Close and FindByKey to matching C

Replace asm bodies for CDBDatabaseClose and CDBDatabaseFindByKey with
equivalent C that matches instruction-exact (ctxdiff diffs 0). Unit stays
33/33 matched with 100% code and data.

* CDBDatabase: reuse labeled error strings for Close/FindByKey

Point CDBReportError at the existing lbl_ string pool entries so the
linked DOL matches baserom SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 17:13:50 -05:00
coah
e2191ae933 cleanup(TVRC): name timing constants and file header (#509)
lbl_816945C8/D0/D8/E0 → scTvrcMsPerSec/NsecPerSec/One/FloatMagic;
lbl_81696230 → scTvrcFileHeader ("TVR0").
2026-10-01 17:11:51 -05:00
coah
7d77c095c0 cleanup(iplSystem): name ortho viewport float constants (#508)
lbl_81694424..38 → scOrthoLeft/Right/Bottom/Top and scWideOrthoLeft/Right.
2026-10-01 17:10:58 -05:00
coah
db8ff7e141 cleanup(www_window): name debug/error format strings (#507)
lbl_816962F8 → scWwwErrorQ, lbl_81643B40 → scWwwTexBufFmt,
lbl_81643B5E → scWwwNoBrowserWin.
2026-10-01 17:10:19 -05:00
github-actions[bot]
2cb6c2dfae docs: update progress [skip ci] 2026-10-01 22:09:43 +00:00
coah
6f96235605 cleanup(tiGUIManager): name sdata2 zero/half/line-color constants (#506)
lbl_81694EE8 → scGuiZeroF, lbl_81694EF0 → scGuiHalfF,
lbl_81694EEC..F → scGuiLineColorR/G/B/A.
2026-10-01 17:09:30 -05:00
coah
367b042e63 Restore memo input vtable declarations and emission order (#505) 2026-10-01 17:08:19 -05:00
coah
feb7ba400d cleanup(Contest): rename NHTTP callback error; drop dead locals (#504)
param_1 → error in sNHTTPReqCallback; remove unused Ghidra locals
from IPLContestInitialize.
2026-10-01 17:07:39 -05:00
coah
20f4af8beb cleanup(NakamuraTest): rename Ghidra locals (#503)
iVar8 → nupResult, iVar7 → startupErr; drop unused iVar1 in conntestthread.
2026-10-01 17:06:56 -05:00
coah
dca6cd9aef cleanup(HermiteIntp): name start/end tangents (#502)
Rename Ghidra param_5/param_6 and unkVal0/unkVal1 to startTangent/endTangent
and mStartTangent/mEndTangent across the HermiteIntp header and users.
2026-10-01 17:05:40 -05:00
coah
a0700bf908 cleanup(NetSetup): rename param_1 → connType (#501)
iSOStartupEXThread arg is mConnType (passed to NETGetStartupErrorCodeEx).
2026-10-01 17:04:56 -05:00
coah
de058b4298 cleanup(NCDSetting): rename uVar1 → privacyMode (#500)
Local mapped privacy mode in setWDPrivacyMode; Matching-only rename.
2026-10-01 17:04:38 -05:00
github-actions[bot]
c5468cbe50 docs: update progress [skip ci] 2026-10-01 22:04:12 +00:00
coah
62591733eb cleanup(BoardObject): rename local_28 → truncatedThumb (#499)
Local wchar temporary used when truncating thumbnail text; Matching-only rename.
2026-10-01 17:03:10 -05:00
coah
e2488b073a cleanup: rename OptOutButton pane name strings (#498)
Rename lbl_816966F9/lbl_816967B5 to scPaneName_B_Stop/T_Stop.
DOL sha1 unchanged.
2026-10-01 17:02:53 -05:00
coah
9a8de22195 Link fully matched letter input form (#497) 2026-10-01 17:01:45 -05:00
coah
a6bf0e5f4f cleanup: rename AOSSThread SO alloc/free callbacks (#495)
Rename AOSSThread_813FCC8C/E4 to aossAlloc/aossFree. DOL sha1 unchanged.
2026-10-01 17:00:23 -05:00
coah
d434f5b897 cleanup: rename CdbBackup progress percent helper (#494)
Rename fn_8135B1C0 to getProgressPercent. DOL sha1 unchanged.
2026-10-01 17:00:18 -05:00
github-actions[bot]
0adc759b42 docs: update progress [skip ci] 2026-10-01 21:58:44 +00:00
coah
9c55b47c1d Emit hardware keyboard country tables after input template (#493) 2026-10-01 16:57:52 -05:00
coah
081329daa8 cleanup: rename TVRCManager start-delay counter (#492)
Rename lbl_8169877C to sTvrcStartDelay. DOL sha1 unchanged.
2026-10-01 16:57:46 -05:00
coah
a348c9777a cleanup: rename HBMController alarm-created flag (#490)
Rename lbl_816989BC to sAlarmCreated. DOL sha1 unchanged.
2026-10-01 16:55:12 -05:00
github-actions[bot]
d5204f5c62 docs: update progress [skip ci] 2026-10-01 21:54:05 +00:00
coah
cedc1f1390 cleanup: rename SaveDataManager title-cache helpers (#488)
Rename address-suffixed title-cache helpers to readable names without
changing codegen. DOL sha1 unchanged.
2026-10-01 16:54:01 -05:00
coah
ff0cce33f6 Correct concatenated cursor-cache method symbol (#487) 2026-10-01 16:53:27 -05:00
github-actions[bot]
2beeb23a47 docs: update progress [skip ci] 2026-10-01 21:53:24 +00:00
coah
35d9ed53b1 Fix letter animation rodata ownership boundary (#486) 2026-10-01 16:52:47 -05:00
coah
015d50906c Match tiTextDrawer Base::beginDraw height half via / 2.0f (#485)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 16:52:23 -05:00
github-actions[bot]
348da5bd89 docs: update progress [skip ci] 2026-10-01 21:52:04 +00:00
coah
cdceb82200 tiInputForm 214/221, 3 asm bodies left (worker 756360e6) (#489) 2026-10-01 16:50:38 -05:00
coah
1b56ea5051 Fix Korean jump-table ownership and link zikorean (#483)
* Correct Korean jump-table ownership and link the exact unit

* Correct Korean jump-table ownership and link the exact unit
2026-10-01 16:50:22 -05:00
coah
3946983f96 KPAD 19/29, kbd_lib 15/21 (objdiff) (worker 2ecd44fa) (#482) 2026-10-01 16:29:36 -05:00
github-actions[bot]
85d75cd0cf docs: update progress [skip ci] 2026-10-01 21:27:27 +00:00
coah
af39f2678f Match SD disk-info success return and restore its epilogue extent (#481)
* Restore the SD disk-info function's original epilogue extent

* Match explicit SD disk-info success return and update code total

* Match explicit SD disk-info success return and update code total
2026-10-01 16:26:40 -05:00
github-actions[bot]
d613662c54 docs: update progress [skip ci] 2026-10-01 21:17:45 +00:00
coah
0e6e235004 Correct PFSYS_TimeStamp's truncated symbol extent (#479)
* Include original stack restore and return in PFSYS_TimeStamp extent

* Account for timestamp epilogue in verified code-byte total
2026-10-01 16:17:08 -05:00
coah
020e1b6f0b iplSetting 105/112 (worker e1b8983d) (#480) 2026-10-01 16:16:23 -05:00
coah
3440aab039 Handle objects without .data in pool_diff (#478)
* Treat absent .data sections as empty string pools

* Test absent and unequal string pools
2026-10-01 16:11:01 -05:00
coah
dab806eaa2 Correct the 43U completion guard's expected unit count (#477) 2026-10-01 16:10:57 -05:00
github-actions[bot]
f4fd16f88f docs: update progress [skip ci] 2026-10-01 21:04:39 +00:00
coah
3d8de1a356 Link the exact-matching NAND driver (#476)
* Link NAND driver with verified storage layout

* Link NAND driver with verified storage layout

* Link NAND driver with verified storage layout
2026-10-01 16:03:40 -05:00
coah
8e43db0528 tiInputForm 210/221 (+8 KB matched code) (worker dad5faf7) (#475) 2026-10-01 16:00:46 -05:00
coah
21c9b95b1b NWC24Download 23/30 (worker 58d80e3c) (#474) 2026-10-01 15:41:52 -05:00
coah
d4bdd3462c iplAddress 94/101 (worker 98388c1d) (#473) 2026-10-01 15:40:46 -05:00
coah
f7d81a0196 CHANSVm 220/233 (worker 2f51b24f) (#472) 2026-10-01 12:31:21 -05:00
coah
4f35874d02 fix: drop unreferenced lbl_ double pinned in iplMemoryCard (#471) 2026-10-01 10:55:24 -05:00
coah
0a5cbaf78e iplAddress 93/101 (worker 81732f71) (#470) 2026-10-01 10:53:32 -05:00
coah
6e7c016ae3 CHANSVm 218/233 (worker 19444f58) (#469) 2026-10-01 10:52:18 -05:00
github-actions[bot]
e60306db62 docs: update progress [skip ci] 2026-10-01 14:03:51 +00:00
devin-ai-integration[bot]
5d0ced6a15 Link scene/memoryCard/iplMemoryCardBase (clean subset) (#468)
Gate Rect.~Rect and RuntimeTypeInfo.DynamicCast behind
IPL_MEMORYCARD_BASE_CPP so this TU emits the weak destructors and the
out-of-line dynamic cast the original object contains.

Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: coah80 <usernamecole7@gmail.com>
2026-10-01 14:03:09 +00:00
github-actions[bot]
858a507ddf docs: update progress [skip ci] 2026-10-01 12:54:41 +00:00
devin-ai-integration[bot]
ce424f1a3e Link scene/memoryCard/iplMemoryCard (clean subset) (#467)
Model MemCardEventListener as a novtable abstract base and give
MemCardEventHandler its full pure-virtual surface so the GCWindow and
MemoryCardManager vtables reproduce the original zero-slot layout.
Declare lbl_81694A78 as a file-scope const so the object exports the
u64->f64 conversion constant that iplMemoryCardBase.o references.

Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: coah80 <usernamecole7@gmail.com>
2026-10-01 12:54:08 +00:00
github-actions[bot]
bcb37e07ef docs: update progress [skip ci] 2026-10-01 11:41:02 +00:00
devin-ai-integration[bot]
11094c638a Link clib/zi8cinfo (#466)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-10-01 11:40:25 +00:00
coah
cb49bde9c6 NWC24Download 21/30 (worker b7c38d52) (#465) 2026-10-01 05:43:26 -05:00
coah
df9fd72e87 iplAddress 91/101, tiZiString 26/29 (worker 5e1635f3) (#464) 2026-10-01 05:37:54 -05:00
coah
0c554a1602 CHANSVm 217/233 (worker e7171d72) (#463) 2026-10-01 05:08:52 -05:00
coah
f00336cc8b NWC24Download 19/30, nup 18/23 (worker 1ac4946e) (#462) 2026-10-01 05:07:41 -05:00
coah
842bbc6942 tiCandidateBox 108/112, iplSDChannelSelect 117/129 (worker 993eabbf) (#461) 2026-10-01 05:06:29 -05:00
coah
ab01520044 CHANSVm: small fuzzy gains (worker b60f5370) (#460) 2026-10-01 03:31:36 -05:00
coah
5f948d3f3a AOSS 96.8, zi8alpha 94.2 (worker 5906998c) (#459) 2026-10-01 03:26:27 -05:00
coah
699f844395 CHANSVm 216/233 (worker b8f00dfb) (#458) 2026-10-01 03:05:28 -05:00
coah
3afb9d8425 iplSDChannelSelect 116/129, tiCandidateBox 104/112 (worker f7b4ed19) (#457) 2026-10-01 02:58:57 -05:00
coah
72c3f4ba2d zi8cgetc: tiny gains (worker 4e5688ba) (#456) 2026-10-01 02:45:50 -05:00
coah
905c45b998 AOSS 96.5, zi8alpha 93.1 (worker 58992861) (#455) 2026-10-01 02:41:34 -05:00
coah
5a849425b1 zi8cgetc: GetZH fuzzy 85 -> 96.4% (worker 68034ea8) (#454) 2026-10-01 02:16:35 -05:00
coah
fd11ddb195 AOSS fuzzy 96.3 (worker fc04bcfa) (#453) 2026-10-01 02:03:34 -05:00
coah
d9b51418b9 CHANSVm: blob unpack, hmac, slice, float parse (worker e953cfc4) (#452) 2026-10-01 02:02:26 -05:00
coah
87e7ab6922 iplSDChannelSelect, tiCandidateBox: structural fixes (worker d5dcdbc0) (#451) 2026-10-01 02:01:17 -05:00
github-actions[bot]
d186251506 docs: update progress [skip ci] 2026-10-01 05:27:53 +00:00
devin-ai-integration[bot]
cb58211725 Link cdb/CDBIntArray (#450)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-10-01 05:27:17 +00:00
github-actions[bot]
2dbf80c418 docs: update progress [skip ci] 2026-10-01 04:38:36 +00:00
devin-ai-integration[bot]
faee1f779d Link fa msc units + msc_drv (#449)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-10-01 04:37:58 +00:00
github-actions[bot]
a324e9a843 docs: update progress [skip ci] 2026-10-01 04:37:27 +00:00
devin-ai-integration[bot]
2bddfcde52 Link pfk_api, pfd_cmn, pf_cp932, pf_fat16, pf_stub (#448)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-10-01 04:36:51 +00:00
coah
776b7981df declsearch tool; odh/wad/KPAD/pf_dir closer (worker 8e7ae0d1) (#447) 2026-09-30 22:42:40 -05:00
131 changed files with 8927 additions and 2845 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.08% | 86.61% | 60.34% | 90.99% |
| 99.37% | 87.69% | 61.93% | 91.37% |
units 902/1027 complete, functions 12151/12563 matched.
units 917/1027 complete, functions 12211/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

@@ -1111,7 +1111,7 @@ src/keyboard/MyTiInputForm.cpp:
src/keyboard/MyTiLetterForm.cpp:
.text start:0x81444730 end:0x814454D8
.rodata start:0x816168B8 end:0x81616B88
.rodata start:0x816168B8 end:0x81616BC8
.data start:0x81668860 end:0x81668CD8
.sdata2 start:0x81694EB0 end:0x81694ED0
.sdata start:0x81697528 end:0x81697570
@@ -1138,7 +1138,7 @@ src/keyboard/tiHKBManager.cpp:
src/keyboard/tiHwKeyboard.cpp:
.bss start:0x810C8940 end:0x810C8950
.text start:0x81448AA4 end:0x81449C98
.rodata start:0x81616B88 end:0x81616C78
.rodata start:0x81616BC8 end:0x81616C78
.data start:0x81668EF8 end:0x81669018
.sdata2 start:0x81694EF8 end:0x81694F08
.sdata start:0x81697570 end:0x81697578
@@ -1405,7 +1405,7 @@ libs/RVLMiddleware/eZiText/src/clib/zikorean.c:
extab start:0x81330748 end:0x81330760
extabindex start:0x8133147C end:0x813314A0
.text start:0x814813FC end:0x81482840
.data start:0x8166B2B0 end:0x8166B3D0
.data start:0x8166B2B0 end:0x8166B3A8
libs/RVLMiddleware/eZiText/src/clib/ziswordw.c:
extab start:0x81330760 end:0x81330770
@@ -1417,6 +1417,7 @@ libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c:
extab start:0x81330770 end:0x813307A8
extabindex start:0x813314B8 end:0x8133150C
.text start:0x8148302C end:0x8148447C
.data start:0x8166B3A8 end:0x8166B3D0
libs/RVLMiddleware/eZiText/src/clib/zierror.c:
.text start:0x8148447C end:0x81484484
@@ -4192,11 +4193,11 @@ libs/RVL_SDK/src/fa/driver/nand_drv.c:
.sbss start:0x816996C0 end:0x816996E0
libs/RVL_SDK/src/fa/driver/sd_drv.c:
.bss start:0x811AF460 end:0x811AF6C0
.bss start:0x811AF460 end:0x811AF6C0 align:32
.text start:0x815EA41C end:0x815ED20C
.rodata start:0x816329E8 end:0x81632B58
.data start:0x81690D18 end:0x81691728
.sbss start:0x816996E0 end:0x81699708
.sbss start:0x816996E0 end:0x81699708 align:32
libs/RVL_SDK/src/fa/driver/pfd_cmn.c:
.text start:0x815ED20C end:0x815ED324

View File

@@ -2042,8 +2042,8 @@ isEqualChannel__Q33ipl8savedata7ManagerFUxUx = .text:0x813594B0; // type:functio
isDefaultChannel__Q33ipl8savedata7ManagerFUlUl = .text:0x8135954C; // type:function size:0x50
updateVersion__Q33ipl8savedata7ManagerFUlUl = .text:0x8135959C; // type:function size:0xD4
setDefaultSDMenu__Q33ipl8savedata7ManagerFv = .text:0x81359670; // type:function size:0x48 scope:local
iplSavedata_813596B8__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
iplSavedata_813597A0 = .text:0x813597A0; // type:function size:0x40 scope:local
pushTitleCache__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
isTitleCached = .text:0x813597A0; // type:function size:0x40
nand_error_handling__Q33ipl8savedata7ManagerFi = .text:0x813597E0; // type:function size:0xDC
__ct__Q33ipl7channel9RsoThreadFPQ23EGG4Heap = .text:0x813598BC; // type:function size:0x6C
__dt__Q33ipl7channel9RsoThreadFv = .text:0x81359928; // type:function size:0x70
@@ -2095,7 +2095,7 @@ stt_wait_fns_msg__Q23ipl9CdbBackupFv = .text:0x8135B004; // type:function size:0
stt_clean_up_back__Q23ipl9CdbBackupFv = .text:0x8135B030; // type:function size:0x60
stt_wait_terminate__Q23ipl9CdbBackupFv = .text:0x8135B090; // type:function size:0x60
error_handling__Q23ipl9CdbBackupFv = .text:0x8135B0F0; // type:function size:0xD0
fn_8135B1C0__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
getProgressPercent__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
cdb_backup_delete_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B1E8; // type:function size:0x8C
cdb_backup_delete_task___3iplFPv = .text:0x8135B274; // type:function size:0xDC
cdb_backup_move_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B350; // type:function size:0xBC
@@ -5126,8 +5126,8 @@ __ct__Q33ipl5scene10AOSSThreadFPQ23EGG4Heap = .text:0x813FCA0C; // type:function
destroy__Q33ipl5scene10AOSSThreadFi = .text:0x813FCAA0; // type:function size:0x84
__dt__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB24; // type:function size:0x70
start__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB94; // type:function size:0xF8
AOSSThread_813FCC8C__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
AOSSThread_813FCCE4__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
aossAlloc__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
aossFree__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
Run__Q33ipl5scene10AOSSThreadFv = .text:0x813FCD34; // type:function size:0xEC
cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x50
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
@@ -5829,7 +5829,7 @@ doAfterDrawProcess__Q39textinput9inputform4BaseFPCwUlRCQ49textinput10textdrawer4
finishDraw__Q39textinput9inputform4BaseFUl = .text:0x81427DC0; // type:function size:0x4
addSender__Q29textinput15CommandReceiverFPQ29textinput13CommandSender = .text:0x81427DC4; // type:function size:0x8
getDrawModifyStartLine__Q39textinput10textdrawer4BaseCFv = .text:0x81427DCC; // type:function size:0x8
isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
isEnableCursorCache__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
getStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DDC; // type:function size:0x8
setVIWidth__Q39textinput10textdrawer4BaseFf = .text:0x81427DE4; // type:function size:0x8
setCandidateBox__Q39textinput12candidatebox18CandidateBoxCallerFPQ39textinput12candidatebox4Base = .text:0x81427DEC; // type:function size:0x8
@@ -13113,7 +13113,7 @@ pfstub_com_massage = .text:0x815E6C40; // type:function size:0xE4
pfstub_store_result = .text:0x815E6D24; // type:function size:0xC4
PFSYS_initializeSYS = .text:0x815E6DE8; // type:function size:0x4
PFSYS_GetCurrentContextID = .text:0x815E6DEC; // type:function size:0x18
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x74
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x7C
pfstub_call_function_standard = .text:0x815E6E80; // type:function size:0x584
pfstub_attach = .text:0x815E7404; // type:function size:0x50
pfstub_buffering = .text:0x815E7454; // type:function size:0x50
@@ -13202,7 +13202,7 @@ pfd_sddrv_pread = .text:0x815EAADC; // type:function size:0x38
pfd_sddrv_pwrite = .text:0x815EAB14; // type:function size:0x38
pfd_sddrv_unmount = .text:0x815EAB4C; // type:function size:0x34
pfd_sddrv_finalize = .text:0x815EAB80; // type:function size:0xE4
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x180
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x188
pfd_sddrv_init_drv_tbl = .text:0x815EADEC; // type:function size:0x18
pfd_sddrv_registar_callback = .text:0x815EAE04; // type:function size:0x10
pfd_sddrv_is_media_insert = .text:0x815EAE14; // type:function size:0x98
@@ -13986,8 +13986,8 @@ lbl_81616AE4 = .rodata:0x81616AE4; // type:object size:0x30
lbl_81616B14 = .rodata:0x81616B14; // type:object size:0x74
lbl_81616B88 = .rodata:0x81616B88; // type:object size:0x40
lbl_81616BC8 = .rodata:0x81616BC8; // type:object size:0x10 data:4byte
lbl_81616BD8 = .rodata:0x81616BD8; // type:object size:0xC
lbl_81616BE4 = .rodata:0x81616BE4; // type:object size:0xC
scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
...data.0 = .data:0x8164C688; // type:label scope:local
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
@@ -20201,10 +20201,10 @@ lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
lbl_816945C8 = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
lbl_816945D0 = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
lbl_816945D8 = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
lbl_816945E0 = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
scTvrcFloatMagic = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
lbl_816945E8 = .sdata2:0x816945E8; // type:object size:0x4 align:4 data:float
lbl_816945EC = .sdata2:0x816945EC; // type:object size:0x4 align:4 data:float
lbl_816945F0 = .sdata2:0x816945F0; // type:object size:0x4 align:4 data:float
@@ -20710,12 +20710,12 @@ lbl_81694ECC = .sdata2:0x81694ECC; // type:object size:0x4 align:4 data:float
@880 = .sdata2:0x81694ED4; // type:object size:0x4 scope:local align:4 data:float
@885 = .sdata2:0x81694ED8; // type:object size:0x4 scope:local align:4 data:float
@888 = .sdata2:0x81694EE0; // type:object size:0x8 scope:local align:8 data:double
lbl_81694EE8 = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
lbl_81694EEC = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
lbl_81694EED = .sdata2:0x81694EED; // type:object size:0x1 data:byte
lbl_81694EEE = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
lbl_81694EEF = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
lbl_81694EF0 = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
scGuiZeroF = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
scGuiLineColorR = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
scGuiLineColorG = .sdata2:0x81694EED; // type:object size:0x1 data:byte
scGuiLineColorB = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
scGuiLineColorA = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
scGuiHalfF = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
lbl_81694EF8 = .sdata2:0x81694EF8; // type:object size:0x8 data:4byte
lbl_81694F00 = .sdata2:0x81694F00; // type:object size:0x4 data:4byte
lbl_81694F08 = .sdata2:0x81694F08; // type:object size:0x8 align:8 data:double
@@ -21552,7 +21552,7 @@ lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
scTvrcFileHeader = .sdata:0x81696230; // type:object size:0x5 data:string
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
_limitMilli__7LibTVRC = .sdata:0x81696240; // type:object size:0x4 data:4byte
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
@@ -21753,7 +21753,7 @@ lbl_816966E1 = .sdata:0x816966E1; // type:object size:0x6 data:string
lbl_816966E7 = .sdata:0x816966E7; // type:object size:0x7 data:string
lbl_816966EE = .sdata:0x816966EE; // type:object size:0x7 data:string
lbl_816966F5 = .sdata:0x816966F5; // type:object size:0x4 data:string
lbl_816966F9 = .sdata:0x816966F9; // type:object size:0x7 data:string
scPaneName_B_Stop = .sdata:0x816966F9; // type:object size:0x7 data:string
lbl_81696700 = .sdata:0x81696700; // type:object size:0x6 data:string
lbl_81696706 = .sdata:0x81696706; // type:object size:0x5 data:string
lbl_8169670B = .sdata:0x8169670B; // type:object size:0x6 data:string
@@ -21781,15 +21781,15 @@ lbl_81696797 = .sdata:0x81696797; // type:object size:0x8 data:string
lbl_8169679F = .sdata:0x8169679F; // type:object size:0x8 data:string
lbl_816967A7 = .sdata:0x816967A7; // type:object size:0x7 data:string
lbl_816967AE = .sdata:0x816967AE; // type:object size:0x7 data:string
lbl_816967B5 = .sdata:0x816967B5; // type:object size:0x7 data:string
scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local data:string
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
@@ -23191,7 +23191,7 @@ _repeatBitLength__7LibTVRC = .sbss:0x81698768; // type:object size:0x4 data:4byt
_repeatBitArray__7LibTVRC = .sbss:0x8169876C; // type:object size:0x4 data:4byte
_tickT__7LibTVRC = .sbss:0x81698770; // type:object size:0x4 data:4byte
m_handle__Q23ipl11TVRCManager = .sbss:0x81698778; // type:object size:0x4 data:4byte
lbl_8169877C__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
sTvrcStartDelay__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
suIDCounter__Q23gui11PaneManager = .sbss:0x81698780; // type:object size:0x4 data:4byte
_bgmBlk__Q23ipl3snd = .sbss:0x81698788; // type:object size:0x4
_mainBGMHandle__Q23ipl3snd = .sbss:0x8169878C; // type:object size:0x4 data:4byte
@@ -23331,7 +23331,7 @@ opera_callbacks__Q23www10wiisetting = .sbss:0x816989A0; // type:object size:0x4
sStatus__Q23www9arcreader = .sbss:0x816989A8; // type:object size:0x4 scope:local data:4byte
lbl_816989B0 = .sbss:0x816989B0; // type:object size:0x4 data:4byte
sBatteryFlag__Q210homebutton10Controller = .sbss:0x816989B8; // type:object size:0x4
lbl_816989BC__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
sAlarmCreated__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
suIDCounter__Q310homebutton3gui11PaneManager = .sbss:0x816989C0; // type:object size:0x4 data:4byte
spInstance__Q210homebutton9RemoteSpk = .sbss:0x816989C8; // type:object size:0x4 data:4byte
InvalidShutdown = .sbss:0x816989D0; // type:object size:0x4 data:4byte

View File

@@ -812,8 +812,8 @@ config.libs = [
]
),
IPLSection("memoryCard", [
Object(NonMatching, "scene/memoryCard/iplMemoryCard.cpp"),
Object(NonMatching, "scene/memoryCard/iplMemoryCardBase.cpp"),
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
@@ -929,7 +929,7 @@ config.libs = [
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
@@ -987,7 +987,7 @@ config.libs = [
Object(NonMatching, "clib/zi8alpha.c"),
Object(Matching, "clib/zi8alts.c"),
Object(NonMatching, "clib/zi8cgetc.c"),
Object(NonMatching, "clib/zi8cinfo.c"),
Object(Matching, "clib/zi8cinfo.c"),
Object(Matching, "clib/zi8copy.c"),
Object(NonMatching, "clib/zi8dawg.c"),
Object(Matching, "clib/zi8getc.c"),
@@ -1004,7 +1004,7 @@ config.libs = [
Object(Matching, "clib/zi8ver.c"),
Object(Matching, "clib/zi8ZHuwd.c"),
Object(NonMatching, "clib/zidawg1.c"),
Object(NonMatching, "clib/zikorean.c"),
Object(Matching, "clib/zikorean.c"),
Object(NonMatching, "clib/ziswordw.c"),
Object(NonMatching, "clib/zkokeyp.c"),
Object(Matching, "clib/zierror.c"),
@@ -1025,7 +1025,7 @@ config.libs = [
Object(NonMatching, "cdb/CDBRecord.c"),
Object(Matching, "cdb/CDBRecordFile.c"),
Object(Matching, "cdb/CDBRecordKey.c"),
Object(NonMatching, "cdb/CDBIntArray.c"),
Object(Matching, "cdb/CDBIntArray.c"),
Object(Matching, "cdb/CDBSystem.c"),
Object(Matching, "cdb/CDBAttr.c"),
Object(Matching, "cdb/CDBFBridge.c"),
@@ -1698,7 +1698,7 @@ config.libs = [
Object(NonMatching, "fa/pf_entry_iterator.c"),
Object(NonMatching, "fa/pf_fat.c"),
Object(NonMatching, "fa/pf_fat12.c"),
Object(NonMatching, "fa/pf_fat16.c"),
Object(Matching, "fa/pf_fat16.c"),
Object(Matching, "fa/pf_fat32.c"),
Object(Matching, "fa/pf_fatfs.c"),
Object(NonMatching, "fa/pf_file.c"),
@@ -1706,7 +1706,7 @@ config.libs = [
Object(Matching, "fa/pf_sector.c"),
Object(NonMatching, "fa/pf_volume.c"),
Object(Matching, "fa/pf_volume_apiadd.c"),
Object(NonMatching, "fa/pf_cp932.c"),
Object(Matching, "fa/pf_cp932.c"),
Object(Matching, "fa/pf_api_util.c"),
Object(Matching, "fa/pf_attach.c"),
Object(Matching, "fa/pf_buffering.c"),
@@ -1800,7 +1800,7 @@ config.libs = [
Object(Matching, "fa/pf_w_rmdir.c"),
Object(Matching, "fa/pf_w_xdivide.c"),
Object(Matching, "fa/pf_filelock.c"),
Object(NonMatching, "fa/pf_stub.c"),
Object(Matching, "fa/pf_stub.c"),
Object(Matching, "fa/pf_system.c"),
Object(Matching, "fa/pf_stub_standard.c"),
Object(Matching, "fa/pfs_attach.c"),
@@ -1851,15 +1851,15 @@ config.libs = [
Object(Matching, "fa/api/FASetThreadPriority.c"),
Object(Matching, "fa/api/FAUnmount.c"),
Object(NonMatching, "fa/kernel/pfk_api.c"),
Object(Matching, "fa/kernel/pfk_api.c"),
Object(NonMatching, "fa/driver/nand_drv.c"),
Object(Matching, "fa/driver/nand_drv.c"),
Object(NonMatching, "fa/driver/sd_drv.c"),
Object(NonMatching, "fa/driver/pfd_cmn.c"),
Object(NonMatching, "fa/driver/msc_drv.c"),
Object(Matching, "fa/driver/pfd_cmn.c"),
Object(Matching, "fa/driver/msc_drv.c"),
Object(NonMatching, "fa/msc/puh_msc.c"),
Object(NonMatching, "fa/msc/puh_msc_cmd.c"),
Object(Matching, "fa/msc/puh_msc.c"),
Object(Matching, "fa/msc/puh_msc_cmd.c"),
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
]
),

View File

@@ -96,7 +96,7 @@ CHANSVmNativeClass* CHANSVmAddNativeClass(CHANSVm* vm, const char* clsName, CHAN
/*** CHANS Image ***/
/************************/
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm);
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm, vmPtr data);
typedef vmPtr (*CHANSVmImageAllocatorCallback)(CHANSVm* vm, u32 size);
void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSVmImageCtorCallback ctorCb);

View File

@@ -75,7 +75,7 @@ namespace homebutton {
private:
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];

View File

@@ -187,7 +187,19 @@ namespace textinput {
void SetFocusedText(s32 pane) { mnFocusedIdx = pane; }
s32 GetFocusedText() { return mnFocusedIdx; }
f32 GetWidthScale_() const { return 608.0f / mfScreenWidth; }
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
f32 GetMargin_() const {
f32 margin;
if (mfScreenWidth > 700.0f) {
margin = 10.0f;
} else {
margin = 20.0f;
}
return margin;
}
#else
f32 GetMargin_() const { return mfScreenWidth > 700.0f ? 10.0f : 20.0f; }
#endif
s32 GetNextPageIdx_(s32 page) const;
s32 GetPrevPageIdx_(s32 page) const;
s32 GetDispNum() const;

View File

@@ -145,7 +145,7 @@ namespace textinput {
#ifdef TISIGNWINDOW_IMPLEMENTATION
bool isAtokActive() const;
#endif
#ifdef MYTILETTERFORM_IMPLEMENTATION
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
virtual void create(MEMAllocator* allocator);
virtual void init();
virtual void onCommand(INPUT_COMMAND command, void* data);
@@ -384,7 +384,7 @@ namespace textinput {
virtual void setRootPaneScaleFor16x9();
virtual void setRootPaneScaleFor4x3();
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
virtual void onSE(sound::SE seId);
#endif

View File

@@ -6,7 +6,7 @@
#include <nw4r/ut/CharWriter.h>
#include <nw4r/ut/Rect.h>
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#include <string.h>
#endif
@@ -34,7 +34,7 @@ namespace textinput {
} CursorPos;
typedef struct DrawInfo {
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
nw4r::ut::Rect rect;
wchar_t character;
#else
@@ -94,7 +94,7 @@ namespace textinput {
virtual u32 getEndPos() const;
// todo
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
@@ -103,12 +103,12 @@ namespace textinput {
virtual void setDrawCacheScopeLine();
virtual void modifyCursorCache();
#endif
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
virtual bool isEnableCursorCache() const;
#else
virtual void isEnableCursorCache();
#endif
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
virtual u32 getDrawModifyStartLine() const;
virtual u32 getDrawModifyEndLine() const;
#else

View File

@@ -20,7 +20,11 @@ namespace gui {
class Manager;
class EventHandler;
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
class __declspec(novtable) Interface {
#else
class Interface {
#endif
public:
virtual void create() {} // 0x08 (0x02)
@@ -30,14 +34,14 @@ namespace gui {
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
virtual void draw() {} // 0x18 (0x06)
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
virtual ~Interface(); // 0x1C (0x07)
#else
virtual ~Interface() {} // 0x1C (0x07)
#endif
};
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
class __declspec(novtable) EventHandler {
#else
class EventHandler {

View File

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

View File

@@ -69,7 +69,7 @@ namespace ipl {
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
T get() const {
f32 var_f27 = mFrame;
@@ -81,11 +81,11 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(unkVal0 *
(mStartTangent *
(var_f27 +
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -101,7 +101,7 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
@@ -109,8 +109,8 @@ namespace ipl {
protected:
T mStart;
T mEnd;
f32 unkVal0;
f32 unkVal1;
f32 mStartTangent;
f32 mEndTangent;
};
template <>
@@ -119,7 +119,7 @@ namespace ipl {
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
f32 speed = 1.0f);
f32 get() const {
@@ -132,10 +132,10 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(unkVal0 *
(mStartTangent *
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -144,8 +144,8 @@ namespace ipl {
protected:
f32 mStart;
f32 mEnd;
f32 unkVal0;
f32 unkVal1;
f32 mStartTangent;
f32 mEndTangent;
};
#pragma dont_instantiate HermiteIntp<float>
@@ -155,12 +155,12 @@ namespace ipl {
public:
HermiteIntp() {}
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
unkVal0 = param_5;
unkVal1 = param_6;
mStartTangent = startTangent;
mEndTangent = endTangent;
}
#ifdef IPL_SD_CHANNEL_SELECT_CPP
@@ -176,9 +176,9 @@ namespace ipl {
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
f32 frameSquared = frame * frame;
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
f32 tangent = unkVal0 * (frame + (cubic -
f32 tangent = mStartTangent * (frame + (cubic -
inverseDuration * (2.0f * frame * frame))) +
unkVal1 * (cubic - inverseDuration * frameSquared);
mEndTangent * (cubic - inverseDuration * frameSquared);
result.x += tangent;
result.y += tangent;
result.z += tangent;
@@ -196,7 +196,7 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
@@ -213,15 +213,55 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
#endif
protected:
f32 unkVal0;
f32 unkVal1;
f32 mStartTangent;
f32 mEndTangent;
};
#endif
#ifdef IPL_SD_CHANNEL_SELECT_CPP
} // namespace math
} // namespace ipl
#include "math/iplMathTypes.h"
namespace ipl {
namespace math {
template <>
class HermiteIntp<VEC3> : public utility::FrameController {
public:
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
VEC3 get() const {
f32 frame = mFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
VEC3 result =
(mStart * (1.0f + (inverseDuration * (inverseDuration *
(inverseDuration * (frame * (2.0f * frame * frame)))) -
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
(mEnd * (inverseDuration * (inverseDuration *
(inverseDuration * (frame * (2.0f * frame * frame)))) -
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
f32 frameSquared = frame * frame;
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
f32 tangent = mStartTangent * (frame + (cubic -
inverseDuration * (2.0f * frame * frame))) +
mEndTangent * (cubic - inverseDuration * frameSquared);
result.x += tangent;
result.y += tangent;
result.z += tangent;
return result;
}
protected:
VEC3 mStart;
VEC3 mEnd;
f32 mStartTangent;
f32 mEndTangent;
};
#endif

View File

@@ -8,7 +8,7 @@
namespace ipl {
namespace scene {
class GCWindow : public MemoryBase, public MemCardEventHandler {
class GCWindow : public MemoryBase, public MemCardEventListener {
#ifdef IPL_MEMORY_CARD_CPP
friend class MemoryCard;
#endif
@@ -48,6 +48,25 @@ private:
void set_texture(const char*, const GXTexObj&);
public:
virtual void onMemEvent(long, u8);
#ifdef IPL_GC_WINDOW_CPP
virtual void on_wait_anim() = 0;
virtual void on_exit() = 0;
virtual void on_error() = 0;
virtual void on_format() = 0;
virtual void on_dialog_result() = 0;
virtual void on_select_in() = 0;
virtual void on_message_done() = 0;
virtual void on_button_trig() = 0;
#else
virtual void on_wait_anim();
virtual void on_exit();
virtual void on_error();
virtual void on_format();
virtual void on_dialog_result();
virtual void on_select_in();
virtual void on_message_done();
virtual void on_button_trig();
#endif
bool isProcess();
void stop_wait_anim();

View File

@@ -35,7 +35,11 @@ namespace ipl {
MemoryBase* mpBase; // 0x0C
};
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
class __declspec(novtable) MemoryBase {
#else
class MemoryBase {
#endif
public:
class Anm {
public:

View File

@@ -12,13 +12,61 @@
namespace ipl {
namespace scene {
class MemCardEventHandler {
class __declspec(novtable) MemCardEventListener {
public:
MemCardEventListener() {}
virtual ~MemCardEventListener() {}
virtual void onMemEvent(long event, u8 slot);
};
class MemCardEventHandler : public MemCardEventListener {
public:
MemCardEventHandler() {}
virtual ~MemCardEventHandler();
virtual void onMemEvent(long event, u8 slot);
virtual void onMount(u8 slot) = 0;
virtual void onUnmount(u8 slot) = 0;
virtual void onAttach(u8 slot) = 0;
virtual void onDetach(u8 slot) = 0;
virtual void onCheck(u8 slot) = 0;
virtual void onFormat(u8 slot) = 0;
virtual void onRepair(u8 slot) = 0;
virtual void onRead(u8 slot) = 0;
virtual void onWrite(u8 slot) = 0;
virtual void onOpen(u8 slot) = 0;
virtual void onClose(u8 slot) = 0;
virtual void onCreate(u8 slot) = 0;
virtual void onDelete(u8 slot) = 0;
virtual void onCopy(u8 slot) = 0;
virtual void onMove(u8 slot) = 0;
virtual void onRename(u8 slot) = 0;
virtual void onVerify(u8 slot) = 0;
virtual void onCommit(u8 slot) = 0;
virtual void onProbe(u8 slot) = 0;
virtual void onMountAsync(u8 slot) = 0;
virtual void onUnmountAsync(u8 slot) = 0;
virtual void onCheckAsync(u8 slot) = 0;
virtual void onFormatAsync(u8 slot) = 0;
virtual void onReadAsync(u8 slot) = 0;
virtual void onWriteAsync(u8 slot) = 0;
virtual void onCreateAsync(u8 slot) = 0;
virtual void onDeleteAsync(u8 slot) = 0;
virtual void onCopyAsync(u8 slot) = 0;
virtual void onMoveAsync(u8 slot) = 0;
virtual void onRenameAsync(u8 slot) = 0;
virtual void onVerifyAsync(u8 slot) = 0;
virtual void onCommitAsync(u8 slot) = 0;
virtual void onProbeAsync(u8 slot) = 0;
virtual void onFreeBlocks(u8 slot) = 0;
virtual void onGetLength(u8 slot) = 0;
virtual void onSetAttrib(u8 slot) = 0;
virtual void onGetAttrib(u8 slot) = 0;
virtual void onSlotStatus(u8 slot) = 0;
};
typedef struct MCFile {
@@ -56,6 +104,44 @@ namespace ipl {
}
virtual ~MemoryCardManager();
virtual void onMount(u8 slot) = 0;
virtual void onUnmount(u8 slot) = 0;
virtual void onAttach(u8 slot) = 0;
virtual void onDetach(u8 slot) = 0;
virtual void onCheck(u8 slot) = 0;
virtual void onFormat(u8 slot) = 0;
virtual void onRepair(u8 slot) = 0;
virtual void onRead(u8 slot) = 0;
virtual void onWrite(u8 slot) = 0;
virtual void onOpen(u8 slot) = 0;
virtual void onClose(u8 slot) = 0;
virtual void onCreate(u8 slot) = 0;
virtual void onDelete(u8 slot) = 0;
virtual void onCopy(u8 slot) = 0;
virtual void onMove(u8 slot) = 0;
virtual void onRename(u8 slot) = 0;
virtual void onVerify(u8 slot) = 0;
virtual void onCommit(u8 slot) = 0;
virtual void onProbe(u8 slot) = 0;
virtual void onMountAsync(u8 slot) = 0;
virtual void onUnmountAsync(u8 slot) = 0;
virtual void onCheckAsync(u8 slot) = 0;
virtual void onFormatAsync(u8 slot) = 0;
virtual void onReadAsync(u8 slot) = 0;
virtual void onWriteAsync(u8 slot) = 0;
virtual void onCreateAsync(u8 slot) = 0;
virtual void onDeleteAsync(u8 slot) = 0;
virtual void onCopyAsync(u8 slot) = 0;
virtual void onMoveAsync(u8 slot) = 0;
virtual void onRenameAsync(u8 slot) = 0;
virtual void onVerifyAsync(u8 slot) = 0;
virtual void onCommitAsync(u8 slot) = 0;
virtual void onProbeAsync(u8 slot) = 0;
virtual void onFreeBlocks(u8 slot) = 0;
virtual void onGetLength(u8 slot) = 0;
virtual void onSetAttrib(u8 slot) = 0;
virtual void onGetAttrib(u8 slot) = 0;
void calc();
bool isSlotReady(u8 slot);
@@ -96,7 +182,7 @@ namespace ipl {
u16 getFreeBlocks(u8 slot);
#endif
void setEventHandler(MemCardEventHandler* eventHandler) {
void setEventHandler(MemCardEventListener* eventHandler) {
mpEventHandler = eventHandler;
}
@@ -107,7 +193,7 @@ namespace ipl {
s32 mLastResult; // 0x16930
s32 mLastCmd; // 0x16934
u32 unk_0x16938; // 0x16938
MemCardEventHandler* mpEventHandler; // 0x1693C
MemCardEventListener* mpEventHandler; // 0x1693C
};
} // namespace scene
} // namespace ipl

View File

@@ -395,9 +395,9 @@ namespace ipl {
NandSDWorker* mpSDWorker;
ESTitleId32* mpSDTitleIds;
SDChannelSelectTitleInfo* mpSDTitleInfo;
NandSDWorker::TitleUsage* mpNandTitleInfo;
s32 mFirstTitleCount;
s32 mSecondTitleCount;
mutable NandSDWorker::TitleUsage* mpNandTitleInfo;
mutable s32 mFirstTitleCount;
mutable s32 mSecondTitleCount;
SDChannelObj* mpCurrentLoadedChannel;
u32 mSDTitleCount;
u32 mNandTitleCount;

View File

@@ -39,7 +39,7 @@ namespace ipl {
void stt_wait_fns_msg();
void stt_wait_terminate();
int fn_8135B1C0();
int getProgressPercent();
void error_handling();

View File

@@ -24,7 +24,7 @@ namespace ipl {
class Manager;
}
namespace savedata {
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
class Manager {
public:
@@ -87,7 +87,7 @@ namespace ipl {
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
void iplSavedata_813596B8(ESTitleId titleId);
void pushTitleCache(ESTitleId titleId);
private:
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
@@ -184,7 +184,7 @@ namespace ipl {
u8 unused_0x504[28];
friend class channel::Manager;
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
};
} // namespace savedata
} // namespace ipl

View File

@@ -20,7 +20,7 @@ namespace nw4r {
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
#endif
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
~Rect() {}
#endif

View File

@@ -37,7 +37,7 @@ namespace nw4r {
} // namespace detail
template <typename TDerived, typename TBase>
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
TDerived DynamicCast(TBase* pPtr);
#else
inline TDerived DynamicCast(TBase* pPtr) {

View File

@@ -142,6 +142,9 @@ typedef struct ziFuzzyZYPairs {
int rANDn : 1;
int bANDp : 1;
int gANDk : 1;
int dANDt : 1;
int reserved : 20;
} ziFuzzyZYPairs;
typedef struct _ziGetParam {
@@ -357,8 +360,8 @@ typedef struct ziMatchParam {
ziWChar first2; // 0x68
ziWChar comp; // 0x6A
ziU8 nSeg; // 0x6C
ziU8 segs1[0xC0]; // 0x6D
ziU8 segsD[0xC0]; // 0x12D
ziU8 segs1[16][12]; // 0x6D
ziU8 segsD[16][12]; // 0x12D
ziU8 pad_0x1ED; // 0x1ED
} ziMatchParam;

View File

@@ -269,10 +269,10 @@ Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
{
Zi8UInt length = 0;
ziU16 initialIndex = (ziU16)(((key & 0xffff) >> 9) & 0x3f);
ziU16 finalIndex = (ziU16)(((key & 0xffff) >> 3) & 0x3f);
ziU16 tone = (ziU16)(key & 7);
Zi8UInt length = 0;
volatile ziU16 tone = (ziU16)(key & 7);
output[0] = zi8PYinitialSpelling[initialIndex][0];
output[1] = zi8PYinitialSpelling[initialIndex][1];

View File

@@ -1074,7 +1074,7 @@ filterVowelCandidate:
(((ZiAlphaWork*)workData)->dictionaries[language] == 0)))))) {
if (language != ((ZiAlphaWork*)workData)->language) break;
index = ((ZiAlphaWork*)workData)->dictionaryKinds[dictionaryIndex + 1];
if ((index == 0xc) || (((index < 0xc && (index < 9)) && (4 < index)))) {
if (index == 0xc || (index < 9 && index >= 5)) {
if (Zi8getKeyLayout(language,0xeff1,&punctuationBuffer[0],1,workData) == 0) {
punctuationBuffer[0] = 0;
}
@@ -1116,15 +1116,15 @@ filterVowelCandidate:
{
prepareCandidate:
if (((elementCount == 1) && (dictionaryKind != 10)) &&
((0xeff0 < *wordCursor && (*wordCursor < 0xf011)))) {
((*wordCursor >= 0xeff1 && *wordCursor <= 0xf010))) {
punctuationCandidate = ZI8_TRUE;
break;
}
wordCursor[wordLength] = 0;
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)elementCount < (int)wordLength))
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)wordLength > (int)elementCount))
{
wordLength = elementCount;
wordCursor[elementCount] = 0;
wordCursor[wordLength] = 0;
}
wordLength = (ziU16)Zi8DeTokenization(wordCursor,wordLength & 0xffff,wordCapacity & 0xffff,language);
if (((phoneticInput) && ((unsigned int)parameters->elementCount < (wordLength & 0xff))) &&
@@ -1151,7 +1151,7 @@ prepareCandidate:
else {
if ((((keyLayoutCount == 0) || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
((int)(wordLength + prefixCount) < 2)) ||
((int)(wordLength + prefixCount) <= 1)) ||
(0x40 < (int)(wordLength + prefixCount))) goto emitCandidate;
switch (dictionaryKind) {
case 5:
@@ -1161,13 +1161,14 @@ checkKeyLayout:
keyLayoutCursor = keyLayout;
candidateCharacterCount = wordLength + prefixCount;
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
if (*keyLayoutCursor >= candidateCharacterCount) {
if (*keyLayoutCursor < candidateCharacterCount) {
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
} else {
if (*keyLayoutCursor++ > candidateCharacterCount) {
index = (unsigned int)keyLayoutCount;
}
break;
}
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
}
if ((int)index < (int)(unsigned int)keyLayoutCount) {
for (elementIndex = 0; (int)elementIndex < (int)(unsigned int)candidateCharacterCount;
@@ -1175,10 +1176,10 @@ checkKeyLayout:
candidateBytes[elementIndex] = Zi8ConvertWC2UC(wordCursor[elementIndex - prefixCount],language,workData);
}
for (; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
for (elementIndex = 0;
((int)elementIndex < (int)(unsigned int)candidateCharacterCount &&
(candidateBytes[elementIndex] == keyLayoutCursor[elementIndex]));
elementIndex = elementIndex + 1) {
elementIndex = 0;
while (elementIndex < candidateCharacterCount) {
if (candidateBytes[elementIndex] != keyLayoutCursor[elementIndex]) break;
elementIndex++;
}
if (elementIndex == candidateCharacterCount) {
wordCursor[-prefixCount] = 0;
@@ -1196,7 +1197,7 @@ emitCandidate:
if (firstCandidate == 0) {
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
if ((int)(wordLength + prefixCount) < (int)((ZiAlphaOptions*)optionData)->shortestWord) {
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
}
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
@@ -1223,23 +1224,17 @@ emitCandidate:
} else {
if (((((ZiAlphaWork*)workData)->suffixMode == '\0') && (wordCursor[1] == 0)) &&
(candidateCount == 0)) {
if ((*wordCursor < 0xeff1) || (0xf010 < *wordCursor)) {
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
}
else {
if (*wordCursor >= 0xeff1 && *wordCursor <= 0xf010) {
((ZiAlphaWork*)workData)->singleCharacter = 0;
}
}
if (((dictionaryExact == 0) || (parameters->elementCount != ((ZiAlphaWork*)workData)->rememberedCount))
|| ((parameters->maxCandidates != 1 &&
((candidateCount != 0 || (parameters->firstCandidate != 0)))))) {
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
&& ((parameters->maxCandidates == 1 ||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
else {
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
}
}
else {
if (dictionaryExact != 0 &&
parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount &&
(parameters->maxCandidates == 1 ||
(candidateCount == 0 && parameters->firstCandidate == 0))) {
for (index = 0; (int)index < (int)prefixCount; index = index + 1) {
((ZiAlphaWork*)workData)->rememberedWord[index]
= wordCursor[index - prefixCount];
@@ -1250,6 +1245,13 @@ emitCandidate:
}
((ZiAlphaWork*)workData)->rememberedWord[index + prefixCount] = 0;
}
else {
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
&& ((parameters->maxCandidates == 1 ||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
}
}
if ((((ZiAlphaWork*)workData)->suffixMode == '\0') &&
((((((dictionaryKind == 1 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 1) != 0)) ||
((dictionaryKind == 3 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 2) != 0)))) ||

File diff suppressed because it is too large Load Diff

View File

@@ -643,7 +643,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
{
int strokeIndex;
int outputCount;
int extraCount;
volatile int extraCount;
outputCount = 0;
Zi8LogError(100, work);
@@ -660,8 +660,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
goto lowStroke;
}
badStroke:
outputCount--;
outputBuffer[(ziU8)outputCount] = 0;
outputBuffer[(ziU8)--outputCount] = 0;
return outputCount;
lowStroke:
outputBuffer[(ziU8)outputCount] = zi8StrokeCode(strokes[strokeIndex] & 0xf, work);

View File

@@ -89,7 +89,12 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
ZI_WORK->unk_0x318 = 0;
}
while ((entry = (ziU8*)ZI_WORK->unk_0x310) != 0) {
for (;;) {
entry = (ziU8*)ZI_WORK->unk_0x310;
if (entry == 0) {
Zi8LogError(0x4B3, __zi8_work_data);
return 0;
}
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
word = entry + 1;
wordSize = *entry;
@@ -158,8 +163,6 @@ next:
fallback = 1;
ZI_WORK->unk_0x318 = 0;
}
Zi8LogError(0x4B3, __zi8_work_data);
return 0;
}
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
ziU32 result;
@@ -167,11 +170,12 @@ ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* out
for (;;) {
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
if ((ziU8)result != 0) break;
if ((ZI_WORK->pudCount = ZI_WORK->pudCount + 1) > 16) {
if (++ZI_WORK->pudCount <= 16) {
continuation = 0;
} else {
ZI_WORK->pudCount = 1;
break;
}
continuation = 0;
}
return result;
}

View File

@@ -45,7 +45,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
if (candidate->length == length) {
position = 0;
while (position < length) {
if ((ziU8)candidate->text[position] != (ziU8)word->text[position]) break;
if (candidate->text[position] != word->text[position]) break;
position++;
}
if (position == length) {
@@ -56,8 +56,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
previous = current;
current = current->next;
}
length = ZI_WORK->uwdCount;
ZI_WORK->uwdCount = length + 1;
length = ZI_WORK->uwdCount++;
added = &ZI_WORK->uwdNodes[length];
if (previous == 0) {
ZI_WORK->uwdList = added;
@@ -91,8 +90,11 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
ziWChar folded;
int fallback = 0;
int visited = 0;
int position, prefixLength, previousOffset;
ziU32 size, entryLanguage, entryLength;
int prefixLength;
int position, previousOffset;
ziU32 size;
ziU8 entryLanguage;
ziU32 entryLength;
ziU8* cursor;
ziU8* begin;
ziU8* boundary;
@@ -103,18 +105,33 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
ziUserDictionary* dictionary;
int firstSegment;
Zi8LogError(100, __zi8_work_data);
if (!(ZI_WORK->unk_0x138 < 3 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
Zi8ReplaceLastError(0x19C, __zi8_work_data);
return 0;
}
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
if (continuation == 0) {
if (continuation != 0) {
result = Zi8_814803F4(__zi8_work_data);
entryLength = 0;
if (result != 0) {
entryLanguage = result->language;
entryLength = result->length;
if (entryLength >= capacity) {
Zi8_8148047C(__zi8_work_data);
return 0;
}
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
}
return entryLength;
}
{
Zi8_8148047C(__zi8_work_data);
ZI_WORK->unk_0x13C = 0;
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
else {
prefixLength = 0;
for (position = currentLength - 2; position >= 0 && currentWord[position] != 0x20; position--) prefixLength++;
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
position++;
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
else {
ZI_WORK->unk_0x140 = 1;
@@ -123,7 +140,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
ZI_WORK->unk_0x141[1] = language;
ZI_WORK->unk_0x141[2] = prefixLength;
previousOffset = 4;
for (; ++position, prefixLength > 0; prefixLength--) {
for (; prefixLength > 0; prefixLength--, position++) {
folded = currentWord[position];
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
ZI_WORK->unk_0x184[previousOffset] = 0;
@@ -131,12 +148,10 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
}
if (ZI_WORK->unk_0x141[previousOffset] == 0) {
if (ZI_WORK->unk_0x141[previousOffset++] == 0) {
ZI_WORK->unk_0x140 = 0;
previousOffset++;
break;
}
previousOffset++;
}
}
}
@@ -146,7 +161,8 @@ rescan:
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
end = (ziU8*)dictionary + dictionary->end + 7;
cursor = begin;
firstSegment = begin < boundary;
if (begin < boundary) firstSegment = 1;
else firstSegment = 0;
while (firstSegment ? cursor < boundary : cursor < end) {
size = *cursor;
candidate = (ziUserWord*)cursor;
@@ -185,7 +201,7 @@ next:
visited = 0;
goto rescan;
}
if (complete != 0 && length == 1) {
if (complete == 1 && length != 0 && continuation == 0) {
complete = 0;
fallback = 1;
visited = 0;

View File

@@ -22,7 +22,8 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
node += offset;
if (((ziU32)header & 2) != 0) {
if ((*(ziU8*)node & 0x80) != 0) {
offset = *((ziU8*)node + 2) + ((*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000);
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
offset += *((ziU8*)node + 2);
} else {
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
offset += (ziU32)*((ziU8*)node + 1);
@@ -43,7 +44,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
ziU8* ZiDAWGGetSibling(ziU8* node) {
ziU16 header;
ziU8* cursor;
ziU8* cursor = node;
ziS32 depth;
ziS32 offset;
@@ -53,29 +54,29 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
if ((header & 4) == 0) {
node = 0;
} else {
cursor = node;
if ((header & 8) != 0) {
if ((node[0] & 0xf) == 0xf) {
cursor = node + 2;
node += 2;
} else {
cursor = node + 1;
node += 1;
}
if ((header & 2) != 0) {
if ((*cursor & 0x80) == 0) {
cursor += 2;
if ((*node & 0x80) == 0) {
node += 2;
} else {
cursor += 3;
node += 3;
}
}
if ((*cursor & 0x80) == 0) {
node += (ziU32)cursor[1] + (ziU32)*cursor * 0x100;
if ((*node & 0x80) != 0) {
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
(ziU32)node[2] + 0x8000;
} else {
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
0x8000 + (ziU32)cursor[2];
node += (ziU16)*node * 0x100 + (ziU32)node[1];
}
} else {
cursor = node;
do {
header = nodeHeaderTable[cursor[0] >> 4];
if ((cursor[0] & 0xf) == 0xf) {
@@ -89,24 +90,24 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
if ((header & 1) != 0) {
if ((header & 2) == 0) {
depth++;
} else if ((*cursor & 0x80) == 0) {
cursor += 2;
offset += 2;
} else {
} else if ((*cursor & 0x80) != 0) {
cursor += 3;
offset += 3;
} else {
cursor += 2;
offset += 2;
}
}
if ((header & 4) == 0) {
depth--;
} else if ((header & 8) != 0) {
if ((*cursor & 0x80) == 0) {
cursor += 2;
offset += 2;
} else {
if ((*cursor & 0x80) != 0) {
cursor += 3;
offset += 3;
} else {
cursor += 2;
offset += 2;
}
depth--;
}
@@ -163,16 +164,10 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
result = 0;
pair = (((ziU16)entry[0] << 8) + entry[1]);
if (pair != 0) {
goto graph_invalid;
return 0;
}
pair = (((ziU16)entry[2] << 8) + entry[3]);
if (pair == 0) {
goto graph_valid;
}
graph_invalid:
result = 0;
goto graph_done;
graph_valid:
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
entry += 10;
depth = 0;
@@ -182,19 +177,18 @@ graph_valid:
}
while (1) {
if (*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8))) {
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
break;
}
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
if ((end <= (ziU32)entry) ||
(*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8)))) {
if (((ziU32)entry >= end) ||
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
break;
}
}
if (end <= (ziU32)entry) {
result = 0;
break;
if ((ziU32)entry >= end) {
return 0;
}
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
@@ -215,8 +209,7 @@ graph_valid:
depth++;
keys++;
}
}
graph_done:
return result;
}

View File

@@ -17,7 +17,7 @@ typedef struct ziUserKeys {
typedef struct ziChineseEntry {
ziU8 data[9];
ziU8 offsetHigh;
ziU16 offsetLow;
ziU8 offsetLow[2];
} ziChineseEntry;
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
@@ -26,19 +26,22 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
ziU8 remaining, group;
ziU16 value = 0;
int count;
int offset;
ziU8 group;
ziU8 remaining;
ziU16 value;
ziWChar* cursor;
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
ziSearchState search;
ziGetParam request;
ziWChar ordinals[65];
ziU32 savedFormats = ZI_WORK->unk_0x1410;
ziU8 savedCount = ZI_WORK->unk_0x1418;
int length, count, offset;
int length;
int unmatched;
ziChineseEntry* entry;
ziU8* data;
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
ziU32 savedFormats = ZI_WORK->unk_0x1410;
ziU8 savedCount = ZI_WORK->unk_0x1418;
search.flags = 0;
search.word = 0;
search.length = 0;
@@ -52,7 +55,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
}
if (language != 1) {
for (length = 0; word[length] != 0; length++) {
if (word[length] > 0xEFF0 || length == 64) return 0;
if (word[length] >= 0xEFF1 || length == 64) return 0;
}
((ziU8*)&search.length)[0] = length;
((ziU8*)&search.flags)[2] = 1;
@@ -91,21 +94,34 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
if (language == 1) {
length = 0;
do {
if (word[length] == 0) {
count = length - 1;
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
if (ordinals[length] == 0xFFFF) return 0;
length++;
if (length == 64) return 0;
} while (word[length] != 0);
{
if (length == 1) return 1;
count = --length;
ordinals[count] |= 0x8000;
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | entry->offsetLow);
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
if (ZI_WORK->unk_0x16 != 0) {
group = *data & 7;
if (group == 5) offset = 4;
else if (group < 5) {
if (group == 2) offset = 2;
else if (group < 2) offset = 1;
else offset = 3;
} else offset = 1;
switch (*data & 7) {
case 2:
offset = 2;
break;
case 3:
case 4:
offset = 3;
break;
case 5:
offset = 4;
break;
default:
offset = 1;
break;
}
data += offset;
}
if ((*data & 0x80) == 0) return 0;
@@ -134,11 +150,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
}
Zi8LogError(0x2BD, __zi8_work_data);
return 0;
}
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
if (ordinals[length] == 0xFFFF) return 0;
length++;
} while (length != 64);
}
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
return 0;
}
@@ -156,10 +168,9 @@ ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
}
}
found:
if (key < 32) {
if (key == 0) return 0xEFFA;
if (key >= 1 && key <= 9) return key + 0xEFF0;
if (key <= 31) return key + 0xEFF1;
}
if (key >= 32) return 0;
if (key == 0) return 0xEFFA;
if (key >= 1 && key <= 9) return key + 0xEFF0;
if (key <= 31) return key + 0xEFF1;
return 0;
}

View File

@@ -44,13 +44,12 @@ static ziU8 ziNumKeysWithChars(ziU8 language, ziPtr __zi8_work_data) {
}
ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data) {
ziU8 numKeys;
ziU16 tableCount;
ziU8 numKeys;
ziU8* dataAddress;
ziUserKeyMap* customTable;
ziU32 totalCharacters;
ziU16 charCount;
ziU32 keyIndex;
ziU16 keyIndex;
ziWChar* keyChars;
dataAddress = 0;
@@ -93,15 +92,15 @@ tables_ready:
return 0;
}
totalCharacters = 0;
keyIndex = totalCharacters;
tableCount = 0;
keyIndex = tableCount;
for (; (ziU16)keyIndex < key; keyIndex++) {
totalCharacters += dataAddress[(ziU16)keyIndex];
tableCount += dataAddress[(ziU16)keyIndex];
}
if ((charCount = (ziU8)dataAddress[key]) == 0) {
return 0;
}
dataAddress = dataAddress + numKeys + ((totalCharacters & 0xffff) * 2);
dataAddress = dataAddress + numKeys + (tableCount * 2);
keyIndex = 0;
for (; (ziU16)keyIndex < charCount; keyIndex++) {
chars[(ziU16)keyIndex] = (ziU16)dataAddress[(ziU16)keyIndex * 2] |

View File

@@ -23,48 +23,60 @@ ziU8 Zi8DetachOEMdata(ziU8 id ZI_NEED_WORK) {
}
ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word, ziU16 capacity, ziBool complete, ziBool continuation ZI_NEED_WORK) {
ziWChar folded;
ziU8 fallback = 0;
ziU32 index;
ziS32 index;
ziU32 position;
ziU32 fallback = 0;
if (!continuation) ZI_WORK->oemIdx = 0;
index = ZI_WORK->oemIdx;
if ((ziS32)index >= ZI_WORK->oemLen || ZI_WORK->oemMatch == 0) goto noMatch;
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
if (ZI_WORK->oemMatch == 0) goto failed;
capacity--;
if (length >= capacity) goto noMatch;
word[capacity] = 0;
word[length] = complete ? 1 : 0;
for (;;) {
if ((ziS32)index >= ZI_WORK->oemLen || !ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) {
if (length != 1 || !complete || continuation) goto noMatch;
complete = 0;
fallback = 1;
index = 0;
continue;
}
position = 0;
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
for (; (ziS32)position < length; position++) {
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF37F) {
if (word[position] != pattern[position]) {
if (!ZI_WORK->unk_0x1F || language == 1) break;
folded = pattern[position];
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
}
} else if (pattern[position] != Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) break;
}
}
if ((ziS32)position >= length) {
if (fallback) {
*word = *pattern;
return 1;
}
ZI_WORK->oemIdx = index + 1;
while (word[position] != 0) position++;
return position;
}
word[length] = complete ? 1 : 0;
index++;
if ((ziS32)length >= (ziS32)capacity) {
failed:
return 0;
}
noMatch:
word[capacity] = 0;
if (complete) word[length] = 1; else word[length] = 0;
goto matchRetry;
posEntry:
position = 0;
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
for (; (ziS32)position < length; position++) {
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF37F) {
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
break;
} else if (word[position] != pattern[position]) {
if (!ZI_WORK->unk_0x1F || language == 1) break;
folded = pattern[position];
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
}
}
}
if ((ziS32)position < length) {
if (complete) word[length] = 1; else word[length] = 0;
index++;
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
goto matchRetry;
}
if (fallback) {
index = 0;
*word = *pattern;
return 1;
}
index++;
ZI_WORK->oemIdx = index;
while (word[position] != 0) position++;
return position;
matchRetry:
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
if (!ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) goto oemFailed;
goto posEntry;
oemFailed:
if (length != 1 || !complete || continuation) goto tail0;
complete = 0;
fallback = 1;
index = 0;
goto matchRetry;
tail0:
return 0;
}

View File

@@ -1,7 +1,7 @@
#include <revolution/fa.h>
static FAInsertCallback g_attach_func;
static FAEjectCallback g_detach_func;
static FAInsertCallback g_attach_func;
extern s32 uhf_msc_is_media_insert(void);

View File

@@ -24,9 +24,9 @@ char NAND_Org_Path[64];
NAND_DISK_INFO nanddisk_info[23];
NAND_SEMAPHORE csem;
NAND_SEMAPHORE osem;
s32 Nanddisk_Internal_Info_Init;
s32 NAND_Init;
s32 fa_nanad_semid;
s32 Nanddisk_Internal_Info_Init = 0;
s32 NAND_Init = 0;
s32 fa_nanad_semid = 0;
static inline s32 find_disk(PDM_DISK* disk, NAND_DISK_INFO** result) {
NAND_DISK_INFO* info;

View File

@@ -1,9 +1,9 @@
#include <private/fa/puh_msc.h>
static s32 st_uhs_msc_status;
static s32 st_uhs_msc_msgid;
static s32 st_uhs_msc_tskid;
s32 uhg_msc_memid_8169971C;
static s32 st_uhs_msc_tskid;
static s32 st_uhs_msc_msgid;
static s32 st_uhs_msc_status;
static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command);
s32 usbh_msc_read10(UHF_MSC_DEVICE* device, u32 sector, u16 count, void* buffer, void* sense) {

View File

@@ -26,11 +26,10 @@ FAFuncTbl st_uhs_msc_blk_func = {
};
static inline UHF_MSC_DEVICE* uhf_msc_blk_find_device(FADisk* disk) {
UHF_MSC_DEVICE* entry = uhg_msc_blk_device_tbl;
UHF_MSC_DEVICE* device = NULL;
u32 index;
for (index = 0; index < 8; entry++, index++) {
if (entry->disk == disk) {
for (index = 0; index < 8; index++) {
if (uhg_msc_blk_device_tbl[index].disk == disk) {
device = &uhg_msc_blk_device_tbl[index];
break;
}
@@ -88,9 +87,8 @@ s32 uhf_msc_blk_mount(FADisk* disk) {
}
s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* completed) {
u16 transfer_blocks;
UHF_MSC_DEVICE* device;
s32 error;
UHF_MSC_DEVICE* device;
u32 block_size;
u8* transfer_buffer;
u32 transfer_limit;
@@ -129,7 +127,7 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
transfer_buffer = buffer;
}
do {
transfer_blocks = transfer_limit;
u16 transfer_blocks = transfer_limit;
if (blocks <= transfer_limit) {
transfer_blocks = blocks;
}

View File

@@ -10,24 +10,34 @@ pf_s32 pdm_part_is_master_boot_sector(pf_u8* buf, pf_u32 total, pf_bool* p_is_mb
pf_s16 index;
pf_u32 start[4];
pf_u32 count[4];
pf_u32* p_start;
pf_u32* p_count;
*p_is_mbr = 0;
if (buf[510] != 0x55 || buf[511] != 0xAA) { return 2; }
p_start = start;
p_count = count;
for (index = 0; index < 4; index++) {
start[index] = 0;
start[index] = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
count[index] = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
if (start[index] != 0 && count[index] != 0) {
*p_start = 0;
*p_start = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
*p_count = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
if (*p_start != 0 && *p_count != 0) {
if (index == 0) { *p_is_mbr = 1; }
} else {
if (index == 0) { return 2; }
}
p_start++;
p_count++;
buf += 16;
}
p_start = start;
p_count = count;
for (index = 0; index < 4; index++) {
if (start[index] + count[index] > total) {
if (*p_start + *p_count > total) {
if (index == 0) { *p_is_mbr = 0; }
return 2;
}
p_start++;
p_count++;
}
return 0;
}

View File

@@ -1,4 +1,3 @@
#define PF_FA_CP932_TABLE
#define VFiPFCODE_CP932_OEM2Unicode PFCODE_CP932_OEM2Unicode
#define VFiPFCODE_CP932_OEMCharWidth PFCODE_CP932_OEMCharWidth
#define VFiPFCODE_CP932_Unicode2OEM PFCODE_CP932_Unicode2OEM

View File

@@ -1070,7 +1070,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
if (error != 0) { return error; }
if (PFPATH_GetVolumeFromPath(new_path) != volume) { return 0x1F; }
if (volume != PFPATH_GetVolumeFromPath(new_path)) { return 0x1F; }
error = PFPATH_SplitPath((PFDIR_STR*)new_path, &directory, &destination_name);
if (error != 0) { return error; }
if (PFSTR_GetCodeMode(&destination_name) == 2) {

View File

@@ -728,20 +728,23 @@ pf_s32 PFENT_ITER_GetEntryOfIter(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
pf_s32 PFENT_ITER_GetLFNEntryName(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
pf_u32 i;
pf_u32 index;
pf_s32 err;
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
index = 0;
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
pf_u16* destination;
err = PFENT_ITER_Retreat(p_iter, 0);
if (err != 0) return err;
err = PFENT_ITER_LoadEntry(p_iter);
if (err != 0) return err;
destination = &p_ent->long_name[(i * 26U) / 2U];
destination = &p_ent->long_name[index];
pf_memcpy(destination, &p_iter->buf[1], 10);
pf_memcpy(destination + 5, &p_iter->buf[14], 12);
pf_memcpy(destination + 11, &p_iter->buf[28], 4);
index += 13;
}
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) / 2U] = 0;
p_ent->long_name[index] = 0;
}
return 0;
}

View File

@@ -126,6 +126,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
pf_s32 fat_offset;
pf_u32 fat_sector;
pf_s32 result;
pf_u32 next_sector;
fat_offset = (pf_u16)(cluster + (cluster >> 1));
fat_sector = (pf_u16)(p_vol->bpb.active_FAT_sector + (fat_offset >> p_vol->bpb.log2_bytes_per_sector));
offset_in_sector = fat_offset & (p_vol->bpb.bytes_per_sector - 1);
@@ -146,10 +147,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
p_page->p_buf[(pf_u16)offset_in_sector] = (p_page->p_buf[(pf_u16)offset_in_sector] & 0xF) | ((value << 4) & 0xF0);
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
FLUSH_FAT_BUFFER();
offset_in_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
next_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
if (err != 0) { return err; }
p_page->sector = offset_in_sector;
p_page->sector = next_sector;
p_page->p_buf[0] = value >> 4;
} else {
((pf_u16)offset_in_sector + p_page->p_buf)[1] = value >> 4;
@@ -158,10 +159,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
p_page->p_buf[(pf_u16)offset_in_sector] = value;
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
FLUSH_FAT_BUFFER();
offset_in_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
next_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
if (err != 0) { return err; }
p_page->sector = offset_in_sector;
p_page->sector = next_sector;
p_page->p_buf[0] = (p_page->p_buf[0] & 0xF0) | ((pf_u8)(value >> 8));
} else {
((pf_u16)offset_in_sector + p_page->p_buf)[1] = (((pf_u16)offset_in_sector + p_page->p_buf)[1] & 0xF0) | ((pf_u8)(value >> 8));

View File

@@ -102,7 +102,7 @@ pf_s32 PFFAT16_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_u32 cluster, pf_u32 val
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, fat_sector, 0, p_vol->bpb.bytes_per_sector);
}
p_page->p_buf[offset_in_sector] = value;
(offset_in_sector + p_page->p_buf)[1] = value >> 8;
p_page->p_buf[offset_in_sector + 1] = value >> 8;
if (err != 0) {
result = err;
}

View File

@@ -58,7 +58,7 @@ void* pfstub_entry(void* argument) {
pf_vol_set.context_id = message->task_id;
if (message->operation >= 0 && message->operation < 100) {
pfstub_call_function_standard(message);
} else if (received->operation >= 100 && received->operation < 200) {
} else if (((s32*)received)[1] >= 100 && ((s32*)received)[1] < 200) {
pfstub_call_function_unicode(message);
} else {
message->result.status = -1;

View File

@@ -851,15 +851,15 @@ USBKBDErr KBDSetModState(u32 channel, u32 value) {
}
u16 KBDTranslateHidCode(u32 keyCode, u32 modifiers, s32 country) {
KBDKeyMap* map;
u16* table;
u32 keyIndex;
u16 entry;
s32 mask;
u16* table;
u16 activeFlag;
u16 entry;
KBDKeyMap* map;
s32 offset;
s32 group;
u32 shiftFlag;
u16 activeFlag;
u32 keyIndex;
if (kbdInitialized == FALSE) {
return 0xFFFF;
@@ -920,9 +920,9 @@ u16 KBDTranslateHidCode(u32 keyCode, u32 modifiers, s32 country) {
shiftFlag <<= offset;
activeFlag = shiftFlag;
if (mask == 0 && (activeFlag & entry) != 0) {
if (mask == 0 && (entry & activeFlag) != 0) {
offset = offset ^ ((modifiers >> 9) & 1);
} else if (mask == 0x8000 && (activeFlag & entry) != 0) {
} else if (mask == 0x8000 && (entry & activeFlag) != 0) {
u32 numLockShift = 0;
if ((s32)(modifiers & 0x100) == 0x100 && offset == 0) {
numLockShift = 1;

View File

@@ -268,10 +268,10 @@ void KPADSetPosParam(s32 chan, f32 x, f32 y) {
}
static void reset_kpad(KPADInside* kpad) {
f32 sensorDistance;
f32 upperY;
f32 distanceValue;
f32 zero;
f32 upperY;
f32 sensorDistance;
f32 lowerY;
f32 one;
f32 negativeOne;
@@ -1607,8 +1607,8 @@ static void KPADiSamplingCallback(s32 chan) {
u32 device;
if (WPADProbe(chan, &device) != -1) {
u8 index = kpad->ringIndex;
KPADSample* status;
u32 tier;
KPADSample* status;
u32 enabled;
u32 tableIndex;
if (index >= 16) {

View File

@@ -156,10 +156,10 @@ void KPRInitRegionUS(void) {
}
void KPRInitQueue(KPRQueue* queue) {
static u8 once;
if (!once) {
static union { u64 align; u8 flag; } once;
if (!once.flag) {
OSRegisterVersion(__KPRVersion);
once = TRUE;
once.flag = TRUE;
}
queue->mode = KPR_MODE_ALT_KEYPAD;
queue->oCount = 0;
@@ -244,10 +244,9 @@ u8 KPRLookAhead(KPRQueue* queue, u16* destination, u32 capacity) {
BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
if (queue->altVal != 0) {
u32 leadingZero = queue->altVal & 0x80000000;
u32 accumulator = queue->altVal;
u32 accumulator = queue->altVal & 0x7FFFFFFF;
u32 value;
accumulator &= 0x7FFFFFFF;
u32 leadingZero = queue->altVal & 0x80000000;
queue->altVal = accumulator;
if (character >= 0xF130 && character <= 0xF139) {
if (accumulator > 0x6666666) {
@@ -302,7 +301,7 @@ BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
void KPRProcessDeadKeys(KPRQueue* queue) {
int index;
int firstFallback;
int secondFallback;
u32 secondFallback;
if (queue->iCount == 1) {
for (index = 0; index < 107; ++index) {
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent) {
@@ -313,17 +312,15 @@ void KPRProcessDeadKeys(KPRQueue* queue) {
queue->iCount = 0;
return;
}
firstFallback = 0;
secondFallback = 107;
for (index = 0; index < 107; ++index) {
u16 first = queue->text[queue->oCount];
if (first == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
queue->text[queue->oCount] = kprDeadKeyMap[index].composed;
queue->iCount = 0;
++queue->oCount;
return;
}
if (first == kprDeadKeyMap[index].accent && first == kprDeadKeyMap[index].base) {
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount] == kprDeadKeyMap[index].base) {
firstFallback = index;
}
if (queue->text[queue->oCount + 1] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {

View File

@@ -367,7 +367,8 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
} else {
snprintf(endpoint, endpointSize, "https://%s/nus/services/NetUpdateSOAP", serverAddress);
requestSize = strlen(messageId) + strlen(productArea);
requestSize += strlen(countryCode) + 0x449;
unsigned long countryLength = strlen(countryCode);
requestSize += countryLength + 0x449;
if (auditData != 0) {
requestSize += strlen(auditData);
}
@@ -1174,7 +1175,7 @@ static inline s32 __nupGetBoot2Version(u16* version) {
if (result == 0) {
u16 checkedVersion = bootVersion;
*version = checkedVersion;
result = checkedVersion == bootVersion ? result : -0x1389;
if (checkedVersion != bootVersion) { result = -0x1389; }
}
return result;
}
@@ -1224,9 +1225,9 @@ static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
extern "C" void* __nupOp(void* argument) {
u8* response = 0;
ESTmdView* tmdView = 0;
char* auditData = 0;
u32 needsAudit;
u32 currentDeviceId;
u32 needsAudit;
char* auditData = 0;
s32 result;
u16 serverBootVersion = 0;
u16 bootTitleVersion;

View File

@@ -562,9 +562,9 @@ static s32 WAD_815BFFA8(WADImportLoopArgs* args) {
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags,
WADProcessCallback processCallback) {
s32 result = 0;
ESTitleMeta* titleMeta;
void* firstBuffer = 0;
void* secondBuffer = 0;
ESHash* sharedContentHashes = 0;
ESContentId* installedContentIds = 0;
ESContentMeta* matchingContents = 0;
u32 importedBytes = 0;
u32 contentCount;
u32 headerReadSize;
@@ -574,11 +574,11 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
WADThreadStack* threadStack = 0;
s32 contentFd;
s32 titleImportStarted = FALSE;
ESTitleMeta* installedTitleMeta = 0;
ESContentId* installedContentIds = 0;
ESTitleMeta* titleMeta;
void* firstBuffer = 0;
s32 contentImportStarted = FALSE;
ESContentMeta* matchingContents = 0;
ESHash* sharedContentHashes = 0;
void* secondBuffer = 0;
ESTitleMeta* installedTitleMeta = 0;
WADStream stream;
WADUnpackInfo unpackInfo;
WADSaveDataHeader wadHeader ALIGN32;
@@ -1177,8 +1177,8 @@ cleanup:
static s32 WAD_815C1288(WADExportLoopArgs* args) {
ESFd fd = args->fd;
u32 remaining = args->size;
u32 size;
u32 remaining = args->size;
u32 bufferIndex = 0;
WADImportTransfer* transfer = args->transfer;
s32 result = 0;

View File

@@ -8,10 +8,10 @@ extern u32 CDBGetInitialCode();
extern void CDBLock();
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
extern void CDBUnlock();
extern void CDBDatabaseFree();
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
extern void CDBRecordCreateAtOnce();
extern void CDBRecordInitDescriptor();
extern void CDBRecordIsExistFile();
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
extern void CDBRecordOpenReadOnly();
extern void CDBRecordKeyArrayInit();
extern void CDBRecordKeyArraySetReverse();
@@ -157,59 +157,27 @@ CDBErr CDBDatabaseOpen(CDBDatabase* database) {
return result;
}
asm CDBErr CDBDatabaseClose(CDBDatabase* database) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x10(r1)
mflr r0
stw r0, 0x14(r1)
stw r31, 0xc(r1)
stw r30, 0x8(r1)
mr r30, r3
bl CDBLock
lwz r31, 0x8(r30)
cmpwi r31, 0x0
beq L_8148746C
addis r3, r31, 0x1
lwz r0, -0x3ff0(r3)
cmpwi r0, 0x0
bne L_8148749C
L_8148746C:
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487494
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B528@ha
addi r3, r3, lbl_8166B528@l
crclr 4*cr1+eq
bl OSReport
L_81487494:
li r31, 0x1b
b L_814874C4
L_8148749C:
mr r3, r30
bl CDBDatabaseFree
cmpwi r3, 0x0
beq L_814874B4
mr r31, r3
b L_814874C4
L_814874B4:
addis r3, r31, 0x1
li r0, 0x0
stw r0, -0x3ff0(r3)
li r31, 0x0
L_814874C4:
bl CDBUnlock
mr r3, r31
lwz r31, 0xc(r1)
lwz r30, 0x8(r1)
lwz r0, 0x14(r1)
mtlr r0
addi r1, r1, 0x10
blr
#endif
CDBErr CDBDatabaseClose(CDBDatabase* database) {
CDBErr result;
CDBErr status;
CDBDatabaseState* instance;
CDBLock();
instance = database->instance;
if (instance == NULL || instance->flags == 0) {
CDBReportError(lbl_8166B528);
result = CDB_ERROR_27;
} else {
status = CDBDatabaseFree(database);
if (status != CDB_ERROR_OK) {
result = status;
} else {
instance->flags = 0;
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
}
CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, char* makerCodeStr, char* gameCodeStr) {
@@ -525,72 +493,24 @@ asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
#endif
}
asm CDBErr CDBDatabaseFindByKey() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r5
stw r30, 0x18(r1)
mr r30, r4
stw r29, 0x14(r1)
mr r29, r3
bl CDBLock
mr r3, r31
bl CDBRecordKeyIsValid
cmpwi r3, 0x0
bne L_81487ABC
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487AB4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5A8@ha
addi r3, r3, lbl_8166B5A8@l
crclr 4*cr1+eq
bl OSReport
L_81487AB4:
li r31, 0x5
b L_81487B14
L_81487ABC:
mr r3, r30
mr r4, r29
mr r5, r31
bl CDBRecordInitDescriptor
mr r3, r30
bl CDBRecordIsExistFile
cmpwi r3, 0x0
bne L_81487B10
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487B08
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5B8@ha
mr r4, r31
addi r3, r3, lbl_8166B5B8@l
crclr 4*cr1+eq
bl OSReport
L_81487B08:
li r31, 0x23
b L_81487B14
L_81487B10:
li r31, 0x0
L_81487B14:
bl CDBUnlock
mr r3, r31
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
#endif
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
CDBErr result;
CDBLock();
if (!CDBRecordKeyIsValid(recordKey)) {
CDBReportError(lbl_8166B5A8);
result = CDB_ERROR_5;
} else {
CDBRecordInitDescriptor(record, database, recordKey);
if (!CDBRecordIsExistFile(record)) {
CDBReportError(lbl_8166B5B8, recordKey->keyString);
result = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
}
CDBErr CDBDatabaseSearchConditionsIsMatch(CDBSearchConditions* conditions, char* key) {

View File

@@ -6,13 +6,10 @@
#include <stdlib.h>
#include <string.h>
#pragma push
#pragma section sconst_type ".sdata"
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
#pragma pop
char CDBFSPathSeparator = '/';
void CDBFSConcatenatePath(char* path, const char* concatPath) {
strcat(path, lbl_816979E8);
strcat(path, &CDBFSPathSeparator);
strcat(path, concatPath);
}

View File

@@ -347,6 +347,10 @@ NWC24Err NWC24SetDlPriority(NWC24DlTask* dlTask, u8 dlPriority) {
static inline void ReadDlTaskIdentifier(const NWC24DlTask* dlTask, u16* identifier) {
*identifier = ((const DlTaskData*)dlTask)->id;
}
static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
NWC24Work* work = NWC24WorkP;
DlTaskListHeader* header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
@@ -358,7 +362,7 @@ static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
else if (task->id != 0xffff && task->id >= header->maxTaskCount) { result = NWC24_ERR_INVALID_VALUE; }
else { result = NWC24_OK; }
if (result != NWC24_OK) { return result; }
taskId = task->id;
ReadDlTaskIdentifier(dlTask, &taskId);
if (taskId == 0xffff) { return NWC24_ERR_FAILED; }
time /= 60;
header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
@@ -421,7 +425,7 @@ NWC24Err NWC24SetDlInterval(NWC24DlTask* dlTask, u16 dlInterval) {
}
}
if (result == NWC24_OK) {
taskId = task->id;
ReadDlTaskIdentifier(dlTask, &taskId);
if (taskId != 0xffff) {
nextTime /= 60;
if (work != NULL) {
@@ -543,12 +547,12 @@ NWC24Err NWC24DumpDlTask(NWC24DlTask* dlTask) {
}
NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
NWC24Err result;
DlTaskListHeader* entriesHeader;
NWC24Work* work;
u16 taskId;
u16 maxTaskCount;
DlTaskListHeader* header;
DlTaskListHeader* entriesHeader;
NWC24Err result;
if (NWC24WorkP != NULL) {
header = (DlTaskListHeader*)NWC24WorkP->dlHead;
@@ -580,7 +584,7 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
}
entriesHeader = (DlTaskListHeader*)work->dlHead;
do {
while (taskId < (work == NULL ? (DlTaskListHeader*)NULL : entriesHeader)->maxTaskCount) {
header = work != NULL ? entriesHeader : NULL;
if (taskId >= header->maxTaskCount || taskId == 0xffff) {
result = NWC24_ERR_INVALID_VALUE;
@@ -594,20 +598,20 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
return NWC24_OK;
}
taskId++;
} while (taskId < (work != NULL ? entriesHeader : (DlTaskListHeader*)NULL)->maxTaskCount);
}
return NWC24_ERR_DONE;
}
NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIterateId) {
DlTaskIterationState* state = (DlTaskIterationState*)dlIterateWork;
s32 (*getValue)(NWC24DlId);
NWC24DlId taskId;
s32 value;
BOOL descending;
BOOL passesSelected;
BOOL bestCandidate;
NWC24Err result;
BOOL found = FALSE;
s32 (*getValue)(NWC24DlId);
NWC24Err result;
if (state->valid == 0) {
return NWC24_ERR_INVALID_VALUE;
@@ -635,8 +639,8 @@ NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIt
if (value == state->comparisonValue && (s32)state->comparisonId < (s32)taskId) {
*dlIterateId = taskId;
state->comparisonValue = value;
state->selectedValue = value;
state->comparisonId = taskId;
state->selectedValue = value;
return NWC24_OK;
}
result = NWC24IterateDlTask(&taskId, FALSE);
@@ -714,6 +718,16 @@ static inline NWC24Err CheckDlTaskRetry(NWC24DlTask* dlTask, u8 retryCount) {
if ((retryMask & (1 << retryCount)) == 0) { return NWC24_ERR_DISABLED; }
return NWC24_OK;
}
static inline NWC24Err UpdateDlTaskAccessTime(NWC24DlTask* dlTask) {
OSTime universalTime;
NWC24Err result = NWC24iGetUniversalTime(&universalTime);
if (result >= NWC24_OK) {
result = SetDlTaskAccessTime(dlTask, universalTime);
if (result < NWC24_OK) { return result; }
}
return result;
}
NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
DlTaskData* task = (DlTaskData*)dlTask;
DlTaskListHeader* header;
@@ -725,11 +739,7 @@ NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
if (result != NWC24_OK) { return result; }
taskId = task->id;
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
result = NWC24iGetUniversalTime(&universalTime);
if (result >= NWC24_OK) {
result = SetDlTaskAccessTime(dlTask, universalTime);
if (result < NWC24_OK) { return result; }
}
result = UpdateDlTaskAccessTime(dlTask);
if (result < NWC24_OK) { return result; }
result = ValidateDlTask(dlTask, TRUE);
if (result == NWC24_OK) {
@@ -778,23 +788,26 @@ NWC24Err NWC24AddDlTask(NWC24DlTask* dlTask) {
result = CheckDlTaskListHeader(header);
if (result < NWC24_OK) { return result; }
result = AddTaskInternal(dlTask, GetCachedDlHeader()->taskCount, GetCachedDlHeader()->maxTaskCount);
if (result < NWC24_OK) { return result; }
universalTime = 0;
result = NWC24iGetUniversalTime(&universalTime);
if (result < NWC24_OK) { return result; }
{
s32 intervalSeconds;
s64 nextTime;
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
nextTime = universalTime + intervalSeconds;
return SetDlTaskNextTime(dlTask, nextTime);
if (result >= NWC24_OK) {
universalTime = 0;
result = NWC24iGetUniversalTime(&universalTime);
if (result < NWC24_OK) { return result; }
{
s32 intervalSeconds;
s64 nextTime;
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
nextTime = universalTime + intervalSeconds;
return SetDlTaskNextTime(dlTask, nextTime);
}
}
return result;
}
NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
DlTaskListHeader* header;
NWC24File file;
DlTaskData* task = (DlTaskData*)dlTask;
NWC24Err result;
NWC24Err operationResult;
@@ -847,7 +860,7 @@ NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
if (operationResult < NWC24_OK) {
result = operationResult;
} else {
operationResult = NWC24FRead(dlTask, 0x200, &file);
operationResult = NWC24FRead(task, 0x200, &file);
result = NWC24_OK;
if (operationResult < NWC24_OK) {
result = operationResult;
@@ -879,17 +892,13 @@ NWC24Err NWC24PurgeOldestDlTask() {
state.initialized = 1;
state.valid = 1;
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
while (result == NWC24_OK) {
while ((result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId)) == NWC24_OK) {
header = GetCachedDlHeader();
if (taskId >= header->taskCount) { break; }
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
}
if (result == NWC24_ERR_DONE) {
return NWC24_ERR_FAILED;
}
if (result < NWC24_OK) {
if (result == NWC24_ERR_DONE) { result = NWC24_ERR_FAILED; }
return result;
}
@@ -1014,9 +1023,7 @@ NWC24Err NWC24ExtendDlTaskList(u32 num) {
result = WriteDlHeader(&file);
closeList:
closeResult = NWC24FClose(&file);
if (result != NWC24_OK) {
closeResult = result;
}
closeResult = result != NWC24_OK ? result : closeResult;
result = NWC24iLoadDlHeader();
if (closeResult != NWC24_OK) {
result = closeResult;
@@ -1215,13 +1222,16 @@ static inline NWC24Err ValidateDlTaskUrl(NWC24DlTask* dlTask) {
DlTaskListHeader* header = GetCachedDlHeader();
NWC24Err result;
if (task->id >= header->maxTaskCount && task->id != 0xffff) { return NWC24_ERR_INVALID_VALUE; }
result = NWC24iCheckStringLength(task->url, 7, 0x100);
if (result >= NWC24_OK) {
if (strncmp(task->url, "http://", 7) != 0 && strncmp(task->url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
else { result = NWC24_OK; }
{
const char* url = task->url;
result = NWC24iCheckStringLength(url, 7, 0x100);
if (result >= NWC24_OK) {
if (strncmp(url, "http://", 7) != 0 && strncmp(url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
else { result = NWC24_OK; }
}
if (result < NWC24_OK) { return result; }
return NWC24_OK;
}
if (result < NWC24_OK) { return result; }
return NWC24_OK;
}
static inline NWC24Err FindFreeDlTask(NWC24DlTask* dlTask, u16 taskCount, u16 maxTaskCount) {
@@ -1251,11 +1261,7 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
if (result != NWC24_OK) { return result; }
taskId = task->id;
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
result = NWC24iGetUniversalTime(&universalTime);
if (result >= NWC24_OK) {
result = SetDlTaskAccessTime(dlTask, universalTime);
if (result < NWC24_OK) { return result; }
}
result = UpdateDlTaskAccessTime(dlTask);
if (result < NWC24_OK) { return result; }
result = ValidateDlTask(dlTask, TRUE);
if (result == NWC24_OK) {
@@ -1263,9 +1269,7 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
task->unknown_0x1a = 0;
}
if (task->retryEnabled == 1) {
for (;;) {
result = CheckDlTaskRetry(dlTask, task->retryCount);
if (result != NWC24_ERR_DISABLED) { break; }
while ((result = CheckDlTaskRetry(dlTask, task->retryCount)) == NWC24_ERR_DISABLED) {
task->retryCount = (task->retryCount + 1) & 0x1f;
}
if (result < NWC24_OK) { return result; }

208
sol-high-attempts.jsonl Normal file

File diff suppressed because one or more lines are too long

47
sol-high-results.txt Normal file
View File

@@ -0,0 +1,47 @@
Final matching audit
src/scene/sdChannelSelect/iplSDChannelSelect: exact 114/129 -> 116/129; objdiff code 25472 -> 26472/33828; data 224 -> 224/2960
create__Q33ipl5scene15SDChannelSelectFv | objdiff 97.73972% | 145/146 instructions; BS2 loop uses different retained manager/string bases | 7 distinct source attempts, 6 compiled
handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | objdiff 99.15205% | 170/171 instructions; timer branch form and loop register selection | 5 distinct source attempts, 5 compiled
collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.81188% | 101/101 instructions; count increment and threshold loads scheduled differently | 7 distinct source attempts, 7 compiled
collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.833336% | 102/102 instructions; count increment and threshold loads scheduled differently | 7 distinct source attempts, 7 compiled
collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.29365% | 126/126 instructions; title registers, indexed operand order, threshold-load scheduling | 7 distinct source attempts, 7 compiled
collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.55125% | 361/361 instructions; four count-increment/threshold-load schedules | 7 distinct source attempts, 7 compiled
flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | objdiff 99.65714% | 35/35 instructions; heap and save-manager loads occur in reversed order | 3 distinct source attempts, 3 compiled
calcCommon__Q33ipl5scene15SDChannelSelectFv | objdiff 99.07407% | 109/108 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | objdiff 95.35849% | 153/159 instructions; state-range branches, switch lowering, and register selection | 7 distinct source attempts, 7 compiled
initializeNormalPage__Q33ipl5scene15SDChannelSelectFv | objdiff 98.93617% | 95/94 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
selectChannel__Q33ipl5scene15SDChannelSelectFii | objdiff 98.305084% | 60/59 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | objdiff 93.4721% | 233/233 instructions; floating-point evaluation order and register allocation | 3 distinct source attempts, 3 compiled
onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface | objdiff 98.541664% | 144/144 instructions; event branch form and opt-out argument setup | 6 distinct source attempts, 4 compiled
src/keyboard/tiCandidateBox: exact 103/112 -> 104/112; objdiff code 17212 -> 17996/24000; data 1132 -> 1132/4652
create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | objdiff 92.71023% | 351/352 instructions; inlined initialization loop and retained pane-name addresses | 4 distinct source attempts, 4 compiled
createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | objdiff 96.56481% | 214/216 instructions; inlined constructor/vtable lifetime and register selection | 3 distinct source attempts, 3 compiled
CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | objdiff 99.78161% | 435/435 instructions; 18 floating-point register differences | 7 distinct source attempts, 7 compiled
GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl | objdiff 100.0% | 130/130 instructions; eight unresolved SDA21 base-register fields; C conversion left 12 register differences and was restored to preserve baseline objdiff 100% | 10 distinct source attempts, 10 compiled
GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | objdiff 99.57365% | 129/129 instructions; 11 floating-point register differences | 11 distinct source attempts, 11 compiled
StartScroll__Q39textinput12candidatebox10UITextAreaFl | objdiff 99.78378% | 185/185 instructions; eight floating-point register differences | 12 distinct source attempts, 12 compiled
StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl | objdiff 99.809784% | 184/184 instructions; seven floating-point register differences | 12 distinct source attempts, 12 compiled
onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input | objdiff 100.0% | 450/450 instructions; objdiff 100%; gate misnormalizes two CR1 branches using the CR operand instead of the branch destination | 3 distinct source attempts, 3 compiled
src/keyboard/tiCellPhone: exact 83/86 -> 83/86; objdiff code 12824 -> 12824/19028; data 3860 -> 3860/3860
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | objdiff 99.67009% | 682/682 instructions; 37 register differences across inlined lookup scopes | 7 distinct source attempts, 7 compiled
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | objdiff 99.8949% | 333/333 instructions; seven register differences in the toggle animation loop | 10 distinct source attempts, 9 compiled
init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | objdiff 98.52612% | 536/536 instructions; 155 register differences; same frame and operation sequence; no tested lifetime/declaration change fixed allocation | 6 distinct source attempts, 6 compiled
Open-function audit: 24 functions; minimum 3 source attempts each.
No shared keyboard headers were edited. No configuration or target symbol sizes were edited.
The 83/86 CellPhone instruction-exact count did not improve. Its create fuzzy score improved from 99.81982% to 99.8949%.
CandidateBox has two objdiff-100 functions excluded by the raw instruction gate: GetNextPageIdx and onGUIEvent. Raw relocation fields and CR1 branch normalization account for that discrepancy; no gate tools were changed.
String pools remain identical. Object data percentages are partial in SDChannelSelect and CandidateBox; this run does not claim unit completion.
Writing skill applied: unslop.
Final full gate: GATE PASS
Regressions vs baseline: 0
Forbidden patterns: 0
Readability warnings: 0
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d

File diff suppressed because it is too large Load Diff

View File

@@ -17,7 +17,7 @@ extern "C" void __dt__Q34nw4r3snd11SoundHandleFv(nw4r::snd::SoundHandle*, int);
namespace homebutton {
bool Controller::sBatteryFlag[WPAD_MAX_CONTROLLERS];
bool Controller::lbl_816989BC[WPAD_MAX_CONTROLLERS];
bool Controller::sAlarmCreated[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarm[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
@@ -83,10 +83,10 @@ namespace homebutton {
if (chan < WPAD_MAX_CONTROLLERS) {
sBatteryFlag[chan] = false;
OSReport("Create %d\n", chan);
if (!lbl_816989BC[chan]) {
if (!sAlarmCreated[chan]) {
OSCreateAlarm(&sAlarm[chan]);
OSCreateAlarm(&sAlarmSoundOff[chan]);
lbl_816989BC[chan] = true;
sAlarmCreated[chan] = true;
}
sThis[chan] = this;
}

View File

@@ -12,11 +12,11 @@ namespace ext_ead {
}
}
extern "C" char lbl_816962F8[] = "ERROR?\n";
extern "C" char lbl_81643B40[] = " TextureBuffer_ %d:%d ptr:%p\n";
extern "C" char lbl_81643B5E[] = "INFO: cannot create browser window\n";
extern "C" char scWwwErrorQ[] = "ERROR?\n";
extern "C" char scWwwTexBufFmt[] = " TextureBuffer_ %d:%d ptr:%p\n";
extern "C" char scWwwNoBrowserWin[] = "INFO: cannot create browser window\n";
#define OSReport(...) OSReport(lbl_816962F8)
#define OSReport(...) OSReport(scWwwErrorQ)
#include "iplwww/www_window.h"
#undef OSReport
@@ -76,12 +76,12 @@ namespace ext_ead {
memset(mTexBufArr[i][j], 0, texBufSize);
DCStoreRange(mTexBufArr[i][j], texBufSize);
print::IPLWWWReport(print::WWW_DEBUG, lbl_81643B40, j, i, mTexBufArr[i][j]);
print::IPLWWWReport(print::WWW_DEBUG, scWwwTexBufFmt, j, i, mTexBufArr[i][j]);
}
}
if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) {
print::IPLWWWReport(print::WWW_WARNING, lbl_81643B5E);
print::IPLWWWReport(print::WWW_WARNING, scWwwNoBrowserWin);
return NULL;
} else {
WWWRect rect = {0, 0, 0, 0};

View File

@@ -20,6 +20,16 @@ protected:
namespace extend {
namespace memo {
class EventHandler : public inputform::EventHandler {
public:
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
virtual ~EventHandler() {}
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
private:
InputForm* mpMemoForm;
};
class AnmPane : public nw4rmanager::AnmPane {
protected:
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
@@ -28,8 +38,8 @@ public:
virtual ~AnmPane();
virtual void init();
virtual void changeAnimation(u32 id);
virtual u32 getState();
virtual u32 getKeyType() const;
virtual u32 getState();
protected:
u32 meState;
u32 meKeyType;
@@ -49,13 +59,6 @@ public:
virtual void onAnmEvent(AnmPaneEvent event);
};
class SimpleAnmPane : public nw4rmanager::AnmPane {
public:
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
virtual ~SimpleAnmPane() {}
virtual void init();
virtual void changeAnimation(u32 id);
};
class ScrollButton {
public:
@@ -74,15 +77,16 @@ private:
bool mbRightPressed;
};
class EventHandler : public inputform::EventHandler {
class SimpleAnmPane : public nw4rmanager::AnmPane {
public:
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
virtual ~EventHandler() {}
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
private:
InputForm* mpMemoForm;
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
virtual ~SimpleAnmPane() {}
virtual void init();
virtual void changeAnimation(u32 id);
};
static const char* scPaneName[] = {
"N_Header", "N_Body", "B_Body", "N_Footer", "Nigaoe",
"T_Nigaoe", "B_Nigaoe", "T_Letter", "T_TouchLetter"

View File

@@ -1,3 +1,4 @@
#define TI_CANDIDATEBOX_IMPLEMENTATION
#include "keyboard/tiCandidateBox.h"
#include "keyboard/tiManager.h"
@@ -407,8 +408,9 @@ namespace textinput {
}
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
CandidateTextAnmPane* pane;
for (u16 i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
CandidateTextAnmPane* pane = NULL;
pane = NULL;
const PaneToAnimation& p = lbl_8165D2F8.panes[i];
switch (p.type) {
case KT_ScrollButton: {
@@ -1052,9 +1054,11 @@ namespace textinput {
f32 fontSizeWidth = pTextBox->GetFontSize().width;
f32 charSpace = pTextBox->GetCharSpace();
f32 acc = 0.0f;
for (int i = 0; text[i] != L'\0'; i++) {
const wchar_t* character = text;
while (*character != L'\0') {
acc += charSpace;
acc += f->GetCharWidth(text[i]);
acc += f->GetCharWidth(*character);
++character;
}
return acc * (fontSizeWidth / f->GetWidth()) + 0.01f;
}
@@ -1237,7 +1241,7 @@ namespace textinput {
}
void UITextArea::Draw(const nw4r::lyt::DrawInfo& drawInfo) {
// NONMATCHING
textdrawer::Base::ViewPort viewport;
s32 selected = GetSelectedPaneIdx();
if (!IsScrolling()) {
for (u32 i = 0; i < NUM_PANES; i++) {
@@ -1247,31 +1251,26 @@ namespace textinput {
}
}
struct {
f32 left;
f32 width;
} scissor;
nw4r::ut::Rect r = mpTextAreaPane->getPane()->GetPaneRect(drawInfo);
// TODO - These vectors are zero-initialized using GPRs first...
Vec v1 = {0, 0, 0};
Vec v2 = {0, 0, 0};
v1.x = r.left;
v1.y = r.top;
Vec v2 = {0, 0, 0};
v2.x = r.right;
v2.y = r.bottom;
MTXMultVec(mpTextAreaPane->getTextPane()->GetGlobalMtx(), &v1, &v1);
MTXMultVec(mpTextAreaPane->getTextPane()->GetGlobalMtx(), &v2, &v2);
u32 left, top, wd, ht;
GXGetScissor(&left, &top, &wd, &ht);
// TODO - These floats need to be stored to the stack
f32 scale = 640.0f / mfScreenWidth;
scissor.left = v1.x + mfScreenWidth / 2.0f;
scissor.left += scissor.left * (scale - 1.0f);
scissor.width = scale * (v2.x - v1.x);
GXSetScissor(scissor.left, top, scissor.width, ht);
viewport.xOrig = v1.x + mfScreenWidth / 2.0f;
viewport.xOrig += viewport.xOrig * (scale - 1.0f);
viewport.wd = scale * (v2.x - v1.x);
GXSetScissor(viewport.xOrig, top, viewport.wd, ht);
mpTextsPane->getPane()->Draw(drawInfo);
if (!IsScrolling()) {
GXSetScissor(left, top, (scissor.width + scissor.left) - left, ht);
GXSetScissor(left, top, (viewport.wd + viewport.xOrig) - left, ht);
for (u32 i = 0; i < NUM_PANES; i++) {
if (i == selected || mpTextAnmPane[i]->getState() == ANM_FocusOut) {
mpTextBoxPane[i]->getPane()->SetVisible(true);
@@ -1282,153 +1281,28 @@ namespace textinput {
GXSetScissor(left, top, wd, ht);
}
extern "C" asm void GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl() {
nofralloc
stwu r1, -0xc0(r1)
mflr r0
stw r0, 0xc4(r1)
stfd f31, 0xb0(r1)
psq_st f31, 0xb8(r1), 0, 0
stfd f30, 0xa0(r1)
psq_st f30, 0xa8(r1), 0, 0
stfd f29, 0x90(r1)
psq_st f29, 0x98(r1), 0, 0
stfd f28, 0x80(r1)
psq_st f28, 0x88(r1), 0, 0
stfd f27, 0x70(r1)
psq_st f27, 0x78(r1), 0, 0
stfd f26, 0x60(r1)
psq_st f26, 0x68(r1), 0, 0
stfd f25, 0x50(r1)
psq_st f25, 0x58(r1), 0, 0
stfd f24, 0x40(r1)
psq_st f24, 0x48(r1), 0, 0
stfd f23, 0x30(r1)
psq_st f23, 0x38(r1), 0, 0
addi r11, r1, 0x30
bl _savegpr_24
lfs f0, lbl_81694DA8(r2)
mr r24, r3
lfs f1, 0x1fc(r3)
mr r25, r4
lwz r5, 0xd8(r3)
fdivs f25, f0, f1
lfs f0, lbl_81694DB4(r2)
lwz r5, 0x9c(r5)
lwz r3, 0x38(r3)
lfs f31, 0x4c(r5)
lwz r27, 0x9c(r3)
fcmpo cr0, f1, f0
ble GetNextPageIdx_L1
lfs f28, lbl_81694DAC(r2)
b GetNextPageIdx_L2
GetNextPageIdx_L1:
lfs f28, lbl_81694DB0(r2)
GetNextPageIdx_L2:
fneg f23, f28
lfd f29, lbl_81694DC8(r2)
lfs f30, lbl_81694DBC(r2)
mr r26, r25
slwi r28, r4, 7
lis r31, 0x4330
b GetNextPageIdx_L3
GetNextPageIdx_L4:
lwz r0, 0x1e8(r24)
cmpw r26, r0
bne GetNextPageIdx_L5
li r3, -1
b GetNextPageIdx_L6
GetNextPageIdx_L5:
lwz r0, 0x204(r24)
add r0, r0, r28
addic. r30, r0, 4
bne GetNextPageIdx_L7
lfs f0, lbl_81694D90(r2)
b GetNextPageIdx_L8
GetNextPageIdx_L7:
mr r3, r27
bl GetFont__Q34nw4r3lyt8TextBoxCFv
lfs f26, 0xe4(r27)
mr r29, r3
lfs f24, 0xf0(r27)
lfs f27, lbl_81694D90(r2)
b GetNextPageIdx_L9
GetNextPageIdx_L10:
lwz r12, 0(r29)
fadds f27, f27, f24
mr r3, r29
lwz r12, 0x48(r12)
mtctr r12
bctrl
xoris r0, r3, 0x8000
stw r31, 8(r1)
addi r30, r30, 2
stw r0, 0xc(r1)
lfd f0, 8(r1)
fsubs f0, f0, f29
fadds f27, f27, f0
GetNextPageIdx_L9:
lhz r4, 0(r30)
cmpwi r4, 0
bne GetNextPageIdx_L10
lwz r12, 0(r29)
mr r3, r29
lwz r12, 0xc(r12)
mtctr r12
bctrl
xoris r0, r3, 0x8000
stw r31, 8(r1)
stw r0, 0xc(r1)
lfd f0, 8(r1)
fsubs f0, f0, f29
fdivs f0, f26, f0
fmuls f0, f27, f0
fadds f0, f30, f0
GetNextPageIdx_L8:
fmuls f0, f0, f25
addi r28, r28, 0x80
addi r26, r26, 1
fadds f0, f28, f0
fadds f23, f23, f0
GetNextPageIdx_L3:
fcmpo cr0, f23, f31
cror 2, 0, 2
beq GetNextPageIdx_L4
addi r0, r26, -1
cmpw r0, r25
bne GetNextPageIdx_L11
addi r26, r26, 1
GetNextPageIdx_L11:
addi r3, r26, -1
GetNextPageIdx_L6:
psq_l f31, 0xb8(r1), 0, 0
lfd f31, 0xb0(r1)
psq_l f30, 0xa8(r1), 0, 0
lfd f30, 0xa0(r1)
psq_l f29, 0x98(r1), 0, 0
lfd f29, 0x90(r1)
psq_l f28, 0x88(r1), 0, 0
lfd f28, 0x80(r1)
psq_l f27, 0x78(r1), 0, 0
lfd f27, 0x70(r1)
psq_l f26, 0x68(r1), 0, 0
lfd f26, 0x60(r1)
psq_l f25, 0x58(r1), 0, 0
lfd f25, 0x50(r1)
psq_l f24, 0x48(r1), 0, 0
lfd f24, 0x40(r1)
psq_l f23, 0x38(r1), 0, 0
addi r11, r1, 0x30
lfd f23, 0x30(r1)
bl _restgpr_24
lwz r0, 0xc4(r1)
mtlr r0
addi r1, r1, 0xc0
blr
s32 UITextArea::GetNextPageIdx_(s32 idx) const {
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
f32 widthScale = GetWidthScale_();
f32 margin = GetMargin_();
f32 xOffset = -margin;
s32 candidateIndex = idx;
while (xOffset <= areaPaneWidth) {
if (candidateIndex == mnCandidateNum) {
return -1;
}
f32 textWidth = calcStringWidth(mpCandidates->szwcPredicted[candidateIndex], textBox);
xOffset += margin + textWidth * widthScale;
++candidateIndex;
}
if (candidateIndex - 1 == idx) {
++candidateIndex;
}
return candidateIndex - 1;
}
s32 UITextArea::GetPrevPageIdx_(s32 idx) const {
// NONMATCHING - only regswaps, hopefully
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
@@ -1452,7 +1326,6 @@ namespace textinput {
}
void UITextArea::StartScroll(s32 steps) {
// NONMATCHING - only regswaps, hopefully
f32 acc = 0.0f;
f32 widthScale = GetWidthScale_();
f32 margin = GetMargin_();
@@ -1470,7 +1343,7 @@ namespace textinput {
}
}
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, this);
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, reinterpret_cast<void*>(steps));
}
void UITextArea::StartScrollToIdx(s32 idx) {

View File

@@ -606,8 +606,9 @@ namespace textinput {
CellPhoneAnmPane* pane = new (MEMAllocFromAllocator(allocator, sizeof(CellPhoneAnmPane)))
CellPhoneAnmPane(getPane(csPaneNameNormalAnimationKey[i].name), NULL);
nw4r::ut::List_Append(&mAnmPanes, pane);
const char* animationKey;
const PaneNameToAnimationKey& paneName = csPaneNameNormalAnimationKey[i];
const char* animationKey = paneName.animationKey;
animationKey = paneName.animationKey;
for (u16 j = 0; j < 5; ++j) {
void* resource = mpMultiArcResourceAccessor->GetResource(0, csAninationFileForControlKey[j].filename);

View File

@@ -8,7 +8,7 @@
namespace textinput {
namespace gui {
extern "C" void drawLine___Q29textinput3guiFfffffUcR8_GXColor();
extern "C" const f32 lbl_81694EE8;
extern "C" const f32 scGuiZeroF;
void drawLine_(f32 x0, f32 y0, f32 x1, f32 y1, f32 z, u8 width, GXColor& color) {
GXClearVtxDesc();
@@ -31,7 +31,7 @@ namespace textinput {
GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_NOOP);
Mtx mtx;
MTXTrans(mtx, lbl_81694EE8, lbl_81694EE8, lbl_81694EE8);
MTXTrans(mtx, scGuiZeroF, scGuiZeroF, scGuiZeroF);
GXLoadPosMtxImm(mtx, 0);
GXSetLineWidth(width, GX_TO_ZERO);
@@ -334,7 +334,7 @@ namespace textinput {
MTXInverse(mpPane->GetGlobalMtx(), globalMtx);
nw4r::math::VEC3 pos;
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, lbl_81694EE8), pos);
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, scGuiZeroF), pos);
nw4r::ut::Rect rect = mpPane->GetPaneRect(*drawInfo);
@@ -348,12 +348,12 @@ namespace textinput {
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const f32 lbl_81694EE8 = 0.0f;
extern "C" const u8 lbl_81694EEC = 0xFF;
extern "C" const u8 lbl_81694EED = 0x00;
extern "C" const u8 lbl_81694EEE = 0x00;
extern "C" const u8 lbl_81694EEF = 0xFF;
extern "C" const f32 lbl_81694EF0 = 0.5f;
extern "C" const f32 scGuiZeroF = 0.0f;
extern "C" const u8 scGuiLineColorR = 0xFF;
extern "C" const u8 scGuiLineColorG = 0x00;
extern "C" const u8 scGuiLineColorB = 0x00;
extern "C" const u8 scGuiLineColorA = 0xFF;
extern "C" const f32 scGuiHalfF = 0.5f;
#pragma pop
extern "C" asm void draw__Q39textinput3gui13PaneComponentFv() {
@@ -376,15 +376,15 @@ namespace textinput {
beq pane_component_draw_done
lwz r5, 0x9c(r31)
mr r3, r31
lbz r7, lbl_81694EEC
lbz r7, scGuiLineColorR
li r4, 0
lfs f1, 0x4c(r5)
lfs f0, 0x50(r5)
lfs f31, 0x90(r5)
lfs f30, 0xa0(r5)
lbz r6, lbl_81694EED
lbz r5, lbl_81694EEE
lbz r0, lbl_81694EEF
lbz r6, scGuiLineColorG
lbz r5, scGuiLineColorB
lbz r0, scGuiLineColorA
stb r7, 8(r1)
stb r6, 9(r1)
stb r5, 0xa(r1)
@@ -402,13 +402,13 @@ namespace textinput {
stb r3, 8(r1)
stb r0, 0xa(r1)
pane_component_draw_lines:
lfs f1, lbl_81694EF0
lfs f1, scGuiHalfF
addi r4, r1, 8
lfs f0, 0x14(r1)
li r3, 8
lfs f2, 0x10(r1)
fmuls f0, f0, f1
lfs f5, lbl_81694EE8
lfs f5, scGuiZeroF
fmuls f3, f2, f1
fsubs f2, f30, f0
fsubs f1, f31, f3
@@ -417,24 +417,24 @@ namespace textinput {
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, 0x10(r1)
addi r4, r1, 8
lfs f2, lbl_81694EF0
lfs f2, scGuiHalfF
li r3, 8
lfs f0, 0x14(r1)
fmuls f1, f1, f2
lfs f5, lbl_81694EE8
lfs f5, scGuiZeroF
fmuls f0, f0, f2
fadds f1, f31, f1
fsubs f2, f30, f0
fadds f4, f30, f0
fmr f3, f1
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, lbl_81694EF0
lfs f1, scGuiHalfF
addi r4, r1, 8
lfs f0, 0x14(r1)
li r3, 8
lfs f2, 0x10(r1)
fmuls f0, f0, f1
lfs f5, lbl_81694EE8
lfs f5, scGuiZeroF
fmuls f3, f2, f1
fadds f2, f30, f0
fadds f1, f31, f3
@@ -443,11 +443,11 @@ namespace textinput {
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, 0x10(r1)
addi r4, r1, 8
lfs f2, lbl_81694EF0
lfs f2, scGuiHalfF
li r3, 8
lfs f0, 0x14(r1)
fmuls f1, f1, f2
lfs f5, lbl_81694EE8
lfs f5, scGuiZeroF
fmuls f0, f0, f2
fsubs f1, f31, f1
fadds f2, f30, f0

View File

@@ -5,8 +5,6 @@
#include "keyboard/tiHKBManager.h"
#include "keyboard/tiLayoutGather.h"
extern const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
@@ -528,6 +526,9 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
@@ -639,16 +640,16 @@ const u8 controlKeys[] = {
nofralloc
cmpwi r4, 2
bne setLanguage_L1
lis r4, lbl_81616BD8@ha
lis r4, scCountryMap_EU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, lbl_81616BD8@l
addi r4, r4, scCountryMap_EU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc
setLanguage_L1:
lis r4, lbl_81616BE4@ha
lis r4, scCountryMap_NonEU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, lbl_81616BE4@l
addi r4, r4, scCountryMap_NonEU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc

View File

@@ -284,122 +284,12 @@ void Base::inputCharDefault_(wchar_t character, u32 modifiers) {
meScrollFlag = SF_ScrollOn;
}
extern "C" asm void draw__Q39textinput9inputform12LayoutByNW4RFv() {
nofralloc
stwu r1, -0x50(r1)
mflr r0
stw r0, 0x54(r1)
stw r31, 0x4c(r1)
stw r30, 0x48(r1)
mr r30, r3
addi r3, r3, 0x218
bl draw__Q39textinput11nw4rmanager6LayoutFv
lwz r12, 0x218(r30)
addi r3, r30, 0x218
lwz r12, 0x28(r12)
mtctr r12
bctrl
lwz r4, 0x10(r3)
li r5, 1
lwz r3, 0x21c(r30)
lbz r0, 0xcd(r4)
lwz r4, 0x2c0(r30)
stb r0, 0x1c8(r30)
lwz r3, 0x10(r3)
lwz r12, 0(r3)
lwz r12, 0x3c(r12)
mtctr r12
bctrl
lwz r12, 0x218(r30)
mr r6, r3
addi r3, r30, 0x218
addi r4, r30, 0x130
lwz r12, 0x70(r12)
addi r5, r30, 0x230
addi r6, r6, 0x84
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0x188(r12)
mtctr r12
bctrl
stw r3, 0x18(r1)
addi r3, r30, 0x10
lfs f2, 0x188(r30)
stw r4, 0x1c(r1)
lfs f1, 0x18(r1)
bl SetCursor__Q34nw4r2ut10CharWriterFff
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0x188(r12)
mtctr r12
bctrl
lfs f0, lbl_81694D28(r0)
stw r3, 0x20(r1)
stfs f0, 0x30(r1)
stfs f0, 0x34(r1)
stfs f0, 0x38(r1)
stfs f0, 0x3c(r1)
lwz r12, 0(r30)
stw r3, 8(r1)
mr r3, r30
lwz r12, 0x184(r12)
stw r4, 0x24(r1)
stw r4, 0xc(r1)
mtctr r12
bctrl
stw r3, 0x10(r1)
lfs f1, 8(r1)
stw r4, 0x14(r1)
lfs f5, 0x10(r1)
lfs f4, 0x14(r1)
stfs f5, 0x30(r1)
lfs f0, 0xc(r1)
stfs f4, 0x3c(r1)
lfs f3, 0x128(r30)
lfs f2, 0x120(r30)
stw r3, 0x28(r1)
fsubs f2, f3, f2
stw r4, 0x2c(r1)
fmuls f1, f1, f2
fadds f1, f5, f1
stfs f1, 0x38(r1)
lfs f2, 0x124(r30)
lfs f1, 0x12c(r30)
fsubs f1, f2, f1
fmuls f0, f0, f1
fadds f0, f4, f0
stfs f0, 0x34(r1)
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r12, 0x5c(r30)
mr r31, r3
addi r3, r30, 0x10
addi r4, r1, 0x30
lwz r12, 0x20(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
mr r4, r31
lwz r12, 0x174(r12)
mtctr r12
bctrl
lwz r12, 0x5c(r30)
addi r3, r30, 0x10
lwz r12, 0x24(r12)
mtctr r12
bctrl
lwz r0, 0x54(r1)
lwz r31, 0x4c(r1)
lwz r30, 0x48(r1)
mtlr r0
addi r1, r1, 0x50
blr
void LayoutByNW4R::draw() {
nw4rmanager::Layout::draw();
muGlobalAlpha = getLayout()->GetRootPane()->GetAlpha();
nw4r::lyt::Pane* textBox = mpLayout->GetRootPane()->FindPaneByName(static_cast<const char*>(mpLayoutData), true);
AdjustPaneMtx(mMtx.m, mDrawInfo, textBox->GetGlobalMtx());
Base::draw();
}
void Base::calcCursorTimer() {
muCursorTimer += 8;
@@ -494,7 +384,6 @@ extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inpu
extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
extern "C" const u32 lbl_816152D0[4] = {0x00200000, 0, 0, 0};
#pragma pop
extern "C" const f32 lbl_81694D28 = 0.0f;
@@ -659,6 +548,7 @@ struct CharacterInput {
u32 modifiers;
bool keyboardMode;
bool deadKey;
u32 data;
};
struct ConfirmInput {
@@ -1046,17 +936,17 @@ void Base::onCommand(INPUT_COMMAND command, void* data) {
mbPredictOn = enabled;
if (meLanguage == KR) mpManager->getPCKeyboard()->refreshState();
}
tistring::Decolated::TranslateMode predictionFixedMode = mpString->getTranslateMode();
const tistring::Decolated::TranslateMode predictionUnfixMode = mpUnfixString->getTranslateMode();
s32 predictionFixedMode = mpString->getTranslateMode();
s32 predictionUnfixMode = mpUnfixString->getTranslateMode();
mpString->initKanaConverter();
mpUnfixString->initKanaConverter();
if (meLanguage == KR) {
if (predictionFixedMode != tistring::Decolated::TM_Direct) predictionFixedMode = tistring::Decolated::TM_Hangul;
} else if (meLanguage == CN) predictionFixedMode = tistring::Decolated::TM_Direct;
mpString->getCursorPos();
mpString->setTranslateMode(predictionFixedMode);
mpString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionFixedMode));
mpString->getCursorPos();
mpUnfixString->setTranslateMode(predictionUnfixMode);
mpUnfixString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionUnfixMode));
switch (mePredictMode) {
case PM_Atok:
if (!mbPredictOn) {
@@ -2220,15 +2110,13 @@ void Base::onPressUp() {
}
}
}
if (!current->hasCandidate()) {
if (!current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorUp();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
if (current->hasCandidate() || !current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorUp();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
}
}
@@ -2273,22 +2161,20 @@ void Base::onPressDown() {
}
}
}
if (!current->hasCandidate()) {
if (!current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorDown();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
if (current->hasCandidate() || !current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorDown();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
}
}
void Base::onPressDownHWKB() {
tistring::Decolated* current = getCurrentString(false);
s32 selected;
tistring::Decolated* current = getCurrentString(false);
u32 modifiers = input::HKBManager::getInstance().GetModifierState();
if (current == mpString) {
mpManager->getHWKeyboard()->resetQuoteState();
@@ -2309,12 +2195,11 @@ void Base::onPressDownHWKB() {
}
}
}
if (!current->hasCandidate()) {
if (!current->isKanaFix()) return;
if (current->hasCandidate() || !current->isKanaFix()) return;
if (mpUnfixString->getCandidate() == L' ') return;
moveCursorDown();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
} else if (mpUnfixString == current) {
if (!mpUnfixString->isKanaFix()) mpUnfixString->confirmKana();
if (mpUnfixString->isConverting()) {
@@ -2344,6 +2229,9 @@ void Base::onPressDownHWKB() {
}
}
}
else if (mpZiString == current) {
return;
}
}
void Base::onPressLeftHWKB() {
@@ -2369,11 +2257,7 @@ void Base::onPressLeftHWKB() {
}
current->getCursorPos();
}
if (current->hasCandidate()) return;
switch (current->isKanaFix()) {
case true: break;
default: return;
}
if (current->hasCandidate() || !current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
@@ -2430,11 +2314,7 @@ void Base::onPressRightHWKB() {
}
current->getCursorPos();
}
if (current->hasCandidate()) return;
switch (current->isKanaFix()) {
case true: break;
default: return;
}
if (current->hasCandidate() || !current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
@@ -2470,375 +2350,73 @@ void Base::onPressRightHWKB() {
meScrollFlag = SF_ScrollOn;
}
extern "C" asm void onPressLeft__Q39textinput9inputform4BaseFv() {
nofralloc
stwu r1, -0x10(r1)
mflr r0
li r4, 0
stw r0, 0x14(r1)
stw r31, 0xc(r1)
stw r30, 8(r1)
mr r30, r3
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
mr r31, r3
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x164(r30)
cmplw r31, r0
bne onPressLeft_L1
lwz r0, 0x1f0(r30)
cmpwi r0, 9
bne onPressLeft_L2
mr r3, r30
li r4, 0
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressLeft_L3
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
li r4, 0xa
lwz r12, 0(r3)
lwz r12, 0x50(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x1f0(r30)
cmpwi r0, 8
bne onPressLeft_L3
lbz r0, 0x178(r30)
cmpwi r0, 0
bne onPressLeft_L4
li r0, 0
b onPressLeft_L5
onPressLeft_L4:
lwz r0, 0x174(r30)
cmpwi r0, 1
beq onPressLeft_L6
lwz r3, 0x16c(r30)
lwz r12, 0(r3)
lwz r12, 0xd8(r12)
mtctr r12
bctrl
cmpwi r3, 0
ble onPressLeft_L6
li r0, 1
b onPressLeft_L5
onPressLeft_L6:
li r0, 0
onPressLeft_L5:
cmpwi r0, 0
beq onPressLeft_L3
lwz r3, 0x16c(r30)
li r4, 0
bl setCurrentWord__Q39textinput8tistring6WithZiFPCw
lwz r3, 0x16c(r30)
bl update__Q39textinput8tistring6WithZiFv
onPressLeft_L3:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x7c(r12)
mtctr r12
bctrl
onPressLeft_L2:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x48(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressLeft_Lend
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressLeft_L13
b onPressLeft_Lend
onPressLeft_L13:
lwz r3, 0x1d4(r30)
lwz r12, 0(r3)
lwz r12, 0x6c(r12)
mtctr r12
bctrl
li r0, 0
stb r0, 0x15(r3)
stb r0, 0x16(r3)
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x128(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x44(r12)
mtctr r12
bctrl
clrlwi r0, r3, 16
cmplwi r0, 0x20
beq onPressLeft_Lend
onPressLeft_L1:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x68(r12)
mtctr r12
bctrl
cmpwi r3, 0
beq onPressLeft_L10
lwz r12, 0(r30)
mr r3, r30
li r4, 5
lwz r12, 0x178(r12)
mtctr r12
bctrl
b onPressLeft_L11
onPressLeft_L10:
lwz r12, 0(r30)
mr r3, r30
li r4, 6
lwz r12, 0x178(r12)
mtctr r12
bctrl
onPressLeft_L11:
lwz r0, 0x168(r30)
cmplw r31, r0
bne onPressLeft_L12
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
onPressLeft_L12:
li r0, 1
stw r0, 0x1b0(r30)
onPressLeft_Lend:
lwz r0, 0x14(r1)
lwz r31, 0xc(r1)
lwz r30, 8(r1)
mtlr r0
addi r1, r1, 0x10
blr
void Base::onPressLeft() {
tistring::Decolated* current = getCurrentString(false);
current->getCursorPos();
if (current == mpString) {
if (meLanguage == KR) {
if (!getCurrentString(false)->isKanaFix()) {
mpString->getCursorPos();
mpString->inputChar(L'\n');
mpString->getCursorPos();
if (meLanguage == CN) {
bool predictions;
if (!mbPredictOn) predictions = false;
else if (mePredictMode != PM_Atok && mpZiString->getCurrentNumPredicted() > 0) predictions = true;
else predictions = false;
if (predictions) {
mpZiString->setCurrentWord(NULL);
mpZiString->update();
}
}
}
current->getCursorPos();
}
if (current->hasCandidate() || !current->isKanaFix()) return;
resetInputRelation();
if (mpUnfixString->getCandidate() == L' ') return;
}
if (current->moveCursorLeft()) onSE(static_cast<sound::SE>(5));
else onSE(static_cast<sound::SE>(6));
if (current == mpUnfixString) updateCandidateState_();
meScrollFlag = SF_ScrollOn;
}
extern "C" asm void onPressRight__Q39textinput9inputform4BaseFv() {
nofralloc
stwu r1, -0x20(r1)
mflr r0
li r4, 0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
mr r30, r3
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
mr r31, r3
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x164(r30)
cmplw r31, r0
bne onPressRight_L1
lwz r0, 0x1f0(r30)
cmpwi r0, 9
bne onPressRight_L2
mr r3, r30
li r4, 0
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressRight_L3
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
li r4, 0xa
lwz r12, 0(r3)
lwz r12, 0x50(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x1f0(r30)
cmpwi r0, 8
bne onPressRight_L3
lbz r0, 0x178(r30)
cmpwi r0, 0
bne onPressRight_L4
li r0, 0
b onPressRight_L5
onPressRight_L4:
lwz r0, 0x174(r30)
cmpwi r0, 1
beq onPressRight_L6
lwz r3, 0x16c(r30)
lwz r12, 0(r3)
lwz r12, 0xd8(r12)
mtctr r12
bctrl
cmpwi r3, 0
ble onPressRight_L6
li r0, 1
b onPressRight_L5
onPressRight_L6:
li r0, 0
onPressRight_L5:
cmpwi r0, 0
beq onPressRight_L3
lwz r3, 0x16c(r30)
li r4, 0
bl setCurrentWord__Q39textinput8tistring6WithZiFPCw
lwz r3, 0x16c(r30)
bl update__Q39textinput8tistring6WithZiFv
onPressRight_L3:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x7c(r12)
mtctr r12
bctrl
onPressRight_L2:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x48(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressRight_Lend
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressRight_L13
b onPressRight_Lend
onPressRight_L13:
lwz r3, 0x1d4(r30)
lwz r12, 0(r3)
lwz r12, 0x6c(r12)
mtctr r12
bctrl
li r0, 0
stb r0, 0x15(r3)
stb r0, 0x16(r3)
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x128(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x44(r12)
mtctr r12
bctrl
clrlwi r0, r3, 16
cmplwi r0, 0x20
beq onPressRight_Lend
onPressRight_L1:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x64(r12)
mtctr r12
bctrl
cmpwi r3, 0
beq onPressRight_L8
lbz r0, 0x17a(r30)
cmpwi r0, 0
beq onPressRight_L8
lis r9, lbl_816152D0@ha
lwzu r8, lbl_816152D0@l(r9)
mr r3, r30
addi r5, r1, 8
lwz r7, 4(r9)
li r4, 0
lwz r6, 8(r9)
lwz r0, 0xc(r9)
stw r8, 8(r1)
stw r7, 0xc(r1)
stw r6, 0x10(r1)
stw r0, 0x14(r1)
lwz r12, 0(r30)
lwz r12, 0x18(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
li r4, 5
lwz r12, 0x178(r12)
mtctr r12
bctrl
onPressRight_L8:
lwz r0, 0x16c(r30)
cmplw r31, r0
beq onPressRight_L9
lwz r0, 0x168(r30)
cmplw r31, r0
bne onPressRight_L10
onPressRight_L9:
lwz r12, 0(r30)
mr r3, r30
li r4, 6
lwz r12, 0x178(r12)
mtctr r12
bctrl
b onPressRight_L11
onPressRight_L10:
lwz r12, 0(r30)
mr r3, r30
li r4, 5
lwz r12, 0x178(r12)
mtctr r12
bctrl
onPressRight_L11:
lwz r0, 0x168(r30)
cmplw r31, r0
bne onPressRight_L12
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
onPressRight_L12:
li r0, 1
stw r0, 0x1b0(r30)
onPressRight_Lend:
lwz r0, 0x24(r1)
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
mtlr r0
addi r1, r1, 0x20
blr
void Base::onPressRight() {
tistring::Decolated* current = getCurrentString(false);
current->getCursorPos();
if (current == mpString) {
if (meLanguage == KR) {
if (!getCurrentString(false)->isKanaFix()) {
mpString->getCursorPos();
mpString->inputChar(L'\n');
mpString->getCursorPos();
if (meLanguage == CN) {
bool predictions;
if (!mbPredictOn) predictions = false;
else if (mePredictMode != PM_Atok && mpZiString->getCurrentNumPredicted() > 0) predictions = true;
else predictions = false;
if (predictions) {
mpZiString->setCurrentWord(NULL);
mpZiString->update();
}
}
}
current->getCursorPos();
}
if (current->hasCandidate() || !current->isKanaFix()) return;
resetInputRelation();
if (mpUnfixString->getCandidate() == L' ') return;
}
if (current->moveCursorRight() && mbRightWithSpace) {
CharacterInput space = {L' ', 0, false, false, 0};
onCommand(static_cast<INPUT_COMMAND>(0), &space);
onSE(static_cast<sound::SE>(5));
}
if (current == mpZiString || current == mpUnfixString) onSE(static_cast<sound::SE>(6));
else onSE(static_cast<sound::SE>(5));
if (current == mpUnfixString) updateCandidateState_();
meScrollFlag = SF_ScrollOn;
}
extern "C" asm void calc__Q39textinput9inputform4BaseFv() {
@@ -3509,27 +3087,32 @@ void Base::clear() {
}
u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
const wchar_t* current = string;
const wchar_t* current;
u32 rows;
bool kanaHandled;
bool kana;
const wchar_t* character;
u32 pos;
f32 cursorX;
u32 cursorStart;
u32 cursorEnd;
current = string;
if (!*string) return 0;
f32 scaleX;
f32 cursorX = getScale().x;
cursorX = getScale().x;
nw4r::math::VEC2 scale = getScale();
u32 pos = 0;
u32 rows = 0;
pos = 0;
rows = 0;
muWordWrapCounter = 0;
bool kanaHandled = false;
kanaHandled = false;
mbHyphen = false;
u32 cursorStart, cursorEnd;
mpString->getCursorPos(&cursorStart, &cursorEnd);
scaleX = scale.x;
for (;;) {
DrawInfo info;
info.rect.left = 0.0f;
info.rect.top = 0.0f;
info.rect.right = 0.0f;
info.rect.bottom = 0.0f;
bool kana = false;
const wchar_t* character;
kana = false;
if (meLanguage == KR && !kanaHandled && cursorStart == pos) {
kanaHandled = true;
character = mpString->getKanaBuffer();
@@ -3541,9 +3124,9 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
}
info.character = *character;
calcRect(info);
f32 right = cursorX + scaleX * (info.rect.right - info.rect.left);
f32 right = cursorX + scale.x * info.rect.GetWidth();
if (kana) {
if (right >= scaleX * (mRect.right - mRect.left)) {
if (right >= scale.x * mRect.GetWidth()) {
cursorX = getScale().x;
++rows;
if (rows >= limit) return pos;
@@ -3556,8 +3139,11 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
++rows;
if (rows >= limit) {
while (pos < muWordWrapCounter) {
f32 advance = scaleX * (info.rect.right - info.rect.left);
if (cursorX + advance >= scaleX * (mRect.right - mRect.left)) return pos;
f32 advance;
f32 nextCursorX;
advance = scale.x * info.rect.GetWidth();
nextCursorX = cursorX + advance;
if (nextCursorX >= scale.x * mRect.GetWidth()) return pos;
++current;
cursorX += advance;
info.character = *current;
@@ -3567,7 +3153,7 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
return muWordWrapCounter - 1;
}
cursorX = getScale().x;
} else if (right >= scaleX * (mRect.right - mRect.left)) {
} else if (right >= scale.x * mRect.GetWidth()) {
cursorX = getScale().x;
++rows;
if (rows >= limit) return pos;
@@ -3578,7 +3164,7 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
if (rows >= limit) return pos;
if (!current[1]) return 0;
} else {
cursorX += scaleX * (info.rect.right - info.rect.left);
cursorX += scale.x * info.rect.GetWidth();
}
++pos;
++current;

View File

@@ -274,7 +274,7 @@ namespace textinput {
xOffset *= scale - 1.0f;
viewport[0] = left + xOffset;
f32 height = (mProjectionRect.bottom -
mProjectionRect.top) * 0.5f;
mProjectionRect.top) / 2.0f;
viewport[1] = rect.bottom + height;
viewport[2] = scale * (100.0f + (rect.right - rect.left));
viewport[3] = rect.top - rect.bottom;

View File

@@ -557,10 +557,11 @@ void WithZi::setCurrentWord(const wchar_t* word) {
LatestWord[1] = 0;
return;
}
mbContextChanged = 1;
wchar_t* currentWord;
const wchar_t* source;
u32 length;
s32 copied;
mbContextChanged = 1;
length = 0;
currentWord = reinterpret_cast<wchar_t*>(LatestWord);
for (; *currentWord != 0 && *currentWord != 0x20;
@@ -571,14 +572,10 @@ void WithZi::setCurrentWord(const wchar_t* word) {
}
}
copied = 0;
const wchar_t* source = word;
u32 destinationOffset = length;
source = word;
for (; *source != 0 && length < 0x3f;) {
wchar_t character = word[copied];
++length;
LatestWord[length++] = word[copied++];
++source;
++copied;
LatestWord[destinationOffset++] = character;
}
LatestWord[length] = 0;
mCurrentWordLength = copied;

View File

@@ -327,15 +327,20 @@ namespace ipl {
mpDialogLayout->calc();
}
static inline math::VEC2 scaledPageOffset(f32 scale) {
math::VEC2 result;
result.y = sPageOffset.y * scale;
result.x = sPageOffset.x * scale;
return result;
}
void Address::draw() {
if (System::getSceneManager()->onDrawLayer(DRAW_LAYER_2)) {
utility::Graphics::setOrtho(0);
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("N_note_a");
for (int i = mNextPageNum; i >= 1; i--) {
math::VEC2 trans;
trans.y = sPageOffset.y * i;
trans.x = sPageOffset.x * i;
math::VEC2 trans = scaledPageOffset(i);
pane->SetTranslate(trans);
pane->CalculateMtx(*mpLayout->getDrawInfo());
mpLayout->draw(pane);
@@ -536,11 +541,16 @@ namespace ipl {
}
}
static inline nw4r::math::_VEC2 negativeOffset(const nw4r::math::_VEC2& value) {
f32 negativeY = -value.y;
f32 negativeX = -value.x;
nw4r::math::_VEC2 result = {negativeX, negativeY};
return result;
}
void Address::stt_cover_backward() {
if (!mpLayout->getAnim(4)->isPlaying()) {
math::VEC2 offset;
offset.x = -sPageOffset.x;
offset.y = -sPageOffset.y;
math::VEC2 offset = negativeOffset(sPageOffset);
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
mbCover = true;
mNextPageNum++;
@@ -582,10 +592,20 @@ namespace ipl {
}
}
static inline nw4r::math::_VEC2 previousPageOffset() {
f32 negativeY = -sPageOffset.y;
f32 negativeX = -sPageOffset.x;
nw4r::math::_VEC2 result;
result.y = negativeY;
result.x = negativeX;
return result;
}
void Address::stt_backward() {
if (!mpLayout->getAnim(5)->isPlaying()) {
mNextPageNum++;
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset);
math::VEC2 offset = previousPageOffset();
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
set_page_text("T_nmbr_b", mPage + 1);
for (u32 i = 0; i < BTN_MAX; i++) {
@@ -602,9 +622,17 @@ namespace ipl {
}
}
static inline nw4r::math::VEC2 loopPageOffset() {
nw4r::math::VEC2 result;
result.y = -sPageOffset.y;
result.x = -sPageOffset.x;
return result;
}
void Address::stt_loop_forward() {
if (!mpLayout->getAnim(4)->isPlaying()) {
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset * PAGE_MAX);
math::VEC2 offset = loopPageOffset() * PAGE_MAX;
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
set_page_text("T_nmbr_b", mPage + 1);
reset_gui(false);

View File

@@ -621,28 +621,28 @@ namespace ipl {
void BoardObject::set_thumb_text(const char* paneName, const wchar_t* thumbText) {
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(paneName));
wchar_t local_28[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
memset(local_28, 0, sizeof(local_28));
wchar_t truncatedThumb[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
memset(truncatedThumb, 0, sizeof(truncatedThumb));
if (thumbText != NULL) {
for (int i = 0; i < THUMB_TEXT_LENGTH + 1 && thumbText[i] != (u16)'\n'; i++) {
local_28[i] = thumbText[i];
truncatedThumb[i] = thumbText[i];
}
}
if (System::getRegion() == SC_PRODUCT_AREA_JPN) {
if (local_28[THUMB_TEXT_LENGTH] != 0) {
local_28[THUMB_TEXT_LENGTH + 0] = L'…';
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
truncatedThumb[THUMB_TEXT_LENGTH + 0] = L'…';
}
} else {
if (local_28[THUMB_TEXT_LENGTH] != 0) {
local_28[THUMB_TEXT_LENGTH + 2] = '.';
local_28[THUMB_TEXT_LENGTH + 1] = '.';
local_28[THUMB_TEXT_LENGTH + 0] = '.';
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
truncatedThumb[THUMB_TEXT_LENGTH + 2] = '.';
truncatedThumb[THUMB_TEXT_LENGTH + 1] = '.';
truncatedThumb[THUMB_TEXT_LENGTH + 0] = '.';
}
}
textBox->SetString(local_28);
textBox->SetString(truncatedThumb);
}
void BoardObject::update(int chan) {

View File

@@ -6,8 +6,8 @@
#include "iplSystem.h"
__declspec(section ".sdata") extern char lbl_816966F9[];
extern char lbl_816967B5[];
__declspec(section ".sdata") extern char scPaneName_B_Stop[];
extern char scPaneName_T_Stop[];
extern "C" BOOL push_button_queue(void*, const void*);
namespace ipl {
@@ -877,7 +877,7 @@ namespace ipl {
}
void OptOutButton::setText(u32 msgId) {
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_816967B5));
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scPaneName_T_Stop));
textBox->SetString(System::getMessage(msgId));
}
@@ -890,7 +890,7 @@ namespace ipl {
}
void OptOutButton::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, lbl_816966F9) == 0) {
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
if (mbHovered == FALSE) {
// Play hover in animation
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_IN)->play();
@@ -906,7 +906,7 @@ namespace ipl {
}
void OptOutButton::start_left_event(const char* paneName) {
if (strcmp(paneName, lbl_816966F9) == 0) {
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
if (mbHovered == TRUE) {
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_OUT)->play();
}
@@ -1005,4 +1005,4 @@ namespace ipl {
} // namespace scene
} // namespace ipl
char lbl_816967B5[] = "T_Stop";
char scPaneName_T_Stop[] = "T_Stop";

View File

@@ -7,40 +7,40 @@
namespace ipl {
namespace scene {
extern "C" char lbl_816967D8[];
extern "C" char lbl_816967DE[];
extern "C" char lbl_816967E4[];
extern "C" char lbl_816967EB[];
extern "C" char lbl_816967F2[];
extern "C" char scW_Cal[];
extern "C" char scT_Cal[];
extern "C" char scCal_Ac[];
extern "C" char scInfo_a[];
extern "C" char scB_Cal[];
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
#pragma pop
// clang-format off
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
lbl_8164C620,
lbl_816967D8,
lbl_816967DE,
lbl_816967E4,
lbl_816967EB,
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
scN_CalDay_r,
scW_Cal,
scT_Cal,
scCal_Ac,
scInfo_a,
};
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
extern "C" const char scMyIplTopFBrlan[] = "my_IplTop_f.brlan";
extern "C" const char scN_CalDay_t[] = "N_CalDay_t";
extern "C" const char scSEDateFocus[] = "WIPL_SE_DATE_FOCUS";
#pragma pop
#pragma push
#pragma section const_type ".sdata"
extern "C" char lbl_816967D8[] = "W_Cal";
extern "C" char lbl_816967DE[] = "T_Cal";
extern "C" char lbl_816967E4[] = "Cal_Ac";
extern "C" char lbl_816967EB[] = "Info_a";
extern "C" char lbl_816967F2[] = "B_Cal";
extern "C" char scW_Cal[] = "W_Cal";
extern "C" char scT_Cal[] = "T_Cal";
extern "C" char scCal_Ac[] = "Cal_Ac";
extern "C" char scInfo_a[] = "Info_a";
extern "C" char scB_Cal[] = "B_Cal";
#pragma pop
static const Date::AnmFrame scAnmFrame[] = {
@@ -73,7 +73,7 @@ namespace ipl {
// Bind animations
for (int i = 0; i < ANIM_PANE_MAX; i++) {
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
mpPaneAnims[i] = mpLayout->bind(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
}
mpLayout->finishBinding();
@@ -81,7 +81,7 @@ namespace ipl {
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
mpGui->setupScene(mpLayout);
mpGui->setAllComponentTriggerTarget(false);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scB_Cal), true);
// Init date
mpDate = new utility::Date();
@@ -128,19 +128,19 @@ namespace ipl {
}
void Date::setRotate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
}
void Date::setTranslate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
}
void Date::setVisible(bool visible) {
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
}
bool Date::getVisible() {
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
}
void Date::setAttribute(int attr) {
@@ -209,13 +209,13 @@ namespace ipl {
}
void Date::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (strcmp(paneName, scB_Cal) == 0) {
if (unk_0x3C == 0) {
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
onCmdRecv(1);
if (getVisible()) {
snd::getSystem()->startSE(lbl_8164C65D);
snd::getSystem()->startSE(scSEDateFocus);
if (con != NULL) {
con->rumble(1);
}
@@ -226,7 +226,7 @@ namespace ipl {
}
void Date::start_left_event(const char* paneName) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (strcmp(paneName, scB_Cal) == 0) {
if (unk_0x3C == 1) {
onCmdRecv(2);
}
@@ -262,7 +262,7 @@ namespace ipl {
numStr[index++] = 0;
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scDateAnimPaneNames[2]));
pane->SetString(numStr);
}

View File

@@ -35,8 +35,8 @@ namespace ipl {
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))))));
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 = (unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
f32 temp_f3 = (mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
r.x += temp_f3;
r.y += temp_f3;
r.z += temp_f3;
@@ -51,8 +51,8 @@ namespace ipl {
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
r += (mStartTangent * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
return r;
}
} // namespace math

View File

@@ -2390,7 +2390,7 @@ namespace ipl {
if (sceneID == SCENE_UNLOCKED_TITLE || sceneID == SCENE_LOCKED_TITLE) {
System::getSaveData()->setPrevPage(mChanPage);
System::getSaveData()->iplSavedata_813596B8(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
System::getSaveData()->pushTitleCache(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
mpSaveDataFile = System::getSaveData()->flushAsync(System::getMem2App());
}
}

View File

@@ -1,4 +1,4 @@
#define IPL_CHANNEL_TITLE_NOVTABLE
#define IPL_GC_SAVEDATA_NOVTABLE
#include "scene/memoryCard/iplGCSaveData.h"
#include "scene/memoryCard/iplMemoryCard.h"
@@ -6,7 +6,6 @@
#include "iplSound.h"
#include "iplSystem.h"
#undef IPL_CHANNEL_TITLE_NOVTABLE
namespace ipl {
namespace scene {

View File

@@ -1,7 +1,7 @@
#define IPL_MEMORYCARD_BASE_CTOR_OUT_OF_LINE
#define IPL_MEMORYCARD_BASE_EVENT_OUT_OF_LINE
#define IPL_GCW_PANEMANAGER_CTOR_OUT_OF_LINE
#define IPL_GCW_INTP_CTOR_OUT_OF_LINE
#define IPL_GC_WINDOW_NOVTABLE
#define IPL_GC_WINDOW_CPP
#include "scene/memoryCard/iplGCWindow.h"
#include "scene/memoryCard/iplMemoryCard.h"
@@ -14,10 +14,6 @@
#include <cstring>
namespace ipl {
namespace math {
template <typename T>
LinearIntp<T>::LinearIntp() {}
}
namespace scene {
struct TextboxToMessageID {
const char* name;
@@ -50,8 +46,15 @@ static const TextboxToMessageID scTextboxToMessageID[3] = {
};
static const char* scButtonName[3] = {"B_Move_00", "B_Copy_00", "B_Del_00"};
struct DigitTable {
wchar_t w[10];
};
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
GCWindow::GCWindow(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName)
: MemoryBase(), MemCardEventHandler(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
: MemoryBase(), MemCardEventListener(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
mWaiting(false) {
mpLayout = new layout::Object(heap, layoutFile, directory, fileName);
add_animation(scAnmName, 0x10);
@@ -102,15 +105,15 @@ void GCWindow::init(const math::VEC3& translate, MemoryCardManager* manager, u8
mpPaneManager->initPane(mpLayout->getNW4RLyt()->GetRootPane()->FindPaneByName(scButtonName[i], true));
}
int blocks = mpMemoryCardManager->getBlocks(cardState, cardIndex);
wchar_t digits[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
DigitTable digitTable = scNumber;
int blockCount = static_cast<u16>(blocks);
wchar_t decimal[5] = {0};
int skipCount = 0;
wchar_t blockText[5] = {0};
decimal[0] = digits[blockCount / 1000];
decimal[1] = digits[(blockCount / 100) % 10];
decimal[2] = digits[(blockCount / 10) % 10];
decimal[3] = digits[blockCount % 10];
decimal[0] = digitTable.w[blockCount / 1000];
decimal[1] = digitTable.w[(blockCount / 100) % 10];
decimal[2] = digitTable.w[(blockCount / 10) % 10];
decimal[3] = digitTable.w[blockCount % 10];
for (i = 0; i < 3; i++) {
if (decimal[i] != L'0') {
break;
@@ -785,7 +788,6 @@ SavedataEditWindow::SavedataEditWindow(EGG::Heap* heap, nand::LayoutFile* layout
add_animation("it_DataDetail_a_SeenOutNo.brlan", scAnmName[0].groupName);
add_animation("it_DataDetail_a_Wait.brlan", scAnmName[15].groupName);
mpLayout->finishBinding();
set_visible("N_Wait", false);
set_visible("T_Block_01", false);
mpEvent = new MemoryBaseEvent(this);
mpPaneManager = new gui::PaneManager(mpEvent, mpLayout->getDrawInfo(), NULL, NULL, true);

View File

@@ -1,8 +1,6 @@
#define IPL_MEMORY_CARD_CPP
#define IPL_MEMORYCARD_BASE_OUT_OF_LINE
#define IPL_CHANNEL_TITLE_NOVTABLE
#define IPL_MEMORY_CARD_NOVTABLE
#include "scene/memoryCard/iplMemoryCard.h"
#undef IPL_CHANNEL_TITLE_NOVTABLE
#include "scene/memoryCard/iplGCWindow.h"
#include "scene/memoryCard/iplGCSaveData.h"
@@ -82,6 +80,53 @@ namespace ipl {
"B_ArwR", "B_ArwL", "B_SelectWii_00", "B_SelectSd_00",
};
struct DigitTable {
wchar_t w[10];
};
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
class __declspec(novtable) MemoryCardManagerImpl : public MemoryCardManager {
public:
virtual void onMount(u8) {}
virtual void onUnmount(u8) {}
virtual void onAttach(u8) {}
virtual void onDetach(u8) {}
virtual void onCheck(u8) {}
virtual void onFormat(u8) {}
virtual void onRepair(u8) {}
virtual void onRead(u8) {}
virtual void onWrite(u8) {}
virtual void onOpen(u8) {}
virtual void onClose(u8) {}
virtual void onCreate(u8) {}
virtual void onDelete(u8) {}
virtual void onCopy(u8) {}
virtual void onMove(u8) {}
virtual void onRename(u8) {}
virtual void onVerify(u8) {}
virtual void onCommit(u8) {}
virtual void onProbe(u8) {}
virtual void onMountAsync(u8) {}
virtual void onUnmountAsync(u8) {}
virtual void onCheckAsync(u8) {}
virtual void onFormatAsync(u8) {}
virtual void onReadAsync(u8) {}
virtual void onWriteAsync(u8) {}
virtual void onCreateAsync(u8) {}
virtual void onDeleteAsync(u8) {}
virtual void onCopyAsync(u8) {}
virtual void onMoveAsync(u8) {}
virtual void onRenameAsync(u8) {}
virtual void onVerifyAsync(u8) {}
virtual void onCommitAsync(u8) {}
virtual void onProbeAsync(u8) {}
virtual void onFreeBlocks(u8) {}
virtual void onGetLength(u8) {}
virtual void onSetAttrib(u8) {}
virtual void onGetAttrib(u8) {}
};
MemoryCard::MemoryCard(EGG::Heap* heap)
: Base(heap), MemoryBase(), mState(2), mPrevState(2), mSlot(0), mIconIndex(-15), mIconCount(0),
mShowArwR(0), mShowArwL(0), mpEvent(NULL), mpFocusSaveData(NULL) {
@@ -90,7 +135,6 @@ namespace ipl {
nw4r::ut::List_Init(&mBalloonList, 0);
}
MemoryBase::~MemoryBase() {}
void MemoryCard::prepare() {
System::getBS2Manager()->abort();
@@ -146,7 +190,7 @@ namespace ipl {
mpGCWindow = new GCWindow(getSceneHeap(), unk_0x08, "arc", "it_CubeDetail_a.brlyt");
mpGCWindow->do_animation(0);
MemoryCardManager* manager = new MemoryCardManager();
MemoryCardManager* manager = new MemoryCardManagerImpl();
mpManager = manager;
mpManager->setEventHandler(mpGCWindow);
mpGCWindow->mpMemoryCardManager = mpManager;
@@ -495,19 +539,14 @@ namespace ipl {
return;
}
u32 freeBlocks = mpManager->getFreeBlocks(slot);
wchar_t digits[5];
wchar_t digitTable[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
digits[0] = L'\0';
digits[1] = L'\0';
digits[2] = L'\0';
digits[3] = L'\0';
digits[4] = L'\0';
DigitTable digitTable = scNumber;
wchar_t digits[5] = {0};
wchar_t text[0x40] = L"";
int blocks = static_cast<u16>(freeBlocks);
digits[0] = digitTable[blocks / 1000];
digits[1] = digitTable[blocks / 100 % 10];
digits[2] = digitTable[blocks / 10 % 10];
digits[3] = digitTable[blocks % 10];
digits[0] = digitTable.w[blocks / 1000];
digits[1] = digitTable.w[blocks / 100 % 10];
digits[2] = digitTable.w[blocks / 10 % 10];
digits[3] = digitTable.w[blocks % 10];
int zeroOffset;
for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) {
@@ -704,3 +743,4 @@ namespace ipl {
}
}

View File

@@ -1,4 +1,5 @@
#define IPL_MEMORYCARD_BASE_IMPLEMENTATION
#define IPL_MEMORYCARD_BASE_CPP
#include "scene/memoryCard/iplMemoryCardBase.h"
#include "scene/settingSelect/iplSettingSelect.h"
#include "scene/settingSelect/iplSettingButton.h"
@@ -130,7 +131,7 @@ void MemoryBase::set_textbox(const char* paneName, u32 message) {
void MemoryBase::set_textbox(const char* paneName, u32 message, int animationIndex, int frame) {
Anm* animation = get_animation(animationIndex);
if (animation->mAnim->getCurrentFrame() >= frame) {
if (animation->mAnim->getCurrentFrame() >= (f32)frame) {
set_textbox(paneName, message);
}
}
@@ -141,7 +142,7 @@ void MemoryBase::set_textbox(const char* paneName, const wchar_t* text, f32 widt
while (length != 0) {
textBox->SetString(text, 0, length);
textBox->CalculateMtx(*mpLayout->getDrawInfo());
nw4r::ut::Rect bounds = textBox->GetTextDrawRect(*mpLayout->getDrawInfo());
const nw4r::ut::Rect& bounds = textBox->GetTextDrawRect(*mpLayout->getDrawInfo());
if (bounds.right - bounds.left < width &&
-1.0f * (bounds.bottom - bounds.top) < height) {
break;

View File

@@ -145,15 +145,14 @@ bool MemoryCardManager::isDistSlot(u8 slot, long* state) {
bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
memorycard::CardState* states = memorycard::getCardSlotState();
bool enabled = false;
int file = mFile[slot][index].fileNo;
u32 file = mFile[slot][index].fileNo;
memorycard::FileInfo* dir = NULL;
memorycard::CardState* destination = NULL;
long result = file;
long result;
bool enabled = false;
if (isDistSlot(slot, NULL) &&
((dir = &dirs[slot][file])->canMove != 0) &&
states[slot].key == (destination = &states[slot ^ 1])->key &&
destination->freeBlocks >= dir->size && destination->unk_0x0E != 0 &&
states[slot].key == states[slot ^ 1].key &&
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
dir->unk_0x06 == 0) {
result = -0x15;
enabled = true;
@@ -169,9 +168,9 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
}
} else if ((dir = &dirs[slot][file])->canMove == 0) {
result = -0x1a;
} else if (states[slot].key != (destination = &states[slot ^ 1])->key) {
} else if (states[slot].key != states[slot ^ 1].key) {
result = -0x1b;
} else if (destination->freeBlocks < dir->size || destination->unk_0x0E == 0) {
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
result = -0x19;
} else if (dir->unk_0x06 != 0) {
result = -0x18;
@@ -186,15 +185,14 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
memorycard::CardState* states = memorycard::getCardSlotState();
bool enabled = false;
int file = mFile[slot][index].fileNo;
u32 file = mFile[slot][index].fileNo;
memorycard::FileInfo* dir = NULL;
memorycard::CardState* destination = NULL;
long result = file;
long result;
bool enabled = false;
if (isDistSlot(slot, NULL) &&
((dir = &dirs[slot][file])->canCopy != 0) &&
states[slot].key == (destination = &states[slot ^ 1])->key &&
destination->freeBlocks >= dir->size && destination->unk_0x0E != 0 &&
states[slot].key == states[slot ^ 1].key &&
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
dir->unk_0x06 == 0) {
result = -0x15;
enabled = true;
@@ -210,9 +208,9 @@ bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
}
} else if ((dir = &dirs[slot][file])->canCopy == 0) {
result = -0x1a;
} else if (states[slot].key != (destination = &states[slot ^ 1])->key) {
} else if (states[slot].key != states[slot ^ 1].key) {
result = -0x1b;
} else if (destination->freeBlocks < dir->size || destination->unk_0x0E == 0) {
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
result = -0x19;
} else if (dir->unk_0x06 != 0) {
result = -0x18;
@@ -253,10 +251,10 @@ void MemoryCardManager::update_icon_anm() {
for (int remaining = 0x7f; remaining > 0; remaining--, index++) {
u32 file = mFile[slot][index].fileNo;
if (file < 0x7f && dirs[slot][file].fileNo != 0) {
memorycard::IconState* icon = &icons[slot][file];
memorycard::IconState* icon = icons[slot] + file;
s32 frame = mFileCell[slot][file].iconAnmCounter + icon->anmDelta;
mFileCell[slot][file].iconAnmCounter = frame;
if ((s16)frame >= icon->anmMax) {
if ((s16)frame >= icons[slot][file].anmMax) {
if (icon->anmType == 4) {
mFileCell[slot][file].iconAnmCounter = icons[slot][file].anmMax - icon->unk_0x07 - 1;
icon->anmDelta = -1;
@@ -342,24 +340,24 @@ void MemoryCardManager::update_change_cardstate(u8 slot) {
}
GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index) {
CardIcons* icons = reinterpret_cast<CardIcons*>(memorycard::getIconStateArray());
memorycard::IconState (*icons)[0x7f] = reinterpret_cast<memorycard::IconState(*)[0x7f]>(memorycard::getIconStateArray());
int total = 0;
int file = mFile[slot][index].fileNo;
u32 file = mFile[slot][index].fileNo;
s16 frame = 0;
do {
u32 shift = frame;
u32 shift = frame << 1;
frame++;
total += ((icons[slot][file].anmFrameBits >> ((shift & 0x1f) << 1)) & 3) * 4;
total += ((icons[slot][file].anmFrameBits >> shift) & 3) * 4;
if (mFileCell[slot][file].iconAnmCounter <= total) {
break;
}
} while (frame < 9);
} while (frame <= 8);
return _create_icon(slot, file, frame - 1);
}
GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index, long start) {
memorycard::getIconStateArray();
int file = mFile[slot][index].fileNo;
u32 file = mFile[slot][index].fileNo;
return _create_icon(slot, file, 0);
}
@@ -385,7 +383,7 @@ GXTexObj* MemoryCardManager::_create_icon(u8 slot, s16 file, long start) {
}
const wchar_t* MemoryCardManager::getComment(u8 slot, s16 index, int which) {
int file = mFile[slot][index].fileNo;
u32 file = mFile[slot][index].fileNo;
wmemset(mFileCell[slot][file].comment[which], 0, 0x40);
char comment[33] = {0};
const char* comments = memorycard::getIconComment(slot, file);
@@ -427,7 +425,7 @@ const wchar_t* MemoryCardManager::getComment(u8 slot, s16 index, int which) {
GXTexObj* MemoryCardManager::create_banner(u8 slot, s16 index) {
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
CardIcons* icons = reinterpret_cast<CardIcons*>(memorycard::getIconStateArray());
int file = mFile[slot][index].fileNo;
u32 file = mFile[slot][index].fileNo;
if (dirs[slot][file].fileNo == 0 || !icons[slot][file].bannerEnable) {
return NULL;
}

View File

@@ -53,16 +53,10 @@ void iplContest_813D54F8(BOOL success, NAT nat);
void* IPLContestAlloc(int size);
void IPLContestFree(void* block, u32 _unused);
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes);
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes);
void sNHTTPCleanupCallback();
void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
char* pcVar1;
char cVar2;
char* pcVar3;
char* pcVar4;
int iVar5;
g_session.heapBuf = heapBuf;
g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0);
OSInitMutex(&g_session.mutex);
@@ -416,9 +410,9 @@ void IPLContestFree(void* block, u32 _unused) {
OSUnlockMutex(&g_session.mutex);
}
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
g_session.httpResponse = httpRes;
if (param_1 == 0) {
if (error == 0) {
switch (NHTTPGetResultCode(httpRes)) {
case 200: {
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
@@ -440,7 +434,7 @@ void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
}
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
switch (param_1) {
switch (error) {
case 0x4: {
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
break;

View File

@@ -234,10 +234,10 @@ namespace ipl {
OSReport("NUP region code : %s\n", productAreaString);
const char* isoCountryCode = SCUTILGetISOCountryCodeA2();
OSReport("NUP country code : %s\n", isoCountryCode);
int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
int nupResult = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
OSReport("NUP_Start()\n");
if (iVar8 < 0) {
switch (iVar8) {
if (nupResult < 0) {
switch (nupResult) {
case -5000: {
OSReport("FAIL ALLOC\n");
}
@@ -426,8 +426,8 @@ namespace ipl {
int val;
int len = 4;
if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) {
int iVar7 = NETGetStartupErrorCode(-111);
mNetSetupLastErr = (-iVar7 / 100) * 100;
int startupErr = NETGetStartupErrorCode(-111);
mNetSetupLastErr = (-startupErr / 100) * 100;
mNetSetupLastErr = mNetSetup.getconntype();
}
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
@@ -451,8 +451,6 @@ namespace ipl {
}
void* NakamuraTest::conntestthread(void*) {
int iVar1;
IPLContestStart();
while (true) {
switch (IPLContestProcess()) {

View File

@@ -11,7 +11,7 @@ namespace ipl {
OSMutex NetSetup::sAllocLock;
NetSetup::StaticSOStartupInfo NetSetup::sSOStartupInfo;
void* NetSetup::iSOStartupEXThread(void* param_1) {
void* NetSetup::iSOStartupEXThread(void* connType) {
s32 cfgSetResult;
int soStartupRes;
SOInAddr soAddr;
@@ -61,7 +61,7 @@ namespace ipl {
soStartupRes = SOStartupEx(45000);
if (soStartupRes < 0) {
OSReport("[FAIL] SOStartup() failed.(%d)\n", soStartupRes);
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)param_1);
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)connType);
OSReport("<Error Code: %d>\n", -soStartupRes);
sSOStartupInfo.state = NET_SETUP_ERROR;
sSOStartupInfo.lastErr = -soStartupRes;

View File

@@ -54,7 +54,7 @@ namespace ipl {
void writeFourFlagBytes(u8* flags, u8 first, u8 second, u8 third, u8 fourth);
void setTitleRowColors(nw4r::lyt::TextBox* textBox, const nw4r::ut::Color& first,
const nw4r::ut::Color& second);
const nw4r::ut::Color& second) NO_INLINE;
static const char* sControlPaneNames[] = {
"A", "B", "B_BtnA",
@@ -1141,13 +1141,15 @@ namespace ipl {
void SDMemory::onDialogState21() {
const wchar_t* message = System::getMessage(mMessageId);
const wchar_t* blockCountMarker = wcsstr(message, L"***\n");
const wchar_t* blockCountMarker = wcsstr(message, L"****");
wchar_t* format = new (System::getMem2App(), -32) wchar_t[0x400];
wchar_t* dialogMessage = new (System::getMem2App(), -32) wchar_t[0x400];
if (blockCountMarker != NULL && message != NULL) {
format[0] = L'\0';
wcsncat(format, message, static_cast<u32>(blockCountMarker - message));
memset(format + 1, 1, 0);
wcsncat(format, message,
(reinterpret_cast<u32>(blockCountMarker) - reinterpret_cast<u32>(message)) >> 1);
wcscat(format, L"%d");
wcscat(format, blockCountMarker + 4);
@@ -1251,7 +1253,10 @@ namespace ipl {
void SDMemory::drawTransferTitles() {
const nw4r::math::VEC3& translation = mpDialogLayout->FindPaneByName("N_Memo")->GetTranslate();
nw4r::math::VEC3 memoPosition(translation.x, translation.y, translation.z);
nw4r::math::VEC3 memoPosition;
memoPosition.x = translation.x;
memoPosition.y = translation.y;
memoPosition.z = translation.z;
mpDialogLayout->FindPaneByName("header_header");
nw4r::lyt::Pane* bodyPane = mpDialogLayout->FindPaneByName("header_body");
@@ -1284,7 +1289,8 @@ namespace ipl {
mpDialogLayout->FindPaneByName("T_Header_body"));
s32 totalLines = lineCount + 1;
s32 lineIndex = 0;
while (lineIndex < totalLines) {
if (lineIndex < totalLines) {
do {
const wchar_t* lineEnd = wcsstr(messageLine, L"\n");
if (lineEnd == NULL) {
utility::layout::set_string(messageText, messageLine);
@@ -1305,6 +1311,7 @@ namespace ipl {
messageOffset -= bodyHeight;
++lineIndex;
} while (lineIndex < totalLines);
}
}
@@ -1328,14 +1335,20 @@ namespace ipl {
for (u32 titleIndex = 0; titleIndex < mTitleCount; ++titleIndex) {
utility::layout::set_string(titleText, mTitleNames[titleIndex]);
if (nandTitleIndex < mNandTitleCount && mTitleIds[titleIndex] == mNandTitleIds[nandTitleIndex]) {
nw4r::ut::Color activeTitleColor;
writeFourFlagBytes(&activeTitleColor.r, 0x34, 0xBE, 0xED, 0xFF);
GXColor gxActive;
writeFourFlagBytes(&gxActive.r, 0x34, 0xBE, 0xED, 0xFF);
++nandTitleIndex;
setTitleRowColors(titleText, activeTitleColor, activeTitleColor);
nw4r::ut::Color active0 = *reinterpret_cast<const nw4r::ut::Color*>(&gxActive);
setTitleRowColors(titleText,
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxActive)),
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxActive)));
} else {
nw4r::ut::Color inactiveTitleColor;
writeFourFlagBytes(&inactiveTitleColor.r, 0x64, 0x64, 0x64, 0xFF);
setTitleRowColors(titleText, inactiveTitleColor, inactiveTitleColor);
GXColor gxInactive;
writeFourFlagBytes(&gxInactive.r, 0x64, 0x64, 0x64, 0xFF);
nw4r::ut::Color inactive0 = *reinterpret_cast<const nw4r::ut::Color*>(&gxInactive);
setTitleRowColors(titleText,
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxInactive)),
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxInactive)));
}
nw4r::ut::Rect textRect = mpDialogLayout->getTextDrawRect("T_Letter");
@@ -1343,7 +1356,7 @@ namespace ipl {
s32 visibleRows = static_cast<s32>(static_cast<f32>(ceil(-rowTop / titleSizePane->GetSize().height)));
for (s32 row = 0; row < visibleRows; ++row) {
f32 rowY = bodyY + backgroundOffset;
if (rowY > -500.0f && rowY < 500.0f) {
if (-500.0f < rowY && rowY < 500.0f) {
nw4r::math::VEC2 translation(0.0f, backgroundOffset);
titleSizePane->SetTranslate(translation);
titleSizePane->CalculateMtx(*mpDialogLayout->getDrawInfo());
@@ -1351,7 +1364,7 @@ namespace ipl {
}
backgroundOffset -= rowHeight;
}
if (bodyY + titleOffset > -500.0f && bodyY + titleOffset < 500.0f) {
if (-500.0f < bodyY + titleOffset && bodyY + titleOffset < 500.0f) {
nw4r::math::VEC2 translation(0.0f, titleOffset);
titleText->SetTranslate(translation);
titleText->CalculateMtx(*mpDialogLayout->getDrawInfo());
@@ -1368,7 +1381,7 @@ namespace ipl {
++footerChild;
}
if (bodyY + backgroundOffset > -500.0f) {
if (-500.0f < bodyY + backgroundOffset) {
nw4r::math::VEC2 translation(0.0f, backgroundOffset);
footerPane->SetTranslate(translation);
footerPane->CalculateMtx(*mpDialogLayout->getDrawInfo());
@@ -1388,7 +1401,7 @@ namespace ipl {
}
void setTitleRowColors(nw4r::lyt::TextBox* textBox, const nw4r::ut::Color& first,
const nw4r::ut::Color& second) {
const nw4r::ut::Color& second) NO_INLINE {
textBox->SetTextColors(first, second);
}

View File

@@ -220,8 +220,8 @@ namespace ipl {
void SDChannelSelect::create() {
mpSDWorker = new (System::getMem2App(), 4) NandSDWorker();
mpWorkerHeap = (EGG::Heap*)System::getMem2App()->alloc(0x3EA60, 0x40);
mpThumbnailWorkHeap = (EGG::Heap*)System::getMem2App()->alloc(
MEMCalcHeapSizeForUnitHeap(0x19620, 0x60, 0x20) + 0x40000, 0x40);
u32 thumbnailHeapSize = MEMCalcHeapSizeForUnitHeap(0x19620, 0x60, 0x20) + 0x40000;
mpThumbnailWorkHeap = (EGG::Heap*)System::getMem2App()->alloc(thumbnailHeapSize, 0x40);
mpSDWorker->create(mpWorkerHeap, NULL, mpThumbnailWorkHeap, 0x12);
if (System::getSaveData()->didntGotoSDMenu() == FALSE) {
@@ -264,7 +264,6 @@ namespace ipl {
command.arguments.values[0] = 0;
command.arguments.values[1] = 0;
command.titleId = 0;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
}
@@ -274,7 +273,6 @@ namespace ipl {
command.arguments.values[0] = 0;
command.arguments.values[1] = 0;
command.titleId = 0;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -289,7 +287,6 @@ namespace ipl {
notice.arguments.values[0] = argument0;
notice.arguments.values[1] = argument1;
notice.titleId = titleId;
notice.arguments.values[2] = 0;
if (mNoticeQueue.capacity != mNoticeQueue.count) {
mNoticeQueue.notices[mNoticeQueue.writeIndex].copyFrom(notice);
++mNoticeQueue.writeIndex;
@@ -311,7 +308,6 @@ namespace ipl {
command.arguments.values[0] = 0;
command.arguments.values[1] = 0;
command.titleId = 0;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -326,7 +322,6 @@ namespace ipl {
command.arguments.values[0] = 0;
command.arguments.values[1] = 0;
command.titleId = 0;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -341,7 +336,6 @@ namespace ipl {
command.arguments.values[0] = 0;
command.arguments.values[1] = 0;
command.titleId = result;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -356,7 +350,6 @@ namespace ipl {
command.arguments.values[0] = value;
command.arguments.values[1] = (u32)&mFirstTitleCount;
command.titleId = ((u64)page << 32) | index;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -371,7 +364,6 @@ namespace ipl {
command.arguments.values[0] = 0;
command.arguments.values[1] = 0;
command.titleId = ((u64)page << 32) | index;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -386,7 +378,6 @@ namespace ipl {
command.arguments.values[0] = state;
command.arguments.values[1] = 0;
command.titleId = ((u64)page << 32) | index;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -401,7 +392,6 @@ namespace ipl {
command.arguments.values[0] = page;
command.arguments.values[1] = index;
command.titleId = 0;
command.arguments.values[2] = 0;
mCommandQueue.push(command);
return true;
}
@@ -1285,12 +1275,17 @@ namespace ipl {
}
bool SDChannelSelect::isCurrentTitleUsageEnough(const s32* usage) const {
s32 blocks = mSecondTitleCount;
s32 bytes = mFirstTitleCount;
ESTitleId currentTitleId = SCGetTmpTitleID();
u32 titleCount = mNandTitleCount;
s32 bytes;
u32 titleCount;
s32 blocks;
ESTitleId currentTitleId;
u32 index;
bytes = mFirstTitleCount;
blocks = mSecondTitleCount;
currentTitleId = SCGetTmpTitleID();
titleCount = mNandTitleCount;
for (index = 0; index < titleCount; ++index) {
if (mpNandTitleInfo[index].curTitleId == currentTitleId) {
break;
@@ -1301,9 +1296,11 @@ namespace ipl {
blocks += mpNandTitleInfo[index].inode;
}
return bytes >= usage[0] && blocks >= usage[1];
if (bytes >= usage[0] && blocks >= usage[1]) {
return true;
}
return false;
}
void SDChannelSelect::getCurrentTitleUsage(s32* bytes, s32* blocks) const {
*bytes = mFirstTitleCount;
*blocks = mSecondTitleCount;
@@ -1456,6 +1453,7 @@ namespace ipl {
s32 bytes;
s32 blocks;
getCurrentTitleUsage(&bytes, &blocks);
int hateUsageIndex = -1;
int hatePage = -1;
int hateChannelIndex = -1;
@@ -1464,45 +1462,48 @@ namespace ipl {
int hadeChannelIndex = -1;
for (u32 usageIndex = 0; usageIndex < mNandTitleCount; ++usageIndex) {
const ESTitleId titleId = mpNandTitleInfo[usageIndex].curTitleId;
ESTitleId titleId = mpNandTitleInfo[usageIndex].curTitleId;
if (titleId == ES_TITLE_ID(0x00010001, 0x48415445)) {
int page;
int channelIndex;
hateUsageIndex = usageIndex;
int foundPage = -1;
int foundIndex = -1;
System::getChannelManager()->hasChannel(
ES_TITLE_ID(0x00010001, 0x48415445), &foundPage, &foundIndex);
hatePage = foundPage;
hateChannelIndex = foundIndex;
ES_TITLE_ID(0x00010001, 0x48415445), &page, &channelIndex);
hatePage = page;
hateChannelIndex = channelIndex;
} else if (titleId == ES_TITLE_ID(0x00010001, 0x48414445)) {
int page;
int channelIndex;
hadeUsageIndex = usageIndex;
int foundPage = -1;
int foundIndex = -1;
System::getChannelManager()->hasChannel(
ES_TITLE_ID(0x00010001, 0x48414445), &foundPage, &foundIndex);
hadePage = foundPage;
hadeChannelIndex = foundIndex;
ES_TITLE_ID(0x00010001, 0x48414445), &page, &channelIndex);
hadePage = page;
hadeChannelIndex = channelIndex;
}
}
*titleCount = 0;
for (int usageIndex = mNandTitleCount - 1; usageIndex >= 0; --usageIndex) {
const ESTitleId titleId = mpNandTitleInfo[usageIndex].curTitleId;
if (titleId == 0x48415A41 || titleId == ES_TITLE_ID(0x00010001, 0x48415445) || titleId == ES_TITLE_ID(0x00010001, 0x48414445)) {
if (mpNandTitleInfo[usageIndex].curTitleId == 0x48415A41 ||
mpNandTitleInfo[usageIndex].curTitleId == ES_TITLE_ID(0x00010001, 0x48415445) ||
mpNandTitleInfo[usageIndex].curTitleId == ES_TITLE_ID(0x00010001, 0x48414445)) {
continue;
}
int page;
int channelIndex;
if (System::getChannelManager()->hasChannel(titleId, &page, &channelIndex) == 0) {
if (System::getChannelManager()->hasChannel(
mpNandTitleInfo[usageIndex].curTitleId, &page, &channelIndex) == 0) {
continue;
}
if (iplSavedata_813597A0(System::getSaveData(), titleId) != FALSE) {
if (isTitleCached(System::getSaveData(),
mpNandTitleInfo[usageIndex].curTitleId) != FALSE) {
continue;
}
bytes += mpNandTitleInfo[usageIndex].size;
blocks += mpNandTitleInfo[usageIndex].inode;
titleIds[*titleCount] = titleId;
titleIds[*titleCount] = mpNandTitleInfo[usageIndex].curTitleId;
wchar_t* titleName = System::getChannelManager()->getTitleName(
page, channelIndex, 0);
memcpy(titleNames + *titleCount * 0x2a, titleName, 0x2a);
@@ -1543,7 +1544,7 @@ namespace ipl {
if (hadeUsageIndex >= 0) {
bytes += mpNandTitleInfo[hadeUsageIndex].size;
blocks += mpNandTitleInfo[hadeUsageIndex].inode;
titleIds[*titleCount] = ES_TITLE_ID(0x00010001, 0x48414445);
titleIds[*titleCount] = mpNandTitleInfo[hadeUsageIndex].curTitleId;
wchar_t* titleName =
System::getChannelManager()->getTitleName(
hadePage, hadeChannelIndex, 0);
@@ -1558,7 +1559,7 @@ namespace ipl {
if (hateUsageIndex >= 0) {
bytes += mpNandTitleInfo[hateUsageIndex].size;
blocks += mpNandTitleInfo[hateUsageIndex].inode;
titleIds[*titleCount] = ES_TITLE_ID(0x00010001, 0x48415445);
titleIds[*titleCount] = mpNandTitleInfo[hateUsageIndex].curTitleId;
wchar_t* titleName =
System::getChannelManager()->getTitleName(
hatePage, hateChannelIndex, 0);
@@ -1570,7 +1571,10 @@ namespace ipl {
}
}
return bytes >= firstUsage[0] && blocks >= firstUsage[1];
if (bytes >= firstUsage[0] && blocks >= firstUsage[1]) {
return true;
}
return false;
}
bool SDChannelSelect::collectTitlesForMode(
@@ -1595,8 +1599,8 @@ namespace ipl {
}
bool SDChannelSelect::findAdjacentChannel(int direction, int* page, int* index) const {
int currentPage;
int slotCount;
int currentPage;
int currentSlot;
currentPage = mCurrentPage;
currentSlot = currentPage * MAX_CHANNEL_INDEX + mCurrentChannelIndex;
@@ -1696,7 +1700,7 @@ namespace ipl {
if (mState == 2 && !mpLayout->isPlaying(0)) {
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
if (button != NULL) {
button->setEventHandler(mpButtonEventHandler, NULL);
button->setEventHandler(mpButtonEventHandler);
mState = 3;
if (mCurrentPage > 0) {
button->initArrowAppearance(1, true);
@@ -1929,10 +1933,11 @@ namespace ipl {
SDChannelObj* channel = NULL;
System::getSaveData()->setLastSDPrevPage(mCurrentPage);
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, NULL)),
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
nw4r::ut::List_Remove(&mChannelObjects, channel);
destroyChannelObject(channel);
channel = NULL;
}
mpLayoutHeap->destroy();
@@ -1948,8 +1953,8 @@ namespace ipl {
OSSleepTicks(OSMicrosecondsToTicks((OSTime)100));
}
delete mpSaveDataFile;
mpSaveDataFile = NULL;
}
mpSaveDataFile = NULL;
if (mpSDWorker != NULL) {
if (!mpSDWorker->is_terminated()) {
@@ -2071,13 +2076,11 @@ namespace ipl {
}
void SDChannelSelect::drawChannelTransitionObjects() {
int index;
int page;
SDChannelObj* channel = NULL;
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
page = channel->getPage();
index = channel->getIndex();
int page = channel->mPage;
int index = channel->mIndex;
if (!hasChannelObject(page, index) || !isChannelReady(channel)) {
continue;
}
@@ -2086,14 +2089,25 @@ namespace ipl {
iplSDChannelObj_813E32C8(channel);
if (iplSDChannelObj_813E3330(channel)) {
if (mState < 24 && mState >= 15 &&
(page != mSourcePage || index != mSourceIndex)) {
nw4r::math::VEC3 position(channel->getTranslate());
mpPageLayouts[0]->GetRootPane()->SetTranslate(position);
mpPageLayouts[0]->calcMtx();
mpPageLayouts[0]->draw();
switch (mState) {
case 15:
case 16:
case 17:
case 18:
case 19:
case 20:
case 21:
case 22:
case 23:
if (page != mSourcePage || index != mSourceIndex) {
nw4r::math::VEC3 position(channel->getTranslate());
mpPageLayouts[0]->GetRootPane()->SetTranslate(position);
mpPageLayouts[0]->calcMtx();
mpPageLayouts[0]->draw();
}
break;
}
} else if (channel->mState == 2) {
} else if (channel->mStateFlags == 2) {
nw4r::math::VEC3 position(channel->getTranslate());
mpErrorLayout->GetRootPane()->SetTranslate(position);
mpErrorLayout->calcMtx();
@@ -2105,7 +2119,6 @@ namespace ipl {
case 16:
case 19:
case 20:
case 21:
case 22:
case 23:
if (page == mSourcePage && index == mSourceIndex) {
@@ -2117,10 +2130,15 @@ namespace ipl {
break;
}
if (mState < 22 && mState >= 19 &&
page == mDestinationPage && index == mDestinationIndex) {
mpPageLayouts[2]->draw();
mpPointerLayout->draw();
switch (mState) {
case 19:
case 20:
case 21:
if (page == mDestinationPage && index == mDestinationIndex) {
mpPageLayouts[2]->draw();
mpPointerLayout->draw();
}
break;
}
}
}
@@ -2244,7 +2262,7 @@ namespace ipl {
mbRightArrowVisible = false;
}
button->setEventHandler(mpButtonEventHandler, NULL);
button->setEventHandler(mpButtonEventHandler);
TVRCManager::getHandle()->setEnable(TRUE);
snd::getSystem()->startBGM("WIPL_BGM_MENU");
clearNoticeQueue();
@@ -2703,8 +2721,8 @@ namespace ipl {
nw4r::math::MTX44 matrix;
f32 rightScale = projection.right / mScale.x;
f32 leftScale = projection.left / mScale.x;
f32 topScale = projection.top / mScale.y;
f32 bottomScale = projection.bottom / mScale.y;
f32 topScale = projection.top / mScale.y;
f32 bottom = mPosition.y - bottomScale;
f32 right = mPosition.x + rightScale;
f32 left = mPosition.x + leftScale;
@@ -3463,7 +3481,7 @@ namespace ipl {
if (strcmp(paneName,
SDButton::smButtonName[SDButton::BTN_WII_MENU]) == 0) {
button->setEventHandler(NULL, NULL);
button->setEventHandler(NULL);
mpScene->mState = 4;
snd::getSystem()->startSE("WIPL_SE_DECIDE");
return;

View File

@@ -86,8 +86,15 @@ static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sd
memory->setTitleLists(sdRange, nandRange);
}
extern "C" char lbl_81696E30[];
extern "C" char lbl_81696E37[];
static const char* sButtonNames[2] = {lbl_81696E30, lbl_81696E37};
static const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
static const wchar_t sMissingTitle[] = L"???";
static const char* sButtonGroups[7] = {
"G_FocusBtnA", "G_FocusBtnB", "G_SelectBtnA", "G_SelectBtnB",
"G_OnOffBtnA", "G_OnOffBtnB", "G_OutBtn"
@@ -103,28 +110,27 @@ static const char* sButtonAnimationNames[6] = {
static const char* sBannerAnimationNames[3] = {
"banner.brlan", "banner_Start.brlan", "banner_Loop.brlan"
};
static const char* sTextNames[2] = {"T_BtnA", "T_BtnB"};
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
static const char* sTexturePaneNames[3][4] = {
{"Fre_a", "Fre_d", "Fre_i", "Fre_l"},
{"Fre_e", "Fre_f", "Fre_g", "Fre_h"},
{"Fre_b", "Fre_c", "Fre_j", "Fre_k"}
};
static const char* sTextNames[2] = {"T_BtnA", "T_BtnB"};
class SDTitleButtonEventHandler : public SDButtonEventHandlerBase {
class SDTitlePaneEventHandler : public ::gui::EventHandler {
public:
SDTitleButtonEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
virtual void onEventDerived(u32 component, u32 event, const controller::Interface* controller);
SDTitlePaneEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
virtual void onEvent(u32 component, u32 event, void* data);
nw4r::lyt::Pane* getPane(u32 component) {
return static_cast< ::gui::PaneComponent*>(mpManager->getComponent(component))->getPane();
}
SDChannelTitle* mpScene;
};
class SDTitlePaneEventHandler : public ::gui::EventHandler {
class SDTitleButtonEventHandler : public SDButtonEventHandlerBase {
public:
SDTitlePaneEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
virtual void onEvent(u32 component, u32 event, void* data);
SDTitleButtonEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
virtual void onEventDerived(u32 component, u32 event, const controller::Interface* controller);
nw4r::lyt::Pane* getPane(u32 component) {
return static_cast< ::gui::PaneComponent*>(mpManager->getComponent(component))->getPane();
}
@@ -222,9 +228,8 @@ void SDChannelTitle::create() {
comment->SetString(System::getMessage(0xad));
iplSDChannelTitle_813E630C(this);
mpFade = new math::HermiteIntp<f32>();
const f32 fadeStart = 0.0f;
const f32 fadeEnd = 255.0f;
mpFade->init(fadeStart, fadeEnd, 10.0f, 0.0f, 0.0f);
static f32 fadeRange[2] = {0.0f, 255.0f};
mpFade->init(fadeRange[0], fadeRange[1], 28.0f, 0.0f, 0.0f);
mpFade->setAnmType(ANIM_TYPE_FORWARD);
mpScreenCapture = new (System::getTreasureHeap(), 32) utility::Capture(System::getTreasureHeap(), 0, 0,
System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight, GX_TF_RGB565);
@@ -560,7 +565,7 @@ extern "C" void iplSDChannelTitle_813E6424(SDChannelTitle* scene) {
if (channel->mStateFlags == 0) {
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_813E4060(channel, 0));
} else {
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(L"");
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(sMissingTitle);
}
scene->mpProgressLayout->getAnim(0)->stop();
scene->mpProgressLayout->getAnim(0)->initAnmFrame();
@@ -1014,9 +1019,8 @@ extern "C" void iplSDChannelTitle_813E7A18(SDChannelTitle* scene) {
if (!scene->mScriptEnabled || scene->mScriptState == 4) {
if (scene->mpChannelSelect->prepareRestarting(scene->mPage)) {
scene->mpChannelSelect->startPageTransition(scene->mPage, scene->mIndex);
const f32 fadeStart = 255.0f;
const f32 fadeEnd = 0.0f;
scene->mpFade->init(fadeStart, fadeEnd, 10.0f, 0.0f, 0.0f);
static f32 fadeRange[2] = {0.0f, 255.0f};
scene->mpFade->init(fadeRange[0], fadeRange[1], 28.0f, 0.0f, 0.0f);
scene->mpFade->setAnmType(ANIM_TYPE_BACKWARD);
scene->mpFade->play();
scene->mState = 6;
@@ -1354,7 +1358,7 @@ extern "C" void iplSDChannelTitle_813E8A20(SDChannelTitle* scene, int nextScene)
int page;
int index;
if (System::getChannelManager()->hasChannel(scene->mTitleId, &page, &index)) {
System::getSaveData()->iplSavedata_813596B8(scene->mTitleId);
System::getSaveData()->pushTitleCache(scene->mTitleId);
}
System::getSaveData()->getSDPrevPage() = scene->mPage;
EGG::Heap* saveHeap = System::getMem2App();
@@ -1556,13 +1560,13 @@ void SDChannelTitle::startResetting() {
snd::getSystem()->resetAllSound();
}
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
iplSDChannelTitle_813E9004(this, component, event, static_cast<const controller::Interface*>(data));
}
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
iplSDChannelTitle_813E92EC(this, component, event, controller);
}
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
iplSDChannelTitle_813E9004(this, component, event, static_cast<const controller::Interface*>(data));
}
}
}

View File

@@ -396,10 +396,12 @@ int AOSS_Init_old(AOSSInitInput* input)
u64 tickRemainder;
AOSSReceiveBuffer* packetBuffer;
AOSSPacketHeader* packetWords;
u16 initialSleep;
u16 nextSleep;
u32 initialSleep;
u32 nextSleep;
u32 resultCode;
u32 flags;
int state;
int protocolState;
u32 retryWait;
u16 retryDelay;
u32 delayStep;
@@ -411,31 +413,38 @@ int AOSS_Init_old(AOSSInitInput* input)
int timeoutMilliseconds;
int protocolResult;
u32 responseSleep;
u32 subnetMask;
u64 timeoutTicks;
int initializationResult = 0;
int initializationResult;
short attemptCount;
u16 remainingWait;
short waitAttempt;
int receivedPackets;
AOSSWaitSettings waitSettings;
AOSSNetworkSettings settings;
AOSSRequestRecords requestRecords;
u16 defaultConnection;
u16 defaultResponse;
union {
struct { s16 connection; s16 response; } limits;
struct { u16 connection; u16 response; } defaults;
} waitIntervals;
AOSSWaitSettings waitSettings;
int receivedPackets;
u8 failureStatus;
AOSSNetworkSettings settings;
AOSSRequestRecords requestRecords;
AOSSSocketAddress replyAddress;
u8 messageIdentity[8];
__declspec(align(32)) AOSSSocketAddress socketAddress;
struct { int seconds; int microseconds; } pollTime;
AOSSSocketAddress receivedAddress;
AOSSPollDescriptor pollArguments[2];
u32 networkAddresses[5];
AOSSPollDescriptor pollArguments[2];
waitIntervals.defaults.response = s_defaultOptions[1];
waitIntervals.defaults.connection = s_defaultOptions[0];
defaultConnection = s_defaultOptions[0];
defaultResponse = s_defaultOptions[1];
waitIntervals.defaults.connection = defaultConnection;
waitIntervals.defaults.response = defaultResponse;
waitSettings.value = 0;
receivedPackets = 0;
protocolState = 0;
memset(&requestRecords,0,0x18);
waitIntervals.limits.connection = input->options[0];
if (waitIntervals.limits.connection == -1) {
@@ -462,12 +471,13 @@ int AOSS_Init_old(AOSSInitInput* input)
memset(&s_runtime,0,0x1c);
s_runtime.config = input->ssid;
s_runtime.configLength = (u32)input->ssidLength;
s_runtime.flags = input->flags & 0xf;
flags = input->flags;
s_runtime.flags = flags & 0xf;
s_runtime.interfaceType = input->mode;
s_runtime.state = 0;
s_runtime.ipAddress = 0xc0a80b01;
s_runtime.active = '\0';
if ((input->flags & 1) != 1) {
if ((flags & 1u) != 1u) {
s_errorCode = 0x13;
input->status = 0xf;
if (s_accessPointConfig) {
@@ -481,12 +491,11 @@ int AOSS_Init_old(AOSSInitInput* input)
resultCode = 0xffffffff;
} else {
attemptCount = 0;
initialWait = waitIntervals.limits.connection;
if (s_operationState != 0) {
s_operationState = 0;
AOSSi_Status(0);
initialWait = waitIntervals.limits.connection;
}
initialWait = waitIntervals.limits.connection;
while (1) {
if (s_accessPointList) {
AOSSi_Free(s_accessPointList);
@@ -534,8 +543,7 @@ int AOSS_Init_old(AOSSInitInput* input)
goto finish_initialization;
}
if (state != 0) {
remainingWait = waitIntervals.limits.response;
if ((short)initialWait <= attemptCount) {
if (attemptCount >= initialWait) {
input->status = 1;
if (s_accessPointConfig) {
AOSSi_Free(s_accessPointConfig);
@@ -548,6 +556,7 @@ int AOSS_Init_old(AOSSInitInput* input)
resultCode = 0xffffffff;
goto finish_initialization;
}
remainingWait = waitIntervals.limits.response;
for (; remainingWait != 0; remainingWait -= initialSleep) {
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -562,9 +571,9 @@ int AOSS_Init_old(AOSSInitInput* input)
resultCode = 0xffffffff;
goto finish_initialization;
}
initialSleep = remainingWait <= 100 ? remainingWait : 100;
AOSSi_Sleep(remainingWait > 100 ? 100 : remainingWait);
initialSleep = remainingWait <= 100 ? remainingWait : 100;
if (remainingWait > 100) initialSleep = 100;
else initialSleep = remainingWait;
}
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -593,7 +602,8 @@ int AOSS_Init_old(AOSSInitInput* input)
if (settings.manufacturerLength <= 0xd) {
memcpy(settings.manufacturer,s_manufacturer,settings.manufacturerLength);
}
state = AOSSi_SetNCDIPAddr(0xc0a80b65,0xffffff00,0xc0a80b01,0,0);
initializationResult = AOSSi_SetNCDIPAddr(0xc0a80b65,0xffffff00,0xc0a80b01,0,0);
state = initializationResult;
if (state != 0) {
s_errorCode = 0xc;
input->status = 0xf;
@@ -622,8 +632,8 @@ int AOSS_Init_old(AOSSInitInput* input)
} else {
memset(s_accessPointConfig,0,0x58);
initialWait = waitIntervals.limits.connection;
remainingWait = 0;
goto wait_for_initial_link;
attemptCount = 0;
goto test_initial_link;
}
}
goto finish_initialization;
@@ -642,7 +652,6 @@ int AOSS_Init_old(AOSSInitInput* input)
}
goto finish_initialization;
wait_for_initial_link:
if ((short)initialWait <= (short)remainingWait) goto handle_initial_link;
state = AOSS_814020CC(&settings,s_accessPointConfig);
if (state == -1) {
input->status = 0xf;
@@ -657,9 +666,9 @@ wait_for_initial_link:
resultCode = 0xffffffff;
goto finish_initialization;
}
initialSleep = waitIntervals.limits.response;
if ((state == 0) && (*s_accessPointConfig == 1)) goto handle_initial_link;
for (; initialSleep != 0; initialSleep -= nextSleep) {
if ((state == 0) && ((u32)*s_accessPointConfig == 1u)) goto handle_initial_link;
remainingWait = (u16)waitIntervals.limits.response;
for (; remainingWait != 0; remainingWait = (u16)(remainingWait - nextSleep)) {
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
if (s_accessPointConfig) {
@@ -673,9 +682,9 @@ wait_for_initial_link:
resultCode = 0xffffffff;
goto finish_initialization;
}
nextSleep = initialSleep <= 100 ? initialSleep : 100;
AOSSi_Sleep(initialSleep > 100 ? 100 : initialSleep);
nextSleep = initialSleep <= 100 ? initialSleep : 100;
AOSSi_Sleep(remainingWait > 100 ? 100 : remainingWait);
if (remainingWait > 100) nextSleep = 100;
else nextSleep = remainingWait;
}
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -690,10 +699,11 @@ wait_for_initial_link:
resultCode = 0xffffffff;
goto finish_initialization;
}
remainingWait++;
goto wait_for_initial_link;
attemptCount++;
test_initial_link:
if (attemptCount < initialWait) goto wait_for_initial_link;
handle_initial_link:
if (remainingWait == waitIntervals.limits.connection) {
if (attemptCount == waitIntervals.limits.connection) {
input->status = 0xf;
if (s_accessPointConfig) {
AOSSi_Free(s_accessPointConfig);
@@ -724,8 +734,8 @@ handle_initial_link:
currentRecord->transactionId = transactionId;
receivedLength = SOHtoNs(transactionId);
currentRecord->transactionId = receivedLength;
requestResult = requestResult + 1;
state = state + 8;
requestResult++;
state += sizeof(AOSSRequestRecord);
} while (requestResult < 3);
s_socket = SOSocket(2,2,0);
if (s_socket < 0) {
@@ -777,14 +787,13 @@ handle_initial_link:
attemptCount = waitSettings.halfwords.high;
settings.gatewayAddress = 0xc0a80b65;
settings.ipAddress = 0xc0a80b01;
state = 0;
perform_request:
packetBuffer = s_responseBuffer;
memset(networkAddresses,0,0x14);
networkAddresses[4] = settings.gatewayAddress;
networkAddresses[0] = settings.ipAddress;
do {
if ((state == 1) && ((s8)s_runtime.active != 1)) {
if ((protocolState == 1) && ((s8)s_runtime.active != 1)) {
if (s_socket != -1) {
SOClose(s_socket);
}
@@ -812,9 +821,10 @@ request_socket_cleanup_complete:
resultCode = 0xffffffff;
goto finish_initialization;
}
responseSleep = s_runtime.ipAddress & s_runtime.subnetMask;
retryWait = responseSleep | (s_runtime.ipAddress & ~s_runtime.subnetMask) + 1;
if ((responseSleep | ~s_runtime.subnetMask) <= retryWait) {
subnetMask = s_runtime.subnetMask;
responseSleep = s_runtime.ipAddress & subnetMask;
retryWait = responseSleep | (s_runtime.ipAddress & ~subnetMask) + 1;
if (retryWait >= (responseSleep | ~subnetMask)) {
retryWait = responseSleep | 1;
}
requestResult = AOSSi_SetNCDIPAddr(retryWait,s_runtime.subnetMask,s_runtime.ipAddress,0,0);
@@ -864,8 +874,8 @@ request_socket_cleanup_complete:
resultCode = 0xffffffff;
goto finish_initialization;
}
remainingWait = waitIntervals.limits.response;
if ((requestResult == 0) && (*s_accessPointConfig == 1)) break;
remainingWait = waitIntervals.limits.response;
for (; remainingWait != 0; remainingWait -= initialSleep) {
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -882,7 +892,8 @@ request_socket_cleanup_complete:
}
initialSleep = remainingWait <= 100 ? remainingWait : 100;
AOSSi_Sleep(remainingWait > 100 ? 100 : remainingWait);
initialSleep = remainingWait <= 100 ? remainingWait : 100;
if (remainingWait > 100) initialSleep = 100;
else initialSleep = remainingWait;
}
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -933,7 +944,7 @@ request_socket_cleanup_complete:
}
}
requestResult = s_socket;
switch (state) {
switch (protocolState) {
case 0:
if (s_operationState != 2) {
s_operationState = 2;
@@ -987,7 +998,7 @@ request_socket_cleanup_complete:
break;
}
if (requestResult == -1) {
s_errorCode = state + 0x1000;
s_errorCode = protocolState + 0x1000;
input->status = 0xf;
if (s_accessPointConfig) {
AOSSi_Free(s_accessPointConfig);
@@ -1016,9 +1027,8 @@ request_socket_cleanup_complete:
requestResult = SOPoll(pollArguments,1,(u32)(timeoutTicks >> 32),(int)timeoutTicks);
if (0 < requestResult) goto process_received_packet;
receivedPackets = receivedPackets + 1;
retryDelay = waitSettings.halfwords.low;
if (attemptCount < receivedPackets) {
switch (state) {
if (receivedPackets > attemptCount) {
switch (protocolState) {
case 0: s_errorCode = 0xf; break;
case 1: s_errorCode = 0x10; break;
default: s_errorCode = 0x11; break;
@@ -1026,6 +1036,7 @@ request_socket_cleanup_complete:
protocolResult = -1;
goto close_protocol_socket;
}
retryDelay = waitSettings.halfwords.low;
for (; retryDelay != 0; retryDelay -= delayStep) {
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -1040,9 +1051,9 @@ request_socket_cleanup_complete:
resultCode = 0xffffffff;
goto finish_initialization;
}
delayStep = retryDelay <= 100 ? retryDelay : 100;
AOSSi_Sleep(retryDelay > 100 ? 100 : retryDelay);
delayStep = retryDelay <= 100 ? retryDelay : 100;
if (retryDelay > 100) delayStep = 100;
else delayStep = retryDelay;
}
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -1078,7 +1089,7 @@ process_received_packet:
packetBuffer->socket = s_socket;
retryWait = SONtoHs(receivedLength);
packetBuffer->length = retryWait & 0xffff;
requestResult = AOSS_814001B4(state,packetBuffer,&receivedPackets,&requestRecords,s_socket);
requestResult = AOSS_814001B4(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
if (requestResult == 100) {
protocolResult = 0;
}
@@ -1086,8 +1097,8 @@ process_received_packet:
protocolResult = -1;
}
else {
if (state != requestResult) {
state = requestResult;
if (protocolState != requestResult) {
protocolState = requestResult;
if (requestResult != 2) goto perform_request;
if (s_socket != -1) {
SOClose(s_socket);
@@ -1209,8 +1220,8 @@ wait_for_packet:
resultCode = 0xffffffff;
goto finish_initialization;
}
remainingWait = waitIntervals.limits.response;
if ((state == 0) && (*s_accessPointConfig == 1)) break;
remainingWait = waitIntervals.limits.response;
for (; remainingWait != 0; remainingWait -= initialSleep) {
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -1225,7 +1236,6 @@ wait_for_packet:
resultCode = 0xffffffff;
goto finish_initialization;
}
initialSleep = remainingWait <= 100 ? remainingWait : 100;
AOSSi_Sleep(remainingWait > 100 ? 100 : remainingWait);
initialSleep = remainingWait <= 100 ? remainingWait : 100;
}
@@ -1284,10 +1294,10 @@ wait_for_packet:
resultCode = 0xffffffff;
goto finish_initialization;
}
state = requestResult;
protocolState = requestResult;
goto perform_request;
}
state = requestResult;
protocolState = requestResult;
if (receivedPackets > waitSettings.halfwords.high) {
switch (requestResult) {
case 0: s_errorCode = 0xf; break;
@@ -1312,9 +1322,10 @@ wait_for_packet:
resultCode = 0xffffffff;
goto finish_initialization;
}
delayStep = retryDelay <= 100 ? retryDelay : 100;
AOSSi_Sleep(retryDelay > 100 ? 100 : retryDelay);
delayStep = retryDelay <= 100 ? retryDelay : 100;
if (retryDelay > 100) AOSSi_Sleep(100);
else AOSSi_Sleep(retryDelay);
if (retryDelay > 100) delayStep = 100;
else delayStep = retryDelay;
}
if (AOSSi_cancel_flag == 1) {
input->status = 0xf;
@@ -1361,13 +1372,14 @@ protocol_socket_cleanup_complete:
}
if (protocolResult != 0) {
switch (s_errorCode) {
case 0xf: input->status = 3; break;
case 0x10: input->status = 4; break;
case 0x11: input->status = 5; break;
case 0x14: input->status = 7; break;
case 0x15: input->status = 8; break;
default: input->status = 0xf; break;
case 0xf: failureStatus = 3; break;
case 0x10: failureStatus = 4; break;
case 0x11: failureStatus = 5; break;
case 0x14: failureStatus = 7; break;
case 0x15: failureStatus = 8; break;
default: failureStatus = 0xf; break;
}
input->status = failureStatus;
if (s_accessPointConfig) {
AOSSi_Free(s_accessPointConfig);
s_accessPointConfig = (int *)0x0;
@@ -1380,10 +1392,8 @@ protocol_socket_cleanup_complete:
goto finish_initialization;
} else {
protocolResult = AOSS_813FFD68(input);
if (protocolResult == 0) {
resultCode = 0;
}
else {
if (protocolResult == 0) goto configuration_success;
{
input->status = 6;
if (s_accessPointConfig) {
AOSSi_Free(s_accessPointConfig);
@@ -1396,6 +1406,9 @@ protocol_socket_cleanup_complete:
resultCode = 0xffffffff;
}
goto finish_initialization;
configuration_success:
resultCode = 0;
goto finish_initialization;
}
finish_initialization:
return (int)resultCode;
@@ -1816,13 +1829,13 @@ int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
}
int AOSS_81400830(AOSSDecryptionMessage* message) {
AOSSEncryptedPayload* encrypted = &message->payload.encrypted;
u32 checksum;
u8 manufacturerAddress[8];
AOSSKeySchedule schedule;
AOSSEncryptedPayload* encrypted = &message->payload.encrypted;
u8* decryptedData;
u32 dataLength;
u32 controlFlags;
u32 checksum;
u32 dataLength;
u32 i;
s32 crcIndex;
u32 firstIndex;
@@ -1831,9 +1844,9 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
u32 secondValue;
u32 stateIndex;
u32 crc;
u8* outputCursor;
u8* state;
const u8* inputCursor;
u8* state;
u8* outputCursor;
int result;
memcpy(manufacturerAddress, message->manufacturerAddress, sizeof(manufacturerAddress));
@@ -2293,10 +2306,12 @@ int AOSS_81401778(void* packet, void* request, int socket) {
AOSSHelloPacket* response = (AOSSHelloPacket*)s_responseBuffer;
AOSSHelloPayload* payload;
AOSSRequestRecords* requestRecords = (AOSSRequestRecords*)request;
AOSSSocketAddress destination;
AOSSKeySchedule schedule;
AOSSHelloRecord hello;
u8 accessPointName[8];
struct {
AOSSSocketAddress destination;
AOSSHelloRecord hello;
u8 accessPointName[8];
AOSSKeySchedule schedule;
} construction;
u32 checksum;
u16 nonce;
u32 stateLength;
@@ -2314,63 +2329,64 @@ int AOSS_81401778(void* packet, void* request, int socket) {
checksum = 0;
sequence = 0;
memset(&hello, 0, sizeof(hello));
memset(&construction.hello, 0, sizeof(construction.hello));
memset(response, 0, 0x5dc);
payload = &response->payload;
hello.data.fields.type = 2;
hello.data.fields.reserved01 = 0;
hello.data.fields.length = SOHtoNs(4);
hello.data.fields.supportedModes = s_runtime.flags;
hello.data.fields.supportedModes = SOHtoNl(hello.data.fields.supportedModes);
construction.hello.data.fields.type = 2;
construction.hello.data.fields.reserved01 = 0;
construction.hello.data.fields.length = SOHtoNs(4);
construction.hello.data.fields.supportedModes = s_runtime.flags;
construction.hello.data.fields.supportedModes = SOHtoNl(construction.hello.data.fields.supportedModes);
responseLength = 8;
if ((s32)s_connectionState == 1) {
const u32* crcTable = s_crcTable;
const u32* crcTable;
sequence = 1;
checksum = 0xffffffff;
AOSS_81401DC0(0, s_crcTable);
crcTable = s_crcTable;
{
u32 part;
for (part = 0; part < 2; part++) {
for (index = 0; index < 4; index++) {
checksum = (checksum >> 8) ^ crcTable[(checksum ^ hello.data.bytes[part * 4 + index]) & 0xff];
for (part = 0; part < 4; part++) {
for (index = 0; index < 2; index++) {
checksum = (checksum >> 8) ^ crcTable[(checksum ^ construction.hello.data.bytes[part * 2 + index]) & 0xff];
}
}
}
checksum = (checksum ^ 0xffffffff) & 0xff;
schedule.bytes = (u8*)AOSSi_Alloc(8);
if (schedule.bytes != 0) {
construction.schedule.bytes = (u8*)AOSSi_Alloc(8);
if (construction.schedule.bytes != 0) {
nonce = (u16)rand();
memcpy(&payload->encrypted.key.nonce, &nonce, 2);
memcpy(s_packetState.keyNonce, payload->encrypted.key.nonceBytes, 2);
memcpy(s_packetState.keyAddress, s_accessPointName, 8);
AOSS_81401C9C(&schedule, s_packetState.keyNonce,
AOSS_81401C9C(&construction.schedule, s_packetState.keyNonce,
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), 8);
for (index = 0; index < 8; index++) {
state = schedule.bytes;
firstIndex = (schedule.i + 1) % schedule.length & 0xff;
state = construction.schedule.bytes;
firstIndex = (construction.schedule.i + 1) % construction.schedule.length & 0xff;
firstByte = state[firstIndex];
secondIndex = (firstByte + schedule.j) % schedule.length & 0xff;
secondIndex = (firstByte + construction.schedule.j) % construction.schedule.length & 0xff;
swap = state[secondIndex];
stateLength = firstByte + swap;
schedule.i = firstIndex;
schedule.j = secondIndex;
construction.schedule.i = firstIndex;
construction.schedule.j = secondIndex;
state[secondIndex] = (u8)firstByte;
state[firstIndex] = swap;
value = state[stateLength % schedule.length] ^ hello.data.bytes[index];
value = state[stateLength % construction.schedule.length] ^ construction.hello.data.bytes[index];
payload->bytes[index + 4] = value;
}
AOSSi_Free(schedule.bytes);
AOSSi_Free(construction.schedule.bytes);
}
payload->encrypted.length = SOHtoNs(8);
responseLength = 0x0c;
} else {
memcpy(payload->bytes, &hello, 8);
memcpy(payload->bytes, &construction.hello, 8);
}
memcpy(accessPointName, &requestRecords->records[1], 8);
encryptionResult = AOSS_81401E80(accessPointName, 8, s_manufacturer, 6);
memcpy(construction.accessPointName, &requestRecords->records[1], 8);
encryptionResult = AOSS_81401E80(construction.accessPointName, 8, s_manufacturer, 6);
if (encryptionResult != 0) {
s_errorCode = 2;
return -1;
@@ -2385,17 +2401,17 @@ int AOSS_81401778(void* packet, void* request, int socket) {
response->header.finalSequence = SOHtoNs(sequence);
response->header.reserved = checksum;
response->header.messageType = 0x11;
memcpy(response->header.messageIdentity, accessPointName, 8);
memcpy(response->header.messageIdentity, construction.accessPointName, 8);
sendLength = (s16)(responseLength + 0x18);
memset(&destination, 0, sizeof(destination));
destination.family = 2;
destination.port = SOHtoNs(0x5790);
destination.address = SOHtoNl(s_runtime.ipAddress);
memset(&construction.destination, 0, sizeof(construction.destination));
construction.destination.family = 2;
construction.destination.port = SOHtoNs(0x5790);
construction.destination.address = SOHtoNl(s_runtime.ipAddress);
if ((s8)s_runtime.active == 0) {
destination.address = 0xffffffff;
construction.destination.address = 0xffffffff;
}
destination.length = 8;
SOSendTo(socket, response, sendLength, 0, &destination);
construction.destination.length = 8;
SOSendTo(socket, response, sendLength, 0, &construction.destination);
return 0;
}

View File

@@ -871,17 +871,17 @@ int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousR
int ATERM_81402A24(void) {
s32 result = -1;
s32 progressInfo[4];
AtermApRecordSet* currentRecords = NULL;
AtermApRecordSet* previousRecords = NULL;
u32 scanBufferBytes;
u32 recordIndex;
s32 iteration = 0;
u8* rawScanBuffer = NULL;
u8* scanBuffer;
u16* firstDescriptor;
u32 recordBytes = gAtermScanLimit * sizeof(AtermApRecord) + sizeof(AtermApRecord) + sizeof(u32);
u32 scanBufferBytes;
s32 progressInfo[4];
u32 scanCount;
u32 recordIndex;
s32 iteration = 0;
AtermApRecordSet* currentRecords = NULL;
AtermApRecordSet* previousRecords = NULL;
u32 now;
char selectedMacText[32];

View File

@@ -78,8 +78,8 @@ namespace ipl {
int finish(NCDAossConfig* config, int* result);
void printInfo();
static void* AOSSThread_813FCC8C(u32 id, s32 size);
static void AOSSThread_813FCCE4(u32 id, void* ptr, s32 align);
static void* aossAlloc(u32 id, s32 size);
static void aossFree(u32 id, void* ptr, s32 align);
private:
s32 mState; // 0x32C
@@ -122,8 +122,8 @@ namespace ipl {
return 0;
}
config.alloc = AOSSThread_813FCC8C;
config.free = AOSSThread_813FCCE4;
config.alloc = aossAlloc;
config.free = aossFree;
BOOL level = OSDisableInterrupts();
@@ -144,7 +144,7 @@ namespace ipl {
return 1;
}
void* AOSSThread::AOSSThread_813FCC8C(u32 id, s32 size) {
void* AOSSThread::aossAlloc(u32 id, s32 size) {
void* buffer;
BOOL level = OSDisableInterrupts();
buffer = MEMAllocFromAllocator(&m_allocator, size);
@@ -152,7 +152,7 @@ namespace ipl {
return buffer;
}
void AOSSThread::AOSSThread_813FCCE4(u32 id, void* ptr, s32 align) {
void AOSSThread::aossFree(u32 id, void* ptr, s32 align) {
BOOL level = OSDisableInterrupts();
MEMFreeToAllocator(&m_allocator, ptr);
OSRestoreInterrupts(level);
@@ -162,7 +162,7 @@ namespace ipl {
mState = 0xF;
AOSS_SetCallback(USBAPThread::callback);
if (AOSSi_InitLocal(AOSSThread_813FCC8C, AOSSThread_813FCCE4) == -1) {
if (AOSSi_InitLocal(aossAlloc, aossFree) == -1) {
return this;
}

View File

@@ -459,48 +459,48 @@ namespace ipl {
}
void NCDSetting::setWDPrivacyMode(u16 mode) {
u16 uVar1;
u16 privacyMode;
switch (mode) {
case 0: {
uVar1 = 0;
privacyMode = 0;
break;
}
case 1: {
uVar1 = 1;
privacyMode = 1;
break;
}
case 2: {
uVar1 = 2;
privacyMode = 2;
break;
}
case 4: {
uVar1 = 4;
privacyMode = 4;
break;
}
case 5: {
uVar1 = 5;
privacyMode = 5;
break;
}
case 6: {
uVar1 = 6;
privacyMode = 6;
break;
}
case 7: {
uVar1 = 4;
privacyMode = 4;
break;
}
case 8: {
uVar1 = 1;
privacyMode = 1;
break;
}
default: {
uVar1 = 0;
privacyMode = 0;
break;
}
}
memset(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104, 0, 0x44);
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = uVar1;
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = privacyMode;
}
void NCDSetting::setPrivacy(u8* newKey, int len) {

View File

@@ -1419,8 +1419,8 @@ namespace ipl {
mpChangeLayout->FindPaneByName("N_Tra0")->SetVisible(true);
}
WWWRect* wideRect = NULL;
WWWRect* standardRect = NULL;
WWWRect* standardRect;
WWWRect* wideRect;
void* wideBuffer = browser->GetTextureBuffer(1, &wideRect);
void* standardBuffer = browser->GetTextureBuffer(0, &standardRect);
nw4r::ut::Rect projection4x3;
@@ -1434,8 +1434,8 @@ namespace ipl {
screenRect.bottom = -screenHeight / 2;
if (wideBuffer != NULL && standardBuffer != NULL) {
GXTexObj wideTexture;
GXTexObj standardTexture;
GXTexObj wideTexture;
GXInitTexObj(&wideTexture, wideBuffer, wideRect->w, wideRect->h, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObj(&standardTexture, standardBuffer, standardRect->w, standardRect->h, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObjLOD(&wideTexture, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
@@ -1715,9 +1715,8 @@ namespace ipl {
memset(unk_0x938, 0, sizeof(unk_0x938));
}
keyboard::Manager* keyboardManager = System::getKeyboard();
if (productArea == 11) {
keyboardManager->memoFrm()->setZiDictionary(keyboardManager->getZiOemDic(), keyboardManager->getZiSystemDic());
System::getKeyboard()->memoFrm()->setZiDictionary(System::getKeyboard()->getZiOemDic(), System::getKeyboard()->getZiSystemDic());
}
keyboard::Manager::KeyboardSetting setting;
@@ -1725,12 +1724,12 @@ namespace ipl {
setting.wcString = reinterpret_cast<const wchar_t*>(unk_0x938);
setting.stringLimit = stringLimit;
setting.rowLimit = rowLimit;
keyboardManager->start(0, setting);
System::getKeyboard()->start(0, setting);
if (invalidInput != 0) {
setDefaultBackString();
} else {
keyboardManager->baseMgr()->setTitleText(L"");
System::getKeyboard()->baseMgr()->setTitleText(L"");
}
if (mpWiiSettingData->data[0x11] == 17) {
System::getKeyboard()->baseMgr()->setSecretInputMode(true);
@@ -1811,9 +1810,9 @@ namespace ipl {
ext_ead::www::SurfaceManager::GetInstance()->GetBrowserThread()->CommitIme(mpBrowserData, formText);
memset(mpStringBuffer->asterisks, 0, sizeof(mpStringBuffer->asterisks));
} else if (mpWiiSettingData->data[0x11] == 2 || mpWiiSettingData->data[0x11] == 22) {
s32 index = 0;
memcpy(mpStringBuffer->asterisks, mpStringBuffer->securityKey, sizeof(mpStringBuffer->securityKey));
mpStringBuffer->asterisks[0x41] = 0;
s32 index = 0;
while (mpStringBuffer->asterisks[index] != 0) {
mpStringBuffer->asterisks[index++] = '*';
}
@@ -1905,12 +1904,16 @@ namespace ipl {
case keyboard::Manager::STATE_HIDDEN:
case keyboard::Manager::STATE_APPEARING: {
u8 formId = mpWiiSettingData->data[0x11];
if (formId >= 1 && formId <= 22 && formId != 9 && formId != 21) {
if (!System::getKeyboard()->memoMgr()->isVacancy()) {
System::getKeyboard()->baseMgr()->setTitleText(L"");
} else {
switch (formId) {
case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
case 10: case 11: case 12: case 13: case 14: case 15: case 16:
case 17: case 18: case 19: case 20: case 22:
if (System::getKeyboard()->memoMgr()->isVacancy()) {
setDefaultBackString();
} else {
System::getKeyboard()->baseMgr()->setTitleText(L"");
}
break;
}
break;
@@ -2448,11 +2451,12 @@ namespace ipl {
void Setting::convertRevIP(u8* destination, const char* address) {
char ascii[20];
int count = 0;
int index;
memset(ascii, 0, sizeof(ascii));
utility::CharacterCode::UTF8ToANSI(reinterpret_cast<u8*>(ascii), address);
int componentStart = 0;
u8* output = destination;
for (int index = 0; index < 0x10; ++index) {
for (index = 0; index < 0x10; ++index) {
u8 character = static_cast<u8>(ascii[index]);
if (character == '.' || character == 0) {
if (character == 0) {
@@ -2714,9 +2718,10 @@ namespace ipl {
case 5:
mpPaneManager->update();
break;
case 6:
case 6: {
int animationIndex = unk_0x918;
unk_0xB9C = 1;
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
if (!mpMainLayout->getAnim(animationIndex)->isPlaying()) {
unk_0x78 = 5;
setAPDraw();
if (unk_0x91C[0] != 0) {
@@ -2738,6 +2743,7 @@ namespace ipl {
mpMainLayout->FindPaneByName("N_AP7")->SetVisible(true);
}
break;
}
case 7:
unk_0xB9C = 1;
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
@@ -3553,6 +3559,10 @@ namespace ipl {
}
}
static inline bool HasUSBAPResult(const u8* result) {
return *result != 0;
}
void Setting::setUSBAP() {
switch (unk_0x84) {
case 1:
@@ -3573,7 +3583,7 @@ namespace ipl {
}
break;
case 2:
if (unk_0x91C[1] != 0) {
if (HasUSBAPResult(&unk_0x91C[1])) {
www::wiisetting::setFuncResult(unk_0x91C[1]);
unk_0x84 = 1;
unk_0x91C[1] = 0;

View File

@@ -10,10 +10,10 @@
#pragma sym on
extern "C" const f32 lbl_816945C8 = 1000.0f;
extern "C" const f64 lbl_816945D0 = 1000000000.0;
extern "C" const f64 lbl_816945D8 = 1.0;
extern "C" const f64 lbl_816945E0 = 4503599627370496.0;
extern "C" const f32 scTvrcMsPerSec = 1000.0f;
extern "C" const f64 scTvrcNsecPerSec = 1000000000.0;
extern "C" const f64 scTvrcOne = 1.0;
extern "C" const f64 scTvrcFloatMagic = 4503599627370496.0;
extern "C" BOOL _isInitialized__7LibTVRC;
extern "C" BOOL _isActive__7LibTVRC;
@@ -53,11 +53,11 @@ extern "C" void __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext();
#pragma push
#pragma section data_type ".sdata"
extern "C" char lbl_81696230[5] = {'T', 'V', 'R', '0', '\0'};
extern "C" char scTvrcFileHeader[5] = {'T', 'V', 'R', '0', '\0'};
#pragma pop
namespace LibTVRC {
const char* TVRC_FILE_HEADER = lbl_81696230;
const char* TVRC_FILE_HEADER = scTvrcFileHeader;
u32 __tienHoseiNsec = 1100;
u32 _limitMilli = 400;
@@ -267,7 +267,7 @@ TVRCSendStartAsync_valid:
bne TVRCSendStartAsync_custom
lwz r6, _tvrcFile__7LibTVRC
lis r3, 2
lfs f1, lbl_816945C8
lfs f1, scTvrcMsPerSec
lis r4, 0x8000
lfs f0, 0xc(r6)
subi r0, r3, 0x17b8
@@ -309,7 +309,7 @@ TVRCSendStartAsync_no_repeat:
TVRCSendStartAsync_timing:
lfs f1, _onTimeRatio__7LibTVRC
lis r4, 0x8000
lfd f0, lbl_816945D0
lfd f0, scTvrcNsecPerSec
lis r27, 0x4330
lwz r0, 0xf8(r4)
lis r3, 2
@@ -321,7 +321,7 @@ TVRCSendStartAsync_timing:
divwu r26, r4, r0
fdiv f2, f1, f0
stw r27, 8(r1)
lfd f1, lbl_816945E0
lfd f1, scTvrcFloatMagic
stw r25, 0xc(r1)
lfd f0, 8(r1)
fsub f0, f0, f1
@@ -339,13 +339,13 @@ TVRCSendStartAsync_timing:
bl __div2i
lfs f2, _onTimeRatio__7LibTVRC
lis r28, _tickWait__7LibTVRC@ha
lfd f1, lbl_816945D8
lfd f1, scTvrcOne
addi r29, r28, _tickWait__7LibTVRC@l
lfd f0, lbl_816945D0
lfd f0, scTvrcNsecPerSec
fsub f3, f1, f2
lfs f2, _Hz__7LibTVRC
stw r25, 0x14(r1)
lfd f1, lbl_816945E0
lfd f1, scTvrcFloatMagic
fmul f3, f0, f3
stw r27, 0x10(r1)
lfd f0, 0x10(r1)

View File

@@ -272,12 +272,12 @@ namespace ipl {
}
void CdbBackup::stt_wait_backup() {
if (fn_8135B1C0() < 100) {
System::getDialog()->setProgBarLength(fn_8135B1C0());
if (getProgressPercent() < 100) {
System::getDialog()->setProgBarLength(getProgressPercent());
}
if (mbDoneProcess) {
if (fn_8135B1C0() >= 100) {
if (getProgressPercent() >= 100) {
System::getDialog()->setProgBarLength(100);
} else {
System::getDialog()->terminate();
@@ -360,7 +360,7 @@ namespace ipl {
}
}
int CdbBackup::fn_8135B1C0() {
int CdbBackup::getProgressPercent() {
return ((mTotalFreeSize - mPrevFreeSize) * 100) / ((0x1400000 - unknown) - mPrevFreeSize);
}

View File

@@ -1132,7 +1132,7 @@ namespace ipl {
}
#ifdef __MWERKS__
asm void Manager::iplSavedata_813596B8(register ESTitleId titleId) {
asm void Manager::pushTitleCache(register ESTitleId titleId) {
nofralloc
lis r7, 0x4841
lis r4, 1
@@ -1146,44 +1146,44 @@ namespace ipl {
xor r0, r5, r8
xor r4, r6, r4
or. r0, r4, r0
bne iplSavedata_813596B8_L1
bne pushTitleCache_L1
blr
iplSavedata_813596B8_L1:
pushTitleCache_L1:
addis r0, r5, -1
cmplwi r0, 1
beq iplSavedata_813596B8_L2
beq pushTitleCache_L2
cmplwi r0, 3
beq iplSavedata_813596B8_L2
beq pushTitleCache_L2
cmplwi r0, 4
beq iplSavedata_813596B8_L2
beq pushTitleCache_L2
cmplwi r0, 6
bnelr
iplSavedata_813596B8_L2:
pushTitleCache_L2:
li r0, 0x30
li r9, 0
li r4, 0
mtctr r0
iplSavedata_813596B8_L3:
pushTitleCache_L3:
add r7, r3, r4
lwz r0, 0x340(r7)
lwz r7, 0x344(r7)
xor r0, r5, r0
xor r7, r6, r7
or. r0, r7, r0
beq iplSavedata_813596B8_L4
beq pushTitleCache_L4
addi r9, r9, 1
addi r4, r4, 8
bdnz iplSavedata_813596B8_L3
iplSavedata_813596B8_L4:
bdnz pushTitleCache_L3
pushTitleCache_L4:
cmpwi r9, 0x30
bne iplSavedata_813596B8_L5
bne pushTitleCache_L5
li r9, 0x2f
iplSavedata_813596B8_L5:
pushTitleCache_L5:
slwi r4, r9, 3
mtctr r9
cmpwi r9, 0
ble iplSavedata_813596B8_L6
iplSavedata_813596B8_L7:
ble pushTitleCache_L6
pushTitleCache_L7:
addi r0, r9, -1
add r7, r3, r4
slwi r0, r0, 3
@@ -1194,14 +1194,14 @@ namespace ipl {
lwz r8, 0x344(r8)
stw r8, 0x344(r7)
stw r0, 0x340(r7)
bdnz iplSavedata_813596B8_L7
iplSavedata_813596B8_L6:
bdnz pushTitleCache_L7
pushTitleCache_L6:
stw r6, 0x344(r3)
stw r5, 0x340(r3)
blr
}
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId) {
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId) {
Manager* savedataManager = static_cast<Manager*>(manager);
for (int index = 0; index < MAX_CHANNEL_TOTAL; index++) {
if (savedataManager->mData.titleCache[0][index] == titleId) {

View File

@@ -39,12 +39,12 @@
extern "C" ipl::System::Arg smArg__Q23ipl6System;
extern "C" ipl::snd::System sSystem__Q23ipl3snd;
extern "C" void initOnMemory__Q33ipl3snd6SystemFPCvPQ23EGG4HeapUl();
extern "C" const f32 lbl_81694424;
extern "C" const f32 lbl_81694428;
extern "C" const f32 lbl_8169442C;
extern "C" const f32 lbl_81694430;
extern "C" const f32 lbl_81694434;
extern "C" const f32 lbl_81694438;
extern "C" const f32 scOrthoLeft;
extern "C" const f32 scOrthoRight;
extern "C" const f32 scOrthoBottom;
extern "C" const f32 scOrthoTop;
extern "C" const f32 scWideOrthoLeft;
extern "C" const f32 scWideOrthoRight;
extern "C" void* m_handle__Q23ipl11TVRCManager;
extern "C" void _savegpr_27();
extern "C" void _restgpr_27();
@@ -1139,7 +1139,7 @@ namespace ipl {
bl VISetBlack
lwz r3, 0xb0(r28)
li r0, 1
lfd f31, lbl_81694424-0xc
lfd f31, scOrthoLeft-0xc
lis r30, 0x4330
lbz r29, 0x3d(r3)
lis r31, sSystem__Q23ipl3snd@ha
@@ -1162,7 +1162,7 @@ namespace ipl {
bl makeRawData__Q33ipl7utility11JpegDecoderFv
warning_run_no_jpeg:
lwz r3, 0x74(r28)
lfs f1, lbl_81694424-0x14
lfs f1, scOrthoLeft-0x14
lwz r27, 0(r3)
stw r30, 8(r1)
fmr f2, f1
@@ -1170,7 +1170,7 @@ namespace ipl {
fmr f5, f1
lhz r0, 6(r27)
stw r3, 0xc(r1)
lfs f6, lbl_81694424-0x4
lfs f6, scOrthoLeft-0x4
lfd f0, 8(r1)
stw r0, 0x14(r1)
fsubs f3, f0, f31
@@ -1362,17 +1362,17 @@ namespace ipl {
}
void System::getProjectionRect4x3(nw4r::ut::Rect* rect) {
rect->left = *((volatile const f32*)&lbl_81694424);
rect->right = *((volatile const f32*)&lbl_81694428);
rect->bottom = *((volatile const f32*)&lbl_8169442C);
rect->top = *((volatile const f32*)&lbl_81694430);
rect->left = *((volatile const f32*)&scOrthoLeft);
rect->right = *((volatile const f32*)&scOrthoRight);
rect->bottom = *((volatile const f32*)&scOrthoBottom);
rect->top = *((volatile const f32*)&scOrthoTop);
}
void System::getProjectionRect16x9(nw4r::ut::Rect* rect) {
rect->left = *((volatile const f32*)&lbl_81694434);
rect->right = *((volatile const f32*)&lbl_81694438);
rect->bottom = *((volatile const f32*)&lbl_8169442C);
rect->top = *((volatile const f32*)&lbl_81694430);
rect->left = *((volatile const f32*)&scWideOrthoLeft);
rect->right = *((volatile const f32*)&scWideOrthoRight);
rect->bottom = *((volatile const f32*)&scOrthoBottom);
rect->top = *((volatile const f32*)&scOrthoTop);
}
GXRenderModeObj* System::getRenderModeObj() {
@@ -1516,11 +1516,11 @@ namespace ipl {
#ifdef __MWERKS__
#pragma force_active on
extern "C" const f32 lbl_81694424 = -304.0f;
extern "C" const f32 lbl_81694428 = 304.0f;
extern "C" const f32 lbl_8169442C = 228.0f;
extern "C" const f32 lbl_81694430 = -228.0f;
extern "C" const f32 lbl_81694434 = -416.0f;
extern "C" const f32 lbl_81694438 = 416.0f;
extern "C" const f32 scOrthoLeft = -304.0f;
extern "C" const f32 scOrthoRight = 304.0f;
extern "C" const f32 scOrthoBottom = 228.0f;
extern "C" const f32 scOrthoTop = -228.0f;
extern "C" const f32 scWideOrthoLeft = -416.0f;
extern "C" const f32 scWideOrthoRight = 416.0f;
#pragma force_active off
#endif

View File

@@ -21,7 +21,7 @@
namespace ipl {
TVRCManager* TVRCManager::m_handle;
int lbl_8169877C = 0;
int sTvrcStartDelay = 0;
TVRCManager::TVRCManager(EGG::Heap* heap) : mbInitialized(FALSE), mpDBFile(NULL), mbResetting(FALSE), mbPrepTVRC(FALSE), mState(STATE_0) {
/* TV model for testing at EAD? */
@@ -280,17 +280,17 @@ namespace ipl {
case STATE_3: {
if (!snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
snd::getSystem()->pauseOnBGM();
lbl_8169877C = 5;
sTvrcStartDelay = 5;
mState = STATE_4;
}
break;
}
case STATE_4: {
if (mbResetting) {
lbl_8169877C = 0;
sTvrcStartDelay = 0;
}
if (--lbl_8169877C <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
if (--sTvrcStartDelay <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
snd_shutup(TRUE);
if (IS_ENABLED && !TVRCIsActive()) {
TVRCSendStartAsync(trans_cmd(mCurrentCommand));

View File

@@ -930,14 +930,14 @@ void CArGBAOdh::cdj_c_makeHeader(SArCDJ_OdhMaster* master, u32 size) {
}
s32 CArGBAOdh::cdj_c_colorConv(SArCDJ_OdhMaster* master, u8* sourceData, int format) {
u16* dimensions;
u32 paddedWidth;
u16 width;
u16 height;
u8* workPlane;
int sourceStride;
u32 paddedWidth;
u8* cbPlane;
u8* crPlane;
u8* cbPlane;
u16* dimensions;
int rowIndex;
int i;
u16 dimension;
@@ -1358,18 +1358,17 @@ s32 CArGBAOdh::cdj_d_initializeDecompressOdh(SArCDJ_OdhMaster* master, u8* workB
}
s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int workSize) {
u32 sourceLimit = srcSize;
int blockStride;
int workBufferSize = workSize;
u8 xSampling;
u8 coefficientIndex;
u16 blockWidth;
int blockRowStride;
int rowStride;
int blockStride;
int planeOffset;
u32 sourceLimit = srcSize;
int statusOrOffset;
u16 blockX;
int planeOffset;
int rowStride;
int blockRowSize;
int naturalIndex;
int requiredBlockEnd;
@@ -1392,7 +1391,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blockY << 6) * (u32)master->blocksWide +
statusOrOffset = (u32)master->blocksWide * ((u32)master->blockY << 6) +
(u32)master->blockX * 8;
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
@@ -1410,7 +1409,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blockY << 6) * (u32)master->blocksWide +
(((u32)master->blocksWide << 6) * (u32)master->blocksHigh +
((u32)master->blocksHigh * ((u32)master->blocksWide << 6) +
(u32)master->blockX * 8);
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
@@ -1429,9 +1428,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blocksWide << 6) * (u32)master->blocksHigh * 2 +
statusOrOffset = (u32)master->blocksHigh * ((u32)master->blocksWide << 6) * 2 +
((u32)master->blockX * 8 +
((u32)master->blockY << 6) * (u32)master->blocksWide);
(u32)master->blocksWide * ((u32)master->blockY << 6));
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
@@ -1450,7 +1449,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
planeOffset = (u32)master->blockX * 0x10 +
((u32)master->blockY << 6) * (u32)master->blocksWide * 2;
(u32)master->blocksWide * ((u32)master->blockY << 6) * 2;
requiredBlockEnd = planeOffset + blockRowStride + 8;
if (requiredBlockEnd > workBufferSize) {
statusOrOffset = -0x7ffffffa;
@@ -1504,7 +1503,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
}
statusOrOffset = ((u32)master->blocksHigh * ((u32)master->blocksWide << 7) * 2) +
((u32)master->blockX * 8 +
((u32)master->blockY << 6) * (u32)master->blocksWide);
(u32)master->blocksWide * ((u32)master->blockY << 6));
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
@@ -1523,7 +1522,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
planeOffset = (u32)master->blockX * 8 +
((u32)master->blockY << 6) * (u32)master->blocksWide * 2;
(u32)master->blocksWide * ((u32)master->blockY << 6) * 2;
if (planeOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
@@ -1556,9 +1555,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blocksWide << 6) * (u32)master->blocksHigh * 2 +
statusOrOffset = (u32)master->blocksHigh * ((u32)master->blocksWide << 6) * 2 +
((u32)master->blockX * 8 +
((u32)master->blockY << 6) * (u32)master->blocksWide);
(u32)master->blocksWide * ((u32)master->blockY << 6));
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
@@ -1575,9 +1574,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blocksWide << 6) * (u32)master->blocksHigh * 4 +
statusOrOffset = (u32)master->blocksHigh * ((u32)master->blocksWide << 6) * 4 +
((u32)master->blockX * 8 +
((u32)master->blockY << 6) * (u32)master->blocksWide);
(u32)master->blocksWide * ((u32)master->blockY << 6));
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
@@ -1596,7 +1595,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
planeOffset = (u32)master->blockX * 0x10 +
((u32)master->blockY << 6) * (u32)master->blocksWide * 4;
(u32)master->blocksWide * ((u32)master->blockY << 6) * 4;
requiredBlockEnd = planeOffset + blockRowStride + 8;
if (requiredBlockEnd > workBufferSize) {
statusOrOffset = -0x7ffffffa;
@@ -1663,9 +1662,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blocksWide << 6) * (u32)master->blocksHigh * 4 +
statusOrOffset = (u32)master->blocksHigh * ((u32)master->blocksWide << 6) * 4 +
((u32)master->blockX * 8 +
((u32)master->blockY << 6) * (u32)master->blocksWide);
(u32)master->blocksWide * ((u32)master->blockY << 6));
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
@@ -1682,9 +1681,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blocksWide << 6) * (u32)master->blocksHigh * 8 +
statusOrOffset = (u32)master->blocksHigh * ((u32)master->blocksWide << 6) * 8 +
((u32)master->blockX * 8 +
((u32)master->blockY << 6) * (u32)master->blocksWide);
(u32)master->blocksWide * ((u32)master->blockY << 6));
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
@@ -2102,18 +2101,18 @@ void CArGBAOdh::LineDeconv22(u8* dest, u8* y, u8* cb, u8* cr, u16 width, u16 hei
}
s32 CArGBAOdh::huffmanDecoder(u32* coefficientOutput, SArCDJ_HuffmanRequest* request, u16** huffmanTables, int component, u32 sourceLimit) {
u16 tableEntry;
u32 bitBuffer;
u32 tableCount;
s32 decodeResult;
int bitIndex;
s32 maximumBitLength;
int maxHuffmanBits;
u32 bitBuffer;
u8* sourceCursor;
u16 tableEntry;
s32 valueCategory;
u32 tableIndex;
u32 magnitudeMask;
int bytesConsumed;
s32 valueCategory;
u8* sourceCursor;
u32 decodedSymbol;
u32 bitCountAndMask;

View File

@@ -46,12 +46,12 @@ namespace ipl {
public:
HermiteIntp() {}
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
unkVal0 = param_5;
unkVal1 = param_6;
mStartTangent = startTangent;
mEndTangent = endTangent;
}
T get() const {
@@ -64,11 +64,11 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(unkVal0 *
(mStartTangent *
(var_f27 +
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -77,8 +77,8 @@ namespace ipl {
protected:
T mStart;
T mEnd;
f32 unkVal0;
f32 unkVal1;
f32 mStartTangent;
f32 mEndTangent;
};
}
}

View File

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

View File

@@ -1076,3 +1076,406 @@ GATE PASS
```
- Post-full-clean-build latest-main comparison repeated: zero project-wide matched/linked/function regressions; 121/121 Step jump relocations preserved.
- Local improvement commits: c4ae8bcc correct interpreter scratch object storage; 743f0580 improve chansvmstep code matching; f9928196 improve chansvmstep code matching; 572a7c04 improve chansvmaddexe code matching; 076645dc improve vmstringreplace code matching; 647f5007 improve vmstringreplace code matching; 5e75409f improve chansvm_8144b4d4 code matching; 179218d7 improve vmblobunpack code matching; d125aec2 improve vmblobunpack code matching; 051a713b read unpacked integers through their typed value.
CHANSVmNewObjData declaration order [0, 1, 2, 3, 4, 5]: structural/exact (0, 10)
CHANSVmNewObjData diagnosis: (0, 10); target size 384; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' u32 idx;\n', ' u32 chunkIdx;\n', ' union {\n u32 off;\n ChunkEntry* entry;\n } u;\n', ' ChunkEntry* chunk;\n', ' u32 memSize;\n']
CHANSVmNewObjData declaration order [1, 0, 2, 3, 4, 5]: structural/exact (0, 10)
CHANSVmNewObjData declaration order [2, 1, 0, 3, 4, 5]: structural/exact (0, 10)
CHANSVmNewObjData declaration order [5, 1, 2, 3, 4, 0]: structural/exact (0, 7)
CHANSVmNewObjData result (0, 7), attempts 163, RESTORED
VmStringFromCharCode declaration order [0, 1, 2, 3, 4]: structural/exact (0, 6)
VmStringFromCharCode diagnosis: (0, 6); target size 236; declaration entries [' CHANSVmObjHdr* arg;\n', ' u32 offs;\n', ' u32 argc;\n', ' u32 ch;\n', ' u32 i;\n']
VmStringFromCharCode declaration order [1, 0, 2, 3, 4]: structural/exact (0, 6)
VmStringFromCharCode declaration order [2, 1, 0, 3, 4]: structural/exact (0, 9)
VmStringFromCharCode result (0, 6), attempts 90, RESTORED
VmWinEmuWrite declaration order [0, 1, 2, 3, 4, 5, 6, 7]: structural/exact (0, 5)
VmWinEmuWrite diagnosis: (0, 5); target size 268; declaration entries [' CHANSVmObjHdr* strObj;\n', ' u32 offset;\n', ' u32 totalLength;\n', ' u8 buf[VM_STRING_SIZE];\n', ' s32 outLen;\n', ' s32 inLen;\n', ' s32 result;\n', ' u32 remaining;\n']
VmWinEmuWrite declaration order [1, 0, 2, 3, 4, 5, 6, 7]: structural/exact (0, 5)
VmWinEmuWrite declaration order [2, 1, 0, 3, 4, 5, 6, 7]: structural/exact (0, 8)
VmWinEmuWrite declaration-order search stopped after 3+ distinct compiled orders without improvement; restored original source.
## 2026-10-01 215/233 baseline continuation
Target and current instructions have equal counts for all 18 open functions. Full structural ctxdiff was captured before each experiment. Baseline pool IDENTICAL, .data 100%, 121/121 jump relocations. Declaration-only trials above did not produce exactness.
vmBlobParsePackFormatString: distinct parameter digit scope then split accumulation; 116/116 instructions, 6 differences each; restored. Target preserves format character in r11 and uses distinct numeric digit r0.
vmBlobParsePackFormatString: u32 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
vmBlobParsePackFormatString: wchar_t digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
vmBlobParsePackFormatString: s32 digit, decimal digit + paramValue * 10 - 0x30: 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10 + (digit - 0x30): 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 98.27586%; 116/116 insns; structural/exact (3, 5); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u16 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u32 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u32 digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
vmBlobParsePackFormatString: wchar_t digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: wchar_t digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
vmBlobParsePackFormatString: s32 digit, decimal digit + paramValue * 10 - 0x30: 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10 + (digit - 0x30): 98.27586%; 116/116 insns; structural/exact (3, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: s32 digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 98.27586%; 116/116 insns; structural/exact (3, 5); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u16 digit, decimal digit + paramValue * 10 - 0x30: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10 + (digit - 0x30): 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: u16 digit, decimal paramValue * 10;
paramValue += digit;
paramValue -= 0x30: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
paramValue = digit + paramValue - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
digit += paramValue;
paramValue = digit - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
paramValue = (s32)(digit + paramValue) - 0x30;: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
paramValue = (digit + paramValue);
paramValue -= 0x30;: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
{
s32 sum = digit + paramValue;
paramValue = sum - 0x30;
}: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
vmBlobParsePackFormatString: split decimal with paramValue *= 10;
{
u32 sum = digit + paramValue;
paramValue = sum - 0x30;
}: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
paramValue += digit - 0x30;: 99.913795%; 116/116 insns; structural/exact (0, 1); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
paramValue = paramValue + digit - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
paramValue += (s32)digit;
paramValue -= 0x30;: 99.82758%; 116/116 insns; structural/exact (0, 2); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
digit = paramValue + digit;
paramValue = digit - 0x30;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal operand/cast paramValue *= 10;
paramValue = digit + (u32)paramValue;
paramValue -= 0x30;: 99.61207%; 116/116 insns; structural/exact (0, 7); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal final operand paramValue = (digit - 0x30) + paramValue;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal final operand paramValue = digit - 0x30 + paramValue;: 99.69827%; 116/116 insns; structural/exact (0, 6); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal final operand paramValue -= 0x30 - digit;: 97.75862%; 116/116 insns; structural/exact (3, 3); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal final operand paramValue += digit + -0x30;: 99.913795%; 116/116 insns; structural/exact (0, 1); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal final operand paramValue += (s32)digit - 0x30;: 99.913795%; 116/116 insns; structural/exact (0, 1); .data 100.0%; RESTORED
vmBlobParsePackFormatString: decimal final operand paramValue += (u32)(digit - 0x30);: 100.0%; 116/116 insns; structural/exact (0, 0); .data 100.0%; KEPT exact; quick GATE PASS
VmStringFromCharCode: character mask/cursor form 0: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
VmStringFromCharCode: character mask/cursor form 1: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
VmStringFromCharCode: character mask/cursor form 2: 94.32204%; 57/59 insns; structural/exact (9, 45); .data 100.0%; RESTORED
VmStringFromCharCode: character mask/cursor form 3: 94.32204%; 57/59 insns; structural/exact (9, 45); .data 100.0%; RESTORED
VmStringFromCharCode: character mask/cursor form 4: 99.32204%; 59/59 insns; structural/exact (0, 7); .data 100.0%; RESTORED
VmStringFromCharCode: character mask/cursor form 5: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
VmStringFromCharCode: character mask/cursor form 6: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
VmStringFromCharCode: character mask/cursor form 7: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
VmWinEmuWrite: size type: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
VmWinEmuWrite: signed size: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
VmWinEmuWrite: cache payload: COMPILE FAIL orm_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
### mwcceppc.exe Compiler:
# File: src\channelScript\CHANSVm.c
# ------------------------------------
# 6073: strValue = strObj->value.wstring_v;
# Error: ^
# (10209) illegal implicit conversion from 'struct *' to
# 'struct *'
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
; RESTORED
VmWinEmuWrite: unmasked cached size: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
CHANSVmParseInt: one-slot end buffer: 94.69388%; 49/49 insns; structural/exact (2, 3); .data 100.0%; RESTORED
CHANSVmParseInt: parse scratch structure: 94.69388%; 49/49 insns; structural/exact (2, 3); .data 100.0%; RESTORED
CHANSVmParseInt: initialized parse end: 94.69388%; 49/49 insns; structural/exact (2, 3); .data 100.0%; RESTORED
CHANSVmParseInt: explicit type after end initialization: 83.67347%; 49/49 insns; structural/exact (4, 5); .data 100.0%; RESTORED
CHANSVm_8144B4D4: one-slot end buffer: 97.59036%; 83/83 insns; structural/exact (2, 2); .data 100.0%; RESTORED
CHANSVm_8144B4D4: parse scratch structure: 97.59036%; 83/83 insns; structural/exact (2, 2); .data 100.0%; RESTORED
CHANSVm_8144B4D4: initialized parse end: 97.59036%; 83/83 insns; structural/exact (2, 2); .data 100.0%; RESTORED
CHANSVm_8144B4D4: explicit type after end initialization: 95.180725%; 83/83 insns; structural/exact (2, 3); .data 100.0%; RESTORED
CHANSVmGetSourceLine: explicit source table and guards 0: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
CHANSVmGetSourceLine: explicit source table and guards 1: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
CHANSVmGetSourceLine: explicit source table and guards 2: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
CHANSVmGetSourceLine: explicit source table and guards 3: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
CHANSVmGetSourceLine: explicit source table and guards 4: 62.065216%; 50/46 insns; structural/exact (21, 48); .data 100.0%; RESTORED
CHANSVmGetSourceLine: explicit source table and guards 5: 79.13043%; 54/46 insns; structural/exact (12, 52); .data 100.0%; RESTORED
VmDateDtor: month and weekday pointer scopes: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
VmDateDtor: calendar by value fields: 89.14286%; 90/91 insns; structural/exact (11, 85); .data 100.0%; RESTORED
VmDateDtor: return format length directly to limit: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
VmDateDtor: month table indexed pointer expression: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
VmDateDtor: short-lived month pointer: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
CHANSVmGetSourceLine: module cached in null-guard scope 0: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
CHANSVmGetSourceLine: module cached in null-guard scope 1: 97.82609%; 46/46 insns; structural/exact (0, 18); .data 100.0%; RESTORED
CHANSVmGetSourceLine: module cached in null-guard scope 2: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
CHANSVmGetSourceLine: module cached in null-guard scope 3: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
CHANSVmGetSourceLine: module cached in null-guard scope 4: 97.82609%; 46/46 insns; structural/exact (0, 16); .data 100.0%; RESTORED
VmStringFromCharCode: integer argument helper: 99.40678%; 59/59 insns; structural/exact (0, 6); .data 100.0%; RESTORED
VmWinEmuWrite: string argument helper: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
VmStringReplace: two string argument helpers: 97.878784%; 132/132 insns; structural/exact (0, 40); .data 100.0%; RESTORED
VmStringSplit: string and integer argument helpers: 98.04054%; 222/222 insns; structural/exact (0, 66); .data 100.0%; RESTORED
VmBlobGetHexString: integer argument helper: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
VmBlobPackCommon: typed argument helper boundaries: COMPILE FAIL .py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
### mwcceppc.exe Compiler:
# File: src\channelScript\CHANSVm.c
# ------------------------------------
# 4976: argArr = CHANSVmGetArgArray(VmInst, 1);
# Error: ^
# (10209) illegal implicit conversion from 'int' to
# 'struct CHANSVmObjHdr *'
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
; RESTORED
VmBlobUnpack: typed string argument helper boundary: 98.26886%; 517/517 insns; structural/exact (0, 156); .data 100.0%; RESTORED
CHANSVmNewObjData: separate index-offset and entry locals: 97.1875%; 95/96 insns; structural/exact (7, 59); .data 100.0%; RESTORED
CHANSVmNewObjData: scope computed chunk address: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
CHANSVmNewObjData: scope slot index to table scan: 99.583336%; 96/96 insns; structural/exact (0, 7); .data 100.0%; RESTORED
CHANSVmNewObjData: counted chunk traversal: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
VmStringReplace declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 40)
VmStringReplace diagnosis: (0, 40); target size 528; declaration entries [' CHANSVmObjHdr* arg0;\n', ' CHANSVmObjHdr* arg1;\n', ' vmString parentStr;\n', ' vmString searchStr;\n', ' vmString replaceStr;\n', ' u32 parentLen;\n', ' u32 srcOffs;\n', ' u32 dstOffs;\n', ' u32 searchLen;\n', ' u32 replaceLen;\n', ' u32 dstBufLen;\n', ' vmString newStr;\n', ' u32 segLen;\n']
VmStringReplace declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 40)
VmStringReplace declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 40)
VmStringReplace declaration order [4, 1, 2, 3, 5, 6, 8, 7, 0, 9, 10, 11, 12]: structural/exact (0, 28)
VmStringReplace result (0, 28), attempts 29, RESTORED
VmStringSplit declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]: structural/exact (0, 66)
VmStringSplit diagnosis: (0, 66); target size 888; declaration entries [' CHANSVmObjHdr* arg0;\n', ' CHANSVmObjHdr* arg1;\n', ' u32 limit;\n', ' CHANSVmObjHdr* array;\n', ' vmString parentStr;\n', ' vmString delimStr;\n', ' u32 parentLen;\n', ' u32 delimLen;\n', ' u32 count;\n', ' u32 srcOffs;\n', ' u32 segStart;\n', ' u32 arrayCount;\n', ' u32 segLen;\n', ' u32 remaining;\n', ' CHANSVmObjHdr* elem;\n', ' u32 i;\n']
VmStringSplit declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]: structural/exact (0, 66)
VmStringSplit declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]: structural/exact (0, 66)
VmStringSplit declaration order [14, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 15]: structural/exact (0, 61)
VmStringSplit result (0, 61), attempts 29, RESTORED
CHANSVmAddExe declaration order [0, 1, 2, 3, 4, 5, 6]: structural/exact (0, 34)
CHANSVmAddExe diagnosis: (0, 34); target size 1016; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' ModuleHeader* mod;\n', ' CHANSVmModule* header;\n', ' u32 maxEnd;\n', ' u32 size;\n', ' u32 cnt;\n', ' u32 ofs;\n']
CHANSVmAddExe declaration order [1, 0, 2, 3, 4, 5, 6]: structural/exact (0, 34)
CHANSVmAddExe declaration order [2, 1, 0, 3, 4, 5, 6]: structural/exact (0, 34)
CHANSVmAddExe result (0, 34), attempts 29, RESTORED
CHANSVmLinkModules declaration order [0, 1, 2, 3]: structural/exact (0, 43)
CHANSVmLinkModules diagnosis: (0, 43); target size 756; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' CHANSVmModule* module;\n', ' u32 modIdx;\n', ' u32 i;\n']
CHANSVmLinkModules declaration order [1, 0, 2, 3]: structural/exact (0, 43)
CHANSVmLinkModules declaration order [2, 1, 0, 3]: structural/exact (0, 46)
CHANSVmLinkModules result (0, 43), attempts 19, RESTORED
VmCallMethod declaration order [0, 1, 2, 3]: structural/exact (4, 97)
VmCallMethod diagnosis: (4, 97); target size 1124; declaration entries [' CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;\n', ' CHANSVmObjHdr* acc;\n', ' u32 retVal;\n', ' CHANSVmNativeClass* target;\n']
VmCallMethod declaration order [1, 0, 2, 3]: structural/exact (4, 97)
VmCallMethod declaration order [2, 1, 0, 3]: structural/exact (4, 109)
VmCallMethod result (4, 97), attempts 19, RESTORED
VmBlobPackCommon declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 246)
VmBlobPackCommon diagnosis: (2, 246); target size 2672; declaration entries [' u32 packBuf[2];\n', ' BlobHeader* parentBlob;\n', ' CHANSVmObjHdr* argStr;\n', ' const wchar_t* fmtStr;\n', ' u32 fmtLen;\n', ' CHANSVmObjHdr* argArr;\n', ' u32 fmtPos;\n', ' u32 argCount;\n', ' u32 totalSize;\n', ' s32 count;\n', ' u32 i;\n', ' CHANSVmObjHdr* obj;\n', ' BlobHeader* srcBlob;\n', ' s32 copySize;\n', ' u32 dataSize;\n', ' u32 srcOff;\n', ' CHANSVmObjHdr* strObj;\n', ' u8* srcData;\n', ' u32 charCount;\n', ' u32 strLen;\n', ' CHANSVmObjHdr* intObj;\n', ' u32 valLow;\n', ' u32 valHigh;\n', ' s32 bufSize;\n', ' u8* dest;\n', ' u32 ch;\n', ' CHANSVmExecutionCtx* execCtx;\n']
VmBlobPackCommon declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 246)
VmBlobPackCommon declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 246)
VmBlobPackCommon declaration order [15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]: structural/exact (2, 244)
VmBlobPackCommon result (2, 244), attempts 29, RESTORED
VmBlobUnpack declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 156)
VmBlobUnpack diagnosis: (0, 156); target size 2068; declaration entries [' union {\n u64 value;\n u32 words[2];\n } unpackBuf;\n', ' BlobHeader* srcBlob;\n', ' CHANSVmObjHdr* argStr;\n', ' wchar_t* fmtStr;\n', ' u32 fmtLen;\n', ' u32 blobOff;\n', ' u32 argCount;\n', ' u32 fmtPos;\n', ' s32 count;\n', ' u32 elemIdx;\n', ' u32 iterIdx;\n', ' s64 value;\n', ' CHANSVmObjHdr* arrElem;\n']
VmBlobUnpack declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 156)
VmBlobUnpack declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]: structural/exact (0, 156)
VmBlobUnpack declaration order [1, 9, 2, 3, 4, 5, 6, 7, 8, 0, 10, 11, 12]: structural/exact (0, 146)
VmBlobUnpack result (0, 146), attempts 29, RESTORED
CHANSVmNewObjData: offset before chunk scan initialization: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
CHANSVmNewObjData: declare scanned chunk inside block: 99.583336%; 96/96 insns; structural/exact (0, 7); .data 100.0%; RESTORED
CHANSVmNewObjData: aligned allocation declared in its lifetime: 99.427086%; 96/96 insns; structural/exact (0, 10); .data 100.0%; RESTORED
VmWinEmuWrite: use byte-string member for output address and length: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
VmWinEmuWrite: immutable converted string header: 99.62687%; 67/67 insns; structural/exact (0, 5); .data 100.0%; RESTORED
VmWinEmuWrite: cache wide-string payload: 96.49254%; 65/67 insns; structural/exact (6, 54); .data 100.0%; RESTORED
VmStringFromCharCode: scope byte offset to output creation: 98.72881%; 59/59 insns; structural/exact (0, 12); .data 100.0%; RESTORED
VmStringFromCharCode: immutable argument pointer for char conversion: COMPILE FAIL lScript/CHANSVm.d
### mwcceppc.exe Compiler:
# File: src\channelScript\CHANSVm.c
# ------------------------------------
# 2873: CHANSVmConvertObjectType(VmInst, CHANS_VM_OBJ_TYPE_INTEGER, arg);
# Error: ^
# (10209) illegal implicit conversion from 'const struct CHANSVmObjHdr *' to
# 'struct CHANSVmObjHdr *'
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
; RESTORED
VmStringFromCharCode: decrement argument count traversal: 96.10169%; 60/59 insns; structural/exact (7, 31); .data 100.0%; RESTORED
VmDateDtor: calendar format inline helper char* buffer, OSCalendarTime* date: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
VmDateDtor: calendar format inline helper OSCalendarTime* date, char* buffer: 94.96703%; 91/91 insns; structural/exact (5, 7); .data 100.0%; RESTORED
VmDateDtor: calendar format inline helper char* buffer, OSCalendarTime date: 72.98901%; 107/91 insns; structural/exact (52, 97); .data 100.0%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 0: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 1: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
### mwcceppc.exe Compiler:
# File: src\channelScript\CHANSVm.c
# ------------------------------------
# 3625: wchar_t* characterText = (wchar_t*)pad0;
# Error: ^^^^^^^
# (10141) expression syntax error
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 2: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
### mwcceppc.exe Compiler:
# File: src\channelScript\CHANSVm.c
# ------------------------------------
# 3625: wchar_t* characterText = (wchar_t*)pad0;
# Error: ^^^^^^^
# (10141) expression syntax error
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 3: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
### mwcceppc.exe Compiler:
# File: src\channelScript\CHANSVm.c
# ------------------------------------
# 3625: wchar_t* characterText = (wchar_t*)pad0;
# Error: ^^^^^^^
# (10141) expression syntax error
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 4: COMPILE FAIL ript && "/usr/bin/python3" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d
### mwcceppc.exe Compiler:
# File: src\channelScript\CHANSVm.c
# ------------------------------------
# 3625: wchar_t* characterText = (wchar_t*)pad0;
# Error: ^^^^^^^
# (10141) expression syntax error
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 5: 98.58237%; 431/431 insns; structural/exact (10, 42); .data 100.0%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 0: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 1: 96.960556%; 430/431 insns; structural/exact (25, 248); .data 18.050066%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 2: 97.4594%; 431/431 insns; structural/exact (0, 143); .data 100.0%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 3: 96.19257%; 431/431 insns; structural/exact (10, 170); .data 100.0%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 4: 94.967514%; 432/431 insns; structural/exact (46, 358); .data 18.050066%; RESTORED
CHANSVm_8145049C: formatted string payload/character lifetime 5: 98.58237%; 431/431 insns; structural/exact (10, 42); .data 100.0%; RESTORED
VmBlobGetHexString declaration order [0, 1, 2, 3, 4, 5, 6]: structural/exact (0, 14)
VmBlobGetHexString diagnosis: (0, 14); target size 328; declaration entries [' wchar_t* dest = (wchar_t*)VmGetStrFromObjHdr(VmReturnObj);\n', ' u8* src = blob->pData;\n', ' u32 offset = blob->offset;\n', ' u32 destOff = 0;\n', ' u32 i = 0;\n', ' char* hexTbl = lbl_816976E4;\n', ' u32 loop_i;\n']
VmBlobGetHexString declaration order [1, 0, 2, 3, 4, 5, 6]: structural/exact (4, 27)
VmBlobGetHexString declaration order [2, 1, 0, 3, 4, 5, 6]: structural/exact (8, 27)
VmBlobGetHexString result (0, 14), attempts 98, RESTORED
VmCallMethod: separate resolved method index and return status 0: 97.2242%; 281/281 insns; structural/exact (4, 97); .data 100.0%; RESTORED
VmCallMethod: separate resolved method index and return status 1: 97.2242%; 281/281 insns; structural/exact (4, 97); .data 100.0%; RESTORED
VmCallMethod: separate resolved method index and return status 2: 97.2242%; 281/281 insns; structural/exact (4, 97); .data 100.0%; RESTORED
VmCallMethod: separate resolved method index and return status 3: 97.29537%; 281/281 insns; structural/exact (2, 93); .data 100.0%; RESTORED
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 0: 99.84919%; 431/431 insns; structural/exact (0, 13); .data 100.0%; RESTORED
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 1: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 2: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 3: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
CHANSVm_8145049C: cache string data and explicit char terminator lifetime 4: 99.35035%; 430/431 insns; structural/exact (25, 142); .data 18.050066%; RESTORED
CHANSVm_8145049C: cached string payload before memcpy and assign the formatting-object tag after UTF-16 terminator storage; 99.84919%; 431/431 instructions, 13 register-only differences, .data 100%; KEPT quick GATE PASS.
CHANSVm_8145049C declaration order [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]: structural/exact (0, 13)
CHANSVm_8145049C diagnosis: (0, 13); target size 1724; declaration entries [' u32 halfMaxSize;\n', ' BOOL flag;\n', ' CHANSVmObjHdr* tempObj;\n', ' u32 argIdxCounter;\n', ' u32 totalLen;\n', ' u8* str;\n', ' u32 strLen;\n', ' u32 strPos;\n', ' u32 segStart;\n', ' u32 fmtBufPos;\n', ' u8* tmpBuf;\n', ' u32 maxSize;\n', ' u8* outputBuf;\n', ' u32 outputPos;\n', ' u32 maxLitLen;\n', ' u32 litLen;\n', ' u32 isEscaped;\n', ' CHANSVmObjHdr* cv;\n', ' CHANSVmPrivate* pVm;\n', ' CHANSVmObjHdr* argObj;\n']
CHANSVm_8145049C declaration order [1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]: structural/exact (5, 18)
CHANSVm_8145049C declaration order [2, 1, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]: structural/exact (5, 18)
CHANSVm_8145049C result (0, 13), attempts 199, RESTORED
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 0: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 1: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 2: 98.71951%; 82/82 insns; structural/exact (0, 14); .data 100.0%; RESTORED
VmBlobGetHexString: hexadecimal nibble temporaries/cursor order 3: 96.15854%; 81/82 insns; structural/exact (8, 34); .data 100.0%; RESTORED
VmCallMethod: direct missing method/property conditional return: 97.29537%; 281/281 insns; structural/exact (2, 93); .data 100.0%; RESTORED
VmCallMethod: call argument/operand scheduling 0: 97.98933%; 281/281 insns; structural/exact (2, 95); .data 100.0%; RESTORED
VmCallMethod: call argument/operand scheduling 1: 98.0605%; 281/281 insns; structural/exact (0, 91); .data 100.0%; RESTORED
VmCallMethod: call argument/operand scheduling 2: 97.29537%; 281/281 insns; structural/exact (2, 93); .data 100.0%; RESTORED
CHANSVmStep: typed interpreter scratch layout 0: 96.452515%; 1253/1253 insns; structural/exact (71, 318); .data 100.0%; RESTORED
CHANSVmStep: typed interpreter scratch layout 1: 96.43735%; 1253/1253 insns; structural/exact (90, 332); .data 100.0%; RESTORED
CHANSVmStep: typed interpreter scratch layout 2: 96.440544%; 1253/1253 insns; structural/exact (86, 329); .data 100.0%; RESTORED
CHANSVmStep: entry count branch and pretested loop: 96.96728%; 1255/1253 insns; structural/exact (82, 1229); .data 18.050066%; RESTORED
CHANSVmStep: pretested countdown retaining default count arithmetic: 96.400635%; 1254/1253 insns; structural/exact (87, 1238); .data 18.050066%; RESTORED
CHANSVmStep: separate operand enums before copy headers: 96.43735%; 1253/1253 insns; structural/exact (90, 332); .data 100.0%; RESTORED
VmCallMethod: direct missing-method/property return and choose header argument at call boundary; 98.0605%; 281/281 instructions, 91 register-only differences, structural differences 0; .data 100%; KEPT quick GATE PASS.
CHANSVmStep: group actual type, floating-immediate, copy-header, load-header, and operand workspaces; all fields actively used, no padding or dummy fields; 96.452515%; 1253/1253 instructions, structural/exact 71/318; .data 100%; KEPT quick GATE PASS.
CHANSVmNewObjData: declaration-order coverage 164 distinct source orders; best structural/exact (0, 7); no new exact result, restored previous accepted source.
VmStringFromCharCode: declaration-order coverage 91 distinct source orders; best structural/exact (0, 6); no new exact result, restored previous accepted source.
VmWinEmuWrite: declaration-order coverage 85 distinct source orders; best structural/exact (0, 5); no new exact result, restored previous accepted source.
VmStringReplace: declaration-order coverage 30 distinct source orders; best structural/exact (0, 28); no new exact result, restored previous accepted source.
VmStringSplit: declaration-order coverage 30 distinct source orders; best structural/exact (0, 61); no new exact result, restored previous accepted source.
CHANSVmAddExe: declaration-order coverage 30 distinct source orders; best structural/exact (0, 34); no new exact result, restored previous accepted source.
CHANSVmLinkModules: declaration-order coverage 20 distinct source orders; best structural/exact (0, 43); no new exact result, restored previous accepted source.
VmCallMethod: declaration-order coverage 20 distinct source orders; best structural/exact (4, 97); no new exact result, restored previous accepted source.
VmBlobPackCommon: declaration-order coverage 30 distinct source orders; best structural/exact (2, 244); no new exact result, restored previous accepted source.
VmBlobUnpack: declaration-order coverage 30 distinct source orders; best structural/exact (0, 146); no new exact result, restored previous accepted source.
VmBlobGetHexString: declaration-order coverage 99 distinct source orders; best structural/exact (0, 14); no new exact result, restored previous accepted source.
CHANSVm_8145049C: declaration-order coverage 200 distinct source orders; best structural/exact (0, 13); no new exact result, restored previous accepted source.
## 2026-10-01 final handoff after clean full gate
Instruction-exact 215/233 -> 216/233; objdiff matched code 35020/53564 -> 35484/53564; data 6904/6904 -> 6904/6904; .data 100%. vmBlobParsePackFormatString is now 100% objdiff with 116/116 instructions and ctxdiff diffs 0. All 121 Step and all 89 formatter jump-table relocation offsets, types, and addends match after the clean rebuild.
| Open function | Objdiff % | Structural / raw differences | Distinct current-round attempts | Remaining difference |
|---|---:|---:|---:|---|
| CHANSVmGetSourceLine | 97.82609 | 0 / 16 | 11 | register allocation |
| CHANSVmNewObjData | 99.427086 | 0 / 10 | 171 | register allocation |
| CHANSVmParseInt | 94.69388 | 2 / 3 | 4 | parse-end store after parameter copies |
| CHANSVm_8144B4D4 | 97.59036 | 2 / 2 | 4 | parse-end store after type comparison |
| VmDateDtor | 94.96703 | 5 / 7 | 8 | month/day argument-load scheduling |
| VmStringFromCharCode | 99.40678 | 0 / 6 | 102 | register allocation |
| VmStringReplace | 97.878784 | 0 / 40 | 31 | register allocation |
| VmStringSplit | 98.04054 | 0 / 66 | 31 | register allocation |
| CHANSVm_8145049C | 99.84919 | 0 / 13 | 214 | register allocation |
| VmBlobGetHexString | 98.71951 | 0 / 14 | 104 | register allocation |
| VmBlobPackCommon | 97.934135 | 2 / 246 | 30 | register allocation and two operand-order differences |
| VmBlobUnpack | 98.26886 | 0 / 156 | 31 | register allocation |
| VmWinEmuWrite | 99.62687 | 0 / 5 | 92 | register allocation |
| CHANSVmAddExe | 99.15354 | 0 / 34 | 30 | register allocation |
| CHANSVmLinkModules | 98.677246 | 0 / 43 | 20 | register allocation |
| VmCallMethod | 98.0605 | 0 / 91 | 29 | register allocation |
| CHANSVmStep | 96.452515 | 71 / 318 | 7 | entry/countdown flow, result-table base, registers and remaining spills |
The unit remains partial with 17 open functions; all have at least three distinct compiled source-level attempts in this run. No linking/configuration changes. Compiler tie-breaks remain unresolved. Four local source commits: d6ec7d58, aa49bd1b, 9283affb, 9265fb79.
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/channelScript/CHANSVm] pool: IDENTICAL
[src/channelScript/CHANSVm] objdiff: code 35484/53564 data 6904/6904 functions 216/233 fuzzy 99.2720 linked code 0
[src/channelScript/CHANSVm] instruction-exact functions: 216/233
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
[src/channelScript/CHANSVm] section .text size 53564 match 99.27205
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.427086
[src/channelScript/CHANSVm] below 100: CHANSVmParseInt 94.69388
[src/channelScript/CHANSVm] below 100: CHANSVm_8144B4D4 97.59036
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
[src/channelScript/CHANSVm] below 100: VmStringFromCharCode 99.40678
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
[src/channelScript/CHANSVm] below 100: CHANSVm_8145049C 99.84919
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.934135
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
[src/channelScript/CHANSVm] baseline: code 35020/53564 data 6904 functions 215 fuzzy 99.2097
regressions vs baseline: 0
global matched_code_percent: 86.68724 -> 86.70274
global fuzzy_match_percent: 99.30689 -> 99.30802
global complete_code_percent: 60.61288 -> 60.61288
global matched_data_percent: 91.11031 -> 91.11031
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```

View File

@@ -0,0 +1,164 @@
# CHANSVm round 7 attempts
Baseline ab015200: 216/233 instruction-exact; code 35484/53564; data 6904/6904; all 121 .data relocations match.
Pool checked before code experiments. Source scope is CHANSVm.c.
Initial CHANSVmGetSourceLine: 97.826090%; instructions 46/46; structural 0; diffs 16.
Initial CHANSVmNewObjData: 99.583336%; instructions 96/96; structural 0; diffs 7.
Initial CHANSVmParseInt: 94.693880%; instructions 49/49; structural 2; diffs 3.
Initial CHANSVm_8144B4D4: 97.590360%; instructions 83/83; structural 2; diffs 2.
Initial VmDateDtor: 94.967030%; instructions 91/91; structural 5; diffs 7.
Initial VmStringFromCharCode: 99.406780%; instructions 59/59; structural 0; diffs 6.
Initial VmStringReplace: 97.878784%; instructions 132/132; structural 0; diffs 40.
Initial VmStringSplit: 98.040540%; instructions 222/222; structural 0; diffs 66.
Initial CHANSVm_8145049C: 99.849190%; instructions 431/431; structural 0; diffs 13.
Initial VmBlobGetHexString: 98.719510%; instructions 82/82; structural 0; diffs 14.
Initial VmBlobPackCommon: 97.934135%; instructions 668/668; structural 2; diffs 246.
Initial VmBlobUnpack: 98.268860%; instructions 517/517; structural 0; diffs 156.
Initial VmWinEmuWrite: 99.626870%; instructions 67/67; structural 0; diffs 5.
Initial CHANSVmAddExe: 99.153540%; instructions 254/254; structural 0; diffs 34.
Initial CHANSVmLinkModules: 98.677246%; instructions 189/189; structural 0; diffs 43.
Initial VmCallMethod: 98.060500%; instructions 281/281; structural 0; diffs 91.
Initial CHANSVmStep: 96.452515%; instructions 1253/1253; structural 71; diffs 318.
- CHANSVmNewObjData: chunk index scoped to chunk fallback scan; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: aligned allocation size scoped after entry selection; 99.427086%; instructions 96/96; structural 0; diffs 10; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: explicit chunk slot kept only across allocation; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: chunk table scanned with pointer and index; 90.020836%; instructions 96/96; structural 17; diffs 53; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: aligned total length scoped inside valid string; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: remaining and converted lengths scoped per conversion; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: capture conversion return directly at declaration; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: for loop owns the byte offset; COMPILE FAIL; restored. /43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6072: for (u32 offset = 0; offset < totalLength; offset += 0x80) { # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- CHANSVmNewObjData: declaration-order search, 120 distinct compiling orders; best structural/diffs (0, 7); 99.583336%; data 6904/6904; restored.
- VmWinEmuWrite: declaration-order search, 120 distinct compiling orders; best structural/diffs (0, 5); 99.626870%; data 6904/6904; restored.
- CHANSVmParseInt: zero parser endpoint with memset; 77.020410%; instructions 53/49; structural 21; diffs 51; code 35484; data 6904/6904; restored.
- CHANSVm_8144B4D4: zero parser endpoint with memset; 93.915665%; instructions 86/83; structural 9; diffs 74; data 6904/6904; restored.
- CHANSVmParseInt: cache object type as unsigned full word; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVm_8144B4D4: cache object type as unsigned full word; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; restored.
- CHANSVmParseInt: assign type at declaration after endpoint declaration; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVm_8144B4D4: assign type at declaration after endpoint declaration; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; restored.
- CHANSVmParseInt: initialize endpoint and type in one expression; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVm_8144B4D4: initialize endpoint and type in one expression; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; restored.
- CHANSVmParseInt: load object type directly after parser endpoint initialization; 83.673470%; instructions 49/49; structural 4; diffs 5; code 35484; data 6904/6904; restored.
- CHANSVm_8144B4D4: load object type directly after parser endpoint initialization; 95.180725%; instructions 83/83; structural 2; diffs 3; data 6904/6904; restored.
- VmStringFromCharCode: word value temporary before UTF16 character mask; 94.322040%; instructions 57/59; structural 9; diffs 45; code 35484; data 6904/6904; restored.
- VmStringFromCharCode: separate character index increment from byte cursor increment; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
- VmStringFromCharCode: for traversal owns argument conversion scope; 99.322040%; instructions 59/59; structural 0; diffs 7; code 35484; data 6904/6904; restored.
- VmStringFromCharCode: mask wide character with typed word mask; 94.322040%; instructions 57/59; structural 9; diffs 45; code 35484; data 6904/6904; restored.
- VmStringFromCharCode: converted integer helper call boundary; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
- VmDateDtor: month and day tables use explicit pointer addition; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
- VmDateDtor: cache weekday index and month index at format branch; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
- VmDateDtor: format using explicit year value beside table pointers; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
- CHANSVmGetSourceLine: inline module source-line lookup helper, module before pc; 88.369570%; instructions 48/46; structural 8; diffs 26; code 35484; data 6904/6904; restored.
- CHANSVmGetSourceLine: inline module source-line lookup helper, pc before module; 88.369570%; instructions 48/46; structural 8; diffs 26; code 35484; data 6904/6904; restored.
- CHANSVmGetSourceLine: declare module/table/pc alongside context with checked loads; 97.391304%; instructions 46/46; structural 0; diffs 17; code 35484; data 6904/6904; restored.
- CHANSVmGetSourceLine: unsigned marker offset separated from line table pointer; 97.826090%; instructions 46/46; structural 0; diffs 16; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: save raw argument before string conversion; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: loop uses current total length and named converted object; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: reserve chunk inline helper variant 1; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: reserve chunk inline helper variant 2; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: reserve chunk inline helper variant 3; 99.427086%; instructions 96/96; structural 0; diffs 10; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: inline converted string writer variant 1; 99.104480%; instructions 67/67; structural 5; diffs 13; code 35484; data 6904/6904; restored.
- VmWinEmuWrite: inline converted string writer variant 2; 96.388060%; instructions 67/67; structural 9; diffs 16; code 35484; data 6904/6904; restored.
- VmStringFromCharCode: inline integer character conversion variant 1; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
- VmStringFromCharCode: inline integer character conversion variant 2; 99.406780%; instructions 59/59; structural 0; diffs 6; code 35484; data 6904/6904; restored.
- VmDateDtor: inline calendar formatting variant 1; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
- VmDateDtor: inline calendar formatting variant 2; 94.967030%; instructions 91/91; structural 5; diffs 7; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: reserve chunk inline helper selected for refinement; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; retained.
- CHANSVmNewObjData: allocated size declared after reserved entry; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: outer private VM reference drives allocation; 99.270836%; instructions 96/96; structural 0; diffs 14; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: allocation size declared inside allocation scope; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: inline allocator for a reserved chunk entry; COMPILE FAIL; restored. ceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 384: object->value.ptr_v = entry; # Error: ^ # (10209) illegal implicit conversion from 'struct ChunkEntry *' to # 'void **' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
Restored whole-reservation helper pending a narrower scan boundary; its only surviving differences were three allocation-size registers, 99.843750%.
- CHANSVmNewObjData: reserve and allocate inline helper boundaries; 97.708336%; instructions 98/96; structural 6; diffs 13; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: reserve helper with typed aligned size named in outer scope; 99.843750%; instructions 96/96; structural 0; diffs 3; code 35484; data 6904/6904; restored.
- CHANSVmNewObjData: reserve helper with allocated byte count initialized at use; COMPILE FAIL; restored. /43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 390: u32 memSize = VM_ALIGN(length); # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- CHANSVmNewObjData: inline chunk fallback scan keeps allocation in caller; 94.583336%; instructions 99/96; structural 8; diffs 67; code 35484; data 6904/6904; restored.
- VmBlobGetHexString: hex pairs share one character index; 90.060974%; instructions 83/82; structural 10; diffs 38; code 35484; data 6904/6904; restored.
- VmBlobGetHexString: character index advances after both hex digits; 93.780490%; instructions 79/82; structural 10; diffs 37; code 35484; data 6904/6904; restored.
- VmBlobGetHexString: byte loop index determines both output positions; 93.780490%; instructions 79/82; structural 10; diffs 37; code 35484; data 6904/6904; restored.
- VmBlobGetHexString: first nibble scoped before output index arithmetic; 98.719510%; instructions 82/82; structural 0; diffs 14; code 35484; data 6904/6904; restored.
- VmStringFromCharCode: argument index determines the two byte positions; 100.000000%; instructions 59/59; structural 0; diffs 0; code 35720; data 6904/6904; restored.
- VmStringFromCharCode: argument index determines the two byte positions exact candidate; 100.000000%; instructions 59/59; structural 0; diffs 0; code 35720; data 6904/6904; retained.
- CHANSVmNewObjData: remove unobserved traversal-offset initialization and increments; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35720; data 6904/6904; restored.
- CHANSVmNewObjData: typed chunk entry and direct global chunk index; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35720; data 6904/6904; restored.
- CHANSVmNewObjData: first fallback slot declared at scan boundary; 99.583336%; instructions 96/96; structural 0; diffs 7; code 35720; data 6904/6904; restored.
- VmBlobGetHexString: byte iteration supplies first destination index; 98.719510%; instructions 82/82; structural 0; diffs 14; code 35720; data 6904/6904; restored.
- VmBlobGetHexString: byte iteration supplies second destination index; 95.536580%; instructions 81/82; structural 9; diffs 36; code 35720; data 6904/6904; restored.
- VmBlobGetHexString: hex second index is initialized before first index cursor; 98.719510%; instructions 82/82; structural 0; diffs 14; code 35720; data 6904/6904; restored.
- CHANSVmGetSourceLine: program-counter-derived source entry index with explicit marker limit; 97.826090%; instructions 46/46; structural 0; diffs 18; code 35720; data 6904/6904; restored.
- CHANSVm_8145049C: typed string-format payload/owner/count declaration location 1; 99.187935%; instructions 431/431; structural 0; diffs 53; code 35720; data 6904/6904; restored.
- CHANSVm_8145049C: typed string-format payload/owner/count declaration location 2; 99.187935%; instructions 431/431; structural 0; diffs 53; code 35720; data 6904/6904; restored.
- CHANSVm_8145049C: typed string-format payload/owner/count declaration location 3; 99.849190%; instructions 431/431; structural 0; diffs 13; code 35720; data 6904/6904; restored.
- VmStringReplace: source and search payloads cached as typed string values; 97.954544%; instructions 132/132; structural 0; diffs 45; code 35720; data 6904/6904; restored.
- VmStringReplace: scope parent/search lengths after string conversions; 97.878784%; instructions 132/132; structural 0; diffs 40; code 35720; data 6904/6904; restored.
- VmStringReplace: second conversion uses its own argument scope; 97.878784%; instructions 132/132; structural 0; diffs 40; code 35720; data 6904/6904; restored.
- VmStringReplace: tail copy derives segment length at the copy site; 97.878784%; instructions 132/132; structural 0; diffs 40; code 35720; data 6904/6904; restored.
- VmStringSplit: cache parent and delimiter string records; 97.567566%; instructions 222/222; structural 0; diffs 88; code 35720; data 6904/6904; restored.
- VmStringSplit: loop counts initialized before cursors; 98.040540%; instructions 222/222; structural 0; diffs 66; code 35720; data 6904/6904; restored.
- VmStringSplit: delimiter miss branches around matched-segment tail; 96.238740%; instructions 222/222; structural 8; diffs 82; code 35720; data 6904/6904; restored.
- VmStringSplit: empty-delimiter byte cursor derives from character index; 98.040540%; instructions 222/222; structural 0; diffs 66; code 35720; data 6904/6904; restored.
- VmBlobPackCommon: skip integer packing immediately when no elements remain; 97.634730%; instructions 670/668; structural 33; diffs 469; code 35720; data 6904/6904; restored.
- VmBlobPackCommon: integer elements use loop-tail continue into format parser; 97.934135%; instructions 668/668; structural 2; diffs 246; code 35720; data 6904/6904; restored.
- VmBlobPackCommon: integer pack loop uses explicitly tested do loop; 97.410180%; instructions 669/668; structural 35; diffs 468; code 35720; data 6904/6904; restored.
- VmBlobPackCommon: packing pass owns converted format and blob locals; 97.934135%; instructions 668/668; structural 2; diffs 246; code 35720; data 6904/6904; restored.
- VmBlobUnpack: decoded integer scoped to numeric unpack cases; 98.268860%; instructions 517/517; structural 0; diffs 156; code 35720; data 6904/6904; restored.
- VmBlobUnpack: counting pass owns index and cursor declarations; COMPILE FAIL; restored. d/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 5484: u32 blobOff = srcBlob->offset; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- VmBlobUnpack: string trimming separates remaining characters from byte pointer; 97.949710%; instructions 516/517; structural 51; diffs 258; code 35720; data 6904/6904; restored.
- VmBlobUnpack: hex output indexes derive from source-byte iteration; 96.847200%; instructions 520/517; structural 55; diffs 227; code 35720; data 6904/6904; restored.
- CHANSVmAddExe: module clearing uses typed module array index; 99.153540%; instructions 254/254; structural 0; diffs 34; code 35720; data 6904/6904; restored.
- CHANSVmAddExe: range macro counters declared at each table boundary; COMPILE FAIL; restored. d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6301: { u32 cnt = header->nameCount; if (cnt) { u32 ofs = (u32) header- # Error: ^ # (10121) declaration syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- CHANSVmAddExe: name pointer cached beside dispatch entry validation; 97.559050%; instructions 254/254; structural 7; diffs 42; code 35720; data 6904/6904; restored.
- CHANSVmAddExe: table traversal uses while loop with explicit increment; 97.618110%; instructions 254/254; structural 8; diffs 42; code 35720; data 6904/6904; restored.
- CHANSVmLinkModules: global and native dispatch loops own separate index scopes; COMPILE FAIL; restored. .py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6774: u32 i; # Error: ^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- CHANSVmLinkModules: index-driven module loop uses for form; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
- CHANSVmLinkModules: dispatch entry snapshots declared before nested index loop; COMPILE FAIL; restored. src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6779: u8* addr; # Error: ^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- VmCallMethod: method table selection compares method count first; 98.024910%; instructions 281/281; structural 1; diffs 92; code 35720; data 6904/6904; restored.
- VmCallMethod: property selector derives method-null after set flag; 98.060500%; instructions 281/281; structural 0; diffs 91; code 35720; data 6904/6904; restored.
- VmCallMethod: return-frame size uses conditional scalar temporary; 98.060500%; instructions 281/281; structural 0; diffs 91; code 35720; data 6904/6904; restored.
- CHANSVmLinkModules: global and native loop indices have independent lifetimes; COMPILE FAIL; restored. NSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6843: for (i = 0; i < module->nameCount; i++) { # Error: ^ # (10140) undefined identifier 'i' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- CHANSVmLinkModules: dispatch snapshot declared before module passes; COMPILE FAIL; restored. src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d ### mwcceppc.exe Compiler: # File: src\channelScript\CHANSVm.c # ------------------------------------ # 6779: u8* addr; # Error: ^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
- CHANSVmLinkModules: global address derived with pointer addition operand order; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
- VmWinEmuWrite: aligned string length from inline payload accessor; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35720; data 6904/6904; restored.
- VmWinEmuWrite: byte offset increment moved into for loop expression; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35720; data 6904/6904; restored.
- VmWinEmuWrite: use byte length as signed nonnegative loop bound; 99.626870%; instructions 67/67; structural 0; diffs 5; code 35720; data 6904/6904; restored.
- CHANSVmParseInt: parser endpoint reset crosses an inline helper boundary; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35720; data 6904/6904; restored.
- CHANSVmParseInt: typed object type loaded through inline helper; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35720; data 6904/6904; restored.
- CHANSVmParseInt: base argument copied beside parser initialization; 94.693880%; instructions 49/49; structural 2; diffs 3; code 35720; data 6904/6904; restored.
- CHANSVmLinkModules: separate global/native indices while retaining local-function index; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
- CHANSVmLinkModules: dispatch snapshots scoped before each index loop; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
- CHANSVmLinkModules: snapshot declared across passes with address declaration first; 98.677246%; instructions 189/189; structural 0; diffs 43; code 35720; data 6904/6904; restored.
- CHANSVmStep: normalize zero step count with explicit conditional; 96.854750%; instructions 1254/1253; structural 66; diffs 1229; code 35720; data 2232/6904; restored.
- CHANSVmStep: pretested countdown loop and explicit zero normalization; 96.983240%; instructions 1255/1253; structural 63; diffs 1228; code 35720; data 2232/6904; restored.
- CHANSVmStep: result table accesses directly name constant fields; 96.308860%; instructions 1254/1253; structural 89; diffs 1094; code 35720; data 2232/6904; restored.
- CHANSVmStep: pretested countdown and direct result table fields; 96.772545%; instructions 1256/1253; structural 82; diffs 1231; code 35720; data 2232/6904; restored.
- CHANSVmStep: enumerated operand type addresses derive from index; 96.396645%; instructions 1254/1253; structural 75; diffs 1131; code 35720; data 2232/6904; restored.
- CHANSVmStep: operand type loads follow left then right source order; 96.452515%; instructions 1253/1253; structural 71; diffs 318; code 35720; data 6904/6904; restored.
- CHANSVmStep: conditional argument type declared at enumeration call; 96.452515%; instructions 1253/1253; structural 71; diffs 318; code 35720; data 6904/6904; restored.
- CHANSVmStep: direct tables, indexed enumeration, and pretested countdown combined; 96.604950%; instructions 1257/1253; structural 74; diffs 1220; code 35720; data 2232/6904; restored.
## Final audit
VmStringFromCharCode is the only retained source change: replace the redundant byte cursor with i * 2 and i * 2 + 1. It is 100.0% in objdiff, 59/59 instructions, ctxdiff diffs 0. All other experiments were restored, including the temporary reservation helper. That helper reached 99.843750% but retained three allocation-size register differences.
The completed source diff contains no added comments, assembly, data-placement changes, shared-header edits, compiler pragmas or uninitialized-value tricks. No configure.py changes were made.
Final full clean gate: PASS; exact 216/233 -> 217/233; code 35484/53564 -> 35720/53564; data 6904/6904 -> 6904/6904. Pools contain 125 identical strings. All 121 CHANSVmStep .data jump-table relocations are identical. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Regressions, forbidden patterns and readability warnings are zero.
Every remaining function has at least three compiling, distinct source-level attempts in this run. Failed compilations are excluded. The declaration-order searches add 120 NewObjData and 120 WinEmuWrite compiled permutations; JSON trial orders are in /tmp/chansvm-r7-decl-*.json.
CHANSVmGetSourceLine 97.826090%, module, entry, bitfield and line-offset registers; 46/46 instructions, structural 0, diffs 16; 5 distinct compiling source attempts.
CHANSVmNewObjData 99.583336%, seven chunk-index and table-slot register differences; 96/96 instructions, structural 0, diffs 7; 17 distinct compiling source attempts.
CHANSVmParseInt 94.693880%, three prologue positions schedule endpoint initialization after argument copies; 49/49 instructions, structural 2, diffs 3; 8 distinct compiling source attempts.
CHANSVm_8144B4D4 97.590360%, endpoint store and type comparison are scheduled in opposite order; 83/83 instructions, structural 2, diffs 2; 5 distinct compiling source attempts.
VmDateDtor 94.967030%, seven calendar table-load and variadic argument positions are scheduled differently; 91/91 instructions, structural 5, diffs 7; 5 distinct compiling source attempts.
VmStringReplace 97.878784%, source/search/replacement and traversal register allocation; 132/132 instructions, structural 0, diffs 40; 4 distinct compiling source attempts.
VmStringSplit 98.040540%, delimiter, cursor, array and element register allocation; 222/222 instructions, structural 0, diffs 66; 4 distinct compiling source attempts.
CHANSVm_8145049C 99.849190%, thirteen string-format payload and owner register differences; 431/431 instructions, structural 0, diffs 13; 3 distinct compiling source attempts.
VmBlobGetHexString 98.719510%, fourteen hex index, cursor and digit register differences; 82/82 instructions, structural 0, diffs 14; 7 distinct compiling source attempts.
VmBlobPackCommon 97.934135%, two branch destinations plus packing-state register allocation; 668/668 instructions, structural 2, diffs 246; 4 distinct compiling source attempts.
VmBlobUnpack 98.268860%, format, cursor and decoded-value register allocation; 517/517 instructions, structural 0, diffs 156; 3 distinct compiling source attempts.
VmWinEmuWrite 99.626870%, five converted-string and aligned-length register differences; 67/67 instructions, structural 0, diffs 5; 10 distinct compiling source attempts.
CHANSVmAddExe 99.153540%, module, size and relocation-loop register allocation; 254/254 instructions, structural 0, diffs 34; 3 distinct compiling source attempts.
CHANSVmLinkModules 98.677246%, module, dispatch and object-iterator register allocation; 189/189 instructions, structural 0, diffs 43; 5 distinct compiling source attempts.
VmCallMethod 98.060500%, call-frame, native target and property selector register allocation; 281/281 instructions, structural 0, diffs 91; 3 distinct compiling source attempts.
CHANSVmStep 96.452515%, countdown control flow, table-base addressing, operand-type spill and registers; 1253/1253 instructions, structural 71, diffs 318; 8 distinct compiling source attempts.
Disassembly note: disasm_fn.py stops at the first paired-single instruction in CHANSVmStep. Its complete target was read from build/43U/asm/src/channelScript/CHANSVm.s, and ctxdiff/declsearch compare all 1253 instructions. The compiler reason behind remaining register choices and scheduling is uncertain; the residual instruction differences are measured, not asserted impossible.

View File

@@ -0,0 +1,36 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/channelScript/CHANSVm] pool: IDENTICAL
[src/channelScript/CHANSVm] objdiff: code 35720/53564 data 6904/6904 functions 217/233 fuzzy 99.2758 linked code 0
[src/channelScript/CHANSVm] instruction-exact functions: 217/233
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
[src/channelScript/CHANSVm] section .text size 53564 match 99.27578
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.583336
[src/channelScript/CHANSVm] below 100: CHANSVmParseInt 94.69388
[src/channelScript/CHANSVm] below 100: CHANSVm_8144B4D4 97.59036
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
[src/channelScript/CHANSVm] below 100: CHANSVm_8145049C 99.84919
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.934135
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
regressions vs baseline: 0
global matched_code_percent: 86.76230 -> 86.77018
global fuzzy_match_percent: 99.32123 -> 99.32127
global complete_code_percent: 60.61288 -> 60.61288
global matched_data_percent: 91.11620 -> 91.11620
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS

View File

@@ -0,0 +1,37 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/channelScript/CHANSVm] pool: IDENTICAL
[src/channelScript/CHANSVm] objdiff: code 35720/53564 data 6904/6904 functions 217/233 fuzzy 99.2758 linked code 0
[src/channelScript/CHANSVm] instruction-exact functions: 217/233
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
[src/channelScript/CHANSVm] section .text size 53564 match 99.27578
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.583336
[src/channelScript/CHANSVm] below 100: CHANSVmParseInt 94.69388
[src/channelScript/CHANSVm] below 100: CHANSVm_8144B4D4 97.59036
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
[src/channelScript/CHANSVm] below 100: CHANSVm_8145049C 99.84919
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.934135
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
regressions vs baseline: 0
global matched_code_percent: 86.76230 -> 86.77018
global fuzzy_match_percent: 99.32123 -> 99.32127
global complete_code_percent: 60.61288 -> 60.61288
global matched_data_percent: 91.11620 -> 91.11620
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS

View File

@@ -0,0 +1,69 @@
GATE PASS
Instruction-exact 216/233 -> 217/233. Objdiff code 35484/53564 -> 35720/53564. Data 6904/6904 -> 6904/6904; .data 100.0%, all 121 interpreter jump-table relocations identical.
VmStringFromCharCode 100.0%; 59/59 instructions, ctxdiff diffs 0. Source commit 6f879ba3.
Remaining functions:
CHANSVmGetSourceLine 97.826090%, module, entry, bitfield and line-offset registers; 46/46 instructions, structural 0, diffs 16; 5 distinct compiling source attempts.
CHANSVmNewObjData 99.583336%, seven chunk-index and table-slot register differences; 96/96 instructions, structural 0, diffs 7; 17 distinct compiling source attempts.
CHANSVmParseInt 94.693880%, three prologue positions schedule endpoint initialization after argument copies; 49/49 instructions, structural 2, diffs 3; 8 distinct compiling source attempts.
CHANSVm_8144B4D4 97.590360%, endpoint store and type comparison are scheduled in opposite order; 83/83 instructions, structural 2, diffs 2; 5 distinct compiling source attempts.
VmDateDtor 94.967030%, seven calendar table-load and variadic argument positions are scheduled differently; 91/91 instructions, structural 5, diffs 7; 5 distinct compiling source attempts.
VmStringReplace 97.878784%, source/search/replacement and traversal register allocation; 132/132 instructions, structural 0, diffs 40; 4 distinct compiling source attempts.
VmStringSplit 98.040540%, delimiter, cursor, array and element register allocation; 222/222 instructions, structural 0, diffs 66; 4 distinct compiling source attempts.
CHANSVm_8145049C 99.849190%, thirteen string-format payload and owner register differences; 431/431 instructions, structural 0, diffs 13; 3 distinct compiling source attempts.
VmBlobGetHexString 98.719510%, fourteen hex index, cursor and digit register differences; 82/82 instructions, structural 0, diffs 14; 7 distinct compiling source attempts.
VmBlobPackCommon 97.934135%, two branch destinations plus packing-state register allocation; 668/668 instructions, structural 2, diffs 246; 4 distinct compiling source attempts.
VmBlobUnpack 98.268860%, format, cursor and decoded-value register allocation; 517/517 instructions, structural 0, diffs 156; 3 distinct compiling source attempts.
VmWinEmuWrite 99.626870%, five converted-string and aligned-length register differences; 67/67 instructions, structural 0, diffs 5; 10 distinct compiling source attempts.
CHANSVmAddExe 99.153540%, module, size and relocation-loop register allocation; 254/254 instructions, structural 0, diffs 34; 3 distinct compiling source attempts.
CHANSVmLinkModules 98.677246%, module, dispatch and object-iterator register allocation; 189/189 instructions, structural 0, diffs 43; 5 distinct compiling source attempts.
VmCallMethod 98.060500%, call-frame, native target and property selector register allocation; 281/281 instructions, structural 0, diffs 91; 3 distinct compiling source attempts.
CHANSVmStep 96.452515%, countdown control flow, table-base addressing, operand-type spill and registers; 1253/1253 instructions, structural 71, diffs 318; 8 distinct compiling source attempts.
Files changed: src/channelScript/CHANSVm.c; tools/decomp-assist/CHANSVm.round7-attempts.md; CHANSVm.round7-gates.txt; CHANSVm.round7-final-gate.txt; CHANSVm.round7-report.md.
Uncertain: compiler cause of remaining scheduling and register allocation.
Final full gate:
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/channelScript/CHANSVm] pool: IDENTICAL
[src/channelScript/CHANSVm] objdiff: code 35720/53564 data 6904/6904 functions 217/233 fuzzy 99.2758 linked code 0
[src/channelScript/CHANSVm] instruction-exact functions: 217/233
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
[src/channelScript/CHANSVm] section .text size 53564 match 99.27578
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.583336
[src/channelScript/CHANSVm] below 100: CHANSVmParseInt 94.69388
[src/channelScript/CHANSVm] below 100: CHANSVm_8144B4D4 97.59036
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
[src/channelScript/CHANSVm] below 100: CHANSVm_8145049C 99.84919
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.934135
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.26886
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.15354
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
[src/channelScript/CHANSVm] below 100: VmCallMethod 98.0605
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.452515
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
regressions vs baseline: 0
global matched_code_percent: 86.76230 -> 86.77018
global fuzzy_match_percent: 99.32123 -> 99.32127
global complete_code_percent: 60.61288 -> 60.61288
global matched_data_percent: 91.11620 -> 91.11620
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```

View File

@@ -0,0 +1,164 @@
# CHANSVm round 8 attempts
Scope CHANSVm.c only; 43U matching, no link classification changes.
Unslop writing pass applied.
Baseline HEAD 0c554a16: instruction-exact 217/233; code 35720/53564; data 6904/6904.
Initial pool identical, 125 strings; .data 4672 bytes and 121 jump-table relocations 100%.
Default gate cannot find baseline-0c554a16.json. Nearest existing immutable ancestor baseline is f00336cc; gates use --base f00336cc and compare retained improvements separately against the fresh initial report.
Initial CHANSVmGetSourceLine: 97.826090%; instructions 46/46; structural 0; positional diffs 16.
Initial CHANSVmNewObjData: 99.583336%; instructions 96/96; structural 0; positional diffs 7.
Initial CHANSVmParseInt: 94.693880%; instructions 49/49; structural 2; positional diffs 3.
Initial CHANSVm_8144B4D4: 97.590360%; instructions 83/83; structural 2; positional diffs 2.
Initial VmDateDtor: 94.967030%; instructions 91/91; structural 5; positional diffs 7.
Initial VmStringReplace: 97.878784%; instructions 132/132; structural 0; positional diffs 40.
Initial VmStringSplit: 98.040540%; instructions 222/222; structural 0; positional diffs 66.
Initial CHANSVm_8145049C: 99.849190%; instructions 431/431; structural 0; positional diffs 13.
Initial VmBlobGetHexString: 98.719510%; instructions 82/82; structural 0; positional diffs 14.
Initial VmBlobPackCommon: 97.934135%; instructions 668/668; structural 2; positional diffs 246.
Initial VmBlobUnpack: 98.268860%; instructions 517/517; structural 0; positional diffs 156.
Initial VmWinEmuWrite: 99.626870%; instructions 67/67; structural 0; positional diffs 5.
Initial CHANSVmAddExe: 99.153540%; instructions 254/254; structural 0; positional diffs 34.
Initial CHANSVmLinkModules: 98.677246%; instructions 189/189; structural 0; positional diffs 43.
Initial VmCallMethod: 98.060500%; instructions 281/281; structural 0; positional diffs 91.
Initial CHANSVmStep: 96.452515%; instructions 1253/1253; structural 71; positional diffs 318.
- CHANSVm_8145049C: separate typed string payload from escaped flag and format count; 99.187935%; instructions 431/431; structural 0; diffs 53; data 6904/6904; regressions 0; restored.
- CHANSVm_8145049C: separate temporary string owner from literal byte length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
- CHANSVm_8145049C: separate typed string payload and owner lifetimes; 99.187935%; instructions 431/431; structural 0; diffs 53; data 6904/6904; regressions 0; restored.
Diagnosis CHANSVmNewObjData: target/source frame 0x30, 96 instructions; branch graph and operand order identical. Only compiler-generated chunk-table slot r25/r26 and chunk counter r26/r25 are exchanged. Tried source boundaries before allocation coloring.
- CHANSVmNewObjData: signed chunk ordinal with unsigned bounds; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: explicit typed chunk-table slot lifetime; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: table-slot pointer plus offset initialized before ordinal; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: inline reservation owns scan and selected-entry lifetime; 99.843750%; instructions 96/96; structural 0; diffs 3; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: inline reservation and aligned size declared after selected entry; 99.843750%; instructions 96/96; structural 0; diffs 3; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: inline reservation aligned allocation scoped beside payload; 99.843750%; instructions 96/96; structural 0; diffs 3; data 6904/6904; regressions 0; restored.
Diagnosis CHANSVm_8145049C: frame 0xe0, all 431 instructions and control flow match. Thirteen differences exchange the temporary string payload/length and object-owner registers only, beginning at char_body. Inner declaration lifetimes are the next lever.
- CHANSVm_8145049C: temporary string owner declared before temporary string length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
- CHANSVm_8145049C: temporary string owner declared beside temporary string length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
- CHANSVm_8145049C: payload result declared before literal length and nested owner before size; 99.756380%; instructions 431/431; structural 0; diffs 21; data 6904/6904; regressions 0; restored.
Diagnosis VmWinEmuWrite: frame 0xb0 and 67 instructions agree; branch and operand forms agree. Converted object r27 and aligned length r29 target are r29/r27 in source; five register differences. Tried typed argument/converted-owner reuse and branch ownership.
- VmWinEmuWrite: raw argument and converted string share object lifetime; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmWinEmuWrite: converted string reuses the unused receiver parameter; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmWinEmuWrite: converted string reuses the unused return-header parameter; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmWinEmuWrite: conversion lengths declared before the conversion buffer; 99.552240%; instructions 67/67; structural 5; diffs 10; data 6904/6904; regressions 0; restored.
- VmWinEmuWrite: raw argument gets an independent typed temporary; 99.626870%; instructions 67/67; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: reservation and payload allocation have separate inline boundaries; 94.895836%; instructions 100/96; structural 8; diffs 88; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: payload helper receives selected entry before header; 94.895836%; instructions 100/96; structural 8; diffs 88; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: payload helper receives requested size before selected entry; 94.895836%; instructions 100/96; structural 8; diffs 88; data 6904/6904; regressions 0; restored.
Diagnosis CHANSVmParseInt: frame 0x70 and 49 instructions match; first type load matches, but endpoint zero store occurs three slots too late after base/output argument copies. CHANSVm_8144B4D4 has the same parser initialization issue inlined, with two adjacent endpoint-store/type-compare slots exchanged.
- CHANSVmParseInt: whole inline parser boundary, argument order obj, out, base; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
- CHANSVmParseInt: whole inline parser boundary, argument order base, obj, out; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
- CHANSVmParseInt: whole inline parser boundary, argument order out, obj, base; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
- CHANSVm_8144B4D4: parser endpoint initialized through const-qualified local pointer; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; regressions 0; restored.
- CHANSVm_8144B4D4: parser keyword conversion uses explicit success predicate; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; regressions 0; restored.
- CHANSVm_8144B4D4: parser result has scoped null-output handling; 95.060240%; instructions 85/83; structural 10; diffs 24; data 6904/6904; regressions 0; restored.
Diagnosis CHANSVmGetSourceLine: leaf frame, 46/46 instructions and normalized structure identical. Module, entry-offset, low PC byte, bitfield and line offset registers differ. Explicit named module and local declaration order are tested after verifying branch/operand forms.
- CHANSVmGetSourceLine: name the module loaded in the validation condition; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: name the low program-counter byte before line-entry traversal; 97.391304%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: loop index initialized only in its loop initializer; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: named module and program-counter byte lifetimes; 97.391304%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: inner declaration order lineOffset,i,bitfield; 97.282610%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: inner declaration order bitfield,lineOffset,i; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: inner declaration order bitfield,i,lineOffset; 97.826090%; instructions 46/46; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: inner declaration order i,lineOffset,bitfield; 97.282610%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
- CHANSVmGetSourceLine: inner declaration order i,bitfield,lineOffset; 97.282610%; instructions 46/46; structural 0; diffs 20; data 6904/6904; regressions 0; restored.
- CHANSVmParseInt: single-case object-type switch; 89.591835%; instructions 50/49; structural 6; diffs 43; data 6904/6904; regressions 0; restored.
- CHANSVmParseInt: object-type predicate computed before endpoint reset; 87.551020%; instructions 51/49; structural 7; diffs 45; data 6904/6904; regressions 0; restored.
- CHANSVmParseInt: parser endpoint lifetime inside parsing scope; 94.693880%; instructions 49/49; structural 2; diffs 3; data 6904/6904; regressions 0; restored.
- CHANSVm_8144B4D4: single-case object-type switch; 96.265060%; instructions 84/83; structural 4; diffs 69; data 6904/6904; regressions 0; restored.
- CHANSVm_8144B4D4: object-type predicate computed before endpoint reset; 94.939760%; instructions 85/83; structural 5; diffs 74; data 6904/6904; regressions 0; restored.
- CHANSVm_8144B4D4: parser endpoint lifetime inside parsing scope; 97.590360%; instructions 83/83; structural 2; diffs 2; data 6904/6904; regressions 0; restored.
Diagnosis VmBlobGetHexString: frame 0x20, 82/82 instructions, structural 0. Fourteen differences exchange character index, generated byte cursor and digit registers. Data/pool identical. Trial declarations, digit temporaries and loop operand forms.
- VmBlobGetHexString: declare character index before output index; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
- VmBlobGetHexString: explicit signed digit temporary before low-digit index; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
- VmBlobGetHexString: explicit signed digit temporary after low-digit index; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
- VmBlobGetHexString: source byte advancement in the low-digit expression; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
- VmBlobGetHexString: initialize character index immediately before traversal; 98.719510%; instructions 82/82; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
Diagnosis VmStringReplace: frame 0x40, 132/132 instructions, structural 0. VM/return, conversion result, source/search/replacement strings and traversal registers differ; branch and operand forms already agree. Source ownership and declaration order are the tested class.
- VmStringReplace: declare traversal lengths before all source pointers; 97.878784%; instructions 132/132; structural 0; diffs 40; data 6904/6904; regressions 0; restored.
- VmStringReplace: declare search and replacement extents before traversal offsets; 97.803030%; instructions 132/132; structural 0; diffs 43; data 6904/6904; regressions 0; restored.
- VmStringReplace: explicit typed string payload owners for length and pointer loads; 97.878784%; instructions 132/132; structural 0; diffs 40; data 6904/6904; regressions 0; restored.
Diagnosis CHANSVmAddExe: frame and 254/254 instruction count match. Mostly module/context and loop-cursor registers; target also reverses addition operands for module end and native method name. Those operand forms are corrected before register search.
- CHANSVmAddExe: module-end and native-name addition follow target operand order; 99.232285%; instructions 254/254; structural 0; diffs 32; data 6904/6904; regressions 0; restored.
- CHANSVmAddExe: executable type copied before module-header read; 99.153540%; instructions 254/254; structural 0; diffs 34; data 6904/6904; regressions 0; restored.
- CHANSVmAddExe: table cursors declared before their traversal counters; 99.547240%; instructions 254/254; structural 0; diffs 18; data 6904/6904; regressions 0; restored.
- CHANSVmAddExe: target addition forms with cursors declared first; 99.625984%; instructions 254/254; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
- CHANSVm_8145049C: record temporary owner before copying its payload; 96.925750%; instructions 431/431; structural 3; diffs 150; data 6904/6904; regressions 0; restored.
- CHANSVm_8145049C: record temporary owner before both character and string payloads; 96.426910%; instructions 430/431; structural 28; diffs 249; data 2232/6904; regressions 0; restored.
- CHANSVm_8145049C: literal extent reused for converted string length; 99.849190%; instructions 431/431; structural 0; diffs 13; data 6904/6904; regressions 0; restored.
- CHANSVm_8145049C: temporary owner is the direct allocation result; 97.389790%; instructions 431/431; structural 0; diffs 147; data 6904/6904; regressions 0; restored.
- CHANSVmAddExe: module header initialized in its declaration after cursor and operand fixes; 99.625984%; instructions 254/254; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
- CHANSVmAddExe: module header declared after header and region extents after cursor and operand fixes; 99.507870%; instructions 254/254; structural 0; diffs 21; data 6904/6904; regressions 0; restored.
- CHANSVmAddExe: module size cached immediately at declaration after cursor and operand fixes; 99.625984%; instructions 254/254; structural 0; diffs 16; data 6904/6904; regressions 0; restored.
CHANSVmAddExe declaration-order search: declaration block: | CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm; | ModuleHeader* mod; | CHANSVmModule* header; | u32 maxEnd; | u32 size; | u32 cnt; | u32 ofs; | start (0, 16) | best (0, 16) after 52 builds; source restored; best order was: | CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm; | ModuleHeader* mod; | CHANSVmModule* header; | u32 maxEnd; | u32 size; | u32 cnt; | u32 ofs; |
Retained CHANSVmAddExe: 99.153540 -> 99.625984%, 34 -> 16 differing instructions; 254/254 instructions; .data and all data sections 100%. Full clean gate --base f00336cc PASS, regressions/forbidden/readability 0, DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Exact count remains 217/233; this is a measured fuzzy improvement only.
Diagnosis VmDateDtor: frame 0x70 and 91/91 instructions match. Seven scheduling differences load weekday table before month table and place the year stack argument earlier than target. Month-first preparation, typed indexes and calendar helper boundary are tested.
- VmDateDtor: month-name lookup evaluated before weekday-name lookup; 94.967030%; instructions 91/91; structural 5; diffs 7; data 6904/6904; regressions 0; restored.
- VmDateDtor: year stack argument captured before the variadic call; 94.967030%; instructions 91/91; structural 5; diffs 7; data 6904/6904; regressions 0; restored.
- VmDateDtor: month and weekday table bases have explicit typed temporaries; 94.967030%; instructions 91/91; structural 5; diffs 7; data 6904/6904; regressions 0; restored.
Diagnosis VmStringSplit: target/source 222 instructions and normalized structure agree. Remaining differences are delimiter/limit, source/delimiter lengths, array ownership and traversal register allocation. Typed owner scopes and initialized array creation order are tested.
- VmStringSplit: parent and delimiter payloads get named typed owners; 98.040540%; instructions 222/222; structural 0; diffs 66; data 6904/6904; regressions 0; restored.
- VmStringSplit: optional limit conversion object scoped to the limit block; 98.040540%; instructions 222/222; structural 0; diffs 66; data 6904/6904; regressions 0; restored.
- VmStringSplit: result array starts null at its declaration; 96.666664%; instructions 222/222; structural 7; diffs 93; data 6904/6904; regressions 0; restored.
- VmStringSplit: delimiter and source extents declared before their pointers; 98.040540%; instructions 222/222; structural 0; diffs 66; data 6904/6904; regressions 0; restored.
Diagnosis VmCallMethod: frame 0x50 and 281/281 instructions agree. The target keeps the method/property selector in caller register r5 after memset and initializes the eventual callback pointer in r28 at entry. Source reuses retVal for both selector and error status across memset, holding it in r30, and leaves funcPtr uninitialized. Separate selector/error lifetimes and callback initialization are the structural-temporary class to test first.
- VmCallMethod: method/property selector has separate lifetime from call error status; 98.060500%; instructions 281/281; structural 0; diffs 91; data 6904/6904; regressions 0; restored.
- VmCallMethod: initialize callback pointer and delay selector initialization until after scratch clear; 98.113880%; instructions 282/281; structural 12; diffs 226; data 6904/6904; regressions 0; restored.
- VmCallMethod: selector reuses decoded operand, function calls explicitly select zero; 98.896800%; instructions 281/281; structural 0; diffs 54; data 6904/6904; regressions 0; restored.
Diagnosis VmCallMethod: frame 0x50 and 281/281 instructions agree. The target keeps the method/property selector in caller register r5 after memset and initializes the eventual callback pointer in r28 at entry. Source reuses retVal for both selector and error status across memset, holding it in r30, and leaves funcPtr uninitialized. Separate selector/error lifetimes and callback initialization are the structural-temporary class to test first.
- VmCallMethod: instruction and next-PC declared before callback and native target; 99.697510%; instructions 281/281; structural 0; diffs 14; data 6904/6904; regressions 0; restored.
- VmCallMethod: target lifetime order with selector-first comparisons and property flag order; 99.768684%; instructions 281/281; structural 0; diffs 12; data 6904/6904; regressions 0; restored.
- VmCallMethod: target lifetime order with explicit PC/module owners; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmCallMethod: property null selector initialized before set flag; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmCallMethod: set-property predicate has a named operation offset; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmCallMethod: set-property predicate assigned after property-list lookup; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmCallMethod: null-selector predicate assigned after push-depth selection; 100.000000%; instructions 281/281; structural 0; diffs 0; data 6904/6904; regressions 0; restored.
- VmCallMethod: inline property-mode predicate; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmCallMethod: inline null-method predicate; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
- VmCallMethod: inline mode classifier sets both property flags; 99.893240%; instructions 281/281; structural 0; diffs 5; data 6904/6904; regressions 0; restored.
VmCallMethod exact candidate: separate decoded method selector from call-status return, initialize callback to null at entry, retain native target on function mode as the target assembly does, declare instruction/PC/callback before native target, name PC/module owners, compare selector before table index, and compute null-method flag after selecting pushDepth. No artificial/uninitialized values. 281/281 instructions, ctxdiff diffs 0, objdiff 100.0%, data 6904/6904; pending full clean gate.
VmCallMethod source review removed two dead selector assignments introduced by broad trial replacements, including one after a later scratch memset. Rebuild remains 100.0% and ctxdiff diffs 0; final source uses only live selector initialization and callbacks are initialized.
Accepted VmCallMethod after fresh reviewed full gate: GATE PASS, instruction-exact 217 -> 218 / 233, matched code 35720 -> 36844 / 53564, data 6904/6904 including .data 100%, pool identical. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; regressions 0; forbidden patterns 0; readability warnings 0. Function objdiff 100%, 281/281 instructions and diffs 0.
Diagnosis CHANSVmLinkModules: target frame 0x40 and 189/189 instructions agree; only module/dispatch/global/native traversal registers differ. Target gives module r23, global dispatch r25/global node r26/index r27, then native dispatch r27/native node r26/index r25. Source shares one dispatch and one index across both passes; test distinct pass-local ownership before register permutations.
- CHANSVmLinkModules: global and native dispatch tables have independent lifetimes; 98.597885%; instructions 189/189; structural 0; diffs 45; data 6904/6904; regressions 0; restored.
- CHANSVmLinkModules: global and native table indices have independent lifetimes; 98.571430%; instructions 189/189; structural 0; diffs 46; data 6904/6904; regressions 0; restored.
- CHANSVmLinkModules: independent dispatch tables and pass indices; 98.571430%; instructions 189/189; structural 0; diffs 46; data 6904/6904; regressions 0; restored.
- CHANSVmLinkModules: module and dispatch owners declared together at function scope; 98.571430%; instructions 189/189; structural 0; diffs 46; data 6904/6904; regressions 0; restored.
- CHANSVmLinkModules: pass-local initialized table and iterator precede pass index; 98.677246%; instructions 189/189; structural 0; diffs 43; data 6904/6904; regressions 0; restored.
- CHANSVmLinkModules: native pass index precedes initialized table and iterator; 98.534390%; instructions 189/189; structural 2; diffs 46; data 6904/6904; regressions 0; restored.
- CHANSVmLinkModules: global iterator declared after pass index; 98.677246%; instructions 189/189; structural 0; diffs 43; data 6904/6904; regressions 0; restored.
Diagnosis VmBlobPackCommon: 668/668 instructions and frame agree, data/jump tables 100%. Two branch destinations differ before register tuning: zero-byte padding source still stores an unchanged offset while target branches directly to the parse loop; integer-count validation source checks negatives only in inferred-count branch while target shares the check after both branches. Packing-state register allocation also differs widely.
- VmBlobPackCommon: zero padding bypasses unchanged-offset store; 97.941620%; instructions 668/668; structural 1; diffs 245; data 6904/6904; regressions 0; restored.
- VmBlobPackCommon: integer count validation is shared by explicit and inferred counts; 97.941620%; instructions 668/668; structural 1; diffs 245; data 6904/6904; regressions 0; restored.
- VmBlobPackCommon: both target branch destinations preserved with common count validation; 97.949104%; instructions 668/668; structural 0; diffs 244; data 6904/6904; regressions 0; restored.
- VmBlobPackCommon: format owners declared after per-element work; 97.949104%; instructions 668/668; structural 0; diffs 244; data 6904/6904; regressions 0; restored.
- VmBlobPackCommon: pass counters declared before format owners; 97.949104%; instructions 668/668; structural 0; diffs 244; data 6904/6904; regressions 0; restored.
- VmBlobPackCommon: format-state declarations shared between counting and writing passes; 97.889220%; instructions 668/668; structural 40; diffs 277; data 6904/6904; regressions 0; restored.
Retained VmBlobPackCommon branch correction: target zero-padding bypass and shared count validation remove both structural differences, 668/668 instructions, 97.934135 -> 97.949104%, 246 -> 244 diffs; all remaining diffs are register/operand coloring. Data remains 6904/6904, pending gate.
VmBlobPackCommon retained branch correction passed full clean gate --base f00336cc. Instruction-exact 218/233, code 36844/53564, data 6904/6904, .data 100%, pool identical; no regressions, forbidden additions or readability warnings; correct DOL SHA1.
Diagnosis VmBlobUnpack: frame and all 517 instructions match structurally, but format cursor/count, blob owner, array element and decoded-value registers differ. Shared versus per-case array-element lifetimes, signed count treatment and type-specific decode temporaries are tested before register-only search.
- VmBlobUnpack: one array-element owner shared across integer/string/hex output cases; 98.452614%; instructions 517/517; structural 0; diffs 141; data 6904/6904; regressions 0; restored.
- VmBlobUnpack: decoded integer value scoped to each integer output iteration; 98.268860%; instructions 517/517; structural 0; diffs 156; data 6904/6904; regressions 0; restored.
- VmBlobUnpack: signed integer traversal counter with explicit unsigned bound; 98.268860%; instructions 517/517; structural 0; diffs 156; data 6904/6904; regressions 0; restored.
- VmBlobUnpack: format length read through named string-value owner; 96.392650%; instructions 526/517; structural 11; diffs 500; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: chunk-table slot declared and initialized inside the scan iteration; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: chunk scan bound has an unsigned named extent; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
- CHANSVmNewObjData: chunk scan ordinal and initialized slot share fallback scope; 99.583336%; instructions 96/96; structural 0; diffs 7; data 6904/6904; regressions 0; restored.
Retained VmBlobUnpack: one array-element variable used by every decode case, removing two shadow declarations. 98.268860 -> 98.452614%, 156 -> 141 positional differences, 517/517 instructions, structural 0, data 6904/6904; pending full gate.
VmBlobUnpack shared array-element owner passed full clean gate --base f00336cc: GATE PASS, exact 218/233, matched code 36844/53564, data 6904/6904, pools identical and .data 100%. DOL hash correct; regressions/forbidden/readability all 0.
Diagnosis CHANSVmStep last: frame 0xf0 and 1253 instructions agree, but 71 structural differences remain. Target uses explicit zero-count normalization and a pretested postdecrement loop, one shared rodata base for undefined constants and result-type tables, byte-offset enumeration rather than a moving enum pointer, different load-string error merge, and different property-result ownership. All 121 initial jump-table relocations are identical; any variant that moves them is rejected.
- CHANSVmStep: explicit zero normalization and pretested postdecrement interpreter loop; 96.983240%; instructions 1255/1253; structural 63; diffs 1228; data 2232/6904; regressions 0; restored.
- CHANSVmStep: result-type tables named directly for compiler rodata-base reuse; 96.308860%; instructions 1254/1253; structural 89; diffs 1094; data 2232/6904; regressions 0; restored.
- CHANSVmStep: enumerated type pointer derived from array index each iteration; 96.396645%; instructions 1254/1253; structural 75; diffs 1131; data 2232/6904; regressions 0; restored.
- CHANSVmStep: float index comparisons follow target operand direction; 96.452515%; instructions 1253/1253; structural 71; diffs 318; data 6904/6904; regressions 0; restored.
- CHANSVmStep: pretested countdown with direct tables and indexed type enumeration; 96.604950%; instructions 1257/1253; structural 74; diffs 1220; data 2232/6904; regressions 0; restored.
- CHANSVmStep: class test puts successful constructor selector before the error arm; 96.466080%; instructions 1253/1253; structural 65; diffs 313; data 6904/6904; regressions 0; restored.
- CHANSVmStep: indirect store addresses the second scratch header directly; 95.683160%; instructions 1251/1253; structural 78; diffs 1234; data 2232/6904; regressions 0; restored.
- CHANSVmStep: string load preserves deletion failures and merges the final result; 96.032720%; instructions 1253/1253; structural 75; diffs 318; data 6904/6904; regressions 0; restored.
- CHANSVmStep: constructor branch and direct indirect-store scratch address; 95.696730%; instructions 1251/1253; structural 72; diffs 1235; data 2232/6904; regressions 0; restored.
- CHANSVmStep: constructor branch, direct scratch address and merged string-load result; 95.450120%; instructions 1251/1253; structural 76; diffs 1235; data 2232/6904; regressions 0; restored.
Retained CHANSVmStep constructor-test direction: 96.452515 -> 96.466080%, 318 -> 313 diffs, structural 71 -> 65, unchanged 1253/1253 instructions and .data 100%. Only the positive class arm precedes the failure arm; no table relocations or strings move. Rejected every size/pool-regressing countdown/table/enumeration/indirect-store trial.
CHANSVmStep positive constructor branch passed full clean gate --base f00336cc: GATE PASS, exact 218/233, matched code 36844/53564, data 6904/6904 and .data 100%; no regressions, forbidden patterns or readability warnings. DOL hash correct.
Completeness audit PASS: every remaining open function has at least three distinct compiling source-level trials in this run. Declaration-order search added 52 builds. Accepted VmCallMethod is separately exact after a clean build; current exact count 218/233. Work remains partial because 15 functions are open.
Relocation audit correction: .data has 255 code relocations including method/function-pointer tables; all 255 normalized destinations are identical. Of these, the 121 CHANSVmStep interpreter jump-table relocations are identical. The earlier assertion mistakenly counted all code relocations as interpreter entries; no source or data changed.
Final independent unit comparison against fresh initial snapshot: preserves every one of the original 217 objdiff-exact functions, adds VmCallMethod at 100.0%, code 35720 -> 36844, data 6904 -> 6904. All 15 remaining functions have >=3 distinct compiling trials; full final gate PASS.

View File

@@ -0,0 +1,35 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/channelScript/CHANSVm] pool: IDENTICAL
[src/channelScript/CHANSVm] objdiff: code 36844/53564 data 6904/6904 functions 218/233 fuzzy 99.3346 linked code 0
[src/channelScript/CHANSVm] instruction-exact functions: 218/233
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
[src/channelScript/CHANSVm] section .text size 53564 match 99.33456
[src/channelScript/CHANSVm] below 100: CHANSVmGetSourceLine 97.82609
[src/channelScript/CHANSVm] below 100: CHANSVmNewObjData 99.583336
[src/channelScript/CHANSVm] below 100: CHANSVmParseInt 94.69388
[src/channelScript/CHANSVm] below 100: CHANSVm_8144B4D4 97.59036
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
[src/channelScript/CHANSVm] below 100: CHANSVm_8145049C 99.84919
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.625984
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.46608
[src/channelScript/CHANSVm] baseline: code 35484/53564 data 6904 functions 216 fuzzy 99.2732
regressions vs baseline: 0
global matched_code_percent: 86.88876 -> 86.93417
global fuzzy_match_percent: 99.32283 -> 99.32392
global complete_code_percent: 60.61288 -> 60.61288
global matched_data_percent: 91.11620 -> 91.11620
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS

Some files were not shown because too many files have changed in this diff Show More