Compare commits

...

121 Commits

Author SHA1 Message Date
coah
d7dbc474c0 cleanup: rename CdbBackup progress percent helper
Rename fn_8135B1C0 to getProgressPercent. DOL sha1 unchanged.
2026-10-01 16:54:50 -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
coah
539693c76a AOSS fuzzy 88 -> 95, zi8alpha 93 (worker 3d36d663) (#446) 2026-09-30 22:25:48 -05:00
coah
3134c4c05a zi8cgetc: GetZH 81 -> 83% (worker ca7cac87) (#445) 2026-09-30 22:18:17 -05:00
coah
d60d10868a asm to C: CDBDatabase 33 -> 15 asm bodies, iplSound 14 -> 3 (worker d04fb346) (#444) 2026-09-30 22:16:35 -05:00
coah
735b0ab878 odh 22/28 (idct_fast, fdct_fast, LineDeconv* exact) (worker 8060e828) (#443) 2026-09-30 22:15:03 -05:00
coah
ea8d4d3b8a zi8cgetc: GetZH instruction count now matches (deficit 0), 81.4% (worker 04fae432) (#442) 2026-09-30 21:36:48 -05:00
coah
7329402a2c BS2Mach 24/29: NAND state globals volatile at definition (worker ddd698b1) (#441) 2026-09-30 21:34:55 -05:00
coah
e46168062b kbd_lib: kbdProcMod 63 -> 99.9%, data 100% (worker aef57ff5) (#440) 2026-09-30 21:27:26 -05:00
coah
b2074a70d7 regalloc sweep 2: CDBRecord 27/29 (worker 03558e7c) (#439) 2026-09-30 21:24:09 -05:00
coah
98648d19bb AOSS, zi8alpha: deficits shrinking (worker 59064877) (#438) 2026-09-30 21:00:22 -05:00
coah
d03219249b regalloc sweep: pf_dir 35/38, NWC24Mime 12/16 (worker edd57acb) (#437) 2026-09-30 20:50:49 -05:00
coah
3c23585249 zi8cgetc: GetZH deficit 78 -> 62 insns (worker 7d22ea37) (#436) 2026-09-30 20:44:21 -05:00
coah
b4745ba2da pf_path, iplAddressEdit closer (worker 1bceaa8f) (#435) 2026-09-30 20:36:41 -05:00
coah
fb3e7bd49a sub-90 functions: SDChannelSelect, AddressEdit closer (worker 35852f84) (#434) 2026-09-30 20:34:31 -05:00
coah
e34eac26ef ATERM/AOSS: small fuzzy gains (worker 52d046e2) (#433) 2026-09-30 20:29:11 -05:00
coah
565d039c01 zconvert 2/4 (worst 78 -> 99.6%) (worker 9f5c4222) (#432) 2026-09-30 20:27:10 -05:00
coah
46d7bc07cf wad: small fuzzy gains (worker ca7a1e52) (#431) 2026-09-30 20:18:01 -05:00
coah
6ec48a1b9a TMC_JPEG: RGB565 6/13 (worker c0724c9e) (#430) 2026-09-30 20:01:28 -05:00
coah
07b3a2b579 ATERM 14/26 (fuzzy 92 -> 96) (worker 8f2e6497) (#429) 2026-09-30 19:59:08 -05:00
coah
e1b46d09e8 wad 34/40 (worker cfd01890) (#428) 2026-09-30 19:48:56 -05:00
coah
a4d46cf340 NWC24Download 18/30, iplSetting 105/112 (worker 363488f7) (#427) 2026-09-30 19:44:27 -05:00
github-actions[bot]
46e8217f2f docs: update progress [skip ci] 2026-10-01 00:07:00 +00:00
devin-ai-integration[bot]
028e36cce2 Link kbd_lib_map_us (#426)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-10-01 00:06:18 +00:00
github-actions[bot]
6abc1f9bd8 docs: update progress [skip ci] 2026-09-30 23:37:01 +00:00
devin-ai-integration[bot]
b004e2be89 Link net sha1 + neterrorcode (#425)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 23:36:27 +00:00
coah
5c1794ef25 wad 32/40 (fuzzy 98.5) (worker 37d1b10e) (#424) 2026-09-30 18:07:25 -05:00
coah
c393274640 sweep: kbd_lib, tiZiString, exif closer (worker 374f661e) (#423) 2026-09-30 17:57:39 -05:00
coah
3bfbb0c9c3 zi8alpha/zi81key: small fuzzy gains (worker 004853ec) (#422) 2026-09-30 17:54:43 -05:00
coah
cdc22045a7 TMC_JPEG: RGB565 3/13 (96%), RGBA8 89%, idct 88%, iqdec 99% (worker 7b4f8d49) (#421) 2026-09-30 17:43:46 -05:00
github-actions[bot]
976fbeb804 docs: update progress [skip ci] 2026-09-30 22:37:48 +00:00
devin-ai-integration[bot]
725599dba0 Link 28 fa tail units (pdm + pf stubs + pfs_*) (#420)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 22:37:10 +00:00
coah
4d0c9e70d6 odh/AOSS: small fuzzy gains (worker f272e078) (#419) 2026-09-30 17:24:56 -05:00
coah
131d8f743c sd_drv round 4 (worker d3d9dcba) (#418) 2026-09-30 17:17:34 -05:00
coah
23067a3477 wad 29/40 (fuzzy 92 -> 97) (worker 2a411d12) (#417) 2026-09-30 17:04:12 -05:00
coah
c7958e9f67 sd_drv round 3 (worker 503a78aa) (#416) 2026-09-30 16:50:52 -05:00
coah
d9ee532e07 vi 28/30 (data 100%), nup 17/23 (worker 53f0591e) (#415) 2026-09-30 16:49:32 -05:00
github-actions[bot]
1d5184b30e docs: update progress [skip ci] 2026-09-30 21:38:54 +00:00
devin-ai-integration[bot]
a27b6aa96e Link 47 fa units (finfo..xdivide + pf_w_* batch) (#414)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 21:38:17 +00:00
coah
112149c8e5 KPAD 18/29 (fuzzy 84 -> 98.5) (worker e7585e33) (#413) 2026-09-30 16:09:46 -05:00
coah
45a6d499ec pfd_cmn 1/1, sd_drv 15/26 (worker 64325785) (#412) 2026-09-30 16:06:22 -05:00
github-actions[bot]
813110e681 docs: update progress [skip ci] 2026-09-30 20:40:48 +00:00
devin-ai-integration[bot]
f4a48bd996 Link 15 fa pf units (cdelete..fconcat) (#411)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 20:40:01 +00:00
coah
f1590c832e wad 27/40 (fuzzy 86 -> 92) (worker c964c352) (#410) 2026-09-30 15:30:30 -05:00
coah
d6cafeab4d zi8cgetc: GetZH closer, data 24 -> 72 (worker bb87205d) (#409) 2026-09-30 15:18:11 -05:00
coah
c047b544c1 nand_drv 18/18, sd_drv 13/26 (no volatile casts) (worker 26ae07cf) (#408) 2026-09-30 15:16:57 -05:00
coah
82dbaac35d CHANSVm: CHANSVmStep 96.4% (worker 87e5a30c) (#407) 2026-09-30 14:46:29 -05:00
coah
e8d4107b11 BS2Mach/BS2Update: closer (fuzzy only) (worker fb7be869) (#406) 2026-09-30 14:33:27 -05:00
coah
1b96b3956b tiInputForm: fuzzy 97 -> 99.5, 3 more asm bodies to C (worker d126d226) (#405) 2026-09-30 14:30:55 -05:00
github-actions[bot]
81c36c4db0 docs: update progress [skip ci] 2026-09-30 19:12:04 +00:00
devin-ai-integration[bot]
355564cd77 Link pf_fat32, pf_sector, pf_volume_apiadd, pf_buffering (#404)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 19:11:15 +00:00
coah
17b5d5946b Texture_MCUtoY8U8V8: nine functions ~50% -> 99% (registers only) (worker b2970e86) (#403) 2026-09-30 13:55:41 -05:00
github-actions[bot]
ed5a62397d docs: update progress [skip ci] 2026-09-30 18:50:46 +00:00
coah
2a34d3703b Revert "Link fa/driver nand_drv + msc_drv (#400)" (#402)
This reverts commit 787aa9d334.
2026-09-30 13:50:09 -05:00
coah
3f5248be4c CHANSVm: data 100%, all 121 jump-table relocations match (worker 7c42cd13) (#401) 2026-09-30 13:48:47 -05:00
github-actions[bot]
59e127f89a docs: update progress [skip ci] 2026-09-30 18:41:42 +00:00
devin-ai-integration[bot]
787aa9d334 Link fa/driver nand_drv + msc_drv (#400)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 18:41:06 +00:00
coah
30809a5b05 BS2Mach: BS2Tick 77 -> 98% (worker 86b254ad) (#399) 2026-09-30 13:34:56 -05:00
coah
c21ae517d5 fix: replace lbl_ string pin in FAInit with a literal (#398) 2026-09-30 13:19:03 -05:00
coah
5c7d7ca74a zi8match 8/10 (data 100%) (worker 5d91f712) (#397) 2026-09-30 13:17:06 -05:00
github-actions[bot]
7a94e90a6e docs: update progress [skip ci] 2026-09-30 18:11:32 +00:00
devin-ai-integration[bot]
cec99e3cf8 Link vi/i2c + vi3in1 (#396)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 18:10:55 +00:00
github-actions[bot]
6172b57647 docs: update progress [skip ci] 2026-09-30 18:10:40 +00:00
devin-ai-integration[bot]
bed8e32e57 Link 18 fa/api units (#395)
Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: wch <usernamecole7@gmail.com>
2026-09-30 18:10:01 +00:00
coah
930e8f4ecf CHANSVm 208/233 (worker 662bd0e0) (#394) 2026-09-30 12:45:06 -05:00
coah
c835bedbc1 zikorean 3/3; zkokeyp 98.6, zprepare 96 (worker 58c15bd8) (#393) 2026-09-30 12:35:36 -05:00
coah
5981234728 scene units: small fuzzy gains (worker 0eaf4057) (#392) 2026-09-30 12:13:13 -05:00
github-actions[bot]
3b2304bd75 docs: update progress [skip ci] 2026-09-30 17:12:29 +00:00
191 changed files with 48579 additions and 10666 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 98.06% | 84.71% | 58.20% | 90.34% |
| 99.37% | 87.69% | 61.81% | 91.27% |
units 778/1027 complete, functions 12070/12563 matched.
units 916/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
@@ -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

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"),
@@ -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"),
@@ -1044,9 +1044,9 @@ config.libs = [
Object(Matching, "net/nettime.c"),
Object(Matching, "net/crc.c"),
Object(NonMatching, "net/md5.c"),
Object(NonMatching, "net/sha1.c"),
Object(Matching, "net/sha1.c"),
Object(NonMatching, "net/hmac.c"),
Object(NonMatching, "net/neterrorcode.c"),
Object(Matching, "net/neterrorcode.c"),
Object(Matching, "net/NETVersion.c"),
Object(NonMatching, "net/aes.c"),
Object(Matching, "net/wireless_macaddr.c"),
@@ -1389,8 +1389,8 @@ config.libs = [
),
RVLSDKLib("vi", [
Object(NonMatching, "vi/vi.c"),
Object(NonMatching, "vi/i2c.c"),
Object(NonMatching, "vi/vi3in1.c"),
Object(Matching, "vi/i2c.c"),
Object(Matching, "vi/vi3in1.c"),
]
),
RVLSDKLib("mtx", [
@@ -1687,9 +1687,9 @@ config.libs = [
Object(Matching, "fa/pf_service.c"),
Object(Matching, "fa/pf_str.c"),
Object(Matching, "fa/pf_driver.c"),
Object(NonMatching, "fa/pdm_api.c"),
Object(NonMatching, "fa/pdm_bpb.c"),
Object(NonMatching, "fa/pdm_disk.c"),
Object(Matching, "fa/pdm_api.c"),
Object(Matching, "fa/pdm_bpb.c"),
Object(Matching, "fa/pdm_disk.c"),
Object(NonMatching, "fa/pdm_partition.c"),
Object(NonMatching, "fa/pf_cache.c"),
Object(NonMatching, "fa/pf_cluster.c"),
@@ -1698,168 +1698,168 @@ 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(NonMatching, "fa/pf_fat32.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"),
Object(NonMatching, "fa/pf_path.c"),
Object(NonMatching, "fa/pf_sector.c"),
Object(Matching, "fa/pf_sector.c"),
Object(NonMatching, "fa/pf_volume.c"),
Object(NonMatching, "fa/pf_volume_apiadd.c"),
Object(NonMatching, "fa/pf_cp932.c"),
Object(Matching, "fa/pf_volume_apiadd.c"),
Object(Matching, "fa/pf_cp932.c"),
Object(Matching, "fa/pf_api_util.c"),
Object(Matching, "fa/pf_attach.c"),
Object(NonMatching, "fa/pf_buffering.c"),
Object(NonMatching, "fa/pf_cdelete.c"),
Object(NonMatching, "fa/pf_chdir.c"),
Object(NonMatching, "fa/pf_chdmod.c"),
Object(NonMatching, "fa/pf_chmod.c"),
Object(NonMatching, "fa/pf_cinsert.c"),
Object(Matching, "fa/pf_buffering.c"),
Object(Matching, "fa/pf_cdelete.c"),
Object(Matching, "fa/pf_chdir.c"),
Object(Matching, "fa/pf_chdmod.c"),
Object(Matching, "fa/pf_chmod.c"),
Object(Matching, "fa/pf_cinsert.c"),
Object(Matching, "fa/pf_closedir.c"),
Object(NonMatching, "fa/pf_combine.c"),
Object(NonMatching, "fa/pf_create.c"),
Object(NonMatching, "fa/pf_createdir.c"),
Object(NonMatching, "fa/pf_cut.c"),
Object(NonMatching, "fa/pf_derrnum.c"),
Object(Matching, "fa/pf_combine.c"),
Object(Matching, "fa/pf_create.c"),
Object(Matching, "fa/pf_createdir.c"),
Object(Matching, "fa/pf_cut.c"),
Object(Matching, "fa/pf_derrnum.c"),
Object(Matching, "fa/pf_detach.c"),
Object(NonMatching, "fa/pf_divide.c"),
Object(Matching, "fa/pf_divide.c"),
Object(Matching, "fa/pf_errnum.c"),
Object(NonMatching, "fa/pf_fadjust.c"),
Object(NonMatching, "fa/pf_fappend.c"),
Object(NonMatching, "fa/pf_fchdir.c"),
Object(Matching, "fa/pf_fadjust.c"),
Object(Matching, "fa/pf_fappend.c"),
Object(Matching, "fa/pf_fchdir.c"),
Object(Matching, "fa/pf_fclose.c"),
Object(NonMatching, "fa/pf_fconcat.c"),
Object(Matching, "fa/pf_fconcat.c"),
Object(Matching, "fa/pf_feof.c"),
Object(Matching, "fa/pf_ferror.c"),
Object(NonMatching, "fa/pf_finfo.c"),
Object(Matching, "fa/pf_finfo.c"),
Object(Matching, "fa/pf_flock.c"),
Object(Matching, "fa/pf_fopen.c"),
Object(NonMatching, "fa/pf_format.c"),
Object(Matching, "fa/pf_format.c"),
Object(Matching, "fa/pf_fread.c"),
Object(Matching, "fa/pf_fseek.c"),
Object(NonMatching, "fa/pf_fsetclstlink.c"),
Object(NonMatching, "fa/pf_fsexec.c"),
Object(Matching, "fa/pf_fsetclstlink.c"),
Object(Matching, "fa/pf_fsexec.c"),
Object(Matching, "fa/pf_fsfirst.c"),
Object(Matching, "fa/pf_fsnext.c"),
Object(Matching, "fa/pf_fstat.c"),
Object(Matching, "fa/pf_fsync.c"),
Object(Matching, "fa/pf_fwrite.c"),
Object(NonMatching, "fa/pf_getdev.c"),
Object(NonMatching, "fa/pf_getvol.c"),
Object(NonMatching, "fa/pf_getvolcfg.c"),
Object(NonMatching, "fa/pf_init_prfile2.c"),
Object(NonMatching, "fa/pf_insert.c"),
Object(NonMatching, "fa/pf_iswriteprotected.c"),
Object(Matching, "fa/pf_getdev.c"),
Object(Matching, "fa/pf_getvol.c"),
Object(Matching, "fa/pf_getvolcfg.c"),
Object(Matching, "fa/pf_init_prfile2.c"),
Object(Matching, "fa/pf_insert.c"),
Object(Matching, "fa/pf_iswriteprotected.c"),
Object(Matching, "fa/pf_mkdir.c"),
Object(Matching, "fa/pf_mount.c"),
Object(NonMatching, "fa/pf_move.c"),
Object(Matching, "fa/pf_move.c"),
Object(Matching, "fa/pf_opendir.c"),
Object(Matching, "fa/pf_readdir.c"),
Object(NonMatching, "fa/pf_regctx.c"),
Object(Matching, "fa/pf_regctx.c"),
Object(Matching, "fa/pf_remove.c"),
Object(Matching, "fa/pf_rename.c"),
Object(Matching, "fa/pf_rewinddir.c"),
Object(Matching, "fa/pf_rmdir.c"),
Object(NonMatching, "fa/pf_rmvvol.c"),
Object(Matching, "fa/pf_rmvvol.c"),
Object(Matching, "fa/pf_seekdir.c"),
Object(NonMatching, "fa/pf_setclstlink.c"),
Object(NonMatching, "fa/pf_setcode.c"),
Object(NonMatching, "fa/pf_setencode.c"),
Object(NonMatching, "fa/pf_settailbuf.c"),
Object(NonMatching, "fa/pf_setupfsi.c"),
Object(NonMatching, "fa/pf_setvol.c"),
Object(NonMatching, "fa/pf_setvolcfg.c"),
Object(NonMatching, "fa/pf_sync.c"),
Object(Matching, "fa/pf_setclstlink.c"),
Object(Matching, "fa/pf_setcode.c"),
Object(Matching, "fa/pf_setencode.c"),
Object(Matching, "fa/pf_settailbuf.c"),
Object(Matching, "fa/pf_setupfsi.c"),
Object(Matching, "fa/pf_setvol.c"),
Object(Matching, "fa/pf_setvolcfg.c"),
Object(Matching, "fa/pf_sync.c"),
Object(Matching, "fa/pf_telldir.c"),
Object(Matching, "fa/pf_unmount.c"),
Object(NonMatching, "fa/pf_unregctx.c"),
Object(NonMatching, "fa/pf_xdivide.c"),
Object(Matching, "fa/pf_unregctx.c"),
Object(Matching, "fa/pf_xdivide.c"),
Object(Matching, "fa/pf_w_api_util.c"),
Object(NonMatching, "fa/pf_w_cdelete.c"),
Object(NonMatching, "fa/pf_w_chdir.c"),
Object(NonMatching, "fa/pf_w_chdmod.c"),
Object(NonMatching, "fa/pf_w_chmod.c"),
Object(NonMatching, "fa/pf_w_cinsert.c"),
Object(NonMatching, "fa/pf_w_combine.c"),
Object(NonMatching, "fa/pf_w_create.c"),
Object(NonMatching, "fa/pf_w_createdir.c"),
Object(NonMatching, "fa/pf_w_cut.c"),
Object(NonMatching, "fa/pf_w_divide.c"),
Object(NonMatching, "fa/pf_w_fconcat.c"),
Object(NonMatching, "fa/pf_w_fopen.c"),
Object(NonMatching, "fa/pf_w_fsexec.c"),
Object(NonMatching, "fa/pf_w_fsfirst.c"),
Object(NonMatching, "fa/pf_w_fsnext.c"),
Object(NonMatching, "fa/pf_w_fstat.c"),
Object(NonMatching, "fa/pf_w_insert.c"),
Object(NonMatching, "fa/pf_w_mkdir.c"),
Object(NonMatching, "fa/pf_w_move.c"),
Object(NonMatching, "fa/pf_w_opendir.c"),
Object(NonMatching, "fa/pf_w_remove.c"),
Object(NonMatching, "fa/pf_w_rename.c"),
Object(NonMatching, "fa/pf_w_rmdir.c"),
Object(NonMatching, "fa/pf_w_xdivide.c"),
Object(NonMatching, "fa/pf_filelock.c"),
Object(NonMatching, "fa/pf_stub.c"),
Object(NonMatching, "fa/pf_system.c"),
Object(NonMatching, "fa/pf_stub_standard.c"),
Object(NonMatching, "fa/pfs_attach.c"),
Object(NonMatching, "fa/pfs_buffering.c"),
Object(NonMatching, "fa/pfs_create.c"),
Object(NonMatching, "fa/pfs_createdir.c"),
Object(NonMatching, "fa/pfs_detach.c"),
Object(NonMatching, "fa/pfs_errnum.c"),
Object(NonMatching, "fa/pfs_fclose.c"),
Object(NonMatching, "fa/pfs_finfot.c"),
Object(NonMatching, "fa/pfs_fopen.c"),
Object(NonMatching, "fa/pfs_format.c"),
Object(NonMatching, "fa/pfs_fread.c"),
Object(NonMatching, "fa/pfs_fseek.c"),
Object(NonMatching, "fa/pfs_fsfirst.c"),
Object(NonMatching, "fa/pfs_fsnext.c"),
Object(NonMatching, "fa/pfs_fstat.c"),
Object(NonMatching, "fa/pfs_fwrite.c"),
Object(NonMatching, "fa/pfs_getdev.c"),
Object(NonMatching, "fa/pfs_init_prfile2.c"),
Object(NonMatching, "fa/pfs_mount.c"),
Object(NonMatching, "fa/pfs_remove.c"),
Object(NonMatching, "fa/pfs_unmount.c"),
Object(NonMatching, "fa/pf_stub_unicode.c"),
Object(Matching, "fa/pf_w_cdelete.c"),
Object(Matching, "fa/pf_w_chdir.c"),
Object(Matching, "fa/pf_w_chdmod.c"),
Object(Matching, "fa/pf_w_chmod.c"),
Object(Matching, "fa/pf_w_cinsert.c"),
Object(Matching, "fa/pf_w_combine.c"),
Object(Matching, "fa/pf_w_create.c"),
Object(Matching, "fa/pf_w_createdir.c"),
Object(Matching, "fa/pf_w_cut.c"),
Object(Matching, "fa/pf_w_divide.c"),
Object(Matching, "fa/pf_w_fconcat.c"),
Object(Matching, "fa/pf_w_fopen.c"),
Object(Matching, "fa/pf_w_fsexec.c"),
Object(Matching, "fa/pf_w_fsfirst.c"),
Object(Matching, "fa/pf_w_fsnext.c"),
Object(Matching, "fa/pf_w_fstat.c"),
Object(Matching, "fa/pf_w_insert.c"),
Object(Matching, "fa/pf_w_mkdir.c"),
Object(Matching, "fa/pf_w_move.c"),
Object(Matching, "fa/pf_w_opendir.c"),
Object(Matching, "fa/pf_w_remove.c"),
Object(Matching, "fa/pf_w_rename.c"),
Object(Matching, "fa/pf_w_rmdir.c"),
Object(Matching, "fa/pf_w_xdivide.c"),
Object(Matching, "fa/pf_filelock.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"),
Object(Matching, "fa/pfs_buffering.c"),
Object(Matching, "fa/pfs_create.c"),
Object(Matching, "fa/pfs_createdir.c"),
Object(Matching, "fa/pfs_detach.c"),
Object(Matching, "fa/pfs_errnum.c"),
Object(Matching, "fa/pfs_fclose.c"),
Object(Matching, "fa/pfs_finfot.c"),
Object(Matching, "fa/pfs_fopen.c"),
Object(Matching, "fa/pfs_format.c"),
Object(Matching, "fa/pfs_fread.c"),
Object(Matching, "fa/pfs_fseek.c"),
Object(Matching, "fa/pfs_fsfirst.c"),
Object(Matching, "fa/pfs_fsnext.c"),
Object(Matching, "fa/pfs_fstat.c"),
Object(Matching, "fa/pfs_fwrite.c"),
Object(Matching, "fa/pfs_getdev.c"),
Object(Matching, "fa/pfs_init_prfile2.c"),
Object(Matching, "fa/pfs_mount.c"),
Object(Matching, "fa/pfs_remove.c"),
Object(Matching, "fa/pfs_unmount.c"),
Object(Matching, "fa/pf_stub_unicode.c"),
Object(NonMatching, "fa/api/FAAttach.c"),
Object(NonMatching, "fa/api/FABuffering.c"),
Object(NonMatching, "fa/api/FACreate.c"),
Object(NonMatching, "fa/api/FACreatedir.c"),
Object(NonMatching, "fa/api/FADetach.c"),
Object(NonMatching, "fa/api/FAErrnum.c"),
Object(Matching, "fa/api/FABuffering.c"),
Object(Matching, "fa/api/FACreate.c"),
Object(Matching, "fa/api/FACreatedir.c"),
Object(Matching, "fa/api/FADetach.c"),
Object(Matching, "fa/api/FAErrnum.c"),
Object(Matching, "fa/api/FAFclose.c"),
Object(Matching, "fa/api/FAFinfo.c"),
Object(NonMatching, "fa/api/FAFopen.c"),
Object(NonMatching, "fa/api/FAFormat.c"),
Object(Matching, "fa/api/FAFopen.c"),
Object(Matching, "fa/api/FAFormat.c"),
Object(Matching, "fa/api/FAFread.c"),
Object(NonMatching, "fa/api/FAFseek.c"),
Object(NonMatching, "fa/api/FAFsfirst.c"),
Object(NonMatching, "fa/api/FAFsnext.c"),
Object(NonMatching, "fa/api/FAFstat.c"),
Object(Matching, "fa/api/FAFseek.c"),
Object(Matching, "fa/api/FAFsfirst.c"),
Object(Matching, "fa/api/FAFsnext.c"),
Object(Matching, "fa/api/FAFstat.c"),
Object(Matching, "fa/api/FAFwrite.c"),
Object(NonMatching, "fa/api/FAGetdev.c"),
Object(NonMatching, "fa/api/FAInit.c"),
Object(Matching, "fa/api/FAGetdev.c"),
Object(Matching, "fa/api/FAInit.c"),
Object(Matching, "fa/api/FAInitDiskManager.c"),
Object(NonMatching, "fa/api/FAMount.c"),
Object(NonMatching, "fa/api/FARegistCB.c"),
Object(NonMatching, "fa/api/FARemove.c"),
Object(NonMatching, "fa/api/FASetThreadPriority.c"),
Object(NonMatching, "fa/api/FAUnmount.c"),
Object(Matching, "fa/api/FAMount.c"),
Object(Matching, "fa/api/FARegistCB.c"),
Object(Matching, "fa/api/FARemove.c"),
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"),
]
),
@@ -1887,7 +1887,7 @@ config.libs = [
RVLSDKLib("kbd", [
Object(NonMatching, "kbd/kbd_lib.c"),
Object(NonMatching, "kbd/kbd_lib_map_jp.c"),
Object(NonMatching, "kbd/kbd_lib_map_us.c"),
Object(Matching, "kbd/kbd_lib_map_us.c"),
Object(NonMatching, "kbd/kbd_lib_map_eu.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

@@ -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

@@ -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

@@ -225,6 +225,46 @@ namespace ipl {
};
#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 param_5, f32 param_6, 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 = unkVal0 * (frame + (cubic -
inverseDuration * (2.0f * frame * frame))) +
unkVal1 * (cubic - inverseDuration * frameSquared);
result.x += tangent;
result.y += tangent;
result.z += tangent;
return result;
}
protected:
VEC3 mStart;
VEC3 mEnd;
f32 unkVal0;
f32 unkVal1;
};
#endif
} // namespace math
} // namespace ipl

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

@@ -38,21 +38,49 @@ namespace ipl {
int holdSE(const char* sndName);
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
#ifdef IPL_SOUND_MATCHING
void stopBGM(int unk = 0);
#else
int stopBGM(int unk = 0);
#endif
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
void stopAllSound(int unk = 0);
int resetAllSound();
#ifdef IPL_SOUND_MATCHING
void muteOffBGM(int);
#else
int muteOffBGM(int);
#endif
#ifdef IPL_SOUND_MATCHING
void muteOnBGM(int);
#else
int muteOnBGM(int);
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOnBGM();
#else
int pauseOnBGM();
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOffBGM();
#else
int pauseOffBGM();
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOnSE();
#else
int pauseOnSE();
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOffSE();
#else
int pauseOffSE();
#endif
void setOutputMode(EAudioOutputMode mode);

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:
@@ -67,6 +67,7 @@ namespace ipl {
#ifdef IPL_SDMEMORY_TITLE_CACHE_ACCESS
const ESTitleId* getTitleCache() const { return &mData.titleCache[0][0]; }
ESTitleId getTitleCacheEntry(int index) const { return (&mData.titleCache[0][0])[index]; }
#endif
#ifdef IPL_SD_CHANNEL_SELECT_CPP
ESTitleId getCachedTitle(int index) const {
@@ -86,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
@@ -183,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

@@ -48,10 +48,14 @@ namespace EGG {
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName) {
#ifdef IPL_SOUND_MATCHING
u32 id = changeNameToId(pName);
#else
u32 id = nw4r::snd::SoundArchive::INVALID_ID;
if (mpArchive != NULL) {
id = changeNameToId(pName);
}
#endif
return mSoundArchivePlayer.PrepareSound(pHandle, id);
} // 0x48

View File

@@ -20,9 +20,13 @@ namespace EGG {
~SoundHeapMgr() { destroySoundHeap(); }
virtual bool loadState(s32 id) {
#ifdef IPL_SOUND_MATCHING
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
#else
s32 level = mHeap.GetCurrentLevel();
if (id > 0 && level >= id) {
#endif
mHeap.LoadState(id);
return true;
}

View File

@@ -11,7 +11,11 @@ namespace nw4r {
namespace snd {
class SoundHandle : private ut::NonCopyable {
public:
#ifdef IPL_SOUND_MATCHING
SoundHandle() NO_INLINE;
#else
SoundHandle() NO_INLINE : mSound(NULL) {}
#endif
~SoundHandle() { DetachSound(); }
void detail_AttachSound(detail::BasicSound* sound);

View File

@@ -31,7 +31,14 @@ namespace nw4r {
ut::detail::AutoLock<OSMutex> lock(mMutex);
return mFrameHeap.SaveState();
}
#ifdef IPL_SOUND_MATCHING
void LoadState(int id) {
ut::detail::AutoLock<OSMutex> lock(mMutex);
mFrameHeap.LoadState(id);
}
#else
void LoadState(int id);
#endif
bool IsValid() { return mFrameHeap.IsValid(); }

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

@@ -17,7 +17,96 @@ static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
return limit;
}
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
u32 bitData;
u32 code;
u32 length;
const TMCHuffmanEntry* entry;
if (bitCount <= 17) {
s32 result = TMCJPEGDEC_load_buff(work);
if (result < 0) {
return result;
}
}
bitCount = work->bitCount;
bitData = work->bitBuf;
bitCount -= 9;
code = (bitData >> bitCount) & 0x1FF;
work->bitCount = bitCount;
length = 9;
entry = table + 9;
goto read_entry;
while (1) {
length++;
entry++;
if (length > 16) {
return TMCC_ERROR_OVERFLOW;
}
bitCount = work->bitCount;
code <<= 1;
bitData = work->bitBuf;
bitCount--;
work->bitCount = bitCount;
code |= (bitData >> bitCount) & 1;
read_entry:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
if (code > (u32)decoded.bitLength) {
continue;
}
code = code - entry->bitLength + entry->symbol;
return symbols[code & 0xFF];
}
}
}
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
u32 bitData;
u32 code;
u32 length;
if (bitCount <= 17) {
s32 result = TMCJPEGDEC_load_buff(work);
if (result < 0) {
return result;
}
}
bitCount = work->bitCount;
bitData = work->bitBuf;
bitCount -= 9;
code = (bitData >> bitCount) & 0x1FF;
work->bitCount = bitCount;
length = 9;
entry += 9;
goto read_entry;
while (1) {
length++;
entry++;
if (length > 16) {
return TMCC_ERROR_OVERFLOW;
}
bitCount = work->bitCount;
code <<= 1;
bitData = work->bitBuf;
bitCount--;
work->bitCount = bitCount;
code |= (bitData >> bitCount) & 1;
read_entry:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
if (code > (u32)decoded.bitLength) {
continue;
}
code = code - entry->bitLength + entry->symbol;
return symbols[code & 0xFF];
}
}
}
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
TMCHuffmanEntry dcEntry;
TMCHuffmanEntry acEntry;
const TMCHuffmanEntry* ac_fast;
u8* huff_sym;
u32* huff_tbl;
@@ -49,7 +138,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
tmp = bit_pos - 8;
tmp = ((bit_data >> tmp) & 0xFF) << 2;
{
TMCHuffmanEntry dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
r = dcEntry.bitLength;
extra = dcEntry.symbol;
}
@@ -59,68 +148,11 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
work->bitCount = bit_pos;
r = extra;
} else {
s32 dcResult;
u32 code;
unsigned int i;
const TMCHuffmanEntry* entry;
s32 thresh;
s32 offs;
huff_sym = work->pDCHuffSym;
huff_tbl = work->pDCHuffTbl;
if (bit_pos <= 17) {
dcResult = TMCJPEGDEC_load_buff(work);
if (dcResult < 0) {
goto dc_end;
}
}
bit_pos = work->bitCount;
bit_data = work->bitBuf;
bit_pos -= 9;
code = (bit_data >> bit_pos) & 0x1FF;
work->bitCount = bit_pos;
i = 9;
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
goto dc_entry;
while (1) {
i++;
entry++;
if (i > 16) {
dcResult = TMCC_ERROR_OVERFLOW;
goto dc_end;
}
bit_pos = work->bitCount;
code <<= 1;
bit_data = work->bitBuf;
bit_pos--;
work->bitCount = bit_pos;
code |= (bit_data >> bit_pos) & 1;
dc_entry:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
thresh = decoded.bitLength;
offs = entry->symbol;
}
if (code > (u32)thresh) {
continue;
}
code = code - entry->bitLength + offs;
dcResult = huff_sym[code & 0xFF];
break;
}
dc_end:
r = dcResult;
if (dcResult < 0) {
return dcResult;
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
if (r < 0) {
return r;
}
}
@@ -132,8 +164,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
if (load_ret < 0) {
return load_ret;
}
bit_pos = work->bitCount;
}
bit_pos = work->bitCount;
bit_data = work->bitBuf;
tmp = 1 << r;
extra = tmp - 1;
@@ -149,7 +181,6 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
*block = dc_predict_row_ptr[0] * blk0;
{
TMCHuffmanEntry acEntry;
ac_fast = (const TMCHuffmanEntry*)work->pACFast;
huff_tbl = work->pACHuffTbl;
huff_sym = work->pACHuffSym;
@@ -170,7 +201,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
t = bit_pos - 8;
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
while (idx < 64) {
do {
s32 ac_thresh = acEntry.bitLength;
if (ac_thresh != 0) {
bit_pos = work->bitCount;
@@ -178,62 +209,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
work->bitCount = bit_pos;
r = acEntry.symbol;
} else {
u32 code;
unsigned int i;
const TMCHuffmanEntry* entry;
s32 thresh;
s32 offs;
bit_pos = work->bitCount;
if (bit_pos <= 17) {
r = TMCJPEGDEC_load_buff(work);
if (r < 0) {
return r;
}
bit_pos = work->bitCount;
}
bit_data = work->bitBuf;
bit_pos -= 9;
code = (bit_data >> bit_pos) & 0x1FF;
work->bitCount = bit_pos;
i = 9;
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
goto ac_entry_huff;
while (1) {
i++;
entry++;
if (i > 16) {
r = TMCC_ERROR_OVERFLOW;
goto ac_end;
}
bit_pos = work->bitCount;
code <<= 1;
bit_data = work->bitBuf;
bit_pos--;
work->bitCount = bit_pos;
code |= (bit_data >> bit_pos) & 1;
ac_entry_huff:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
thresh = decoded.bitLength;
offs = entry->symbol;
}
if (code > (u32)thresh) {
continue;
}
code = code - entry->bitLength + offs;
r = huff_sym[code & 0xFF];
break;
}
ac_end:
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
if (r < 0) {
return r;
}
@@ -256,8 +233,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
if (r < 0) {
return r;
}
bit_pos = work->bitCount;
}
bit_pos = work->bitCount;
tmp = 1 << t;
bit_data = work->bitBuf;
extra = tmp - 1;
@@ -265,14 +242,14 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
work->bitCount = bit_pos;
t = bit_pos - 8;
extra = extra & (bit_data >> bit_pos);
q = ((s32*)conv_row_ptr)[(u8)zz];
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
if (((s32)tmp >> 1) > extra) {
extra -= tmp - 1;
}
q = ((s32*)conv_row_ptr)[zz];
block[zz] = extra * q;
block[(u8)zz] = extra * q;
idx++;
} else {
@@ -294,7 +271,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
idx += 16;
}
}
} while (idx < 64);
if (idx > 64) {
return TMCC_ERROR_OVERFLOW;

View File

@@ -1,30 +1,28 @@
#include <string.h>
#include <tmc_jpeg_internal.h>
static u8 clampU8(s32 v) {
static s32 clampU8(s32 v) {
s32 ok;
ok = 0;
if (v < 256 && v > -1) {
ok = 1;
}
return ok ? v : 255 & ~(v >> 31);
return ok ? v : (v < 0 ? 0 : 255);
}
static s8 clampS8(s32 v) {
static s32 clampS8(s32 v) {
s32 inRange = 0;
if (v < 128 && v > -129) {
inRange = 1;
}
return inRange ? (s8)v : (v > 0) ? 127 : -128;
return inRange ? v : (v > 0) ? 127 : -128;
}
static s32 scalingClampU8(s32 val) {
s32 result;
if (val >> 19 != 0)
result = ~(val >> 31) & 0xFF;
else
result = (val >> 11);
return result;
static s32 scalingClampU8(s32 value) {
if ((value >> 19) == 0) {
return value >> 11;
}
return value < 0 ? 0 : 255;
}
void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
@@ -33,13 +31,35 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
s32 done;
s32 iter;
s32 i;
s32 b1, b2, b3, b4, b5, b6, b7;
s32 v, e, a, d, n, o, p, q, t, u, w, x, y;
s32 x_factor, z_factor, m_part, p_part;
s32 r, z, m;
s32 e;
s32 b2;
s32 b3;
s32 b4;
s32 b5;
s32 b6;
s32 b7;
s32 v;
s32 m;
s32 a;
s32 d;
s32 z;
s32 o;
s32 p;
s32 p_part;
s32 t;
s32 u;
s32 r;
s32 n;
s32 y;
s32 x_factor;
s32 z_factor;
s32 m_part;
s32 q;
s32 w;
s32 x;
s32 b1;
r = (zigzag >> 4) * 8;
iter = (u32)(r + 7) >> 3;
dst = tmp;
done = 0;
{
@@ -71,28 +91,41 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
dst[1] = val;
dst[0] = val;
} else {
t = (b2 - b6) * 0xB5 >> 8;
a = block[0] - b4;
d = block[0] + b4;
u = t + (b6 + b2);
v = a + t;
e = a - t;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
y = d - u;
z_factor = (b5 - b3) + (b1 - b7);
m_part = (b1 - b7) * 0x14E >> 8;
p_part = (b5 - b3) * 0x8B >> 8;
s32 oddLowSum;
s32 oddHighSum;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
b5 = b5 - b3;
oddHighSum = b1 + b7;
b1 = b1 - b7;
u = b6 + b2;
t = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = b5 + b1;
dcValue = block[0];
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
d = dcValue + b4;
u = t + u;
v = a + t;
z = z_factor * 0x62 >> 8;
w = d + u;
y = d - u;
m_part = b1 * 0x14E >> 8;
e = a - t;
m = m_part - z;
n = (b1 + b7) + ((b5 + b3) + m);
oddLowSum += m;
n = oddHighSum + oddLowSum;
o = x + m;
p = z + p_part;
q = x + p;
dst[0] = w + n;
p_part = b5 * 0x8B;
dst[7] = w - n;
p_part >>= 8;
dst[1] = v + o;
p = z + p_part;
q = p + x;
dst[6] = v - o;
dst[2] = e + q;
dst[5] = e - q;
@@ -145,25 +178,37 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
out[pitch] = val;
out[0] = val;
} else {
t = (b2 - b6) * 0xB5 >> 8;
a = (*dst + 0x40000) - b4;
d = (*dst + 0x40000) + b4;
u = t + (b6 + b2);
v = a + t;
e = a - t;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
s32 oddLowSum;
s32 oddHighSum;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
b5 = b5 - b3;
oddHighSum = b1 + b7;
b1 = b1 - b7;
u = b6 + b2;
b2 = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = b5 + b1;
dcValue = *dst + 0x40000;
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
d = dcValue + b4;
u = b2 + u;
v = a + b2;
z_factor = z_factor * 0x62 >> 8;
w = d + u;
y = d - u;
z_factor = ((b5 - b3) + (b1 - b7)) * 0x62 >> 8;
m_part = ((b1 - b7) * 0x14E >> 8) - z_factor;
n = (b1 + b7) + ((b5 + b3) + m_part);
m_part = b1 * 0x14E >> 8;
e = a - b2;
m_part = m_part - z_factor;
oddLowSum += m_part;
n = oddHighSum + oddLowSum;
o = x + m_part;
p = ((b5 - b3) * 0x8B >> 8) + z_factor;
q = x + p;
p_part = b5 * 0x8B >> 8;
p = z_factor + p_part;
q = p + x;
out[0] = scalingClampU8(w + n);
out[r] = scalingClampU8(w - n);
out[pitch] = scalingClampU8(v + o);
@@ -182,11 +227,34 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
s32* dst;
s32 done;
s32 iter;
s32 i;
s32 b1, b2, b3, b4, b5, b6, b7;
s32 v, e, a, d, m, n, o, p, q, t, u, w, x, y, z;
s32 x_factor, z_factor, m_part, p_part;
s32 d;
s32 b1;
s32 b2;
s32 b3;
s32 b4;
s32 b5;
s32 b6;
s32 b7;
s32 v;
s32 r;
s32 a;
s32 i;
s32 m;
s32 n;
s32 o;
s32 x;
s32 q;
s32 y;
s32 u;
s32 w;
s32 p;
s32 t;
s32 z;
s32 x_factor;
s32 z_factor;
s32 m_part;
s32 p_part;
s32 e;
if (zigzag == 0x11) {
s32 val;
@@ -200,90 +268,42 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
goto mode_gt_2;
}
{
s32 inner;
dst = tmp;
done = 0;
for (; done < r; done += 8) {
s32 dcValue;
s32 oddCoefficient;
dst = tmp;
done = 0;
iter = (r + 7) >> 3;
if (r > 0) {
inner = (r + 7) >> 4;
done = iter << 3;
if (inner != 0) {
for (; inner > 0; inner--) {
t = block[1] * 0xB5 >> 8;
v = block[1] * 0x62 >> 8;
u = v + t;
z = (block[1] * 0x14E >> 8) - v;
m = block[1] + z;
n = t + z;
b1 = block[0] + m;
dst[0] = b1;
dst[7] = block[0] - m;
dst[1] = block[0] + n;
dst[6] = block[0] - n;
dst[2] = block[0] + u;
dst[5] = block[0] - u;
dst[3] = block[0] + v;
dst[4] = block[0] - v;
t = block[9] * 0xB5 >> 8;
v = block[9] * 0x62 >> 8;
u = v + t;
z = (block[9] * 0x14E >> 8) - v;
m = block[9] + z;
n = t + z;
b2 = block[8] + m;
dst[8] = b2;
dst[15] = block[8] - m;
dst[9] = block[8] + n;
dst[14] = block[8] - n;
dst[10] = block[8] + u;
dst[13] = block[8] - u;
dst[11] = block[8] + v;
dst[12] = block[8] - v;
dst += 0x10;
block += 0x10;
}
iter = iter & 1;
if (iter == 0) {
goto zero_fill;
}
}
for (; iter > 0; iter--) {
t = block[1] * 0xB5 >> 8;
v = block[1] * 0x62 >> 8;
u = v + t;
z = (block[1] * 0x14E >> 8) - v;
m = block[1] + z;
n = t + z;
b1 = block[0] + m;
dst[0] = b1;
dst[7] = block[0] - m;
dst[1] = block[0] + n;
dst[6] = block[0] - n;
dst[2] = block[0] + u;
dst[5] = block[0] - u;
dst[3] = block[0] + v;
dst[4] = block[0] - v;
dst += 8;
block += 8;
}
}
zero_fill:
dst = tmp + done;
for (; done <= 0x38; done += 8) {
memset(dst, 0, 0x20);
dst += 8;
}
oddCoefficient = block[1];
dcValue = block[0];
t = oddCoefficient * 0xB5 >> 8;
v = oddCoefficient * 0x62 >> 8;
u = v + t;
z = (oddCoefficient * 0x14E >> 8) - v;
m = oddCoefficient + z;
n = t + z;
dst[0] = dcValue + m;
dst[7] = dcValue - m;
dst[1] = dcValue + n;
dst[6] = dcValue - n;
dst[2] = dcValue + u;
dst[5] = dcValue - u;
dst[3] = dcValue + v;
dst[4] = dcValue - v;
dst += 8;
block += 8;
}
dst = tmp + done;
for (; done <= 0x38; done += 8) {
memset(dst, 0, 0x20);
dst += 8;
}
goto epilogue;
mode_gt_2:
dst = tmp;
done = 0;
if (r > 0) {
for (iter = (r + 7) >> 3; iter > 0; iter--) {
for (; done < r; done += 8) {
u32 ac;
b4 = block[4];
b6 = block[6];
@@ -312,28 +332,43 @@ mode_gt_2:
dst[1] = val;
dst[0] = val;
} else {
t = (b2 - b6) * 0xB5 >> 8;
a = block[0] - b4;
d = block[0] + b4;
u = t + (b6 + b2);
v = a + t;
e = a - t;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
y = d - u;
z_factor = (b5 - b3) + (b1 - b7);
m_part = (b1 - b7) * 0x14E >> 8;
p_part = (b5 - b3) * 0x8B >> 8;
s32 oddLowSum;
s32 oddLowDifference;
s32 oddHighSum;
s32 oddHighDifference;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
oddLowDifference = b5 - b3;
oddHighSum = b1 + b7;
oddHighDifference = b1 - b7;
u = b6 + b2;
t = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = oddLowDifference + oddHighDifference;
dcValue = block[0];
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
d = dcValue + b4;
u = t + u;
v = a + t;
z = z_factor * 0x62 >> 8;
w = d + u;
y = d - u;
m_part = oddHighDifference * 0x14E >> 8;
e = a - t;
m = m_part - z;
n = (b1 + b7) + ((b5 + b3) + m);
oddLowSum += m;
n = oddHighSum + oddLowSum;
o = x + m;
dst[0] = w + n;
p_part = oddLowDifference * 0x8B;
dst[7] = w - n;
p_part >>= 8;
dst[1] = v + o;
p = z + p_part;
q = p + x;
dst[0] = w + n;
dst[7] = w - n;
dst[1] = v + o;
dst[6] = v - o;
dst[2] = e + q;
dst[5] = e - q;
@@ -342,8 +377,6 @@ mode_gt_2:
}
block += 8;
dst += 8;
done += 8;
}
}
dst = tmp + done;
@@ -357,7 +390,9 @@ epilogue:
dst = tmp + 7;
for (iter = 8, i = 7; iter > 0; iter--, i--) {
u32 ac;
u8* output;
b4 = dst[0x20];
output = conv_row_ptr + i;
b6 = dst[0x30];
b2 = dst[0x10];
b1 = dst[8];
@@ -375,42 +410,56 @@ epilogue:
if (ac == 0) {
s32 val;
val = clampS8(*dst >> 11);
conv_row_ptr[i + 56] = (u8)val;
conv_row_ptr[i + 48] = (u8)val;
conv_row_ptr[i + 40] = (u8)val;
conv_row_ptr[i + 32] = (u8)val;
conv_row_ptr[i + 24] = (u8)val;
conv_row_ptr[i + 16] = (u8)val;
conv_row_ptr[i + 8] = (u8)val;
conv_row_ptr[i] = (u8)val;
output[56] = (u8)val;
output[48] = (u8)val;
output[40] = (u8)val;
output[32] = (u8)val;
output[24] = (u8)val;
output[16] = (u8)val;
output[8] = (u8)val;
output[0] = (u8)val;
} else {
t = (b2 - b6) * 0xB5 >> 8;
a = *dst - b4;
d = *dst + b4;
u = t + (b6 + b2);
v = a + t;
e = a - t;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
s32 oddLowSum;
s32 oddLowDifference;
s32 oddHighSum;
s32 oddHighDifference;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
oddLowDifference = b5 - b3;
oddHighSum = b1 + b7;
oddHighDifference = b1 - b7;
u = b6 + b2;
t = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = oddLowDifference + oddHighDifference;
dcValue = *dst;
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
y = d - u;
z_factor = (b5 - b3) + (b1 - b7);
d = dcValue + b4;
u = t + u;
v = a + t;
z = z_factor * 0x62 >> 8;
m = ((b1 - b7) * 0x14E >> 8) - z;
n = (b1 + b7) + ((b5 + b3) + m);
w = d + u;
y = d - u;
m_part = oddHighDifference * 0x14E >> 8;
e = a - t;
m = m_part - z;
oddLowSum += m;
n = oddHighSum + oddLowSum;
o = x + m;
p = z + ((b5 - b3) * 0x8B >> 8);
p_part = oddLowDifference * 0x8B >> 8;
p = z + p_part;
q = p + x;
conv_row_ptr[i] = (u8)clampS8((w + n) >> 11);
conv_row_ptr[i + 56] = (u8)clampS8((w - n) >> 11);
conv_row_ptr[i + 8] = (u8)clampS8((v + o) >> 11);
conv_row_ptr[i + 48] = (u8)clampS8((v - o) >> 11);
conv_row_ptr[i + 16] = (u8)clampS8((e + q) >> 11);
conv_row_ptr[i + 40] = (u8)clampS8((e - q) >> 11);
conv_row_ptr[i + 24] = (u8)clampS8((y + p) >> 11);
conv_row_ptr[i + 32] = (u8)clampS8((y - p) >> 11);
output[0] = (u8)clampS8((w + n) >> 11);
output[56] = (u8)clampS8((w - n) >> 11);
output[8] = (u8)clampS8((v + o) >> 11);
output[48] = (u8)clampS8((v - o) >> 11);
output[16] = (u8)clampS8((e + q) >> 11);
output[40] = (u8)clampS8((e - q) >> 11);
output[24] = (u8)clampS8((y + p) >> 11);
output[32] = (u8)clampS8((y - p) >> 11);
}
dst--;
}

View File

@@ -244,6 +244,11 @@ _error:
static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData* pInfo) {
u16 byteOrder;
u32 ifdOffset;
const u8* entries;
u16 remaining;
u16 count;
s32 entriesSize;
u16 index;
pInfo->thumbnailData = (u8*)data;
pInfo->dataEnd = (u8*)data + size;
pInfo->nextIfdOffset = 0;
@@ -262,11 +267,8 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
return -161;
}
{
const u8* entries = data + ifdOffset;
u16 remaining = size - (u16)ifdOffset;
u16 count;
s32 entriesSize;
u16 index;
entries = data + ifdOffset;
remaining = size - (u16)ifdOffset;
if (remaining < 2) {
return -161;
}
@@ -294,11 +296,8 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
return -161;
}
{
const u8* entries = data + ifdOffset;
u16 remaining = size - (u16)ifdOffset;
u16 count;
s32 entriesSize;
u16 index;
entries = data + ifdOffset;
remaining = size - (u16)ifdOffset;
if (remaining < 2) {
return -161;
}
@@ -319,11 +318,8 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
return -161;
}
{
const u8* entries = data + ifdOffset;
u16 remaining = size - (u16)ifdOffset;
u16 count;
s32 entriesSize;
u16 index;
entries = data + ifdOffset;
remaining = size - (u16)ifdOffset;
if (remaining < 2) {
return -161;
}
@@ -354,7 +350,7 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
case 0x0111:
case 0x0201:
case 0x0202: {
return;
break;
}
case 0x0112: {
pInfo->orientation = readU16(entry + 8, byteOrder);
@@ -474,21 +470,19 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
return;
}
case 0xA002: {
u32 offset = readU32(entry + 8, byteOrder);
if (type == 4) {
pInfo->pixelXDim = offset;
} else if (type == 3) {
if (type == 3) {
pInfo->pixelXDim = readU16(entry + 8, byteOrder);
} else if (type == 4) {
pInfo->pixelXDim = readU32(entry + 8, byteOrder);
}
return;
}
case 0xA003: {
u32 offset = readU32(entry + 8, byteOrder);
if (type == 4) {
pInfo->pixelYDim = offset;
} else if (type == 3) {
if (type == 3) {
pInfo->pixelYDim = readU16(entry + 8, byteOrder);
} else if (type == 4) {
pInfo->pixelYDim = readU32(entry + 8, byteOrder);
}
return;
}
@@ -508,7 +502,7 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
case 0x9000:
case 0x9101:
case 0xA003: {
return;
break;
}
case 0x011A: {
u32 offset;

View File

@@ -1411,131 +1411,22 @@ static s32 TMCJPEGDEC_parse_dht(s32 first, TMCCJPEGDecWork* work) {
}
#endif
#ifdef __MWERKS__
static asm s32 TMCJPEGDEC_parse_dqt(register TMCCJPEGDecWork* work) {
nofralloc
stwu r1, -0x130(r1)
mflr r0
lis r4, lbl_8161E080@ha
stw r0, 0x134(r1)
addi r4, r4, lbl_8161E080@l
li r0, 0x20
addi r6, r1, 0xc
stmw r24, 0x110(r1)
mr r30, r3
addi r5, r4, -4
mtctr r0
_parse_dqt_copy:
lwz r4, 4(r5)
lwzu r0, 8(r5)
stw r4, 4(r6)
stwu r0, 8(r6)
bdnz _parse_dqt_copy
addi r31, r3, 0x58
mr r4, r30
addi r3, r1, 0xa
bl TMCJPEGDEC_get_wbyte
cmpwi r3, 0
bge _parse_dqt_have_length
b _parse_dqt_return
_parse_dqt_have_length:
lhz r3, 0xa(r1)
addi r29, r1, 0x10
li r27, 1
lis r28, TMCJPEGDEC_Zigzag_data@ha
addi r0, r3, -2
sth r0, 0xa(r1)
_parse_dqt_table:
lhz r5, 0xa(r1)
mr r4, r30
addi r3, r1, 9
addi r0, r5, -0x41
sth r0, 0xa(r1)
bl TMCJPEGDEC_get_byte
cmpwi r3, 0
bge _parse_dqt_have_qt_info
b _parse_dqt_return
_parse_dqt_have_qt_info:
lbz r0, 9(r1)
cmplwi r0, 4
ble _parse_dqt_valid_qt_info
li r3, -0x41
b _parse_dqt_return
_parse_dqt_valid_qt_info:
add r3, r31, r0
addi r26, r28, TMCJPEGDEC_Zigzag_data@l
stb r27, 0x1790(r3)
li r25, 0
_parse_dqt_coeff:
lbz r24, 0(r26)
cmpwi r24, 0x3f
ble _parse_dqt_valid_coeff
li r3, -0x41
b _parse_dqt_return
_parse_dqt_valid_coeff:
mr r4, r30
addi r3, r1, 8
bl TMCJPEGDEC_get_byte
cmpwi r3, 0
bge _parse_dqt_have_coeff
b _parse_dqt_return
_parse_dqt_have_coeff:
slwi r4, r24, 2
lbz r3, 9(r1)
add r0, r4, r31
lbz r5, 8(r1)
lwzx r4, r29, r4
slwi r3, r3, 8
mullw. r4, r5, r4
stwx r4, r3, r0
bne _parse_dqt_nonzero
li r3, -0x41
b _parse_dqt_return
_parse_dqt_nonzero:
addi r25, r25, 1
addi r26, r26, 1
cmpwi r25, 0x40
blt _parse_dqt_coeff
lhz r0, 0xa(r1)
cmpwi r0, 0
bne _parse_dqt_table
li r3, 0
_parse_dqt_return:
lmw r24, 0x110(r1)
lwz r0, 0x134(r1)
mtlr r0
addi r1, r1, 0x130
blr
}
#else
static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
typedef struct {
u32 data[64];
} CopyBlock64;
u8* scaleInfo;
u32 tblCopy[65];
u32* tblPtr;
typedef struct { u32 coefficients[4][64]; } QuantizationTables;
QuantizationTables* scaleInfo;
u32 tblCopy[64];
u32* d;
u16 len;
s32 r;
d = tblCopy;
*(CopyBlock64*)(d + 1) = *(CopyBlock64*)lbl_8161E080;
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
scaleInfo = (u8*)work + 0x58;
scaleInfo = (QuantizationTables*)&work->scaleFlag;
r = TMCJPEGDEC_get_wbyte(&len, work);
if (r < 0) {
@@ -1543,8 +1434,6 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
}
len -= 2;
tblPtr = &tblCopy[1];
do {
u8 qtInfo;
const u8* zigPtr;
@@ -1563,11 +1452,10 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
return -0x41;
}
scaleInfo[qtInfo + 0x1790] = 1; // quantTblFlag[0..3]
((TMCUnknownInfo*)scaleInfo)->quantTblFlag[qtInfo] = 1;
zigPtr = TMCJPEGDEC_Zigzag_data;
for (zzIdx = 0; zzIdx < 64; zzIdx++) {
u32 tmp;
zz = *zigPtr;
if (zz > 0x3F) {
@@ -1579,9 +1467,8 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
return r;
}
tmp = (zz << 2) + ((u32)qtInfo << 8);
val = (u32)byte * tblPtr[zz];
*(u32*)(tmp + scaleInfo) = val;
val = (u32)byte * tblCopy[zz];
scaleInfo->coefficients[qtInfo][zz] = val;
if (val == 0) {
return -0x41;
}
@@ -1592,7 +1479,6 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
return 0;
}
#endif
#ifdef __MWERKS__
static asm s32 TMCJPEGDEC_parse_sof(register TMCCJPEGDecWork* work) {

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

@@ -67,12 +67,11 @@ ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
return mapped[character - defaults->first];
}
ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
ziU16 index, count, first, last, value;
ziU16 index, count, value, first, last;
ziU8* cursor;
ziConversionTable* table;
const ziConversionRangeTable* defaults;
ziConversionRange* ranges;
ziConversionEntry* entry;
ziU8* cursor;
if (character == 0) {
Zi8LogError(0x133, __zi8_work_data);
return 0;
@@ -83,94 +82,109 @@ ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
Zi8LogError(0x6AE, __zi8_work_data);
return 0;
}
entry = table->entries;
count = (ziU16)table->count[0] << 8 | table->count[1];
entry = (ziConversionEntry*)table;
count = (ziU16)entry->first[0] << 8 | entry->first[1];
entry++;
for (index = 0; index < count; index++) {
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
first = (ziU16)entry->first[0] << 8 | entry->first[1];
last = (ziU16)entry->last[0] << 8 | entry->last[1];
if (first <= character && character <= last) {
value = ((ziU16)entry->value[0] << 8 | entry->value[1]);
if (first == last) {
Zi8LogError(100, __zi8_work_data);
return value & 0xFF;
}
Zi8LogError(100, __zi8_work_data);
return ((ziU8*)table->entries)[character + value - first];
if (character < first || character > last) {
entry++;
continue;
}
entry++;
value = (ziU16)entry->value[0] << 8 | entry->value[1];
if (first == last) {
Zi8LogError(100, __zi8_work_data);
return value & 0xFF;
}
entry = (ziConversionEntry*)((ziU8*)table + value + character - first + 8);
Zi8LogError(100, __zi8_work_data);
return *(ziU8*)entry;
}
Zi8LogError(0x6C2, __zi8_work_data);
return 0;
} else {
defaults = &Zi8CvrtTables.reverse;
if (defaults == 0) {
ranges = Zi8CvrtTables.reverse.entries;
if (ranges == 0) {
Zi8LogError(0x6AE, __zi8_work_data);
return 0;
}
ranges = defaults->entries;
for (index = 0; index < defaults->count; index++) {
if (ranges[index].first <= character && character <= ranges[index].last) {
count = Zi8CvrtTables.reverse.count;
for (index = 0; index < count; index++) {
if (character >= ranges[index].first && character <= ranges[index].last) {
Zi8LogError(100, __zi8_work_data);
if (ranges[index].first == ranges[index].last) return ranges[index].result.character & 0xFF;
return ((ziU8*)ranges[index].result.table)[character - ranges[index].first];
if (ranges[index].first == ranges[index].last)
return ranges[index].result.character & 0xFF;
cursor = ranges[index].result.table;
return cursor[character - ranges[index].first];
}
}
Zi8LogError(0x6C2, __zi8_work_data);
return 0;
}
Zi8LogError(0x6C2, __zi8_work_data);
return 0;
}
ziWChar Zi8ConvertUC2Key(ziChar character, ziU8 language ZI_NEED_WORK) {
ziU16 count, index, first, last;
ziU32 key = 0;
ziU16 key = 0;
ziU16 index, count, first, last;
ziConversionTable* table;
const ziConversionRangeTable* defaults;
ziWChar* mapped;
ziConversionRange* ranges;
ziConversionEntry* entry;
ziU8* cursor;
if (character == 0) {
Zi8LogError(0x133, __zi8_work_data);
return 0;
}
if (ZI_WORK->userKeys[language] != 0) return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
if (ZI_WORK->userKeys[language] != 0)
return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
if (Zi8GetTableCount(language, 8, __zi8_work_data) != 0) {
table = Zi8GetTableAddress(language, 8, __zi8_work_data);
if (table == 0) {
Zi8LogError(0x6B8, __zi8_work_data);
return 0;
}
entry = table->entries;
count = (ziU16)table->count[0] << 8 | table->count[1];
entry = (ziConversionEntry*)table;
count = (ziU16)entry->first[0] << 8 | entry->first[1];
entry++;
for (index = 0; index < count; index++) {
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
first = (ziU16)entry->first[0] << 8 | entry->first[1];
last = (ziU16)entry->last[0] << 8 | entry->last[1];
if (first <= character && character <= last) {
key = ((ziU16)entry->value[0] << 8 | entry->value[1]);
if (first != last) {
cursor = (ziU8*)table->entries + key + (character - first) * 2;
key = (ziU16)cursor[0] << 8 | cursor[1];
}
break;
if (character < first || character > last) {
entry++;
continue;
}
entry++;
key = (ziU16)entry->value[0] << 8 | entry->value[1];
if (first == last) break;
entry = (ziConversionEntry*)((ziU8*)table + key + (character - first) * 2);
entry = (ziConversionEntry*)((ziU8*)entry + 8);
key = (ziU16)entry->first[0] << 8 | entry->first[1];
break;
}
} else {
defaults = &Zi8CvrtTables.keys;
if (defaults == 0) {
ranges = Zi8CvrtTables.keys.entries;
if (ranges == 0) {
Zi8LogError(0x6B8, __zi8_work_data);
return 0;
}
ranges = defaults->entries;
for (index = 0; index < defaults->count; index++) {
if (ranges[index].first <= character && character <= ranges[index].last) {
if (ranges[index].first == ranges[index].last) key = ranges[index].result.character & 0xFF;
else key = ((ziWChar*)ranges[index].result.table)[character - ranges[index].first];
count = Zi8CvrtTables.keys.count;
for (index = 0; index < count; index++) {
if (character >= ranges[index].first && character <= ranges[index].last) {
if (ranges[index].first == ranges[index].last) {
key = (ziU8)ranges[index].result.character;
break;
}
mapped = ranges[index].result.table;
key = mapped[character - ranges[index].first];
break;
}
}
}
if (key == 0) {
Zi8LogError(0x6C2, __zi8_work_data);
key = 0xEFF1;
} else Zi8LogError(100, __zi8_work_data);
return key;
return 0xEFF1;
} else {
Zi8LogError(100, __zi8_work_data);
return key;
}
}
ziWChar Zi8ConvertWC2Key(ziWChar character, ziU8 language ZI_NEED_WORK) {
return Zi8ConvertUC2Key(Zi8ConvertWC2UC(character, language, __zi8_work_data), language, __zi8_work_data);

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];
@@ -311,7 +311,7 @@ Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
return length;
}
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,Zi8UInt tone)
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,ziU8 tone)
{
ziU16 spelling[16];
Zi8UInt spellingLength;
@@ -330,7 +330,7 @@ ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFul
if ((requireFull != 0) && ((inputLength & 0xff) != (spellingLength & 0xff))) {
return 0;
}
if (((tone & 0xff) == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
if ((tone == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
switch (input[(inputLength & 0xff) - 1]) {
case 0xeff1:
case 0xeff2:
@@ -943,8 +943,7 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
*output |= 0xf300;
output++;
} else {
*output = 0xf360;
output++;
*output++ = 0xf360;
}
}
tableIndex++;

View File

@@ -305,7 +305,7 @@ ziU8 Zi8LangSupported(ziU8 language, ziPtr work);
ziU8 Zi8MatchOEMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
ziU8 Zi8MatchPUDdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
ziU8 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziBool reservedMode, ziBool exactLength, ziPtr work);
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU8 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
void Zi8Memset(ziPtr destination, ziU32 value, ziU32 count);
ziU16 Zi8WCharCount(ziWChar* word, ziPtr work);
ziBool Zi8ZHCheckSpelling(ziWChar* word, ziWChar* elements, ziU8 count, ziPtr work);
@@ -414,7 +414,12 @@ int Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr optionData, ziPtr workDa
phoneticInput = ZI8_TRUE;
for (elementIndex = 0; elementIndex < elementCount; elementIndex++) {
normalizedElements[elementIndex] = elements[elementIndex];
if ((int)elements[elementIndex] < 0xf336 && (int)elements[elementIndex] >= 0xf331) {
switch ((int)elements[elementIndex]) {
case 0xf331:
case 0xf332:
case 0xf333:
case 0xf334:
case 0xf335:
phoneticSeparator = ZI8_TRUE;
phoneticInput = ZI8_FALSE;
if ((language == 0x7d) || ((language == 0x79 || (language == 0x7a)))) {
@@ -887,7 +892,7 @@ selectDictionary:
if ((((matchMode == 0) && (currentVowelRestriction)) &&
((2 < (int)elementCount &&
((((ZiAlphaWork*)workData)->language == language &&
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
(((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
(elements[elementCount - 1] == 0xeff1)) {
wordLength = 0;
}
@@ -942,15 +947,15 @@ selectDictionary:
}
if (wordLength != 0) goto filterVowelCandidate;
dictionaryStatus[dictionaryKind] = 1;
if (elements[apostropheIndex] < 0xEFF1) goto finishDictionaryPass;
goto retryDictionary;
if (elements[apostropheIndex] >= 0xEFF1) goto retryDictionary;
goto finishDictionaryPass;
}
filterVowelCandidate:
if ((wordLength != 0) && (prefixVowelRestriction)) {
if ((*wordCursor >= 0x30) && (*wordCursor <= 0x39)) {
wordLength = 0;
} else {
if (((elementCount == 1) && (dictionaryKind != 10)) && (0xeff0 < *wordCursor)) {
if (((elementCount == 1) && (dictionaryKind != 10)) && (*wordCursor >= 0xeff1)) {
punctuationCandidate = ZI8_TRUE;
goto finishDictionaryPass;
}
@@ -1017,67 +1022,59 @@ filterVowelCandidate:
}
break;
case 10:
index = *punctuationCursor;
*wordCursor = index;
if (index == 0) {
if ((*wordCursor = *punctuationCursor) != 0) {
punctuationCursor++;
wordLength = 1;
} else {
wordLength = 0;
}
else {
punctuationCursor = punctuationCursor + 1;
wordLength = 1;
break;
case 11:
if (prefixCount != 0) break;
if (retryPunctuation) {
for (index = 0; index < parameters->elementCount - 1; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
if (wordCursor[index] == 0) break;
}
if (index < parameters->elementCount - 1) {
wordLength = 0;
break;
}
} else {
for (index = 0; index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
if (wordCursor[index] == 0) break;
}
if (index < ((ZiAlphaWork*)workData)->rememberedCount) {
wordLength = 0;
break;
}
}
if ((wordCursor[index++] = *punctuationCursor) != 0) {
punctuationCursor++;
wordLength = index;
} else {
wordLength = 0;
}
break;
case 0xb:
if (prefixCount == 0) {
if (retryPunctuation) {
for (index = 0;
index < parameters->elementCount - 1; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
if (wordCursor[index] == 0) break;
}
if (index < (int)(parameters->elementCount - 1)) {
wordLength = 0;
}
else {
appendPunctuation:
wordLength = index + 1;
wordCursor[index] = *punctuationCursor;
if (wordCursor[index] == 0) {
wordLength = 0;
}
else {
punctuationCursor = punctuationCursor + 1;
}
}
}
else {
for (index = 0;
index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
if (wordCursor[index] == 0) break;
}
if ((int)(unsigned int)((ZiAlphaWork*)workData)->rememberedCount <= index) goto appendPunctuation;
wordLength = 0;
}
}
}
dictionaryStatus[dictionaryKind] = 1;
if (wordLength == 0) {
dictionaryStatus[dictionaryKind] = 2;
if ((((((((ZiAlphaWork*)workData)->prefixEnabled != '\0') && (!retryPunctuation)) && (parameters->elementCount != 0)) &&
(((int)(parameters->elementCount - 1) <= (int)(unsigned int)((ZiAlphaWork*)workData)->requiredLength &&
((((ZiAlphaWork*)workData)->requiredLength >= parameters->elementCount - 1 &&
(parameters->elements[parameters->elementCount - 1] == 0xEFF1)))) &&
(((((ZiAlphaWork*)workData)->prefixEnabled != '\x01' ||
(((ZiAlphaWork*)workData)->requiredLength != parameters->elementCount)) &&
(((((ZiAlphaWork*)workData)->prefixLength == '\0' ||
((unsigned int)parameters->elementCount <= ((ZiAlphaWork*)workData)->prefixLength + 1)) && (dictionaryExact != 0)))
(((ZiAlphaWork*)workData)->prefixLength + 1 >= parameters->elementCount)) && (dictionaryExact != 0)))
))) && ((((completionAllowed && (prefixCount == 0)) && (dictionaryKind != 0xb)) &&
((((int)dictionaryIndex < (int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount &&
(((ZiAlphaOptions*)optionData)->lookupMode == '\0')) &&
(((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;
}
@@ -1089,10 +1086,10 @@ appendPunctuation:
}
if ((((((dictionaryExact == 0) || (!completionAllowed)) || (prefixCount != 0)) ||
((dictionaryKind == 0xb ||
((int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount <= (int)dictionaryIndex)))) ||
(elements == (ziU16 *)0x0)) ||
(dictionaryIndex >= ((ZiAlphaWork*)workData)->dictionaryCount)))) ||
(elements == 0)) ||
((((elementCount == 0 || (elements[elementCount - 1] != 0xeff1)) ||
(((unsigned int)((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
((((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
(((((ZiAlphaWork*)workData)->rememberedWord[0] == 0 || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
(((ZiAlphaWork*)workData)->dictionaries[language] != 0)))))) ||
(languagePassCount == 2)))) break;
@@ -1104,7 +1101,7 @@ appendPunctuation:
punctuationCursor = &punctuationBuffer[0];
dictionaryKind = 0xb;
}
else if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->minWordLength <= (int)wordLength) {
else if (((ZiAlphaOptions*)optionData)->minWordLength <= wordLength) {
if (prefixVowelRestriction) {
if (*wordCursor >= 0x30 && *wordCursor <= 0x39) goto retryDictionary;
if (language == 0x2f) {
@@ -1119,15 +1116,15 @@ appendPunctuation:
{
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))) &&
@@ -1139,35 +1136,39 @@ prepareCandidate:
((Zi8ZHCheckSpelling(wordCursor,parameters->elements,parameters->elementCount,
workData)) != '\0')) {
if ((((ZiAlphaWork*)workData)->caseMode != '\0') && ((!phoneticInput && (!phoneticSeparator)))) {
Zi8ChangeWordCase(wordCursor + -prefixCount,language,workData);
Zi8ChangeWordCase(wordCursor - prefixCount,language,workData);
}
if ((((ZiAlphaOptions*)optionData)->suffixOnly != '\0') &&
((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
wordLength = (ziU8)((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
wordLength = ((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
wordCursor[wordLength] = 0;
}
if (((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
((Zi8IsDupWordW(wordCursor + -prefixCount,wordLength + prefixCount & 0xff,
if (((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
((Zi8IsDupWordW(wordCursor - prefixCount,wordLength + prefixCount & 0xff,
workData)) != '\0')) {
if ((prefixCount != 0) && ((ziU8)((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
if ((prefixCount != 0) && (((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
}
else {
if ((((keyLayoutCount == 0) || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
((int)(wordLength + prefixCount) < 2)) ||
((int)(wordLength + prefixCount) <= 1)) ||
(0x40 < (int)(wordLength + prefixCount))) goto emitCandidate;
if (dictionaryKind == 5) {
switch (dictionaryKind) {
case 5:
case 1:
case 9:
checkKeyLayout:
keyLayoutCursor = keyLayout;
candidateCharacterCount = wordLength + prefixCount;
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
if (candidateCharacterCount <= *keyLayoutCursor) {
if (candidateCharacterCount < *keyLayoutCursor++) {
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,32 +1176,31 @@ 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;
goto retryDictionary;
}
keyLayoutCursor += candidateCharacterCount;
if (candidateCharacterCount < *keyLayoutCursor++) break;
if (*keyLayoutCursor++ > candidateCharacterCount) break;
}
}
break;
default:
break;
}
else if (dictionaryKind < 5) {
if (dictionaryKind == 1) goto checkKeyLayout;
}
else if (dictionaryKind == 9) goto checkKeyLayout;
emitCandidate:
if (firstCandidate == 0) {
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
if ((int)(wordLength + prefixCount) < (int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->shortestWord) {
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
}
if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
((ZiAlphaOptions*)optionData)->longestWord = wordLength + prefixCount;
}
}
@@ -1224,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];
@@ -1251,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)))) ||
@@ -1313,7 +1314,7 @@ emitCandidate:
}
else {
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
wordCursor = wordCursor + -prefixCount;
wordCursor = wordCursor - prefixCount;
wordCapacity = wordCapacity + prefixCount;
wordLength += prefixCount;
for (index = 0; parameters->elementCount + index < wordLength; index++) {
@@ -1435,7 +1436,7 @@ finishDictionaryPass:;
if ((completionAllowed) &&
((((((ZiAlphaWork*)workData)->suffixMode == '\0' && (2 < (int)elementCount)) &&
(elements[elementCount - 2] == 0xeff1)) &&
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
((int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
((ZiAlphaWork*)workData)->prefixElementCount = ((ZiAlphaWork*)workData)->prefixCount + '\x01';
((ZiAlphaWork*)workData)->suffixMode = 1;
}
@@ -1443,19 +1444,58 @@ finishDictionaryPass:;
prefixPrepared = ZI8_TRUE;
goto preparePrefix;
}
if ((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
if (!((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
((((ZiAlphaWork*)workData)->suffixLocked == '\0' && (2 < (int)elementCount)))) &&
(((elements[elementCount - 2] == 0xeff1 &&
((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
(((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0')))))) {
((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
(((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0'))))))) {
tryAlternatePrefix:
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
if (language == parameters->language) {
if (primaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
else if (secondaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
wordCursor -= prefixCount;
elements -= prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
prefixPrepared = ZI8_FALSE;
((ZiAlphaWork*)workData)->suffixMode = 0;
((ZiAlphaWork*)workData)->suffixLocked = 0;
((ZiAlphaWork*)workData)->suffixCount = 0;
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
((ZiAlphaWork*)workData)->prefix[index] =
((ZiAlphaWork*)workData)->alternatePrefix[index];
}
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
if (((ZiAlphaWork*)workData)->language == parameters->language) {
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
}
else {
((ZiAlphaWork*)workData)->language = parameters->language;
}
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
goto finishCandidates;
if (completionAllowed) goto checkPrefixPunctuation;
} else {
if ((((ZiAlphaWork*)workData)->prefixEnabled == '\0') || (elements[elementCount - 1] != 0xeff1)) {
if ((!primaryMatched) && (!secondaryMatched)) {
((ZiAlphaWork*)workData)->suffixLocked = 1;
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount - 1;
if (prefixCount != 0) {
wordCursor = wordCursor + -prefixCount;
elements = elements + -prefixCount;
wordCursor -= prefixCount;
elements -= prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
@@ -1480,8 +1520,8 @@ checkPrefixPunctuation:
((((Zi8GetTableCount(language,0x1f,workData)) & 8) == 0 &&
(parameters->elements[parameters->elementCount - 1] != 0xEFF1)))))) {
if (prefixPrepared) {
wordCursor = wordCursor + -prefixCount;
elements = elements + -prefixCount;
wordCursor -= prefixCount;
elements -= prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
@@ -1489,7 +1529,7 @@ checkPrefixPunctuation:
if (((ZiAlphaWork*)workData)->suffixLocked != '\0') {
((ZiAlphaWork*)workData)->previousSuffixCount = ((ZiAlphaWork*)workData)->suffixElementCount;
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount;
elementIndex = (unsigned int)((ZiAlphaWork*)workData)->prefixCount + (unsigned int)((ZiAlphaWork*)workData)->suffixCount;
elementIndex = (int)((ZiAlphaWork*)workData)->prefixCount + (int)((ZiAlphaWork*)workData)->suffixCount;
if (elements[elementIndex] != 0xEFF1 && Zi8IsAlphaPunct(elements[elementIndex]) != 0) {
((ZiAlphaWork*)workData)->suffix[((ZiAlphaWork*)workData)->suffixCount++] = elements[elementIndex];
} else {
@@ -1519,46 +1559,6 @@ checkPrefixPunctuation:
goto preparePrefix;
}
}
else {
tryAlternatePrefix:
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
if (language == parameters->language) {
if (primaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
else if (secondaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
wordCursor = wordCursor + -prefixCount;
elements = elements + -prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
prefixPrepared = ZI8_FALSE;
((ZiAlphaWork*)workData)->suffixMode = 0;
((ZiAlphaWork*)workData)->suffixLocked = 0;
((ZiAlphaWork*)workData)->suffixCount = 0;
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
((ZiAlphaWork*)workData)->prefix[index] =
((ZiAlphaWork*)workData)->alternatePrefix[index];
}
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
if (((ZiAlphaWork*)workData)->language == parameters->language) {
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
}
else {
((ZiAlphaWork*)workData)->language = parameters->language;
}
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
goto finishCandidates;
if (completionAllowed) goto checkPrefixPunctuation;
}
if (!completionAllowed && ((ZiAlphaWork*)workData)->suffixMode == 0 && ((ZiAlphaWork*)workData)->prefixCount != 0 &&
elementCount > 2 && ((ZiAlphaWork*)workData)->prefixCount == elementCount - 1 &&
Zi8IsAlphaPunct(parameters->elements[((ZiAlphaWork*)workData)->prefixCount - 1]) != 0) goto checkPrefixFields;
@@ -1618,7 +1618,7 @@ finishCandidates:
} else {
wordCursor = 0;
}
if (wordCursor != (ziU16 *)0x0) {
if (wordCursor) {
Zi8SetHighlightedWordW(wordCursor,parameters->language,parameters->subLanguage,workData);
}
}
@@ -1634,8 +1634,7 @@ finishCandidates:
countIndex = ((ZiAlphaWork*)workData)->dictionaryCount - 1;
}
for (; countIndex >= 1; countIndex = countIndex - 1) {
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] =
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -=
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex - 1];
}
}

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

@@ -289,7 +289,7 @@ ziBool Zi8SecMatchComp(ziPtr nodeAddress, ziMatchParam* matchAddress, ziPtr dict
extern ziU16 Zi8MatchAltSound(ziPtr soundTable, ziU16 soundCode, ziPtr pCodeTable, ziU16 index, ziU16 mask, ziU16 value, ziU8 flag ZI_NEED_WORK);
ziU16 Zi8GetPCode(ziU8* table, ziU8* node);
ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziPtr dictionary, ziPtr soundTable, ziU16 soundCode, ziU32 tableAddress, ziU8* node, ziU16* masks, ziU16* values, ziU16* count, ziU8** resultNode, ziU8** stringOffset, ziS8 partialMode, ziU8 strictMode, ziU8 numParts, ziU16 partMask, ziU16 partValue, ziU8 flag, ziU8 altMode, ziU16 initialCode, ziU16* resultCode, ziU8 lastMode ZI_NEED_WORK) {
ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziU8* dictionary, ziPtr soundTable, ziU16 soundCode, ziU32 tableAddress, ziU8* node, ziU16* masks, ziU16* values, ziU16* count, ziU8** resultNode, ziU8** stringOffset, ziU8 partialMode, ziU8 strictMode, ziU8 numParts, ziU16 partMask, ziU16 partValue, ziU8 flag, ziU8 altMode, ziU16 initialCode, ziU16* resultCode, ziU8 lastMode ZI_NEED_WORK) {
struct {
ziBool hasString;
ziU8 partIndex;
@@ -302,6 +302,10 @@ ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziPtr dictionary, ziPtr soundTable, zi
ziU16 code;
} traversal;
ziU8* sound;
typedef struct {
ziU8 header;
ziU8 content[11];
} DictionaryNode;
if (*stringOffset != 0) {
traversal.hasString = 1;
@@ -336,7 +340,12 @@ decode_node:
match_code:
if (partValue == (traversal.code & partMask)) goto next_node;
traversal.matchedParts = 1;
sound = (ziU8*)(((node[9] & 0xF) * 0x10000 + node[0xB]) + (tableAddress + node[0xA] * 0x100));
if (*count != 0) {
traversal.soundIndex = (initialCode - traversal.remaining) - 1;
} else {
traversal.soundIndex = initialCode;
}
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
if (ZI_WORK->unk_0x16 != 0) {
switch (sound[0] & 7) {
case 2:
@@ -365,7 +374,8 @@ match_code:
*count = traversal.remaining;
return 1;
}
do {
next_group:
{
traversal.nextCode = *sound++;
traversal.partCount = traversal.nextCode & 0xF;
if ((traversal.nextCode & flag) == 0) {
@@ -377,7 +387,7 @@ match_code:
}
for (; traversal.partCount != 0; traversal.partCount--) {
traversal.partIndex = 1;
if (traversal.hasString && (*stringOffset < sound)) {
if (traversal.hasString && (sound > *stringOffset)) {
traversal.hasString = 0;
}
if (!traversal.hasString) {
@@ -389,17 +399,27 @@ match_code:
if (traversal.hasString) {
goto phonetic_skip;
}
traversal.code = Zi8GetPCode((ziU8*)pCodeTable, (ziU8*)dictionary + (traversal.dictionaryIndex & 0x7FFF) * 0xC);
if (((traversal.code & masks[traversal.partIndex]) != values[traversal.partIndex]) && (altMode == 0) && (((ziU8*)dictionary)[(traversal.dictionaryIndex & 0x7FFF) * 0xC] & 0x80) != 0) {
traversal.code = Zi8GetPCode((ziU8*)pCodeTable, dictionary + (traversal.dictionaryIndex & 0x7FFF) * sizeof(DictionaryNode));
if (((traversal.code & masks[traversal.partIndex]) != values[traversal.partIndex]) && (altMode == 0) && (dictionary[(traversal.dictionaryIndex & 0x7FFF) * sizeof(DictionaryNode)] & 0x80) != 0) {
traversal.code = Zi8MatchAltSound(soundTable, soundCode, pCodeTable, traversal.dictionaryIndex & 0x7FFF, masks[traversal.partIndex], values[traversal.partIndex], flag, ZI_WORK);
}
if ((traversal.code & masks[traversal.partIndex]) != values[traversal.partIndex]) {
goto phonetic_skip;
if ((traversal.code & masks[traversal.partIndex]) == values[traversal.partIndex]) {
goto phonetic_matched;
}
traversal.partIndex++;
if (traversal.partIndex == numParts) {
if ((partialMode != 0) && ((strictMode == 0 && (traversal.dictionaryIndex & 0x8000) != 0) || (strictMode != 0 && (traversal.dictionaryIndex & 0x8000) == 0))) {
goto phonetic_skip;
phonetic_skip:
if ((traversal.dictionaryIndex & 0x8000) == 0) {
sound++;
while ((*sound & 0x80) == 0) {
sound += 2;
}
sound++;
}
break;
phonetic_matched:
if (++traversal.partIndex == numParts) {
if (partialMode != 0) {
if (strictMode == 0 && (traversal.dictionaryIndex & 0x8000) != 0) goto phonetic_skip;
if (strictMode != 0 && (traversal.dictionaryIndex & 0x8000) == 0) goto phonetic_skip;
}
*resultNode = node;
*resultCode = ((ziU16)node[6] << 8) + node[7];
@@ -407,19 +427,10 @@ match_code:
return 1;
}
} while ((traversal.dictionaryIndex & 0x8000) == 0);
continue;
phonetic_skip:
if ((traversal.dictionaryIndex & 0x8000) == 0) {
sound++;
while ((*sound & 0x80) == 0) {
sound += 2;
}
sound++;
}
}
} while ((traversal.nextCode & 0x80) == 0);
goto next_node;
}
if ((traversal.nextCode & 0x80) != 0) goto next_node;
goto next_group;
check_code:
if (*values == (traversal.code & *masks)) goto match_code;
goto next_node;
@@ -430,22 +441,22 @@ check_code:
ziBool Zi8GetPyFinal(ziU8* pinyin, ziU8* initial, ziU8* final);
ziU8 Zi8GetPyPhonetic(ziWChar* text, ziU8 count, ziU16* initial, ziU16* final, ziU8* resultCount, ziU16* bestInitial, ziU16* bestFinal ZI_NEED_WORK) {
ziU8 firstInitial;
ziU8 pyFinal;
ziU8 pyInitial;
ziU8 pyFinal;
ziU8 convertedCount;
ziBool partial;
ziU8 result;
ziBool partial;
ziBool alternateInitial;
ziU8 outputIndex;
ziU16 value;
ziU8 index;
ziU16 value;
ziWChar converted[256];
ziWChar* current;
ziU8 pinyin[12];
ziWChar* current;
current = converted;
alternateInitial = 0;
result = 0;
partial = 0;
*resultCount = 0;
if (count == 0) {
Zi8LogError(0x135, ZI_WORK);
@@ -456,21 +467,19 @@ ziU8 Zi8GetPyPhonetic(ziWChar* text, ziU8 count, ziU16* initial, ziU16* final, z
for (; index < count; index++) {
if (((text[index] >= 0xF341) && (text[index] <= 0xF35A)) || ((text[index] >= 0x41) && (text[index] <= 0x5A))) {
if ((convertedCount != 0) && (current[convertedCount - 1] != 0xF360) && (current[convertedCount - 1] != 0x27)) {
current[convertedCount] = 0x27;
convertedCount++;
current[convertedCount++] = 0x27;
}
current[convertedCount] = (text[index] & 0xFF) + 0x20;
current[convertedCount++] = (text[index] & 0xFF) + 0x20;
} else {
current[convertedCount] = text[index];
current[convertedCount++] = text[index];
}
convertedCount++;
}
count = convertedCount;
outputIndex = 0;
*bestInitial = 0;
*bestFinal = 0;
while ((outputIndex < 0x10) && (count != 0)) {
while (count != 0) {
initial[outputIndex] = 0;
final[outputIndex] = 0;
value = *current;
@@ -484,41 +493,44 @@ check_pinyin_extension:
if (value < 0xF361) {
goto invalid_pinyin;
}
if (value <= 0xF37A) {
value += 0xC9F;
goto pinyin_initial;
}
if (value <= 0xF37A) goto pinyin_extension;
invalid_pinyin:
initial[0] = 0xFFFF;
final[0] = 0xFFFF;
*bestInitial = 0xFFFF;
*bestFinal = 0xFFFF;
*bestInitial = *bestFinal = initial[0] = final[0] = 0xFFFF;
return 1;
pinyin_extension:
value -= 0xF361;
goto pinyin_initial;
pinyin_ascii:
value -= 0x61;
pinyin_initial:
firstInitial = Zi8PinyinInitials[value];
if (firstInitial != 0) {
convertedCount = Zi8PinyinInitials[value];
if (convertedCount != 0) {
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
result++;
initial[outputIndex] = 0x7E00;
final[outputIndex] = (ziU16)firstInitial << 9;
*bestInitial = initial[outputIndex];
*bestFinal = final[outputIndex];
final[outputIndex] = (ziU16)(convertedCount & 0x7f) << 9;
*bestInitial = initial[0];
*bestFinal = final[0];
count--;
if (count == 0) {
break;
}
current += 1;
if (((firstInitial & 0x80) != 0) && ((current[0] == 0x68) || (current[0] == 0xF368))) {
if ((convertedCount & 0x80) != 0) {
if (alternateInitial) {
initial[outputIndex] &= 0xfdff;
final[outputIndex] &= 0xfdff;
}
value = *current;
if (value != 0x68 && value != 0xF368) goto scan_final;
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
final[outputIndex] += 0x200;
*bestInitial = initial[outputIndex];
*bestFinal = final[outputIndex];
*bestInitial = initial[0];
*bestFinal = final[0];
count--;
if (count == 0) {
break;
@@ -528,80 +540,80 @@ pinyin_initial:
} else if ((*current == 0xF369) || (*current == 0x69)) {
goto invalid_pinyin;
}
scan_final:
partial = 0;
for (index = 0; index < 4; index++) {
pinyin[index] = 0;
}
index = 0;
do {
while (1) {
if (index > 3) {
goto finish_final;
}
value = *current;
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
if (index != 0) {
partial = 1;
}
goto finish_final;
}
if ((value > 0xF330) && (value < 0xF336)) {
if (index != 0) {
partial = 1;
}
goto finish_final;
}
if ((value < 0x61) || (value > 0x7A)) {
if (value < 0xF361) {
goto finish_final;
}
value += 0xC9F;
if (value > 0x19) {
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
goto finish_final;
}
} else {
value -= 0x61;
}
pinyin[index] = (ziU8)value + 1;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
break;
}
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
current++;
index++;
count--;
if (count == 0) {
goto finish_final;
while (index < 4) {
value = *current;
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
if (index != 0) {
partial = 1;
}
goto finish_final;
}
if (index > 2) {
pinyin[index] = 0;
partial = 1;
break;
if ((value >= 0xF331) && (value < 0xF336)) {
if (index != 0) {
partial = 1;
}
goto finish_final;
}
pinyin[index + 1] = 0xFF;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
pinyin[index + 1] = 0;
pinyin[index] = 0;
partial = 1;
break;
if ((value < 0x61) || (value > 0x7A)) {
if (value < 0xF361) {
goto finish_final;
}
value -= 0xF361;
if (value > 0x19) {
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
goto finish_final;
}
} else {
value -= 0x61;
}
pinyin[index] = (ziU8)value + 1;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) goto try_final_extension;
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
pinyin[index + 1] = 0;
current++;
index++;
count--;
} while (count != 0);
if (count == 0) {
goto finish_final;
}
continue;
try_final_extension:
if (index < 3) {
pinyin[index + 1] = 0xFF;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
pinyin[index + 1] = 0;
current++;
index++;
count--;
if (count == 0) break;
} else {
pinyin[index + 1] = 0;
pinyin[index] = 0;
partial = 1;
break;
}
} else {
pinyin[index] = 0;
partial = 1;
break;
}
}
finish_final:
if ((index > 3) && (count != 0) && ((*current == 0x27) || (*current == 0xF360) || (*current == 0x20))) {
if ((index > 3) && (count != 0) && (((value = *current) == 0x27) || (value == 0xF360) || (value == 0x20))) {
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
@@ -611,35 +623,38 @@ finish_final:
if (index > 3) {
partial = 1;
}
if (!partial) {
pinyin[index] = 0xFF;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
pinyin[index] = 0;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
if (firstInitial == 0) {
result++;
initial[outputIndex] = 0x7E00;
final[outputIndex] = 0x200;
}
initial[outputIndex] |= (ziU16)pyInitial << 3;
final[outputIndex] |= (ziU16)pyFinal << 3;
*bestInitial = initial[outputIndex];
*bestFinal = final[outputIndex];
}
} else {
if (firstInitial == 0) {
if (partial && alternateInitial == 0) {
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
if (convertedCount == 0) {
result++;
initial[outputIndex] = 0x7E00;
final[outputIndex] = 0x200;
}
initial[outputIndex] |= (ziU16)pyInitial << 3;
final[outputIndex] |= (ziU16)pyFinal << 3;
*bestInitial = initial[outputIndex];
*bestFinal = final[outputIndex];
*bestInitial = initial[0];
*bestFinal = final[0];
} else {
if ((index != 0) && (count != 0)) {
goto invalid_pinyin;
}
}
} else {
pinyin[index] = 0xFF;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
if (convertedCount == 0) {
result++;
initial[outputIndex] = 0x7E00;
final[outputIndex] = 0x200;
}
initial[outputIndex] |= (ziU16)pyInitial << 3;
final[outputIndex] |= (ziU16)pyFinal << 3;
*bestInitial = initial[0];
*bestFinal = final[0];
if ((outputIndex == 0) && (count == 0)) {
pinyin[index] = 0;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
if (firstInitial == 0) {
if (convertedCount == 0) {
*bestInitial = 0x7E00;
*bestFinal = 0x200;
}
@@ -647,45 +662,42 @@ finish_final:
*bestFinal |= (ziU16)pyFinal << 3;
}
}
}
} else {
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
if (firstInitial == 0) {
result++;
initial[outputIndex] = 0x7E00;
final[outputIndex] = 0x200;
}
initial[outputIndex] |= (ziU16)pyInitial << 3;
final[outputIndex] |= (ziU16)pyFinal << 3;
*bestInitial = initial[outputIndex];
*bestFinal = final[outputIndex];
} else {
if ((index != 0) && (count != 0)) {
goto invalid_pinyin;
pinyin[index] = 0;
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
if (convertedCount == 0) {
result++;
initial[outputIndex] = 0x7E00;
final[outputIndex] = 0x200;
}
initial[outputIndex] |= (ziU16)pyInitial << 3;
final[outputIndex] |= (ziU16)pyFinal << 3;
*bestInitial = initial[0];
*bestFinal = final[0];
}
}
}
convertedCount = count;
}
if (count != 0) {
value = *current;
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
current++;
convertedCount = count - 1;
count--;
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
} else if ((value > 0xF330) && ((ziU16)(value + 0xCCF) < 5)) {
} else if ((value >= 0xF331) && ((value -= 0xF331) <= 4)) {
value++;
initial[outputIndex] |= 7;
final[outputIndex] |= value + 0xCD0;
*bestInitial = initial[outputIndex];
*bestFinal = final[outputIndex];
convertedCount = count - 1;
final[outputIndex] |= value;
*bestInitial = initial[0];
*bestFinal = final[0];
count--;
current++;
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
}
if ((convertedCount != 0) && ((*current == 0x27) || (*current == 0xF360) || (*current == 0x20))) {
convertedCount = count - 2;
if ((count != 0) && (((value = *current) == 0x27) || (value == 0xF360) || (value == 0x20))) {
count--;
current++;
if (outputIndex == 0) {
*resultCount = *resultCount + 1;
@@ -693,10 +705,10 @@ finish_final:
}
}
}
count = convertedCount;
outputIndex++;
if (outputIndex > 0xf) break;
}
if ((*resultCount > 1) && (text[*resultCount - 1] > 0xF340) && (text[*resultCount - 1] < 0xF35B)) {
if ((result > 1) && (text[*resultCount - 1] >= 0xF341) && (text[*resultCount - 1] <= 0xF35A)) {
*resultCount = *resultCount - 1;
}
return result;

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

@@ -26,7 +26,7 @@ ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData)
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
ziPtr workData) {
ziPtr workData) {
struct {
ziU8 characterIndex;
ziU8 matched;
@@ -44,7 +44,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
ziU8* table1;
} state;
ziU16 buffer[100];
ziU32 result;
ziU8 result;
ziU16 currentCharacter;
ziU8* selectedTable;
@@ -72,13 +72,13 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
state.tableCount31 = Zi8GetTableCount(ZI8_LANG_KO, 0x31, workData);
for (state.elementIndex = 0; state.elementIndex < params->elementCount;
state.elementIndex++) {
state.elementIndex++) {
currentCharacter = params->elements[state.elementIndex];
if ((currentCharacter >= 0x61) && (currentCharacter <= 0x7A)) {
buffer[state.elementIndex] = state.table1[(currentCharacter - 0x61) * 2];
} else if ((currentCharacter >= 0x41) && (currentCharacter <= 0x5A)) {
buffer[state.elementIndex] = state.table1[(currentCharacter - 0x41) * 2 + 1];
buffer[state.elementIndex] = (state.table1 + (currentCharacter - 0x41) * 2)[1];
} else {
state.matched = 0;
for (; state.table2[state.matched * 3] != 0; state.matched++) {
@@ -86,8 +86,8 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
}
if (state.table2[state.matched * 3] != 0) {
buffer[state.elementIndex] =
((ziU16)state.table2[state.matched * 3 + 1] << 8) |
state.table2[state.matched * 3 + 2];
((ziU16)(state.table2 + state.matched * 3)[1] << 8) |
(state.table2 + state.matched * 3)[2];
} else {
Zi8LogError(0x161, workData);
return 0;
@@ -98,13 +98,13 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
result = 0;
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
&state.inputIndex, workData) != 0) {
&state.inputIndex, workData) != 0) {
state.matched = Zi8_81481E6C(&state.nextIndex,
buffer + currentCharacter + 1,
state.characterIndex,
(state.elementIndex - currentCharacter) - 1,
workData);
if ((((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 1) && (state.characterIndex < 0x1F)) {
buffer + currentCharacter + 1,
state.characterIndex,
(state.elementIndex - currentCharacter) - 1,
workData);
if ((((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 1)) {
switch (state.characterIndex) {
case 1:
selectedTable = (ziU8*)Zi8GetTableAddress(ZI8_LANG_KO, 0x1E, workData);
@@ -170,37 +170,30 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
} else {
state.matched = 0;
}
if (state.matched == 0) {
if (state.currentCandidate == 0) {
for (state.index = 0; state.index < state.tableCount31; state.index++) {
if (((ziU16)state.table31[(state.index * 3)] == buffer[currentCharacter]) &&
((ziU16)state.table31[(state.index * 3) + 1] == buffer[currentCharacter + 1])) {
if (currentCharacter == 0) {
params->count = 1;
}
params->candidates[result] =
state.tableCount0 + state.table31[(state.index * 3) + 2];
result++;
currentCharacter++;
break;
}
}
if (state.index == state.tableCount31) {
params->candidates[result] = buffer[currentCharacter];
if (buffer[currentCharacter] < 0xFF) {
if (currentCharacter == 0) {
params->count = 1;
}
params->candidates[result] += state.tableCount0;
result++;
}
}
if (state.matched != 0) {
if (state.tableCount6 == 0) {
state.nextIndex += state.inputIndex * state.tableCount3;
}
if (state.currentCandidate != 0) {
state.currentCandidate--;
} else {
params->candidates[(ziU8)result] =
((ziU16)selectedTable[state.nextIndex * 2] << 8) | (selectedTable + state.nextIndex * 2)[1];
if ((state.tableCount6 != 0) && (((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 0)) {
params->candidates[(ziU8)result] += state.inputIndex * state.tableCount3;
}
result++;
}
if (currentCharacter == 0) {
params->count = state.matched + 1;
}
currentCharacter += state.matched;
} else {
if (state.currentCandidate != 0) {
state.index = 0;
while ((state.index < state.tableCount31) &&
(((ziU16)state.table31[(state.index * 3)] != buffer[currentCharacter]) ||
((ziU16)state.table31[(state.index * 3) + 1] != buffer[currentCharacter + 1]))) {
state.index++;
for (; state.index < state.tableCount31; state.index++) {
if (state.table31[state.index * 3] == buffer[currentCharacter] &&
(state.table31 + state.index * 3)[1] == buffer[currentCharacter + 1]) break;
}
if (state.index == state.tableCount31) {
state.currentCandidate--;
@@ -208,25 +201,30 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
if (currentCharacter == 0) {
params->count = 1;
}
}
} else {
if (state.tableCount6 == 0) {
state.nextIndex += state.inputIndex * state.tableCount3;
}
if (state.currentCandidate == 0) {
params->candidates[result] =
(selectedTable[state.nextIndex * 2] << 8) | selectedTable[state.nextIndex * 2 + 1];
if ((state.tableCount6 != 0) && (((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 0)) {
params->candidates[result] += state.inputIndex * state.tableCount3;
}
result++;
} else {
state.currentCandidate--;
for (state.index = 0; state.index < state.tableCount31; state.index++) {
if ((state.table31[(state.index * 3)] == buffer[currentCharacter]) &&
((state.table31 + state.index * 3)[1] == buffer[currentCharacter + 1])) {
if (currentCharacter == 0) {
params->count = 1;
}
params->candidates[(ziU8)result] =
state.tableCount0 + (state.table31 + state.index * 3)[2];
result++;
currentCharacter++;
break;
}
}
if (state.index == state.tableCount31) {
if ((params->candidates[(ziU8)result] = buffer[currentCharacter]) < 0xFF) {
if (currentCharacter == 0) {
params->count = 1;
}
params->candidates[(ziU8)result] += state.tableCount0;
result++;
}
}
}
if (currentCharacter == 0) {
params->count = state.matched + 1;
}
currentCharacter += state.matched;
}
if (result >= params->maxCandidates) {
break;

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

@@ -231,7 +231,7 @@ ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
Zi8_81483308(param, param->candidates[filter.compactIndex], inserted, ZI_WORK);
}
}
*remaining -= (ziU8)matched;
*remaining = *remaining - matched;
*count = 0;
}
}
@@ -285,8 +285,8 @@ ziU32 Zi8GetKOcandidates(ziGetParam* param, ZiKoreanCandidateOptions* options ZI
search.previousIndex = 0xFFFF;
search.resultCount = 0;
search.packedKeys.bytes[4] = 0;
search.packedKeys.firstWord = 0;
search.packedKeys.bytes[4] = 0;
search.remainingLetters = 0;
search.wordIndex = 0;
search.candidateCount = 0;
@@ -317,15 +317,15 @@ ziU32 Zi8GetKOcandidates(ziGetParam* param, ZiKoreanCandidateOptions* options ZI
if (((search.keyIndex = Zi8_8148302C(param->currentWord[0], keyTable, ZI_WORK)) != 0xFFFF) &&
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 8) != 0)) {
search.wordOffset = ((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childLow |
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 3) << 16 |
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childHigh << 8);
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 3) << 16 |
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childHigh << 8);
search.remainingLetters = param->wordCharCount - 1;
search.wordIndex = 1;
wordNode = search.wordTable + search.wordOffset;
match_word:
while (search.remainingLetters != 0) {
search.keyIndex = Zi8_8148302C(param->currentWord[search.wordIndex], (ziU8*)keyTable, ZI_WORK);
if (search.keyIndex == (ziU16)((*wordNode & 0x1F) << 8 | wordNode[1])) {
if (search.keyIndex == (((ziU16)*wordNode & 0x1F) << 8 | (ziU16)wordNode[1])) {
--search.remainingLetters;
++search.wordIndex;
if ((*wordNode & 0x40) != 0) {
@@ -341,9 +341,9 @@ match_word:
}
}
if (search.remainingLetters == 0) {
search.keyIndex = (*wordNode & 0x1F) << 8 | wordNode[1];
search.character = (ziU16)(((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterHigh << 8 |
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterLow);
search.keyIndex = ((ziU16)*wordNode & 0x1F) << 8 | (ziU16)wordNode[1];
search.character = (ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterHigh << 8 |
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterLow);
if (param->wordCharCount == 1) {
if (search.keyIndex == search.previousIndex) {
for (; (*wordNode & 0x40) == 0; wordNode = wordNode + 2) {
@@ -355,55 +355,46 @@ match_word:
}
search.previousIndex = search.keyIndex;
if (param->elementCount == 0) {
if (search.remainingCandidates == 0) {
if (search.remainingCandidates != 0) {
--search.remainingCandidates;
} else {
if (options->countOnly != 0) {
++search.prefixCount;
if ((ziS32)search.prefixCount < (ziS32)options->maxCount) {
if (++search.prefixCount < (ziS32)options->maxCount) {
goto skip_word;
}
return options->maxCount;
}
param->candidates[search.candidateCount] = search.character;
++search.candidateCount;
param->candidates[search.candidateCount++] = search.character;
++param->unk_0x20;
if (++param->letters >= param->maxCandidates) {
return param->letters;
}
} else {
--search.remainingCandidates;
}
} else {
param->candidates[search.candidateCount] = search.character;
++search.candidateCount;
param->candidates[search.candidateCount++] = search.character;
++param->unk_0x20;
if (++param->letters >= param->maxCandidates) {
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
param->unk_0x20 = search.candidateCount;
param->letters = search.candidateCount;
if (param->maxCandidates <= search.candidateCount) {
if (options->countOnly == 0) {
return search.candidateCount;
}
search.prefixCount += search.candidateCount;
if ((ziS32)options->maxCount <= (ziS32)search.prefixCount) {
return options->maxCount;
}
if (search.candidateCount < param->maxCandidates) goto skip_word;
if (options->countOnly != 0) {
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
param->unk_0x20 = 0;
param->letters = 0;
search.candidateCount = 0;
} else {
return search.candidateCount;
}
}
}
} else {
for (search.candidateIndex = 0;
(search.candidateIndex < search.candidateCount &&
(search.character != param->candidates[search.candidateIndex]));
search.candidateIndex = search.candidateIndex + 1) {
for (search.candidateIndex = 0; search.candidateIndex < search.candidateCount; search.candidateIndex++) {
if (search.character == param->candidates[search.candidateIndex]) break;
}
if ((search.candidateIndex == search.candidateCount) &&
(Zi8_814833F0(param, search.character, ZI_WORK) == 0)) {
param->candidates[search.candidateCount] = search.character;
++search.candidateCount;
param->candidates[search.candidateCount++] = search.character;
++param->unk_0x20;
if (++param->letters < param->maxCandidates) {
goto skip_word;
@@ -411,17 +402,14 @@ match_word:
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
param->unk_0x20 = search.candidateCount;
param->letters = search.candidateCount;
if (param->maxCandidates <= search.candidateCount) {
if (options->countOnly == 0) {
return search.candidateCount;
}
search.prefixCount += search.candidateCount;
if ((ziS32)options->maxCount <= (ziS32)search.prefixCount) {
return options->maxCount;
}
if (search.candidateCount < param->maxCandidates) goto skip_word;
if (options->countOnly != 0) {
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
param->unk_0x20 = 0;
param->letters = 0;
search.candidateCount = 0;
} else {
return search.candidateCount;
}
}
}
@@ -444,18 +432,21 @@ search_table:
if (search.candidateCount != 0) {
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
if (options->countOnly != 0) {
search.prefixCount += search.candidateCount;
if (search.prefixCount >= (ziS32)options->maxCount) return options->maxCount;
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
search.resultCount = search.prefixCount;
}
param->unk_0x20 = search.candidateCount;
param->letters = search.candidateCount;
}
if (param->elementCount < 10) {
if ((param->elementCount == 0) || (options->countOnly != 0)) {
search.matchPass = 1;
} else {
if (param->elementCount > 9) {
param->letters = 0;
return 0;
}
{
if (param->elementCount != 0 && options->countOnly == 0) {
search.matchPass = 0;
} else {
search.matchPass = 1;
}
search.tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
Zi8_81483118(param, search.packedKeys.bytes);
@@ -466,8 +457,8 @@ search_table:
search.keyByte = 0;
if (1 < param->elementCount) {
for (search.keyByte = 0;
(ziU32)search.keyByte < (int)param->elementCount / 2;
search.keyByte = search.keyByte + 1) {
(ziS32)search.keyByte < (int)param->elementCount / 2;
search.keyByte++) {
if (search.packedKeys.bytes[search.keyByte] != search.entry->keyBytes[search.keyByte]) {
search.matches = ZI8_FALSE;
break;
@@ -476,7 +467,7 @@ search_table:
}
if ((search.matches && ((param->elementCount % 2) != 0)) &&
((search.packedKeys.bytes[search.keyByte] & 0xF0) !=
(search.entry->keyBytes[search.keyByte] & 0xF0))) {
(search.entry->keyBytes[search.keyByte] & 0xF0))) {
search.matches = ZI8_FALSE;
}
if (search.matches) {
@@ -499,17 +490,15 @@ search_table:
if (++search.resultCount >= (ziS32)options->maxCount) return options->maxCount;
} else {
param->candidates[search.candidateCount++] =
(ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterHigh << 8 |
((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterLow);
(ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterHigh << 8 |
((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterLow);
if (++param->letters >= param->maxCandidates) return param->letters;
}
}
next_entry:
;
}
} while (++search.matchPass < 2);
} else {
param->letters = 0;
} while (++search.matchPass < 2);
}
if (options->countOnly != 0) return search.resultCount;
return param->letters;

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

@@ -106,7 +106,7 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
if ((index != 0) && ((buffers.component[5] & 1) == 0)) {
index--;
match->arrD[index] &= 0xf0;
match->arr1[index] = match->arr1[index] & 0xf0;
match->arr1[index] &= 0xf0;
}
nibbles = (ziU8)(buffers.component[5] + 1);
if (8 < nibbles) {
@@ -132,16 +132,16 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
case 1:
case 2:
case 4:
match->arr1[0] |= (ziU8)(mode << 4);
match->arrD[0] |= (ziU8)(mode << 4);
break;
match->arr1[0] |= (ziU8)(mode << 4);
match->arrD[0] |= (ziU8)(mode << 4);
break;
}
}
if (nibbles == 0) {
nibbles = 1;
}
if (((request->getMode == '\0') || (request->getMode == '\x10')) ||
(request->getMode == '\x05')) {
(request->getMode == '\x05')) {
Zi8Memcpy(buffers.masks,match->arr1,0xc);
Zi8Memcpy(buffers.strokes,match->arrD,0xc);
do {
@@ -170,26 +170,26 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
nibbles++;
}
if ((nibbles & 1) != 0) {
buffers.strokes[nibbles >> 1] = buffers.strokes[nibbles >> 1] | stroke;
buffers.strokes[nibbles >> 1] |= stroke;
if (element == 0xef0b) {
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 8;
buffers.masks[nibbles >> 1] |= 8;
}
else if (element == 0xef0a) {
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 4;
buffers.masks[nibbles >> 1] |= 4;
}
else if (element != 0xef00) {
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 7;
buffers.masks[nibbles >> 1] |= 7;
}
} else {
buffers.strokes[nibbles >> 1] = buffers.strokes[nibbles >> 1] | (ziU8)(stroke << 4);
} else {
buffers.strokes[nibbles >> 1] |= stroke << 4;
if (element == 0xef0b) {
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 0x80;
buffers.masks[nibbles >> 1] |= 0x80;
}
else if (element == 0xef0a) {
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 0x40;
buffers.masks[nibbles >> 1] |= 0x40;
}
else if (element != 0xef00) {
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 0x70;
buffers.masks[nibbles >> 1] |= 0x70;
}
}
nibbles++;
@@ -219,7 +219,7 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
Zi8Memcpy((ziU8 (*)[12])match->segs1 + match->nSeg,buffers.masks,0xc);
Zi8Memcpy((ziU8 (*)[12])match->segsD + match->nSeg,buffers.strokes,0xc);
match->nSeg++;
if (((stroke != 0xff) || (elementCount <= elementIndex)) || (0xf < match->nSeg)) goto complete;
if (stroke != 0xff || elementIndex >= elementCount || match->nSeg >= 0x10) goto complete;
Zi8Memset(buffers.masks,0,0xc);
Zi8Memset(buffers.strokes,0,0xc);
buffers.masks[0] = match->arr1[0] & 0xf0;
@@ -239,7 +239,7 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
}
if ((request->getMode == '\x01') || (request->getMode == '\f')) {
match->nCand = Zi8GetPyPhonetic(request->elements,elementCount,match->phon,match->phon2,
&request->count,&match->first,&match->first2,__zi8_work_data);
&request->count,&match->first,&match->first2,__zi8_work_data);
}
else {
initial = 0;
@@ -253,12 +253,24 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
request->count = request->elementCount;
phoneticLength = 1;
for (index = 0; index < elementCount; index++) {
if (Zi8GetBpmfPhonetic(buffers.phoneticInput,phoneticLength,&initial,&final,&bestInitial,&bestFinal,
__zi8_work_data) == 0) {
stroke = Zi8GetBpmfPhonetic(buffers.phoneticInput,phoneticLength,&initial,&final,&bestInitial,&bestFinal,
__zi8_work_data);
if (stroke != 0) {
previousInitial = bestInitial;
previousFinal = bestFinal;
savePhonetic:
match->phon[match->nCand] = initial;
match->phon2[match->nCand] = final;
if (match->nCand == 0) {
match->first = bestInitial;
match->first2 = bestFinal;
}
}
else {
if ((index == 0) ||
((((1 < phoneticLength && (buffers.phoneticInput[phoneticLength - 2] == 0xF360)) &&
(buffers.phoneticInput[phoneticLength - 1] == 0xF360)) ||
(++match->nCand == 0x10)))) {
((((1 < phoneticLength && (buffers.phoneticInput[phoneticLength - 2] == 0xF360)) &&
(buffers.phoneticInput[phoneticLength - 1] == 0xF360)) ||
(++match->nCand == 0x10)))) {
initial = 0xffff;
final = 0xffff;
bestInitial = 0xffff;
@@ -277,21 +289,10 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
if (match->nCand == 1) {
request->count = phoneticLength - 1;
}
buffers.phoneticInput += phoneticLength - 1;
buffers.phoneticInput = buffers.phoneticInput + phoneticLength - 1;
phoneticLength = 0;
index--;
}
else {
savePhonetic:
match->phon[match->nCand] = initial;
match->phon2[match->nCand] = final;
previousFinal = bestFinal;
previousInitial = bestInitial;
if (match->nCand == 0) {
match->first = bestInitial;
match->first2 = bestFinal;
}
}
phoneticLength++;
}
if (elementCount != 0) {
@@ -305,25 +306,23 @@ savePhonetic:
}
}
if (((request->context & contextMask) != 0) &&
((1 < match->nCand || (request->count != elementCount)))) {
((1 < match->nCand || (request->count != elementCount)))) {
match->phon[0] = 0xFFFF;
match->phon2[0] = 0xFFFF;
match->nCand = 0;
}
if (((request->getOptions & 0x20) == 0) &&
((match->phon[0] != 0xFFFF || (match->phon2[0] != 0xFFFF)))) {
if (match->nCand < 2) {
phoneticInitial = match->phon[0];
phoneticMask = match->phon2[0];
((match->phon[0] != 0xFFFF || (match->phon2[0] != 0xFFFF)))) {
if (match->nCand > 1) {
phoneticInitial = match->phon[match->nCand - 1] & 0xfff8;
phoneticMask = match->phon2[match->nCand - 1] & 0xfff8;
}
else {
phoneticInitial = match->phon[match->nCand - 1];
phoneticMask = match->phon2[match->nCand - 1];
phoneticInitial = match->phon[0] & 0xfff8;
phoneticMask = match->phon2[0] & 0xfff8;
}
phoneticInitial = phoneticInitial & 0xfff8;
phoneticMask = phoneticMask & 0xfff8;
for (phoneticLength = 0; phoneticLength < phoneticCount; phoneticLength++) {
phoneticCode = (buffers.phoneticTable[phoneticLength * 2 + 1] << 8) | buffers.phoneticTable[phoneticLength * 2];
phoneticCode = buffers.phoneticTable[phoneticLength * 2] | ((ziU16)buffers.phoneticTable[phoneticLength * 2 + 1] << 8);
if (phoneticMask == (phoneticCode & phoneticInitial)) break;
}
if (phoneticLength == phoneticCount) {

View File

@@ -1,9 +1,9 @@
#include <revolution/fa.h>
#include <revolution/os.h>
char* __FAVersion = "<< RVL_SDK - FA \trelease build: Apr 20 2010 11:20:14 (0x4199_60831) >>";
s32 FAFileSysInitialized;
char* __FAVersion[2] = {"<< RVL_SDK - FA \trelease build: Apr 20 2010 11:20:14 (0x4199_60831) >>", NULL};
s32 FAInInitializing;
s32 FAFileSysInitialized;
extern s32 FADiskInitialized;
extern s32 pdm_init_diskmanager(s32 config, void* parameter);
extern s32 pfstub_init_prfile2(s32 config, void* parameter);
@@ -31,6 +31,6 @@ FAError FAInit(int flag) {
}
}
FAInInitializing = 0;
OSRegisterVersion(__FAVersion);
OSRegisterVersion(__FAVersion[0]);
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;
@@ -169,13 +169,14 @@ static s32 fa_nanddrv_ParseCreateNANDFile(NAND_DISK_INFO* info) {
if (error == 0 || error == -6 || error == -1) {
error = NANDChangeDir(name);
if (error != 0) { return error; }
path++;
pf_memset(name, 0, 16);
next = name;
length = 0;
break;
} else {
return error;
}
return error;
path++;
pf_memset(name, 0, 16);
next = name;
length = 0;
break;
case 0:
if (length > 12) { return -20; }
error = NANDCreate(name, 0x30, 0);
@@ -403,8 +404,8 @@ s32 fa_nanddrv_init_drv_tbl(PDM_DISK_TBL* table, u32 extension) {
return 0;
}
s32 fa_nanddrv_NotifyNANDFile(const char* path, u32 size) {
NAND_DISK_INFO* info;
u16 index;
if (pf_strlen(path) >= 76) { return -20; }
if (Nanddisk_Internal_Info_Init == 0) {
pf_memset(nanddisk_info, 0, sizeof(nanddisk_info));
@@ -416,10 +417,9 @@ s32 fa_nanddrv_NotifyNANDFile(const char* path, u32 size) {
if (fa_nanad_semid == 0) { return -21; }
}
for (index = 0; index < 23; index++) {
info = &nanddisk_info[index];
if (pf_strcmp(info->path, path) == 0) { return 0; }
if (pf_strcmp(nanddisk_info[index].path, path) == 0) { return 0; }
if (nanddisk_info[index].disk == 0) {
pf_strcpy(info->path, path);
pf_strcpy(nanddisk_info[index].path, path);
nanddisk_info[index].file_size = size;
break;
}
@@ -481,15 +481,15 @@ static s32 fa_nanddrv_physical_read(u32 count, u8* buf, u32 block, u32 bps, u32*
return error;
}
static s32 fa_nanddrv_physical_write(u32 count, const u8* buf, u32 block, u32 bps, u32* success, PDM_DISK* disk) {
u32 remaining;
u32 wanted;
u32 file_size;
NAND_DISK_INFO* info = 0;
u32 wanted;
u32 remaining;
u16 index;
u32 offset;
u32 position;
s32 error;
u8 work[512] __attribute__((aligned(32)));
NAND_DISK_INFO* info = 0;
for (index = 0; index < 23; index++) {
if (nanddisk_info[index].disk == disk) { info = &nanddisk_info[index]; break; }
}

View File

@@ -6,11 +6,11 @@ extern pf_s32 pdm_part_is_attached_partition(PDM_PARTITION* partition);
pf_u8 pfd_get_media_drv_char(PDM_DISK* disk, pf_s8* drives, pf_u32 capacity) {
pf_u32 partition_index;
PDM_PARTITION* partition;
PF_VOLUME* volume;
pf_u8 count;
pf_s8* next_drive;
pf_u32 volume_index;
PDM_PARTITION* partition;
pf_u16 volume_index;
PF_VOLUME* volume;
if (drives == NULL || capacity == 0) {
return 0;
}
@@ -20,8 +20,7 @@ pf_u8 pfd_get_media_drv_char(PDM_DISK* disk, pf_s8* drives, pf_u32 capacity) {
for (partition_index = 0; partition_index < 26; partition_index++, partition++) {
if (pdm_part_is_attached_partition(partition) && partition->p_disk == disk) {
volume = pf_vol_set.volumes;
for (volume_index = 0; volume_index < 26; volume++) {
volume_index++;
for (volume_index = 0; volume_index < 26; volume_index++, volume++) {
if (volume->p_part == partition) {
count++;
*next_drive++ = volume->drv_char;

View File

@@ -1,3 +1,4 @@
#include <stddef.h>
#include <revolution/fa/types.h>
#include <revolution/os.h>
#include <revolution/sdi.h>
@@ -32,8 +33,8 @@ PFD_SDDRV_INFO g_pfd_sddrv_info;
PFD_SDDEV_STORAGE g_pfd_sddev;
u8 g_pfd_sddrv_buf[0x200];
static FAInsertCallback g_attach_func;
static FAEjectCallback g_detach_func;
static FAInsertCallback g_attach_func = 0;
static FAEjectCallback g_detach_func = 0;
u32 g_event;
extern u8 pfd_get_media_drv_char(FADisk*, s8*, u32);
@@ -135,17 +136,17 @@ typedef union PFD_SDDRV_U16_BYTES {
u8 bytes[2];
} PFD_SDDRV_U16_BYTES;
#define pfd_sddrv_store_le16(field, value) \
#define pfd_sddrv_store_le16(buffer, field, offset, value) \
do { \
if (((u32)(field) & 1) != 0) { \
(field)[0] = (u8)(value); \
(field)[1] = (u8)((value) >> 8); \
} else { \
*(u16*)(field) = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
((u16*)(buffer))[(offset) / 2 + (offset) % 2] = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
} \
} while (0)
#define pfd_sddrv_store_le32(field, value) \
#define pfd_sddrv_store_le32(buffer, field, offset, value) \
do { \
if (((u32)(field) & 3) != 0) { \
(field)[0] = (u8)(value); \
@@ -153,7 +154,7 @@ typedef union PFD_SDDRV_U16_BYTES {
(field)[2] = (u8)((value) >> 16); \
(field)[3] = (u8)((value) >> 24); \
} else { \
*(u32*)(field) = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
((u32*)(buffer))[(offset) / 4 + (offset) % 4] = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
(((value) & 0xff000000) >> 24 | ((value) & 0xff0000) >> 8); \
} \
} while (0)
@@ -242,23 +243,39 @@ static inline void clear_mount_flag(void) {
g_pfd_sddrv_info.flags &= ~2;
}
static inline u32 pfd_sddrv_flags(const PFD_SDDRV_INFO* info) {
return info->flags;
}
static inline SDDev* pfd_sddrv_device(const PFD_SDDRV_INFO* info) {
return info->device;
}
static inline FADisk* pfd_sddrv_disk(const PFD_SDDRV_INFO* info) {
return info->disk;
}
static inline s8 pfd_sddrv_drive(const PFD_SDDRV_INFO* info) {
return info->drive;
}
s32 pfd_st_inter_callback(s32 status, void* data) {
s32 result;
if ((status & 1) != 1) {
return 0;
}
if (g_pfd_sddrv_info.device != 0) {
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
g_event = 2;
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
if (result != 0) {
OSReport("ERR:Failed to regist intr handler. pfd_st_inter_callback()\n");
}
}
if (g_pfd_sddrv_info.disk != 0) {
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
update_media_drive();
pdm_disk_notify_media_insert(g_pfd_sddrv_info.disk);
if (g_pfd_sddrv_info.drive != 0 && g_attach_func != 0) {
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_attach_func != 0) {
g_attach_func(g_pfd_sddrv_info.drive);
}
}
@@ -274,17 +291,17 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
return 0;
}
g_pfd_sddrv_info.media_inserted = 0;
if (g_pfd_sddrv_info.device != 0) {
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
g_event = 1;
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
if (result != 0) {
OSReport("ERR:Failed to regist intr handler. pfd_st_removal_callback()\n");
}
}
if (g_pfd_sddrv_info.disk != 0) {
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
update_media_drive();
pdm_disk_notify_media_eject(g_pfd_sddrv_info.disk);
if (g_pfd_sddrv_info.drive != 0 && g_detach_func != 0) {
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_detach_func != 0) {
g_detach_func(g_pfd_sddrv_info.drive);
}
}
@@ -299,7 +316,7 @@ s32 pfd_sddrv_init(FADisk* disk) {
if (disk == 0) {
return -30;
}
if ((g_pfd_sddrv_info.flags & 1) != 0) {
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 1) != 0) {
OSReport("INFO SD Card driver is already initialize. pfd_sddrv_init()\n");
if (disk == g_pfd_sddrv_info.disk) {
return 0;
@@ -328,11 +345,11 @@ s32 pfd_sddrv_init(FADisk* disk) {
OSReport("ERR Failed to get sd card status. [ret = 0x%x]\n", sd_result);
return 21;
}
if ((status & 1) == 1) {
if ((status & 1) != 0) {
g_pfd_sddrv_info.media_inserted = 1;
}
g_pfd_sddrv_info.device = device;
if (g_pfd_sddrv_info.media_inserted == 1) {
if (g_pfd_sddrv_info.media_inserted != 0) {
g_event = 2;
sd_result = ISD_RegisterDeviceIntrHandler(device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
if (sd_result != 0) {
@@ -456,7 +473,7 @@ s32 pfd_sddrv_unmount(FADisk* disk) {
if (disk == 0) {
return -30;
}
if ((g_pfd_sddrv_info.flags & 2) != 0) {
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
clear_mount_flag();
}
return 0;
@@ -468,7 +485,7 @@ s32 pfd_sddrv_finalize(FADisk* disk) {
if (disk == 0) {
return -30;
}
if ((g_pfd_sddrv_info.flags & 2) == 2) {
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
clear_mount_flag();
}
if ((g_pfd_sddrv_info.flags & 1) != 0) {
@@ -483,7 +500,7 @@ s32 pfd_sddrv_finalize(FADisk* disk) {
g_pfd_sddrv_info.device = 0;
}
g_pfd_sddrv_info.flags = g_pfd_sddrv_info.flags & 0xfffffffe;
g_pfd_sddrv_info.media_inserted = g_pfd_sddrv_info.media_ejected = 0;
g_pfd_sddrv_info.media_inserted = 0;
g_pfd_sddrv_info.disk = 0;
g_pfd_sddrv_info.drive = 0;
return 0;
@@ -574,7 +591,7 @@ s32 pfd_sddrv_is_media_insert(void) {
static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_read) {
s32 result;
u32 current_sector;
s32 current_sector;
u32 completed;
u8* current_buffer;
if ((g_pfd_sddrv_info.flags & 2) == 0) {
@@ -639,7 +656,7 @@ static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes
s32 pfd_sddrv_physical_write(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_written) {
s32 result;
u32 current_sector;
s32 current_sector;
u32 completed;
u8* current_buffer;
if ((g_pfd_sddrv_info.flags & 2) == 0) {
@@ -731,7 +748,8 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
multiplier = (csd[2] >> 8) & 0xf;
minimum_multiplier = multiplier >= 9 ? multiplier : 9;
max_multiplier = minimum_multiplier <= 11 ? minimum_multiplier : 11;
multiplier_factor = 1 << (u16)(max_multiplier - 9);
multiplier_factor = 1;
multiplier_factor <<= (u16)(max_multiplier - 9);
*sectors = cluster_blocks * multiplier_factor;
} else {
*sectors = ((csd[1] >> 8 & 0x3fffff) + 1) * 0x400;
@@ -740,20 +758,27 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
return 0;
}
static inline u32 pfd_sddrv_encode_serial(s32 year, s32 month, s32 day, s32 hour, s32 minute, s32 second) {
u32 date;
u32 time;
date = (day & 0x1f) | ((month & 0xf) << 5) | (((year - 1900) & 0x7f) << 9);
time = (second & 0x1f) | ((minute & 0x3f) << 5) | ((hour & 0x1f) << 11);
return (date << 16) + time;
}
s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
const PFD_SDDRV_SIZE_DEPEND* size_entry;
PFD_SDDRV_SIZE_SETTINGS settings;
u32 entry_index;
u32 requested_sectors;
u32 fat_entry_bits;
u32 fat_sectors;
u32 next_fat_sectors;
u32 total_sectors;
u8 sectors_per_cluster;
const PFD_SDDRV_SIZE_DEPEND* size_entry;
u32 current_start;
u32 reserved_sectors;
u32 total_sectors;
u32 fat_sectors;
u32 fat_entry_bits;
u32 fixed_sectors;
u32 start_sector;
u32 current_start;
u32 next_fat_sectors;
u32 clusters;
u32 candidate_fat_sectors;
u32 reserve_count;
@@ -781,10 +806,9 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
return result;
}
sectors_per_cluster = settings.sectors_per_cluster;
format_data->sectors_per_cluster = sectors_per_cluster;
format_data->sectors_per_cluster = settings.sectors_per_cluster;
total_sectors = format_data->total_sectors;
clusters = total_sectors / sectors_per_cluster;
clusters = total_sectors / format_data->sectors_per_cluster;
if (clusters < 0x1005) {
fat_entry_bits = 12;
} else if (clusters < 0xfff5) {
@@ -792,7 +816,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
} else {
return -31;
}
if (total_sectors % sectors_per_cluster != 0) {
if (total_sectors % format_data->sectors_per_cluster != 0) {
clusters++;
}
candidate_fat_sectors = clusters * fat_entry_bits;
@@ -819,7 +843,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
start_sector += reserved_sectors;
}
moved_start = 0;
clusters = (total_sectors - start_sector - fixed_sectors) / sectors_per_cluster + 1;
clusters = (total_sectors - start_sector - fixed_sectors) / format_data->sectors_per_cluster + 1;
if (clusters >= 0xfe5 && clusters < 0x1005) {
current_start += reserved_sectors;
start_sector = current_start - fixed_sectors;
@@ -844,7 +868,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
format_data->sectors_per_fat = fat_sectors;
format_data->partition_start_sector = start_sector;
format_data->partition_sector_count = format_data->total_sectors - start_sector;
clusters = (format_data->partition_sector_count - (fat_sectors * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
clusters = (format_data->partition_sector_count - (format_data->sectors_per_fat * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
if (clusters < 0xff5) {
format_data->fat_type = 0;
} else if (clusters >= 0xff5) {
@@ -853,22 +877,18 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
return -31;
}
OSTicksToCalendarTime(OSGetTime(), &current_time);
format_data->volume_serial_number = ((((current_time.year - 1900) & 0x7f) << 9) |
((current_time.mon & 0xf) << 5) |
(current_time.mday & 0x1f)) * 0x10000 +
(((current_time.hour & 0x1f) << 11) |
((current_time.min & 0x3f) << 5) |
(current_time.sec & 0x1f));
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
current_time.hour, current_time.min, current_time.sec);
return 0;
}
s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
const PFD_SDDRV_SIZE_DEPEND* size_entry;
PFD_SDDRV_SIZE_SETTINGS settings;
PFD_SDDRV_BPB* boot_sector;
u32 entry_index;
u32 requested_sectors;
const PFD_SDDRV_SIZE_DEPEND* size_entry;
u16 sectors_16;
s32 result;
u32 sectors_32;
@@ -914,42 +934,41 @@ s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
boot_sector->jump[0] = 0xeb;
boot_sector->jump[1] = 0;
boot_sector->jump[2] = 0x90;
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_BPB, bytes_per_sector), 0x200);
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, 1);
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_BPB, reserved_sector_count), 1);
boot_sector->fat_count = 2;
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0x200);
pfd_sddrv_store_le16(boot_sector->total_sectors_16, (u16)sectors_16);
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_BPB, root_entry_count), 0x200);
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_BPB, total_sectors_16), (u16)sectors_16);
boot_sector->media_descriptor = 0xf8;
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, (u16)format_data->sectors_per_fat);
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
pfd_sddrv_store_le32(boot_sector->total_sectors_32, sectors_32);
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_BPB, sectors_per_fat_16), (u16)format_data->sectors_per_fat);
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_BPB, sectors_per_track), (u16)settings.root_entries);
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_BPB, heads), (u16)settings.fat_copies);
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_BPB, hidden_sectors), format_data->partition_start_sector);
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_BPB, total_sectors_32), sectors_32);
boot_sector->drive_number = 0x80;
boot_sector->extended_signature = 0x29;
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_BPB, volume_serial_number), format_data->volume_serial_number);
boot_sector->signature[0] = 0x55;
boot_sector->signature[1] = 0xaa;
return 0;
}
s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
const PFD_SDDRV_SIZE_DEPEND* size_entry;
PFD_SDDRV_SIZE_SETTINGS settings;
PFD_SDDRV_MBR* master_boot_record;
PFD_SDDRV_PARTITION_ENTRY* partition;
u32 entry_index;
u32 requested_sectors;
const PFD_SDDRV_SIZE_DEPEND* size_entry;
s32 result;
u8 start_head;
u8 end_head;
u8 partition_type;
u32 sectors_per_cylinder;
u16 start_cylinder;
u16 end_cylinder;
u8 start_head;
u16 start_sector;
u16 start_cylinder;
u8 end_head;
u16 end_sector;
u16 end_cylinder;
if (format_data == 0) {
return -30;
@@ -971,13 +990,12 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
return result;
}
sectors_per_cylinder = settings.fat_copies * settings.root_entries;
start_cylinder = format_data->partition_start_sector / sectors_per_cylinder;
end_cylinder = (format_data->total_sectors - 1) / sectors_per_cylinder;
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
end_cylinder = (format_data->total_sectors - 1) / (settings.fat_copies * settings.root_entries);
end_head = ((format_data->total_sectors - 1) % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
end_sector = (format_data->total_sectors - 1) % settings.root_entries + 1;
start_head = (format_data->partition_start_sector % sectors_per_cylinder) / settings.root_entries;
end_head = ((format_data->total_sectors - 1) % sectors_per_cylinder) / settings.root_entries;
if (format_data->partition_sector_count == 0) {
return -30;
}
@@ -993,14 +1011,14 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
partition = &master_boot_record->partitions[0];
partition->boot_indicator = 0;
partition->start_head = start_head;
pfd_sddrv_store_le16(partition->start_sector_cylinder,
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
partition->partition_type = partition_type;
partition->end_head = end_head;
pfd_sddrv_store_le16(partition->end_sector_cylinder,
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
master_boot_record->signature[0] = 0x55;
master_boot_record->signature[1] = 0xaa;
return 0;
@@ -1055,8 +1073,9 @@ s32 pfd_sddrv_build_mbr_bpb(u32 total_sectors) {
}
s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
u32 available_sectors;
u8 sectors_per_cluster;
u32 fat_sector_count;
u32 available_sectors;
u32 fat_sectors;
u32 cluster_count;
u32 entry_index;
@@ -1069,10 +1088,7 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
u32 attempts;
s32 result;
u32 next_data_region;
u32 date;
u32 time;
u32 total_sectors;
u8 sectors_per_cluster;
OSCalendarTime current_time;
if (format_data == 0) {
@@ -1148,37 +1164,32 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
format_data->sectors_per_fat = fat_sectors;
format_data->reserved_sectors = reserved_sectors;
format_data->partition_start_sector = 0x2000;
format_data->partition_sector_count = total_sectors - 0x2000;
format_data->partition_sector_count = format_data->total_sectors - 0x2000;
OSTicksToCalendarTime(OSGetTime(), &current_time);
time = ((current_time.hour & 0x1f) << 11) |
((current_time.min & 0x3f) << 5) |
(current_time.sec & 0x1f);
date = (((current_time.year - 1900) & 0x7f) << 9) |
((current_time.mon & 0xf) << 5) |
(current_time.mday & 0x1f);
format_data->volume_serial_number = time + date * 0x10000;
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
current_time.hour, current_time.min, current_time.sec);
return 0;
}
s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
PFD_SDDRV_SIZE_SETTINGS settings;
const PFD_SDDRV_SIZE_DEPEND* size_entry;
PFD_SDDRV_MBR* master_boot_record;
PFD_SDDRV_PARTITION_ENTRY* partition;
u32 entry_index;
u32 requested_sectors;
const PFD_SDDRV_SIZE_DEPEND* size_entry;
s32 result;
u32 cylinder_size;
u16 start_cylinder;
u8 partition_type;
u8 start_head;
u16 start_sector;
u16 end_cylinder;
u16 start_cylinder;
u8 end_head;
u16 end_sector;
u16 end_cylinder;
u32 partition_end;
u8 partition_type;
if (format_data == 0) {
if (format_data == 0 || sector_buffer == 0) {
return -30;
}
pf_memset(&settings, 0, 0x10);
@@ -1198,42 +1209,42 @@ s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
return result;
}
cylinder_size = settings.fat_copies * settings.root_entries;
partition_end = format_data->total_sectors - 1;
partition_type = 0x0b;
if (format_data->partition_start_sector <= 0xfb0400) {
start_cylinder = format_data->partition_start_sector / cylinder_size;
start_head = (format_data->partition_start_sector % cylinder_size) / settings.root_entries;
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
} else {
start_cylinder = 0x3ff;
if (format_data->partition_start_sector > 0xfb0400) {
start_head = 0xfe;
start_sector = 0x3f;
}
if (partition_end <= 0xfb0400) {
end_cylinder = partition_end / cylinder_size;
end_head = (partition_end % cylinder_size) / settings.root_entries;
end_sector = partition_end % settings.root_entries + 1;
start_cylinder = 0x3ff;
} else {
end_cylinder = 0x3ff;
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
}
if (format_data->total_sectors > 0xfb0400) {
end_head = 0xfe;
end_sector = 0x3f;
end_cylinder = 0x3ff;
partition_type = 0x0c;
} else {
partition_end = format_data->total_sectors - 1;
partition_type = 0x0b;
end_cylinder = partition_end / (settings.fat_copies * settings.root_entries);
end_head = (partition_end % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
end_sector = partition_end % settings.root_entries + 1;
}
pf_memset(sector_buffer, 0, 0x200);
master_boot_record = (PFD_SDDRV_MBR*)sector_buffer;
partition = &master_boot_record->partitions[0];
partition->boot_indicator = 0;
partition->start_head = (u8)start_head;
pfd_sddrv_store_le16(partition->start_sector_cylinder,
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
partition->partition_type = partition_type;
partition->end_head = (u8)end_head;
pfd_sddrv_store_le16(partition->end_sector_cylinder,
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
pfd_sddrv_store_le16(master_boot_record->signature, 0xaa55);
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
master_boot_record->signature[0] = 0x55;
master_boot_record->signature[1] = 0xaa;
return 0;
}
@@ -1287,13 +1298,13 @@ s32 pfd_sddrv_store_fat32_fsi_buf(u8* sector_buffer) NO_INLINE {
s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
PFD_SDDRV_SIZE_SETTINGS settings;
const PFD_SDDRV_SIZE_DEPEND* size_entry;
PFD_SDDRV_FAT32_BPB* boot_sector;
u32 entry_index;
u32 requested_sectors;
const PFD_SDDRV_SIZE_DEPEND* size_entry;
s32 result;
if (format_data == 0) {
if (format_data == 0 || sector_buffer == 0) {
return -30;
}
pf_memset(&settings, 0, 0x10);
@@ -1321,33 +1332,29 @@ s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
boot_sector->jump[0] = 0xeb;
boot_sector->jump[1] = 0;
boot_sector->jump[2] = 0x90;
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_FAT32_BPB, bytes_per_sector), 0x200);
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, format_data->reserved_sectors);
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_FAT32_BPB, reserved_sector_count), format_data->reserved_sectors);
boot_sector->fat_count = 2;
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0);
pfd_sddrv_store_le16(boot_sector->total_sectors_16, 0);
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_FAT32_BPB, root_entry_count), 0);
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_16), 0);
boot_sector->media_descriptor = 0xf8;
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, 0);
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
pfd_sddrv_store_le32(boot_sector->total_sectors_32, format_data->partition_sector_count);
pfd_sddrv_store_le32(boot_sector->sectors_per_fat_32, format_data->sectors_per_fat);
pfd_sddrv_store_le16(boot_sector->ext_flags, 0);
pfd_sddrv_store_le16(boot_sector->filesystem_version, 0);
pfd_sddrv_store_le32(boot_sector->root_cluster, 2);
pfd_sddrv_store_le16(boot_sector->fsinfo_sector, 1);
pfd_sddrv_store_le16(boot_sector->backup_boot_sector, 6);
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_16), 0);
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_track), (u16)settings.root_entries);
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_FAT32_BPB, heads), (u16)settings.fat_copies);
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_FAT32_BPB, hidden_sectors), format_data->partition_start_sector);
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_32), format_data->partition_sector_count);
pfd_sddrv_store_le32(sector_buffer, boot_sector->sectors_per_fat_32, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_32), format_data->sectors_per_fat);
pfd_sddrv_store_le16(sector_buffer, boot_sector->ext_flags, offsetof(PFD_SDDRV_FAT32_BPB, ext_flags), 0);
pfd_sddrv_store_le16(sector_buffer, boot_sector->filesystem_version, offsetof(PFD_SDDRV_FAT32_BPB, filesystem_version), 0);
pfd_sddrv_store_le32(sector_buffer, boot_sector->root_cluster, offsetof(PFD_SDDRV_FAT32_BPB, root_cluster), 2);
pfd_sddrv_store_le16(sector_buffer, boot_sector->fsinfo_sector, offsetof(PFD_SDDRV_FAT32_BPB, fsinfo_sector), 1);
pfd_sddrv_store_le16(sector_buffer, boot_sector->backup_boot_sector, offsetof(PFD_SDDRV_FAT32_BPB, backup_boot_sector), 6);
boot_sector->drive_number = 0x80;
boot_sector->extended_signature = 0x29;
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
if (((u32)boot_sector->signature & 1) != 0) {
boot_sector->signature[0] = 0x55;
boot_sector->signature[1] = 0xaa;
} else {
*(u16*)boot_sector->signature = 0x55aa;
}
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_FAT32_BPB, volume_serial_number), format_data->volume_serial_number);
boot_sector->signature[0] = 0x55;
boot_sector->signature[1] = 0xaa;
return 0;
}

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

@@ -1,6 +1,6 @@
#include <private/fa/pdm.h>
#include <revolution/types.h>
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 2] << 16) + (buf)[offset] + (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 1] << 8)))
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 2] << 16) + ((pf_u32)(buf)[(offset) + 1] << 8) + (buf)[offset])
static inline pf_u16 read_boot_u16(pf_u8* buf, pf_u32 offset) {
if ((pf_u32)&buf[offset] & 1) { return (buf[offset + 1] << 8) | buf[offset]; }
return PF_SWAP_16(*(pf_u16*)&buf[(offset + 1) & ~1]);
@@ -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

@@ -214,21 +214,19 @@ pf_s32 PFDIR_CheckDirIsEmpty(PF_ENT_ITER* iter, pf_u32* is_empty) {
PFDIR_SDD* PFDIR_GetSDD(PF_VOLUME* volume, PF_DIR_ENT* entry) {
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)volume;
PFDIR_SDD* first_free_sdd = 0;
PFDIR_SDD* free_candidate = volume_dirs->sdds;
pf_s32 i;
pf_s32 remaining = 3;
for (i = 0; remaining != 0; remaining--) {
if ((volume_dirs->sdds[i].stat & 1) == 0 || ((volume_dirs->sdds[i].stat & 1) != 0 && (!volume_dirs->sdds[i].stat & 2) != 0)) {
if (first_free_sdd == 0) {
first_free_sdd = free_candidate;
first_free_sdd = &volume_dirs->sdds[i];
}
} else if (entry->p_vol == volume_dirs->sdds[i].dir_entry.p_vol &&
entry->entry_sector == volume_dirs->sdds[i].dir_entry.entry_sector &&
entry->entry_offset == volume_dirs->sdds[i].dir_entry.entry_offset) {
return &volume_dirs->sdds[i];
}
free_candidate++;
i++;
}
if (first_free_sdd == 0) {
@@ -1072,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

@@ -347,7 +347,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
if (err != 0) {
return err;
}
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0", 2, 0, 1) == 0)) {
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
return 0;
}
} else {
@@ -366,7 +366,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
if (err != 0) {
return err;
}
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) == 0)) {
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
break;
}
@@ -424,7 +424,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
}
if ((p_ent->attr & 0x10) == 0 || p_ent->short_name[0] != '.') {
p_ent->path_len = (PFSTR_StrNumChar(&token, 1) + 1) + p_ent->path_len;
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) != 0)) {
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) != 0)) {
p_ent->path_len -= PFSTR_StrNumChar(&token, 2);
}
}
@@ -689,7 +689,7 @@ pf_s32 PFENT_ITER_FindEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_STR*
if (PFSTR_StrNCmp(p_pattern, (pf_s8*)"\\", 1, 0, 1) == 0 || PFSTR_StrNCmp(p_pattern, (pf_s8*)"/", 1, 0, 1) == 0) {
err = PFENT_GetRootDir(p_iter->p_vol, p_ent);
if (err != 0) return err;
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0", 2, 0, 1) == 0) return 0;
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0\0\0", 2, 0, 1) == 0) return 0;
} else {
err = PFVOL_GetCurrentDir(p_iter->p_vol, p_ent);
if (err != 0) return err;
@@ -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

@@ -1852,13 +1852,15 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
s32 alreadyAllocated;
u32 completedBytes;
s32 error;
s32 error2;
error = 0;
if ((volume->fsi_flag & 4) != 0) {
error = PFCACHE_AllocateDataPage(volume, -1, &page,
&alreadyAllocated);
if (error != 0) { goto finished; }
{
error2 = PFCACHE_AllocateDataPage(volume, -1, &page,
&alreadyAllocated);
if (error2 != 0) {
return error2;
} else {
error = PFSEC_ReadData(
volume, page->p_buf, volume->bpb.fs_info_sector, 0,
volume->bpb.bytes_per_sector, &completedBytes, 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

@@ -400,20 +400,22 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
case '*': {
do {
pattern_width = volume->codeset.oem_char_width(pattern);
if (pattern_width == 1) {
pattern_char = pf_toupper(*pattern);
if (pattern_width != 1) {
read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)pattern);
} else {
pattern_char = PF_GET_LE_U16((const pf_u8*)pattern);
read_char = pf_toupper(*pattern);
}
pattern_char = (pf_u16)read_char;
pattern += pattern_width;
if (pattern_char == '?') {
if (name_char == 0) { return 1; }
name += name_width;
name_width = volume->codeset.oem_char_width(name);
if (name_width == 1) { name_char = pf_toupper(*name); }
else { name_char = PF_GET_LE_U16((const pf_u8*)name); }
if (name_width == 1) { read_char = pf_toupper(*name); }
else { read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)name); }
name_char = (pf_u16)read_char;
}
} while (pattern_char == '*' || pattern_char == '?');
} while (pattern_char == '?' || pattern_char == '*');
if (pattern_char == 0) {
return 0;
}
@@ -428,21 +430,21 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
}
name_width = volume->codeset.oem_char_width(name);
if (name_width == 1) {
name_char = pf_toupper(*name);
read_char = pf_toupper(*name);
} else {
name_char = PF_GET_LE_U16((const pf_u8*)name);
read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)name);
}
name_char = (pf_u16)read_char;
}
if (*name == 0 || *pattern == 0) {
*matched_end = 1;
}
return 1;
}
default:
if (name_char != pattern_char) { return 1; }
break;
}
name += name_width;
if (*name == 0 || *pattern == 0) {
*matched_end = 1;
}
}
return *name != 0;
}
@@ -1014,7 +1016,7 @@ void PFPATH_SetSearchPattern(pf_s8* p_buf_local, pf_u16* p_buf_unicode, PF_STR*
pf_u32 PFPATH_CheckExtShortNameSignature(PF_STR* p_str) {
pf_u32 result = 0;
pf_s8 sig[2] = {1, 2};
pf_s8 sig[2] = "\x01\x02";
if (PFSTR_StrNCmp(p_str, sig, 1, 0, 2) == 0) {
result = 1;
@@ -1027,7 +1029,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
pf_s16 i;
pf_s16 num;
pf_bool is_wildcard = PF_FALSE;
pf_s8 sig[2] = {1, 2};
pf_s8 sig[2] = "\x01\x02";
pf_s8* p_c;
pf_u16* p_wc;
@@ -1035,7 +1037,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
(PFSTR_StrNCmp(p_str, (pf_s8*)"?", target, 0, 1) == 0 &&
(PFSTR_StrNCmp(p_str, (pf_s8*)"?", target, 1, 1) == 0 || PFSTR_StrNCmp(p_str, (pf_s8*)"*", target, 0, 1) == 0)) ||
PFSTR_StrNCmp(p_str, (pf_s8*)"*", target, 0, 1) == 0) {
for (i = 2; i < 8 && PF_IS_PATH_SEPERATOR(p_str, target, i) == PF_FALSE && PFSTR_StrNCmp(p_str, (pf_s8*)" ", target, i, 1) != 0 &&
for (i = 2; i < 8 && PF_IS_PATH_SEPERATOR(p_str, target, i) == PF_FALSE && PFSTR_StrNCmp(p_str, (pf_s8*)"\x20\0\0", target, i, 1) != 0 &&
PF_IS_PATH_NOT_NULL(p_str, target, i);
i++) {
if (PFSTR_GetCodeMode(p_str) == 1) {
@@ -1059,7 +1061,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
}
}
if (i == 8 || is_wildcard == PF_TRUE) {
if (PFSTR_StrNCmp(p_str, (pf_s8*)" ", target, i, 1) == 0 || PF_IS_PATH_SEPERATOR(p_str, target, i) == 0 ||
if (PFSTR_StrNCmp(p_str, (pf_s8*)"\x20\0\0", target, i, 1) == 0 || PF_IS_PATH_SEPERATOR(p_str, target, i) == 0 ||
PF_IS_PATH_NULL(p_str, target, i)) {
result = i;
}
@@ -1073,7 +1075,7 @@ pf_u32 PFPATH_GetExtShortNameIndex(PF_STR* p_str, pf_u32* p_index) {
pf_s16 i;
pf_s16 num;
pf_u32 index;
pf_s8 sig[2] = {1, 2};
pf_s8 sig[2] = "\x01\x02";
pf_s8* p_c;
pf_u16* p_wc;

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

@@ -224,6 +224,9 @@ typedef struct PFVOL_SET {
PFVOL_SET pf_vol_set;
static s8 default_volume_label[12] = "NO NAME ";
static const u8 deleted_entry_mark[8] = {0xE5};
extern s32 PFDRV_mount(PFVOL_VOLUME* volume);
extern s32 PFDRV_unmount(PFVOL_VOLUME* volume, u32 mode);
extern s32 PFDRV_format(PFVOL_VOLUME* volume, const u8* format_options);
@@ -370,12 +373,7 @@ static inline s32 finalize_volume(PFVOL_VOLUME* volume) {
return 0;
}
static inline s32 copy_codeset(const PFVOL_CHARCODE* code_set) {
pf_vol_set.codeset.oem2unicode = code_set->oem2unicode;
pf_vol_set.codeset.unicode2oem = code_set->unicode2oem;
pf_vol_set.codeset.oem_char_width = code_set->oem_char_width;
pf_vol_set.codeset.is_oem_mb_char = code_set->is_oem_mb_char;
pf_vol_set.codeset.unicode_char_width = code_set->unicode_char_width;
pf_vol_set.codeset.is_unicode_mb_char = code_set->is_unicode_mb_char;
pf_vol_set.codeset = *code_set;
return 0;
}
s32 PFVOL_DoMountVolume(PFVOL_VOLUME* volume) {
@@ -500,7 +498,9 @@ s32 PFVOL_p_setvol(PFVOL_VOLUME* volume, const s8* label) {
s32 error;
error = PFENT_GetRootDir(volume, &root_entry);
if (error == 0) {
if (error != 0) {
return error;
} else {
PFFAT_InitFFD(&ffd, &hint, volume, &root_entry.start_cluster);
PFSTR_InitStr(&path, "*", 1);
PFSTR_SetLocalStr(&path, 0);
@@ -514,7 +514,7 @@ s32 PFVOL_p_setvol(PFVOL_VOLUME* volume, const s8* label) {
entry.start_cluster = 0;
}
} else {
PFSTR_InitStr(&path, "", 1);
PFSTR_InitStr(&path, "\0\0\0", 1);
PFSTR_SetLocalStr(&path, 0);
error = PFENT_allocateEntry(&entry, 1, &ffd, previous_cluster, &path);
if (error != 0) {
@@ -584,7 +584,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
u32 logical_position;
u32 entry_position;
u32 processed;
u8 deleted = (u8)"\xE5"[0];
u8 deleted = deleted_entry_mark[0];
s32 error;
error = PFENT_GetRootDir(volume, &root_entry);
@@ -913,7 +913,7 @@ s32 PFVOL_getvol(s8 drive, PFVOL_VOLUME_INFO* volume_info) {
} else {
volume = &pf_vol_set.volumes[volume_index];
}
if (pf_memcmp(volume->label, "NO NAME ", 11) == 0) {
if (pf_memcmp(volume->label, default_volume_label, 11) == 0) {
pf_vol_set.last_error = 3;
volume->last_error = 3;
return 3;
@@ -945,7 +945,7 @@ s32 PFVOL_rmvvol(s8 drive) {
} else {
volume = &pf_vol_set.volumes[volume_index];
}
if (pf_memcmp(volume->label, "NO NAME ", 11) == 0) {
if (pf_memcmp(volume->label, default_volume_label, 11) == 0) {
pf_vol_set.last_error = 3;
volume->last_error = 3;
return 3;
@@ -956,7 +956,7 @@ s32 PFVOL_rmvvol(s8 drive) {
volume->last_error = error;
return error;
}
error = PFDRV_StoreVolumeLabelToBPB(volume, (const s8*)"NO NAME ");
error = PFDRV_StoreVolumeLabelToBPB(volume, default_volume_label);
if (error != 0) {
pf_vol_set.last_error = error;
volume->last_error = error;
@@ -1536,3 +1536,4 @@ s32 PFVOL_setencode(u32 mode) {
pf_vol_set.setting = pf_vol_set.setting & ~3 | mode;
return 0;
}

View File

@@ -69,17 +69,17 @@ typedef struct {
} KBDChannel;
typedef struct {
u32 callbackAddress;
USBKBDCmdLEDCallback callbackAddress;
void* callbackArg;
} KBDLEDCallbackData;
const char* __KBDVersion =
"<< RVL_SDK - KBD \trelease build: Apr 20 2010 11:21:43 (0x4199_60831) >>";
static BOOL kbdInitialized;
static USBKBDAttachCallback kbdDevAttachCallback;
static USBKBDDetachCallback kbdDevDetachCallback;
static void (*kbdKeyCallback)(KBDKeyEventData* event);
static USBKBDDetachCallback kbdDevDetachCallback;
static USBKBDAttachCallback kbdDevAttachCallback;
static BOOL kbdInitialized;
KBDKeyMapTable kbdKeyMaps = {0};
typedef struct {
@@ -346,7 +346,6 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
event.channel = channel;
event.state = pressed;
event.modifiers = 0;
kbdGetModState(channel, &event.modifiers);
map = &kbdKeyMaps.maps[data->country];
keyCount = map->keypadCount;
@@ -402,86 +401,86 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
KBDChannel* data;
u32 modState;
s32 delta;
u8 flags;
KBDModifierState state;
u32 finalState;
s8 value;
data = &kbdData[channel];
delta = (pressed & 1) != 0 ? 1 : -1;
flags = kbdKeyMaps.maps[data->country].flags;
state.value = data->modState;
kbdGetModState(channel, &state.value);
kbdGetModState(channel, &modState);
switch (key) {
case 0xF001:
if (data->lockState != 0) {
if ((pressed & 1) != 0) {
state.value ^= 2;
modState ^= 2;
}
} else {
value = data->lockCount[1] + delta;
data->lockCount[1] = value;
state.keys.rightControl = (u8)value != 0;
modState = (modState & ~0x2) | (((u8)value != 0) << 1);
}
break;
case 0xF005:
if (data->lockState != 0) {
if ((pressed & 1) != 0) {
state.value ^= 0x20;
modState ^= 0x20;
}
} else {
value = data->lockCount[4] + delta;
data->lockCount[4] = value;
state.keys.rightAlt = (u8)value != 0;
modState = (modState & ~0x20) | (((u8)value != 0) << 5);
}
break;
case 0xF000:
if (data->lockState != 0) {
if ((pressed & 1) != 0) {
state.value ^= 1;
modState ^= 1;
}
} else {
value = data->lockCount[0] + delta;
data->lockCount[0] = value;
state.keys.leftControl = (u8)value != 0;
modState = (modState & ~0x1) | ((u8)value != 0);
}
break;
case 0xF008:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
state.value ^= 0x200;
modState ^= 0x200;
}
break;
case 0xF007:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
state.value ^= 0x100;
modState ^= 0x100;
}
break;
case 0xF006:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
u32 oldState;
u32 lockState;
oldState = state.value;
oldState = modState;
lockState = oldState & 0xC0;
switch (lockState) {
case 0:
if ((flags & 1) == 1) {
state.value = oldState | 0x40;
modState = oldState | 0x40;
}
break;
case 0x40:
{
state.value = oldState & 0xFFFFFFBF;
modState = oldState & 0xFFFFFFBF;
if ((flags & 4) == 4) {
state.value = oldState & 0xFFFFFFBF | 0x80;
modState = oldState & 0xFFFFFFBF | 0x80;
}
}
break;
case 0x80:
state.value = oldState & 0xFFFFFF7F;
modState = oldState & 0xFFFFFF7F;
break;
case 0xC0:
state.value = oldState & 0xFFFFFF3F;
modState = oldState & 0xFFFFFF3F;
break;
}
}
@@ -489,43 +488,43 @@ static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
case 0xF002:
if (data->lockState != 0) {
if ((pressed & 1) != 0) {
state.value ^= 4;
modState ^= 4;
}
} else {
value = data->lockCount[2] + delta;
data->lockCount[2] = value;
state.keys.leftShift = (u8)value != 0;
modState = (modState & ~0x4) | (((u8)value != 0) << 2);
}
break;
case 0xF003:
if (data->lockState != 0) {
if ((pressed & 1) != 0) {
state.value ^= 8;
modState ^= 8;
}
} else {
value = data->lockCount[3] + delta;
data->lockCount[3] = value;
state.keys.rightShift = (u8)value != 0;
modState = (modState & ~0x8) | (((u8)value != 0) << 3);
}
break;
case 0xF004:
if (data->lockState != 0) {
if ((pressed & 1) != 0) {
state.value ^= 0x10;
modState ^= 0x10;
}
} else {
value = data->lockCount[5] + delta;
data->lockCount[5] = value;
state.keys.leftAlt = (u8)value != 0;
modState = (modState & ~0x10) | (((u8)value != 0) << 4);
}
break;
case 0xF021:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
state.value ^= 0x400;
modState ^= 0x400;
}
break;
}
finalState = state.value | 0x1000;
finalState = modState | 0x1000;
KBDSetModState(channel, finalState);
}
@@ -564,28 +563,26 @@ static inline u32 kbdChannelFlags(u32 channel) {
static void kbd_led_handler(BOOL success, void* callbackArg) {
u32 index;
u32 result;
u32 callbackAddress;
u32 err;
index = (u32)callbackArg;
callbackAddress = kbdLCBuf[index].callbackAddress;
kbdCmdBuf[index].device = 0;
if (callbackAddress == 0) {
if (kbdLCBuf[index].callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
return;
}
switch (success) {
case TRUE:
result = 0;
break;
default:
result = 7;
err = 7;
break;
case TRUE:
err = 0;
break;
}
((USBKBDCmdLEDCallback)kbdLCBuf[index].callbackAddress)(result, kbdLCBuf[index].callbackArg);
kbdLCBuf[index].callbackAddress(err, kbdLCBuf[index].callbackArg);
}
USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback, void* callbackArg) {
u32 index;
s32 index;
u32 ofs;
u8 ledBits;
BOOL interrupts;
USBKBDErr result;
@@ -595,62 +592,66 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
if (channel >= 4) {
return 4;
}
if ((s32)kbdData[(u8)channel].flags == 1 || (s32)kbdData[(u8)channel].flags == 4) {
return 5;
}
ledBits = leds;
interrupts = OSDisableInterrupts();
for (index = 0; index < 12; index++) {
if (kbdCmdBuf[index].device == 0) {
kbdCmdBuf[index].device = (u32)kbdData[channel].device;
break;
}
}
OSRestoreInterrupts(interrupts);
if (index == 12) {
return 7;
}
kbdLCBuf[index].callbackAddress = (u32)callback;
kbdLCBuf[index].callbackArg = callbackArg;
result = USBKBDSetLEDAsync((u32)kbdData[channel].device, ledBits,
(USBKBDCmdLEDAsync*)&kbdCmdBuf[index],
kbd_led_handler, (void*)index);
switch (result) {
case 0:
return 0;
default:
return 7;
}
}
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
u32 index;
BOOL interrupts;
USBKBDErr result;
if (!kbdInitialized) {
return 2;
}
if (channel >= 4) {
return 4;
}
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
return 5;
}
leds &= 0xff;
ledBits = leds;
interrupts = OSDisableInterrupts();
index = 0;
while (index < 12) {
if ((kbdCmdBuf + index)->device == 0) {
kbdCmdBuf[index].device = (u32)kbdData[channel].device;
for (index = 0, ofs = 0; index < 12; index++, ofs += sizeof(KBDLEDCommand)) {
if (*(u32*)&((u8*)kbdCmdBuf)[ofs] == 0) {
*(u32*)&((u8*)kbdCmdBuf)[ofs] = (u32)kbdData[channel].device;
break;
}
index++;
}
OSRestoreInterrupts(interrupts);
if (index == 12) {
return 7;
}
result = USBKBDSetLED((u32)kbdData[channel].device, leds,
kbdLCBuf[index].callbackAddress = callback;
kbdLCBuf[index].callbackArg = callbackArg;
result = USBKBDSetLEDAsync((u32)kbdData[channel].device, ledBits,
(USBKBDCmdLEDAsync*)&kbdCmdBuf[index],
kbd_led_handler, (void*)index);
switch (result) {
default:
return 7;
case 0:
return 0;
}
}
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
u32 index;
KBDLEDCommand* command;
BOOL interrupts;
USBKBDErr result;
u8 ledBits;
if (!kbdInitialized) {
return 2;
}
if (channel >= 4) {
return 4;
}
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
return 5;
}
ledBits = leds & 0xff;
interrupts = OSDisableInterrupts();
index = 0;
command = kbdCmdBuf;
while (index < 12) {
if (command->device == 0) {
command->device = (u32)kbdData[channel].device;
break;
}
index++;
command++;
}
OSRestoreInterrupts(interrupts);
if (index == 12) {
return 7;
}
result = USBKBDSetLED((u32)kbdData[channel].device, ledBits,
(USBKBDCmdLED*)&kbdCmdBuf[index]);
kbdCmdBuf[index].device = 0;
switch (result) {
@@ -837,30 +838,28 @@ USBKBDErr KBDSetModState(u32 channel, u32 value) {
kbdData[channel].modState = value & ~0x1000;
} else {
BOOL interrupts;
KBDModifierState* state;
KBDModifierState oldState;
KBDModifierState newState;
interrupts = OSDisableInterrupts();
state = (KBDModifierState*)&kbdData[channel].modState;
newState.value = value & 0xfc0;
oldState = *state;
oldState.value = kbdData[channel].modState;
newState.bits.physical = oldState.bits.physical;
*state = newState;
kbdData[channel].modState = newState.value;
OSRestoreInterrupts(interrupts);
}
return 0;
}
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;

File diff suppressed because it is too large Load Diff

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

@@ -169,13 +169,13 @@ static inline char* __nupFindTag(char* response, const char* endTag, const char*
char** value, size_t* length) {
char* start;
char* end;
if (response != 0 && (start = strstr(response, startTag)) != 0 &&
(end = strstr(start, endTag)) != 0) {
*value = start + strlen(startTag);
*length = end - *value;
return end + strlen(endTag);
if (response == 0 || (start = strstr(response, startTag)) == 0 ||
(end = strstr(start, endTag)) == 0) {
return 0;
}
return 0;
*value = start + strlen(startTag);
*length = end - *value;
return end + strlen(endTag);
}
static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* messageId,
@@ -192,11 +192,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
const char* versionStartTag = "<Version>";
afterEnd = __nupFindTag(response, versionEndTag, versionStartTag,
&start, &valueLength);
if (afterEnd == 0) {
result = -5004;
goto done;
}
if (valueLength != strlen("1.0") || strncmp(start, "1.0", valueLength) != 0) {
if (afterEnd == 0 || valueLength != strlen("1.0") || strncmp(start, "1.0", valueLength) != 0) {
result = -5004;
goto done;
}
@@ -207,11 +203,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
const char* deviceIdStartTag = "<DeviceId>";
afterEnd = __nupFindTag(response, deviceIdEndTag, deviceIdStartTag,
&start, &valueLength);
if (afterEnd == 0) {
result = -5004;
goto done;
}
if (strtoull(start, 0, 10) != deviceId) {
if (afterEnd == 0 || strtoull(start, 0, 10) != deviceId) {
result = -5004;
goto done;
}
@@ -222,11 +214,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
const char* messageIdStartTag = "<MessageId>";
afterEnd = __nupFindTag(response, messageIdEndTag, messageIdStartTag,
&start, &valueLength);
if (afterEnd == 0) {
result = -5004;
goto done;
}
if (valueLength != strlen(messageId) || strncmp(start, messageId, valueLength) != 0) {
if (afterEnd == 0 || valueLength != strlen(messageId) || strncmp(start, messageId, valueLength) != 0) {
result = -5004;
goto done;
}
@@ -237,11 +225,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
const char* errorCodeStartTag = "<ErrorCode>";
afterEnd = __nupFindTag(response, errorCodeEndTag, errorCodeStartTag,
&start, &valueLength);
if (afterEnd == 0) {
result = -5004;
goto done;
}
if (valueLength != strlen("0") || strncmp(start, "0", valueLength) != 0) {
if (afterEnd == 0 || valueLength != strlen("0") || strncmp(start, "0", valueLength) != 0) {
result = -5004;
goto done;
}
@@ -252,15 +236,15 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
const char* uploadAuditStartTag = "<UploadAuditData>";
afterEnd = __nupFindTag(response, uploadAuditEndTag, uploadAuditStartTag,
&start, &valueLength);
if (afterEnd == 0) {
if (afterEnd == 0 || valueLength != strlen("0") || (*start != '0' && *start != '1')) {
result = -5004;
goto done;
}
if (valueLength != strlen("0") || (*start != '0' && *start != '1')) {
result = -5004;
goto done;
if (*start == '0') {
context->uploadAuditData = 0;
} else {
context->uploadAuditData = 1;
}
context->uploadAuditData = *start == '1';
}
{
@@ -268,11 +252,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
const char* contentPrefixStartTag = "<ContentPrefixURL>";
afterEnd = __nupFindTag(response, contentPrefixEndTag, contentPrefixStartTag,
&start, &valueLength);
if (afterEnd == 0) {
result = -5004;
goto done;
}
if (valueLength == 0) {
if (afterEnd == 0 || valueLength == 0) {
result = -5004;
goto done;
}
@@ -290,11 +270,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
const char* uncachedPrefixStartTag = "<UncachedContentPrefixURL>";
afterEnd = __nupFindTag(response, uncachedPrefixEndTag, uncachedPrefixStartTag,
&start, &valueLength);
if (afterEnd == 0) {
result = -5004;
goto done;
}
if (valueLength == 0) {
if (afterEnd == 0 || valueLength == 0) {
result = -5004;
goto done;
}
@@ -310,19 +286,14 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
titleCount = 0;
cursor = response;
{
const char* titleIdEndTag = "</TitleId>";
const char* titleIdStartTag = "<TitleId>";
const char* versionEndTag = "</Version>";
const char* versionStartTag = "<Version>";
for (;;) {
cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag, &start, &valueLength);
if (cursor == 0) {
break;
}
cursor = __nupFindTag(cursor, versionEndTag, versionStartTag, &start, &valueLength);
if (cursor == 0) {
break;
}
const char* titleIdEndTag = "</TitleId>";
const char* titleIdStartTag = "<TitleId>";
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
&start, &valueLength)) != 0 &&
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
&start, &valueLength)) != 0) {
titleCount++;
}
}
@@ -335,26 +306,19 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
memset(context->titles, 0, titleCount * sizeof(NUPTitleInfo));
cursor = response;
{
const char* titleIdEndTag = "</TitleId>";
const char* titleIdStartTag = "<TitleId>";
const char* versionEndTag = "</Version>";
const char* versionStartTag = "<Version>";
for (;;) {
char* titleStart;
char* versionStart;
size_t titleLength;
size_t versionLength;
char* parsedEnd;
cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
&titleStart, &titleLength);
if (cursor == 0) {
break;
}
cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
&versionStart, &versionLength);
if (cursor == 0) {
break;
}
const char* titleIdEndTag = "</TitleId>";
const char* titleIdStartTag = "<TitleId>";
char* titleStart;
char* versionStart;
size_t titleLength;
size_t versionLength;
char* parsedEnd;
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
&titleStart, &titleLength)) != 0 &&
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
&versionStart, &versionLength)) != 0) {
unsigned long long titleId = strtoull(titleStart, &parsedEnd, 16);
if (parsedEnd != titleStart + titleLength) {
result = -5004;
@@ -365,12 +329,13 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
result = -5004;
goto done;
}
if ((u16)version != version) {
u16 checkedVersion = version;
if (version != checkedVersion) {
result = -5004;
goto done;
}
context->titles[context->titleCount].titleId = titleId;
context->titles[context->titleCount].serverVersion = version;
context->titles[context->titleCount].serverVersion = checkedVersion;
context->titleCount++;
}
}
@@ -401,9 +366,9 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
result = -5000;
} else {
snprintf(endpoint, endpointSize, "https://%s/nus/services/NetUpdateSOAP", serverAddress);
requestSize = strlen(messageId);
requestSize += strlen(productArea);
requestSize += strlen(countryCode) + 0x449;
requestSize = strlen(messageId) + strlen(productArea);
unsigned long countryLength = strlen(countryCode);
requestSize += countryLength + 0x449;
if (auditData != 0) {
requestSize += strlen(auditData);
}
@@ -514,8 +479,11 @@ static u32 __nupSetAuditState(u8 state) {
}
#pragma dont_inline reset
static inline unsigned long __nupBase64EncodedSize(unsigned long length) {
return ((length + 2) / 3) * 4;
}
static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
const char* alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
u8* end = input + length;
u32 value = 0;
u32 count = 0;
@@ -523,23 +491,31 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
while (input != end) {
count++;
value = value << 8 | *input++;
value <<= 8;
value |= *input++;
if (count < 3) {
continue;
}
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
output[2] = alphabet[value >> 6 & 0x3f];
output[3] = alphabet[value & 0x3f];
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
output[1] = encodedSecond;
u8 encodedFourth = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value & 0x3f];
output[2] = encodedThird;
output[3] = encodedFourth;
count = 0;
output += 4;
}
if (count == 2) {
value <<= 8;
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
output[2] = alphabet[value >> 6 & 0x3f];
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
output[1] = encodedSecond;
output[2] = encodedThird;
output[3] = fillByte;
return;
}
@@ -547,8 +523,10 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
return;
}
value <<= 16;
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
output[1] = encodedSecond;
output[2] = fillByte;
output[3] = fillByte;
}
@@ -558,16 +536,16 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
u32 auditFormat = 0;
ESTicketView* ticketViews = 0;
u32 viewCount;
u32 selected = 0;
u32 selectedIndex = 0;
void* auditRecord = 0;
void* signatureCertificate = 0;
void* deviceCertificate = 0;
NUPSignedAuditData* signedData = 0;
void* encodedData = 0;
u32 i;
u32 selectedIndex;
u32 selected = 0;
ESSignature signature ALIGN32;
char deviceInfo[0x21];
u32 i;
for (i = 0; selected == 0 && i < context->ownedTitleCount; i++) {
ESTitleId ownedTitleId = context->ownedTitleIds[i];
@@ -594,11 +572,13 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
if (selected != 0) {
memset(deviceInfo, 0, sizeof(deviceInfo));
char* productCode = SCGetProductCode();
unsigned long productCodeSize = 0;
unsigned long productCodeSize;
if (productCode != 0) {
memcpy(deviceInfo, productCode, 5);
deviceInfo[4] = '\0';
productCodeSize = strlen(deviceInfo);
} else {
productCodeSize = 0;
}
if (SCGetProductSNString(deviceInfo + productCodeSize, sizeof(deviceInfo) - productCodeSize) == 0) {
memset(deviceInfo + productCodeSize, 0, sizeof(deviceInfo) - productCodeSize);
@@ -629,16 +609,22 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
result = -5000;
} else {
memcpy(&signedData->format, &auditFormat, sizeof(auditFormat));
memcpy(&signedData->auditRecord, auditRecord, sizeof(NUPAuditRecord));
memcpy(signedData->signature, signature, sizeof(signature));
memcpy(signedData->signatureCertificate, signatureCertificate, 0x180);
memcpy(signedData->deviceCertificate, deviceCertificate, 0x180);
encodedData = nup::__nupMalloc(0x5a1);
u8* auditCursor = (u8*)&signedData->auditRecord;
memcpy(auditCursor, auditRecord, sizeof(NUPAuditRecord));
auditCursor += sizeof(NUPAuditRecord);
memcpy(auditCursor, signature, sizeof(signature));
auditCursor += sizeof(signature);
memcpy(auditCursor, signatureCertificate, 0x180);
memcpy(auditCursor + sizeof(signedData->signatureCertificate),
deviceCertificate, sizeof(signedData->deviceCertificate));
unsigned long auditSize = sizeof(NUPSignedAuditData);
unsigned long encodedSize = __nupBase64EncodedSize(auditSize);
encodedData = nup::__nupMalloc(encodedSize + 1);
if (encodedData == 0) {
result = -5000;
} else {
__nupBase64Encode((u8*)encodedData, (u8*)signedData, sizeof(NUPSignedAuditData));
((u8*)encodedData)[0x5a0] = 0;
__nupBase64Encode((u8*)encodedData, (u8*)signedData, auditSize);
((u8*)encodedData)[encodedSize] = 0;
}
}
}
@@ -695,23 +681,59 @@ static s32 __nupGetTmdView(ESTitleId titleId, ESTmdView** tmdView) {
}
#pragma dont_inline reset
template <class Title>
static inline BOOL __nupHasContent(const Title* title, ESContentId contentId) {
if (title->contentCount == 0 || title->contentIds == 0) {
return FALSE;
}
ESContentId* installedContent;
u32 index;
for (index = 0; index < title->contentCount; index++) {
if (contentId == *(installedContent = &title->contentIds[index])) {
break;
}
}
return index < title->contentCount;
}
static inline BOOL __nupHasInstalledContent(const ESTitleVersion* title, ESContentId contentId,
u32 contentCount) {
if (contentCount == 0 || title->contentIds == 0) {
return FALSE;
}
ESContentId* installedContent;
u32 index;
for (index = 0; index < contentCount; index++) {
if (contentId == *(installedContent = &title->contentIds[index])) {
break;
}
}
return index < contentCount;
}
static inline s32 __nupSetBootTitleVersion(ESTitleVersion* title) {
u32 bootVersion;
s32 result = ES_GetBoot2Version(&bootVersion);
if (result == 0) {
u16 installedVersion = bootVersion;
if (installedVersion != bootVersion) {
result = -0x1389;
} else {
title->installedVersion = installedVersion;
}
}
return result;
}
static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
s32 result;
ESTmdView* tmdView = 0;
if (title->titleId == 0x0000000100000001ULL) {
u32 bootVersion;
title->hasTicket = 1;
title->hasTmd = 1;
title->hasContent = 1;
result = ES_GetBoot2Version(&bootVersion);
if (result == 0) {
if ((bootVersion & 0xffff) == bootVersion) {
title->installedVersion = bootVersion;
} else {
result = -0x1389;
}
}
result = __nupSetBootTitleVersion(title);
} else {
u32 i;
for (i = 0; i < context->ownedTitleCount; i++) {
@@ -729,49 +751,48 @@ static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
title->installedVersion = tmdView->head.titleVersion;
} else if (result == -0x6a) {
result = 0;
}
if (result < 0) {
} else if (result < 0) {
goto done;
}
if (tmdView != 0) {
result = ES_ListTitleContentsOnCard(title->titleId, 0, &title->contentCount);
if (result == -0x6a) {
result = 0;
} else if (result == 0) {
if (result == 0) {
if (title->contentCount != 0) {
title->contentIds = (ESContentId*)nup::__nupMalloc(title->contentCount * sizeof(ESContentId));
if (title->contentIds == 0) {
result = -5000;
title->contentCount = 0;
} else {
result = ES_ListTitleContentsOnCard(title->titleId, title->contentIds, &title->contentCount);
if (result != 0) {
nup::__nupFree(title->contentIds);
title->contentIds = 0;
title->contentCount = 0;
}
goto done;
}
result = ES_ListTitleContentsOnCard(title->titleId, title->contentIds, &title->contentCount);
if (result != 0) {
nup::__nupFree(title->contentIds);
title->contentIds = 0;
title->contentCount = 0;
goto done;
}
}
if (result == 0 && title->contentCount >= tmdView->head.numContents) {
s32 contentIndex;
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
u32 installedIndex;
for (installedIndex = 0; installedIndex < title->contentCount; installedIndex++) {
if (title->contentIds[installedIndex] == tmdView->contents[contentIndex].cid) {
break;
}
}
if (installedIndex == title->contentCount) {
break;
}
}
if (contentIndex >= tmdView->head.numContents) {
title->hasContent = 1;
u32 installedContentCount = title->contentCount;
if (installedContentCount < tmdView->head.numContents) {
goto done;
}
s32 contentIndex;
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
if (!__nupHasInstalledContent(title, tmdView->contents[contentIndex].cid,
installedContentCount)) {
break;
}
}
if (contentIndex < tmdView->head.numContents) {
goto done;
}
title->hasContent = 1;
goto done;
}
}
if (result == -0x6a) {
result = 0;
}
}
done:
@@ -884,24 +905,9 @@ static s32 __nupGetTmd(NUPTitleInfo* title, char* contentPrefixUrl) {
return result;
}
static inline BOOL __nupHasContent(const NUPTitleInfo* title, ESContentId contentId) {
if (title->contentCount == 0 || title->contentIds == 0) {
return FALSE;
}
ESContentId* installedContent = title->contentIds;
u32 index;
for (index = 0; index < title->contentCount; index++) {
if (contentId == *installedContent) {
break;
}
installedContent++;
}
return index < title->contentCount;
}
static s32 __nupGetTitleSize(NUPTitleInfo* title) {
s32 contentIndex;
s32 result = 0;
s32 contentIndex;
title->progressStep += 2;
if (title->hasTicket == 0) {
title->progressStep += 1;
@@ -917,14 +923,15 @@ static s32 __nupGetTitleSize(NUPTitleInfo* title) {
title->installedContentSize += 0x4000;
for (contentIndex = 0; contentIndex < ((ESTmdView*)title->tmdView)->head.numContents; contentIndex++) {
ESCmdView* content = &((ESTmdView*)title->tmdView)->contents[contentIndex];
if (!__nupHasContent(title, content->cid) ||
ESContentId contentId = content->cid;
if (!__nupHasContent(title, contentId) ||
title->titleId == 0x0000000100000001ULL) {
if (content->size >= 0xfffffff0ULL) {
if (content->size > 0xffffffefULL) {
result = -0x1394;
break;
}
title->updateContentSize += (content->size + 0xf) & 0xfffffffffffffff0ULL;
title->installedContentSize += (content->size + 0x3fff) & 0xffffffffffffc000ULL;
title->installedContentSize += (((ESTmdView*)title->tmdView)->contents[contentIndex].size + 0x3fff) & 0xffffffffffffc000ULL;
title->progressStep++;
}
}
@@ -977,10 +984,11 @@ static s32 __nupGetContentFull(NUPContextInfo* context, NUPTitleInfo* title, cha
}
static s32 __nupGetContentIncr(NUPContextInfo* context, NUPTitleInfo* title, char* contentPrefixUrl) {
s32 contentIndex;
s32 result = 0;
char* url;
unsigned long urlSize = strlen(contentPrefixUrl) + 0x28;
char* url = (char*)nup::__nupMalloc(urlSize);
url = (char*)nup::__nupMalloc(urlSize);
s32 contentIndex;
if (url == 0) {
result = -5000;
@@ -989,14 +997,14 @@ static s32 __nupGetContentIncr(NUPContextInfo* context, NUPTitleInfo* title, cha
ESContentId contentId = ((ESTmdView*)title->tmdView)->contents[contentIndex].cid;
if (!__nupHasContent(title, contentId)) {
snprintf(url, urlSize, "%s/%016llx/%08x", contentPrefixUrl, title->titleId, contentId);
unsigned long contentSize = ((ESTmdView*)title->tmdView)->contents[contentIndex].size;
unsigned long contentSize = (u32)((((ESTmdView*)title->tmdView)->contents[contentIndex].size + 0xf) & 0xfffffffffffffff0ULL);
ESFd fd = ES_ImportContentBegin(title->titleId, contentId);
result = fd;
if (result < 0) {
ES_ImportContentEnd(fd);
break;
}
result = __nupHttpGetIncr(url, (contentSize + 0xf) & 0xfffffff0,
result = __nupHttpGetIncr(url, contentSize,
__nupUpdateStatusIncr, context, __nupHttpBufferFlushES, (void*)fd);
if (result != 0) {
ES_ImportContentEnd(fd);
@@ -1085,6 +1093,16 @@ static void __nupCleanup(NUPContextInfo* context) {
context->productArea = 0;
}
static inline s32 __nupCheckTitleSpace(const NUPTitleInfo* title) {
ISFSStats stats;
s32 result = ISFS_GetStats(&stats);
if (result == 0 && (title->installedContentSize >> 14) <= stats.freeBlocks &&
title->progressStep <= stats.freeInodes) {
result = 1;
}
return result;
}
static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char* contentPrefixUrl,
char* uncachedContentPrefixUrl) {
s32 result;
@@ -1109,13 +1127,9 @@ static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char*
if (result != 0) {
goto done;
}
goto cleanup;
} else {
ISFSStats stats;
result = ISFS_GetStats(&stats);
if (result == 0 && stats.freeBlocks >= (title->installedContentSize >> 14) &&
title->progressStep <= stats.freeInodes) {
result = 1;
}
result = __nupCheckTitleSpace(title);
if (result == 0) {
result = -0x1392;
goto done;
@@ -1144,47 +1158,97 @@ static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char*
goto done;
}
result = ES_ImportTitleDone();
if (result != 0) {
goto done;
}
}
if (result == 0) {
__nupCleanupTitleInfo(title);
title->updateRequired = 0;
}
cleanup:
__nupCleanupTitleInfo(title);
title->updateRequired = 0;
done:
return result;
}
static inline s32 __nupGetBoot2Version(u16* version) {
u32 bootVersion;
s32 result = ES_GetBoot2Version(&bootVersion);
if (result == 0) {
u16 checkedVersion = bootVersion;
*version = checkedVersion;
if (checkedVersion != bootVersion) { result = -0x1389; }
}
return result;
}
static inline s32 __nupGetOwnedTitles(NUPContextInfo* context) {
s32 result = ES_ListOwnedTitles(0, &context->ownedTitleCount);
if (result == 0) {
context->ownedTitleIds = (ESTitleId*)nup::__nupMalloc(context->ownedTitleCount * sizeof(ESTitleId));
if (context->ownedTitleIds != 0) {
result = ES_ListOwnedTitles(context->ownedTitleIds, &context->ownedTitleCount);
} else {
result = -5000;
}
}
return result;
}
static inline s32 __nupCheckTitleVersion(NUPContextInfo* context, NUPTitleInfo* title) {
s32 result = __nupGetBootVersion(context, (ESTitleVersion*)title);
if (result == 0) {
if (title->hasTicket && title->hasTmd && title->hasContent &&
title->installedVersion >= title->serverVersion) {
title->updateRequired = 0;
} else {
title->updateRequired = 1;
}
}
if (result >= 0) {
result = title->updateRequired;
}
return result;
}
static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
OSLockMutex(&context->mutex);
context->progress.result = status;
if (status < 0) {
context->progress.message = __nupStatusMessage[5];
} else if (status >= 4) {
context->progress.message = __nupStatusMessage[4];
} else {
context->progress.message = __nupStatusMessage[status];
}
OSUnlockMutex(&context->mutex);
}
extern "C" void* __nupOp(void* argument) {
NUPContextInfo* context = (NUPContextInfo*)argument;
u8* response = 0;
ESTmdView* tmdView = 0;
u32 currentDeviceId;
u32 needsAudit;
char* auditData = 0;
NUPTitleInfo* bootTitle = 0;
NUPTitleInfo* menuTitle = 0;
NUPTitleInfo* systemTitle = 0;
u32 deviceId;
u32 bootVersion;
s32 result;
u16 serverBootVersion = 0;
u16 bootTitleVersion;
u16 systemMenuVersion;
ESTitleId currentTitleId;
NUPTitleInfo* bootTitle = 0;
NUPTitleInfo* menuTitle = 0;
NUPTitleInfo* systemTitle = 0;
NUPContextInfo* context = (NUPContextInfo*)argument;
u32 deviceId;
char messageId[0x15];
NANDStatus auditStatus;
s32 result;
u32 i;
BOOL needsAudit;
snprintf(messageId, sizeof(messageId), "%llu", OSGetTime());
result = ES_GetDeviceId(&deviceId);
if (result != 0) {
goto done;
}
result = ES_GetBoot2Version(&bootVersion);
if (result == 0) {
serverBootVersion = bootVersion;
if (serverBootVersion != bootVersion) {
result = -0x1389;
}
}
currentDeviceId = deviceId;
result = __nupGetBoot2Version(&serverBootVersion);
if (result < 0) {
goto done;
}
@@ -1203,15 +1267,7 @@ extern "C" void* __nupOp(void* argument) {
systemMenuVersion = tmdView->head.titleVersion;
nup::__nupFree(tmdView);
tmdView = 0;
result = ES_ListOwnedTitles(0, &context->ownedTitleCount);
if (result == 0) {
context->ownedTitleIds = (ESTitleId*)nup::__nupMalloc(context->ownedTitleCount * sizeof(ESTitleId));
if (context->ownedTitleIds != 0) {
result = ES_ListOwnedTitles(context->ownedTitleIds, &context->ownedTitleCount);
} else {
result = -5000;
}
}
result = __nupGetOwnedTitles(context);
if (result != 0) {
goto done;
}
@@ -1230,7 +1286,7 @@ extern "C" void* __nupOp(void* argument) {
context->progress.message = __nupStatusMessage[2];
OSUnlockMutex(&context->mutex);
result = __nupGetServerInfo((char*)context->serverAddress, messageId,
0x0000000100000000ULL | deviceId,
0x0000000100000000ULL | currentDeviceId,
(char*)context->productArea, (char*)context->countryCode,
context->systemVersion, auditData, serverBootVersion, bootTitleVersion,
currentTitleId, systemMenuVersion, (char**)&response);
@@ -1242,7 +1298,7 @@ extern "C" void* __nupOp(void* argument) {
}
auditData = 0;
result = __nupParseServerInfo(context, (char*)response, messageId,
0x0000000100000000ULL | deviceId);
0x0000000100000000ULL | currentDeviceId);
if (result != 0) {
goto done;
}
@@ -1254,18 +1310,7 @@ extern "C" void* __nupOp(void* argument) {
}
for (i = 0; i < context->titleCount; i++) {
NUPTitleInfo* title = &context->titles[i];
result = __nupGetBootVersion(context, (ESTitleVersion*)title);
if (result == 0) {
if (title->hasTicket && title->hasTmd && title->hasContent &&
title->installedVersion >= title->serverVersion) {
title->updateRequired = 0;
} else {
title->updateRequired = 1;
}
}
if (result >= 0) {
result = title->updateRequired;
}
result = __nupCheckTitleVersion(context, title);
if (result < 0) {
goto done;
}
@@ -1305,11 +1350,12 @@ extern "C" void* __nupOp(void* argument) {
OSUnlockMutex(&context->mutex);
for (i = 0; i < context->titleCount; i++) {
NUPTitleInfo* title = &context->titles[i];
if (title->titleId == 0x0000000100000001ULL) {
ESTitleId titleId = title->titleId;
if (titleId == 0x0000000100000001ULL) {
bootTitle = title;
} else if (title->titleId == 0x0000000100000002ULL) {
} else if (titleId == 0x0000000100000002ULL) {
menuTitle = title;
} else if (title->titleId == currentTitleId) {
} else if (titleId == currentTitleId) {
systemTitle = title;
}
if (bootTitle != 0 && menuTitle != 0 && systemTitle != 0) {
@@ -1368,17 +1414,11 @@ done:
}
__nupCleanup(context);
if (result >= 0) {
OSLockMutex(&context->mutex);
context->progress.result = 0;
context->progress.message = __nupStatusMessage[0];
OSUnlockMutex(&context->mutex);
__nupSetStatus(context, 0);
} else {
OSLockMutex(&context->mutex);
context->progress.result = result;
context->progress.message = __nupStatusMessage[5];
OSUnlockMutex(&context->mutex);
__nupSetStatus(context, result);
}
return 0;
return (void*)result;
}
void* NUP_Init(MEMAllocator* allocator) {

View File

@@ -2,7 +2,7 @@
#include <private/os/OSTime.h>
#include <private/bus.h>
static int __i2c_ident_flag = 1;
static volatile int __i2c_ident_flag = 1;
static u32 __i2c_ident_first;
#define I2C_OUT 0xCD8000C0

File diff suppressed because it is too large Load Diff

View File

@@ -138,7 +138,25 @@ static s32 Vdac_Flag_Region;
static s32 __type;
static s32 __gamma;
static s32 __level;
u32 Vdac_Flag_Changed_816991E0;
volatile u32 Vdac_Flag_Changed_816991E0;
static void __VISetCCSEL(u8 flag) {
u8 data[2];
data[0] = 0x6a;
data[1] = TRUE;
__VISendI2CData(0xe0, data, sizeof(data));
WaitMicroTime(2);
}
static void __VISetOverSampling(u8 flag) {
u8 data[2];
data[0] = 0x65;
data[1] = TRUE;
__VISendI2CData(0xe0, data, sizeof(data));
WaitMicroTime(2);
}
void __VISetVolume(u8 wd0, u8 wd1) {
u8 data[3];
@@ -233,36 +251,38 @@ void __VISetClosedCaption(void) {
WaitMicroTime(2);
}
typedef const u8* __VIMacrovisionImm;
static void __VISetMacrovisionImm(__VIMacrovisionImm macrovisionImm)
{
u8 data[0x1a + 1];
u8 i;
data[0] = 0x40;
for (i = 1; i < sizeof(data); i++) {
data[i] = macrovisionImm[i - 1];
}
__VISendI2CData(0xe0, data, sizeof(data));
WaitMicroTime(2);
}
void __VISetMacrovision(void) {
switch (__type) {
case 2:
switch (__tvType) {
case 0: {
u8 data[0x1b];
COPY_ACP(data, VINtscACPType1);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VINtscACPType1);
break;
}
case 1: {
u8 data[0x1b];
COPY_ACP(data, VIPalACPType1);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIPalACPType1);
break;
}
case 2: {
u8 data[0x1b];
COPY_ACP(data, VIMpalACPType1);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIMpalACPType1);
break;
}
case 5: {
u8 data[0x1b];
COPY_ACP(data, VIEurgb60ACPType1);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIEurgb60ACPType1);
break;
}
}
@@ -270,31 +290,19 @@ void __VISetMacrovision(void) {
case 3:
switch (__tvType) {
case 0: {
u8 data[0x1b];
COPY_ACP(data, VINtscACPType2);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VINtscACPType2);
break;
}
case 1: {
u8 data[0x1b];
COPY_ACP(data, VIPalACPType2);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIPalACPType2);
break;
}
case 2: {
u8 data[0x1b];
COPY_ACP(data, VIMpalACPType2);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIMpalACPType2);
break;
}
case 5: {
u8 data[0x1b];
COPY_ACP(data, VIEurgb60ACPType2);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIEurgb60ACPType2);
break;
}
}
@@ -302,103 +310,74 @@ void __VISetMacrovision(void) {
case 4:
switch (__tvType) {
case 0: {
u8 data[0x1b];
COPY_ACP(data, VINtscACPType3);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VINtscACPType3);
break;
}
case 1: {
u8 data[0x1b];
COPY_ACP(data, VIPalACPType3);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIPalACPType3);
break;
}
case 2: {
u8 data[0x1b];
COPY_ACP(data, VIMpalACPType3);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIMpalACPType3);
break;
}
case 5: {
u8 data[0x1b];
COPY_ACP(data, VIEurgb60ACPType3);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIEurgb60ACPType3);
break;
}
}
break;
case 1: {
u8 data[0x1b];
COPY_ACP(data, VIZeroACPType);
__VISendI2CData(0xe0, data, 0x1b);
WaitMicroTime(2);
__VISetMacrovisionImm(VIZeroACPType);
break;
}
}
}
void VISetMacrovision(s32 type) {
u8 oldType;
u8 oldWd2;
u8 oldWd0;
u8 mode;
u32 volume;
u8 newType;
u8 newWd2;
s32 tvFormat;
mode = 0;
volume = 0;
oldWd0 = __wd0;
oldType = __wd1;
oldWd2 = __wd2;
newType = oldType;
if (type == 3) {
goto type3;
}
if (type < 3) {
if (type == 1) {
goto type1;
} else if (type >= 1) {
goto type2;
}
goto done;
}
if (type >= 5) {
goto done;
}
goto type5;
type1:
mode = 0;
volume = 0;
goto done;
type2:
mode = 2;
volume = 3;
newType = 0;
goto done;
type3:
mode = 1;
volume = 3;
newType = 0;
goto done;
type5:
mode = 3;
volume = 3;
newType = 0;
done:
volume |= oldWd2 & 0xf0;
newWd2 = volume | mode << 2;
if ((oldType != newType) || (oldWd2 != newWd2)) {
__wd0 = oldWd0;
__wd1 = newType;
__wd2 = newWd2;
void VISetCGMS(u8 wd0, u8 wd1, u8 wd2) {
if (__wd0 != wd0 || __wd1 != wd1 || __wd2 != wd2) {
__wd0 = wd0;
__wd1 = wd1;
__wd2 = wd2;
Vdac_Flag_Changed_816991E0 |= 1;
}
}
void VISetMacrovision(s32 type) {
u32 tvFormat;
u8 mode = 0;
u8 volume = 0;
u8 wd0 = __wd0;
u8 wd1 = __wd1;
u8 wd2 = __wd2;
switch (type) {
case 1:
mode = 0;
volume = 0;
break;
case 2:
mode = 2;
volume = 3;
wd1 = 0;
break;
case 3:
mode = 1;
volume = 3;
wd1 = 0;
break;
case 4:
mode = 3;
volume = 3;
wd1 = 0;
break;
default:
break;
}
wd2 = wd2 & 0xF0;
wd2 = (wd2 | (mode << 2)) | volume;
VISetCGMS(wd0, wd1, wd2);
tvFormat = VIGetTvFormat();
if ((__type != type) || (__tvType != tvFormat)) {
__type = type;
@@ -578,101 +557,90 @@ void __VISetRevolutionMode(void) {
WaitMicroTime(2);
}
void __VISetRevolutionModeSimple(void) {
u32 i;
u8 powerCommand[2];
u8 clockCommand[2];
u8 outputCommand[2];
u8 volumeCommand[3];
u8 syncCommand[2];
u8 cgmsCommand[3];
u8 wssCommand[3];
u8 captionCommand[5];
u8 acpCommand[0x1c];
u8 driveCommand[2];
u8 filterCommand[2];
void __VISetTiming(s32 timing) {
u8 data[2];
powerCommand[0] = 0x6a;
powerCommand[1] = 1;
__VISendI2CData(0xe0, powerCommand, 2);
data[0] = 0;
data[1] = (u8)timing;
__VISendI2CData(0xe0, data, sizeof(data));
WaitMicroTime(2);
clockCommand[0] = 0x65;
clockCommand[1] = 1;
__VISendI2CData(0xe0, clockCommand, 2);
WaitMicroTime(2);
__VISetYUVSEL(VIGetDTVStatus());
outputCommand[0] = 0;
outputCommand[1] = 0;
__VISendI2CData(0xe0, outputCommand, 2);
WaitMicroTime(2);
volumeCommand[0] = 0x71;
volumeCommand[1] = 0x8e;
volumeCommand[2] = 0x8e;
__VISendI2CData(0xe0, volumeCommand, 3);
WaitMicroTime(2);
syncCommand[0] = 2;
syncCommand[1] = 7;
__VISendI2CData(0xe0, syncCommand, 2);
}
void __VISetVBICtrl(u8 arg0, u8 arg1, u8 arg2) {
u8 data[2];
data[0] = 2;
data[1] = (~arg2 & 1) | (((~arg1 & 1) << 2) | ((~arg0 & 1) << 1));
__VISendI2CData(0xe0, data, sizeof(data));
WaitMicroTime(2);
}
void __VISetCGMSClear(void) {
__wd0 = 0;
__wd1 = 0;
__wd2 = 0;
cgmsCommand[0] = 5;
cgmsCommand[1] = 0;
cgmsCommand[2] = 0;
__VISendI2CData(0xe0, cgmsCommand, 3);
WaitMicroTime(2);
if ((__gp1 != 0) || (__gp2 != 0) || (__gp3 != 0) || (__gp4 != 0)) {
__gp1 = 0;
__gp2 = 0;
__gp3 = 0;
__gp4 = 0;
__VISetCGMS();
}
void VISetWSS(u8 gp1, u8 gp2, u8 gp3, u8 gp4) {
if (__gp1 != gp1 || __gp2 != gp2 || __gp3 != gp3 || __gp4 != gp4) {
__gp1 = gp1;
__gp2 = gp2;
__gp3 = gp3;
__gp4 = gp4;
Vdac_Flag_Changed_816991E0 |= 2;
}
wssCommand[0] = 8;
wssCommand[1] = (__gp2 & 0xf) << 4 | __gp1 & 0xf;
wssCommand[2] = (__gp4 & 7) << 3 | __gp3 & 7;
__VISendI2CData(0xe0, wssCommand, 3);
WaitMicroTime(2);
if ((__cc1 != 0) || (__cc2 != 0) || (__cc3 != 0) || (__cc4 != 0)) {
__cc1 = 0;
__cc2 = 0;
__cc3 = 0;
__cc4 = 0;
}
void VISetClosedCaption(u8 cc1, u8 cc2, u8 cc3, u8 cc4) {
if (__cc1 != cc1 || __cc2 != cc2 || __cc3 != cc3 || __cc4 != cc4) {
__cc1 = cc1;
__cc2 = cc2;
__cc3 = cc3;
__cc4 = cc4;
Vdac_Flag_Changed_816991E0 |= 4;
}
captionCommand[0] = 0x7a;
captionCommand[1] = __cc1 & 0x7f;
captionCommand[2] = __cc2 & 0x7f;
captionCommand[3] = __cc3 & 0x7f;
captionCommand[4] = __cc4 & 0x7f;
__VISendI2CData(0xe0, captionCommand, 5);
WaitMicroTime(2);
for (i = 0; i < 0x1a; i++) {
acpCommand[i + 1] = VIZeroACPType[i];
}
acpCommand[0] = 0x40;
__VISendI2CData(0xe0, acpCommand, 0x1b);
WaitMicroTime(2);
if (__level != 0) {
__level = 0;
}
void VISetRGBOverDrive(s32 level) {
if (__level != level) {
__level = level;
Vdac_Flag_Changed_816991E0 |= 0x40;
}
if (Vdac_Flag_Region == 3) {
driveCommand[0] = 10;
driveCommand[1] = __level << 1 | 1;
__VISendI2CData(0xe0, driveCommand, 2);
WaitMicroTime(2);
}
void __VISetTrapFilterImm(u8 flag) {
u8 data[2];
data[0] = 3;
if (flag == TRUE) {
data[1] = 0;
} else {
driveCommand[0] = 10;
driveCommand[1] = 0;
__VISendI2CData(0xe0, driveCommand, 2);
WaitMicroTime(2);
data[1] = 1;
}
filterCommand[0] = 3;
filterCommand[1] = 1;
__VISendI2CData(0xe0, filterCommand, 2);
__VISendI2CData(0xe0, data, sizeof(data));
WaitMicroTime(2);
}
void __VISetRevolutionModeSimple(void) {
u32 dtvStatus;
__VISetCCSEL(TRUE);
__VISetOverSampling(TRUE);
dtvStatus = VIGetDTVStatus();
__VISetYUVSEL(dtvStatus);
__VISetTiming(0);
__VISetVolume(142, 142);
__VISetVBICtrl(0, 0, 0);
__VISetCGMSClear();
VISetWSS(0, 0, 0, 0);
__VISetWSS();
VISetClosedCaption(0, 0, 0, 0);
__VISetClosedCaption();
__VISetMacrovisionImm(VIZeroACPType);
VISetRGBOverDrive(0);
__VISetRGBOverDrive();
__VISetTrapFilterImm(0);
__VISetGammaImm(gammaSet[10]);
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -821,9 +821,9 @@ CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize
u32 fileDataSize;
u32 fileSize;
u8 iv[16];
CDBRecordKey comparisonKey;
u8 digest[20] ATTRIBUTE_ALIGN(64);
u8 wiiIdKey[64] ATTRIBUTE_ALIGN(16);
u8 digest[20] ATTRIBUTE_ALIGN(64);
CDBRecordKey comparisonKey;
NETHMACContext hmac;
CDBAttrSignature signature;

View File

@@ -180,11 +180,11 @@ void AESiEncryptBlock(AESContext* context, u32* output, const u32* input) {
const u32* key = context->keys + 4;
u32 a=input[0]^context->keys[0], b=input[1]^context->keys[1], c=input[2]^context->keys[2], d=input[3]^context->keys[3];
while (--rounds != 0) {
u32 nextA=ENCRYPT(a,b,c,d)^key[0];
u32 nextB=ENCRYPT(b,c,d,a)^key[1];
u32 nextC=ENCRYPT(c,d,a,b)^key[2];
u32 nextD=ENCRYPT(d,a,b,c)^key[3];
a=nextA; b=nextB; c=nextC; d=nextD;
u32 nextA=ENCRYPT(a,b,c,d);
u32 nextB=ENCRYPT(b,c,d,a);
u32 nextC=ENCRYPT(c,d,a,b);
u32 nextD=ENCRYPT(d,a,b,c);
a=nextA^key[0]; b=nextB^key[1]; c=nextC^key[2]; d=nextD^key[3];
key += 4;
}
output[0] = SUBSTITUTE(AESiSubShiftTable,a,b,c,d)^key[0];
@@ -203,15 +203,16 @@ void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
u32 round;
for (round=1; round<context->rounds; ++round) {
u32 word;
u32* keys=context->keys + round*4;
for (word=0; word<4; ++word) {
u32 value=context->keys[round*4+word];
u32 value=keys[word];
u32 twice=DOUBLE_BYTES(value);
u32 four=DOUBLE_BYTES(twice);
u32 eight=DOUBLE_BYTES(four)^value;
u32 mixed=eight ^ (four ^ ROTATE(eight,8));
mixed ^= twice ^ ROTATE(mixed,8);
mixed ^= value ^ ROTATE(mixed,8);
context->keys[round*4+word]=mixed;
keys[word]=mixed;
}
}
context->needsTransform=0;
@@ -219,11 +220,11 @@ void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
a=input[0]^key[0]; b=input[1]^key[1]; c=input[2]^key[2]; d=input[3]^key[3];
key-=4;
while (--rounds != 0) {
u32 nextA=DECRYPT(a,d,c,b)^key[0];
u32 nextB=DECRYPT(b,a,d,c)^key[1];
u32 nextC=DECRYPT(c,b,a,d)^key[2];
u32 nextD=DECRYPT(d,c,b,a)^key[3];
a=nextA; b=nextB; c=nextC; d=nextD;
u32 nextA=DECRYPT(a,d,c,b);
u32 nextB=DECRYPT(b,a,d,c);
u32 nextC=DECRYPT(c,b,a,d);
u32 nextD=DECRYPT(d,c,b,a);
a=nextA^key[0]; b=nextB^key[1]; c=nextC^key[2]; d=nextD^key[3];
key-=4;
}
output[0]=SUBSTITUTE_XOR(AESiInvSubShiftTable,a,d,c,b)^key[0];

View File

@@ -20,11 +20,11 @@ typedef struct HMACContext {
} HMACContext;
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
const char* function = "NETHMACInit";
u8 innerKey[64];
u32 i;
u32 keyLength;
void* work = context->digestContext;
const char* function = "NETHMACInit";
context->interface = *interface;
if (context->interface.contextSize > 96 || context->interface.blockSize > 64) {
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, function);

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;
@@ -1065,15 +1072,10 @@ NWC24Err NWC24iCheckDlHeaderConsistency(DlTaskListHeader* header, BOOL repair) {
NWC24Err NWC24iCreateDlTaskList() {
u16 taskId;
DlTaskListHeader* header;
DlTaskListHeader* header = GetCachedDlHeader();
NWC24Err result;
NWC24File file;
if (NWC24WorkP != NULL) {
header = (DlTaskListHeader*)NWC24WorkP->dlHead;
} else {
header = NULL;
}
memset(header, 0, 0x800);
header->magic = 0x5763446c;
@@ -1220,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) {
@@ -1256,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) {
@@ -1268,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; }

View File

@@ -596,9 +596,9 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
NWC24Err NWC24DecodeMIMEHeaderFieldBody(u8* charsetData, u32 charsetDataSize, u8* decoded, u32 decodedCapacity, u32* decodedSize, u8* encoded,
u32 encodedSize) {
int result = 0;
u8* output;
s32 inputSize;
char* input;
s32 inputSize;
u8* output;
s32 remainingCapacity;
if (decodedSize == NULL) {

View File

@@ -4,7 +4,7 @@
#include <revolution/nwc24.h>
static char MultiPartDivider[64];
BOOL LoopBackEnable = TRUE;
BOOL LoopBackEnable[2] = {TRUE, FALSE};
static NWC24File* m_pFile;
static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType type);
@@ -177,7 +177,7 @@ NWC24Err NWC24CommitMsg(NWC24MsgObj* object) {
return NWC24_ERR_LIB_NOT_OPENED;
if (!(msg->type & 0x100) || (msg->type & 0x200))
return NWC24_ERR_PROTECTED;
if (LoopBackEnable && (msg->type & 1)) {
if (LoopBackEnable[0] && (msg->type & 1)) {
NWC24GetMyUserId(&myId);
if (msg->numTo == 1 && msg->toIds[0] == myId)
loopback = TRUE;
@@ -327,7 +327,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
Mail_strcat(buffer, "\r\n");
Mail_strcat(buffer, "\r\n\0");
CHECK_WRITE(WriteString(msg, buffer));
}
CHECK_WRITE(WriteContentTypeField(msg));
@@ -346,7 +346,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
Mail_strcat(buffer, "\r\n");
Mail_strcat(buffer, "\r\n\0");
CHECK_WRITE(WriteString(msg, buffer));
CHECK_WRITE(WriteMIMEAttachHeader(msg, index));
attached[index].ptr = (const void*)msg->length;

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

View File

@@ -8,6 +8,7 @@
#include <private/nand.h>
#include <private/os.h>
#include <private/vi.h>
#include <private/hollywood/flipper.h>
#include <private/es.h>
#include <private/fs.h>
@@ -62,7 +63,7 @@ BOOL AbortFlag = FALSE;
volatile int lbl_81698A44 = 0;
volatile int lbl_81698A48 = 0;
volatile int lbl_81698A4C = 0;
u32 lbl_81698A50 = 0;
vu32 lbl_81698A50 = 0;
u32 lbl_81698A54 = 0;
u32 lbl_81698A58 = 0;
u32 lbl_81698A5C = 0;
@@ -82,17 +83,17 @@ u32 lbl_81698A9C = 0;
u64 lbl_81698AA0 = 0;
u32 lbl_81698AA8 = 0;
u32 lbl_81698AAC = 0;
u32 lbl_81698AB0 = 0;
u32 lbl_81698AB4 = 0;
vu32 lbl_81698AB0 = 0;
vu32 lbl_81698AB4 = 0;
u8 *lbl_81698AB8 = NULL;
NANDFileInfo *lbl_81698ABC = NULL;
u32 lbl_81698AC0 = 0;
NANDCallback lbl_81698AC4 = NULL;
vu32 lbl_81698AC0 = 0;
volatile NANDCallback lbl_81698AC4 = NULL;
u32 lbl_81698AC8 = 0;
u32 lbl_81698ACC = 0;
vu32 lbl_81698ACC = 0;
u32 lbl_81698AD0 = 0;
u32 lbl_81698AD4 = 0;
u32 lbl_81698AD8 = 0;
vu32 lbl_81698AD4 = 0;
vu32 lbl_81698AD8 = 0;
vu32 lbl_81698ADC = 0;
vu32 lbl_81698AE0 = 0;
u32 *lbl_81698AE4 = 0;
@@ -295,8 +296,8 @@ extern vu32 __DVDLayoutFormat;
void Run(u32 entryPoint, void *start, u32 blockCount, u32 argument) {
u8 *block = start;
for (; blockCount != 0; --blockCount) {
DCZeroRange(block, 32);
DCFlushRange(block, 32);
__dcbz(block, 0);
__dcbf(block, 0);
block += 32;
}
((void (*)(u32))entryPoint)(argument);
@@ -938,7 +939,8 @@ void BS2StartGCGame() {
}
__OSClearRTCFlags();
*(u32 *)0xCC003024 |= 7;
PI_SET_REG_F(0x24, 7);
(void)PI_READ_REG(0x24);
ticketViews = TicketViews;
ticketCount = 1;
BS2Report(" sysVersion = %016llx\n", 0x0000000100000100ULL);
@@ -1043,8 +1045,8 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
} else if (result < 0) {
NandCompletion(result, block);
} else {
NandTransferred += result;
NandBuffer += result;
NandTransferred += result;
if (NandLength - NandTransferred > 0x40000) {
if (NandOperation == 1) {
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
@@ -1108,8 +1110,6 @@ void BS2NANDDivideWriteAsync(NANDFileInfo *info, const void *buffer, u32 length,
}
BOOL CheckBS2CommandStatus() {
u32 partCount;
u32 chunkLength;
if (CheckDVDCommandStatus(&Block) == 0) {
BS2Report("DVD command is issuing\n");
return 0;
@@ -1192,16 +1192,13 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write partition ifno\n");
NandPending = 1;
partCount = ((DVDGameTOC *)DataToc)->partitionCount;
chunkLength = OSRoundUp32B(partCount * sizeof(DVDPartitionInfo)) + 32;
CacheLength += OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32;
CacheCommandComplete = 1;
CacheLength = CacheLength + OSRoundUp32B(partCount * sizeof(DVDPartitionInfo));
CacheLength += 32;
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
} else {
BS2NANDDivideWriteAsync(&BS2CacheFileInfo, &PartitionInfoBuf, chunkLength, BS2NANDCallback, &BS2NandBlock);
BS2NANDDivideWriteAsync(&BS2CacheFileInfo, &PartitionInfoBuf, OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32, BS2NANDCallback, &BS2NandBlock);
return 0;
}
}
@@ -1339,15 +1336,20 @@ void BS2ReadDiskID(void *buffer, s32 length, u32 offset) {
BS2State BS2Tick() {
u32 interruptsEnabled = OSDisableInterrupts();
u32 titleCode, titlePrefix;
u32 titleCode;
s32 titlePrefix;
u8 titleCharacters[4];
u32 readOffset, readLength, readAddress;
struct {
u32 offset;
u32 length;
u32 address;
} loaderRead;
DVDFileInfo bannerFile;
s32 discRegion, status;
u32 discRegion;
s32 status;
u64 currentTime;
BOOL regionMatches;
char productRegion;
DVDPartitionInfo *partition;
u32 iosHigh;
char *ticketByte;
u32 entryCount;
@@ -1376,8 +1378,7 @@ BS2State BS2Tick() {
currentTime = __OSGetSystemTime();
ResetTime = currentTime;
if (BS2WaitSpinup != 0 && BS2BootFromCache == 0) {
currentTime = __OSGetSystemTime();
SpinupDeadline = (u64)((OS_BUS_CLOCK >> 2) * 5) + currentTime;
SpinupDeadline = __OSGetSystemTime() + OSSecondsToTicks(5);
} else {
currentTime = __OSGetSystemTime();
SpinupDeadline = currentTime;
@@ -1403,8 +1404,7 @@ BS2State BS2Tick() {
currentTime = __OSGetSystemTime();
SpinupDeadline = currentTime;
} else {
currentTime = __OSGetSystemTime();
SpinupDeadline = (u64)((OS_BUS_CLOCK >> 2) * 7) + currentTime;
SpinupDeadline = __OSGetSystemTime() + OSSecondsToTicks(7);
}
__OSClearRTCFlags();
DVDResetAsync(&Block, BS2DVDCallback);
@@ -1421,7 +1421,7 @@ BS2State BS2Tick() {
status = CheckDVDCommandStatus(&CoverBlock);
if (status != 0) {
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 100)) {
if ((OSTime)(currentTime - CoverPollTime) >= OSMillisecondsToTicks((OSTime)100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
@@ -1434,12 +1434,12 @@ BS2State BS2Tick() {
if (status != 0) {
State = BS2_STT_4;
case 4:
if (BS2BootFromCache == 0)
DVDInquiryAsync(&Block, &DriveInfo, BS2DVDCallback);
else {
if (BS2BootFromCache != 0) {
BS2Report("Read drive info from cache.dat\n");
NandPending = 1;
BS2NANDDivideReadAsync(&BS2CacheFileInfo, &DriveInfo, 0x20, BS2NANDCallback, &BS2NandBlock);
} else {
DVDInquiryAsync(&Block, &DriveInfo, BS2DVDCallback);
}
State = BS2_STT_5;
}
@@ -1465,26 +1465,28 @@ BS2State BS2Tick() {
break;
State = BS2_STT_8;
case 8:
if (BS2BootFromCache == 0)
DVDReadDiskID(&Block, &DiskID, BS2DVDCallback);
else {
if (BS2BootFromCache != 0) {
BS2Report("Read disk id from cache.dat\n");
NandPending = 1;
BS2NANDDivideReadAsync(&BS2CacheFileInfo, &DiskID, 0x20, BS2NANDCallback, &BS2NandBlock);
} else {
DVDReadDiskID(&Block, &DiskID, BS2DVDCallback);
}
State = BS2_STT_9;
break;
case 9:
case 10:
case 10: {
DVDDiskID *bootDisc;
status = CheckBS2CommandStatus();
if (status == 0)
break;
memcpy((void *)0x80000000, &DiskID, 0x20);
if ((*(u32 *)0x80000018) == 0x5d1c9ea3) {
status = strncmp((char *)0x80000000, "RAAE", 4);
if (status == 0 || strncmp((char *)0x80000000, "408", 3) == 0 ||
strncmp((char *)0x80000000, "410", 3) == 0 ||
strncmp((char *)0x80000000, "410", 3) == 0)
memcpy((void *)0x80000000, &DiskID, sizeof(DVDDiskID));
bootDisc = (DVDDiskID *)0x80000000;
if (bootDisc->rvlMagic == 0x5d1c9ea3) {
status = strncmp((char *)bootDisc, "RAAE", 4);
if (status == 0 || strncmp((char *)bootDisc, "408", 3) == 0 ||
strncmp((char *)bootDisc, "410", 3) == 0 ||
strncmp((char *)bootDisc, "410", 3) == 0)
regionMatches = FALSE;
else
regionMatches = TRUE;
@@ -1495,31 +1497,33 @@ BS2State BS2Tick() {
break;
}
}
if ((*(u32 *)0x8000001c) == -0x3dcc60c3) {
if (bootDisc->gcMagic == -0x3dcc60c3) {
BS2Report("DOLPHIN LAYOUT FORMAT\n");
__DVDLayoutFormat = 2;
State = BS2_STT_11;
} else {
BS2Report("UNKNOWN\n");
State = BS2_STT_54;
break;
}
case 0xb:
productRegion = (*(u8 *)0x80000008);
State = BS2_STT_11;
}
case 0xb: {
DVDDiskID *bootDisc = (DVDDiskID *)0x80000000;
u32 audioBufferSize;
if (AudioBufferUnconfigured == 0) {
State = BS2_STT_GC_GAME;
break;
}
AudioBufferUnconfigured = 0;
if (productRegion == '\0')
if (bootDisc->streaming != 0) {
audioBufferSize = bootDisc->streamingBufSize;
audioBufferSize = audioBufferSize != 0 ? audioBufferSize : 10;
__DVDAudioBufferConfig(&Block, 1, audioBufferSize, BS2DVDCallback);
} else {
__DVDAudioBufferConfig(&Block, 0, 0, BS2DVDCallback);
else {
productRegion = (*(u8 *)0x80000009);
if (productRegion == '\0')
productRegion = '\n';
__DVDAudioBufferConfig(&Block, 1, productRegion, BS2DVDCallback);
}
State = BS2_STT_12;
}
case 0xc:
status = CheckDVDCommandStatus(&Block);
if (status == 0)
@@ -1530,28 +1534,35 @@ BS2State BS2Tick() {
State = BS2_STT_14;
case 0xe:
status = CheckDVDCommandStatus(&Block);
discRegion = bi2.countryCode;
if (status == 0)
break;
discRegion = bi2.countryCode;
productRegion = SCGetProductGameRegion();
switch (productRegion) {
case 0:
regionMatches = discRegion == 0;
if (discRegion != 0)
goto invalidGcRegion;
regionMatches = TRUE;
break;
case 1:
regionMatches = discRegion == 1;
if (discRegion != 1)
goto invalidGcRegion;
regionMatches = TRUE;
break;
case 2:
regionMatches = discRegion == 2;
if (discRegion != 2)
goto invalidGcRegion;
regionMatches = TRUE;
break;
default:
invalidGcRegion:
regionMatches = FALSE;
break;
}
if (regionMatches)
State = BS2_STT_GC_GAME;
else
if (!regionMatches)
State = BS2_STT_54;
else
State = BS2_STT_GC_GAME;
break;
case 0xf:
if (LoadingTitle != 0) {
@@ -1580,27 +1591,23 @@ BS2State BS2Tick() {
status = CheckBS2CommandStatus();
if (status == 0)
break;
partition = (DVDPartitionInfo *)PartitionInfoBuf;
PartitionCursor = (u32)&PartitionInfoBuf;
UpdatePartition = 0;
GamePartition = 0;
for (titleCode = 0; titleCode < (*(DVDGameTOC **)&GameToc)->partitionCount; titleCode = titleCode + 1) {
BS2Report("gamePartition ... 0x%08X\n", (u32)partition->partition);
BS2Report("gamePartition ... 0x%08X\n", (u32)((DVDPartitionInfo *)PartitionCursor)->partition);
BS2Report("type ... 0x%08X\n", ((DVDPartitionInfo *)PartitionCursor)->partitionType);
if (((DVDPartitionInfo *)PartitionCursor)->partitionType == 0)
GamePartition = PartitionCursor;
if (((DVDPartitionInfo *)PartitionCursor)->partitionType == 1)
UpdatePartition = PartitionCursor;
partition = (DVDPartitionInfo *)PartitionCursor + 1;
PartitionCursor = (u32)partition;
PartitionCursor = (u32)((DVDPartitionInfo *)PartitionCursor + 1);
}
partition = (DVDPartitionInfo *)PartitionInfoBuf + 4;
PartitionCursor = (u32)((DVDPartitionInfo *)PartitionInfoBuf + 4);
for (titleCode = 0; titleCode < ((DVDGameTOC *)DataToc)->partitionCount; titleCode = titleCode + 1) {
BS2Report("gamePartition ... 0x%08X\n", (u32)partition->partition);
BS2Report("gamePartition ... 0x%08X\n", (u32)((DVDPartitionInfo *)PartitionCursor)->partition);
BS2Report("type ... 0x%08X\n", ((DVDPartitionInfo *)PartitionCursor)->partitionType);
partition = (DVDPartitionInfo *)PartitionCursor + 1;
PartitionCursor = (u32)partition;
PartitionCursor = (u32)((DVDPartitionInfo *)PartitionCursor + 1);
}
State = BS2_STT_19;
}
@@ -1609,62 +1616,80 @@ BS2State BS2Tick() {
State = BS2_STT_20;
case 0x14:
status = CheckBS2CommandStatus();
discRegion = bi3.countryCode;
if (status == 0)
break;
if (bi3.magic != -0x3c07e572) {
State = BS2_STT_54;
break;
}
productRegion = SCGetProductGameRegion();
switch (productRegion) {
case 0:
regionMatches = discRegion == 0;
break;
case 1:
regionMatches = discRegion == 1;
break;
case 2:
regionMatches = discRegion == 2;
break;
case 4:
regionMatches = discRegion == 4;
break;
case 5:
regionMatches = discRegion == 5;
break;
default:
regionMatches = FALSE;
break;
}
if (regionMatches) {
status = BS2IsValidDisc();
if (status == 0)
if (bi3.magic == -0x3c07e572) {
discRegion = bi3.countryCode;
productRegion = SCGetProductGameRegion();
switch (productRegion) {
case 0:
if (discRegion != 0)
goto invalidRvlRegion;
regionMatches = TRUE;
break;
case 1:
if (discRegion != 1)
goto invalidRvlRegion;
regionMatches = TRUE;
break;
case 2:
if (discRegion != 2)
goto invalidRvlRegion;
regionMatches = TRUE;
break;
case 4:
if (discRegion != 4)
goto invalidRvlRegion;
regionMatches = TRUE;
break;
case 5:
if (discRegion != 5)
goto invalidRvlRegion;
regionMatches = TRUE;
break;
default:
invalidRvlRegion:
regionMatches = FALSE;
break;
}
if (!regionMatches) {
State = BS2_STT_54;
else if (BS2BootFromCache == 0) {
if (UpdatePartition == 0) {
if (GamePartition == 0)
State = BS2_STT_54;
else
State = BS2_STT_37;
} else {
State = BS2_STT_21;
case 0x15:
DVDOpenPartitionAsync(&Block, (void *)(u32)&PartitionParams.tmd, (u32)((DVDPartitionInfo *)UpdatePartition)->partition,
BS2DVDCallback);
PartitionOpen = 1;
State = BS2_STT_22;
}
} else
State = BS2_STT_37;
} else
break;
}
status = BS2IsValidDisc();
if (status == 0) {
State = BS2_STT_54;
break;
}
} else {
State = BS2_STT_54;
break;
}
if (BS2BootFromCache != 0) {
State = BS2_STT_37;
break;
}
if (UpdatePartition != 0)
State = BS2_STT_21;
else {
if (GamePartition != 0)
State = BS2_STT_37;
else
State = BS2_STT_54;
break;
}
case 0x15:
DVDOpenPartitionAsync(&Block, &PartitionParams.tmd,
(u32)((DVDPartitionInfo *)UpdatePartition)->partition,
BS2DVDCallback);
PartitionOpen = 1;
State = BS2_STT_22;
break;
case 0x16:
status = CheckDVDCommandStatus(&Block);
if (status != 0) {
CurrentTmd = (u32)&PartitionParams.tmd;
BS2Report("TMD ver ... 0x%02X\n", PartitionParams.tmd.head.version);
BS2Report("TMD ver ... 0x%02X\n", ((ESTitleMeta *)CurrentTmd)->head.version);
BS2Report("CA CRL ver ... 0x%02X\n", ((ESTitleMeta *)CurrentTmd)->head.caCrlVersion);
BS2Report("Signer CRL ver ... 0x%02X\n", ((ESTitleMeta *)CurrentTmd)->head.signerCrlVersion);
BS2Report("Req sys ver ... 0x%08X%08X\n", (u32)(((ESTitleMeta *)CurrentTmd)->head.sysVersion >> 32),
@@ -1682,11 +1707,12 @@ BS2State BS2Tick() {
status = CheckDVDCommandStatus(&Block);
if (status == 0)
break;
if (UpdateDiskID.rvlMagic != 0x5d1c9ea3) {
if (UpdateDiskID.rvlMagic == 0x5d1c9ea3)
State = BS2_STT_25;
else {
State = BS2_STT_35;
break;
}
State = BS2_STT_25;
case 0x19:
DVDReadAbsAsyncForBS(&Block, &AppLoaderHdr, 0x20, 0x910, BS2DVDCallback);
State = BS2_STT_26;
@@ -1711,22 +1737,20 @@ BS2State BS2Tick() {
((void (*)(void *))((*(void **)&LoaderInit)))((void *)BS2Report);
BS2Report("\nApploader Initialized\n");
State = BS2_STT_29;
break;
case 0x1d:
status = ((int (*)(u32 *, u32 *, u32 *))((*(void **)&LoaderMain)))(&readAddress, &readLength, &readOffset);
if (status == 0)
State = BS2_STT_31;
else {
BS2Report("Addr [0x%x] length [0x%x] offset [0x%x]\n", readAddress, readLength, readOffset);
status = ((int (*)(u32 *, u32 *, u32 *))((*(void **)&LoaderMain)))(&loaderRead.address, &loaderRead.length, &loaderRead.offset);
if (status != 0) {
BS2Report("Addr [0x%x] length [0x%x] offset [0x%x]\n", loaderRead.address, loaderRead.length, loaderRead.offset);
readInterruptsEnabled = OSDisableInterrupts();
DVDReadAbsAsyncForBS(&Block, (void *)readAddress, readLength, readOffset >> (__DVDLayoutFormat & 0x3f), BS2DVDCallback);
DVDReadAbsAsyncForBS(&Block, (void *)loaderRead.address, loaderRead.length, loaderRead.offset >> __DVDLayoutFormat, BS2DVDCallback);
if (*(s32 *)DvdProgress != 0) {
DvdReadPending = 1;
DvdTransferLength = readLength;
DvdTransferLength = loaderRead.length;
}
OSRestoreInterrupts(readInterruptsEnabled);
State = BS2_STT_30;
}
} else
State = BS2_STT_31;
break;
case 0x1e:
status = CheckDVDCommandStatus(&Block);
@@ -1750,11 +1774,11 @@ BS2State BS2Tick() {
}
} else {
status = BS2GetUpdateEntryNum();
if ((status != 0) && (status = BS2UpdateState(), status == 1)) {
if ((status != 0) && (BS2UpdateState() == 1)) {
entryCount = BS2GetUpdateEntryNum();
BS2Report("%d entries\n", entryCount);
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 100)) {
if ((OSTime)(currentTime - CoverPollTime) >= OSMillisecondsToTicks((OSTime)100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
@@ -1768,9 +1792,9 @@ BS2State BS2Tick() {
break;
case 0x21:
status = CheckDVDCommandStatus(&CoverBlock);
if ((status != 0) && (status = BS2UpdateState(), status == 1)) {
if ((status != 0) && (BS2UpdateState() == 1)) {
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 100)) {
if ((OSTime)(currentTime - CoverPollTime) >= OSMillisecondsToTicks((OSTime)100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
@@ -1837,14 +1861,12 @@ BS2State BS2Tick() {
}
State = BS2_STT_37;
case 0x25:
if (BS2BootFromCache == 0)
DVDOpenPartitionAsync(&Block, (void *)(u32)&PartitionParams.tmd, (u32)((DVDPartitionInfo *)GamePartition)->partition,
BS2DVDCallback);
else {
if (BS2BootFromCache != 0) {
BS2Report("Open partition from cache.dat\n");
NandPending = 1;
BS2NANDDivideReadAsync(&BS2CacheFileInfo, (void *)(u32)&PartitionParams.tmd, 0x4a00, BS2NANDCallback, &BS2NandBlock);
}
BS2NANDDivideReadAsync(&BS2CacheFileInfo, &PartitionParams.tmd, 0x4a00, BS2NANDCallback, &BS2NandBlock);
} else
DVDOpenPartitionAsync(&Block, &PartitionParams.tmd, (u32)((DVDPartitionInfo *)GamePartition)->partition, BS2DVDCallback);
PartitionOpen = 1;
State = BS2_STT_38;
break;
@@ -1853,7 +1875,7 @@ BS2State BS2Tick() {
if (status == 0)
break;
CurrentTmd = (u32)&PartitionParams.tmd;
BS2Report("TMD ver ... 0x%02X\n", PartitionParams.tmd.head.version);
BS2Report("TMD ver ... 0x%02X\n", ((ESTitleMeta *)CurrentTmd)->head.version);
BS2Report("CA CRL ver ... 0x%02X\n", ((ESTitleMeta *)CurrentTmd)->head.caCrlVersion);
BS2Report("Signer CRL ver ... 0x%02X\n", ((ESTitleMeta *)CurrentTmd)->head.signerCrlVersion);
BS2Report("Req sys ver ... 0x%08X%08X\n", (u32)(((ESTitleMeta *)CurrentTmd)->head.sysVersion >> 32),
@@ -1865,7 +1887,7 @@ BS2State BS2Tick() {
RequiredIosHigh = iosHigh;
titleCode = (u32)((ESTitleMeta *)CurrentTmd)->head.titleId;
TitleCode = titleCode;
if ((u32)((ESTitleMeta *)CurrentTmd)->head.sysVersion == 0x10 && (u32)(((ESTitleMeta *)CurrentTmd)->head.sysVersion >> 32) == 1) {
if (((ESTitleMeta *)CurrentTmd)->head.sysVersion == 0x0000000100000010ULL) {
BS2Report("This must be a backup disk\n");
State = BS2_STT_FATAL_ERROR;
break;
@@ -1874,80 +1896,95 @@ BS2State BS2Tick() {
titlePrefix = titleCode >> 0x18;
titleCharacters[3] = (u8)titleCode;
titleCharacters[0] = (char)(titleCode >> 0x18);
if (titlePrefix < 0x52) {
if (titlePrefix != 0x44)
goto unrestricted_title;
if (titlePrefix < 'R') {
if (titlePrefix == 'D')
goto check_title_region;
} else if (titlePrefix < 'U')
goto check_title_region;
regionMatches = TRUE;
goto title_region_checked;
{
check_title_region:
if (titleCharacters[3] == 0x41) {
regionMatches = TRUE;
goto title_region_checked;
}
productRegion = SCGetProductGameRegion();
if (productRegion == '\x03')
goto title_region_mismatch;
if ('\x02' < productRegion) {
if (productRegion == '\x05') {
if (titleCharacters[3] != 0x43)
goto title_region_mismatch;
regionMatches = TRUE;
} else {
if (('\x04' < productRegion) || (titleCharacters[3] != 0x4b))
goto title_region_mismatch;
regionMatches = TRUE;
}
goto title_region_checked;
}
if (productRegion == '\x01') {
if (titleCharacters[3] < 0x58) {
if (titleCharacters[3] == 0x45)
goto us_title_region;
} else if (titleCharacters[3] < 0x5b) {
us_title_region:
regionMatches = TRUE;
goto title_region_checked;
}
goto title_region_mismatch;
}
if (productRegion < '\x01') {
if ((productRegion < '\0') ||
((titleCharacters[3] != 0x57 && ((0x56 < titleCharacters[3] || (titleCharacters[3] != 0x4a))))))
goto title_region_mismatch;
regionMatches = TRUE;
} else {
switch (titleCharacters[3]) {
case 0x44:
case 0x46:
case 0x48:
case 0x49:
case 0x50:
case 0x52:
case 0x53:
case 0x55:
case 0x56:
case 0x58:
case 0x59:
case 0x5a:
switch (productRegion) {
case 0:
switch ((s32)titleCharacters[3]) {
case 'J':
case 'W':
regionMatches = TRUE;
break;
case 0x57:
titleCharacters[1] = (u8)(titleCode >> 0x10);
default:
goto title_region_mismatch;
}
break;
case 1:
switch ((s32)titleCharacters[3]) {
case 'E':
case 'X':
case 'Y':
case 'Z':
regionMatches = TRUE;
break;
default:
goto title_region_mismatch;
}
break;
case 2:
switch (titleCharacters[3]) {
case 'D':
case 'F':
case 'H':
case 'I':
case 'P':
case 'R':
case 'S':
case 'U':
case 'V':
case 'X':
case 'Y':
case 'Z':
regionMatches = TRUE;
break;
case 'W':
titleCharacters[1] = (u8)(titleCode >> 16);
titleCharacters[2] = (u8)(titleCode >> 8);
if (((titleCharacters[0] != 'R') || ((titleCode >> 0x10 & 0xff) != 0x4c)) || ((titleCode >> 8 & 0xff) != 0x57))
if (titleCharacters[0] != 'R' ||
(titleCode >> 16 & 0xff) != 'L' ||
(titleCode >> 8 & 0xff) != 'W')
goto title_region_mismatch;
regionMatches = TRUE;
break;
default:
title_region_mismatch:
regionMatches = FALSE;
break;
goto title_region_mismatch;
}
break;
case 4:
switch ((s32)titleCharacters[3]) {
case 'K':
regionMatches = TRUE;
break;
default:
goto title_region_mismatch;
}
break;
case 5:
switch ((s32)titleCharacters[3]) {
case 'C':
regionMatches = TRUE;
break;
default:
goto title_region_mismatch;
}
break;
default:
title_region_mismatch:
regionMatches = FALSE;
break;
}
goto title_region_checked;
} else {
if (titlePrefix < 0x55)
goto check_title_region;
unrestricted_title:
regionMatches = TRUE;
}
title_region_checked:
if (!regionMatches) {
@@ -1982,25 +2019,23 @@ BS2State BS2Tick() {
((void (*)(void *))((*(void **)&LoaderInit)))((void *)OSReport);
BS2Report("\nApploader Initialized\n");
State = BS2_STT_43;
break;
case 0x2b:
status = ((int (*)(u32 *, u32 *, u32 *))((*(void **)&LoaderMain)))(&readAddress, &readLength, &readOffset);
if (status == 0)
State = BS2_STT_45;
else {
BS2Report("Addr [0x%x] length [0x%x] offset [0x%x]\n", readAddress, readLength, readOffset);
status = ((int (*)(u32 *, u32 *, u32 *))((*(void **)&LoaderMain)))(&loaderRead.address, &loaderRead.length, &loaderRead.offset);
if (status != 0) {
BS2Report("Addr [0x%x] length [0x%x] offset [0x%x]\n", loaderRead.address, loaderRead.length, loaderRead.offset);
readInterruptsEnabled = OSDisableInterrupts();
BS2ReadDiskID((void *)readAddress, readLength, readOffset >> (__DVDLayoutFormat & 0x3f));
LoaderLength = readLength;
LoaderAddress = readAddress;
LoaderOffset = readOffset;
BS2ReadDiskID((void *)loaderRead.address, loaderRead.length, loaderRead.offset >> __DVDLayoutFormat);
LoaderLength = loaderRead.length;
LoaderAddress = loaderRead.address;
LoaderOffset = loaderRead.offset;
if ((*(s32 *)DvdProgress != 0) && (BS2BootFromCache == 0)) {
DvdReadPending = 1;
DvdTransferLength = readLength;
DvdTransferLength = loaderRead.length;
}
OSRestoreInterrupts(readInterruptsEnabled);
State = BS2_STT_44;
}
} else
State = BS2_STT_45;
break;
case 0x2c:
status = CheckBS2CommandStatus();
@@ -2008,10 +2043,14 @@ BS2State BS2Tick() {
State = BS2_STT_43;
break;
case 0x2d:
if (PartitionParams.numTmdBytes == 0) {
if (PartitionParams.numTmdBytes != 0) {
State = BS2_STT_47;
break;
}
{
__DVDFSInit();
status = DVDConvertPathToEntrynum("/opening.bnr");
if (-1 < status) {
if (status >= 0) {
DVDFastOpen(status, &bannerFile);
if (Allocator != 0) {
if (BannerAllocation != 0)
@@ -2033,7 +2072,7 @@ BS2State BS2Tick() {
}
if (bannerFile.length != 0) {
BS2ReadDiskID((void *)BannerBuffer, ((bannerFile.length + 0x1fU) & 0xffffffe0),
bannerFile.startAddr >> (__DVDLayoutFormat & 0x3f));
bannerFile.startAddr >> __DVDLayoutFormat);
State = BS2_STT_46;
break;
}
@@ -2046,8 +2085,7 @@ BS2State BS2Tick() {
BannerLength = 0;
}
State = BS2_STT_47;
} else
State = BS2_STT_47;
}
break;
case 0x2e:
status = CheckBS2CommandStatus();
@@ -2073,10 +2111,10 @@ BS2State BS2Tick() {
}
if (((u32)((ESTitleMeta *)CurrentTmd)->head.titleId == 0x4c4f43) && (LoadingTitle == 0))
State = BS2_STT_DATA_DISK;
else if (PartitionParams.numTmdBytes == 0)
State = BS2_STT_RVL_GAME;
else
else if (PartitionParams.numTmdBytes != 0)
State = BS2_STT_START_LOCKED_DISK;
else
State = BS2_STT_RVL_GAME;
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
@@ -2089,7 +2127,7 @@ BS2State BS2Tick() {
status = CheckDVDCommandStatus(&CoverBlock);
if ((status != 0) && (StartingGame == 0)) {
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 100)) {
if ((OSTime)(currentTime - CoverPollTime) >= OSMillisecondsToTicks((OSTime)100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
@@ -2100,7 +2138,7 @@ BS2State BS2Tick() {
status = CheckDVDCommandStatus(&CoverBlock);
if ((status != 0) && (StartingGame == 0)) {
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 100)) {
if ((OSTime)(currentTime - CoverPollTime) >= OSMillisecondsToTicks((OSTime)100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
@@ -2131,15 +2169,19 @@ BS2State BS2Tick() {
BS2BootFromCache = 0;
BS2BootCaching = 1;
LoadingTitle = 0;
if ((Block.state < 6) && (3 < Block.state))
switch (Block.state) {
case 4:
case 5:
CheckDVDCommandStatus(&Block);
else {
break;
default: {
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 100)) {
if ((OSTime)(currentTime - CoverPollTime) >= OSMillisecondsToTicks((OSTime)100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
}
} break;
}
break;
case 0x36:
@@ -2168,31 +2210,6 @@ BS2State BS2Tick() {
}
LoadingTitle = 0;
break;
case 0x3b:
case 0x3f:
if (UpdateErrorFlag == 0) {
if (RetryErrorFlag != 0) {
RetryErrorFlag = 0;
State = BS2_STT_DIRTY_DISK;
}
if (AbortFlag == 0) {
if ((Block.state < 6) && (3 < Block.state))
CheckDVDCommandStatus(&Block);
else {
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
}
}
} else {
AbortFlag = 0;
State = BS2_STT_64;
}
} else
State = BS2_STT_UPDATE_FAILED;
break;
case 0x3c:
status = CheckBS2CommandStatus();
if (status != 0)
@@ -2210,29 +2227,81 @@ BS2State BS2Tick() {
State = BS2_STT_63;
}
break;
case 0x46:
DVDGetPartitionParamsAsync(&Block, &PartitionParams, (u32)((DVDPartitionInfo *)GamePartition)->partition, BS2DVDCallback);
State = BS2_STT_71;
break;
case 0x47: {
status = CheckBS2CommandStatus();
if (status != 0) {
ticketByte = (char *)&PartitionParams.ticket;
for (status = 0; status < sizeof(PartitionParams.ticket); ++status) {
if ((u8)ticketByte[status] != 0) {
BS2Report("eTicket is none zero\n");
break;
}
}
memcpy(&PartitionParams.ticketView, (void *)TitleTicketView, sizeof(ESTicketView));
DCStoreRange(&PartitionParams.ticketView, sizeof(ESTicketView));
DVDOpenPartitionWithParamsAsync(&Block, &PartitionParams, (u32)((DVDPartitionInfo *)GamePartition)->partition, BS2DVDCallback);
PartitionOpen = 1;
State = BS2_STT_38;
}
} break;
case 0x3b:
case 0x3f:
if (UpdateErrorFlag != 0) {
State = BS2_STT_UPDATE_FAILED;
break;
}
if (RetryErrorFlag != 0) {
RetryErrorFlag = 0;
State = BS2_STT_DIRTY_DISK;
}
if (AbortFlag != 0) {
AbortFlag = 0;
State = BS2_STT_64;
break;
}
switch (Block.state) {
case 4:
case 5:
CheckDVDCommandStatus(&Block);
break;
default: {
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - CoverPollTime) >= OSMillisecondsToTicks((OSTime)100)) {
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
}
} break;
}
break;
case 0x40:
AbortFlag = 0;
if (RestartRequested != 0) {
RestartRequested = 0;
if (FatalErrorFlag == 0) {
if (PartitionOpen == 0) {
if ((__DVDLayoutFormat == 2) || ((BS2DriveReset != 0 && (DriveWasReset == 0))))
State = BS2_STT_2;
else {
if (Block.state == 10)
Block.state = 0;
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
State = BS2_STT_3;
}
} else {
PartitionOpen = 0;
State = BS2_STT_15;
}
} else
State = BS2_STT_FATAL_ERROR;
if (RestartRequested == 0)
break;
RestartRequested = 0;
if (FatalErrorFlag != 0) {
State = BS2_STT_FATAL_ERROR;
break;
}
if (PartitionOpen != 0) {
PartitionOpen = 0;
State = BS2_STT_15;
break;
}
if ((__DVDLayoutFormat == 2) || (BS2DriveReset != 0 && DriveWasReset == 0)) {
State = BS2_STT_2;
break;
}
if (Block.state == 10)
Block.state = 0;
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
__DVDGetCoverStatusAsync(&CoverBlock, BS2DVDCallback);
State = BS2_STT_3;
break;
case 0x41:
BannerAvailable = 0;
@@ -2245,7 +2314,7 @@ BS2State BS2Tick() {
break;
case 0x42:
currentTime = __OSGetSystemTime();
if ((OSTime)(currentTime - (((u64)CoverOpenTimeHigh << 32) | CoverOpenTimeLow)) < (OSTime)(((OS_BUS_CLOCK >> 2) / 1000) * 350))
if ((OSTime)(currentTime - (((u64)CoverOpenTimeHigh << 32) | CoverOpenTimeLow)) < OSMillisecondsToTicks((OSTime)350))
break;
currentTime = __OSGetSystemTime();
CoverPollTime = currentTime;
@@ -2255,27 +2324,6 @@ BS2State BS2Tick() {
case 0x44:
CheckDVDCommandStatus(&Block);
break;
case 0x46:
DVDGetPartitionParamsAsync(&Block, &PartitionParams, (u32)((DVDPartitionInfo *)GamePartition)->partition, BS2DVDCallback);
State = BS2_STT_71;
break;
case 0x47: {
status = CheckBS2CommandStatus();
if (status != 0) {
ticketByte = (char *)&PartitionParams.ticket;
for (status = 0; status < sizeof(PartitionParams.ticket); ++status) {
if (ticketByte[status] != 0) {
BS2Report("eTicket is none zero\n");
break;
}
}
memcpy(&PartitionParams.ticketView, (void *)TitleTicketView, sizeof(ESTicketView));
DCStoreRange(&PartitionParams.ticketView, sizeof(ESTicketView));
DVDOpenPartitionWithParamsAsync(&Block, &PartitionParams, (u32)((DVDPartitionInfo *)GamePartition)->partition, BS2DVDCallback);
PartitionOpen = 1;
State = BS2_STT_38;
}
} break;
default:
OSPanic("BS2Mach.c", 0x14e3, "BS2 ERROR >>> UNKNOWN STATE");
break;

View File

@@ -87,22 +87,24 @@ static void* UpdateThread(void* argument) {
u32 requiredBytes;
u32 requiredInodes;
u32 channelCount;
u32 freeChannels;
u32 freeBlocks;
u32 freeInodes;
u32 ticketCount;
char productArea[8];
u64 titleId;
char updatePath[32];
char seatPath[32];
DVDFileInfo file;
u32 index;
BS2UpdateEntry* entry;
BS2UpdateEntry* seatEntries;
BS2UpdateEntry* selectedSeats;
u32 selectedSeatCount;
BOOL regionValid;
u32 titleRegion;
s32 importResult;
struct {
u32 freeChannels;
u32 freeBlocks;
u32 freeInodes;
u32 ticketCount;
char productArea[8];
u64 titleId;
char updatePath[32];
char seatPath[32];
DVDFileInfo file;
} scratch;
BS2Report("Start update thread\n");
StartUpdate = 0;
@@ -112,152 +114,174 @@ static void* UpdateThread(void* argument) {
requiredBytes = 0;
requiredInodes = 0;
channelCount = 0;
freeChannels = 0;
freeBlocks = 0;
freeInodes = 0;
scratch.freeChannels = 0;
scratch.freeBlocks = 0;
scratch.freeInodes = 0;
selectedSeatCount = 0;
State = 0;
ContainsSeatTitles = FALSE;
if (ES_GetTitleId(&titleId) != 0) {
if (ES_GetTitleId(&scratch.titleId) != 0) {
regionValid = FALSE;
} else {
titleRegion = (u8)titleId;
regionValid = FALSE;
titleRegion = (u8)scratch.titleId;
switch (SCGetProductArea()) {
case 0:
case 5:
if (titleRegion == 'J' || titleRegion == 'D') {
regionValid = TRUE;
goto product_region_checked;
}
break;
goto invalid_product_region;
case 1:
if (titleRegion == 'E' || titleRegion == 'D') {
regionValid = TRUE;
goto product_region_checked;
}
break;
goto invalid_product_region;
case 2:
if (titleRegion == 'P' || titleRegion == 'D') {
regionValid = TRUE;
goto product_region_checked;
}
break;
goto invalid_product_region;
case 6:
if (titleRegion == 'K') {
regionValid = TRUE;
goto product_region_checked;
}
break;
goto invalid_product_region;
case 11:
if (titleRegion == 'C') {
regionValid = TRUE;
goto product_region_checked;
}
goto invalid_product_region;
default:
invalid_product_region:
regionValid = FALSE;
break;
}
}
product_region_checked:
if (!regionValid) {
BS2Report("Error: failed to check product region.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
if (!SCGetProductAreaString(productArea, sizeof(productArea))) {
if (!SCGetProductAreaString(scratch.productArea, sizeof(scratch.productArea))) {
BS2Report("Error: failed to get product information.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
strcpy(updatePath, "__update.inf");
strcat(updatePath, "-");
strcat(updatePath, productArea);
if (DVDConvertPathToEntrynum(updatePath) < 0) {
strcpy(scratch.updatePath, "__update.inf");
strcat(scratch.updatePath, "-");
strcat(scratch.updatePath, scratch.productArea);
if (DVDConvertPathToEntrynum(scratch.updatePath) < 0) {
switch (SCGetProductArea()) {
case 0:
case 1:
case 2:
case 6:
case 11:
strcpy(updatePath, "__update.inf");
if (DVDConvertPathToEntrynum(updatePath) < 0) {
strcpy(scratch.updatePath, "__update.inf");
if (DVDConvertPathToEntrynum(scratch.updatePath) < 0) {
BS2Report("Error: update information file is not found.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
break;
default:
BS2Report("Error: update information file is not found.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
}
BS2Report("%s is found.\n", updatePath);
if (!DVDOpen(updatePath, &file)) {
BS2Report("%s is found.\n", scratch.updatePath);
if (!DVDOpen(scratch.updatePath, &scratch.file)) {
BS2Report("Error: failed to open update information file.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
if (DVDReadPrio(&file, &UpdateHeader0, sizeof(UpdateHeader0), 0, 2) < 0) {
if (DVDReadPrio(&scratch.file, &UpdateHeader0, sizeof(UpdateHeader0), 0, 2) < 0) {
BS2Report("Error: failed to read update information header.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
if (UpdateHeader0.wadCount == 0) {
BS2Report("Error: no entry.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
if (UpdateHeader0.wadCount > 32) {
BS2Report("Error: found too many entries.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
UpdateHeader0.wadCount += UpdateHeader0.extraCount;
if (UpdateHeader0.wadCount > BS2_UPDATE_ENTRY_COUNT) {
BS2Report("Error: found too many extra entries.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
if (DVDReadPrio(&file, UPDATE_DISC_ENTRIES, UpdateHeader0.wadCount * sizeof(BS2UpdateEntry), 32, 2) < 0) {
if (DVDReadPrio(&scratch.file, UPDATE_DISC_ENTRIES, UpdateHeader0.wadCount * sizeof(BS2UpdateEntry), 32, 2) < 0) {
BS2Report("Error: failed to read update information.");
goto no_updates;
selectedCount = 0;
goto selection_done;
}
for (index = 0; index < UpdateHeader0.wadCount; index++) {
entry = &UPDATE_DISC_ENTRIES[index];
if ((entry->attr & 1) == 0) {
continue;
}
switch (OSGetPhysicalMem2Size()) {
case 0x4000000:
if ((entry->depend & 1) == 0) {
{
BS2UpdateEntry *discEntries = UPDATE_DISC_ENTRIES;
for (index = 0; index < UpdateHeader0.wadCount; index++) {
if ((discEntries[index].attr & 1) == 0) {
continue;
}
break;
case 0x8000000:
if ((entry->depend & 2) == 0) {
switch (OSGetPhysicalMem2Size()) {
case 0x4000000:
if ((discEntries[index].depend & 1) == 0) {
continue;
}
break;
case 0x8000000:
if ((discEntries[index].depend & 2) == 0) {
continue;
}
break;
default:
BS2Report("Cannot get physical MEM2 size\n");
State = 5;
selectedCount = 0;
goto selection_done;
}
if (DVDOpen(discEntries[index].path, &scratch.file) < 0) {
BS2Report("%s is not found\n", discEntries[index].path);
missingFile = TRUE;
continue;
}
break;
default:
BS2Report("Cannot get physical MEM2 size\n");
State = 5;
goto no_updates;
}
if (DVDOpen(entry->path, &file) < 0) {
BS2Report("%s is not found\n", entry->path);
missingFile = TRUE;
continue;
}
entry->size = file.length;
if (entry->type == 0) {
selectedCount++;
} else if (WADCheckImport(entry->titleId, entry->titleVersion) == 0) {
BS2Report("%s is already installed\n", entry->path);
Flags1[index] = 0;
} else {
BS2Report("%s\n", entry->path);
memcpy(&EntriesToImport[selectedCount], entry, sizeof(*entry));
selectedCount++;
Flags1[index] = 1;
discEntries[index].size = scratch.file.length;
if (discEntries[index].type == 0) {
selectedCount++;
} else if (WADCheckImport(discEntries[index].titleId, discEntries[index].titleVersion) == 0) {
BS2Report("%s is already installed\n", discEntries[index].path);
Flags1[index] = 0;
} else {
BS2Report("%s\n", discEntries[index].path);
memcpy(&EntriesToImport[selectedCount], &discEntries[index], sizeof(BS2UpdateEntry));
selectedCount++;
Flags1[index] = 1;
}
}
}
strcpy(seatPath, "__seatholder.inf");
strcat(seatPath, "-");
strcat(seatPath, productArea);
if (DVDConvertPathToEntrynum(seatPath) < 0) {
strcpy(scratch.seatPath, "__seatholder.inf");
strcat(scratch.seatPath, "-");
strcat(scratch.seatPath, scratch.productArea);
if (DVDConvertPathToEntrynum(scratch.seatPath) < 0) {
switch (SCGetProductArea()) {
case 0:
case 1:
case 2:
case 6:
case 11:
strcpy(seatPath, "__seatholder.inf");
if (DVDConvertPathToEntrynum(seatPath) < 0) {
strcpy(scratch.seatPath, "__seatholder.inf");
if (DVDConvertPathToEntrynum(scratch.seatPath) < 0) {
BS2Report("Error: update seatholder information file is not found.");
goto seats_done;
}
@@ -267,12 +291,12 @@ static void* UpdateThread(void* argument) {
goto seats_done;
}
}
BS2Report("%s is found.\n", seatPath);
if (!DVDOpen(seatPath, &file)) {
BS2Report("%s is found.\n", scratch.seatPath);
if (!DVDOpen(scratch.seatPath, &scratch.file)) {
BS2Report("Error: failed to open update information file.");
goto seats_done;
}
if (DVDReadPrio(&file, &UpdateHeader1, sizeof(UpdateHeader1), 0, 2) < 0) {
if (DVDReadPrio(&scratch.file, &UpdateHeader1, sizeof(UpdateHeader1), 0, 2) < 0) {
BS2Report("Error: failed to read update information header.");
goto seats_done;
}
@@ -287,32 +311,31 @@ static void* UpdateThread(void* argument) {
}
seatEntries = &UPDATE_DISC_ENTRIES[UpdateHeader0.wadCount];
selectedSeats = &EntriesToImport[selectedCount];
if (DVDReadPrio(&file, seatEntries, UpdateHeader1.wadCount * sizeof(BS2UpdateEntry), 32, 2) < 0) {
if (DVDReadPrio(&scratch.file, seatEntries, UpdateHeader1.wadCount * sizeof(BS2UpdateEntry), 32, 2) < 0) {
BS2Report("Error: failed to read update information.");
goto seats_done;
}
for (index = 0; index < UpdateHeader1.wadCount; index++) {
entry = &seatEntries[index];
OSReport("type = %d\n", entry->type);
OSReport("attribute = %d\n", entry->attr);
OSReport("size = %d\n", entry->size);
OSReport("inodes = %d\n", entry->inodes);
OSReport("dependency = %d\n", entry->depend);
OSReport("path = %64s\n", entry->path);
OSReport("titleId = %llx\n", entry->titleId);
OSReport("titleVersion = %d\n", entry->titleVersion);
OSReport("type = %d\n", seatEntries[index].type);
OSReport("attribute = %d\n", seatEntries[index].attr);
OSReport("size = %d\n", seatEntries[index].size);
OSReport("inodes = %d\n", seatEntries[index].inodes);
OSReport("dependency = %d\n", seatEntries[index].depend);
OSReport("path = %64s\n", seatEntries[index].path);
OSReport("titleId = %llx\n", seatEntries[index].titleId);
OSReport("titleVersion = %d\n", seatEntries[index].titleVersion);
Flags0[index] = 0;
if ((entry->attr & 1) == 0) {
if ((seatEntries[index].attr & 1) == 0) {
continue;
}
switch (OSGetPhysicalMem2Size()) {
case 0x4000000:
if ((entry->depend & 1) == 0) {
if ((seatEntries[index].depend & 1) == 0) {
continue;
}
break;
case 0x8000000:
if ((entry->depend & 2) == 0) {
if ((seatEntries[index].depend & 2) == 0) {
continue;
}
break;
@@ -321,58 +344,58 @@ static void* UpdateThread(void* argument) {
State = 5;
goto seats_done;
}
if (DVDOpen(entry->path, &file) < 0) {
BS2Report("%s is not found\n", entry->path);
if (DVDOpen(seatEntries[index].path, &scratch.file) < 0) {
BS2Report("%s is not found\n", seatEntries[index].path);
missingFile = TRUE;
continue;
}
if (entry->type != 7) {
if (seatEntries[index].type != 7) {
continue;
}
if (ES_GetTicketViews(entry->titleId, NULL, &ticketCount) != 0) {
if (ES_GetTicketViews(seatEntries[index].titleId, NULL, &scratch.ticketCount) != 0) {
BS2Report("Faild to get eTicket views.\n");
continue;
}
if (ticketCount != 0) {
if (scratch.ticketCount != 0) {
continue;
}
if (SCGetWwwRestriction() && ((u32)entry->titleId & 0xFFFFFF00) == 0x48414400) {
if (SCGetWwwRestriction() && ((u32)(seatEntries[index].titleId & 0xFFFFFFFFULL) & 0xFFFFFF00) == 0x48414400) {
Flags0[index] = 0;
OSReport("Internet CH is restricted!\n");
continue;
}
if (SCGetProductGameRegion() == 2 && (SCGetSimpleAddressID() >> 24) != 110 &&
(u32)entry->titleId == 0x48434A50) {
(u32)(seatEntries[index].titleId & 0xFFFFFFFFULL) == 0x48434A50) {
Flags0[index] = 0;
OSReport("BBCi CH is only for UK!\n");
continue;
}
BS2Report("%s\n", entry->path);
memcpy(&selectedSeats[selectedSeatCount], entry, sizeof(*entry));
BS2Report("%s\n", seatEntries[index].path);
memcpy(&selectedSeats[selectedSeatCount], &seatEntries[index], sizeof(BS2UpdateEntry));
Flags0[index] = 1;
channelCount++;
selectedSeatCount++;
requiredBytes += entry->size;
requiredInodes += entry->inodes;
requiredBytes += seatEntries[index].size;
requiredInodes += seatEntries[index].inodes;
}
if (channelCount != 0) {
if (!SCGetFreeChannelAppCount(&freeChannels)) {
if (!SCGetFreeChannelAppCount(&scratch.freeChannels)) {
BS2Report("Error: cannot get channel count.");
goto seats_done;
}
if (NANDSecretGetUserAvailableArea(&freeBlocks, &freeInodes) != 0) {
if (NANDSecretGetUserAvailableArea(&scratch.freeBlocks, &scratch.freeInodes) != 0) {
BS2Report("Error: cannot get free user blocks.");
goto seats_done;
}
if ((freeBlocks << 14) < 0x1004000 || requiredBytes > (freeBlocks << 14) - 0x1004000) {
if ((scratch.freeBlocks << 14) < 0x1004000 || requiredBytes > (scratch.freeBlocks << 14) - 0x1004000) {
BS2Report("Sufficient user blocks doesn't exist.");
goto seats_done;
}
if (freeInodes < requiredInodes + 36) {
if (scratch.freeInodes < requiredInodes + 36) {
BS2Report("Sufficient user inodes doesn't exist.");
goto seats_done;
}
if (channelCount > freeChannels) {
if (channelCount > scratch.freeChannels) {
BS2Report("No enough blank channel.");
goto seats_done;
}
@@ -388,23 +411,23 @@ static void* UpdateThread(void* argument) {
seats_done:
if (missingFile) {
State = 5;
goto no_updates;
selectedCount = 0;
goto selection_done;
}
pEntries = EntriesToImport;
pFlags = Flags1;
for (index = 0; index < UpdateHeader0.wadCount; index++) {
if (Flags1[index] == 1) {
entry = &UPDATE_DISC_ENTRIES[index];
BS2Report("File: %s\n", entry->path);
BS2Report("Name: %s\n", entry->dataName);
BS2Report("Info: %s\n", entry->dataMeta);
BS2Report("Attr: %s\n", (entry->attr & 1) ? "Critical" : "Non critical");
BS2Report(" %s\n", (entry->attr & 2) ? "Reboot" : "Not reboot");
{
BS2UpdateEntry *discEntries = UPDATE_DISC_ENTRIES;
for (index = 0; index < UpdateHeader0.wadCount; index++) {
if (Flags1[index] == 1) {
BS2Report("File: %s\n", discEntries[index].path);
BS2Report("Name: %s\n", discEntries[index].dataName);
BS2Report("Info: %s\n", discEntries[index].dataMeta);
BS2Report("Attr: %s\n", (discEntries[index].attr & 1) ? "Critical" : "Non critical");
BS2Report(" %s\n", (discEntries[index].attr & 2) ? "Reboot" : "Not reboot");
}
}
}
goto selection_done;
no_updates:
selectedCount = 0;
selection_done:
EntriesCount = selectedCount;
if (EntriesCount == 0) {
@@ -416,76 +439,81 @@ selection_done:
}
State = 1;
UpdateProgress = 0;
for (;;) {
if (StartUpdate != 0) {
if (UpdateProgress < UpdateHeader0.wadCount) {
BS2Report("Progress : %d\n", UpdateProgress);
if (Flags1[UpdateProgress] == 1) {
BS2Report("Import : %s\n", UPDATE_DISC_ENTRIES[UpdateProgress].path);
State = 2;
CurrentEntry = &UPDATE_DISC_ENTRIES[UpdateProgress];
if (UPDATE_DISC_ENTRIES[UpdateProgress].type == 0) {
UpdateProgress++;
continue;
}
if (UPDATE_DISC_ENTRIES[UpdateProgress].type == 1) {
BS2Report("BS2WADImportDVD : ");
index = UpdateProgress;
if (strcmp(getSuffix(UPDATE_DISC_ENTRIES[index].path), "wad") == 0) {
rc = WADImportDVDForBS(UPDATE_DISC_ENTRIES[index].path, (void*)BS2_UPDATE_ADDRESS, 0x80000);
{
BS2UpdateEntry *discEntries = UPDATE_DISC_ENTRIES;
for (;;) {
if (StartUpdate != 0) {
if (UpdateProgress < UpdateHeader0.wadCount) {
BS2Report("Progress : %d\n", UpdateProgress);
if (Flags1[UpdateProgress] == 1) {
BS2Report("Import : %s\n", discEntries[UpdateProgress].path);
State = 2;
CurrentEntry = &discEntries[UpdateProgress];
if (discEntries[UpdateProgress].type == 0) {
UpdateProgress++;
continue;
}
if (discEntries[UpdateProgress].type == 1) {
BS2Report("BS2WADImportDVD : ");
index = UpdateProgress;
if (strcmp(getSuffix(discEntries[index].path), "wad") == 0) {
importResult = WADImportDVDForBS(discEntries[index].path, (void*)BS2_UPDATE_ADDRESS, 0x80000);
} else {
importResult = 0;
}
rc = importResult;
BS2Report("rc = %d\n", rc);
if (rc != 0) {
NANDLoggingAddMessageAsync(NULL, "BS2 error. [%d] titleID: 0x%016llx %s line: %d",
rc, discEntries[UpdateProgress].titleId, "BS2Update.c", 0x3F5);
State = 5;
UpdateProgress = UpdateHeader0.wadCount + 1;
break;
}
if ((discEntries[UpdateProgress].attr & 2) != 0) {
RebootRequired = 1;
}
UpdateProgress++;
} else {
rc = 0;
BS2Report("BS2WADImportDVDEx : ");
index = UpdateProgress;
if (strcmp(getSuffix(discEntries[index].path), "wad") == 0) {
importResult = WADImportDVDExForBS(discEntries[index].path, (void*)BS2_UPDATE_ADDRESS, 0x80000);
} else {
importResult = 0;
}
rc = importResult;
BS2Report("rc = %d\n", rc);
if (rc != 0) {
NANDLoggingAddMessageAsync(NULL, "BS2 error. [%d] titleID: 0x%016llx %s line: %d",
rc, discEntries[UpdateProgress].titleId, "BS2Update.c", 0x40F);
State = 5;
UpdateProgress = UpdateHeader0.wadCount + 1;
break;
}
if ((discEntries[UpdateProgress].attr & 2) != 0) {
RebootRequired = 1;
}
UpdateProgress++;
}
BS2Report("rc = %d\n", rc);
if (rc != 0) {
NANDLoggingAddMessageAsync(NULL, "BS2 error. [%d] titleID: 0x%016llx %s line: %d",
rc, UPDATE_DISC_ENTRIES[UpdateProgress].titleId, "BS2Update.c", 0x3F5);
State = 5;
UpdateProgress = UpdateHeader0.wadCount + 1;
break;
}
if ((UPDATE_DISC_ENTRIES[UpdateProgress].attr & 2) != 0) {
RebootRequired = 1;
}
UpdateProgress++;
} else {
BS2Report("BS2WADImportDVDEx : ");
index = UpdateProgress;
if (strcmp(getSuffix(UPDATE_DISC_ENTRIES[index].path), "wad") == 0) {
rc = WADImportDVDExForBS(UPDATE_DISC_ENTRIES[index].path, (void*)BS2_UPDATE_ADDRESS, 0x80000);
} else {
rc = 0;
}
BS2Report("rc = %d\n", rc);
if (rc != 0) {
NANDLoggingAddMessageAsync(NULL, "BS2 error. [%d] titleID: 0x%016llx %s line: %d",
rc, UPDATE_DISC_ENTRIES[UpdateProgress].titleId, "BS2Update.c", 0x40F);
State = 5;
UpdateProgress = UpdateHeader0.wadCount + 1;
break;
}
if ((UPDATE_DISC_ENTRIES[UpdateProgress].attr & 2) != 0) {
RebootRequired = 1;
}
BS2Report("Not import : %s\n", discEntries[UpdateProgress].path);
UpdateProgress++;
}
} else {
BS2Report("Not import : %s\n", UPDATE_DISC_ENTRIES[UpdateProgress].path);
} else if (UpdateProgress == UpdateHeader0.wadCount) {
if (RebootRequired != 0) {
State = 4;
} else {
State = 3;
}
UpdateProgress++;
CurrentEntry = NULL;
break;
}
} else if (UpdateProgress == UpdateHeader0.wadCount) {
if (RebootRequired != 0) {
State = 4;
} else {
State = 3;
}
UpdateProgress++;
CurrentEntry = NULL;
} else if (CancelUpdate != 0) {
State = 6;
break;
}
} else if (CancelUpdate != 0) {
State = 6;
break;
}
}
StartUpdate = 0;

File diff suppressed because it is too large Load Diff

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);

File diff suppressed because it is too large Load Diff

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

@@ -254,6 +254,13 @@ wchar_t* WithZi::getCurrentInput() {
return (wchar_t*)CandidatesBuffer;
}
static inline bool IsKoreanLeadingLetter(wchar_t value) {
for (s32 index = 0; index < 14; ++index) {
if (value == kKoreanLeadingLetters[index]) return true;
}
return false;
}
void WithZi::partialConfirmForKR() {
if (mInputLength <= 1) return;
bool match;
@@ -272,18 +279,7 @@ void WithZi::partialConfirmForKR() {
finalLetterChecked:
if (!match) goto keepLastLetter;
value = util::toWLower(CandidatesBuffer[mInputLength - 2]);
index = 0;
letters = kKoreanLeadingLetters;
for (; index < 14; ++index) {
if (value == *letters) {
match = true;
goto leadingLetterChecked;
}
++letters;
}
match = false;
leadingLetterChecked:
if (!match) goto keepLastLetter;
if (!IsKoreanLeadingLetter(value)) goto keepLastLetter;
CandidatesBuffer[0] = CandidatesBuffer[mInputLength - 2];
CandidatesBuffer[1] = CandidatesBuffer[mInputLength - 1];
mInputLength = 2;
@@ -301,6 +297,7 @@ void WithZi::update() {
return;
}
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
mSelectedCandidate = 0;
s32 elementCount = static_cast<u16>(setElementBuffer());
mSearch.language = getPredictLanguage();
@@ -309,7 +306,7 @@ void WithZi::update() {
mSearch.context = 1;
mSearch.getOptions = 0x81;
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
mSearch.candidates = candidateOutput;
mSearch.maxCandidates = 0x28;
mSearch.elementCount = static_cast<u8>(elementCount);
mSearch.firstCandidate = 0;
@@ -363,7 +360,7 @@ void WithZi::update() {
count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
mSearch.firstCandidate = 0;
count += 0x61;
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
mSearch.candidates = candidateOutput;
}
if (static_cast<s32>(count) > 0x28) {
count = 0x28;
@@ -514,10 +511,10 @@ scanDone:
u32 WithZi::setElementBuffer() {
u32 count = 0;
memset(ElementBuffer, 0, 0x1fe);
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
u16* elements = ElementBuffer;
u16* candidates = CandidatesBuffer;
memset(elements, 0, 0x1fe);
memset(candidates + 0x100, 0, 0x1fe);
u16 inputCharacter;
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
u16 index = count;
@@ -560,11 +557,11 @@ void WithZi::setCurrentWord(const wchar_t* word) {
LatestWord[1] = 0;
return;
}
mbContextChanged = 1;
wchar_t* currentWord;
u32 sourceOffset;
const wchar_t* source;
u32 length;
s32 copied;
mbContextChanged = 1;
length = 0;
currentWord = reinterpret_cast<wchar_t*>(LatestWord);
for (; *currentWord != 0 && *currentWord != 0x20;
@@ -575,15 +572,10 @@ void WithZi::setCurrentWord(const wchar_t* word) {
}
}
copied = 0;
sourceOffset = 0;
currentWord = const_cast<wchar_t*>(word);
for (; *currentWord != 0 && length < 0x3f;) {
wchar_t character = word[sourceOffset];
++length;
++currentWord;
++copied;
LatestWord[length - 1] = character;
++sourceOffset;
source = word;
for (; *source != 0 && length < 0x3f;) {
LatestWord[length++] = word[copied++];
++source;
}
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

@@ -595,6 +595,7 @@ create_mode_done:
}
void ipl::scene::AddressEdit::stt_wait_decide_anm() {
nw4r::lyt::Pane* textPane;
bool complete = true;
ipl::scene::Button* button = static_cast<ipl::scene::Button*>(ipl::System::getScene(5));
for (s32 i = 0; i < 5; ++i) {
@@ -645,7 +646,7 @@ void ipl::scene::AddressEdit::stt_wait_decide_anm() {
animator = mpBackgroundLayout->getAnim(0);
animator->initFrame();
animator->restart();
nw4r::lyt::Pane* textPane = mpNameLayout->getNW4RLyt()->GetRootPane()->FindPaneByName(
textPane = mpNameLayout->getNW4RLyt()->GetRootPane()->FindPaneByName(
"T_question_00", true);
set_textbox(textPane, ipl::System::getMessage(0x32));
textPane = mpNameLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_name_00", true);
@@ -2209,86 +2210,62 @@ done:
return;
}
void ipl::scene::AddressEdit::start_left_event(
const char* paneName) {
void ipl::scene::AddressEdit::start_left_event(const char* paneName) {
int buttonNo = get_button_no(paneName);
switch (mState) {
case 0x22:
goto state22;
case 0:
switch (buttonNo) {
case 0: {
if (mpFriendCache->getInfo(mSelectedFriend).attr.status != 2) {
break;
}
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
layout::Animator* animator = mpCodeLayout->getAnim(buttonNo + 11);
animator->initFrame();
animator->restart();
}
if (*count > 0) {
--*count;
}
break;
}
case 3:
goto state0Button3;
case 0:
goto state0Friend;
if (mPointCount[buttonNo] == 1) {
mpBalloon->fadeoutForce();
}
case 1:
case 2:
goto state0Common;
case 2: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
layout::Animator* animator = mpCodeLayout->getAnim(buttonNo + 11);
animator->initFrame();
animator->restart();
}
if (*count > 0) {
--*count;
}
break;
}
default:
break;
}
break;
case 0x22:
switch (buttonNo) {
case 3: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
mpBalloon->fadeoutForce();
}
--*count;
break;
}
}
break;
default:
break;
}
goto done;
state0Friend: {
u32 friendIndex = mSelectedFriend;
u32 friendType = mpFriendCache->getInfo(friendIndex).attr.status;
if (friendType != 2) {
goto done;
}
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
ipl::layout::Object* layout = mpCodeLayout;
ipl::layout::Animator* pane = layout->getAnim(buttonNo + 0xb);
pane->initFrame();
pane->restart();
}
if (*count > 0) {
--*count;
}
goto done;
}
state0Button3: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
(mpBalloon)->fadeoutForce();
}
--*count;
goto done;
}
state0Common: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
ipl::layout::Object* layout = mpCodeLayout;
ipl::layout::Animator* pane = layout->getAnim(buttonNo + 0xb);
pane->initFrame();
pane->restart();
}
if (*count > 0) {
--*count;
}
goto done;
}
state22:
if (buttonNo != 3) {
goto done;
}
{
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
(mpBalloon)->fadeoutForce();
}
--*count;
}
done:
return;
}
void ipl::scene::AddressEdit::start_trig_event(

View File

@@ -697,16 +697,19 @@ extern "C" s32 CardSequence_813D3424(s32 slot, s32 fileNo, CARDDir* dir) {
s32 sectorSize;
CARDFileInfo fileInfo;
} local;
s32 result = CARDFastOpen(slot, fileNo, &local.fileInfo);
s32 result;
u32 iconAddressBase;
s32 iconAddressOffset;
result = CARDFastOpen(slot, fileNo, &local.fileInfo);
if (result < 0) {
return result;
}
u32 bannerImageSize = 0;
s32 bannerImageSize = 0;
u8 format = dir->bannerFormat & 3;
u32 iconAddress = dir->iconAddr;
u32 iconAddressBase = iconAddress & 0xFFFFFE00;
s32 iconAddressOffset = iconAddress - iconAddressBase;
iconAddressBase = iconAddress & 0xFFFFFE00;
iconAddressOffset = iconAddress - iconAddressBase;
switch (format) {
case 1: {
@@ -827,7 +830,7 @@ iconSpeedDone:
sThread->icons[slot][fileNo].anmDelta = 1;
}
s32 totalImageSize = bannerImageSize + iconImageSize;
s32 totalImageSize = iconImageSize + bannerImageSize;
u32 transferSize = (totalImageSize + iconAddressOffset + 0x1FF) & 0xFFFFFE00;
result = CARDGetSectorSize(slot, (u32*)&local.sectorSize);
if (result < 0) {
@@ -854,9 +857,14 @@ iconSpeedDone:
(u8*)sThread->imageReadBuffer + iconAddressOffset,
totalImageSize);
DCStoreRange(sThread->images[slot][fileNo], transferSize);
result = 0;
}
}
if (result < 0) {
goto closeFile;
}
iconAddress = dir->commentAddr;
iconAddressBase = iconAddress & 0xFFFFFE00;
s32 commentDataOffset = iconAddress - iconAddressBase;
@@ -865,26 +873,30 @@ iconSpeedDone:
if (result < 0) {
goto clearComment;
}
if ((s32)iconAddressBase >= 0) {
if ((s32)iconAddressBase < 0) {
result = 0;
} else {
u32 fileSize = (u32)dir->length * local.commentSectorSize;
if (iconAddressBase <= fileSize) {
u32 endOffset = iconAddressBase + imageSize;
if ((s32)endOffset >= 0 && endOffset <= fileSize) {
result = CARDRead(&local.fileInfo, sThread->commentBuffer, imageSize,
iconAddressBase);
if (result < 0) {
goto clearComment;
}
memset(sThread->comments[slot][fileNo], 0, 0x40);
memcpy(sThread->comments[slot][fileNo],
sThread->commentBuffer + commentDataOffset, 0x40);
result = 0;
goto commentDone;
}
if (iconAddressBase > fileSize) {
result = 0;
goto clearComment;
}
u32 endOffset = iconAddressBase + imageSize;
if ((s32)endOffset < 0 || endOffset > fileSize) {
result = 0;
goto clearComment;
}
result = CARDRead(&local.fileInfo, sThread->commentBuffer, imageSize,
iconAddressBase);
if (result < 0) {
goto clearComment;
}
memset(sThread->comments[slot][fileNo], 0, 0x40);
memcpy(sThread->comments[slot][fileNo],
sThread->commentBuffer + commentDataOffset, 0x40);
result = 0;
goto commentDone;
}
result = 0;
goto clearComment;
clearComment:
memset(sThread->comments[slot][fileNo], 0, 0x40);

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,20 +145,19 @@ 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;
} else {
long destinationState = 0;
long destinationState;
if (!isDistSlot(slot, &destinationState)) {
if (destinationState == 0) {
result = -0x17;
@@ -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,20 +185,19 @@ 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;
} else {
long destinationState = 0;
long destinationState;
if (!isDistSlot(slot, &destinationState)) {
if (destinationState == 0) {
result = -0x17;
@@ -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,12 +251,12 @@ 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];
s16 frame = mFileCell[slot][file].iconAnmCounter + icon->anmDelta;
memorycard::IconState* icon = icons[slot] + file;
s32 frame = mFileCell[slot][file].iconAnmCounter + icon->anmDelta;
mFileCell[slot][file].iconAnmCounter = frame;
if (frame >= icon->anmMax) {
if ((s16)frame >= icons[slot][file].anmMax) {
if (icon->anmType == 4) {
mFileCell[slot][file].iconAnmCounter = icon->anmMax - icon->unk_0x07 - 1;
mFileCell[slot][file].iconAnmCounter = icons[slot][file].anmMax - icon->unk_0x07 - 1;
icon->anmDelta = -1;
} else {
mFileCell[slot][file].iconAnmCounter = 0;
@@ -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

@@ -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",
@@ -89,13 +89,13 @@ namespace ipl {
mpMainLayout->getAnim(5)->initAnmFrame();
mpMainLayout->getAnim(8)->initAnmFrame();
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
textBox->SetString(System::getMessage(0xB0));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_05"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_05"));
textBox->SetString(System::getMessage(0xBB));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_06"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_06"));
textBox->SetString(System::getMessage(0xBC));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_BtnA"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_BtnA"));
textBox->SetString(System::getMessage(0x25));
mpTitleLayout = new layout::Object(heap, layoutFile, "arc", "mn_DialogWindow_ChChange_b.brlyt");
@@ -124,29 +124,29 @@ namespace ipl {
mpTitleLayout->getAnim(11)->initAnmFrame();
mpTitleLayout->getAnim(14)->initAnmFrame();
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("T_Dialog"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("T_Dialog"));
textBox->SetString(System::getMessage(0xB6));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_00"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_00"));
textBox->SetString(System::getMessage(0xB7));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_01"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_01"));
textBox->SetString(System::getMessage(0xB8));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_02"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_02"));
textBox->SetString(System::getMessage(0xB9));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_03"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_03"));
textBox->SetString(System::getMessage(0xBA));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("T_Dialog_00"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("T_Dialog_00"));
textBox->SetString(System::getMessage(0xB6));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_05"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_05"));
textBox->SetString(System::getMessage(0xB8));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_06"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_06"));
textBox->SetString(System::getMessage(0xB9));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_07"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_07"));
textBox->SetString(System::getMessage(0xBA));
const ESTitleId* cachedTitles = System::getSaveData()->getTitleCache();
const savedata::Manager* saveData = System::getSaveData();
s32 cachedTitleCount = 0;
for (s32 i = 0; i < 48; ++i) {
if (cachedTitles[i] == 0) {
if (saveData->getTitleCacheEntry(i) == 0) {
break;
}
++cachedTitleCount;
@@ -160,7 +160,7 @@ namespace ipl {
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(false);
mDisplayMode = 3;
}
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("T_BtnA"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("T_BtnA"));
textBox->SetString(System::getMessage(0xA5));
mpDialogLayout = new layout::Object(heap, layoutFile, "arc", "mn_DialogWindow_ChChange_c.brlyt");
@@ -195,18 +195,19 @@ namespace ipl {
mpDialogLayout->getAnim(11)->initAnmFrame();
mpDialogLayout->getAnim(8)->initAnmFrame();
mpDialogLayout->getAnim(18)->initAnmFrame();
mpDialogLayout->getAnim(18)->initFrame();
mpDialogLayout->getAnim(18)->restart();
layout::Animator* scrollAnimator = mpDialogLayout->getAnim(18);
scrollAnimator->initFrame();
scrollAnimator->restart();
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpDialogLayout->FindPaneByName("T_CalExit"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpDialogLayout->FindPaneByName("T_CalExit"));
textBox->SetString(System::getMessage(0xA5));
textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpDialogLayout->FindPaneByName("T_CalExit_00"));
textBox = static_cast<nw4r::lyt::TextBox*>(mpDialogLayout->FindPaneByName("T_CalExit_00"));
textBox->SetString(System::getMessage(0xC4));
mpProgressLayout = new layout::Object(heap, layoutFile, "arc", "mn_DialogWindow_Background.brlyt");
mpProgressLayout->bindToGroup("mn_DialogWindow_Background_DialogIn.brlan", "G_InOut", false, true);
mpProgressLayout->bindToGroup("mn_DialogWindow_Background_DialogOut.brlan", "G_InOut", false, true);
mpProgressLayout->finishBinding();
mpDialogLayout->finishBinding();
mpProgressLayout->getAnim(0)->initAnmFrame();
ControlPaneEventHandler* controlEvent = new ControlPaneEventHandler(this);
@@ -240,6 +241,7 @@ namespace ipl {
mpPaneManagers[2]->setTriggerTarget(mpDialogLayout->FindPaneByName(sDialogPaneNames[i]), true);
}
mTransferFlags[0] = 1;
}
void SDMemory::setTitleLists(const TitleRange& nandTitles, const TitleRange& sdTitles) {
@@ -1139,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);
@@ -1249,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");
@@ -1282,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);
@@ -1303,6 +1311,7 @@ namespace ipl {
messageOffset -= bodyHeight;
++lineIndex;
} while (lineIndex < totalLines);
}
}
@@ -1326,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");
@@ -1341,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());
@@ -1349,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());
@@ -1366,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());
@@ -1386,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;
@@ -1453,48 +1450,60 @@ namespace ipl {
bool SDChannelSelect::collectTitlesBySpecialChannels(
const s32* firstUsage, const s32* secondUsage, ESTitleId* titleIds,
char* titleNames, u32* titleCount) {
s32 bytes;
s32 blocks;
getCurrentTitleUsage(&bytes, &blocks);
int hateUsageIndex = -1;
int hatePage = -1;
int hateChannelIndex = -1;
int hadeUsageIndex = -1;
int hadePage = -1;
int hadeChannelIndex = -1;
s32 bytes;
s32 blocks;
getCurrentTitleUsage(&bytes, &blocks);
for (u32 usageIndex = 0; usageIndex < mNandTitleCount; ++usageIndex) {
ESTitleId titleId = mpNandTitleInfo[usageIndex].curTitleId;
if (titleId == ES_TITLE_ID(0x00010001, 0x48415445)) {
int page;
int channelIndex;
hateUsageIndex = usageIndex;
System::getChannelManager()->hasChannel(
ES_TITLE_ID(0x00010001, 0x48415445), &hatePage, &hateChannelIndex);
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;
System::getChannelManager()->hasChannel(
ES_TITLE_ID(0x00010001, 0x48414445), &hadePage, &hadeChannelIndex);
ES_TITLE_ID(0x00010001, 0x48414445), &page, &channelIndex);
hadePage = page;
hadeChannelIndex = channelIndex;
}
}
*titleCount = 0;
for (int usageIndex = mNandTitleCount - 1; usageIndex >= 0; --usageIndex) {
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);
@@ -1535,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);
@@ -1550,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);
@@ -1590,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;
@@ -1691,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);
@@ -1924,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();
@@ -1943,8 +1953,8 @@ namespace ipl {
OSSleepTicks(OSMicrosecondsToTicks((OSTime)100));
}
delete mpSaveDataFile;
mpSaveDataFile = NULL;
}
mpSaveDataFile = NULL;
if (mpSDWorker != NULL) {
if (!mpSDWorker->is_terminated()) {
@@ -2066,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;
}
@@ -2081,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();
@@ -2100,7 +2119,6 @@ namespace ipl {
case 16:
case 19:
case 20:
case 21:
case 22:
case 23:
if (page == mSourcePage && index == mSourceIndex) {
@@ -2112,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;
}
}
}
@@ -2239,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();
@@ -2698,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;
@@ -3458,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));
}
}
}

File diff suppressed because it is too large Load Diff

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