Compare commits
381 Commits
agent/w092
...
cleanup/ch
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7404d6202 | ||
|
|
40653c3c02 | ||
|
|
f0829ff810 | ||
|
|
ffdd7b58e0 | ||
|
|
1a0f83a156 | ||
|
|
a3d088e4d3 | ||
|
|
3b90bd66c6 | ||
|
|
b395269be6 | ||
|
|
60bc67e097 | ||
|
|
4e8223f3d4 | ||
|
|
3f36d5f4cc | ||
|
|
1f0dc64062 | ||
|
|
5db0cd6086 | ||
|
|
54b44a3534 | ||
|
|
1493baaba0 | ||
|
|
22dd088277 | ||
|
|
1bbc40cb3b | ||
|
|
e6bf9cc669 | ||
|
|
ffd9cc4a69 | ||
|
|
eb8f78788d | ||
|
|
889823ed67 | ||
|
|
7dea4122fc | ||
|
|
1802d45758 | ||
|
|
130cc9e88e | ||
|
|
a801d1c5d6 | ||
|
|
8ab07fbb20 | ||
|
|
f68fcc0f9b | ||
|
|
5ad481ae40 | ||
|
|
713951c551 | ||
|
|
b47507aa3f | ||
|
|
01a73b600f | ||
|
|
83b577cf62 | ||
|
|
f67990d237 | ||
|
|
ad85ad1537 | ||
|
|
f32665703f | ||
|
|
e062e1c669 | ||
|
|
76a60f8c1a | ||
|
|
63579601e2 | ||
|
|
e46bac9a1b | ||
|
|
1f224c53c1 | ||
|
|
30e2147479 | ||
|
|
6ffcbf8f46 | ||
|
|
47add32987 | ||
|
|
e0ea552982 | ||
|
|
c7949ac4f0 | ||
|
|
e697514b7b | ||
|
|
32c3f7f2cd | ||
|
|
1618565c1d | ||
|
|
6040414eec | ||
|
|
08acc800f1 | ||
|
|
0703b62968 | ||
|
|
86c3cacc2d | ||
|
|
f7e6fc5387 | ||
|
|
dfbb774ce4 | ||
|
|
9b69048f06 | ||
|
|
602b10ed43 | ||
|
|
f0a91338f4 | ||
|
|
ff568a273c | ||
|
|
9f6ef656fd | ||
|
|
9d2f607b3f | ||
|
|
c836ab8bae | ||
|
|
b889c52efc | ||
|
|
282c29b2c7 | ||
|
|
27e37fd7ee | ||
|
|
00051c32c6 | ||
|
|
80fecf3aa3 | ||
|
|
37724c57d6 | ||
|
|
1a32db7bdc | ||
|
|
2aab31c1f9 | ||
|
|
24c84f5bfc | ||
|
|
73de5786da | ||
|
|
3abcd34252 | ||
|
|
5c20a11fa8 | ||
|
|
f85a98a6e3 | ||
|
|
137ee3242a | ||
|
|
2368a9a774 | ||
|
|
90399bb6cf | ||
|
|
fc831357ea | ||
|
|
e2191ae933 | ||
|
|
7d77c095c0 | ||
|
|
db8ff7e141 | ||
|
|
2cb6c2dfae | ||
|
|
6f96235605 | ||
|
|
367b042e63 | ||
|
|
feb7ba400d | ||
|
|
20f4af8beb | ||
|
|
dca6cd9aef | ||
|
|
a0700bf908 | ||
|
|
de058b4298 | ||
|
|
c5468cbe50 | ||
|
|
62591733eb | ||
|
|
e2488b073a | ||
|
|
9a8de22195 | ||
|
|
a6bf0e5f4f | ||
|
|
d434f5b897 | ||
|
|
0adc759b42 | ||
|
|
9c55b47c1d | ||
|
|
081329daa8 | ||
|
|
a348c9777a | ||
|
|
d5204f5c62 | ||
|
|
cedc1f1390 | ||
|
|
ff0cce33f6 | ||
|
|
2beeb23a47 | ||
|
|
35d9ed53b1 | ||
|
|
015d50906c | ||
|
|
348da5bd89 | ||
|
|
cdceb82200 | ||
|
|
1b56ea5051 | ||
|
|
3946983f96 | ||
|
|
85d75cd0cf | ||
|
|
af39f2678f | ||
|
|
d613662c54 | ||
|
|
0e6e235004 | ||
|
|
020e1b6f0b | ||
|
|
3440aab039 | ||
|
|
dab806eaa2 | ||
|
|
f4fd16f88f | ||
|
|
3d8de1a356 | ||
|
|
8e43db0528 | ||
|
|
21c9b95b1b | ||
|
|
d4bdd3462c | ||
|
|
f7d81a0196 | ||
|
|
4f35874d02 | ||
|
|
0a5cbaf78e | ||
|
|
6e7c016ae3 | ||
|
|
e60306db62 | ||
|
|
5d0ced6a15 | ||
|
|
858a507ddf | ||
|
|
ce424f1a3e | ||
|
|
bcb37e07ef | ||
|
|
11094c638a | ||
|
|
cb49bde9c6 | ||
|
|
df9fd72e87 | ||
|
|
0c554a1602 | ||
|
|
f00336cc8b | ||
|
|
842bbc6942 | ||
|
|
ab01520044 | ||
|
|
5f948d3f3a | ||
|
|
699f844395 | ||
|
|
3afb9d8425 | ||
|
|
72c3f4ba2d | ||
|
|
905c45b998 | ||
|
|
5a849425b1 | ||
|
|
fd11ddb195 | ||
|
|
d9b51418b9 | ||
|
|
87e7ab6922 | ||
|
|
d186251506 | ||
|
|
cb58211725 | ||
|
|
2dbf80c418 | ||
|
|
faee1f779d | ||
|
|
a324e9a843 | ||
|
|
2bddfcde52 | ||
|
|
776b7981df | ||
|
|
539693c76a | ||
|
|
3134c4c05a | ||
|
|
d60d10868a | ||
|
|
735b0ab878 | ||
|
|
ea8d4d3b8a | ||
|
|
7329402a2c | ||
|
|
e46168062b | ||
|
|
b2074a70d7 | ||
|
|
98648d19bb | ||
|
|
d03219249b | ||
|
|
3c23585249 | ||
|
|
b4745ba2da | ||
|
|
fb3e7bd49a | ||
|
|
e34eac26ef | ||
|
|
565d039c01 | ||
|
|
46d7bc07cf | ||
|
|
6ec48a1b9a | ||
|
|
07b3a2b579 | ||
|
|
e1b46d09e8 | ||
|
|
a4d46cf340 | ||
|
|
46e8217f2f | ||
|
|
028e36cce2 | ||
|
|
6abc1f9bd8 | ||
|
|
b004e2be89 | ||
|
|
5c1794ef25 | ||
|
|
c393274640 | ||
|
|
3bfbb0c9c3 | ||
|
|
cdc22045a7 | ||
|
|
976fbeb804 | ||
|
|
725599dba0 | ||
|
|
4d0c9e70d6 | ||
|
|
131d8f743c | ||
|
|
23067a3477 | ||
|
|
c7958e9f67 | ||
|
|
d9ee532e07 | ||
|
|
1d5184b30e | ||
|
|
a27b6aa96e | ||
|
|
112149c8e5 | ||
|
|
45a6d499ec | ||
|
|
813110e681 | ||
|
|
f4a48bd996 | ||
|
|
f1590c832e | ||
|
|
d6cafeab4d | ||
|
|
c047b544c1 | ||
|
|
82dbaac35d | ||
|
|
e8d4107b11 | ||
|
|
1b96b3956b | ||
|
|
81c36c4db0 | ||
|
|
355564cd77 | ||
|
|
17b5d5946b | ||
|
|
ed5a62397d | ||
|
|
2a34d3703b | ||
|
|
3f5248be4c | ||
|
|
59e127f89a | ||
|
|
787aa9d334 | ||
|
|
30809a5b05 | ||
|
|
c21ae517d5 | ||
|
|
5c7d7ca74a | ||
|
|
7a94e90a6e | ||
|
|
cec99e3cf8 | ||
|
|
6172b57647 | ||
|
|
bed8e32e57 | ||
|
|
930e8f4ecf | ||
|
|
c835bedbc1 | ||
|
|
5981234728 | ||
|
|
3b2304bd75 | ||
|
|
6ade163015 | ||
|
|
e6496cc6a8 | ||
|
|
99cfa80f99 | ||
|
|
dfb64b9747 | ||
|
|
94e6d86223 | ||
|
|
c923937c3b | ||
|
|
bf90a97c1a | ||
|
|
884952a19b | ||
|
|
70b04f1d72 | ||
|
|
95d895d71a | ||
|
|
6a2a3dd67f | ||
|
|
341354dce2 | ||
|
|
a22313e57e | ||
|
|
91e65d765b | ||
|
|
dc93ab5777 | ||
|
|
a3b04ad9ea | ||
|
|
55fd34f972 | ||
|
|
7f055a587e | ||
|
|
7a6efe8a2c | ||
|
|
de2c8c4688 | ||
|
|
d08d7dec60 | ||
|
|
f20fc7b8e9 | ||
|
|
03ed29ccee | ||
|
|
2058b121cc | ||
|
|
4588eee6a9 | ||
|
|
ad3da3bb76 | ||
|
|
f9bd6755ba | ||
|
|
4f78910f8b | ||
|
|
9189c9bb9f | ||
|
|
eccd5f8c45 | ||
|
|
038cd6f939 | ||
|
|
1c505b9708 | ||
|
|
b646f1caaf | ||
|
|
46066115ab | ||
|
|
bc6d67e3f5 | ||
|
|
d399446f10 | ||
|
|
5c690a7da3 | ||
|
|
59a3bfc3b2 | ||
|
|
547c2f508f | ||
|
|
f34c0b3aa7 | ||
|
|
dcc384b7fa | ||
|
|
3fef1bd99e | ||
|
|
fd30e881a1 | ||
|
|
213a6bee9b | ||
|
|
e758673de1 | ||
|
|
c4f51491a3 | ||
|
|
675a831828 | ||
|
|
cbeb2dee76 | ||
|
|
e744a24c1f | ||
|
|
1ec6dda7ad | ||
|
|
97ceae0874 | ||
|
|
e81a2616cd | ||
|
|
4830a26101 | ||
|
|
ba7b9fa6ea | ||
|
|
9845b3d75e | ||
|
|
88ab8325db | ||
|
|
2060db15f6 | ||
|
|
eaee2295cc | ||
|
|
856a31f8c9 | ||
|
|
9ea683dd61 | ||
|
|
ea4ec10115 | ||
|
|
97a2eb1f23 | ||
|
|
3cbf4bb3e9 | ||
|
|
033b33a486 | ||
|
|
6b6215ad3e | ||
|
|
9ad0863dbf | ||
|
|
41877f03dc | ||
|
|
bc95aa48e9 | ||
|
|
64018b3b33 | ||
|
|
2748f29a98 | ||
|
|
e6ef163648 | ||
|
|
c765bd2eca | ||
|
|
c65c722932 | ||
|
|
df54d9a348 | ||
|
|
b983deeb07 | ||
|
|
b615148895 | ||
|
|
95c685534e | ||
|
|
68f1674a5d | ||
|
|
5875521928 | ||
|
|
0e4f2c726f | ||
|
|
620a8a6814 | ||
|
|
84972cb9f1 | ||
|
|
54d865f151 | ||
|
|
0e31a5b37c | ||
|
|
8b568557b0 | ||
|
|
19f6c82a98 | ||
|
|
3e81c24a0c | ||
|
|
5e0fbb88f0 | ||
|
|
32da26fae0 | ||
|
|
413e6c483b | ||
|
|
d76c36462f | ||
|
|
f1cc81a228 | ||
|
|
ca4339eece | ||
|
|
0107230f11 | ||
|
|
c77b866ed4 | ||
|
|
550c5f19c1 | ||
|
|
e00d7aefd6 | ||
|
|
92f10a65fa | ||
|
|
e858a9362d | ||
|
|
bd1885f9be | ||
|
|
42647c75c1 | ||
|
|
83a55a20a0 | ||
|
|
46f34f11f5 | ||
|
|
1bc8f49115 | ||
|
|
f055c43c22 | ||
|
|
985bae5d42 | ||
|
|
d4696caeaf | ||
|
|
2b4ed18122 | ||
|
|
02e50d2dc2 | ||
|
|
46d7abf8c0 | ||
|
|
fddb035def | ||
|
|
e196e79bfd | ||
|
|
a4854483dc | ||
|
|
5ed744554c | ||
|
|
fcb5be85f7 | ||
|
|
1a697e61f9 | ||
|
|
112e4e1a14 | ||
|
|
0aca3c76ee | ||
|
|
8882983861 | ||
|
|
7097003811 | ||
|
|
e265d9664e | ||
|
|
a620eec6a4 | ||
|
|
5cdca2e8aa | ||
|
|
3b286167ba | ||
|
|
882a83064e | ||
|
|
d9237cdbd3 | ||
|
|
a6ac8d34d0 | ||
|
|
58b5333a4e | ||
|
|
64f977ea3b | ||
|
|
daf758ece1 | ||
|
|
6cdbe274bd | ||
|
|
2e63974b0c | ||
|
|
1c419b67a1 | ||
|
|
07459f685a | ||
|
|
3b93fc8664 | ||
|
|
7f627435b5 | ||
|
|
74f1719bfd | ||
|
|
506535db40 | ||
|
|
2a4e4f85ed | ||
|
|
4402bd99a8 | ||
|
|
44f42d98ed | ||
|
|
db27a09ea3 | ||
|
|
c21dcc3d31 | ||
|
|
ac51d83fa5 | ||
|
|
6490b90f65 | ||
|
|
823ee31937 | ||
|
|
51f940c1ea | ||
|
|
8e254f1c88 | ||
|
|
313e396989 | ||
|
|
f98e550b24 | ||
|
|
7f8b4c8a4f | ||
|
|
6806dc1926 | ||
|
|
f0f1462ff4 | ||
|
|
9347e0b1c3 | ||
|
|
341ce036f5 | ||
|
|
53be96c012 | ||
|
|
a4e7841498 | ||
|
|
fb81577a0f | ||
|
|
258f4a6f91 | ||
|
|
b719ba47a5 | ||
|
|
094cfd811e | ||
|
|
c98c2010b2 |
62
.github/workflows/readme-progress.yml
vendored
Normal file
62
.github/workflows/readme-progress.yml
vendored
Normal file
@@ -0,0 +1,62 @@
|
||||
name: README progress
|
||||
|
||||
# runs on the self-hosted runner on cole's server so it doesn't use hosted minutes.
|
||||
# only push/schedule/manual triggers, never pull_request, so fork PRs can't reach this machine.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
paths-ignore: [README.md]
|
||||
schedule:
|
||||
- cron: "*/30 * * * *"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: readme-progress
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
progress:
|
||||
runs-on: [self-hosted, wii-ipl-local]
|
||||
timeout-minutes: 60
|
||||
env:
|
||||
ORIG_APP: /mnt/drive2/projects/wiichannels/wii-ipl/orig/43U/00000008.app
|
||||
TOOL_CACHE: /mnt/drive2/projects/wiichannels/wii-ipl/build
|
||||
NINJA: /home/cole/projects/tests/.venv/bin/ninja
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: main
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Prepare
|
||||
run: |
|
||||
mkdir -p build orig/43U
|
||||
cp "$ORIG_APP" orig/43U/00000008.app
|
||||
[ -d build/compilers ] || cp -a "$TOOL_CACHE/compilers" build/
|
||||
[ -d build/tools ] || cp -a "$TOOL_CACHE/tools" build/
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
python3 configure.py --version 43U
|
||||
"$NINJA"
|
||||
"$NINJA" build/43U/ok
|
||||
|
||||
- name: Report
|
||||
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
|
||||
|
||||
- name: Update README
|
||||
run: python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
|
||||
- name: Commit
|
||||
run: |
|
||||
if git diff --quiet README.md; then exit 0; fi
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add README.md
|
||||
git commit -m "docs: update progress [skip ci]"
|
||||
git pull --rebase origin main || { git rebase --abort; echo "main moved, next run will update"; exit 0; }
|
||||
git push origin HEAD:main
|
||||
10
README.md
10
README.md
@@ -50,6 +50,16 @@ Supported versions:
|
||||
|
||||
Progress
|
||||
========
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.84% | 62.33% | 92.06% |
|
||||
|
||||
units 919/1027 complete, functions 12220/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 -->
|
||||
|
||||
| Version | Progress |
|
||||
|-----------------------|------------------------------------------------------------------------------|
|
||||
| [Wii Menu 4.3U][V43U] | [![FuncBadgeV43U]][V43U] [![DecompBadgeV43U]][V43U] [![LinkBadgeV43U]][V43U] |
|
||||
|
||||
293
agent/sol-med-attempts.md
Normal file
293
agent/sol-med-attempts.md
Normal file
@@ -0,0 +1,293 @@
|
||||
# sol-med matching attempts
|
||||
|
||||
ATERM pool was identical before iteration. Initial gate: 3/26 instruction-exact, code 72/19204, data 18440/18864, no regressions.
|
||||
|
||||
ATERM_814021BC: (1) combined network settings and access-point name, moved member-pointer initialization after clears, bottom-tested host loop: 153/154 instructions, register and addressing differences; (2) aligned the name member and explicit settings pointer: same instruction count and differences; (3) initialized IP pointer before clear: no improvement. Restored original to avoid unrelated aggregate changes.
|
||||
ATERM_81402424: (1) aligned scan parameters to 32, swapped message/buffer declarations, preserved scan exit result test: 210/210, three condition-register differences; (2) tested scan result != retry error: one branch difference; (3) tested scan result == retry error: 210/210, diffs 0. Retained.
|
||||
ATERM_8140276C: (1) initialized previous record cursor before outer loop, reset at outer tail, separated result flag, scoped AOSS flags: 174/174, 31 register differences; (2) reordered result/found declarations and scoped previous index: 174/174, 27 register differences. Further experiments below.
|
||||
ATERM_81403614: (1) switch over hex character ranges, signed index and indexed output: 49/49, two division differences; (2) explicit signed truncation for index/2: one operand-order difference; (3) reversed addition operands: diffs 0. Retained.
|
||||
ATERMi_AutoConfigThread: (1) real three-field progress object and conditional terminal state: 39/40 instructions; (2) signed equality mask: 40/40, three scheduling/register differences; (3) read progress result before deadline assignment: eight differences. Further experiments below.
|
||||
ATERMi_ApConfigStart: (1) inclusive state bounds, use stored stack size and callback: 103/103, twelve differences; (2) restore source order of global initialization: six clock-register differences. Further experiments below.
|
||||
ATERMi_ApConfigEnd: (1) capture initial state only inside active-thread branch, swap message declarations, compute 500ms alarm instead of reciprocal literal: 125/129 instructions, frame/scheduling differences. Further experiments below.
|
||||
ATERMi_ApConfigGetState: (1) reciprocal first in multiply-high: four register differences; (2) load bus clock in multiply expression: unchanged; (3) direct time conversion expression: unchanged. Restored original, 35/35 instructions with three register differences.
|
||||
|
||||
ATERM_8140276C initial 99.166664%
|
||||
- previous cursor declaration before current cursor: 99.5115%; src 0x2b8 base 0x2b8 insns 174/174; diffs 15: [8, 9, 82, 84, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97]; 8 M addi r27, r4, 4; B addi r31, r3, 4
|
||||
- signed record indices: 99.166664%; src 0x2b8 base 0x2b8 insns 174/174; diffs 27: [8, 9, 18, 29, 34, 41, 50, 54, 55, 60, 61, 68, 74, 75, 82, 84, 87, 88, 89, 90]; 8 M addi r27, r3, 4; B addi r31, r3, 4
|
||||
- AOSS flags initialized after clear: 99.54023%; src 0x2b8 base 0x2b8 insns 174/174; diffs 14: [8, 9, 18, 29, 34, 41, 50, 54, 55, 60, 61, 68, 74, 75]; 8 M addi r27, r3, 4; B addi r31, r3, 4
|
||||
Retained original
|
||||
|
||||
ATERM_81402A24 initial 72.47529%
|
||||
- record capacity includes final descriptor: 71.30038%; src 0x3d4 base 0x41c insns 245/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- allocate nullable buffers before handling failure: 72.380226%; src 0x3cc base 0x41c insns 243/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- multiply-high tick conversion: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81402E40 initial 99.791664%
|
||||
- payload clear through byte alias: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- natural checksum loop: 65.208336%; src 0x108 base 0x180 insns 66/96; --- replace mine 5:12 base 5:12; M 5 mr r28, r5; M 6 mr r26, r3
|
||||
- end length as packet byte extent: 95.572914%; src 0x180 base 0x180 insns 96/96; diffs 6: [9, 10, 42, 44, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
Retained original
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- full-width checksum accumulator: 64.76296%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- bottom-tested option loop: compile failed
|
||||
- early return for bad checksum: 66.94074%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained original
|
||||
|
||||
ATERM_814031DC initial 85.7218%
|
||||
- MAC text uses equal-sized buffers: 85.766914%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 47:48 base 47:48; M 47 beq 288; B 47 beq 320
|
||||
- nibble conversion advances output cursor: 84.293236%; src 0x204 base 0x214 insns 129/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
- inclusive digit bound and pointer-based MAC scan: 85.90225%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_814033F0 initial 65.868614%
|
||||
- option fields retain converted word width: 67.39416%; src 0x214 base 0x224 insns 133/137; --- replace mine 5:6 base 5:6; M 5 addi r30, r3, 8; B 5 addi r29, r3, 8
|
||||
- bottom-tested parser dispatch: 65.79562%; src 0x21c base 0x224 insns 135/137; --- replace mine 5:6 base 5:6; M 5 addi r28, r3, 8; B 5 addi r29, r3, 8
|
||||
- signed nibble comparisons: 65.32117%; src 0x21c base 0x224 insns 135/137; --- insert mine 7:7 base 7:8; B 7 li r24, 0; --- replace mine 10:29 base 11:17
|
||||
Retained original
|
||||
|
||||
ATERM_814036D8 initial 73.92742%
|
||||
- security switch matches original decision tree: 85.22581%; src 0x1ec base 0x1f0 insns 123/124; --- replace mine 14:15 base 14:15; M 14 beq 340; B 14 beq 344
|
||||
- key text passed through one cursor: 87.0%; src 0x1e4 base 0x1f0 insns 121/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
- counted loop over key records: 73.92742%; src 0x1e0 base 0x1f0 insns 120/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
Retained original
|
||||
|
||||
ATERM_814038C8 initial 35.28917%
|
||||
- one-shot 500ms wait replaces repeated alarm: 35.700314%; src 0x788 base 0xedc insns 482/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- bottom-tested state machine and wait buffer order: 35.288116%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- progress uses semantic structure: 35.28917%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- signed RFC3394 counters: 16.34188%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
- counter represented as big-endian bytes: compile failed
|
||||
- RFC3394 initial value and block output order: 18.264957%; src 0x1b0 base 0x1d4 insns 108/117; --- replace mine 6:9 base 6:13; M 6 mr r27, r3; M 7 mr r20, r4
|
||||
Retained original
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- signed RFC3394 counters: 16.34188%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
|
||||
ATERM_81404844 initial 16.34188%
|
||||
- signed RFC3394 counters: 16.34188%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
- counter represented as big-endian bytes: compile failed
|
||||
- RFC3394 initial value and block output order: 18.264957%; src 0x1b0 base 0x1d4 insns 108/117; --- replace mine 6:9 base 6:13; M 6 mr r27, r3; M 7 mr r20, r4
|
||||
Retained original
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
- signed RFC3394 counters: 52.05785%; src 0x1c8 base 0x1e4 insns 114/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
- counter represented as big-endian bytes: compile failed
|
||||
- RFC3394 initial value and block output order: 54.991737%; src 0x1c4 base 0x1e4 insns 113/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x190(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81404BFC initial 36.869404%
|
||||
- AES byte assembly uses XOR instead of OR: 37.063435%; src 0x400 base 0x430 insns 256/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- key schedule reads preceding round and chains fourth key word: 36.925373%; src 0x3dc base 0x430 insns 247/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- signed round count drives key expansion termination: 49.21642%; src 0x3e0 base 0x430 insns 248/268; --- replace mine 0:3 base 0:47; M 0 lbz r8, 1(r4); M 1 cmplwi r5, 0x80
|
||||
Retained original
|
||||
|
||||
ATERM_8140502C initial 35.666668%
|
||||
- interleaved key-word swaps: 42.355072%; src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- signed indexed round reversal: 38.746376%; src 0x290 base 0x228 insns 164/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- counted transformation loop: 11.731884%; src 0x288 base 0x228 insns 162/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
Retained original
|
||||
|
||||
ATERM_81405254 initial 30.464945%
|
||||
- AES byte assembly uses XOR: 34.23247%; src 0x3c4 base 0x43c insns 241/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained original
|
||||
|
||||
ATERM_81405690 initial 26.601477%
|
||||
- AES byte assembly uses XOR: 34.64945%; src 0x3d4 base 0x43c insns 245/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained original
|
||||
|
||||
ATERM_81405ACC initial 0%
|
||||
- natural byte copy instead of explicit eight-byte loop: 0%; src 0x10c base 0x240 insns 67/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:12 base 4:10
|
||||
- separate 32-bit count carry updates: 0%; src 0x184 base 0x240 insns 97/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:5 base 4:11
|
||||
- indexed full-block walk retains input length: 0%; src 0x17c base 0x240 insns 95/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:12 base 4:10
|
||||
Retained original
|
||||
|
||||
ATERM_81405D0C initial 32.62639%
|
||||
- decode words with XOR: 25.144444%; src 0xa5c base 0xb40 insns 663/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- MD5 first-round select expressed as xor mask: 30.945833%; src 0x9fc base 0xb40 insns 639/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- flat byte-to-word decode loop: 27.13889%; src 0x904 base 0xb40 insns 577/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
Retained original
|
||||
|
||||
ATERMi_AutoConfigThread initial 91.325%
|
||||
- remaining time assigned before terminal state: 91.475%; src 0xa0 base 0xa0 insns 40/40; diffs 7: [20, 22, 23, 26, 28, 29, 30]; 20 M nor r0, r3, r0; B nor r3, r3, r0
|
||||
- terminal mask reuses result variable: 85.075%; src 0xa0 base 0xa0 insns 40/40; diffs 9: [21, 22, 23, 25, 26, 28, 29, 30, 31]; 21 M lwz r4, 0(0); B li r4, -1
|
||||
- state stores preceding deadline store: 85.2%; src 0xa0 base 0xa0 insns 40/40; diffs 8: [21, 22, 23, 25, 26, 29, 30, 31]; 21 M lwz r4, 0(0); B li r4, -1
|
||||
Retained original
|
||||
|
||||
ATERMi_ApConfigStart initial 99.70874%
|
||||
- allocate via stored callback: 99.70874%; src 0x19c base 0x19c insns 103/103; diffs 6: [46, 47, 48, 49, 75, 76]; 46 M lis r31, -0x8000; B lis r30, -0x8000
|
||||
- tick multiplier commutes operands: 97.76699%; src 0x19c base 0x19c insns 103/103; diffs 7: [48, 49, 51, 75, 76, 77, 78]; 48 M lwz r6, 0xf8(r30); B lwz r0, 0xf8(r30)
|
||||
- progress state populated before zeroing result buffer: 90.72816%; src 0x19c base 0x19c insns 103/103; diffs 18: [46, 47, 48, 49, 56, 58, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 75, 76]; 46 M lis r31, -0x8000; B lis r30, -0x8000
|
||||
Retained original
|
||||
|
||||
ATERMi_ApConfigEnd initial 93.94574%
|
||||
- message queues declared within their wait scopes: 91.89922%; src 0x1f4 base 0x204 insns 125/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- join loop expressed as do-while: 91.54263%; src 0x200 base 0x204 insns 128/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- time conversion evaluated directly: 93.94574%; src 0x1f4 base 0x204 insns 125/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- big-endian counter union assigned after declarations: 23.931623%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
- big-endian counter union assigned after declarations: 57.677685%; src 0x1c8 base 0x1e4 insns 114/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81405254 initial 30.464945%
|
||||
- two-round iteration with scoped second round: 25.00369%; src 0x4b8 base 0x43c insns 302/271; --- replace mine 5:42 base 5:230; M 5 lbz r9, 1(r5); M 6 lis r12, 0
|
||||
- signed round index: 30.464945%; src 0x3a4 base 0x43c insns 233/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- round key XOR before table combination: 30.464945%; src 0x3a4 base 0x43c insns 233/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81405690 initial 26.601477%
|
||||
- two-round iteration with scoped second round: 23.239853%; src 0x4d8 base 0x43c insns 310/271; --- replace mine 5:13 base 5:7; M 5 lbz r10, 1(r5); M 6 lis r7, 0
|
||||
- signed round index: 26.601477%; src 0x3b4 base 0x43c insns 237/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- round key XOR before table combination: 26.601477%; src 0x3b4 base 0x43c insns 237/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- option loop with explicit continuation test: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained original
|
||||
|
||||
ATERM final source retains only exact scan and hex-conversion changes. All unsuccessful experiments restored. Remaining 21 functions are open; their instruction counts and experiment outcomes are recorded above. Cryptographic routines require substantial reconstruction, not just register allocation.
|
||||
|
||||
AOSS initial gate: 7/21 instruction-exact; code 2540/16192; data 3896/3928. String pool identical.
|
||||
AOSS_814001B4: early returns and opcode switch: 75/79, remaining differences are save/restore helper versus individual stores.
|
||||
AOSS_81401BBC: (1) reverse rounding addition: same one operand-order difference; (2) signed rounding temporary: same difference; (3) inline signed rounding expression: 56/56, diffs 0. Retained.
|
||||
AOSS_81401DC0: (1) reuse seed parameter: 48/48, four last-step register differences; (2) split shift/XOR statements: 64/48 instructions; (3) eight-iteration CRC loop: 16/48 instructions. Restored original.
|
||||
|
||||
AOSS_Init_old initial 28.42298%
|
||||
- full-width wait counters instead of narrowing every update: 28.546717%; src 0x1758 base 0x18c0 insns 1494/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
|
||||
AOSS_Init_old initial 28.42298%
|
||||
- full-width wait counters instead of narrowing every update: 28.546717%; src 0x1758 base 0x18c0 insns 1494/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- packet length conversion retains full width: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- poll arguments given semantic socket events structure: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
Retained original
|
||||
|
||||
AOSS_813FFD68 initial 96.981735%
|
||||
- validation loops use signed char: 93.69406%; src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- return failure immediately on invalid character: 82.05023%; src 0x2ec base 0x36c insns 187/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- ascending validation cursor loop: 94.76712%; src 0x374 base 0x36c insns 221/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
AOSS_814001B4 initial 88.78481%
|
||||
- converted packet length stays full width: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- direct opcode return cases: 83.27848%; src 0x124 base 0x13c insns 73/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- full-width validation and branch nesting: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
AOSS_814002F0 initial 79.525%
|
||||
- read manufacturer only after state validation: 85.058334%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 6:8 base 6:8; M 6 mr r30, r3; M 7 mr r26, r4
|
||||
- packet sequence values remain full-width: 76.441666%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
- direct address error branch: 79.525%; src 0x1c8 base 0x1e0 insns 114/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
Retained original
|
||||
|
||||
AOSS_81400830 initial 77.619934%
|
||||
- single-byte RC4 generation loop instead of manual pairs: 65.65109%; src 0x3c0 base 0x504 insns 240/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
- natural CRC byte loop: 60.13084%; src 0x3c4 base 0x504 insns 241/321; --- replace mine 5:6 base 5:7; M 5 mr r27, r3; B 5 mr r26, r3
|
||||
- narrow RC4 state indices at assignment: 77.619934%; src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
Retained original
|
||||
|
||||
AOSS_81400E0C initial 77.52105%
|
||||
- signed option lengths and iteration indices: 77.778946%; src 0x2bc base 0x2f8 insns 175/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- natural integer byte decode for both address options: 44.963158%; src 0x188 base 0x2f8 insns 98/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- address decode accumulation uses OR: 61.963158%; src 0x284 base 0x2f8 insns 161/190; --- replace mine 5:8 base 5:8; M 5 mr r29, r3; M 6 mr r30, r4
|
||||
Retained original
|
||||
|
||||
AOSS_814013AC initial 91.70175%
|
||||
- signed option lengths: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- apply flags after successful parser call: 84.68421%; src 0x1ec base 0x1c8 insns 123/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- bounded while loop over selected reply payload: 88.2807%; src 0x1d4 base 0x1c8 insns 117/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
Retained original
|
||||
|
||||
AOSS_81401574 initial 92.558136%
|
||||
- semantic payload extent expression: 92.558136%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- request length remains full-width: 92.209305%; src 0x1f8 base 0x204 insns 126/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- initialize destination length before port conversion: 88.31783%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
Retained original
|
||||
|
||||
AOSS_81401778 initial 71.93407%
|
||||
- CRC checksum stays full width until header store: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- signed RC4 byte loop index: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- copy hello payload before manufacturer encoding: 71.91575%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
Retained original
|
||||
|
||||
AOSS_81401C9C initial 71.9315%
|
||||
- natural RC4 state initialization loop: 43.342464%; src 0x98 base 0x124 insns 38/73; --- replace mine 0:1 base 0:2; M 0 li r9, 0; B 0 stwu r1, -0x10(r1)
|
||||
- schedule state reset before obtaining byte pointer: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
- signed key and state indices: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
Retained original
|
||||
|
||||
AOSS_81401E80 initial 91.80272%
|
||||
- natural XOR loop over half-packet: 56.455784%; src 0x168 base 0x24c insns 90/147; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x40(r1)
|
||||
- half-length via signed division: 87.04082%; src 0x240 base 0x24c insns 144/147; --- replace mine 5:19 base 5:13; M 5 srawi r0, r4, 1; M 6 mr r28, r3
|
||||
- count-down rounds: 88.734695%; src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3
|
||||
Retained original
|
||||
|
||||
AOSS_814020CC initial 76.066666%
|
||||
- sleep tick product stays 64-bit: 67.51667%; src 0xfc base 0xf0 insns 63/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- tick duration via explicit multiply-high: 81.65%; src 0xe4 base 0xf0 insns 57/60; --- replace mine 3:5 base 3:6; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- do-while host acquisition loop: 65.066666%; src 0xf8 base 0xf0 insns 62/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
AOSS final: retained exact packet builder AOSS_81401BBC only. Other experiments restored; remaining differences include loop expansion, register allocation, missing original compiler control flow.
|
||||
|
||||
## src/scene/memoryCard/iplMemoryCardBase
|
||||
Baseline absent source: 0/34, code 0/3640, data 0/152. Implemented all real functions in target address order from original disassembly using typed classes and fields. Initial build: 33/34 exact, code 3240/3640, data 144/152; pool identical.
|
||||
|
||||
onCmdRecv initial 96.35%: 101/100 instructions.
|
||||
- Signed lower/upper bounds for command range: extra comparison and branch.
|
||||
- Switch cases 1/2/3: 95.35%, 102/100 instructions, compiler produces signed comparison tree.
|
||||
- Unsigned command range distance: 100%, 100/100 instructions, diffs 0. Retained.
|
||||
|
||||
Data limitation: original .sdata2 contains -1.0 plus trailing alignment, while source also emits the required integer-to-float conversion double constant. No forced data or padding added. Full DOL gate determines acceptance; no configure Matching changes.
|
||||
|
||||
## Remaining functions at final handoff
|
||||
src/scene/setting/ATERM: ATERM_814021BC 67.655846% — src 0x264 base 0x268 insns 153/154; --- insert mine 7:7 base 7:9; B 7 addi r30, r30, 0; B 8 li r4, 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_8140276C 92.10345% — src 0x2ac base 0x2b8 insns 171/174; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0x80(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81402A24 72.47529% — src 0x3d0 base 0x41c insns 244/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81402E40 99.791664% — src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27; remaining register/scheduling differences
|
||||
src/scene/setting/ATERM: ATERM_81402FC0 67.28148% — src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814031DC 85.7218% — src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814033F0 65.868614% — src 0x21c base 0x224 insns 135/137; --- insert mine 7:7 base 7:8; B 7 li r24, 0; --- replace mine 10:29 base 11:17; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814036D8 73.92742% — src 0x1e0 base 0x1f0 insns 120/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814038C8 35.28917% — src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_AutoConfigThread 94.6% — src 0xa0 base 0xa0 insns 40/40; diffs 9: [0, 2, 3, 20, 22, 23, 34, 36, 38]; 0 M stwu r1, -0x30(r1); B stwu r1, -0x20(r1); remaining register/scheduling differences
|
||||
src/scene/setting/ATERM: ATERM_81404844 19.615385% — src 0x19c base 0x1d4 insns 103/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81404A18 51.107437% — src 0x1c4 base 0x1e4 insns 113/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x1a0(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81404BFC 36.869404% — src 0x3dc base 0x430 insns 247/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_8140502C 35.666668% — src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405254 30.464945% — src 0x3a4 base 0x43c insns 233/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405690 26.601477% — src 0x3b4 base 0x43c insns 237/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405ACC None% — src 0x17c base 0x240 insns 95/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:12 base 4:10; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405D0C 32.62639% — src 0x9e4 base 0xb40 insns 633/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_ApConfigStart 86.49515% — src 0x1a4 base 0x19c insns 105/103; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x20(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_ApConfigEnd 87.54263% — src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_ApConfigGetState 99.42857% — src 0x8c base 0x8c insns 35/35; diffs 3: [17, 18, 20]; 17 M lwz r6, 0xf8(r6); B lwz r0, 0xf8(r6); remaining register/scheduling differences
|
||||
src/scene/setting/AOSS: AOSS_Init_old 28.42298% — src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_813FFD68 96.981735% — src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814001B4 41.518986% — src 0x118 base 0x13c insns 70/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814002F0 79.525% — src 0x1c8 base 0x1e0 insns 114/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81400830 77.619934% — src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81400E0C 77.52105% — src 0x2c4 base 0x2f8 insns 177/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814013AC 91.70175% — src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401574 92.558136% — src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401778 71.93407% — src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0); remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401C9C 71.9315% — src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401DC0 99.375% — src 0xc0 base 0xc0 insns 48/48; diffs 4: [39, 41, 42, 43]; 39 M srwi r0, r3, 1; B srwi r3, r3, 1; remaining register/scheduling differences
|
||||
src/scene/setting/AOSS: AOSS_81401E80 91.80272% — src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814020CC 76.066666% — src 0xf0 base 0xf0 insns 60/60; diffs 39: [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 26]; 3 M addi r11, r1, 0x20; B stw r31, 0x1c(r1); remaining register/scheduling differences
|
||||
|
||||
MemoryBase full clean gate: 34/34 instruction-exact, code 3640/3640, data 144/152, pool identical, regressions 0, forbidden patterns 0, readability warnings 0, DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d, GATE PASS. Data remains incomplete in objdiff; no artificial fix attempted.
|
||||
326
agent/sol-med-round2.md
Normal file
326
agent/sol-med-round2.md
Normal file
@@ -0,0 +1,326 @@
|
||||
# ATERM and AOSS continuation
|
||||
|
||||
Baseline ATERM: 5/26, code 1108/19204, data 18440/18864, fuzzy 50.973755. Baseline AOSS: 8/21, code 2764/16192, data 3896/3928, fuzzy 63.720604. All functions have bodies; existing large state machine and crypto bodies remain incomplete reconstructions. No absent symbols or empty bodies found.
|
||||
|
||||
ATERM_8140276C initial 92.10345%
|
||||
- previous cursor declaration before current cursor: no source change; skipped
|
||||
- signed record indices: 92.10345%; src 0x2ac base 0x2b8 insns 171/174; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0x80(r1)
|
||||
- AOSS flags initialized after clear: 91.72988%; src 0x2ac base 0x2b8 insns 171/174; --- replace mine 5:10 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402A24 initial 72.47529%
|
||||
- record byte count kept signed: no source change; skipped
|
||||
- allocate nullable buffers before handling failure: 72.380226%; src 0x3cc base 0x41c insns 243/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- multiply-high tick conversion: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402E40 initial 99.791664%
|
||||
- payload clear through byte alias: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- natural checksum loop: 65.208336%; src 0x108 base 0x180 insns 66/96; --- replace mine 5:12 base 5:12; M 5 mr r28, r5; M 6 mr r26, r3
|
||||
- end length as packet byte extent: 95.572914%; src 0x180 base 0x180 insns 96/96; diffs 6: [9, 10, 42, 44, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- full-width checksum accumulator: 64.76296%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- bottom-tested option loop: compile failed
|
||||
- early return for bad checksum: 66.94074%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814031DC initial 85.7218%
|
||||
- MAC text uses equal-sized buffers: 85.766914%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 47:48 base 47:48; M 47 beq 288; B 47 beq 320
|
||||
- nibble conversion advances output cursor: 84.293236%; src 0x204 base 0x214 insns 129/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
- inclusive digit bound and pointer-based MAC scan: 85.90225%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814033F0 initial 65.868614%
|
||||
- option fields retain converted word width: 67.39416%; src 0x214 base 0x224 insns 133/137; --- replace mine 5:6 base 5:6; M 5 addi r30, r3, 8; B 5 addi r29, r3, 8
|
||||
- bottom-tested parser dispatch: 65.79562%; src 0x21c base 0x224 insns 135/137; --- replace mine 5:6 base 5:6; M 5 addi r28, r3, 8; B 5 addi r29, r3, 8
|
||||
- signed nibble comparisons: 65.32117%; src 0x21c base 0x224 insns 135/137; --- insert mine 7:7 base 7:8; B 7 li r24, 0; --- replace mine 10:29 base 11:17
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814036D8 initial 73.92742%
|
||||
- security switch matches original decision tree: 85.22581%; src 0x1ec base 0x1f0 insns 123/124; --- replace mine 14:15 base 14:15; M 14 beq 340; B 14 beq 344
|
||||
- key text passed through one cursor: 87.0%; src 0x1e4 base 0x1f0 insns 121/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
- counted loop over key records: 73.92742%; src 0x1e0 base 0x1f0 insns 120/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814038C8 initial 35.28917%
|
||||
- one-shot 500ms wait replaces repeated alarm: 35.700314%; src 0x788 base 0xedc insns 482/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- bottom-tested state machine and wait buffer order: 35.288116%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- progress uses semantic structure: 35.28917%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- complete RFC3394 block handling with target initial value and byte counter: 89.89744%; src 0x1bc base 0x1d4 insns 111/117; --- replace mine 6:13 base 6:13; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- hoist signed pass product outside block loop: 89.89744%; src 0x1bc base 0x1d4 insns 111/117; --- replace mine 6:13 base 6:13; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- natural bytewise counter XOR loop: 62.299145%; src 0x178 base 0x1d4 insns 94/117; --- replace mine 6:13 base 6:13; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
- complete RFC3394 block handling with target initial value and byte counter: 74.38843%; src 0x1c0 base 0x1e4 insns 112/121; --- replace mine 6:13 base 6:14; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- hoist signed pass product outside block loop: 74.38843%; src 0x1c0 base 0x1e4 insns 112/121; --- replace mine 6:13 base 6:14; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- natural bytewise counter XOR loop: 55.96694%; src 0x180 base 0x1e4 insns 96/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x190(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81404BFC initial 36.869404%
|
||||
- complete AES schedules with bounded final expansion for all three key sizes: 52.50746%; src 0x408 base 0x430 insns 258/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- direct expanded-key parameter used as advancing cursor: 52.50746%; src 0x408 base 0x430 insns 258/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- round limit at loop bottom for 128-bit key: 53.074627%; src 0x404 base 0x430 insns 257/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
Retained best candidate
|
||||
|
||||
ATERM_8140502C initial 35.666668%
|
||||
- interleaved key-word swaps: 42.355072%; src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- signed indexed round reversal: 38.746376%; src 0x290 base 0x228 insns 164/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- counted transformation loop: 11.731884%; src 0x288 base 0x228 insns 162/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405254 initial 30.464945%
|
||||
- AES byte assembly uses XOR: 34.23247%; src 0x3c4 base 0x43c insns 241/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405690 initial 26.601477%
|
||||
- AES byte assembly uses XOR: 34.64945%; src 0x3d4 base 0x43c insns 245/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405254 initial 34.23247%
|
||||
- two-round AES loop with final round exit matching target structure: 16.295202%; src 0x4a8 base 0x43c insns 298/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- signed remaining round-pair count: 16.295202%; src 0x4a8 base 0x43c insns 298/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- separate round exit before key advancement: 17.630997%; src 0x4a8 base 0x43c insns 298/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405690 initial 34.64945%
|
||||
- two-round AES loop with final round exit matching target structure: 33.738007%; src 0x4c8 base 0x43c insns 306/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- signed remaining round-pair count: 33.738007%; src 0x4c8 base 0x43c insns 306/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- separate round exit before key advancement: 31.90037%; src 0x4c8 base 0x43c insns 306/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405D0C initial 32.62639%
|
||||
- complete MD5 accumulator rotation with per-step argument-relative selectors: 53.851387%; src 0xa50 base 0xb40 insns 660/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- MD5 selectors expressed as XOR masks: 44.879166%; src 0xa48 base 0xb40 insns 658/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- natural sixteen-word little-endian block decode: 47.679165%; src 0x970 base 0xb40 insns 604/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERMi_ApConfigGetState initial 99.42857%
|
||||
- read bus clock before current time call: 72.942856%; src 0x94 base 0x8c insns 37/35; --- replace mine 4:6 base 4:5; M 4 stw r30, 8(r1); M 5 mr r30, r3
|
||||
- direct timer division using clock conversion expression: 99.42857%; src 0x8c base 0x8c insns 35/35; diffs 3: [17, 18, 20]; 17 M lwz r6, 0xf8(r6); B lwz r0, 0xf8(r6)
|
||||
- timer load narrowed to native clock register width: 99.42857%; src 0x8c base 0x8c insns 35/35; diffs 4: [15, 16, 17, 18]; 15 M lis r5, -0x8000; B lis r6, -0x8000
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402E40 initial 99.791664%
|
||||
- checksum terminal pointer declared before byte length: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- payload encryption size retained as signed integer: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- end pointer assigned only after header conversion: 94.947914%; src 0x180 base 0x180 insns 96/96; diffs 8: [9, 10, 42, 44, 45, 46, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
Retained best candidate
|
||||
|
||||
ATERMi_AutoConfigThread initial 94.6%
|
||||
- callback progress uses three-field structure: 94.75%; src 0xa0 base 0xa0 insns 40/40; diffs 3: [20, 22, 23]; 20 M nor r0, r3, r0; B nor r3, r3, r0
|
||||
- signed completion state mask in correctly sized progress buffer: 94.75%; src 0xa0 base 0xa0 insns 40/40; diffs 3: [20, 22, 23]; 20 M nor r0, r3, r0; B nor r3, r3, r0
|
||||
- explicit completion state branch in progress structure: 85.25%; src 0x9c base 0xa0 insns 39/40; --- replace mine 18:21 base 18:22; M 18 addi r0, r31, -1; M 19 li r5, -1
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814021BC initial 67.655846%
|
||||
- interface configuration pointer initialized before IP setup: 64.266235%; src 0x264 base 0x268 insns 153/154; --- replace mine 7:8 base 7:8; M 7 addi r28, r30, 0; B 7 addi r30, r30, 0
|
||||
- wait queue message and buffer order follows target stack slots: 67.64286%; src 0x264 base 0x268 insns 153/154; --- insert mine 7:7 base 7:9; B 7 addi r30, r30, 0; B 8 li r4, 0
|
||||
- host wait expressed as while with shared converted host value: 92.77922%; src 0x274 base 0x268 insns 157/154; --- replace mine 5:8 base 5:8; M 5 lis r31, 0; M 6 li r28, 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_8140276C initial 92.10345%
|
||||
- previous-record cursor reset at outer loop tail and scoped fallback flags: 94.04023%; src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
- previous record initialized before current record: 94.0115%; src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
- fallback flags set after SSID clear: 94.04023%; src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405ACC initial 0%
|
||||
- complete two-phase update copy with target eight-byte group bounds: 55.54861%; src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10
|
||||
- signed byte-copy loop cursors: 55.54861%; src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10
|
||||
- cursor-pair copies instead of repeated indexed addresses: 55.54861%; src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10
|
||||
Retained best candidate
|
||||
Retained complete update implementation: objdiff 55.54861%, 135/144 instructions. Older source had no reported function score; no exact claim.
|
||||
|
||||
ATERMi_ApConfigStart initial 86.49515%
|
||||
- allocate via stored callback: 86.49515%; src 0x1a4 base 0x19c insns 105/103; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x20(r1)
|
||||
- tick multiplier commutes operands: 84.11651%; src 0x1a4 base 0x19c insns 105/103; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x20(r1)
|
||||
- progress callback loaded from installed function pointer: 93.718445%; src 0x1a0 base 0x19c insns 104/103; --- delete mine 4:5 base 4:4; M 4 mr r31, r3; --- replace mine 6:7 base 5:6
|
||||
Retained best candidate
|
||||
|
||||
ATERMi_ApConfigEnd initial 87.54263%
|
||||
- message queues declared within their wait scopes: 85.496124%; src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- join loop expressed as do-while: 85.28682%; src 0x1e8 base 0x204 insns 122/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- time conversion evaluated directly: 87.54263%; src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- signed option payload cursor length: no source change; skipped
|
||||
- checksum receive pointer read after length decode: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- option traversal explicit continuation: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402A24 initial 75.76426%
|
||||
- record allocation size held as size_t: no source change; skipped
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- packet and option values stay full-width until usage: 68.577774%; src 0x208 base 0x21c insns 130/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- delete mine 15:16 base 16:16
|
||||
- full-width checksum accumulated before explicit final narrowing: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- option lengths retained as signed word count: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402A24 initial 75.76426%
|
||||
- record allocation byte count stored in size_t: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- iteration counter narrowed to signed timer range: 76.20532%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- record pointer walk and indexed record walk share cursor: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM reconstruction evidence: all 26 target function names have source bodies. Reconstructed RFC3394 wrap/unwrap initial value, signed counters, block writeback and unwrap ordering; corrected all three AES key schedules; corrected MD5 per-step accumulator/selector semantics and low/high bit counts; reconstructed the missing authentication timestamp digest and protocol option-id bytes in the main state machine. These are partial instruction matches, not completion.
|
||||
Native validation of extracted unchanged crypto implementations: NIST AES 128/192/256 encryption and decryption vectors passed. MD5 messages of length 0, 1, 3, 55, 56, 64, 130 matched hashlib. Native correctness is supplemental evidence only; MWCC objdiff remains the matching authority.
|
||||
Data attempts: ordinary local option-id initialization restored the real seven-byte constant sequence; .sdata2 reached 100%. Genuine MD5 fill array emitted locally, then as an ordinary named global after the state-machine function to preserve jump-table/source order. .data remains incomplete because the three generated jump tables still differ. AES tables and round constants remain byte-identical .rodata.
|
||||
Data attempt: restored the genuine request-options pointer initializer shown in target .sdata; it completed .sdata but moved the response buffer before the thread in .bss and caused objdiff .bss 100 -> 83.33333 and a matched-data regression. Tried source declaration order, original thread name, and original section-aligned network buffer declaration; none passed the regression gate. Restored the pointer attempt and kept the existing BSS layout. No artificial padding, address symbols, or forced sections retained. .sdata and .sbss remain open.
|
||||
|
||||
Initial AOSS trial batch failed to compile because of a mistaken message-length field name in the packet dispatcher; corrected the field and reran all trials successfully. Failed batch not counted as attempts.
|
||||
|
||||
AOSS_Init_old initial 28.42298%
|
||||
- full-width wait counters instead of narrowing every update: 28.546717%; src 0x1758 base 0x18c0 insns 1494/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- packet length conversion retains full width: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- poll arguments given semantic socket events structure: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
Retained best candidate
|
||||
|
||||
AOSS_813FFD68 initial 96.981735%
|
||||
- validation loops use signed char: 93.69406%; src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- return failure immediately on invalid character: 82.05023%; src 0x2ec base 0x36c insns 187/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- ascending validation cursor loop: 94.76712%; src 0x374 base 0x36c insns 221/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814001B4 initial 88.78481%
|
||||
- converted packet length stays full width: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- direct opcode return cases: 83.27848%; src 0x124 base 0x13c insns 73/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- full-width validation and branch nesting: no source change; skipped
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814002F0 initial 79.525%
|
||||
- read manufacturer only after state validation: 85.058334%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 6:8 base 6:8; M 6 mr r30, r3; M 7 mr r26, r4
|
||||
- packet sequence values remain full-width: 76.441666%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
- direct address error branch: 79.525%; src 0x1c8 base 0x1e0 insns 114/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81400830 initial 77.619934%
|
||||
- single-byte RC4 generation loop instead of manual pairs: 65.65109%; src 0x3c0 base 0x504 insns 240/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
- natural CRC byte loop: 60.13084%; src 0x3c4 base 0x504 insns 241/321; --- replace mine 5:6 base 5:7; M 5 mr r27, r3; B 5 mr r26, r3
|
||||
- narrow RC4 state indices at assignment: 77.619934%; src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81400E0C initial 77.52105%
|
||||
- signed option lengths and iteration indices: 77.778946%; src 0x2bc base 0x2f8 insns 175/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- natural integer byte decode for both address options: 44.963158%; src 0x188 base 0x2f8 insns 98/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- address decode accumulation uses OR: 61.963158%; src 0x284 base 0x2f8 insns 161/190; --- replace mine 5:8 base 5:8; M 5 mr r29, r3; M 6 mr r30, r4
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814013AC initial 91.70175%
|
||||
- signed option lengths: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- apply flags after successful parser call: 84.68421%; src 0x1ec base 0x1c8 insns 123/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- bounded while loop over selected reply payload: 88.2807%; src 0x1d4 base 0x1c8 insns 117/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401574 initial 92.558136%
|
||||
- semantic payload extent expression: 92.558136%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- request length remains full-width: 92.209305%; src 0x1f8 base 0x204 insns 126/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- initialize destination length before port conversion: 88.31783%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401778 initial 71.93407%
|
||||
- CRC checksum stays full width until header store: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- signed RC4 byte loop index: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- copy hello payload before manufacturer encoding: 71.91575%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401C9C initial 71.9315%
|
||||
- natural RC4 state initialization loop: 43.342464%; src 0x98 base 0x124 insns 38/73; --- replace mine 0:1 base 0:2; M 0 li r9, 0; B 0 stwu r1, -0x10(r1)
|
||||
- schedule state reset before obtaining byte pointer: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
- signed key and state indices: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401E80 initial 91.80272%
|
||||
- natural XOR loop over half-packet: 56.455784%; src 0x168 base 0x24c insns 90/147; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x40(r1)
|
||||
- half-length via signed division: 87.04082%; src 0x240 base 0x24c insns 144/147; --- replace mine 5:19 base 5:13; M 5 srawi r0, r4, 1; M 6 mr r28, r3
|
||||
- count-down rounds: 88.734695%; src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814020CC initial 76.066666%
|
||||
- sleep tick product stays 64-bit: 67.51667%; src 0xfc base 0xf0 insns 63/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- tick duration via explicit multiply-high: 81.65%; src 0xe4 base 0xf0 insns 57/60; --- replace mine 3:5 base 3:6; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- do-while host acquisition loop: 65.066666%; src 0xf8 base 0xf0 insns 62/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401DC0 initial 99.375%
|
||||
- CRC output accumulator reuses incoming seed value: 99.375%; src 0xc0 base 0xc0 insns 48/48; diffs 4: [39, 41, 42, 43]; 39 M srwi r0, r3, 1; B srwi r3, r3, 1
|
||||
- last CRC bit combined with conditional polynomial: 80.916664%; src 0xc8 base 0xc0 insns 50/48; --- delete mine 0:1 base 0:0; M 0 lis r3, -0x1247; --- replace mine 2:4 base 1:2
|
||||
- ordinary counted loop for eight CRC polynomial steps: 24.833334%; src 0x40 base 0xc0 insns 16/48; --- insert mine 0:0 base 0:1; B 0 li r0, 0x100; --- delete mine 1:3 base 2:2
|
||||
Retained best candidate
|
||||
|
||||
AOSS_Init_old initial 28.546717%
|
||||
- network settings alignment follows target 32-byte stack contract: 24.69697%; src 0x17f8 base 0x18c0 insns 1534/1584; --- replace mine 8:9 base 8:11; M 8 li r14, 0; B 8 lhz r4, 0(0)
|
||||
- request records alignment follows target stack offset a0: 24.69697%; src 0x17f8 base 0x18c0 insns 1534/1584; --- replace mine 8:9 base 8:11; M 8 li r14, 0; B 8 lhz r4, 0(0)
|
||||
- both network settings and request records use observed stack alignment: 24.69697%; src 0x17f8 base 0x18c0 insns 1534/1584; --- replace mine 8:9 base 8:11; M 8 li r14, 0; B 8 lhz r4, 0(0)
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814001B4 initial 88.78481%
|
||||
- opcode uses full-width switch expression after conversion: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- rejection increments written as explicit count stores: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- validation represented by a named result before rejection: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814013AC initial 91.70175%
|
||||
- outer response stride evaluated once before cursor advancement: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- one option cursor serves outer and inner traversal: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- config flags initialization delayed until matching response is located: 89.60526%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
Retained best candidate
|
||||
|
||||
AOSS .sbss source-order reconstruction: moved real existing address/status declarations into original address order; 28.57143 -> 57.14286.
|
||||
- explicit zero initialization of owned pointer globals: 42.857143%; original source restored if no improvement.
|
||||
- explicit zero initialization of runtime status globals: 57.14286%; original source restored if no improvement.
|
||||
- ordinary zero initialization of access-point address bytes: 28.57143%; original source restored if no improvement.
|
||||
|
||||
AOSS dispatch reconstruction: rejected empty/type/validation failures return immediately and opcode dispatch uses a switch; 41.518986 -> 88.78481%, 75/79 instructions. Remaining four instructions are prologue/epilogue save helpers versus individual register saves; three additional real source variations did not change them.
|
||||
AOSS_Init_old has a body for every observed state path; six distinct attempts logged. Restored narrow wait counters despite a small fuzzy gain from widening, because the original performs signed 16-bit wrapping assignments. Observed 32-byte stack alignment trials all worsened codegen and were restored. Renamed existing decompiler labels to meaningful state/cleanup names.
|
||||
AOSS .data/.bss/.sdata/.sdata2 remain 100%; ordinary source declaration reordering improves .sbss to 57.14286 but does not finish its symbol associations. Three normal initialization forms produced no further improvement and were restored. No forced sections, padding, address-pinning symbols, or table blobs added.
|
||||
|
||||
Current handoff: remaining functions and instruction evidence
|
||||
ATERM_814021BC 92.77922%: src 0x274 base 0x268 insns 157/154; --- replace mine 5:8 base 5:8; M 5 lis r31, 0; M 6 li r28, 0; M 7 addi r3, r31, 0
|
||||
ATERM_8140276C 94.04023%: src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4; M 7 mr r27, r5
|
||||
ATERM_81402A24 76.20532%: src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1); --- replace mine 2:4 base 2:4
|
||||
ATERM_81402E40 99.791664%: src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27; 10 M mr r3, r27
|
||||
ATERM_81402FC0 68.577774%: src 0x208 base 0x21c insns 130/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- delete mine 15:16 base 16:16; M 15 li r31, 0
|
||||
ATERM_814031DC 85.90225%: src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1); --- replace mine 4:6 base 4:6
|
||||
ATERM_814033F0 67.39416%: src 0x214 base 0x224 insns 133/137; --- replace mine 5:6 base 5:6; M 5 addi r30, r3, 8; B 5 addi r29, r3, 8; --- insert mine 7:7 base 7:8
|
||||
ATERM_814036D8 87.0%: src 0x1e4 base 0x1f0 insns 121/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0; M 16 li r0, 4
|
||||
ATERM_814038C8 41.043114%: src 0x9b4 base 0xedc insns 621/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x140(r1); B 0 stwu r1, -0x180(r1); --- replace mine 2:4 base 2:4
|
||||
ATERMi_AutoConfigThread 94.75%: src 0xa0 base 0xa0 insns 40/40; diffs 3: [20, 22, 23]; 20 M nor r0, r3, r0; B nor r3, r3, r0; 22 M srawi r3, r0, 0x1f
|
||||
ATERM_81404844 92.62393%: src 0x1bc base 0x1d4 insns 111/117; --- replace mine 8:13 base 8:13; M 8 mr r29, r3; M 9 mr r22, r4; M 10 mr r23, r5
|
||||
ATERM_81404A18 75.82645%: src 0x1c0 base 0x1e4 insns 112/121; --- replace mine 8:13 base 8:14; M 8 mr r29, r3; M 9 mr r21, r4; M 10 mr r22, r5
|
||||
ATERM_81404BFC 74.36194%: src 0x46c base 0x430 insns 283/268; --- replace mine 6:7 base 6:7; M 6 cmplwi r5, 0x80; B 6 cmpwi r5, 0x80; --- delete mine 38:40 base 38:38
|
||||
ATERM_8140502C 42.355072%: src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0; B 7 addi r30, r30, 0
|
||||
ATERM_81405254 34.23247%: src 0x3c4 base 0x43c insns 241/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); --- replace mine 2:4 base 2:4
|
||||
ATERM_81405690 34.64945%: src 0x3d4 base 0x43c insns 245/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); --- replace mine 2:4 base 2:4
|
||||
ATERM_81405ACC 55.54861%: src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10; M 3 addi r11, r1, 0x20
|
||||
ATERM_81405D0C 53.851387%: src 0xa50 base 0xb40 insns 660/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1); --- replace mine 2:4 base 2:4
|
||||
ATERMi_ApConfigStart 93.718445%: src 0x1a0 base 0x19c insns 104/103; --- delete mine 4:5 base 4:4; M 4 mr r31, r3; --- replace mine 6:7 base 5:6; M 6 mr r30, r8
|
||||
ATERMi_ApConfigEnd 87.54263%: src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0; B 3 stw r31, 0xdc(r1)
|
||||
ATERMi_ApConfigGetState 99.42857%: src 0x8c base 0x8c insns 35/35; diffs 3: [17, 18, 20]; 17 M lwz r6, 0xf8(r6); B lwz r0, 0xf8(r6); 18 M addi r0, r5, 0x4dd3
|
||||
AOSS_Init_old 28.42298%: src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b; B 1 mr r12, r1
|
||||
AOSS_813FFD68 96.981735%: src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0; B 3 stw r31, 0x1c(r1)
|
||||
AOSS_814001B4 88.78481%: src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0; B 3 stw r31, 0x1c(r1)
|
||||
AOSS_814002F0 85.058334%: src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 6:8 base 6:8; M 6 mr r30, r3; M 7 mr r26, r4; B 6 mr r26, r3
|
||||
AOSS_81400830 77.619934%: src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9; B 8 li r5, 8
|
||||
AOSS_81400E0C 77.778946%: src 0x2bc base 0x2f8 insns 175/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8; M 6 mr r29, r4
|
||||
AOSS_814013AC 91.70175%: src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8; M 7 mr r27, r3
|
||||
AOSS_81401574 92.558136%: src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4; B 5 lwz r27, 0(0)
|
||||
AOSS_81401778 71.93407%: src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0); B 5 lwz r28, 0(0)
|
||||
AOSS_81401C9C 71.9315%: src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0; M 2 stw r0, 0x24(r1)
|
||||
AOSS_81401DC0 99.375%: src 0xc0 base 0xc0 insns 48/48; diffs 4: [39, 41, 42, 43]; 39 M srwi r0, r3, 1; B srwi r3, r3, 1; 41 M xoris r0, r0, 0xedb8
|
||||
AOSS_81401E80 91.80272%: src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3; --- replace mine 8:20 base 8:13
|
||||
AOSS_814020CC 81.65%: src 0xe4 base 0xf0 insns 57/60; --- replace mine 3:5 base 3:6; M 3 addi r11, r1, 0x20; M 4 bl 0; B 3 stw r31, 0x1c(r1)
|
||||
|
||||
Supplemental native crypto validation: NIST AES-128/192/256 encrypt/decrypt vectors passed; MD5 lengths 0, 1, 3, 55, 56, 64, 130 and streaming chunks 1, 7, 55, 63, 64, 65, 127 over 512 bytes passed against hashlib. RFC3394 wrap/unwrap passed using a temporary native test copy that explicitly emulates Wii big-endian counter bytes; unchanged x86 union byte order does not emulate the target. Tests reside under /tmp; MWCC object and gate remain matching authority.
|
||||
@@ -11,12 +11,23 @@ splits: 'config/43U/splits.txt'
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- fprintf
|
||||
- leap_days
|
||||
- __msl_time2tm
|
||||
- __tm2time
|
||||
- clock
|
||||
- mktime
|
||||
- localtime
|
||||
- emit
|
||||
- __MSL_ISO8601NewYear
|
||||
- __MSL_ISO8601Week
|
||||
- strftime
|
||||
- labs
|
||||
- atol
|
||||
- itoa
|
||||
- strpbrk
|
||||
- strspn
|
||||
- strcspn
|
||||
- atol
|
||||
- padding__Q23ipl5scene
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
@@ -1054,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
|
||||
.data start:0x8165F818 end:0x8165F8F0
|
||||
.sdata2 start:0x81694E10 end:0x81694E28
|
||||
|
||||
src/keyboard/tiManager.cpp:
|
||||
src/keyboard/tiKeyboard.cpp:
|
||||
.text start:0x81437558 end:0x81439608
|
||||
.ctors start:0x8160D208 end:0x8160D20C
|
||||
.data start:0x8165F8F0 end:0x81660378
|
||||
@@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
400
configure.py
400
configure.py
@@ -247,7 +247,7 @@ config.asflags = [
|
||||
"-I include",
|
||||
f"-I build/{config.version}/include",
|
||||
f"--defsym BUILD_VERSION={version_num}",
|
||||
f"--defsym VERSION_{config.version}",
|
||||
f"--defsym VERSION_{config.version}=1",
|
||||
]
|
||||
config.ldflags = [
|
||||
"-fp hardware",
|
||||
@@ -624,8 +624,8 @@ config.libs = [
|
||||
Object(Matching, "system/rvl_dec.c"),
|
||||
Object(Matching, "system/RIPL_BoardRecord.c"),
|
||||
Object(Matching, "system/iplSystem.cpp"),
|
||||
Object(NonMatching, "system/iplController.cpp"),
|
||||
Object(NonMatching, "system/iplControllerManager.cpp"),
|
||||
Object(Matching, "system/iplController.cpp"),
|
||||
Object(Matching, "system/iplControllerManager.cpp"),
|
||||
Object(Matching, "system/iplChannelManager.cpp"),
|
||||
Object(Matching, "system/iplChannelScriptManager.cpp"),
|
||||
Object(Matching, "system/iplNand.cpp"),
|
||||
@@ -812,10 +812,10 @@ 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(NonMatching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
]
|
||||
),
|
||||
@@ -875,11 +875,11 @@ config.libs = [
|
||||
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplUSBAP.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c"),
|
||||
Object(NonMatching, "scene/setting/ATERM.c"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
]
|
||||
),
|
||||
IPLSection("settingSelect", [
|
||||
@@ -918,9 +918,9 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
@@ -929,7 +929,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -985,26 +985,26 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zconvert.c"),
|
||||
Object(NonMatching, "clib/zi81key.c"),
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(NonMatching, "clib/zi8alts.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(NonMatching, "clib/zi8getc.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
Object(NonMatching, "clib/zi8getc2.c"),
|
||||
Object(NonMatching, "clib/zi8getSW.c"),
|
||||
Object(NonMatching, "clib/zi8initd.c"),
|
||||
Object(NonMatching, "clib/zi8is.c"),
|
||||
Object(Matching, "clib/zi8getSW.c"),
|
||||
Object(Matching, "clib/zi8initd.c"),
|
||||
Object(Matching, "clib/zi8is.c"),
|
||||
Object(NonMatching, "clib/zi8match.c"),
|
||||
Object(NonMatching, "clib/zi8misc.c"),
|
||||
Object(Matching, "clib/zi8misc.c"),
|
||||
Object(NonMatching, "clib/zi8pud2.c"),
|
||||
Object(NonMatching, "clib/Zi8punct.c"),
|
||||
Object(NonMatching, "clib/zi8space.c"),
|
||||
Object(Matching, "clib/Zi8punct.c"),
|
||||
Object(Matching, "clib/zi8space.c"),
|
||||
Object(NonMatching, "clib/zi8uwd.c"),
|
||||
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"),
|
||||
@@ -1037,35 +1037,35 @@ config.libs = [
|
||||
),
|
||||
RevoEXLib("ncd", [
|
||||
Object(Matching, "ncd/ncdsystem.c"),
|
||||
Object(NonMatching, "ncd/ncdsleep.c"),
|
||||
Object(Matching, "ncd/ncdsleep.c"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("net", [
|
||||
Object(NonMatching, "net/nettime.c"),
|
||||
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"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("nhttp", [
|
||||
Object(NonMatching, "nhttp/NHTTP_bgnend.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_control.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_list.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_os_RVL.c"),
|
||||
Object(Matching, "nhttp/NHTTP_bgnend.c"),
|
||||
Object(Matching, "nhttp/NHTTP_control.c"),
|
||||
Object(Matching, "nhttp/NHTTP_list.c"),
|
||||
Object(Matching, "nhttp/NHTTP_os_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_recvbuf.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_request.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_response.c"),
|
||||
Object(Matching, "nhttp/NHTTP_request.c"),
|
||||
Object(Matching, "nhttp/NHTTP_response.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_thread.c"),
|
||||
Object(NonMatching, "nhttp/d_nhttp_private.c"),
|
||||
Object(NonMatching, "nhttp/d_nhttp.c"),
|
||||
Object(NonMatching, "nhttp/d_nhttp_common.c"),
|
||||
Object(Matching, "nhttp/d_nhttp.c"),
|
||||
Object(Matching, "nhttp/d_nhttp_common.c"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("nwc24", [
|
||||
@@ -1089,9 +1089,9 @@ config.libs = [
|
||||
Object(Matching, "nwc24/NWC24UserId.c"),
|
||||
Object(Matching, "nwc24/NWC24Time.c"),
|
||||
Object(Matching, "nwc24/NWC24Ipc.c"),
|
||||
Object(NonMatching, "nwc24/NWC24Download.c"),
|
||||
Object(Equivalent, "nwc24/NWC24Download.c"),
|
||||
Object(Matching, "nwc24/NWC24CHJump.c"),
|
||||
Object(NonMatching, "nwc24/NWC24System.c"),
|
||||
Object(Matching, "nwc24/NWC24System.c"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("so", [
|
||||
@@ -1218,7 +1218,7 @@ config.libs = [
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGBA8.c"),
|
||||
|
||||
Object(NonMatching, "b65/iqdec_b65_frv32.c"),
|
||||
Object(Matching, "b65/iqdec_b65_frv32.c", source="b65/iqdec_b65_frv32.s"),
|
||||
]
|
||||
),
|
||||
# NW4R
|
||||
@@ -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", [
|
||||
@@ -1448,10 +1448,10 @@ config.libs = [
|
||||
Object(Matching, "axfx/AXFXReverbHi.c"),
|
||||
Object(Matching, "axfx/AXFXReverbHiDpl2.c"),
|
||||
Object(Matching, "axfx/AXFXReverbHiExp.c"),
|
||||
Object(NonMatching, "axfx/AXFXReverbHiExpDpl2.c"),
|
||||
Object(Matching, "axfx/AXFXReverbHiExpDpl2.c"),
|
||||
Object(Matching, "axfx/AXFXDelay.c"),
|
||||
Object(Matching, "axfx/AXFXReverbStd.c"),
|
||||
Object(NonMatching, "axfx/AXFXReverbStdExp.c"),
|
||||
Object(Matching, "axfx/AXFXReverbStdExp.c"),
|
||||
Object(Matching, "axfx/AXFXChorus.c"),
|
||||
Object(NonMatching, "axfx/AXFXChorusExp.c"),
|
||||
Object(Matching, "axfx/AXFXLfoTable.c"),
|
||||
@@ -1552,7 +1552,7 @@ config.libs = [
|
||||
),
|
||||
RVLSDKLib("wpad", [
|
||||
Object(Matching, "wpad/WPAD.c"),
|
||||
Object(NonMatching, "wpad/WPADHIDParser.c"),
|
||||
Object(Matching, "wpad/WPADHIDParser.c"),
|
||||
Object(Matching, "wpad/WPADMem.c"),
|
||||
Object(Matching, "wpad/WPADEncrypt.c"),
|
||||
Object(Matching, "wpad/debug_msg.c"),
|
||||
@@ -1682,184 +1682,184 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("fa", [
|
||||
Object(NonMatching, "fa/pf_clib.c"),
|
||||
Object(NonMatching, "fa/pf_code.c"),
|
||||
Object(NonMatching, "fa/pf_service.c"),
|
||||
Object(NonMatching, "fa/pf_str.c"),
|
||||
Object(NonMatching, "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/pf_clib.c"),
|
||||
Object(Matching, "fa/pf_code.c"),
|
||||
Object(Matching, "fa/pf_service.c"),
|
||||
Object(Matching, "fa/pf_str.c"),
|
||||
Object(Matching, "fa/pf_driver.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"),
|
||||
Object(NonMatching, "fa/pf_dir.c"),
|
||||
Object(NonMatching, "fa/pf_entry.c"),
|
||||
Object(Matching, "fa/pf_entry.c"),
|
||||
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(NonMatching, "fa/pf_api_util.c"),
|
||||
Object(NonMatching, "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_volume_apiadd.c"),
|
||||
Object(Matching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_api_util.c"),
|
||||
Object(Matching, "fa/pf_attach.c"),
|
||||
Object(Matching, "fa/pf_buffering.c"),
|
||||
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(NonMatching, "fa/pf_detach.c"),
|
||||
Object(NonMatching, "fa/pf_divide.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(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(NonMatching, "fa/pf_fopen.c"),
|
||||
Object(NonMatching, "fa/pf_format.c"),
|
||||
Object(Matching, "fa/pf_fopen.c"),
|
||||
Object(Matching, "fa/pf_format.c"),
|
||||
Object(Matching, "fa/pf_fread.c"),
|
||||
Object(NonMatching, "fa/pf_fseek.c"),
|
||||
Object(NonMatching, "fa/pf_fsetclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_fsexec.c"),
|
||||
Object(NonMatching, "fa/pf_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pf_fsnext.c"),
|
||||
Object(NonMatching, "fa/pf_fstat.c"),
|
||||
Object(Matching, "fa/pf_fseek.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(NonMatching, "fa/pf_mkdir.c"),
|
||||
Object(NonMatching, "fa/pf_mount.c"),
|
||||
Object(NonMatching, "fa/pf_move.c"),
|
||||
Object(NonMatching, "fa/pf_opendir.c"),
|
||||
Object(NonMatching, "fa/pf_readdir.c"),
|
||||
Object(NonMatching, "fa/pf_regctx.c"),
|
||||
Object(NonMatching, "fa/pf_remove.c"),
|
||||
Object(NonMatching, "fa/pf_rename.c"),
|
||||
Object(NonMatching, "fa/pf_rewinddir.c"),
|
||||
Object(NonMatching, "fa/pf_rmdir.c"),
|
||||
Object(NonMatching, "fa/pf_rmvvol.c"),
|
||||
Object(NonMatching, "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(NonMatching, "fa/pf_telldir.c"),
|
||||
Object(NonMatching, "fa/pf_unmount.c"),
|
||||
Object(NonMatching, "fa/pf_unregctx.c"),
|
||||
Object(NonMatching, "fa/pf_xdivide.c"),
|
||||
Object(NonMatching, "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_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(Matching, "fa/pf_move.c"),
|
||||
Object(Matching, "fa/pf_opendir.c"),
|
||||
Object(Matching, "fa/pf_readdir.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(Matching, "fa/pf_rmvvol.c"),
|
||||
Object(Matching, "fa/pf_seekdir.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(Matching, "fa/pf_unregctx.c"),
|
||||
Object(Matching, "fa/pf_xdivide.c"),
|
||||
Object(Matching, "fa/pf_w_api_util.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"),
|
||||
]
|
||||
),
|
||||
@@ -1870,7 +1870,7 @@ config.libs = [
|
||||
RVLSDKLib("nup", [
|
||||
Object(NonMatching, "nup/nup.cpp"),
|
||||
Object(NonMatching, "nup/nup_nhttp.cpp"),
|
||||
Object(NonMatching, "nup/nup_mem.cpp"),
|
||||
Object(Matching, "nup/nup_mem.cpp"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("scutil", [
|
||||
@@ -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"),
|
||||
]
|
||||
),
|
||||
@@ -1944,33 +1944,33 @@ config.libs = [
|
||||
Object(Matching, "MSL_Common/alloc.c"),
|
||||
Object(Matching, "MSL_Common/errno.c"),
|
||||
Object(Matching, "MSL_Common/ansi_files.c"),
|
||||
Object(NonMatching, "MSL_Common_Embedded/ansi_fp.c"),
|
||||
Object(Matching, "MSL_Common_Embedded/ansi_fp.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/ctype.c"),
|
||||
Object(NonMatching, "MSL_Common/locale.c"),
|
||||
Object(Matching, "MSL_Common/locale.c"),
|
||||
Object(Matching, "MSL_Common/arith.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/bsearch.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/buffer_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/direct_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/file_io.c"),
|
||||
Object(Matching, "MSL_Common/file_io.c"),
|
||||
Object(Matching, "MSL_Common/FILE_POS.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mbstring.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mem.c"),
|
||||
Object(Matching, "MSL_Common/mem_funcs.c"),
|
||||
Object(Matching, "MSL_Common/math_api.c"),
|
||||
Object(Matching, "MSL_Common/misc_io.c"),
|
||||
Object(NonMatching, "MSL_Common/printf.c"),
|
||||
Object(Matching, "MSL_Common/printf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/qsort.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/rand.c"),
|
||||
Object(NonMatching, "MSL_Common/scanf.c"),
|
||||
Object(Matching, "MSL_Common/scanf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/signal.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/string.c"),
|
||||
Object(Matching, "MSL_Common/float.c"),
|
||||
Object(NonMatching, "MSL_Common/strtold.c"),
|
||||
Object(Matching, "MSL_Common/strtold.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/strtoul.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/time.c"),
|
||||
Object(Matching, "MSL_Common/time.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/wctype.c"),
|
||||
Object(Matching, "MSL_Common/wmem.c"),
|
||||
Object(NonMatching, "MSL_Common/wprintf.c"),
|
||||
Object(NonMatching, "MSL_Common/wprintf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/wstring.c"),
|
||||
Object(Matching, "MSL_Common/wchar_io.c"),
|
||||
Object(Matching, "PPC_EABI/time.dolphin.c"),
|
||||
|
||||
@@ -14,7 +14,12 @@ enum {
|
||||
typedef struct BS2UpdateHeader {
|
||||
char timestamp[16]; // 0x00
|
||||
u32 wadCount; // 0x10
|
||||
#ifdef BS2_UPDATE_SOURCE
|
||||
u32 extraCount;
|
||||
u32 reserved[2];
|
||||
#else
|
||||
u32 reserved[3]; // 0x14
|
||||
#endif
|
||||
} BS2UpdateHeader;
|
||||
|
||||
typedef struct BS2UpdateEntry {
|
||||
@@ -29,7 +34,12 @@ typedef struct BS2UpdateEntry {
|
||||
u64 titleId; // 0x50
|
||||
u16 titleVersion; // 0x58
|
||||
|
||||
#ifdef BS2_UPDATE_SOURCE
|
||||
u16 reservedTitle;
|
||||
u32 inodes;
|
||||
#else
|
||||
u8 padding[6]; // 0x5A
|
||||
#endif
|
||||
|
||||
// Update Data
|
||||
char dataName[0x40]; // 0x60
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace homebutton {
|
||||
|
||||
private:
|
||||
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
72
include/iplMemoryCardLib.h
Normal file
72
include/iplMemoryCardLib.h
Normal file
@@ -0,0 +1,72 @@
|
||||
#ifndef IPL_MEMORY_CARD_LIB_H
|
||||
#define IPL_MEMORY_CARD_LIB_H
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
namespace ipl {
|
||||
namespace memorycard {
|
||||
typedef struct FileInfo {
|
||||
u16 fileNo; // 0x00
|
||||
u16 size; // 0x02
|
||||
u8 canCopy; // 0x04
|
||||
u8 canMove; // 0x05
|
||||
u16 unk_0x06; // 0x06
|
||||
u32 key; // 0x08
|
||||
} FileInfo; // 0x0C
|
||||
|
||||
typedef struct CardState {
|
||||
vu8 unk_0x00; // 0x00
|
||||
vu8 changed; // 0x01
|
||||
vs16 state; // 0x02
|
||||
vu16 unk_0x04; // 0x04
|
||||
vu16 unk_0x06; // 0x06
|
||||
vu32 key; // 0x08
|
||||
vu16 unk_0x0C; // 0x0C
|
||||
vu16 unk_0x0E; // 0x0E
|
||||
vu16 freeBlocks; // 0x10
|
||||
vu16 unk_0x12; // 0x12
|
||||
} CardState; // 0x14
|
||||
|
||||
typedef struct IconState {
|
||||
u8 bannerEnable; // 0x00
|
||||
u8 unk_0x01; // 0x01
|
||||
u8 unk_0x02; // 0x02
|
||||
u8 bannerType; // 0x03
|
||||
s8 anmDelta; // 0x04
|
||||
u8 anmType; // 0x05
|
||||
u8 unk_0x06; // 0x06
|
||||
u8 unk_0x07; // 0x07
|
||||
u8 iconFmt[8]; // 0x08
|
||||
u16 anmFrameBits; // 0x10
|
||||
s16 anmMax; // 0x12
|
||||
u32 bannerOffset; // 0x14
|
||||
u32 bannerTlutOffset; // 0x18
|
||||
u32 iconOffset[8]; // 0x1C
|
||||
u32 iconTlutOffset; // 0x3C
|
||||
} IconState; // 0x40
|
||||
|
||||
void probeCard();
|
||||
CardState* getCardSlotState();
|
||||
FileInfo* getCardDirState();
|
||||
IconState* getIconStateArray();
|
||||
long getCardLastSendCmd();
|
||||
long getCardLastSrcSlot();
|
||||
long getCardLastCMDFCmdResult();
|
||||
|
||||
void sendCardFormatCmd(u8 slot);
|
||||
void sendCardCopyCmd(u8 slot, s16 fileNo);
|
||||
void sendCardMoveCmd(u8 slot, s16 fileNo);
|
||||
void sendCardDeleteCmd(u8 slot, s16 fileNo);
|
||||
|
||||
const char* getIconComment(u8 slot, s16 fileNo);
|
||||
|
||||
void initCardThread();
|
||||
#if defined(IPL_MEMORY_CARD_CPP) || defined(IPL_CARD_SEQUENCE_CPP)
|
||||
BOOL shutdownCardThread();
|
||||
#else
|
||||
bool shutdownCardThread();
|
||||
#endif
|
||||
} // namespace memorycard
|
||||
} // namespace ipl
|
||||
|
||||
#endif // IPL_MEMORY_CARD_LIB_H
|
||||
@@ -122,6 +122,14 @@ extern WWWProtocolFinalizeFn WWWProtocolFinished;
|
||||
extern WWWProtocolFinalizeFn WWWProtocolFailed;
|
||||
extern WWWAddProtocolFn WWWAddProtocol;
|
||||
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class Setting;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace www {
|
||||
namespace arcreader {
|
||||
class ArcContainer;
|
||||
@@ -206,6 +214,9 @@ namespace ext_ead {
|
||||
WWWHandle* GetHandle() { return mpBrowserHandle; }
|
||||
|
||||
private:
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
friend class ::ipl::scene::Setting;
|
||||
#endif
|
||||
static BOOL SNotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData);
|
||||
BOOL NotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData);
|
||||
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
||||
|
||||
class SurfaceManager {
|
||||
public:
|
||||
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* param_10);
|
||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* arcPath);
|
||||
static void DisposeManager();
|
||||
|
||||
static void RegisterArcFile(void* fileBuf);
|
||||
|
||||
@@ -14,7 +14,17 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(nw4r::lyt::MultiArcResourceAccessor* multiArc, const char* layoutName, EventObserver* event)
|
||||
: nw4rmanager::Layout(multiArc, layoutName, event) {}
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_MATCHING)
|
||||
virtual ~LayoutByNW4R() {}
|
||||
#elif defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
virtual ~LayoutByNW4R();
|
||||
#else
|
||||
virtual ~LayoutByNW4R() {}
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
|
||||
@@ -20,6 +20,10 @@ namespace textinput {
|
||||
virtual void moveNigaoeButton() {}
|
||||
};
|
||||
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
class ScrollButton;
|
||||
#endif
|
||||
|
||||
class InputForm : public textinput::InputForm {
|
||||
public:
|
||||
typedef enum EditMode {
|
||||
@@ -30,14 +34,51 @@ namespace textinput {
|
||||
EM_Last
|
||||
} EditMode;
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
|
||||
const char* layoutName, EventObserver* event, const char* fontName)
|
||||
: textinput::InputForm(manager, multiArc, layoutName, event, fontName),
|
||||
unk_0x308(NULL), unk_0x30C(NULL), unk_0x310(NULL), unk_0x314(NULL),
|
||||
mfScroll(0.0f), mfScrollFrom(0.0f), mfScrollTo(0.0f), mnLine(0),
|
||||
mDrawRect(), mDefaultDrawSize(), mDefaultBoundSize(), mExScrollAnm(),
|
||||
mpNigaoeObserver(NULL), mpDefaultNigaoe(NULL), mpSendString(NULL),
|
||||
mbEdited(false), mbGoodBye(false), mbEditScrollUp(false), mbEditScrollDown(false),
|
||||
mbCloseWithSend(false), mpScrollButton(NULL), mbScrollUp(false), mbScrollDown(false),
|
||||
meEditMode(EM_Disp) {}
|
||||
#endif
|
||||
|
||||
~InputForm();
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
virtual void moveCursorUp();
|
||||
virtual void moveCursorDown();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
virtual void create(MEMAllocator* allocator, inputform::EditBuffer* editBuffer);
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(input::HKBManager& hkbManager);
|
||||
virtual void init();
|
||||
virtual void draw();
|
||||
virtual void calc();
|
||||
virtual void doScroll(Scroll* scroll);
|
||||
virtual u32 calcCursorPos(f32 x, f32 y);
|
||||
virtual void drawCursor(f32 x, f32 y);
|
||||
virtual nw4r::math::VEC2 getScale() const;
|
||||
virtual void preDraw(u32 pos);
|
||||
virtual void doLineFeed();
|
||||
virtual void finishDraw(u32 pos);
|
||||
virtual bool isInScroll();
|
||||
#endif
|
||||
|
||||
virtual void setScroll(f32 scroll);
|
||||
virtual void setAddScroll(f32 scroll, bool up, bool down);
|
||||
|
||||
virtual f32 getScroll() { return mfScroll; }
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual f32 getScrollFrom();
|
||||
virtual f32 getScrollTo();
|
||||
#else
|
||||
virtual f32 getScrollFrom() { return mfScrollFrom; }
|
||||
virtual f32 getScrollTo() { return mfScrollTo; }
|
||||
#endif
|
||||
|
||||
virtual void open();
|
||||
virtual void close();
|
||||
@@ -90,7 +131,11 @@ namespace textinput {
|
||||
void setEditScrollDown(bool editScrollDown) { mbEditScrollUp = editScrollDown; }
|
||||
void setCloseWithSend(bool closeWithSend) { mbCloseWithSend = closeWithSend; }
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
void setEditMode(EditMode editMode);
|
||||
#else
|
||||
void setEditMode(EditMode editMode) { meEditMode = editMode; }
|
||||
#endif
|
||||
|
||||
bool isEdited() { return mbEdited; }
|
||||
bool isGoodBye() { return mbGoodBye; }
|
||||
@@ -102,10 +147,24 @@ namespace textinput {
|
||||
|
||||
tistring::Decolated* getSendString() { return mpSendString; }
|
||||
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
nw4r::lyt::Pane* mpMemoPane;
|
||||
nw4r::lyt::Pane* mpMemoRootPane;
|
||||
nw4r::lyt::Pane* mpBoundPane;
|
||||
nw4r::lyt::Pane* mpDrawPane;
|
||||
#else
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
undefined4* unk_0x308;
|
||||
#endif
|
||||
undefined4* unk_0x30C;
|
||||
undefined4* unk_0x310;
|
||||
undefined4* unk_0x314;
|
||||
#endif
|
||||
f32 mfScroll; // 0x318
|
||||
f32 mfScrollFrom; // 0x31C
|
||||
f32 mfScrollTo; // 0x320
|
||||
@@ -117,7 +176,11 @@ namespace textinput {
|
||||
nw4r::lyt::Size mDefaultBoundSize; // 0x358
|
||||
Mtx mDrawMtx; // 0x360
|
||||
Mtx mBoundMtx; // 0x390
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
util::Animation mExScrollAnm; // 0x3C0
|
||||
#else
|
||||
u8 /*todo*/ mExScrollAnm[32]; // 0x3C0
|
||||
#endif
|
||||
NigaoeEventObserver* mpNigaoeObserver; // 0x3E0
|
||||
GXTexObj* mpDefaultNigaoe; // 0x3E4
|
||||
tistring::Decolated* mpSendString; // 0x3E8
|
||||
@@ -127,7 +190,11 @@ namespace textinput {
|
||||
bool mbEditScrollDown; // 0x3EF
|
||||
bool mbCloseWithSend; // 0x3F0
|
||||
u8 padding[3]; // 0x3F1
|
||||
undefined4* mpScrollButton; // 0x3F4
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
ScrollButton* mpScrollButton;
|
||||
#else
|
||||
undefined4* mpScrollButton;
|
||||
#endif
|
||||
bool mbScrollUp; // 0x3F8
|
||||
bool mbScrollDown; // 0x3F9
|
||||
EditMode meEditMode; // 0x3FC
|
||||
|
||||
@@ -16,6 +16,22 @@ namespace textinput {
|
||||
T_Last,
|
||||
} Type;
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
|
||||
const char* layoutName, EventObserver* event, const char* fontName)
|
||||
: textinput::MemoInputForm(manager, multiArc, layoutName, event, fontName),
|
||||
unk_0x400(0), mbPhotoDraw(false), meType(T_MailAddressSel) {}
|
||||
#endif
|
||||
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
virtual ~InputForm();
|
||||
virtual void create(MEMAllocator*, inputform::EditBuffer*);
|
||||
virtual void drawBody();
|
||||
virtual void drawFooter();
|
||||
virtual void open();
|
||||
virtual void close();
|
||||
virtual bool isWholePaneInAnimation();
|
||||
#endif
|
||||
virtual nw4r::lyt::Material* getPhotoPaneMaterial();
|
||||
|
||||
virtual void onPhotoTrig();
|
||||
@@ -31,7 +47,11 @@ namespace textinput {
|
||||
void resizePhotoPane(f32 width, f32 height);
|
||||
|
||||
private:
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
bool mbPhotoScaledUp;
|
||||
#else
|
||||
u8 unk_0x400;
|
||||
#endif
|
||||
bool mbPhotoDraw; // 0x401
|
||||
Type meType; // 0x404
|
||||
};
|
||||
|
||||
@@ -28,6 +28,9 @@ namespace textinput {
|
||||
CT_NumericWithSeparator,
|
||||
CT_NormalWithoutLineFeedWithSign,
|
||||
CT_PredictWithoutLineFeed,
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
CT_PredictBigText,
|
||||
#endif
|
||||
|
||||
CT_Last
|
||||
} ConfigType;
|
||||
@@ -78,7 +81,11 @@ namespace textinput {
|
||||
virtual void start();
|
||||
virtual void end();
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual textinput::InputForm* createInputForm();
|
||||
#else
|
||||
virtual InputForm* createInputForm();
|
||||
#endif
|
||||
|
||||
virtual void memoDraw();
|
||||
|
||||
@@ -93,8 +100,16 @@ namespace textinput {
|
||||
|
||||
virtual ConfigType getConfigType() { return meConfigType; }
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual void setSaveData();
|
||||
#else
|
||||
virtual void setSaveData_();
|
||||
#endif
|
||||
virtual void reflectSaveData();
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
void reflectSaveDataRev1();
|
||||
void reflectSaveDataDefault();
|
||||
#endif
|
||||
|
||||
virtual void configDefault();
|
||||
virtual void configLetter();
|
||||
@@ -111,10 +126,21 @@ namespace textinput {
|
||||
virtual void configNormalWithoutLineFeedWithSign();
|
||||
virtual void configPredictWithoutLineFeed();
|
||||
virtual void configPredictBigText();
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual textinput::MemoInputForm* createMemoInputForm();
|
||||
virtual textinput::LetterInputForm* createLetterInputForm();
|
||||
virtual textinput::InputForm* createBigTextInputForm();
|
||||
virtual void* createBG();
|
||||
#else
|
||||
virtual void createMemoInputForm();
|
||||
virtual void createLetterInputForm();
|
||||
virtual void createBigTextInputForm();
|
||||
virtual void createBG();
|
||||
#endif
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
void* getBackGround() const { return mpBackGround; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
State* mpCurrentState; // 0x40
|
||||
@@ -135,7 +161,31 @@ namespace textinput {
|
||||
|
||||
class State {
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
State() : mpManager(NULL) {}
|
||||
Manager* getManager() const { return mpManager; }
|
||||
void setManager(Manager* manager) { mpManager = manager; }
|
||||
#endif
|
||||
virtual ~State();
|
||||
#ifdef MYTIMANAGER_MATCHING
|
||||
virtual Manager::StateType getStateType() = 0;
|
||||
|
||||
virtual void create() = 0;
|
||||
|
||||
virtual void init() = 0;
|
||||
|
||||
virtual void draw() = 0;
|
||||
virtual void memoDraw() = 0;
|
||||
|
||||
virtual void calc() = 0;
|
||||
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release) = 0;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) = 0;
|
||||
|
||||
virtual void start() = 0;
|
||||
virtual void end() = 0;
|
||||
|
||||
#else
|
||||
virtual Manager::StateType getStateType();
|
||||
|
||||
virtual void create();
|
||||
@@ -153,6 +203,19 @@ namespace textinput {
|
||||
virtual void start();
|
||||
virtual void end();
|
||||
|
||||
#endif
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual InputForm* InputForm();
|
||||
virtual keyboard::hwkey::HWKeyboard* HWKeyboard();
|
||||
virtual keyboard::pctype::LayoutByNW4R* PCKeyboard();
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* CellPhoneKeyboard();
|
||||
virtual void* SignKeyboard();
|
||||
virtual candidatebox::LayoutByNW4R* CandidateBox();
|
||||
virtual toolbar::LayoutByNW4R* ToolBar();
|
||||
virtual void* PredictLanguageSelectDialog();
|
||||
virtual void* BG();
|
||||
#endif
|
||||
|
||||
private:
|
||||
Manager* mpManager; // 0x04
|
||||
};
|
||||
|
||||
@@ -48,6 +48,9 @@ namespace textinput {
|
||||
|
||||
class CandidateBoxCaller {
|
||||
public:
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
CandidateBoxCaller() : mpCandidateBox(NULL) {}
|
||||
#endif
|
||||
// This candidate thing is a bit different from the dwarf
|
||||
class Candidates {
|
||||
public:
|
||||
@@ -74,6 +77,9 @@ namespace textinput {
|
||||
|
||||
class Base : public CommandSender {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Base(Manager* manager) : mpCandidates(NULL), mpAllocator(NULL), mbOn(false), mbInvalid(true), meLanguage(USA), mpManager(manager) {}
|
||||
#endif
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override {}
|
||||
@@ -108,6 +114,9 @@ namespace textinput {
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
#endif
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) override; // 0x18
|
||||
|
||||
LayoutByNW4R* mpLayoutByNW4R; // 0xC
|
||||
@@ -178,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;
|
||||
@@ -281,6 +302,13 @@ namespace textinput {
|
||||
// TODO
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public UIObj::Listener {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mEventHandler(this), mpTiString(NULL),
|
||||
mTextArea(0, this, this), mLeftScroll(1, this, this), mRightScroll(2, this, this), mOnOffButton(3, this, this),
|
||||
mTextWindow(4, this, this), mbActive(true) {}
|
||||
const UIOnOffButton& getOnOffButton() const { return mOnOffButton; }
|
||||
#endif
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
@@ -309,7 +337,11 @@ namespace textinput {
|
||||
virtual u16 getScroll() { return mTextArea.GetDispOffset(); } // 0x100
|
||||
virtual bool isInScroll(); // 0x104
|
||||
virtual void setActive(bool active); // 0x108
|
||||
virtual bool isActive() const; // 0x10C
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isActive() const { return mbActive; }
|
||||
#else
|
||||
virtual bool isActive() const;
|
||||
#endif // 0x10C
|
||||
virtual void setSelectedTextPane(int pane) { mTextArea.SetSelectedText(pane); } // 0x110
|
||||
virtual void setFocusedTextPane(int pane) { mTextArea.SetFocusedText(pane); } // 0x114
|
||||
virtual int getFocusedTextPane() { return mTextArea.GetFocusedText(); } // 0x118
|
||||
@@ -319,6 +351,9 @@ namespace textinput {
|
||||
virtual void cancelStateFocusIn(); // 0x128
|
||||
virtual void onEvent(UIObj*, u32, void*) override; // 0x12C
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
UITextArea& getTextArea() { return mTextArea; }
|
||||
#endif
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
void startTurnOn(bool);
|
||||
|
||||
@@ -2,13 +2,109 @@
|
||||
#define TEXTINPUT_CELL_PHONE_H
|
||||
|
||||
#include "tiNw4rManager.h"
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#include "tiKeyboard.h"
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
#include <revolution/gx.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
class Manager;
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
class EventObserver;
|
||||
#endif
|
||||
namespace predictlang {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
namespace keyboard {
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
enum VKeyCode {
|
||||
VK_LINE_FEED = 0,
|
||||
VK_DELETE = 1,
|
||||
VK_SIGN_INPUT = 9,
|
||||
VK_PREDICT_LANGUAGE = 10,
|
||||
VK_INPUT_MODE_02 = 11,
|
||||
VK_INPUT_MODE_03 = 13,
|
||||
VK_INPUT_MODE_00 = 18,
|
||||
VK_INPUT_MODE_01 = 19,
|
||||
VK_TOGGLE_ABC_MODE = 23,
|
||||
};
|
||||
#endif
|
||||
namespace signwindow {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace cellphonetype {
|
||||
class EventHandler;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
class CellPhoneAnmPane;
|
||||
struct PaneNameToCharCode;
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
class Base : public textinput::keyboard::KeyboardBase {
|
||||
#else
|
||||
class Base {
|
||||
#endif
|
||||
public:
|
||||
// TODO
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_SAMPLE_CLASS)
|
||||
Base(Manager* manager) : mPreviousInputMode(0), mCurrentInputMode(0), mpManager(manager) {}
|
||||
#endif
|
||||
enum InputMode {
|
||||
IM_00,
|
||||
IM_01,
|
||||
IM_02,
|
||||
IM_03,
|
||||
IM_04,
|
||||
};
|
||||
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Base(Manager* manager) : mpManager(manager) {}
|
||||
#endif
|
||||
#if defined(TI_CELLPHONE_IMPLEMENTATION)
|
||||
virtual u32 getType() override;
|
||||
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual int getType() override;
|
||||
#elif defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
virtual int getType() override;
|
||||
#else
|
||||
virtual void getType() override;
|
||||
#endif
|
||||
virtual void onActive() override;
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
virtual InputMode getInputMode() const;
|
||||
virtual bool isLocked() const;
|
||||
virtual bool isNumeric() const;
|
||||
virtual bool isNumericWithDot() const;
|
||||
virtual bool isHoldingButton() const;
|
||||
virtual void doNumericMode(bool);
|
||||
virtual void changeInputMode(InputMode);
|
||||
virtual bool isUpperCase();
|
||||
virtual void setInputMode(InputMode);
|
||||
virtual void setUpperCaseJP(bool);
|
||||
virtual void setLangKeyActive(bool);
|
||||
virtual bool onClose();
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void setAbcMode(bool);
|
||||
virtual bool isZiActive();
|
||||
virtual bool isAtokActive();
|
||||
virtual void doInput();
|
||||
virtual void updateFixMode();
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
wchar_t convertToZiCellphoneInput_(wchar_t value);
|
||||
#endif
|
||||
#else
|
||||
virtual void vt_0x08();
|
||||
virtual void vt_0x0C();
|
||||
virtual void vt_0x10();
|
||||
@@ -30,7 +126,11 @@ namespace textinput {
|
||||
|
||||
virtual void vt_0x4C();
|
||||
virtual void vt_0x50();
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual void doNumericMode(bool);
|
||||
#else
|
||||
virtual void vt_0x54();
|
||||
#endif
|
||||
virtual void vt_0x58();
|
||||
virtual void vt_0x5C();
|
||||
virtual void vt_0x60();
|
||||
@@ -38,18 +138,137 @@ namespace textinput {
|
||||
virtual void vt_0x68(bool);
|
||||
|
||||
virtual bool onClose();
|
||||
#endif
|
||||
|
||||
// TODO enum?
|
||||
int getInputType() const;
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void resetHoldingButton();
|
||||
#endif
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_IMPLEMENTATION)
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
u32 mPreviousInputMode;
|
||||
u32 mCurrentInputMode;
|
||||
bool mbInputModeLocked;
|
||||
bool mbNumericMode;
|
||||
bool mbNumericWithDotMode;
|
||||
bool mbUpperCaseMode;
|
||||
bool mbAbcMode;
|
||||
bool mbLanguageKeyMode;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
const PaneNameToCharCode* mHoldingButton;
|
||||
#else
|
||||
u32 mHoldingButton;
|
||||
#endif
|
||||
void* mpInputModeTable;
|
||||
MEMAllocator* mpAllocator;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
Manager* mpManager;
|
||||
bool mInputState;
|
||||
#elif defined(TIMANAGER_IMPLEMENTATION)
|
||||
Manager* mpManager;
|
||||
u32 mInputState;
|
||||
#else
|
||||
void* mpInputSettings;
|
||||
u32 mInputState;
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
void onCtrlKey_(VKeyCode keyCode);
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
#include "tiCellPhoneLayout.h"
|
||||
#else
|
||||
class LayoutByNW4R;
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
enum Animation {
|
||||
ANM_Normal,
|
||||
ANM_FocusIn,
|
||||
ANM_FocusOut,
|
||||
ANM_RollOver,
|
||||
ANM_Pushed,
|
||||
ANM_05,
|
||||
ANM_06,
|
||||
ANM_ToggleOff,
|
||||
ANM_Last,
|
||||
};
|
||||
|
||||
enum KeyType {
|
||||
KT_NormalButton,
|
||||
KT_ControlButton,
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
virtual bool onClose();
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent* pane, u32 event, Input* input) override;
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
private:
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
};
|
||||
#endif
|
||||
|
||||
class CellPhoneAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
CellPhoneAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
: nw4rmanager::AnmPane(pane, observer), meState(ANM_Normal), meKeyType(KT_NormalButton) {
|
||||
init();
|
||||
changeAnimation(meState);
|
||||
}
|
||||
#else
|
||||
: nw4rmanager::AnmPane(pane, observer), meState(ANM_Normal), meKeyType(KT_NormalButton) {}
|
||||
#endif
|
||||
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent event) override;
|
||||
virtual void changeAnimation(u32 id) override;
|
||||
virtual KeyType getKeyType() const;
|
||||
u32 getAnimationState() const { return meState; }
|
||||
virtual ~CellPhoneAnmPane();
|
||||
|
||||
protected:
|
||||
Animation meState;
|
||||
KeyType meKeyType;
|
||||
};
|
||||
|
||||
class CellPhoneControlAnmPane : public CellPhoneAnmPane {
|
||||
public:
|
||||
CellPhoneControlAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: CellPhoneAnmPane(pane, observer) { meKeyType = KT_ControlButton; }
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent event) override;
|
||||
virtual ~CellPhoneControlAnmPane();
|
||||
};
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent* pane, u32 event, Input* input) override;
|
||||
|
||||
private:
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
#include "tiCellPhoneLayout.h"
|
||||
#endif
|
||||
|
||||
} // namespace cellphonetype
|
||||
} // namespace keyboard
|
||||
|
||||
126
include/keyboard/tiCellPhoneLayout.h
Normal file
126
include/keyboard/tiCellPhoneLayout.h
Normal file
@@ -0,0 +1,126 @@
|
||||
#ifndef TEXTINPUT_CELL_PHONE_LAYOUT_H
|
||||
#define TEXTINPUT_CELL_PHONE_LAYOUT_H
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpEventHandler(NULL) {}
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver);
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual void setLanguage(Language language);
|
||||
virtual void update();
|
||||
virtual void onActive();
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
virtual void changeInputMode(InputMode mode);
|
||||
virtual void setInputMode(InputMode mode);
|
||||
virtual void setUpperCaseJP(bool upper);
|
||||
virtual void setLangKeyActive(bool active);
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void setAbcMode(bool abc);
|
||||
virtual void doNumericMode(bool);
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R* dialog);
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R* window);
|
||||
#else
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_cellPhone_a.brlyt", observer), mpSignWindow(NULL) {}
|
||||
#endif
|
||||
virtual void doNumericMode(bool);
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R*);
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R*);
|
||||
#else
|
||||
virtual void setPredictLanguageDialog(void*);
|
||||
virtual void setSignWindow(void*);
|
||||
#endif
|
||||
#endif
|
||||
virtual void doNumericWithDotMode(bool);
|
||||
virtual void setLineFeedButton(bool);
|
||||
virtual void setPredictLanguageButton(bool);
|
||||
virtual void setSignWindowButton(bool);
|
||||
#endif
|
||||
virtual bool onClose();
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
bool hasLineFeedButton() const { return mbLineFeedButton; }
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
GXTexObj mSpaceTexture;
|
||||
GXTexObj mSpaceTextureCN;
|
||||
GXTexObj mSpaceTextureKR;
|
||||
nw4rmanager::TiEventHandler* mpEventHandler;
|
||||
predictlang::LayoutByNW4R* mpPredictDialog;
|
||||
signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#endif
|
||||
public:
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) override;
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void draw() override;
|
||||
virtual void calc() override;
|
||||
virtual void update() override;
|
||||
virtual void onKey(u32 key, void* data) override;
|
||||
virtual void onActive() override;
|
||||
virtual void updateFromReceiver(u32 command, void* data) override;
|
||||
virtual void changeInputMode(InputMode mode) override;
|
||||
virtual void changePredictLanguage() override;
|
||||
virtual void setAbcMode(bool enabled) override;
|
||||
virtual void goSignInputMode() override;
|
||||
virtual void setInputMode(InputMode mode) override;
|
||||
virtual void setLanguage(Language language) override;
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override;
|
||||
|
||||
virtual CellPhoneAnmPane* getAnmPane(InputMode mode);
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void changeAnimationAllToNormal();
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
|
||||
virtual void changeKeyTop(const PaneNameToCharCode* keys);
|
||||
virtual void changeSpaceKeyTop(const PaneNameToCharCode* keys);
|
||||
void setUpperCaseJP(bool enabled);
|
||||
void setLangKeyActive(bool enabled);
|
||||
void resetHoldingButton();
|
||||
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
GXTexObj mTextures[3];
|
||||
EventHandler* mpEventHandler;
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog;
|
||||
signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#elif defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual nw4rmanager::AnmPane* getAnmPane(InputMode mode);
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void changeAnimationAllToNormal();
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
|
||||
virtual void changeKeyTop(const struct PaneNameToCharCode* table);
|
||||
virtual void changeSpaceKeyTop(const struct PaneNameToCharCode* table);
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
@@ -93,8 +93,13 @@ namespace textinput {
|
||||
extern const KeySet csKeySetCNPinyin;
|
||||
extern const KeySet csKeySetHangul;
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
extern const wchar_t* csSpaceZero;
|
||||
extern const wchar_t* csSpace;
|
||||
#else
|
||||
extern const wchar_t csSpaceZero[3];
|
||||
extern const wchar_t csSpace[3];
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,6 +92,9 @@ namespace textinput {
|
||||
EVENT_RELEASE
|
||||
};
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void init();
|
||||
#else
|
||||
virtual void init() { // 0x10
|
||||
for (int i = 0; i < GUI_POINTS_MAX; i++) {
|
||||
mbPointed[i] = false;
|
||||
@@ -100,6 +103,7 @@ namespace textinput {
|
||||
mFlightDuration[i] = 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
GUIComponent(u32 id)
|
||||
: GUIInterface(), mbInitialize(false), mDraggingButton(0xFFFF), mID(id), mbTriggerTarget(false), mpManager(NULL), mpListener(NULL) {
|
||||
|
||||
@@ -6,11 +6,143 @@
|
||||
#include <revolution/mem/allocator.h>
|
||||
|
||||
#include "keyboard/tiCpData.h"
|
||||
#ifdef TIHKBMANAGER_IMPLEMENTATION
|
||||
#include <revolution/kbd.h>
|
||||
enum _KBDEc { KBD_EC_BUSY = 7 };
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace input {
|
||||
#ifdef TIHKBMANAGER_IMPLEMENTATION
|
||||
class HKBManager {
|
||||
public:
|
||||
class KeyState_ {
|
||||
public:
|
||||
void NotifyEvent(u8 down, u8 code);
|
||||
void Update();
|
||||
void UpdateModState_();
|
||||
void Clear() {
|
||||
held = 0;
|
||||
triggered = 0;
|
||||
released = 0;
|
||||
repeated = 0;
|
||||
current = 0;
|
||||
pending = 0;
|
||||
modifiers &= 0x700;
|
||||
forceMask = 0;
|
||||
forceState = 0;
|
||||
retryLeds = 0;
|
||||
}
|
||||
void Initialize(u8 channel) {
|
||||
held = 0;
|
||||
triggered = 0;
|
||||
released = 0;
|
||||
repeated = 0;
|
||||
current = 0;
|
||||
pending = 0;
|
||||
forceMask = 0;
|
||||
forceState = 0;
|
||||
retryLeds = 0;
|
||||
device = channel;
|
||||
country = 0xf;
|
||||
modifiers = 0;
|
||||
}
|
||||
u8 device;
|
||||
u32 held, triggered, released, repeated;
|
||||
u32 previous, current, pending;
|
||||
u32 modifiers, forceState, forceMask;
|
||||
s32 country;
|
||||
u8 retryLeds;
|
||||
u8 previousKeys[8], currentKeys[8], pendingKeys[8];
|
||||
u32 repeatDelay[8];
|
||||
};
|
||||
class KeySet {
|
||||
public:
|
||||
KeySet() {}
|
||||
KeySet(const HKBManager* owner, u8 kind)
|
||||
: manager(owner), type(kind), index(-1), device(0), vcode(0) {}
|
||||
u8 GetKey() const;
|
||||
u32 GetWChar() const;
|
||||
u32 GetVCode() const;
|
||||
u32 IsValid() const;
|
||||
bool CheckValidity() const {
|
||||
if (!manager) return false;
|
||||
s8 keyIndex = index;
|
||||
if (keyIndex < 0 || keyIndex >= 8) return false;
|
||||
u8 keyDevice = device;
|
||||
if (keyDevice >= 2) return false;
|
||||
switch (type) {
|
||||
case 0: return (manager->states[keyDevice].held & (1 << keyIndex)) != 0;
|
||||
case 1: return (manager->states[keyDevice].triggered & (1 << keyIndex)) != 0;
|
||||
case 2: return (manager->states[keyDevice].released & (1 << keyIndex)) != 0;
|
||||
case 3: return (manager->states[keyDevice].repeated & (1 << keyIndex)) != 0;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
KeySet GetNext() const;
|
||||
const HKBManager* manager;
|
||||
u8 type;
|
||||
s8 index;
|
||||
u8 device;
|
||||
mutable u16 vcode;
|
||||
};
|
||||
class KBDListenerOwn;
|
||||
class KBDListenerLinks {
|
||||
public:
|
||||
KBDListenerLinks() : previous(0), next(0) {}
|
||||
virtual ~KBDListenerLinks() {}
|
||||
virtual void OnAttach(KBDDevEvent*) = 0;
|
||||
virtual void OnDetach(KBDDevEvent*) = 0;
|
||||
virtual void OnKeyEvent(KBDKeyEvent*) = 0;
|
||||
KBDListenerOwn* previous;
|
||||
KBDListenerOwn* next;
|
||||
};
|
||||
class KBDListenerOwn : public KBDListenerLinks {
|
||||
public:
|
||||
KBDListenerOwn(HKBManager* owner) : manager(owner) {}
|
||||
virtual ~KBDListenerOwn();
|
||||
virtual void OnAttach(KBDDevEvent* event);
|
||||
virtual void OnDetach(KBDDevEvent* event);
|
||||
virtual void OnKeyEvent(KBDKeyEvent* event);
|
||||
HKBManager* manager;
|
||||
};
|
||||
HKBManager() __attribute__((never_inline));
|
||||
~HKBManager();
|
||||
static HKBManager& getInstance() { return sInstance; }
|
||||
void Initialize();
|
||||
void ClearState();
|
||||
u32 GetModifierState() const;
|
||||
void SetCountry(u8 country);
|
||||
void SetModifierState(u32 state, u32 mask);
|
||||
void SetForceModifierState(u32 state, u32 mask);
|
||||
void Update();
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetReleasedKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
KeySet GetReleasedKeySet() const;
|
||||
#endif
|
||||
static void SetLedCB(_KBDEc result, void* userData);
|
||||
static void AttachCB(KBDDevEvent* event);
|
||||
static void DetachCB(KBDDevEvent* event);
|
||||
static void KeyEventCB(KBDKeyEvent* event);
|
||||
private:
|
||||
u8 initialized;
|
||||
u8 attached[2];
|
||||
u32 lockState;
|
||||
u32 retryDevices;
|
||||
const wchar_t* allowedCharacters;
|
||||
u32 allowedCharacterCount;
|
||||
KeyState_ states[2];
|
||||
KBDListenerOwn listener;
|
||||
static HKBManager sInstance;
|
||||
};
|
||||
#else
|
||||
class HKBManager {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
void ClearState();
|
||||
#endif
|
||||
static HKBManager& getInstance() { return sInstance; }
|
||||
|
||||
void Initialize();
|
||||
@@ -19,19 +151,85 @@ namespace textinput {
|
||||
u32 GetModifierState() const;
|
||||
void SetModifierState(u32, u32);
|
||||
|
||||
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
||||
class KeySet {
|
||||
public:
|
||||
u8 GetKey() const;
|
||||
u32 GetWChar() const;
|
||||
bool IsValid() const;
|
||||
KeySet GetNext() const;
|
||||
KeySet(const KeySet& other)
|
||||
: mpManager(other.mpManager), mKind(other.mKind), mIndex(other.mIndex),
|
||||
mDevice(other.mDevice), mCharacter(other.mCharacter) {}
|
||||
private:
|
||||
const HKBManager* mpManager;
|
||||
u8 mKind;
|
||||
s8 mIndex;
|
||||
u8 mDevice;
|
||||
u16 mCharacter;
|
||||
};
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#else
|
||||
#if defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
class KeySet {
|
||||
public:
|
||||
u8 GetKey() const;
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
u32 GetWChar() const;
|
||||
#else
|
||||
wchar_t GetWChar() const;
|
||||
#endif
|
||||
bool IsValid() const;
|
||||
KeySet GetNext() const;
|
||||
KeySet(const KeySet& other)
|
||||
: mpManager(other.mpManager), mKind(other.mKind), mIndex(other.mIndex), mDevice(other.mDevice), mCharacter(other.mCharacter) {}
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
KeySet() : mpManager(NULL), mKind(0), mIndex(-1), mDevice(0), mCharacter(0) {}
|
||||
#endif
|
||||
private:
|
||||
const HKBManager* mpManager;
|
||||
u8 mKind;
|
||||
s8 mIndex;
|
||||
u8 mDevice;
|
||||
u16 mCharacter;
|
||||
};
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
KeySet GetReleasedKeySet() const;
|
||||
#endif
|
||||
void SetForceModifierState(u32 mask, u32 state);
|
||||
#else
|
||||
class KeySet {
|
||||
private:
|
||||
keyboard::cellphonetype::PaneNameToCharCode* pPaneNameToCharCode; // 0x00
|
||||
wchar_t szKeySetName[17]; // 0x04
|
||||
u16 uNum; // 0x26
|
||||
u16 uType; // 0x28
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
public:
|
||||
bool IsValid() const;
|
||||
u32 GetKey() const;
|
||||
wchar_t GetWChar() const;
|
||||
KeySet GetNext() const;
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
private:
|
||||
u8 unk_0x00[0xFC];
|
||||
|
||||
static HKBManager sInstance;
|
||||
};
|
||||
#endif
|
||||
} // namespace input
|
||||
} // namespace textinput
|
||||
|
||||
|
||||
@@ -8,17 +8,43 @@ namespace textinput {
|
||||
class Manager;
|
||||
namespace keyboard {
|
||||
namespace hwkey {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
class HWKeyboard : public CommandSender {
|
||||
#else
|
||||
class HWKeyboard : CommandSender {
|
||||
#endif
|
||||
public:
|
||||
HWKeyboard(Manager *);
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
inline ~HWKeyboard();
|
||||
#else
|
||||
~HWKeyboard();
|
||||
#endif
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
void setLanguage(Destination destination, Language language);
|
||||
#endif
|
||||
|
||||
virtual void init();
|
||||
#if defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
wchar_t convertWCCode(wchar_t code) const;
|
||||
#endif
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
#else
|
||||
virtual void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
#endif
|
||||
virtual bool updateInput(input::HKBManager& hkbManager);
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void resetQuoteState() { mbSingleQuoteClosing = 0; mbDoubleQuoteClosing = 0; }
|
||||
#endif
|
||||
private:
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
bool updateRepeatKey_(input::HKBManager&);
|
||||
bool updateTriggerKey_(input::HKBManager&);
|
||||
bool updateTappingShift_(input::HKBManager&);
|
||||
#endif
|
||||
void updateShift(input::HKBManager& hkbManager);
|
||||
void controlKeyTriggeredHandler(input::HKBManager);
|
||||
|
||||
@@ -26,8 +52,18 @@ namespace textinput {
|
||||
|
||||
Manager* mpManager; // 0x10
|
||||
u8 field_0x14; // 0x14
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
u8 mbSingleQuoteClosing;
|
||||
u8 mbDoubleQuoteClosing;
|
||||
#else
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
bool field_0x15;
|
||||
bool field_0x16;
|
||||
#else
|
||||
u8 field_0x15; // 0x15
|
||||
u8 field_0x16; // 0x16
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -13,11 +13,43 @@
|
||||
#include "tiZiString.h"
|
||||
#include "tiSEId.h"
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
extern "C" wchar_t KPRGetChar(KPRQueue* queue);
|
||||
extern "C" void KPRPutChar(KPRQueue* queue, wchar_t character);
|
||||
extern "C" void KPRClearQueue(KPRQueue* queue);
|
||||
extern "C" void KPRInitRegionUS();
|
||||
extern "C" u8 KPRLookAhead(KPRQueue* queue, wchar_t* character, wchar_t* combining);
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
class Manager;
|
||||
#endif
|
||||
namespace inputform {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
class Base;
|
||||
class EventHandler;
|
||||
class LayoutByNW4R;
|
||||
#endif
|
||||
class EditBuffer {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
friend class textinput::Manager;
|
||||
public:
|
||||
EditBuffer() : mpString(NULL), mpUnfixString(NULL), mpZiString(NULL), mpAllocator(NULL) {}
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
friend class LayoutByNW4R;
|
||||
friend class Base;
|
||||
#endif
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void create(MEMAllocator* allocator);
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual ~EditBuffer();
|
||||
#else
|
||||
~EditBuffer();
|
||||
#endif
|
||||
|
||||
private:
|
||||
void* mpString; // 0x04
|
||||
@@ -27,6 +59,27 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class DeadKeyStream {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
public:
|
||||
DeadKeyStream() { KPRInitRegionUS(); init(); }
|
||||
static wchar_t ToCombineClass(Language language, wchar_t code);
|
||||
static wchar_t ToIndependentClass(wchar_t code);
|
||||
inline wchar_t getChar();
|
||||
void init();
|
||||
u8 lookAhead() { return KPRLookAhead(&mKPRQueue, NULL, NULL); }
|
||||
void putChar(wchar_t character) { KPRPutChar(&mKPRQueue, character); }
|
||||
bool isEmpty() const { return mKPRQueue.oCount == 0; }
|
||||
void clear() { KPRClearQueue(&mKPRQueue); }
|
||||
private:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
friend class textinput::Manager;
|
||||
#endif
|
||||
static bool sbCompatibleFilterEnabled;
|
||||
static inline bool isCompatible(wchar_t character);
|
||||
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
public:
|
||||
static wchar_t ToIndependentClass(wchar_t code);
|
||||
#endif
|
||||
private:
|
||||
KPRQueue mKPRQueue; // 0x00
|
||||
};
|
||||
@@ -75,13 +128,61 @@ namespace textinput {
|
||||
|
||||
// TODO - location
|
||||
class RowInfoManager {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
friend class LayoutByNW4R;
|
||||
friend class Base;
|
||||
public:
|
||||
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void init() __attribute__((never_inline));
|
||||
#else
|
||||
void init();
|
||||
#endif
|
||||
~RowInfoManager();
|
||||
#endif
|
||||
private:
|
||||
Info_* mpInfo; // 0x00
|
||||
u16 mMaxLength; // 0x04
|
||||
MEMAllocator* mpAllocator; // 0x08
|
||||
};
|
||||
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
bool isAtokActive() const;
|
||||
#endif
|
||||
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
#endif
|
||||
virtual ~Base();
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
Base(Manager* manager);
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
void setCursorPos(tistring::Decolated* string, u32 pos);
|
||||
void calcCursorTimer();
|
||||
bool isAtokActive() const;
|
||||
bool isVacancy() const;
|
||||
void dirtyCacheAll();
|
||||
tistring::Decolated* getCurrentString(bool inputting);
|
||||
void moveCandidateToIdx(s32 index);
|
||||
void onPressDownHWKB();
|
||||
void onPressLeftHWKB();
|
||||
void onPressRightHWKB();
|
||||
void toggleAtokMode_(u8 operation);
|
||||
void onSpaceKeyHWKB(u32 modifiers);
|
||||
void onHKBCtrlCode(HVKCode code, u32 modifiers);
|
||||
void confirmInput_();
|
||||
void confirmInputting_(wchar_t character, bool direct, u16 letterMode, bool confirmOnly, void* holdingKey);
|
||||
void inputCharZi_(wchar_t character, u32 modifiers);
|
||||
void inputCharDefault_(wchar_t character, u32 modifiers);
|
||||
void inputInputting_(wchar_t character);
|
||||
inline bool hasZiPredictions() const;
|
||||
inline bool usesZiPrediction() const;
|
||||
inline void resetPredictionContext();
|
||||
inline void resetInputRelation();
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator, EditBuffer* editBuffer);
|
||||
|
||||
@@ -137,7 +238,12 @@ namespace textinput {
|
||||
|
||||
virtual void enableSpaceByRight(bool rightWithSpace);
|
||||
virtual void onClose();
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
tistring::WithAtok* getCurrentString(bool fixed);
|
||||
virtual bool canConvert() { return getCurrentString(false) == mpUnfixString; }
|
||||
#else
|
||||
virtual bool canConvert();
|
||||
#endif
|
||||
|
||||
virtual void setString(const wchar_t* string);
|
||||
|
||||
@@ -167,6 +273,10 @@ namespace textinput {
|
||||
|
||||
virtual void onSE(sound::SE seId);
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
void dirtyCacheAll();
|
||||
#endif
|
||||
|
||||
virtual void clear();
|
||||
|
||||
virtual u32 calcCursorPos(f32 x, f32 y);
|
||||
@@ -183,8 +293,21 @@ namespace textinput {
|
||||
|
||||
virtual void makeUpCursorPos(CursorPos* cursorPos, u32 pos, s32 startLine, s32 endLine);
|
||||
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
#if !defined(TIINPUTFORM_IMPLEMENTATION) && !defined(TIMANAGER_IMPLEMENTATION)
|
||||
void setCursorPos(tistring::Decolated* string, u32 pos);
|
||||
void calcCursorTimer();
|
||||
#endif
|
||||
void resetRelation();
|
||||
#else
|
||||
private:
|
||||
Rect mRect; // 0x120
|
||||
#endif
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect mRect;
|
||||
#else
|
||||
Rect mRect;
|
||||
#endif
|
||||
nw4r::math::MTX34 mMtx; // 0x130
|
||||
Destination meDestination; // 0x160
|
||||
tistring::Decolated* mpString; // 0x164
|
||||
@@ -192,6 +315,9 @@ namespace textinput {
|
||||
tistring::WithZi* mpZiString; // 0x16C
|
||||
InputMode meInputMode; // 0x170
|
||||
PredictMode mePredictMode; // 0x174
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
friend class textinput::Manager;
|
||||
#endif
|
||||
bool mbPredictOn; // 0x178
|
||||
bool mbDoWordWrap; // 0x179
|
||||
bool mbRightWithSpace; // 0x17A
|
||||
@@ -227,7 +353,14 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
friend class EventHandler;
|
||||
inline const nw4r::lyt::Pane* getLanguageTextPane() const;
|
||||
#endif
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
LayoutByNW4R(textinput::Manager*, nw4r::lyt::MultiArcResourceAccessor*, const char*, EventObserver*, const char*);
|
||||
#endif
|
||||
~LayoutByNW4R();
|
||||
|
||||
virtual void init();
|
||||
@@ -242,6 +375,9 @@ namespace textinput {
|
||||
|
||||
virtual nw4r::math::VEC2 getScale() const;
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void updateRepeatInput(u32 trig, u32 hold);
|
||||
#endif
|
||||
virtual void updateInputCommon(int chan, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(textinput::input::HKBManager& hkbManager);
|
||||
@@ -252,10 +388,37 @@ namespace textinput {
|
||||
virtual void setRootPaneScaleFor16x9();
|
||||
virtual void setRootPaneScaleFor4x3();
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void onSE(sound::SE seId);
|
||||
#endif
|
||||
|
||||
virtual void visibleSeparator(bool flag);
|
||||
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
const void* mpLayoutData;
|
||||
const void* mpLanguageData;
|
||||
const char* mpFontName;
|
||||
bool mbUpVisible;
|
||||
bool mbDownVisible;
|
||||
bool mbRepeat;
|
||||
nw4rmanager::TiEventHandler* mpInputEventHandler;
|
||||
nw4r::ut::ResFont mFont;
|
||||
int mUpRepeat;
|
||||
int mDownRepeat;
|
||||
int mLeftRepeat;
|
||||
int mRightRepeat;
|
||||
int mDeleteRepeat;
|
||||
int mConfirmRepeat;
|
||||
u32 mRepeatButtons;
|
||||
#else
|
||||
private:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
u8 unk_0x2C0[0x48];
|
||||
#else
|
||||
u8 unk_0x2C0[0x4C];
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
}
|
||||
typedef inputform::LayoutByNW4R InputForm;
|
||||
|
||||
@@ -8,17 +8,50 @@ namespace textinput {
|
||||
|
||||
class KeyboardBase : public CommandSender {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
KeyboardBase() : meLanguage(JP) {}
|
||||
#endif
|
||||
virtual ~KeyboardBase() {}
|
||||
#if !(defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) && !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* alloc) override;
|
||||
virtual void init() override;
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override;
|
||||
virtual void sendCommand(u32 command, void*) override;
|
||||
#endif
|
||||
#endif
|
||||
#if !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void onKey(u32, void*);
|
||||
#else
|
||||
virtual void onKey(u32);
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual u32 getType();
|
||||
#elif (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual int getType();
|
||||
#else
|
||||
virtual void getType();
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual void setLanguage(Language language) { meLanguage = language; }
|
||||
#else
|
||||
virtual void setLanguage(Language language);
|
||||
#endif
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
virtual Language getLanguage() const;
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
virtual void update() {}
|
||||
#else
|
||||
virtual Language getLanguage() const;
|
||||
virtual void update();
|
||||
#endif
|
||||
virtual void onActive();
|
||||
|
||||
protected:
|
||||
|
||||
@@ -19,6 +19,10 @@ namespace textinput {
|
||||
bool isHoldingShift() const {
|
||||
return isHWPressedShift() || isPressedShiftB();
|
||||
}
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
u8 isCapsLock() const { return mbCpasLock; }
|
||||
void setPressedShiftB(bool pressed) { mbPressedShiftB = pressed; }
|
||||
#endif
|
||||
u8 isHWPressedShift() const { return mbPressedShift; }
|
||||
u8 isPressedShiftB() const { return mbPressedShiftB; }
|
||||
void setHWPressedShift(const u8& arg) { mbPressedShift = arg; }
|
||||
|
||||
@@ -28,11 +28,20 @@ namespace textinput {
|
||||
virtual void onEvent(nw4r::lyt::Pane* pane, u32 event) {} // 0x10
|
||||
|
||||
virtual void onSE(sound::SE seId) {}
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void onOK();
|
||||
virtual void onCancel();
|
||||
virtual void onOutOfLength();
|
||||
#else
|
||||
virtual void onOK() { printf("OK!\n"); }
|
||||
virtual void onCancel() { printf("Cancel!\n"); }
|
||||
virtual void onOutOfLength() { printf("OutOfLength\n"); }
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
namespace predictlang { class LayoutByNW4R; }
|
||||
#endif
|
||||
class Manager : public Base {
|
||||
public:
|
||||
Manager(MEMAllocator* allocator, nw4r::lyt::MultiArcResourceAccessor* multiArc, textinput::EventObserver* event);
|
||||
@@ -56,6 +65,9 @@ namespace textinput {
|
||||
|
||||
virtual void setLanguage(Language language);
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
Language getLanguageForMemo() const { return meLanguage; }
|
||||
#endif
|
||||
|
||||
virtual void setDestination(Destination destination);
|
||||
|
||||
@@ -66,19 +78,51 @@ namespace textinput {
|
||||
|
||||
virtual void setAspectRatio(bool b4x3);
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
MEMAllocator* getAllocatorForMemo() const { return mpAllocator; }
|
||||
inputform::EditBuffer* getEditBufferForMemo() const { return mpEditBuffer; }
|
||||
void setEditBufferForMemo(inputform::EditBuffer* editBuffer) { mpEditBuffer = editBuffer; }
|
||||
void setHWKeyboardForMemo(keyboard::hwkey::HWKeyboard* keyboard) { mpHWKeyboard = keyboard; }
|
||||
nw4r::lyt::MultiArcResourceAccessor* getMultiArcForMemo() const { return mpMultiArcResourceAccessor; }
|
||||
EventObserver* getEventObserverForMemo() const { return mpEventObserver; }
|
||||
InputForm* getInputFormForMemo() const { return mpInputForm; }
|
||||
void setInputFormForMemo(InputForm* inputForm) { mpInputForm = inputForm; }
|
||||
toolbar::LayoutByNW4R* getToolBarForMemo() const { return mpToolBar; }
|
||||
candidatebox::LayoutByNW4R* getCandidateBoxForMemo() const { return mpCandidateBox; }
|
||||
void setPCKeyboardForMemo(keyboard::pctype::LayoutByNW4R* keyboard) { mpPCKeyboard = keyboard; }
|
||||
void setCellPhoneKeyboardForMemo(keyboard::cellphonetype::LayoutByNW4R* keyboard) { mpCellPhoneKeyboard = keyboard; }
|
||||
void setCandidateBoxForMemo(candidatebox::LayoutByNW4R* candidateBox) { mpCandidateBox = candidateBox; }
|
||||
void setToolBarForMemo(toolbar::LayoutByNW4R* toolBar) { mpToolBar = toolBar; }
|
||||
void setPredictLanguageDialogForMemo(void* dialog) { mpPredictLanguageDialog = dialog; }
|
||||
void setSignWindowForMemo(void* signWindow) { mpSignWindow = signWindow; }
|
||||
void* getSignWindowForMemo() const { return mpSignWindow; }
|
||||
keyboard::pctype::LayoutByNW4R* getPCKeyboardForMemo() const { return mpPCKeyboard; }
|
||||
keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboardForMemo() const { return mpCellPhoneKeyboard; }
|
||||
Destination getDestinationForMemo() const { return meDestination; }
|
||||
void initAspect();
|
||||
#endif
|
||||
|
||||
virtual void setSecretInputMode(bool secretInputMode) { mpInputForm->setSecretModeOn(secretInputMode); }
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void enableKSXFilter(bool compatibleFilter);
|
||||
#endif
|
||||
|
||||
virtual void setDefaultPredictionJP(int num, const char** predicts);
|
||||
virtual void setFixedPredictionJP(int num, const char** predicts);
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void setTitleText(wchar_t* titleText);
|
||||
void initAspect();
|
||||
#else
|
||||
virtual void setTitleText(const wchar_t* titleText);
|
||||
#endif
|
||||
|
||||
virtual void start() {}
|
||||
virtual void end() {}
|
||||
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
EventObserver* getEventObserverForHardware() const { return mpEventObserver; }
|
||||
#endif
|
||||
virtual InputForm* getInputForm() { return mpInputForm; }
|
||||
virtual const InputForm* getInputForm() const { return mpInputForm; }
|
||||
|
||||
@@ -91,8 +135,13 @@ namespace textinput {
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getSignKeyboard();
|
||||
virtual const void* getSignKeyboard() const;
|
||||
#else
|
||||
virtual void* getSignKeyboard() { return mpSignWindow; }
|
||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||
#endif
|
||||
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
@@ -100,8 +149,13 @@ namespace textinput {
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
virtual const void* getPredictLanguageSelectDialog() const;
|
||||
#else
|
||||
virtual void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
|
||||
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
||||
#endif
|
||||
|
||||
virtual inputform::EditBuffer* createEditBuffer();
|
||||
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();
|
||||
@@ -119,6 +173,10 @@ namespace textinput {
|
||||
void enableCompatibleFilter(bool compatibleFilter);
|
||||
|
||||
bool isVacancy() const;
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
bool isPredictTurning() const;
|
||||
void startPredictTurnOn(bool enabled);
|
||||
#endif
|
||||
|
||||
private:
|
||||
MEMAllocator* mpAllocator; // 0x04
|
||||
@@ -132,9 +190,14 @@ namespace textinput {
|
||||
InputForm* mpInputForm; // 0x1C
|
||||
candidatebox::LayoutByNW4R* mpCandidateBox; // 0x20
|
||||
toolbar::LayoutByNW4R* mpToolBar; // 0x24
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog;
|
||||
keyboard::signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#else
|
||||
void* mpPredictLanguageDialog; // 0x28
|
||||
void* mpSignWindow; // 0x2C
|
||||
|
||||
#endif
|
||||
EventObserver* mpEventObserver; // 0x30
|
||||
|
||||
Destination meDestination; // 0x34
|
||||
|
||||
@@ -14,12 +14,22 @@ namespace textinput {
|
||||
class TiEventHandler : public gui::EventHandler {
|
||||
public:
|
||||
typedef struct Input {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
u32 controller;
|
||||
f32 x;
|
||||
f32 y;
|
||||
u32 trigger;
|
||||
u32 hold;
|
||||
u32 release;
|
||||
u8 remaining[8];
|
||||
#else
|
||||
// todo
|
||||
u32 field_0x00; // 0x00
|
||||
u8 dummy[8];
|
||||
u32 field_0x0C; // 0x0C
|
||||
u32 field_0x10; // 0x10
|
||||
u8 dummy2[12];
|
||||
#endif
|
||||
} Input;
|
||||
|
||||
virtual void onEvent(gui::GUIComponent& comp, u32 event, void* data); // 0x0C
|
||||
@@ -86,11 +96,29 @@ namespace textinput {
|
||||
virtual void init() {} // 0x08
|
||||
virtual void calc(); // 0x0C
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void onAnmEvent(AnmPaneEvent) {}
|
||||
#else
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent);
|
||||
#endif // 0x10
|
||||
|
||||
virtual void changeAnimation(u32 id); // 0x14
|
||||
virtual bool isInAnimation(); // 0x18
|
||||
virtual Anim* searchAnimation(u32 id); // 0x1C
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isInAnimation() { return mpCurrentAnim != NULL; }
|
||||
#else
|
||||
virtual bool isInAnimation();
|
||||
#endif // 0x18
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual Anim* searchAnimation(u32 id) {
|
||||
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
|
||||
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
|
||||
if (animation->muID == id) return animation;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
virtual Anim* searchAnimation(u32 id);
|
||||
#endif // 0x1C
|
||||
|
||||
virtual ~AnmPane(); // 0x20
|
||||
|
||||
@@ -128,6 +156,11 @@ namespace textinput {
|
||||
|
||||
class AnimPaneGroup {
|
||||
public:
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
AnimPaneGroup(nw4r::lyt::Group* group) : mpGroup(group) {
|
||||
nw4r::ut::List_Init(&mAnmPaneList, offsetof(AnmPane, mGroupLink));
|
||||
}
|
||||
#endif
|
||||
virtual void create() {} // 0x08
|
||||
virtual void init() {} // 0x0C
|
||||
|
||||
@@ -181,7 +214,11 @@ namespace textinput {
|
||||
|
||||
virtual nw4r::lyt::Pane* get(int i) { return mpaFifo[i]; } // 0x10
|
||||
virtual nw4r::lyt::Pane* getLast() { // 0x14
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
for (int i = MAX_COUNT-1; i > -1; i--) {
|
||||
#else
|
||||
for (int i = MAX_COUNT-1; i > -1; i++) {
|
||||
#endif
|
||||
if (mpaFifo[i] != NULL) {
|
||||
return mpaFifo[i];
|
||||
}
|
||||
@@ -226,8 +263,16 @@ namespace textinput {
|
||||
|
||||
virtual void setProjectionMtx(); // 0x48
|
||||
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* paneLastDraw); // 0x4C
|
||||
virtual void initPaneLastDrawReceived(); // 0x50
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* pane) { mAnmPaneFifo.push(pane); }
|
||||
#else
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* paneLastDraw);
|
||||
#endif // 0x4C
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void initPaneLastDrawReceived() { mAnmPaneFifo.init(); }
|
||||
#else
|
||||
virtual void initPaneLastDrawReceived();
|
||||
#endif // 0x50
|
||||
|
||||
virtual void setVisible(const char* paneName, bool flag); // 0x54
|
||||
virtual bool isVisible(const char* paneName, bool* result) const; // 0x58
|
||||
|
||||
@@ -1,8 +1,15 @@
|
||||
#ifndef TEXTINPUT_PC_KEYBOARD_H
|
||||
#define TEXTINPUT_PC_KEYBOARD_H
|
||||
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
#include "tiPcKeyboardImpl.h"
|
||||
#else
|
||||
|
||||
#include "tiNw4rManager.h"
|
||||
#include "tiTextInputBase.h"
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
#include "tiKeyboard.h"
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
class Manager;
|
||||
@@ -11,11 +18,29 @@ namespace textinput {
|
||||
|
||||
namespace pctype {
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class UIObj {
|
||||
public:
|
||||
class Listener {
|
||||
public:
|
||||
virtual void onEvent(UIObj*, u32, void*);
|
||||
};
|
||||
};
|
||||
#endif
|
||||
|
||||
// TODO
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class Base : public textinput::keyboard::KeyboardBase {
|
||||
#else
|
||||
class Base : public CommandSender {
|
||||
#endif
|
||||
public:
|
||||
enum TranslateMode {
|
||||
TM_00,
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
TM_Kana,
|
||||
TM_Roman,
|
||||
#endif
|
||||
};
|
||||
|
||||
enum InputType {
|
||||
@@ -26,6 +51,52 @@ namespace textinput {
|
||||
IT_04,
|
||||
};
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
enum InputMode {
|
||||
IM_00,
|
||||
IM_01,
|
||||
IM_02,
|
||||
IM_03,
|
||||
IM_04,
|
||||
};
|
||||
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual u32 getType() override;
|
||||
#else
|
||||
virtual void getType() override;
|
||||
#endif
|
||||
virtual void setLanguage(Language) override;
|
||||
virtual void onActive() override;
|
||||
virtual void inputCharCode(u16);
|
||||
virtual void getState();
|
||||
virtual bool isShiftOn() const;
|
||||
virtual bool isCapsOn() const;
|
||||
virtual bool isABC();
|
||||
virtual void setABC(bool);
|
||||
virtual InputMode getABCInputMode() const;
|
||||
virtual InputMode getAIUInputMode() const;
|
||||
virtual TranslateMode getTranslateMode() const;
|
||||
virtual void setTranslateMode(TranslateMode);
|
||||
virtual void onlyQwerty(bool);
|
||||
virtual void setLangKeyActive(bool);
|
||||
virtual void setInputModeJP(bool, u32, u32);
|
||||
virtual void setInputModeCK(u32);
|
||||
virtual void refreshState();
|
||||
virtual void changeABCInputMode(InputMode);
|
||||
virtual void changeAIUInputMode(InputMode);
|
||||
virtual void onClose();
|
||||
virtual void getWCCode(char*);
|
||||
virtual void getControlKey(char*);
|
||||
virtual void sendInputWChar(u16, bool);
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void updateFixMode();
|
||||
#else
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
@@ -61,17 +132,72 @@ namespace textinput {
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void updateFixMode();
|
||||
#endif
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
private:
|
||||
u8 mKeyboardInputFlags[8];
|
||||
const void* mpKeyStateTable;
|
||||
u32 mTranslateMode;
|
||||
u32 mABCInputMode;
|
||||
u32 mAIUInputMode;
|
||||
u32 mCurrentInputType;
|
||||
u32 mInputState;
|
||||
const void* mpLanguageData;
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
MEMAllocator* mpAllocator;
|
||||
#endif
|
||||
bool mbOnlyQwerty;
|
||||
bool mbLanguageKeyActive;
|
||||
u16 mKeyboardFlags;
|
||||
void* mpInputSettings;
|
||||
void* mpCurrentKeyState;
|
||||
|
||||
public:
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool isQwertyOnly() const { return mbOnlyQwerty; }
|
||||
bool isLanguageKeyActive() const { return mbLanguageKeyActive; }
|
||||
#endif
|
||||
u32 getTranslateModeForMemo() const { return mTranslateMode; }
|
||||
u32 getABCInputModeForMemo() const { return mABCInputMode; }
|
||||
u32 getAIUInputModeForMemo() const { return mAIUInputMode; }
|
||||
#endif
|
||||
};
|
||||
|
||||
// TODO
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
, public UIObj::Listener
|
||||
#endif
|
||||
{
|
||||
public:
|
||||
// TODO - ...
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void draw();
|
||||
virtual void calc();
|
||||
virtual void setPredictLanguageDialog(void*);
|
||||
virtual void setSignWindow(void*);
|
||||
virtual void setLineFeedButton(bool);
|
||||
virtual void setPredictLanguageButton(bool);
|
||||
virtual void setSignWindowButton(bool);
|
||||
#endif
|
||||
virtual void onClose();
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool hasLineFeedButton() const { return mbLineFeedButton; }
|
||||
private:
|
||||
void* mpPredictLanguageDialog;
|
||||
void* mpSignWindow;
|
||||
bool mbLineFeedButton;
|
||||
public:
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
} // namespace pctype
|
||||
@@ -80,4 +206,5 @@ namespace textinput {
|
||||
|
||||
} // namespace textinput
|
||||
|
||||
#endif
|
||||
#endif // TEXTINPUT_HW_KEYBOARD_H
|
||||
|
||||
400
include/keyboard/tiPcKeyboardImpl.h
Normal file
400
include/keyboard/tiPcKeyboardImpl.h
Normal file
@@ -0,0 +1,400 @@
|
||||
#ifndef TEXTINPUT_PC_KEYBOARD_IMPL_H
|
||||
#define TEXTINPUT_PC_KEYBOARD_IMPL_H
|
||||
|
||||
#include "tiKeyboard.h"
|
||||
#include "tiNw4rManager.h"
|
||||
#include "tiPkData.h"
|
||||
|
||||
namespace textinput {
|
||||
class Manager;
|
||||
namespace predictlang {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
namespace keyboard {
|
||||
namespace signwindow {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
}
|
||||
namespace keyboard {
|
||||
namespace signwindow {
|
||||
#ifndef TISIGNWINDOW_IMPLEMENTATION
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
struct LanguageDependencyData;
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
Base(Manager* manager) : mpAllocator(NULL), mpManager(manager) {}
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual int getType();
|
||||
virtual void setLanguage(Language language);
|
||||
virtual bool isLocked();
|
||||
virtual void setPage(u8 page);
|
||||
virtual u8 getPage();
|
||||
virtual void movePrevSignPage();
|
||||
virtual void moveNextSignPage();
|
||||
virtual void close();
|
||||
private:
|
||||
u32 mInputState;
|
||||
const LanguageDependencyData* mpLanguageData;
|
||||
MEMAllocator* mpAllocator;
|
||||
Manager* mpManager;
|
||||
};
|
||||
class EventHandler;
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mbActive(false), mbInput(false), mpEventHandler(NULL), mpCaller(NULL) {}
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual void movePrevSignPage();
|
||||
virtual void moveNextSignPage();
|
||||
virtual void close();
|
||||
virtual void draw();
|
||||
virtual void open(KeyboardBase* keyboard, bool repeat);
|
||||
virtual bool isActive();
|
||||
virtual void onChangeAnmState(AnmEvent event, nw4rmanager::AnmPane* pane, nw4rmanager::Anim* animation);
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(input::HKBManager& hkb);
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void resetAnmSignWindow();
|
||||
virtual void setSignKeyTop(u16 first, u16 count);
|
||||
virtual void setPageNumber(u16 page);
|
||||
virtual void endToClose();
|
||||
virtual void startToInput();
|
||||
virtual void movePrevSignWindow();
|
||||
virtual void moveNextSignWindow();
|
||||
private:
|
||||
bool mbActive;
|
||||
bool mbInput;
|
||||
EventHandler* mpEventHandler;
|
||||
KeyboardBase* mpCaller;
|
||||
};
|
||||
#else
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
virtual bool isLocked();
|
||||
virtual void setPage(u8 page);
|
||||
virtual u8 getPage();
|
||||
virtual void movePrevSignPage();
|
||||
virtual void moveNextSignPage();
|
||||
virtual void close();
|
||||
};
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
virtual void draw();
|
||||
virtual void open(KeyboardBase* keyboard, bool repeat);
|
||||
virtual bool isActive();
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
namespace pctype {
|
||||
|
||||
struct GridKey {
|
||||
char paneName[18];
|
||||
wchar_t codes[4];
|
||||
};
|
||||
struct ControlKey {
|
||||
char paneName[20];
|
||||
u32 key;
|
||||
};
|
||||
struct VisiblePanes {
|
||||
u16 visibleCount;
|
||||
u16 hiddenCount;
|
||||
const char* visible[24];
|
||||
const char* hidden[24];
|
||||
};
|
||||
struct Ablaut {
|
||||
wchar_t code;
|
||||
wchar_t alternatives[7];
|
||||
};
|
||||
struct LanguageData {
|
||||
const PaneNameToCharCodeWithModeAscii* ascii;
|
||||
const GridKey* grid;
|
||||
const ControlKey* controls;
|
||||
const VisiblePanes* panes;
|
||||
const Ablaut* ablaut;
|
||||
};
|
||||
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
enum TranslateMode {
|
||||
TM_Direct,
|
||||
TM_Roman,
|
||||
TM_Kana
|
||||
};
|
||||
enum InputMode {
|
||||
IM_Direct,
|
||||
IM_01,
|
||||
IM_02,
|
||||
IM_03,
|
||||
IM_04,
|
||||
IM_05,
|
||||
IM_Hiragana,
|
||||
IM_Katakana
|
||||
};
|
||||
enum InputType {
|
||||
IT_00,
|
||||
IT_01,
|
||||
IT_02,
|
||||
IT_03,
|
||||
IT_04
|
||||
};
|
||||
struct State {
|
||||
bool rejected;
|
||||
u8 inputFlags[7];
|
||||
};
|
||||
class KeyState {
|
||||
public:
|
||||
void refresh_();
|
||||
void refreshText(nw4r::lyt::Pane* root);
|
||||
void setABCFlag(u32 flags);
|
||||
u32 getABCFlag() const { return abcFlags & ~15; }
|
||||
u32 getABCMode() const { return abcFlags & 15; }
|
||||
wchar_t getWCCode(u32 index);
|
||||
wchar_t getWCCode(char* paneName) NO_INLINE;
|
||||
void setABCMode(u32 mode) {
|
||||
if ((abcFlags & 15) != mode) {
|
||||
abcFlags = (abcFlags & ~15) | (mode & 15);
|
||||
refresh_();
|
||||
}
|
||||
}
|
||||
void setAIUMode(u32 mode) {
|
||||
if ((aiuFlags & 15) != mode) {
|
||||
aiuFlags = (aiuFlags & ~15) | (mode & 15);
|
||||
refresh_();
|
||||
}
|
||||
}
|
||||
u32 abcFlags;
|
||||
u32 inputType;
|
||||
u32 aiuFlags;
|
||||
Language language;
|
||||
const LanguageData* data;
|
||||
Base* owner;
|
||||
};
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Base(Manager* manager) {
|
||||
mKeyState.abcFlags = 0;
|
||||
mKeyState.inputType = 0;
|
||||
mKeyState.aiuFlags = 0;
|
||||
mKeyState.language = USA;
|
||||
mKeyState.data = NULL;
|
||||
mKeyState.owner = this;
|
||||
mpAllocator = NULL;
|
||||
mbOnlyQwerty = false;
|
||||
mpManager = manager;
|
||||
}
|
||||
#endif
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual inline void init();
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual int getType();
|
||||
virtual void setLanguage(Language language);
|
||||
virtual void onActive();
|
||||
virtual void inputCharCode(wchar_t code);
|
||||
virtual State* getState();
|
||||
virtual bool isShiftOn() const;
|
||||
virtual bool isCapsOn() const;
|
||||
virtual bool isABC();
|
||||
virtual void setABC(bool abc);
|
||||
virtual InputMode getABCInputMode() const;
|
||||
virtual InputMode getAIUInputMode() const;
|
||||
virtual TranslateMode getTranslateMode() const;
|
||||
virtual void setTranslateMode(TranslateMode mode);
|
||||
virtual void onlyQwerty(bool only);
|
||||
virtual void setLangKeyActive(bool active);
|
||||
virtual void setInputModeJP(bool, u32, u32);
|
||||
virtual void setInputModeCK(u32);
|
||||
virtual void refreshState();
|
||||
virtual void changeABCInputMode(InputMode mode);
|
||||
virtual void changeAIUInputMode(InputMode mode);
|
||||
virtual void onClose();
|
||||
virtual wchar_t getWCCode(char* paneName);
|
||||
virtual u32 getControlKey(char* paneName);
|
||||
virtual void sendInputWChar(wchar_t code, bool repeat);
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void updateFixMode();
|
||||
|
||||
protected:
|
||||
State mState;
|
||||
const LanguageData* mpInitialLanguageData;
|
||||
KeyState mKeyState;
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
public:
|
||||
KeyState& hardwareKeyState() { return mKeyState; }
|
||||
bool hardwareLanguageKeyActive() const { return mbLanguageKeyActive; }
|
||||
protected:
|
||||
#endif
|
||||
MEMAllocator* mpAllocator;
|
||||
bool mbOnlyQwerty;
|
||||
bool mbLanguageKeyActive;
|
||||
Manager* mpManager;
|
||||
};
|
||||
|
||||
class LayoutByNW4R;
|
||||
class AnmPane;
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpKeyboard(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent* component, u32 event, Input* input);
|
||||
|
||||
private:
|
||||
LayoutByNW4R* mpKeyboard;
|
||||
};
|
||||
class UIObj : public gui::EventHandler {
|
||||
public:
|
||||
class Listener {
|
||||
public:
|
||||
virtual void onEvent(UIObj*, u32, void*) = 0;
|
||||
};
|
||||
UIObj(u32 id, LayoutByNW4R* layout, Listener* listener) : mId(id), mpLayout(layout), mpListener(listener) {}
|
||||
virtual ~UIObj();
|
||||
virtual void onEvent(gui::GUIComponent& component, u32 event, void* data);
|
||||
virtual void onGUIEvent(gui::PaneComponent& component, u32 event, nw4rmanager::TiEventHandler::Input* input);
|
||||
|
||||
protected:
|
||||
u32 mId;
|
||||
LayoutByNW4R* mpLayout;
|
||||
Listener* mpListener;
|
||||
};
|
||||
class UIModifierButton : public UIObj {
|
||||
public:
|
||||
UIModifierButton(u32 id, LayoutByNW4R* layout, Listener* listener);
|
||||
inline void Create(nw4rmanager::Layout* layout, const char* pane, const char* bounding);
|
||||
inline void SetState(bool enabled, u32 inactiveAnimation);
|
||||
virtual ~UIModifierButton();
|
||||
virtual void onGUIEvent(gui::PaneComponent& component, u32 event, nw4rmanager::TiEventHandler::Input* input);
|
||||
gui::PaneComponent* mpPaneComponent;
|
||||
gui::PaneComponent* mpBoundingComponent;
|
||||
AnmPane* mpAnimation;
|
||||
bool mbOn;
|
||||
};
|
||||
class UIModePanel : public UIObj {
|
||||
public:
|
||||
UIModePanel(u32 id, LayoutByNW4R* layout, Listener* listener);
|
||||
virtual ~UIModePanel();
|
||||
virtual void onGUIEvent(gui::PaneComponent& component, u32 event, nw4rmanager::TiEventHandler::Input* input);
|
||||
void Create(nw4rmanager::Layout* layout);
|
||||
u32 mMode;
|
||||
gui::PaneComponent* mpPaneComponents[5];
|
||||
gui::PaneComponent* mpBoundingComponents[5];
|
||||
AnmPane* mpAnimations[5];
|
||||
nw4r::lyt::Pane* mpEnglishText;
|
||||
nw4r::lyt::Pane* mpHangulText;
|
||||
nw4r::lyt::Pane* mpModeSelect;
|
||||
GXTexObj mDirectTexture;
|
||||
GXTexObj mPinyinTexture;
|
||||
GXTexObj mEnglishTexture;
|
||||
GXTexObj mHangulTexture;
|
||||
};
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public UIObj::Listener {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpKeyboardEventHandler(NULL),
|
||||
mShiftButton(1, this, this), mCapsButton(0, this, this), mModePanel(2, this, this) {}
|
||||
#endif
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual void setLanguage(Language language);
|
||||
virtual void onActive();
|
||||
virtual void inputCharCode(wchar_t code);
|
||||
virtual void setABC(bool abc);
|
||||
virtual void setTranslateMode(TranslateMode mode);
|
||||
virtual void onlyQwerty(bool only);
|
||||
virtual void setLangKeyActive(bool active);
|
||||
virtual void setInputModeJP(bool abc, u32 abcMode, u32 aiuMode);
|
||||
virtual void setInputModeCK(u32 mode);
|
||||
virtual void refreshState();
|
||||
virtual void onClose();
|
||||
virtual void sendInputWChar(wchar_t code, bool repeat);
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void draw();
|
||||
virtual void calc();
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R* dialog);
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R* window);
|
||||
virtual void setLineFeedButton(bool visible);
|
||||
virtual void setPredictLanguageButton(bool visible);
|
||||
virtual void setSignWindowButton(bool visible);
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(input::HKBManager& hkb);
|
||||
virtual void changeAnimationAllToNormal();
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void cancelStateFocusIn();
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
|
||||
virtual void updateDakuten();
|
||||
virtual void initLayout();
|
||||
virtual void onEvent(UIObj* object, u32 event, void* data);
|
||||
void onPressedCaps();
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
void createAnmPane_(MEMAllocator* allocator);
|
||||
|
||||
private:
|
||||
EventHandler* mpKeyboardEventHandler;
|
||||
predictlang::LayoutByNW4R* mpPredictDialog;
|
||||
signwindow::LayoutByNW4R* mpSignWindow;
|
||||
bool mbLineFeed;
|
||||
UIModifierButton mShiftButton;
|
||||
UIModifierButton mCapsButton;
|
||||
UIModePanel mModePanel;
|
||||
};
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer), mAnimation(0) {}
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 animation);
|
||||
virtual ~AnmPane();
|
||||
virtual int getState() const { return mAnimation; }
|
||||
virtual int getKeyType() const { return mKeyType; }
|
||||
|
||||
protected:
|
||||
int mAnimation;
|
||||
int mKeyType;
|
||||
};
|
||||
class NormalButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
NormalButtonAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) { mKeyType = 0; }
|
||||
virtual ~NormalButtonAnmPane();
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
};
|
||||
class ShiftCapsAnmPane : public AnmPane {
|
||||
public:
|
||||
ShiftCapsAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer), mbOn(false) { mKeyType = 1; }
|
||||
virtual ~ShiftCapsAnmPane();
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
bool isFocused() const;
|
||||
|
||||
private:
|
||||
bool mbOn;
|
||||
};
|
||||
class ToggleButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
ToggleButtonAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) { mKeyType = 2; }
|
||||
virtual ~ToggleButtonAnmPane();
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
};
|
||||
class OnOffButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
OnOffButtonAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) { mKeyType = 3; }
|
||||
virtual ~OnOffButtonAnmPane();
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -14,11 +14,17 @@ namespace textinput {
|
||||
|
||||
class Base : public CommandSender {
|
||||
public:
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
#if defined(TI_PREDICTLANG_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
Base(Manager* manager) : mePredictMode(inputform::Base::PM_USEn), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual ~Base();
|
||||
virtual void init();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
#else
|
||||
virtual void create(MEMAllocator* allocator) override { mpAllocator = allocator; }
|
||||
#endif
|
||||
virtual void setPredictMode(inputform::Base::PredictMode mode) { mePredictMode = mode; }
|
||||
|
||||
protected:
|
||||
@@ -32,7 +38,11 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, layoutName, observer), mbActive(false), mbInput(false),
|
||||
mpEventHandler(NULL), meDestination(DST_US), mpCaller(NULL) {}
|
||||
#elif defined(TI_PREDICTLANG_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_prdicSelWidw_a.brlyt", observer), mbActive(false), mbInput(false),
|
||||
mpEventHandler(NULL), meDestination(DST_US), mpCaller(NULL) {}
|
||||
@@ -68,12 +78,21 @@ namespace textinput {
|
||||
keyboard::KeyboardBase* mpCaller; // 0xD4
|
||||
};
|
||||
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
#if defined(TI_PREDICTLANG_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: LayoutByNW4R(manager, resAccessor, observer, layoutName) {}
|
||||
#else
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
#endif
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual ~Sample();
|
||||
#else
|
||||
virtual ~Sample() {}
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
134
include/keyboard/tiSignWindow.h
Normal file
134
include/keyboard/tiSignWindow.h
Normal file
@@ -0,0 +1,134 @@
|
||||
#ifndef TEXTINPUT_SIGN_WINDOW_H
|
||||
#define TEXTINPUT_SIGN_WINDOW_H
|
||||
|
||||
#include "tiKeyboard.h"
|
||||
#include "tiNw4rManager.h"
|
||||
#include "tiSwData.h"
|
||||
|
||||
namespace textinput {
|
||||
class Manager;
|
||||
namespace keyboard {
|
||||
|
||||
namespace signwindow {
|
||||
|
||||
struct LanguageDependency {
|
||||
u8 count;
|
||||
const PaneNameToCharCodeInSignMode* keys;
|
||||
};
|
||||
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator*) override;
|
||||
virtual void init() override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
virtual bool isLocked();
|
||||
virtual void setPage(u8);
|
||||
virtual u8 getPage();
|
||||
virtual void movePrevSignPage();
|
||||
virtual void moveNextSignPage();
|
||||
virtual void close();
|
||||
virtual int getType() override;
|
||||
virtual void setLanguage(Language) override;
|
||||
|
||||
protected:
|
||||
u8 mInputFlags;
|
||||
bool mbLocked;
|
||||
bool mbRepeat;
|
||||
u8 muPage;
|
||||
const LanguageDependency* mpLanguageDependency;
|
||||
MEMAllocator* mpAllocator;
|
||||
Manager* mpManager;
|
||||
};
|
||||
|
||||
class EventHandler;
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator*) override;
|
||||
virtual void init() override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
virtual void movePrevSignPage() override;
|
||||
virtual void moveNextSignPage() override;
|
||||
virtual void close() override;
|
||||
virtual void draw() override;
|
||||
virtual void open(KeyboardBase*, bool);
|
||||
virtual bool isActive();
|
||||
virtual void onChangeAnmState(AnmEvent, nw4rmanager::AnmPane*, nw4rmanager::Anim*) override;
|
||||
virtual bool updateInput(int, f32, f32, u32, u32, u32, void*) override;
|
||||
virtual bool updateInput(input::HKBManager&) override;
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void resetAnmSignWindow();
|
||||
virtual void setSignKeyTop(u16, u16);
|
||||
virtual void setPageNumber(u16);
|
||||
virtual void endToClose();
|
||||
virtual void startToInput();
|
||||
virtual void movePrevSignWindow();
|
||||
virtual void moveNextSignWindow();
|
||||
|
||||
bool mbActive;
|
||||
bool mbInput;
|
||||
EventHandler* mpEventHandler;
|
||||
KeyboardBase* mpKeyboard;
|
||||
};
|
||||
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
virtual ~Sample();
|
||||
};
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
explicit EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*) override;
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
};
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: nw4rmanager::AnmPane(pane, observer), muAnimation(0) {}
|
||||
inline virtual ~AnmPane();
|
||||
virtual void init() override;
|
||||
virtual void changeAnimation(u32) override;
|
||||
virtual u32 getKeyType() const;
|
||||
|
||||
protected:
|
||||
s32 muAnimation;
|
||||
u32 muKeyType;
|
||||
};
|
||||
|
||||
class CellPhoneSignAllAnmPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignAllAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 0; }
|
||||
virtual ~CellPhoneSignAllAnmPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
class CellPhoneSignScrollAnmPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignScrollAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 1; }
|
||||
virtual ~CellPhoneSignScrollAnmPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
class CellPhoneSignButtonPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignButtonPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 2; }
|
||||
virtual ~CellPhoneSignButtonPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -3,6 +3,9 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
#include <revolution/mem/allocator.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
#include <revolution/kpr.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace tistring {
|
||||
@@ -36,12 +39,20 @@ namespace textinput {
|
||||
virtual wchar_t* getWCString() const { return mpszString; }
|
||||
|
||||
virtual void setCandidate(wchar_t candidate) { mwcCandidate = candidate; }
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
virtual wchar_t getCandidate() const { return mwcCandidate; }
|
||||
#else
|
||||
virtual wchar_t getCandidate() { return mwcCandidate; }
|
||||
#endif
|
||||
virtual bool hasCandidate() const;
|
||||
|
||||
virtual wchar_t getLastWChar();
|
||||
|
||||
#if defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
u16 muMaxLength; // 0x04
|
||||
u16 muLength; // 0x06
|
||||
|
||||
@@ -54,14 +65,71 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class KanaStream {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
public:
|
||||
KPRQueue mQueue;
|
||||
wchar_t mPending;
|
||||
wchar_t mOutput[5];
|
||||
#else
|
||||
private:
|
||||
u8 field_0x00[0x24];
|
||||
#endif
|
||||
};
|
||||
|
||||
class Decolated : public StringBase {
|
||||
public:
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(false), mTranslateMode(0) { initKanaConverter(); }
|
||||
#else
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), field_0x18(0), field_0x1C(0), field_0x20(0), field_0x24(0) { initKanaConverter(); }
|
||||
#endif
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
virtual ~Decolated();
|
||||
enum TranslateMode { TM_Direct, TM_Kana, TM_Roman, TM_Hangul };
|
||||
virtual void clear();
|
||||
virtual void set(const wchar_t* string);
|
||||
virtual void setLength(u16 length);
|
||||
void setTranslateMode(TranslateMode mode);
|
||||
TranslateMode getTranslateMode() const { return static_cast<TranslateMode>(mTranslateMode); }
|
||||
void inputString(const wchar_t* string, TranslateMode mode);
|
||||
virtual void inputChar(wchar_t ch);
|
||||
virtual void inputString(const wchar_t* string);
|
||||
virtual void deleteChar();
|
||||
virtual void backSpace();
|
||||
virtual void confirm(const wchar_t* string);
|
||||
virtual bool moveCursorRight();
|
||||
virtual bool moveCursorLeft();
|
||||
virtual void setCursorPos(u32 pos);
|
||||
virtual void onSustain();
|
||||
virtual void offSustain();
|
||||
virtual bool isOnSustain();
|
||||
virtual u32 getCursorPos() const;
|
||||
virtual void getCursorPos(u32* start, u32* end);
|
||||
virtual bool canBackSpace();
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
virtual bool deleteForward();
|
||||
#else
|
||||
virtual void deleteForward();
|
||||
#endif
|
||||
virtual void getSelected(u32& start, u32& end);
|
||||
virtual wchar_t getWCharAtCursor();
|
||||
virtual void replaceAtCursor(wchar_t ch);
|
||||
virtual bool isDakuten();
|
||||
virtual void converDakuten();
|
||||
virtual bool isHandaku();
|
||||
virtual void converHandaku();
|
||||
virtual void convertAll();
|
||||
virtual bool isSmall();
|
||||
virtual void converSmall();
|
||||
virtual bool atTheBeginningOfASentence();
|
||||
virtual void initKanaConverter();
|
||||
virtual wchar_t* getKanaBuffer();
|
||||
virtual bool isKanaFix() const;
|
||||
virtual void confirmKana();
|
||||
virtual void clearKana();
|
||||
virtual void EnableKSXFilter(bool enable);
|
||||
#else
|
||||
virtual void inputChar();
|
||||
virtual void inputString();
|
||||
virtual void deleteChar();
|
||||
@@ -95,15 +163,84 @@ namespace textinput {
|
||||
virtual void clearKana();
|
||||
virtual void EnableKSXFilter();
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
u32 mCursorStart;
|
||||
u32 mCursorEnd;
|
||||
#if defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
u8 mbSustain;
|
||||
s32 mTranslateMode;
|
||||
#else
|
||||
bool mbSustain;
|
||||
u32 mTranslateMode;
|
||||
#endif
|
||||
#else
|
||||
u32 field_0x18; // 0x18
|
||||
u32 field_0x1C; // 0x1C
|
||||
u8 field_0x20; // 0x20
|
||||
u32 field_0x24; // 0x24
|
||||
#endif
|
||||
KanaStream mKanaStream; // 0x28
|
||||
};
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
class WithAtok : public Decolated {
|
||||
public:
|
||||
WithAtok(u16 maxLength) : Decolated(maxLength) {}
|
||||
virtual ~WithAtok();
|
||||
virtual void pushBack(wchar_t ch);
|
||||
virtual void popBack();
|
||||
virtual void inputChar(wchar_t ch);
|
||||
virtual void backSpace();
|
||||
virtual void confirm(const wchar_t* string);
|
||||
virtual bool moveCursorRight();
|
||||
virtual bool moveCursorLeft();
|
||||
virtual void getCursorPos(u32* start, u32* end);
|
||||
struct DrawInfo {
|
||||
const wchar_t* string;
|
||||
u32 start;
|
||||
u32 end;
|
||||
u32 selectedStart;
|
||||
u32 selectedEnd;
|
||||
};
|
||||
virtual bool isFix();
|
||||
virtual void setFix(bool fix);
|
||||
virtual void initConverting();
|
||||
virtual bool isConverting();
|
||||
virtual wchar_t* getConfirmedWCString() const;
|
||||
virtual int getCurrentNumPredicted();
|
||||
virtual void getPredicted(int index, wchar_t* string);
|
||||
virtual void commitPredicted(int index);
|
||||
virtual void setSelectedCandidate(s32 index);
|
||||
virtual bool isCandidateSelected();
|
||||
virtual s32 getSelectedCandidate();
|
||||
virtual void init();
|
||||
virtual void setInputting(wchar_t ch);
|
||||
virtual void getDrawString(DrawInfo& info);
|
||||
virtual void openDictionary(void* atok, int atokSize, void* apot, int apotSize, void* nintendo, int nintendoSize);
|
||||
virtual void closeDictionary();
|
||||
virtual bool hasConfirmedString();
|
||||
virtual void enableConfirmedString(bool enable);
|
||||
virtual void startConverting();
|
||||
virtual bool isDictionaryOpened();
|
||||
virtual void changeKanaMode(bool kana);
|
||||
virtual wchar_t getInputStringLength();
|
||||
virtual void resetRelation();
|
||||
virtual void setFixMode(bool fixed);
|
||||
virtual void setFixPrediction(int count, const char** predictions);
|
||||
virtual void setDefaultPrediction(int count, const char** predictions);
|
||||
virtual s16 getSelectedConverting();
|
||||
virtual s32 getFixedPredictionNum();
|
||||
};
|
||||
#else
|
||||
class WithAtok : public StringBase {};
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,10 +6,17 @@
|
||||
|
||||
#include <nw4r/ut/CharWriter.h>
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace textdrawer {
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
class Base : public nw4r::ut::CharWriter {
|
||||
#else
|
||||
class Base : nw4r::ut::CharWriter {
|
||||
#endif
|
||||
public:
|
||||
typedef struct ViewPort {
|
||||
f32 xOrig; // 0x00
|
||||
@@ -27,9 +34,23 @@ namespace textinput {
|
||||
} CursorPos;
|
||||
|
||||
typedef struct DrawInfo {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
u8 unk_0x00[32];
|
||||
#endif
|
||||
} DrawInfo;
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
Base() : mpDrawAllocator(NULL), mfViewX(0.0f), mfViewY(0.0f), mfViewWidth(0.0f), mfViewHeight(0.0f),
|
||||
mfVIWidth(640.0f), mbAspect4x3(false), mbDrawClipped(false), muLine(0), mfLineSpacing(0.0f),
|
||||
mfCharacterSpacing(0.0f), mfFontWidth(0.0f), mfFontHeight(0.0f), mfModifyStartY(0.0f), mfMinScrollY(0.0f),
|
||||
muDrawStartPos(0), muDrawEndPos(65535), mbSecretMode(false), muDrawModifyStartLine(0), muDrawModifyEndLine(0),
|
||||
muDrawModifyStartPos(0), muDrawModifyEndPos(0), muCachedStartPos(0), muCachedEndPos(0), mbDrawCache(false),
|
||||
mfCachedCursorX(0.0f), mfCachedCursorY(0.0f), mfDrawScrollY(0.0f), muCachedCursorPosition(0),
|
||||
mbCursorCache(false), mbMaintainCursorCache(true) { memset(&mCachedCursor, 0, sizeof(mCachedCursor)); }
|
||||
#endif
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void draw(CursorPos* cursorPos);
|
||||
virtual void draw();
|
||||
@@ -73,20 +94,116 @@ namespace textinput {
|
||||
virtual u32 getEndPos() const;
|
||||
|
||||
// todo
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
|
||||
#else
|
||||
virtual void setDrawModifyScopeLine();
|
||||
virtual void setDrawCacheScopeLine();
|
||||
virtual void modifyCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool isEnableCursorCache() const;
|
||||
#else
|
||||
virtual void isEnableCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual u32 getDrawModifyStartLine() const;
|
||||
virtual u32 getDrawModifyEndLine() const;
|
||||
#else
|
||||
virtual void getDrawModifyStartLine();
|
||||
virtual void getDrawModifyEndLine();
|
||||
#endif
|
||||
virtual u32 getDrawCacheStartPos() const;
|
||||
virtual void dirtyDrawCache();
|
||||
virtual void dirtyCursorCache();
|
||||
|
||||
#ifdef TITEXTDRAWER_IMPLEMENTATION
|
||||
protected:
|
||||
const wchar_t* mpDrawString;
|
||||
ViewPort mSavedViewport;
|
||||
f32 mSavedProjection[7];
|
||||
nw4r::ut::Rect mProjectionRect;
|
||||
f32 mfVIWidth;
|
||||
bool mbAspect4x3;
|
||||
bool mbDrawClipped;
|
||||
s32 muLine;
|
||||
f32 mfLineSpacing;
|
||||
f32 mfCharacterSpacing;
|
||||
f32 mfFontWidth;
|
||||
f32 mfFontHeight;
|
||||
f32 mfModifyStartY;
|
||||
f32 mfMinScrollY;
|
||||
u32 muDrawStartPos;
|
||||
u32 muDrawEndPos;
|
||||
u32 muDrawCacheStartPos;
|
||||
bool mbSecretMode;
|
||||
s32 muDrawModifyStartLine;
|
||||
s32 muDrawModifyEndLine;
|
||||
s32 muDrawModifyStartPos;
|
||||
s32 muDrawModifyEndPos;
|
||||
u32 muCachedStartPos;
|
||||
u32 muCachedEndPos;
|
||||
bool mbDrawCache;
|
||||
f32 mfCachedCursorX;
|
||||
f32 mfCachedCursorY;
|
||||
f32 mfDrawScrollY;
|
||||
s32 mnCachedCursorLine;
|
||||
CursorPos mCachedCursor;
|
||||
bool mbCursorCache;
|
||||
bool mbMaintainCursorCache;
|
||||
#else
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
MEMAllocator* mpDrawAllocator;
|
||||
u8 mDrawConfiguration[0x34];
|
||||
f32 mfViewX;
|
||||
f32 mfViewY;
|
||||
f32 mfViewWidth;
|
||||
f32 mfViewHeight;
|
||||
f32 mfVIWidth;
|
||||
bool mbAspect4x3;
|
||||
bool mbDrawClipped;
|
||||
u32 muLine;
|
||||
f32 mfLineSpacing;
|
||||
f32 mfCharacterSpacing;
|
||||
f32 mfFontWidth;
|
||||
f32 mfFontHeight;
|
||||
f32 mfModifyStartY;
|
||||
f32 mfMinScrollY;
|
||||
u32 muDrawStartPos;
|
||||
u32 muDrawEndPos;
|
||||
u32 muDrawCacheStartPos;
|
||||
#else
|
||||
private:
|
||||
u8 unk_0x50[0x78];
|
||||
#endif
|
||||
bool mbSecretMode; // 0xC8
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
u32 muDrawModifyStartLine;
|
||||
u32 muDrawModifyEndLine;
|
||||
u32 muDrawModifyStartPos;
|
||||
u32 muDrawModifyEndPos;
|
||||
u32 muCachedStartPos;
|
||||
u32 muCachedEndPos;
|
||||
bool mbDrawCache;
|
||||
f32 mfCachedCursorX;
|
||||
f32 mfCachedCursorY;
|
||||
f32 mfDrawScrollY;
|
||||
u32 muCachedCursorPosition;
|
||||
CursorPos mCachedCursor;
|
||||
bool mbCursorCache;
|
||||
bool mbMaintainCursorCache;
|
||||
#elif defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
u8 mDrawState[0x27];
|
||||
f32 mfDrawScrollY;
|
||||
u8 mDrawCacheState[0x14];
|
||||
#else
|
||||
u8 unk_0xCC[0x3C];
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,6 +39,10 @@ namespace textinput {
|
||||
f32 y; // 0x08
|
||||
} Scroll;
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
enum HVKCode { HVK_None = 0 };
|
||||
#endif
|
||||
|
||||
class Base {
|
||||
public :
|
||||
virtual ~Base() {}
|
||||
@@ -50,11 +54,28 @@ namespace textinput {
|
||||
class CommandSender;
|
||||
class CommandReceiver : public Base {
|
||||
public:
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
struct ChangePredictMode;
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
CommandReceiver() { clearSender(); }
|
||||
virtual ~CommandReceiver();
|
||||
#endif
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
struct Scroll {
|
||||
bool absY;
|
||||
f32 x;
|
||||
f32 y;
|
||||
};
|
||||
#endif
|
||||
typedef enum INPUT_COMMAND {
|
||||
INPUT_COMMAND_0 = 0,
|
||||
INPUT_COMMAND_37 = 37,
|
||||
} INPUT_COMMAND;
|
||||
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
struct ChangePredictMode { u32 mode; bool enabled; };
|
||||
#endif
|
||||
virtual void clearSender();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
virtual void addSender(CommandSender* cmdSend);
|
||||
@@ -68,7 +89,13 @@ namespace textinput {
|
||||
CommandSender() : mpCommandReceiver(NULL) {}
|
||||
|
||||
virtual void setCommandReceiver(CommandReceiver* cmdRecv);
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual void sendCommand(u32 command, void* data) {
|
||||
if (mpCommandReceiver != NULL) mpCommandReceiver->onCommand(static_cast<CommandReceiver::INPUT_COMMAND>(command), data);
|
||||
}
|
||||
#else
|
||||
virtual void sendCommand(u32, void*);
|
||||
#endif
|
||||
virtual void updateFromReceiver(u32, void*) {}
|
||||
|
||||
nw4r::ut::Link mLink; // 0x00
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace textinput {
|
||||
namespace toolbar {
|
||||
class Base {
|
||||
public:
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
#if defined(TI_TOOLBAR_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
Base(Manager* manager) : mQwerty(true), meLanguage(USA), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
@@ -35,7 +35,11 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, layoutName, observer), mpEventHandler(NULL),
|
||||
mbIsEnableQwertyChg(false) {}
|
||||
#elif defined(TI_TOOLBAR_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_toolbar_a.brlyt", observer), mpEventHandler(NULL),
|
||||
mbIsEnableQwertyChg(false) {}
|
||||
@@ -52,10 +56,19 @@ namespace textinput {
|
||||
virtual void onOK();
|
||||
virtual void onCancel();
|
||||
virtual void setQwertyWithSE(bool qwerty);
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual bool isEnableKeytopChange() const { return mbIsEnableQwertyChg; }
|
||||
#else
|
||||
virtual bool isEnableKeytopChange() const;
|
||||
#endif
|
||||
virtual void enableKeytopChange(bool enable);
|
||||
#ifdef MYTIMANAGER_MATCHING
|
||||
virtual nw4r::lyt::Pane* getDownArea();
|
||||
virtual nw4r::lyt::Pane* getUpArea();
|
||||
#else
|
||||
virtual nw4r::lyt::Pane* getUpArea();
|
||||
virtual nw4r::lyt::Pane* getDownArea();
|
||||
#endif
|
||||
virtual void setOKButtonVisible(bool visible);
|
||||
virtual void setCancelButtonVisible(bool visible);
|
||||
virtual void setOKButtonCaption(const wchar_t* caption);
|
||||
@@ -117,12 +130,21 @@ namespace textinput {
|
||||
KeyType meKeyType; // 0x30
|
||||
};
|
||||
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
#if defined(TI_TOOLBAR_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: LayoutByNW4R(manager, resAccessor, observer, layoutName) {}
|
||||
#else
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
#endif
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual ~Sample();
|
||||
#else
|
||||
virtual ~Sample() {}
|
||||
#endif
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
|
||||
namespace textinput {
|
||||
namespace util {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
wchar_t HankakuToZenkaku(wchar_t ch);
|
||||
#endif
|
||||
wchar_t toWLower(wchar_t ch);
|
||||
wchar_t toWUpper(wchar_t ch);
|
||||
|
||||
@@ -17,9 +20,15 @@ namespace textinput {
|
||||
wchar_t KBD_ConvertSmall(wchar_t ch);
|
||||
wchar_t KBD_ConvertAll(wchar_t ch);
|
||||
|
||||
#ifdef TISTRING_IMPLEMENTATION
|
||||
u32 KBD_IsDakuten(wchar_t ch);
|
||||
u32 KBD_IsHandaku(wchar_t ch);
|
||||
u32 KBD_IsSmall(wchar_t ch);
|
||||
#else
|
||||
bool KBD_IsDakuten(wchar_t ch);
|
||||
bool KBD_IsHandaku(wchar_t ch);
|
||||
bool KBD_IsSmall(wchar_t ch);
|
||||
#endif
|
||||
|
||||
bool strcmp(const char* s1, const char* s2);
|
||||
void replaceChar(char* dest, u32 destLen, const char* src, int replaceIdx, char newCh);
|
||||
@@ -46,7 +55,11 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*); // 0x08
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
#endif // 0x08
|
||||
virtual void calc(); // 0x0C
|
||||
virtual f32 getValue(); // 0x10
|
||||
virtual bool isActive(); // 0x14
|
||||
|
||||
@@ -1,14 +1,159 @@
|
||||
#ifndef TEXTINPUT_ZI_STRING_H
|
||||
#define TEXTINPUT_ZI_STRING_H
|
||||
|
||||
#if defined(TIZISTRING_IMPLEMENTATION)
|
||||
#include "tiString.h"
|
||||
extern "C" {
|
||||
#include <eztx.h>
|
||||
}
|
||||
#elif defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#include "tiString.h"
|
||||
#include <eztx.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace tistring {
|
||||
#if defined(TIZISTRING_IMPLEMENTATION)
|
||||
class WithZi : public Decolated {
|
||||
public:
|
||||
enum PredictLanguage {
|
||||
PL_0,
|
||||
PL_1,
|
||||
PL_2,
|
||||
PL_3,
|
||||
PL_4,
|
||||
PL_5,
|
||||
PL_6,
|
||||
PL_7,
|
||||
PL_8,
|
||||
PL_9,
|
||||
PL_10,
|
||||
PL_11
|
||||
};
|
||||
|
||||
enum LetterMode {
|
||||
LM_0,
|
||||
LM_1,
|
||||
LM_2,
|
||||
LM_3
|
||||
};
|
||||
|
||||
static u16 ElementBuffer[0x100];
|
||||
static u16 CandidatesBuffer[0x300];
|
||||
static u16 CandidatedWord[0xa00];
|
||||
static u16 LatestWord[0x40];
|
||||
|
||||
virtual ~WithZi();
|
||||
virtual void create(MEMAllocator*);
|
||||
virtual void pushBack(wchar_t);
|
||||
virtual void popBack();
|
||||
virtual void clear();
|
||||
virtual void inputChar(wchar_t);
|
||||
virtual void backSpace();
|
||||
virtual void confirm(const wchar_t*);
|
||||
virtual bool moveCursorRight();
|
||||
virtual bool moveCursorLeft();
|
||||
virtual bool canBackSpace();
|
||||
virtual void EnableKSXFilter(bool);
|
||||
virtual void init();
|
||||
virtual void setInputting(wchar_t);
|
||||
virtual u32 getCurrentNumPredicted();
|
||||
virtual void getPredicted(int, wchar_t*);
|
||||
virtual wchar_t* getCurrentSelected();
|
||||
virtual u16 getInputStringLength();
|
||||
virtual void setSelectedCandidate(s32);
|
||||
virtual bool isFix();
|
||||
virtual void setPredictLaunguage(PredictLanguage);
|
||||
virtual void changeLetterMode(LetterMode);
|
||||
virtual void ChangeDictionaryLanguage(u8);
|
||||
virtual void setCellPhoneHoldingkey(void*);
|
||||
virtual u32 setElementBuffer();
|
||||
virtual u8 getPredictLanguage();
|
||||
void openDictionary(void*, void*);
|
||||
void clearCandidates();
|
||||
void partialConfirmForKR();
|
||||
void update();
|
||||
u32 complementsCandidates_(s32);
|
||||
void setCurrentWord(const wchar_t*);
|
||||
u32 getCurrentInput(wchar_t*, u32);
|
||||
wchar_t* getCurrentInput();
|
||||
|
||||
private:
|
||||
EZTXGetParam mSearch;
|
||||
u32 mSearchState;
|
||||
u8 mbDictionaryOpen;
|
||||
u8 mbContextChanged;
|
||||
u32 mCurrentWordLength;
|
||||
EZTXLanguageEntry* mpDictionaries;
|
||||
void* mpDictionaryWork;
|
||||
u16 mInputLength;
|
||||
u32 mCandidateCount;
|
||||
u32 mOemDictionaryId;
|
||||
u8 mDictionaryLanguage;
|
||||
s32 mSelectedCandidate;
|
||||
PredictLanguage mPredictLanguage;
|
||||
LetterMode mLetterMode;
|
||||
void* mpHoldingKey;
|
||||
u8 mbKoreanPartialConfirm;
|
||||
};
|
||||
#elif defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
class WithZi : public Decolated {
|
||||
public:
|
||||
enum PredictLanguage { PL_Default };
|
||||
enum LetterMode { LM_Lower, LM_Normal, LM_Upper };
|
||||
WithZi(u16 maxLength) : Decolated(maxLength), mbDictionaryOpen(false), mbContextChanged(false),
|
||||
mCurrentWordLength(0), mpDictionaries(NULL), mpDictionaryWork(NULL), mInputLength(0),
|
||||
mCandidateCount(0), mOemDictionaryId(0), mDictionaryLanguage(0xff), mSelectedCandidate(0),
|
||||
mPredictLanguage(0), mLetterMode(2), mpHoldingKey(NULL), mbKoreanPartialConfirm(false) {}
|
||||
virtual ~WithZi();
|
||||
virtual void init();
|
||||
virtual void setInputting(wchar_t ch);
|
||||
virtual int getCurrentNumPredicted();
|
||||
virtual void getPredicted(int index, wchar_t* string);
|
||||
virtual const wchar_t* getCurrentSelected();
|
||||
virtual u16 getInputStringLength();
|
||||
virtual void setSelectedCandidate(s32 index);
|
||||
virtual bool isFix();
|
||||
virtual void setPredictLaunguage(PredictLanguage language);
|
||||
virtual void changeLetterMode(LetterMode mode);
|
||||
virtual void ChangeDictionaryLanguage(u8 language);
|
||||
virtual void setCellPhoneHoldingkey(void* key);
|
||||
virtual void setElementBuffer();
|
||||
virtual u8 getPredictLanguage();
|
||||
s32 getSelectedCandidateIndex() const { return mSelectedCandidate; }
|
||||
void openDictionary(void* ziDict, void* ziOemDict);
|
||||
void setCurrentWord(const wchar_t* string);
|
||||
void update();
|
||||
const wchar_t* getCurrentInput();
|
||||
s32 getCurrentInput(wchar_t* buffer, u32 length);
|
||||
void clearCandidates();
|
||||
void partialConfirmForKR();
|
||||
private:
|
||||
EZTXGetParam mSearch;
|
||||
u32 mSearchState;
|
||||
bool mbDictionaryOpen;
|
||||
bool mbContextChanged;
|
||||
u32 mCurrentWordLength;
|
||||
EZTXLanguageEntry* mpDictionaries;
|
||||
void* mpDictionaryWork;
|
||||
u16 mInputLength;
|
||||
s32 mCandidateCount;
|
||||
u32 mOemDictionaryId;
|
||||
u8 mDictionaryLanguage;
|
||||
s32 mSelectedCandidate;
|
||||
u32 mPredictLanguage;
|
||||
u32 mLetterMode;
|
||||
void* mpHoldingKey;
|
||||
bool mbKoreanPartialConfirm;
|
||||
};
|
||||
#else
|
||||
class WithZi {
|
||||
public:
|
||||
virtual ~WithZi();
|
||||
|
||||
void openDictionary(void* ziDict, void* ziOemDict);
|
||||
};
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -8,17 +8,23 @@
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "global/decomp/utils.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace gui {
|
||||
class PaneComponent : public ::gui::PaneComponent {};
|
||||
class PaneManager : public ::gui::PaneManager {
|
||||
public:
|
||||
#ifdef IPL_GCW_PANEMANAGER_CTOR_OUT_OF_LINE
|
||||
PaneManager(::gui::EventHandler* event, const nw4r::lyt::DrawInfo* drawInfo, EGG::Heap* heap, EGG::Allocator* allocator, bool bDisableCon = false) NO_INLINE;
|
||||
#else
|
||||
PaneManager(::gui::EventHandler* event, const nw4r::lyt::DrawInfo* drawInfo, EGG::Heap* heap, EGG::Allocator* allocator, bool bDisableCon = false) :
|
||||
::gui::PaneManager(event, allocator, drawInfo),
|
||||
mpHeap(heap),
|
||||
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() {}
|
||||
|
||||
@@ -180,7 +180,11 @@ namespace ipl {
|
||||
|
||||
/*** TODO: These always generate a weak. Try and make them not do that. ***/
|
||||
const nw4r::ut::Rect getTextDrawRect(const nw4r::lyt::TextBox* textBox) const { return textBox->GetTextDrawRect(mDrawInfo); }
|
||||
#ifdef IPL_SDMEMORY_GET_TEXT_DRAW_RECT_OUT_OF_LINE
|
||||
const nw4r::ut::Rect getTextDrawRect(const char* paneName) const;
|
||||
#else
|
||||
const nw4r::ut::Rect getTextDrawRect(const char* paneName) const { return getTextDrawRect(nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mLayout.GetRootPane()->FindPaneByName(paneName))); }
|
||||
#endif
|
||||
|
||||
const nw4r::ut::Rect getPaneRect(nw4r::lyt::Pane* pane) const { return pane->GetPaneRect(mDrawInfo); }
|
||||
const nw4r::ut::Rect getPaneRect(const char* paneName) const { return getPaneRect(mLayout.GetRootPane()->FindPaneByName(paneName)); }
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
|
||||
#include "utility/iplFrameController.h"
|
||||
|
||||
#ifdef IPL_GCW_INTP_CTOR_OUT_OF_LINE
|
||||
#include "global/decomp/utils.h"
|
||||
#endif
|
||||
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <typename T>
|
||||
@@ -37,9 +41,15 @@ namespace ipl {
|
||||
template <typename T>
|
||||
class LinearIntp : public Interporation<T> {
|
||||
public:
|
||||
#ifdef IPL_BOARD_OBJECT_INLINE_INTERPOLATION_DTORS
|
||||
#ifdef IPL_GCW_INTP_CTOR_OUT_OF_LINE
|
||||
LinearIntp() NO_INLINE;
|
||||
#endif
|
||||
#if defined(IPL_BOARD_OBJECT_INLINE_INTERPOLATION_DTORS) || defined(IPL_GC_WINDOW_CPP)
|
||||
virtual ~LinearIntp();
|
||||
#endif
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
T get() const;
|
||||
#else
|
||||
T get() const {
|
||||
T r = mEnd * getCurrentFrame();
|
||||
T b = mStart * (mMaxFrame - mFrame);
|
||||
@@ -47,9 +57,11 @@ namespace ipl {
|
||||
return b * (f64)(1.0f / getMaxFrame());
|
||||
}
|
||||
|
||||
#endif
|
||||
T get2() const { return (((mStart * (mMaxFrame - mFrame)) + (mEnd * mFrame)) / mMaxFrame); }
|
||||
};
|
||||
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
template <typename T>
|
||||
class __declspec(novtable) HermiteIntp : public utility::FrameController {
|
||||
@@ -57,7 +69,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
@@ -69,11 +81,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(mStartTangent *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -89,7 +101,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
@@ -97,8 +109,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -107,7 +119,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
@@ -120,10 +132,10 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(mStartTangent *
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -132,8 +144,8 @@ namespace ipl {
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
@@ -143,14 +155,36 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
T get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
T result =
|
||||
(mStart * (1.0f + (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
|
||||
(mEnd * (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
return result;
|
||||
}
|
||||
#else
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
@@ -162,7 +196,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
@@ -179,14 +213,55 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
#include "math/iplMathTypes.h"
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <>
|
||||
class HermiteIntp<VEC3> : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
VEC3 result =
|
||||
(mStart * (1.0f + (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
|
||||
(mEnd * (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
return result;
|
||||
}
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ namespace ipl {
|
||||
y = r.y;
|
||||
z = 0.0f;
|
||||
}
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(IPL_SD_CHANNEL_SELECT_CPP) || defined(IPL_GC_WINDOW_CPP)
|
||||
VEC3(f32 fx, f32 fy, f32 fz);
|
||||
#else
|
||||
VEC3(f32 fx, f32 fy, f32 fz) {
|
||||
@@ -134,7 +134,15 @@ namespace ipl {
|
||||
VEC3& operator/=(f32 val) { return operator*=(1.f / val); }
|
||||
VEC3 operator+(const VEC3& rhs) const { return VEC3(x + rhs.x, y + rhs.y, z + rhs.z); }
|
||||
VEC3 operator+(f32 v) const { return VEC3(x + v, y + v, z + v); }
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
nw4r::math::VEC3 operator-(const VEC3& rhs) const {
|
||||
nw4r::math::VEC3 difference;
|
||||
nw4r::math::VEC3Sub(&difference, this, &rhs);
|
||||
return difference;
|
||||
}
|
||||
#else
|
||||
VEC3 operator-(const VEC3& rhs) const { return VEC3(x - rhs.x, y - rhs.y, z - rhs.z); }
|
||||
#endif
|
||||
VEC3 operator*(f32 val) const { return VEC3(x * val, y * val, z * val); }
|
||||
VEC3 operator*(f64 val) const {
|
||||
nw4r::math::VEC3 vecOut;
|
||||
|
||||
@@ -114,6 +114,8 @@ namespace ipl {
|
||||
void setName(const wchar_t* value);
|
||||
void setEMail(const wchar_t* value);
|
||||
void setWiiNo(const wchar_t* value);
|
||||
BOOL isDupCode() const;
|
||||
BOOL isMyCode() const;
|
||||
|
||||
wchar_t mValue[0x102];
|
||||
wchar_t mName[0x0c];
|
||||
@@ -121,6 +123,7 @@ namespace ipl {
|
||||
bool mbValidMail;
|
||||
bool mbNameNotEmpty;
|
||||
bool mbHasWiiNo;
|
||||
AddressEdit* mpCallbackOwner;
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -144,7 +147,6 @@ namespace ipl {
|
||||
TextBalloon* mpBalloon;
|
||||
nand::LayoutFile* mpBalloonFile;
|
||||
String mString;
|
||||
AddressEdit* mpCallbackOwner;
|
||||
bool mbParentalOK;
|
||||
nigaoe::Object* mpNigaoe;
|
||||
RFLCreateID mCreateID;
|
||||
|
||||
@@ -85,6 +85,10 @@ namespace ipl {
|
||||
}
|
||||
|
||||
const utility::BScroller& getBInst() { return mBScroller; }
|
||||
#ifdef IPL_SDMEMORY_SCROLLER_BINST_RESET
|
||||
void initScroll() { mScroller.init(); }
|
||||
void resetBInst() { mBScroller.reset(); }
|
||||
#endif
|
||||
|
||||
bool isDownEnd() const { return mScroller.isDownEnd(); }
|
||||
bool isUpEnd() const { return mScroller.isUpEnd(); }
|
||||
@@ -98,6 +102,9 @@ namespace ipl {
|
||||
|
||||
void setDownLimit(f32 v) { mScroller.setDownLimit(v); }
|
||||
void setUpLimit(f32 v) { mScroller.setUpLimit(v); }
|
||||
#ifdef IPL_SDMEMORY_SCROLLER_STATE_ACCESSOR
|
||||
void setState(int state) { mScroller.setState(state); }
|
||||
#endif
|
||||
|
||||
bool isActive() const { return mScroller.isActive(); }
|
||||
|
||||
|
||||
44
include/scene/memoryCard/iplGCSaveData.h
Normal file
44
include/scene/memoryCard/iplGCSaveData.h
Normal file
@@ -0,0 +1,44 @@
|
||||
#ifndef IPL_SCENE_GC_SAVE_DATA_H
|
||||
#define IPL_SCENE_GC_SAVE_DATA_H
|
||||
|
||||
#include <nw4r/ut.h>
|
||||
|
||||
#include "scene/memoryCard/iplMemoryCardBase.h"
|
||||
|
||||
#include "math/iplMathTypes.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class GCSaveData : public MemoryBase {
|
||||
friend class MemoryCard;
|
||||
|
||||
public:
|
||||
GCSaveData(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName,
|
||||
math::VEC3 translate);
|
||||
virtual ~GCSaveData();
|
||||
|
||||
virtual void onPoint(const char* paneName, controller::Interface* controller);
|
||||
virtual void onLeft(const char* paneName);
|
||||
virtual void onTrig(const char* paneName);
|
||||
|
||||
void calc();
|
||||
void draw();
|
||||
void update();
|
||||
void init();
|
||||
|
||||
void setTranslate(const nw4r::math::VEC3& translate);
|
||||
const nw4r::math::VEC3* getTranslate();
|
||||
|
||||
void setBalloon(TextBalloon* balloon);
|
||||
|
||||
private:
|
||||
MemoryBaseEvent* mpEvent; // 0x34
|
||||
TextBalloon* mpBalloon; // 0x38
|
||||
u8 mSlot; // 0x3C
|
||||
s16 mIndex; // 0x3E
|
||||
nw4r::ut::Link mLink; // 0x40
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
#endif // IPL_SCENE_GC_SAVE_DATA_H
|
||||
118
include/scene/memoryCard/iplGCWindow.h
Normal file
118
include/scene/memoryCard/iplGCWindow.h
Normal file
@@ -0,0 +1,118 @@
|
||||
#ifndef IPL_SCENE_GC_WINDOW_H
|
||||
#define IPL_SCENE_GC_WINDOW_H
|
||||
|
||||
#include "scene/memoryCard/iplMemoryCardBase.h"
|
||||
#include "scene/memoryCard/iplMemoryCardManager.h"
|
||||
#include "math/iplMathTypes.h"
|
||||
#include "math/iplInterporation.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class GCWindow : public MemoryBase, public MemCardEventListener {
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
friend class MemoryCard;
|
||||
#endif
|
||||
public:
|
||||
GCWindow(EGG::Heap*, nand::LayoutFile*, const char*, const char*);
|
||||
virtual ~GCWindow();
|
||||
void init(const math::VEC3&, MemoryCardManager*, u8, short);
|
||||
void calc();
|
||||
void draw();
|
||||
void destroy();
|
||||
void onPoint(const char*, controller::Interface*);
|
||||
void onLeft(const char*);
|
||||
void onTrig(const char*);
|
||||
private:
|
||||
void on_wait();
|
||||
void on_fadein();
|
||||
void on_normal();
|
||||
void on_fadeout1st();
|
||||
void on_fadeout_yes1st();
|
||||
void on_focus_move();
|
||||
void on_focus_copy();
|
||||
void on_focus_del();
|
||||
void on_select_out();
|
||||
void on_dialog();
|
||||
void on_error_message();
|
||||
void on_process();
|
||||
void on_error_message1st();
|
||||
void on_error_message2nd();
|
||||
void on_error_message3rd();
|
||||
void on_format1st();
|
||||
void on_format2nd();
|
||||
void on_format3rd();
|
||||
void on_format4th();
|
||||
void on_format_error();
|
||||
void change_textbox_doing();
|
||||
void change_textbox_done();
|
||||
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();
|
||||
|
||||
private:
|
||||
int mState;
|
||||
MemoryBaseEvent* mpEvent;
|
||||
MemoryCardManager* mpMemoryCardManager;
|
||||
math::LinearIntp<math::VEC3> mLinearInterp;
|
||||
math::VEC3 mTranslate;
|
||||
u8 mCardState;
|
||||
short mCardIndex;
|
||||
int mOperation;
|
||||
bool mActive;
|
||||
bool mWaiting;
|
||||
u8 mFlags0[2];
|
||||
u8 mFlags1[2];
|
||||
};
|
||||
|
||||
class SavedataEditWindow : public MemoryBase {
|
||||
public:
|
||||
SavedataEditWindow(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName);
|
||||
virtual void init();
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
virtual void destroy();
|
||||
|
||||
private:
|
||||
void add_animation(const char* fileName, const char* groupName) {
|
||||
AnmName animation = {fileName, groupName};
|
||||
MemoryBase::add_animation(&animation, 1);
|
||||
}
|
||||
void on_normal();
|
||||
void on_fadein();
|
||||
void on_fadeout1st();
|
||||
void on_focus_del();
|
||||
void on_select_out();
|
||||
void on_fadeout_yes1st();
|
||||
|
||||
int mState;
|
||||
MemoryBaseEvent* mpEvent;
|
||||
math::LinearIntp<math::VEC3> mLinearInterp;
|
||||
math::VEC3 mTranslate;
|
||||
bool mActive;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -3,14 +3,91 @@
|
||||
|
||||
#include "iplSceneHeader.h"
|
||||
|
||||
#include "scene/memoryCard/iplMemoryCardBase.h"
|
||||
#include "scene/memoryCard/iplMemoryCardManager.h"
|
||||
|
||||
#include "math/iplMathTypes.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
SCENE_CLASS(MemoryCard) {
|
||||
class GCSaveData;
|
||||
class GCWindow;
|
||||
class SavedataEditWindow;
|
||||
|
||||
class MemoryCard : public Base, public MemoryBase {
|
||||
public:
|
||||
MemoryCard(EGG::Heap * heap);
|
||||
MemoryCard(EGG::Heap* heap);
|
||||
virtual ~MemoryCard();
|
||||
|
||||
virtual BOOL isResetAcceptable() const;
|
||||
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
|
||||
virtual void onPoint(const char* paneName, controller::Interface* controller);
|
||||
virtual void onLeft(const char* paneName);
|
||||
virtual void onTrig(const char* paneName);
|
||||
|
||||
void onFocus(void* data);
|
||||
void onRelease();
|
||||
|
||||
MemoryCardManager* getManager() { return mpManager; }
|
||||
|
||||
private:
|
||||
u8 unk_0x54[0x7C];
|
||||
enum {
|
||||
SLOT_A = 0,
|
||||
SLOT_B,
|
||||
};
|
||||
|
||||
void on_fadein1st();
|
||||
void on_fadein2nd();
|
||||
void on_normal();
|
||||
void on_scroll_r();
|
||||
void on_scroll_l();
|
||||
void on_change_tag1st();
|
||||
void on_change_tag2nd();
|
||||
void on_fadeout1st();
|
||||
void on_fadeout2nd();
|
||||
void on_error();
|
||||
void on_insert_card();
|
||||
void on_detach_card();
|
||||
|
||||
void start_savedata_fadein();
|
||||
void start_savedata_fadeout();
|
||||
void start_errormessage_fadein();
|
||||
int update_slot();
|
||||
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
bool can_scroll_r() const { return mIconCount > 30 && mState == 2; }
|
||||
bool can_scroll_l() const { return mIconIndex >= 0 && mState == 2; }
|
||||
#endif
|
||||
void show_arw();
|
||||
void show_capacity(u8 slot);
|
||||
|
||||
void scroll_common();
|
||||
void start_scroll_r();
|
||||
void start_scroll_l();
|
||||
|
||||
private:
|
||||
s32 mState; // 0x88
|
||||
s32 mPrevState; // 0x8C
|
||||
u8 mSlot; // 0x90
|
||||
u8 unk_0x91[3]; // 0x91
|
||||
s32 mSlotState[2]; // 0x94
|
||||
s16 mIconIndex; // 0x9C
|
||||
s16 mIconCount; // 0x9E
|
||||
u8 mShowArwR; // 0xA0
|
||||
u8 mShowArwL; // 0xA1
|
||||
u8 unk_0xA2[2]; // 0xA2
|
||||
MemoryCardManager* mpManager; // 0xA4
|
||||
MemoryBaseEvent* mpEvent; // 0xA8
|
||||
nw4r::ut::List mSaveDataList; // 0xAC
|
||||
nand::LayoutFile* mBalloonLayoutFile; // 0xB8
|
||||
nw4r::ut::List mBalloonList; // 0xBC
|
||||
GCSaveData* mpFocusSaveData; // 0xC8
|
||||
GCWindow* mpGCWindow; // 0xCC
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
148
include/scene/memoryCard/iplMemoryCardBase.h
Normal file
148
include/scene/memoryCard/iplMemoryCardBase.h
Normal file
@@ -0,0 +1,148 @@
|
||||
#ifndef IPL_SCENE_MEMORY_CARD_BASE_H
|
||||
#define IPL_SCENE_MEMORY_CARD_BASE_H
|
||||
|
||||
#include <nw4r/ut.h>
|
||||
|
||||
#include "layout/iplLayout.h"
|
||||
#include "layout/iplGuiManager.h"
|
||||
|
||||
#include "system/iplController.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class TextBalloon;
|
||||
class SettingButton;
|
||||
class MemoryBase;
|
||||
}
|
||||
namespace nand {
|
||||
class LayoutFile;
|
||||
}
|
||||
namespace scene {
|
||||
|
||||
class MemoryBaseEvent : public ::gui::EventHandler {
|
||||
public:
|
||||
#ifdef IPL_MEMORYCARD_BASE_EVENT_OUT_OF_LINE
|
||||
MemoryBaseEvent(MemoryBase* base);
|
||||
#else
|
||||
MemoryBaseEvent(MemoryBase* base) : mpBase(base) {}
|
||||
#endif
|
||||
|
||||
virtual ~MemoryBaseEvent();
|
||||
|
||||
virtual void onEvent(u32 componentID, u32 event, void* data);
|
||||
|
||||
private:
|
||||
MemoryBase* mpBase; // 0x0C
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) MemoryBase {
|
||||
#else
|
||||
class MemoryBase {
|
||||
#endif
|
||||
public:
|
||||
class Anm {
|
||||
public:
|
||||
Anm(layout::GroupAnimator* anim) : mAnim(anim) {}
|
||||
virtual ~Anm();
|
||||
|
||||
layout::GroupAnimator* mAnim; // 0x04
|
||||
nw4r::ut::Link mLink; // 0x08
|
||||
};
|
||||
|
||||
class Button {
|
||||
public:
|
||||
Button(nw4r::lyt::Pane* pane) : unk_0x04(0), mPane(pane) {}
|
||||
virtual ~Button();
|
||||
|
||||
u32 unk_0x04; // 0x04
|
||||
nw4r::lyt::Pane* mPane; // 0x08
|
||||
nw4r::ut::Link mLink; // 0x0C
|
||||
};
|
||||
|
||||
class AnmButton {
|
||||
public:
|
||||
AnmButton(const char* name, Anm* anm1, Anm* anm2, Anm* anm3)
|
||||
: unk_0x04(0), mName(name), mCurrentAnm(NULL), mAnm1(anm1), mAnm2(anm2), mAnm3(anm3),
|
||||
unk_0x24(0), mLastCmd(0), mpBalloon(NULL) {}
|
||||
virtual ~AnmButton();
|
||||
|
||||
void calc();
|
||||
void onCmdRecv(int command);
|
||||
|
||||
void setBalloon(TextBalloon* balloon);
|
||||
|
||||
int unk_0x04; // 0x04
|
||||
const char* mName; // 0x08
|
||||
Anm* mCurrentAnm; // 0x0C
|
||||
Anm* mAnm1; // 0x10
|
||||
Anm* mAnm2; // 0x14
|
||||
Anm* mAnm3; // 0x18
|
||||
nw4r::ut::Link mLink; // 0x1C
|
||||
u32 unk_0x24; // 0x24
|
||||
int mLastCmd; // 0x28
|
||||
TextBalloon* mpBalloon; // 0x2C
|
||||
};
|
||||
|
||||
struct AnmName {
|
||||
const char* anmFile;
|
||||
const char* groupName;
|
||||
};
|
||||
|
||||
#ifdef IPL_MEMORYCARD_BASE_CTOR_OUT_OF_LINE
|
||||
MemoryBase();
|
||||
#else
|
||||
MemoryBase() : mpLayout(NULL), unk_0x08(NULL) {
|
||||
nw4r::ut::List_Init(&mAnmList, offsetof(Anm, mLink));
|
||||
nw4r::ut::List_Init(&mButtonList, offsetof(Button, mLink));
|
||||
nw4r::ut::List_Init(&mAnmButtonList, offsetof(AnmButton, mLink));
|
||||
}
|
||||
#endif
|
||||
#ifdef IPL_MEMORYCARD_BASE_OUT_OF_LINE
|
||||
virtual ~MemoryBase();
|
||||
#else
|
||||
virtual ~MemoryBase() {}
|
||||
#endif
|
||||
|
||||
virtual void onPoint(const char* paneName, controller::Interface* controller);
|
||||
virtual void onLeft(const char* paneName);
|
||||
virtual void onMove(const char* paneName);
|
||||
virtual void onTrig(const char* paneName);
|
||||
|
||||
virtual void add_button(const char** paneNames, int count);
|
||||
virtual void add_anmbutton(const char* paneName, Anm* anm1, Anm* anm2, Anm* anm3);
|
||||
virtual Button* get_button(const char* paneName);
|
||||
virtual AnmButton* get_anmbutton(const char* paneName);
|
||||
virtual void clear_button(const char* paneName);
|
||||
virtual void add_animation(const AnmName* anmNames, int count);
|
||||
virtual Anm* get_animation(int index);
|
||||
virtual void do_animation(int index);
|
||||
virtual void do_animation(int index, bool flag);
|
||||
virtual void stop_animation(int index);
|
||||
virtual bool is_animation(int index);
|
||||
virtual bool is_fadein_enable();
|
||||
virtual void set_visible(const char* paneName, bool flag);
|
||||
|
||||
void set_textbox(const char* paneName, u32 message);
|
||||
void set_textbox(const char* paneName, u32 message, int x, int y);
|
||||
void set_textbox(const char* paneName, const wchar_t* text, f32 x, f32 y);
|
||||
void set_textbox(const char* paneName, const wchar_t* text);
|
||||
SettingButton* get_setting_button();
|
||||
void change_button_text_close();
|
||||
void change_button_text_return();
|
||||
void change_button_text_ok();
|
||||
void show_button_return();
|
||||
void show_button_ok();
|
||||
|
||||
protected:
|
||||
layout::Object* mpLayout; // 0x04
|
||||
nand::LayoutFile* unk_0x08; // 0x08
|
||||
gui::PaneManager* mpPaneManager; // 0x0C
|
||||
nw4r::ut::List mAnmList; // 0x10
|
||||
nw4r::ut::List mButtonList; // 0x1C
|
||||
nw4r::ut::List mAnmButtonList; // 0x28
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
#endif // IPL_SCENE_MEMORY_CARD_BASE_H
|
||||
201
include/scene/memoryCard/iplMemoryCardManager.h
Normal file
201
include/scene/memoryCard/iplMemoryCardManager.h
Normal file
@@ -0,0 +1,201 @@
|
||||
#ifndef IPL_SCENE_MEMORY_CARD_MANAGER_H
|
||||
#define IPL_SCENE_MEMORY_CARD_MANAGER_H
|
||||
|
||||
#include <revolution/types.h>
|
||||
#include <revolution/gx.h>
|
||||
|
||||
#include <private/card.h>
|
||||
|
||||
#include <wchar.h>
|
||||
|
||||
#include "iplMemoryCardLib.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
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 {
|
||||
u32 fileNo; // 0x00
|
||||
u32 unk_0x04; // 0x04
|
||||
u32 unk_0x08; // 0x08
|
||||
s32 sortKey; // 0x0C
|
||||
} MCFile; // 0x10
|
||||
|
||||
typedef struct MCFileCell {
|
||||
wchar_t comment[2][0x40]; // 0x000
|
||||
s16 iconAnmCounter; // 0x100
|
||||
u16 unk_0x102; // 0x102
|
||||
GXTexObj icon; // 0x104
|
||||
GXTexObj banner; // 0x124
|
||||
GXTlutObj iconTlut; // 0x144
|
||||
GXTlutObj bannerTlut; // 0x150
|
||||
} MCFileCell; // 0x15C
|
||||
|
||||
class MemoryCardManager {
|
||||
public:
|
||||
MemoryCardManager() {
|
||||
MCFileCell* pCell = mFileCell[0];
|
||||
do {
|
||||
pCell->iconAnmCounter = 0;
|
||||
wmemset(pCell->comment[0], 0, 0x40);
|
||||
pCell++;
|
||||
} while (pCell < mFileCell[2]);
|
||||
mLastResult = 0;
|
||||
mLastCmd = 0;
|
||||
__CARDSetDiskID(NULL);
|
||||
memorycard::initCardThread();
|
||||
sort_file_array(0);
|
||||
sort_file_array(1);
|
||||
}
|
||||
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);
|
||||
bool isSlotNoCard(u8 slot);
|
||||
long isSlotWrongDevice(u8 slot);
|
||||
|
||||
void sort_file_array(u8 slot);
|
||||
|
||||
void sendCardCmdMove(u8 slot, s16 index);
|
||||
void sendCardCmdCopy(u8 slot, s16 index);
|
||||
void sendCardCmdDelete(u8 slot, s16 index);
|
||||
void sendCardCmdFormat(u8 slot);
|
||||
|
||||
bool isDistSlot(u8 slot, long* pState);
|
||||
bool isMoveEnable(u8 slot, u32 index, long* pCode);
|
||||
bool isCopyEnable(u8 slot, u32 index, long* pCode);
|
||||
|
||||
bool isIconValidate(u8 slot, s16 index);
|
||||
bool isBannerEnable(u8 slot, s16 index);
|
||||
|
||||
void update_icon_anm();
|
||||
void update_file_array(u8 slot);
|
||||
void update_change_cardstate(u8 slot);
|
||||
|
||||
GXTexObj* create_icon(u8 slot, s16 index);
|
||||
GXTexObj* create_icon(u8 slot, s16 index, long start);
|
||||
GXTexObj* _create_icon(u8 slot, s16 fileNo, long start);
|
||||
const wchar_t* getComment(u8 slot, s16 index, int which);
|
||||
GXTexObj* create_banner(u8 slot, s16 index);
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
u32 getBlocks(u8 slot, s16 index);
|
||||
#else
|
||||
u16 getBlocks(u8 slot, s16 index);
|
||||
#endif
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
u32 getFreeBlocks(u8 slot);
|
||||
#else
|
||||
u16 getFreeBlocks(u8 slot);
|
||||
#endif
|
||||
|
||||
void setEventHandler(MemCardEventListener* eventHandler) {
|
||||
mpEventHandler = eventHandler;
|
||||
}
|
||||
|
||||
private:
|
||||
u32 unk_0x04; // 0x00004
|
||||
MCFile mFile[2][0x7F]; // 0x00008
|
||||
MCFileCell mFileCell[2][0x7F]; // 0x00FE8
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 unk_0x16938; // 0x16938
|
||||
MemCardEventListener* mpEventHandler; // 0x1693C
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
#endif // IPL_SCENE_MEMORY_CARD_MANAGER_H
|
||||
@@ -11,6 +11,12 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
namespace {
|
||||
class SDChannelSelectButtonEventHandler;
|
||||
}
|
||||
#endif
|
||||
|
||||
class SDButtonEventHandlerBase : public ::gui::EventHandler {
|
||||
public:
|
||||
virtual void onEvent(u32 compId, u32 event, void* data);
|
||||
@@ -91,8 +97,17 @@ namespace ipl {
|
||||
void startLeftEvent(const char* paneName);
|
||||
|
||||
bool isActive() const;
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
bool isLeftArrowVisible() const { return mbArrowVisible[ARROW_BTN_LEFT]; }
|
||||
static const char* getButtonName(int button) { return smButtonName[button]; }
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void setEventHandler(::gui::EventHandler * event,
|
||||
::gui::EventHandler * optOutEvent = NULL);
|
||||
#else
|
||||
void setEventHandler(::gui::EventHandler * event, ::gui::EventHandler * optOutEvent);
|
||||
#endif
|
||||
|
||||
void setText(const char* paneName, u32 msgId);
|
||||
void setText(const char* paneName, const wchar_t* text);
|
||||
@@ -156,6 +171,10 @@ namespace ipl {
|
||||
|
||||
friend class SDArrow;
|
||||
friend class SDButtonEventHandlerBase;
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
friend class SDChannelSelect;
|
||||
friend class SDChannelSelectButtonEventHandler;
|
||||
#endif
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
164
include/scene/sdChannelMemory/iplSDMemory.h
Normal file
164
include/scene/sdChannelMemory/iplSDMemory.h
Normal file
@@ -0,0 +1,164 @@
|
||||
#ifndef IPL_SCENE_SD_MEMORY_H
|
||||
#define IPL_SCENE_SD_MEMORY_H
|
||||
|
||||
#include <revolution.h>
|
||||
|
||||
#include "layout/iplLayout.h"
|
||||
#include "layout/iplGuiManager.h"
|
||||
#include "scene/board/iplFocusObject.h"
|
||||
#include "scene/channelEdit/iplNandSDCardManager.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class SDChannelSelect;
|
||||
|
||||
class SDMemory {
|
||||
public:
|
||||
struct TitleRange {
|
||||
s32 mByteSize;
|
||||
u32 mCount;
|
||||
};
|
||||
|
||||
SDMemory();
|
||||
~SDMemory();
|
||||
|
||||
void create(EGG::Heap* heap, nand::LayoutFile* layoutFile, SDChannelSelect* channelSelect);
|
||||
void setTitleLists(const TitleRange& nandTitles, const TitleRange& sdTitles);
|
||||
bool calc();
|
||||
void draw();
|
||||
void setScrollLimit();
|
||||
void updateSideArrows();
|
||||
void resetScrollArrows();
|
||||
void updateScrollArrows(u32 previousDownEnd, u32 previousUpEnd, u32 downEnd, u32 upEnd);
|
||||
void showDownArrow();
|
||||
void showUpArrow();
|
||||
void hideDownArrow();
|
||||
void hideUpArrow();
|
||||
void showLeftArrow();
|
||||
void showRightArrow();
|
||||
void hideLeftArrow();
|
||||
void hideRightArrow();
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
public:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
s32 updateState();
|
||||
void drawTransferTitles();
|
||||
void onDialogState0();
|
||||
void onDialogState2();
|
||||
bool onDialogState3();
|
||||
void onDialogState4();
|
||||
void onDialogState6();
|
||||
void onDialogState7();
|
||||
void onDialogState8();
|
||||
void onDialogState9();
|
||||
void onDialogState10();
|
||||
void onDialogState11();
|
||||
void onDialogState12();
|
||||
void onDialogState13();
|
||||
void onDialogState14();
|
||||
void onDialogState15();
|
||||
void onDialogState16();
|
||||
void onDialogState17();
|
||||
void onDialogState18();
|
||||
void onDialogState19();
|
||||
bool onDialogState20();
|
||||
void onDialogState21();
|
||||
bool onDialogState22();
|
||||
void onDialogState23();
|
||||
bool onDialogState24();
|
||||
void resetDialogPaneAnimations();
|
||||
s32 getControlPaneIndex(const char* paneName);
|
||||
void activateControlPane(const char* paneName, ::gui::Component* component);
|
||||
void deactivateControlPane(const char* paneName);
|
||||
void cancelControlPane(const char* paneName);
|
||||
s32 getTitlePaneIndex(const char* paneName);
|
||||
void activateTitlePane(const char* paneName, ::gui::Component* component);
|
||||
void deactivateTitlePane(const char* paneName);
|
||||
void selectTitlePane(const char* paneName);
|
||||
s32 getDialogPaneIndex(const char* paneName);
|
||||
void activateDialogPane(const char* paneName, ::gui::Component* component);
|
||||
void deactivateDialogPane(const char* paneName);
|
||||
void selectDialogPane(const char* paneName);
|
||||
|
||||
class ControlPaneEventHandler : public ::gui::EventHandler {
|
||||
public:
|
||||
ControlPaneEventHandler(SDMemory* instance) : ::gui::EventHandler(), mpInstance(instance) {}
|
||||
virtual void onEvent(u32 compId, u32 event, void* data);
|
||||
|
||||
private:
|
||||
SDMemory* mpInstance;
|
||||
};
|
||||
|
||||
class TitlePaneEventHandler : public ::gui::EventHandler {
|
||||
public:
|
||||
TitlePaneEventHandler(SDMemory* instance) : ::gui::EventHandler(), mpInstance(instance) {}
|
||||
virtual void onEvent(u32 compId, u32 event, void* data);
|
||||
|
||||
private:
|
||||
SDMemory* mpInstance;
|
||||
};
|
||||
|
||||
class DialogPaneEventHandler : public ::gui::EventHandler {
|
||||
public:
|
||||
DialogPaneEventHandler(SDMemory* instance) : ::gui::EventHandler(), mpInstance(instance) {}
|
||||
virtual void onEvent(u32 compId, u32 event, void* data);
|
||||
|
||||
private:
|
||||
SDMemory* mpInstance;
|
||||
};
|
||||
|
||||
layout::Object* mpMainLayout;
|
||||
layout::Object* mpTitleLayout;
|
||||
layout::Object* mpDialogLayout;
|
||||
layout::Object* mpProgressLayout;
|
||||
gui::PaneManager* mpPaneManagers[3];
|
||||
s32 mDialogState;
|
||||
s32 mProcessState;
|
||||
s32 mDisplayMode;
|
||||
s32 mMessageId;
|
||||
u32 mErrorCode;
|
||||
u32 mPanelStates[3];
|
||||
u32 mTitlePanelStates[5];
|
||||
u32 mPanelAnimationStates[4];
|
||||
SDChannelSelect* mpSDChannelSelect;
|
||||
TitleRange mNandTitleRange;
|
||||
TitleRange mSDTitleRange;
|
||||
u32 mTitleCount;
|
||||
u32 mCurrentTitle;
|
||||
u32 mTitleFlags;
|
||||
ESTitleId mTitleIds[96];
|
||||
wchar_t mTitleNames[96][21];
|
||||
u32 mTitleNameCount;
|
||||
u32 mSDTitleCount;
|
||||
ESTitleId mSDTitleIds[96];
|
||||
u32 mNandTitleCount;
|
||||
u32 mNandTitleNameCount;
|
||||
ESTitleId mNandTitleIds[96];
|
||||
wchar_t mCurrentTitleName[0x840];
|
||||
u8 mTransferFlags[4];
|
||||
u32 mTransferStatus;
|
||||
u64 mTransferStartTime;
|
||||
s32 mTransferFrame;
|
||||
struct TitleListState {
|
||||
ESTitleId* mpTitles;
|
||||
u32 mCount;
|
||||
ESTitleId* mpSecondaryTitles;
|
||||
u32 mSecondaryCount;
|
||||
ESTitleId* mpNames;
|
||||
u32 mNameCount;
|
||||
} mTitleListState;
|
||||
scroller mScroller;
|
||||
s32 mButtonState;
|
||||
u8 mControllerFlags[4];
|
||||
#ifndef IPL_SD_CHANNEL_TITLE_CPP
|
||||
u32 mFinalState[3];
|
||||
u8 mFinalFlags[4];
|
||||
#endif
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
#endif
|
||||
@@ -1,18 +1,429 @@
|
||||
#ifndef IPL_SCENE_SD_CHANNEL_SELECT_H
|
||||
#define IPL_SCENE_SD_CHANNEL_SELECT_H
|
||||
|
||||
#include "iplSceneHeader.h"
|
||||
#include "iplSceneUIHeader.h"
|
||||
|
||||
#include "math/iplInterporation.h"
|
||||
#include "scene/sdButton/iplSDButton.h"
|
||||
#include "system/iplChannelRsoThread.h"
|
||||
#include "system/iplNandSDWorker.h"
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
class SDChannelSelect;
|
||||
namespace {
|
||||
class SDChannelSelectEventHandler;
|
||||
class SDChannelSelectButtonEventHandler;
|
||||
}
|
||||
#endif
|
||||
|
||||
class SDChannelObj {
|
||||
public:
|
||||
SDChannelObj(EGG::Heap* heap, int page, int index);
|
||||
~SDChannelObj();
|
||||
|
||||
EGG::Heap* getHeap() const { return mpHeap; }
|
||||
int getPage() const { return mPage; }
|
||||
int getIndex() const { return mIndex; }
|
||||
nw4r::math::VEC3& getTranslate() const;
|
||||
|
||||
#if defined(IPL_SD_CHANNEL_TITLE_CPP) || defined(IPL_SD_CHANNEL_OBJ_CPP)
|
||||
public:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
friend class SDChannelSelect;
|
||||
|
||||
nw4r::ut::Link mListLink;
|
||||
EGG::ExpHeap* mpDialogHeap;
|
||||
EGG::ExpHeap* mpChannelHeap;
|
||||
EGG::Heap* mpHeap;
|
||||
#ifdef IPL_SD_CHANNEL_OBJ_CPP
|
||||
int mState;
|
||||
#else
|
||||
u32 mState;
|
||||
#endif
|
||||
int mPage;
|
||||
int mIndex;
|
||||
nand::LayoutFile* mpLayoutFile;
|
||||
nw4r::lyt::Pane* mpPane;
|
||||
#ifdef IPL_SD_CHANNEL_OBJ_CPP
|
||||
nand::File* mpPaneAnimator;
|
||||
#else
|
||||
layout::Animator* mpPaneAnimator;
|
||||
#endif
|
||||
layout::Object* mpBaseLayout;
|
||||
layout::Animator* mpBaseAnimator;
|
||||
layout::Object* mpPageLayout;
|
||||
layout::Animator* mpPageAnimators[3];
|
||||
int mPageAnimation;
|
||||
int mPageAnimationFrame;
|
||||
layout::Object* mpDialogLayout;
|
||||
layout::Animator* mpDialogAnimator;
|
||||
int mDialogState;
|
||||
int mDialogFrame;
|
||||
int mDialogTimer;
|
||||
int mAnimationState;
|
||||
nw4r::lyt::Group* mpNewMessageGroup;
|
||||
#ifdef IPL_SD_CHANNEL_OBJ_CPP
|
||||
layout::Animator* mpNewMessageAnimator;
|
||||
#else
|
||||
int mNewMessageCount;
|
||||
#endif
|
||||
u8 mbNewMessageGroupActive;
|
||||
int mNewMessageState;
|
||||
int mNewMessageFrame;
|
||||
f32 mOffsetX;
|
||||
f32 mOffsetY;
|
||||
f32 mAspectRatioScale;
|
||||
int mStateFlags;
|
||||
void* mpThumbnailData;
|
||||
NandSDWorker::SDAppMetaEntry mAppMeta;
|
||||
};
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap);
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool selected);
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int enabled);
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel);
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel);
|
||||
|
||||
union SDChannelSelectCommandArguments {
|
||||
u32 values[3];
|
||||
NandSDWorker::AppBlocksInfo* appBlocks[3];
|
||||
NandSDWorker::TitleIdList* titleLists[3];
|
||||
void* pointers[3];
|
||||
};
|
||||
|
||||
struct SDChannelSelectCommand {
|
||||
u32 type;
|
||||
u64 titleId;
|
||||
SDChannelSelectCommandArguments arguments;
|
||||
|
||||
void copyFrom(const SDChannelSelectCommand& other);
|
||||
};
|
||||
|
||||
struct SDChannelSelectCommandQueue {
|
||||
SDChannelSelectCommand commands[4];
|
||||
int capacity;
|
||||
int count;
|
||||
int readIndex;
|
||||
int writeIndex;
|
||||
|
||||
SDChannelSelectCommandQueue(u32 capacity, u32 count, u32 readIndex, u32 writeIndex)
|
||||
: capacity(capacity), count(count), readIndex(readIndex), writeIndex(writeIndex) {
|
||||
}
|
||||
|
||||
bool push(const SDChannelSelectCommand& command);
|
||||
bool pop();
|
||||
};
|
||||
|
||||
struct SDChannelSelectTitleInfo {
|
||||
ESTitleId32 titleId;
|
||||
bool used;
|
||||
};
|
||||
|
||||
struct SDChannelSelectNoticeQueue {
|
||||
SDChannelSelectCommand notices[42];
|
||||
int capacity;
|
||||
int count;
|
||||
int readIndex;
|
||||
int writeIndex;
|
||||
|
||||
SDChannelSelectNoticeQueue(u32 capacity, u32 count, u32 readIndex, u32 writeIndex)
|
||||
: capacity(capacity), count(count), readIndex(readIndex), writeIndex(writeIndex) {
|
||||
}
|
||||
|
||||
bool pop();
|
||||
};
|
||||
|
||||
FADER_SCENE_CLASS(SDChannelSelect) {
|
||||
public:
|
||||
SDChannelSelect(EGG::Heap * heap);
|
||||
enum {
|
||||
PAGE_COUNT = 5,
|
||||
};
|
||||
|
||||
SDChannelSelect(EGG::Heap* heap);
|
||||
virtual ~SDChannelSelect();
|
||||
|
||||
NandSDWorker::WorkSDState getSDState() const {
|
||||
return static_cast<NandSDWorker::WorkSDState>(mCurrentSDState);
|
||||
}
|
||||
NandSDWorker* getWorker() const { return mpSDWorker; }
|
||||
|
||||
virtual BOOL isResetProcessDone();
|
||||
virtual void startResetting();
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void draw();
|
||||
virtual void destroy();
|
||||
virtual void initCalcFadeout();
|
||||
virtual void calcCommon();
|
||||
virtual FaderSceneCommand calcFadein();
|
||||
virtual FaderSceneCommand calcNormal();
|
||||
virtual FaderSceneCommand calcFadeout();
|
||||
|
||||
void onButtonEvent(const char* paneName, u32 event,
|
||||
const controller::Interface* controller);
|
||||
BOOL onEventDerived(const char* paneName, u32 event,
|
||||
controller::Interface* controller);
|
||||
bool collectTitlesByUsage(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
u32* titleCount);
|
||||
|
||||
static const char* mscChannelPaneNames[PAGE_COUNT][MAX_CHANNEL_INDEX];
|
||||
static const char* mscBasePaneNames[PAGE_COUNT];
|
||||
static const char* mscPicturePaneNames[PAGE_COUNT];
|
||||
static const char* mscEdgePaneNames[PAGE_COUNT];
|
||||
static const char* mscClockPaneNames[3];
|
||||
static const char* mscMaskPaneName;
|
||||
|
||||
#if defined(IPL_SD_CHANNEL_TITLE_CPP) || defined(IPL_SD_CHANNEL_OBJ_CPP)
|
||||
public:
|
||||
#else
|
||||
private:
|
||||
u8 unk_0x58[0x728];
|
||||
#endif
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
friend class SDChannelSelectEventHandler;
|
||||
friend class SDChannelSelectButtonEventHandler;
|
||||
#endif
|
||||
void enqueueStartNotice();
|
||||
bool enqueueFinishNotice();
|
||||
bool enqueueNotice(u32 highTitleId, u32 lowTitleId, u32 result);
|
||||
bool enqueueLoadNotice();
|
||||
bool enqueuePageNotice();
|
||||
bool enqueueResultNotice(u32 result);
|
||||
bool enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value);
|
||||
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state);
|
||||
bool enqueueErrorNotice(u32 page, u32 index);
|
||||
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
||||
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
||||
void clearCommandQueue();
|
||||
void clearNoticeQueue();
|
||||
void calcChannelObjects();
|
||||
void updateChannelObjects();
|
||||
void updateChannelObject(SDChannelObj* channel);
|
||||
void drawChannelTransitionObjects();
|
||||
void drawChannelObjects();
|
||||
bool isChannelInCalc(int page, int index, int currentPage) const;
|
||||
nw4r::lyt::Pane* getChannelBasePane(int page, int index, int currentPage) const;
|
||||
int getCenterChannelIndex(const char* paneName) const;
|
||||
nw4r::lyt::Pane* getCenterChannelPane(int index) const;
|
||||
nw4r::lyt::Pane* getChannelPane(int index) const;
|
||||
static math::VEC3 getChannelPanePosition(SDChannelSelect* scene, int index);
|
||||
void calcPageAnimations();
|
||||
void processNormalInput();
|
||||
void updateArrowVisibility();
|
||||
void processWorkerState();
|
||||
void updateDialogAnimation();
|
||||
void initializeNormalPage();
|
||||
void updatePageTransform();
|
||||
void setChannelScissor(const SDChannelObj* channel) const;
|
||||
bool isCurrentTitleUsageEnough(const s32* usage) const;
|
||||
void getCurrentTitleUsage(s32* bytes, s32* blocks) const;
|
||||
bool collectTitlesByChannelOrder(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
u32* titleCount);
|
||||
bool collectTitlesFromNandUsage(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
u32* titleCount);
|
||||
bool collectTitlesBySpecialChannels(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
u32* titleCount);
|
||||
bool collectTitlesForMode(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
u32* titleCount, int searchMode);
|
||||
bool findAdjacentChannel(int direction, int* page, int* index) const;
|
||||
void setStateAndPlaySelectSound(int state) NO_INLINE;
|
||||
void finishDialogOperation();
|
||||
void finishDialogTransition();
|
||||
void processWorkerCommands();
|
||||
void handleWorkerStartup();
|
||||
void handleNandTitleCount();
|
||||
void handleNandTitleUsage();
|
||||
void handleNandTitleUsageComplete();
|
||||
void handleSDTitleList();
|
||||
void handleSDTitleListResult();
|
||||
void refreshAfterSDTitleList();
|
||||
void handleSDChannelUpdateComplete();
|
||||
void updateChannelNotices(int pageOffset, int index);
|
||||
void handleSDMountComplete();
|
||||
void handleCopyComplete();
|
||||
void handleDeleteComplete();
|
||||
void handleMoveComplete();
|
||||
void handleStorageCheckComplete();
|
||||
void handleCardCommand();
|
||||
void handleSDCardReady();
|
||||
void handleSDLocationUpdateComplete();
|
||||
void handleSDLocationReadComplete();
|
||||
void handleBackupFitComplete();
|
||||
void handleNandSDCleanupComplete();
|
||||
void handleSDDeleteComplete();
|
||||
bool setDialogMessage(u32 state, u32 message);
|
||||
static int compareTitleUsage(const void* lhs, const void* rhs);
|
||||
static int compareTitleInfo(const void* lhs, const void* rhs);
|
||||
void createChannelList(int page, bool force);
|
||||
void destroyChannelObject(SDChannelObj* channel);
|
||||
void destroyUnusedChannelObjects(int currentPage, SDChannelObj* keepChannel);
|
||||
void refreshChannelList();
|
||||
bool hasChannelObject(int page, int index) const;
|
||||
SDChannelObj* findChannelObject(int page, int index) const;
|
||||
void createChannelObject(int page, int index);
|
||||
void createBaseLayout();
|
||||
void createSceneLayouts();
|
||||
BOOL isChannelMoveTarget(int page, int index) const;
|
||||
void selectChannel(int page, int index);
|
||||
BOOL prepareRestarting(int page);
|
||||
void startPageTransition(int page, int index);
|
||||
void setCurrentPageAndRefresh(int page, int index, SDChannelObj* keepChannel);
|
||||
void handleFourPageDialog();
|
||||
void handleThreePageDialog();
|
||||
void setPageActionFrame();
|
||||
void advancePageAnimation();
|
||||
void finishPageScroll();
|
||||
void finishCardDialog();
|
||||
void flushSaveDataAndMountSD();
|
||||
void startDrag(const controller::Interface* controller, int page, int index);
|
||||
void finishDrag();
|
||||
void moveDrag();
|
||||
void updateDragState();
|
||||
void updateDragPageTransition();
|
||||
void finishDragWait();
|
||||
void finishDragPageTransition();
|
||||
void applyChannelMove();
|
||||
void finishChannelMove();
|
||||
void resetDragPreview();
|
||||
void finishDragPageChange();
|
||||
BOOL isPageCreated(int page) const;
|
||||
void refreshPageObjects(int page, SDChannelObj* keepChannel, int noticeIndex);
|
||||
void updateChannelObjectOrder(int page);
|
||||
void moveChannelObjectsToDrawOrder(int page, int mode);
|
||||
void setLayoutFrame(int state);
|
||||
BOOL tellStartingZoomAnm();
|
||||
void initPageAnimations(const math::VEC3& position, int direction);
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void removeNandTitleInfo(ESTitleId titleId) {
|
||||
u32 titleCount = mNandTitleCount;
|
||||
u32 index = 0;
|
||||
for (; index < titleCount; ++index) {
|
||||
if (mpNandTitleInfo[index].curTitleId == titleId) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (index < mNandTitleCount) {
|
||||
for (; index < mNandTitleCount - 1; ++index) {
|
||||
NandSDWorker::TitleUsage& nextTitle = mpNandTitleInfo[index + 1];
|
||||
NandSDWorker::TitleUsage& currentTitle = mpNandTitleInfo[index];
|
||||
currentTitle.curTitleId = nextTitle.curTitleId;
|
||||
currentTitle.size = nextTitle.size;
|
||||
currentTitle.inode = nextTitle.inode;
|
||||
}
|
||||
--mNandTitleCount;
|
||||
}
|
||||
}
|
||||
nw4r::math::VEC3 getPageTransitionPosition(int index) const {
|
||||
nw4r::math::VEC3 position(0.0f, 0.0f, 0.0f);
|
||||
nw4r::lyt::Pane* pane = getCenterChannelPane(index);
|
||||
PSMTXMultVec(pane->GetGlobalMtx(), position, position);
|
||||
return position;
|
||||
}
|
||||
#endif
|
||||
static BOOL isChannelReady(const SDChannelObj* channel);
|
||||
nw4r::ut::List mChannelObjects;
|
||||
nand::LayoutFile* mpLayoutFile;
|
||||
layout::Object* mpLayout;
|
||||
math::HermiteIntp<math::VEC3>* mpPageAnimations[4];
|
||||
gui::PaneManager* mpPaneManager;
|
||||
layout::Object* mpNoCardLayout;
|
||||
layout::Object* mpPageLayouts[3];
|
||||
layout::Object* mpDialogLayout;
|
||||
SDButtonEventHandlerBase* mpButtonEventHandler;
|
||||
int mState;
|
||||
int mCurrentPage;
|
||||
int mPageCount;
|
||||
int mCurrentChannelIndex;
|
||||
f32 mThumbOffsetX;
|
||||
f32 mThumbOffsetY;
|
||||
math::VEC3 mPosition;
|
||||
math::VEC2 mScale;
|
||||
f32 mAspectRatioScale;
|
||||
bool mbLeftArrowVisible;
|
||||
bool mbRightArrowVisible;
|
||||
u8 mArrowState;
|
||||
u8 mNoCardState;
|
||||
EGG::UnitHeap* mpLayoutHeap;
|
||||
EGG::ExpHeap* mpDialogHeap;
|
||||
EGG::ExpHeap* mpChannelHeap;
|
||||
EGG::ExpHeap* mpThumbnailHeap;
|
||||
nw4r::math::VEC2 mPointerPosition;
|
||||
int mControllerChannel;
|
||||
int mSourcePage;
|
||||
int mSourceIndex;
|
||||
int mDestinationPage;
|
||||
int mDestinationIndex;
|
||||
int mPendingPage;
|
||||
int mPendingIndex;
|
||||
int mMoveState;
|
||||
bool mbButtonEnabled;
|
||||
bool mbDialogActive;
|
||||
u16 mInputFlags;
|
||||
void* mpCurrentChannel;
|
||||
layout::Object* mpStateLayout;
|
||||
layout::Animator* mpHelpLayout;
|
||||
EGG::ExpHeap* mpRsoHeap;
|
||||
channel::RsoThread* mpRsoThread;
|
||||
u32 mCommandQueueState;
|
||||
SDChannelSelectCommandQueue mCommandQueue;
|
||||
SDChannelSelectNoticeQueue mNoticeQueue;
|
||||
int mCurrentSDState;
|
||||
int mPreviousSDState;
|
||||
int mWorkerState;
|
||||
int mWorkerCommand;
|
||||
EGG::Heap* mpWorkerHeap;
|
||||
EGG::Heap* mpThumbnailWorkHeap;
|
||||
NandSDWorker* mpSDWorker;
|
||||
ESTitleId32* mpSDTitleIds;
|
||||
SDChannelSelectTitleInfo* mpSDTitleInfo;
|
||||
mutable NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
mutable s32 mFirstTitleCount;
|
||||
mutable s32 mSecondTitleCount;
|
||||
SDChannelObj* mpCurrentLoadedChannel;
|
||||
u32 mSDTitleCount;
|
||||
u32 mNandTitleCount;
|
||||
u32* mpChannelTitleIds;
|
||||
u32 mPendingOperation;
|
||||
int mLastOperation;
|
||||
layout::Object* mpErrorLayout;
|
||||
layout::Object* mpPointerLayout;
|
||||
layout::Object* mpHelpButtonLayout;
|
||||
int mOperationResult;
|
||||
u8 mbShowNoCardMessage;
|
||||
u8 mbOperationActive;
|
||||
u8 mbSDCardBroken;
|
||||
int mOperationState;
|
||||
int mDialogState;
|
||||
nand::File* mpSaveDataFile;
|
||||
u32 mAnimationState;
|
||||
u32 mAnimationTarget;
|
||||
OSTime mOperationStartTime;
|
||||
nand::File* mpCorruptIconFile;
|
||||
u8 mbHazardTitleFound;
|
||||
u8 mbChannelLimitReached;
|
||||
u8 mbInitialLoadComplete;
|
||||
u8 mbNeedsRefresh;
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
}
|
||||
}
|
||||
|
||||
#endif // IPL_SCENE_SD_CHANNEL_SELECT_H
|
||||
#endif
|
||||
|
||||
@@ -3,15 +3,104 @@
|
||||
|
||||
#include "iplSceneHeader.h"
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
#include "math/iplInterporation.h"
|
||||
#include "scene/sdChannelMemory/iplSDMemory.h"
|
||||
#include "system/iplChannelRsoThread.h"
|
||||
#include "utility/iplCapture.h"
|
||||
#include <private/es.h>
|
||||
#include <nw4r/snd/SoundHandle.h>
|
||||
#endif
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class SDChannelSelect;
|
||||
class SDButtonEventHandlerBase;
|
||||
FADER_SCENE_CLASS(SDChannelTitle) {
|
||||
public:
|
||||
SDChannelTitle(EGG::Heap * heap, SDChannelSelect * chanSel);
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual ~SDChannelTitle();
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void calcCommon();
|
||||
virtual FaderSceneCommand calcFadein();
|
||||
virtual FaderSceneCommand calcNormal();
|
||||
virtual void initCalcFadeout();
|
||||
virtual FaderSceneCommand calcFadeout();
|
||||
virtual void draw();
|
||||
virtual void destroy();
|
||||
BOOL isResetAcceptable();
|
||||
virtual void startResetting();
|
||||
|
||||
using Base::reserveAllSceneDestruction;
|
||||
using Base::createChildScene;
|
||||
|
||||
s32 mState;
|
||||
EGG::ExpHeap* mpBannerHeap;
|
||||
EGG::ExpHeap* mpCaptureHeap;
|
||||
s32 mPage;
|
||||
s32 mIndex;
|
||||
s32 mPageCount;
|
||||
s32 mNextScene;
|
||||
s32 mParentalResult;
|
||||
math::VEC3 mPosition;
|
||||
u32 mLaunchFrame;
|
||||
s32 mStartButtonState;
|
||||
bool mbBannerStarting;
|
||||
layout::Animator* mpButtonAnimations[7][6];
|
||||
math::HermiteIntp<f32>* mpFade;
|
||||
SDChannelSelect* mpChannelSelect;
|
||||
nand::LayoutFile* mpLayoutFile;
|
||||
layout::Object* mpLayout;
|
||||
gui::PaneManager* mpPaneManager;
|
||||
layout::Object* mpIconLayout;
|
||||
EGG::ExpHeap* mpIconHeap;
|
||||
layout::Object* mpProgressLayout;
|
||||
s32 mLoadedIndex;
|
||||
nand::LayoutFile* mpBannerFiles[2];
|
||||
nand::File* mpSoundFiles[2];
|
||||
layout::Object* mpBannerLayout;
|
||||
layout::Animator* mpBannerAnimations[3];
|
||||
nw4r::snd::SoundHandle* mpSoundHandle;
|
||||
nand::File* mpSaveFile;
|
||||
u32 mWpadStopTick;
|
||||
s32 mHoverCounts[2];
|
||||
SDButtonEventHandlerBase* mpButtonEventHandler;
|
||||
utility::Capture* mpScreenCapture;
|
||||
utility::Capture* mpBannerCapture;
|
||||
ESTmdView* mpTmd;
|
||||
u8 mbTmdReady;
|
||||
u8 mTitleFlags;
|
||||
u16 mMakerCode;
|
||||
u8 mbStartAnimation;
|
||||
s32 mScriptState;
|
||||
s32 mScriptEnabled;
|
||||
bool mbStopScript;
|
||||
u32 mScriptFrame;
|
||||
u32 mScriptDuration;
|
||||
nand::File* mpScriptFile;
|
||||
EGG::ExpHeap* mpScriptHeaps[2];
|
||||
s32 mScriptHeapIndex;
|
||||
channel::RsoThread* mpRsoThread;
|
||||
EGG::ExpHeap* mpRsoHeap;
|
||||
layout::Animator* mpScriptAnimations[16];
|
||||
bool mbScriptFailed;
|
||||
EGG::ExpHeap* mpScriptHeap;
|
||||
ESTitleId mTitleId;
|
||||
SDMemory::TitleRange mTitleRange;
|
||||
u8 mUnknownTitleWork[0x800];
|
||||
SDMemory mMemory;
|
||||
u32 mErrorMessage;
|
||||
s32 mChangeFrame;
|
||||
u8 mbCopiedTitle;
|
||||
u8 mbResetAcceptable;
|
||||
nw4r::snd::SoundHandle* mpCopySound;
|
||||
#else
|
||||
private:
|
||||
u8 unk_0x58[0x3460];
|
||||
#endif
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
32
include/scene/setting/AOSS.h
Normal file
32
include/scene/setting/AOSS.h
Normal file
@@ -0,0 +1,32 @@
|
||||
#ifndef IPL_SCENE_SETTING_AOSS_H
|
||||
#define IPL_SCENE_SETTING_AOSS_H
|
||||
|
||||
#include <revolution/ncd/NCDTypes.h>
|
||||
#include <revolution/types.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct AOSSInitInput {
|
||||
u16 flags;
|
||||
u8 mode;
|
||||
u8 reserved;
|
||||
u16 ssidLength;
|
||||
u8 ssid[0x100];
|
||||
s16 options[5];
|
||||
u8 optionData[6];
|
||||
u8 status;
|
||||
u8 result[0x154];
|
||||
} AOSSInitInput;
|
||||
|
||||
int AOSSi_Init(AOSSInitInput* input);
|
||||
int AOSS_Init_old(AOSSInitInput* input);
|
||||
void* AOSSi_Alloc(u32 size);
|
||||
void AOSSi_Free(void* block);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -17,7 +17,11 @@ namespace ipl {
|
||||
|
||||
virtual ~APScanThread(); // 0x08
|
||||
virtual void* Run(); // 0x0C
|
||||
virtual void unk_0x2C() = 0; // 0x2C
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
virtual void unk_0x2C();
|
||||
#else
|
||||
virtual void unk_0x2C() = 0;
|
||||
#endif
|
||||
|
||||
void setResultData(unsigned short* buffer);
|
||||
void setParam();
|
||||
|
||||
@@ -3,14 +3,174 @@
|
||||
|
||||
#include "iplSceneHeader.h"
|
||||
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
#include <revolution/os.h>
|
||||
#include "layout/iplGuiManager.h"
|
||||
#include "layout/GUIManager.h"
|
||||
#include "iplwww/www_wiisetting.h"
|
||||
#include "iplwww/www_browser.h"
|
||||
#include "system/iplKeyboard.h"
|
||||
#include "system/iplNand.h"
|
||||
#include "utility/iplThread.h"
|
||||
extern "C" {
|
||||
#include <revolution/wd.h>
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace ipl {
|
||||
namespace controller {
|
||||
class Interface;
|
||||
}
|
||||
}
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
class Setting;
|
||||
class APScanThread;
|
||||
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
class APEvent;
|
||||
#else
|
||||
class APEvent : public ::gui::EventHandler {
|
||||
public:
|
||||
APEvent(Setting* setting) : ::gui::EventHandler(), mpSetting(setting) {}
|
||||
|
||||
virtual void onEvent(u32 componentID, u32 event, void* data);
|
||||
|
||||
private:
|
||||
Setting* mpSetting;
|
||||
};
|
||||
#endif
|
||||
|
||||
struct SettingAPScanList {
|
||||
u8 unknown[0x14];
|
||||
union {
|
||||
struct {
|
||||
u16 count;
|
||||
u8 entries[0x7fe];
|
||||
};
|
||||
u8 recordBuffer[0x800];
|
||||
};
|
||||
union {
|
||||
WDBssDesc_* currentDescriptor;
|
||||
u16* currentDescriptorWords;
|
||||
};
|
||||
};
|
||||
#endif
|
||||
|
||||
FADER_SCENE_CLASS(Setting) {
|
||||
public:
|
||||
Setting(EGG::Heap * heap, int arg);
|
||||
void setInitializeResult(bool, int);
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
virtual ~Setting();
|
||||
|
||||
bool isAnimating();
|
||||
void getFuncMsgQ();
|
||||
void resetFuncMsgQ();
|
||||
void createBrowser();
|
||||
void initDirectUrl();
|
||||
void initString();
|
||||
void initWiiSettingData();
|
||||
void initNickName();
|
||||
void initSecurityKey();
|
||||
void initSSID();
|
||||
void initIP();
|
||||
void initDNS();
|
||||
void initProxy();
|
||||
void initBasic();
|
||||
void initMTU();
|
||||
void initSecA();
|
||||
void initVersion();
|
||||
void updateController_();
|
||||
void setSE();
|
||||
void changeVideoMode();
|
||||
bool isInitialSequenceExit(const ::ipl::controller::Interface* input);
|
||||
bool updateScreenMode();
|
||||
void initHTMLText();
|
||||
void initMessage();
|
||||
void initKeyboard(const char* text);
|
||||
bool checkInputString(const wchar_t* text) NO_INLINE;
|
||||
int checkIPString(const wchar_t* text);
|
||||
void setDefaultBackString();
|
||||
void calcKeyboard();
|
||||
void calcSetting();
|
||||
void onTextInputOK();
|
||||
void setDisPos();
|
||||
void setNickName();
|
||||
void setSecurityKey();
|
||||
void setSSID();
|
||||
void setIP();
|
||||
void setDNS();
|
||||
void setProxy();
|
||||
void setBasic();
|
||||
void setMTU();
|
||||
void setParePass();
|
||||
void setPareRePass();
|
||||
void setPareJudgePass();
|
||||
void setSecA();
|
||||
void setReSecA();
|
||||
void setMasterKey();
|
||||
void adjustSecA(wchar_t* text);
|
||||
void reAdjustSecA();
|
||||
u8 checkTextNum(const char* text);
|
||||
bool checkSpace();
|
||||
void convertIP(char* destination, const u8* address);
|
||||
void convertRevIP(u8* destination, const char* address);
|
||||
void initScroll();
|
||||
void updateScroll();
|
||||
void setAPDraw();
|
||||
int getRadioLevel(const WDBssDesc_* descriptor);
|
||||
void setUseEULA_Init_();
|
||||
void setUseEULA_Cancel_();
|
||||
void setUseEULA_Start_();
|
||||
void setUseEULA_WaitStopMotor_();
|
||||
bool validateEULA_();
|
||||
void setUpdate_Init_();
|
||||
void setUpdate_WaitAcceptDialog_();
|
||||
void setUpdate_ConnectTestStart_();
|
||||
void setUpdate_ConnectTestCreateWait_();
|
||||
void setUpdate_ConnectTestRun_();
|
||||
void setUpdate_ConnectTestFailed_();
|
||||
void setUpdate_SuccessDialog_();
|
||||
void setUpdate_NoUpdateDialog_();
|
||||
void setUpdate_EULAInit_();
|
||||
void setUpdate_Reboot_();
|
||||
void makeErrorMessage();
|
||||
bool calcSafeMode();
|
||||
void waitStart();
|
||||
void waitFinish();
|
||||
bool isWaitPlaying();
|
||||
void initAP();
|
||||
void resetAP();
|
||||
void redrawAP();
|
||||
void scanAP();
|
||||
void setNUP();
|
||||
void setUSBAP();
|
||||
void cancelUSBAP();
|
||||
void AOSSProcess();
|
||||
void RakuProcess();
|
||||
void setUpdate_();
|
||||
void setUseEULA_();
|
||||
void start_point_event(const char* pageName);
|
||||
void start_trig_event(const char* pageName);
|
||||
void start_left_event(const char* pageName);
|
||||
int get_arw_no(const char* paneName);
|
||||
int get_ap_no(const char* buttonName);
|
||||
void makeSupportCode();
|
||||
int getErrorNum();
|
||||
virtual void destroy();
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void draw();
|
||||
virtual FaderSceneCommand calcFadein();
|
||||
virtual FaderSceneCommand calcNormal();
|
||||
virtual FaderSceneCommand calcFadeout();
|
||||
virtual BOOL isResetAcceptable() const;
|
||||
#endif
|
||||
|
||||
u16 getProfileID();
|
||||
void setInitializeResult(bool, int);
|
||||
void setConnectTestResult(int, int, bool, int);
|
||||
int getUpdateTiming();
|
||||
|
||||
@@ -25,8 +185,97 @@ namespace ipl {
|
||||
};
|
||||
|
||||
private:
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
int mUpdateTiming;
|
||||
u8 unk_0x5C;
|
||||
u8 unk_0x5D[3];
|
||||
nand::Base* mpWWWLibraryFile;
|
||||
nand::Base* mpSettingHTMLFile;
|
||||
nand::Base* mpWWWArchiveFile;
|
||||
nand::Base* mpFontFile;
|
||||
nand::Base* mpBackgroundTPLFile;
|
||||
int unk_0x74;
|
||||
int unk_0x78;
|
||||
int unk_0x7C;
|
||||
int mProfileIDMode;
|
||||
int unk_0x84;
|
||||
int mAOSSState;
|
||||
int mRakuState;
|
||||
int mFuncMsgPending;
|
||||
int unk_0x94;
|
||||
ESTitleId mUpdateTitleId;
|
||||
u32 mPrepareTick;
|
||||
u8 mSettingData[0x16];
|
||||
u8 unk_0xBA[2];
|
||||
nand::LayoutFile* mpSettingLayoutFile;
|
||||
layout::Object* mpChangeLayout;
|
||||
layout::Object* mpMainLayout;
|
||||
layout::Object* mpWaitLayout;
|
||||
utility::FrameController* mpFirstAnimation;
|
||||
utility::FrameController* mpSecondAnimation;
|
||||
APEvent* mpEventHandler;
|
||||
gui::PaneManager* mpPaneManager;
|
||||
void* mpUSBAPThread;
|
||||
utility::ut_thread* mpAOSSThread;
|
||||
utility::ut_thread* mpRakuRakuThread;
|
||||
APScanThread* mpAPScanThread;
|
||||
SettingAPScanList mAPScanList;
|
||||
void* mpMem1BrowserBuffer;
|
||||
u32 unk_0x908;
|
||||
void* mpMem2BrowserBuffer;
|
||||
void* mpBrowserStringBuffer;
|
||||
int unk_0x914;
|
||||
int unk_0x918;
|
||||
u8 unk_0x91C[4];
|
||||
ext_ead::www::ImeData* mpBrowserData;
|
||||
www::wiisetting::WiiData* mpWiiSettingData;
|
||||
www::wiisetting::WiiFlag* mpWiiSettingFlag;
|
||||
u8 unk_0x92C;
|
||||
u8 unk_0x92D[3];
|
||||
int unk_0x930;
|
||||
www::wiisetting::SetStringBuf* mpStringBuffer;
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
wchar_t unk_0x938[0x101];
|
||||
#else
|
||||
u8 unk_0x938[0x202];
|
||||
#endif
|
||||
u8 unk_0xB3A;
|
||||
u8 mBrowserCreated;
|
||||
keyboard::Manager::State mKeyboardState;
|
||||
int mInitialArgument;
|
||||
int mAspectRatio;
|
||||
int mProgressiveMode;
|
||||
int mEuRgb60Mode;
|
||||
u8 mIsResetAcceptable;
|
||||
u8 unk_0xB5D[3];
|
||||
OSMessageQueue mFuncMessageQueue;
|
||||
OSMessage mFuncMessages[5];
|
||||
int unk_0xB94;
|
||||
int mState;
|
||||
int unk_0xB9C;
|
||||
OSTime mCreatePageTime;
|
||||
u32 unk_0xBA8;
|
||||
u8 unk_0xBAC;
|
||||
u8 unk_0xBAD[3];
|
||||
u8 unk_0xBB0[0x10];
|
||||
static void* mem1Buffer_;
|
||||
static void* mem2Buffer_;
|
||||
#else
|
||||
u8 unk_0x58[0xB68];
|
||||
#endif
|
||||
|
||||
};
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
class APEvent : public ::gui::EventHandler {
|
||||
public:
|
||||
APEvent(Setting* setting) : ::gui::EventHandler(), mpSetting(setting) {}
|
||||
|
||||
virtual void onEvent(u32 componentID, u32 event, void* data);
|
||||
|
||||
private:
|
||||
Setting* mpSetting;
|
||||
};
|
||||
#endif
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
|
||||
@@ -20,6 +20,10 @@ namespace ipl {
|
||||
return mState == STATE_WAIT_CHILD;
|
||||
}
|
||||
|
||||
#ifdef IPL_MEMORYCARD_BASE_IMPLEMENTATION
|
||||
int getMemoryCardTransitionState() const { return mState; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
enum {
|
||||
// Base
|
||||
@@ -163,12 +167,12 @@ namespace ipl {
|
||||
|
||||
bool is_stopped_all_anm() const;
|
||||
|
||||
void fn_81409864();
|
||||
void calc_exit_sequence();
|
||||
|
||||
void fn_814098F4();
|
||||
void fn_unk_inline();
|
||||
void fn_81409988();
|
||||
void fn_814099EC();
|
||||
void prepare_exit_abort();
|
||||
void wait_decide_se();
|
||||
void start_exit_fade();
|
||||
void finish_exit_reboot();
|
||||
|
||||
int mState; // 0x60
|
||||
int mPrevState; // 0x64
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int fn_8135B1C0();
|
||||
int getProgressPercent();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -36,6 +36,11 @@
|
||||
#define MAX_CHANNEL_INFO_SIZE CHANNEL_INFO_SIZE(MAX_CHANNEL_PAGE, MAX_CHANNEL_INDEX)
|
||||
|
||||
namespace ipl {
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
namespace scene {
|
||||
class SDChannelSelect;
|
||||
}
|
||||
#endif
|
||||
namespace channel {
|
||||
enum {
|
||||
PRIMARY_TYPE_NONE = 0,
|
||||
@@ -331,19 +336,19 @@ namespace ipl {
|
||||
|
||||
BOOL nand_error_handling(int code);
|
||||
|
||||
SEntry* fn_8133A4E0(ESTitleId titleId);
|
||||
u32 fn_8133A57C(ESTitleId titleId);
|
||||
u32 fn_8133A5B8(ESTitleId titleId);
|
||||
BOOL fn_8133A5F0(ESTitleId titleId);
|
||||
BOOL fn_8133A634(ESTitleId titleId);
|
||||
BOOL fn_8133A678(ESTitleId titleId);
|
||||
BOOL fn_8133A6B8(ESTitleId titleId);
|
||||
BOOL fn_8133A73C(ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
|
||||
void fn_8133A9F0();
|
||||
void fn_8133AA50(ESTitleId titleId);
|
||||
SEntry* findEntryByTitleId(ESTitleId titleId);
|
||||
u32 getBannerCSIdx(ESTitleId titleId);
|
||||
u32 getSoundSize(ESTitleId titleId);
|
||||
BOOL needsNetSetting(ESTitleId titleId);
|
||||
BOOL usesAltSound(ESTitleId titleId);
|
||||
BOOL isMissingTicket(ESTitleId titleId);
|
||||
BOOL isNewsChannelV6Plus(ESTitleId titleId);
|
||||
BOOL isOperaChannel(ESTitleId titleId);
|
||||
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
void clearTmpChannel();
|
||||
void unloadBanner(ESTitleId titleId);
|
||||
|
||||
BOOL isReady() { return mState == FINISH; }
|
||||
|
||||
@@ -368,6 +373,9 @@ namespace ipl {
|
||||
char* getChJumpData() { return mChJumpData; }
|
||||
|
||||
private:
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
friend class ipl::scene::SDChannelSelect;
|
||||
#endif
|
||||
typedef struct MD5Head {
|
||||
u8 magic[4]; // 0x00 (`IMD5`; "IPL MD5"?)
|
||||
u32 length; // 0x04
|
||||
|
||||
@@ -63,10 +63,14 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
#ifdef IPL_CONTROLLER_NATIVE_HIERARCHY
|
||||
#ifdef IPL_CONTROLLER_OUT_OF_LINE_INTERFACE
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature;
|
||||
#else
|
||||
#ifdef IPL_CONTROLLER_INLINE_INTERFACE
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature implementation
|
||||
#else
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature;
|
||||
#endif
|
||||
#endif
|
||||
class Interface {
|
||||
public:
|
||||
@@ -79,7 +83,7 @@ namespace ipl {
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinch() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinchTrg() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinchOffTrg() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int decide() const, { return 0; })
|
||||
virtual int decide() const = 0;
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool repeat(u32 button) const, { return false; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(BOOL rumble(int type = 0), { return FALSE; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(void cancelRumbling(), { })
|
||||
|
||||
@@ -118,6 +118,11 @@ namespace ipl {
|
||||
int getLastResult() { return mLastResult; }
|
||||
/** @return If the dialog is moving onto the next state. */
|
||||
bool doingNextState() { return mbNextState; }
|
||||
#ifdef IPL_SDMEMORY_DIALOG_STATE_ACCESSOR
|
||||
int getStateForSDMemory() const { return mState; }
|
||||
int getResultForSDMemory() const { return mResult; }
|
||||
void setTitleForSDMemory(const wchar_t* text) { set_title(text); }
|
||||
#endif
|
||||
|
||||
/*=================*/
|
||||
/* DIALOG BUTTON 0 */
|
||||
@@ -322,6 +327,9 @@ namespace ipl {
|
||||
void setProgBarLength(int len) { mProgBarLen = len; }
|
||||
/** @return The current length of the progress bar */
|
||||
int getProgBarLength() { return mProgBarLen; }
|
||||
#ifdef IPL_SDMEMORY_DIALOG_PROGRESS_FRAME_ACCESSOR
|
||||
int getProgBarFrame() const { return mProgBarFrame; }
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Dialog component handler (Automatically executed by the GUI manager)
|
||||
|
||||
@@ -37,23 +37,41 @@ namespace ipl {
|
||||
LETTER,
|
||||
PHOTO_LETTER,
|
||||
NUMERIC,
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
NORMAL_WITHOUT_LINEFEED = 2,
|
||||
NORMAL_WITHOUT_LINEFEED_WITH_SIGN = 4,
|
||||
NORMAL_BIGTEXT_WITHOUT_LINEFEED = 6,
|
||||
#else
|
||||
NORMAL_WITHOUT_LINEFEED,
|
||||
NORMAL_WITHOUT_LINEFEED_WITH_SIGN,
|
||||
NORMAL_BIGTEXT_WITHOUT_LINEFEED,
|
||||
#endif
|
||||
ONLY_QWERTY_WITHOUT_LINEFEED_AND_SIGN,
|
||||
ONLY_QWERTY_BIGTEXT_WITHOUT_LINEFEED_AND_SIGN,
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
NUMERIC_WITH_DOT = 16,
|
||||
NUMERIC_BIGTEXT_WITH_DOT = 10,
|
||||
#else
|
||||
NUMERIC_WITH_DOT,
|
||||
NUMERIC_BIGTEXT_WITH_DOT,
|
||||
#endif
|
||||
NORMAL_BIGTEXT_WITHOUT_LINEFEED_WITH_SIGN,
|
||||
NUMERIC_WITH_SEPERATOR,
|
||||
PREDICT_WITHOUT_LINEFEED,
|
||||
} KeyboardType;
|
||||
|
||||
typedef struct KeyboardSetting {
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
u32 rowLimit;
|
||||
const wchar_t* wcString;
|
||||
u32 stringLimit;
|
||||
KeyboardType type;
|
||||
#else
|
||||
KeyboardType type; // 0x00
|
||||
const wchar_t* wcString; // 0x04
|
||||
u32 stringLimit; // 0x08
|
||||
u32 rowLimit; // 0x0C
|
||||
#endif
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
KeyboardSetting(KeyboardType keyboardType, const wchar_t* value, u32 limit, u32 rows);
|
||||
#endif
|
||||
@@ -63,8 +81,15 @@ namespace ipl {
|
||||
textinput::MemoManager::StateType type; // 0x00
|
||||
KeyboardState iplType; // 0x04
|
||||
bool pressOK; // 0x08
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
u8 reservedByte;
|
||||
#else
|
||||
u8 unused_0x09;
|
||||
#endif
|
||||
wchar_t* wcString; // 0x0C
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
State& operator=(const State& other);
|
||||
#endif
|
||||
} State;
|
||||
|
||||
Manager() : mpManager(NULL), mEvent(), mCurrentConChan(0), mbActivated(false), mpSaveFile(NULL) {}
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
#include "system/iplMessage.h"
|
||||
|
||||
namespace ipl {
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
namespace scene { class Setting; }
|
||||
#endif
|
||||
namespace message {
|
||||
class Manager {
|
||||
public:
|
||||
@@ -16,6 +19,9 @@ namespace ipl {
|
||||
void setResource(u8* msgData) const { mpMessage->setResource(msgData); }
|
||||
|
||||
private:
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
friend class scene::Setting;
|
||||
#endif
|
||||
void initMessage();
|
||||
|
||||
Message* mpMessage; // 0x00
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
void read_sd_app_location_async(ESTitleId32* titleIds);
|
||||
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
||||
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
||||
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
|
||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
||||
|
||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||
|
||||
@@ -151,6 +151,10 @@ namespace ipl {
|
||||
BOOL is_terminated();
|
||||
BOOL is_working();
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void requestCancel() { unk_0x04 = true; }
|
||||
#endif
|
||||
|
||||
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
|
||||
void* get_cached_nand_app_thumbnail(ESTitleId titleId, u32*);
|
||||
WIISaveBannerFile* get_cached_sd_save_banner(ESTitleId32 titleId);
|
||||
@@ -179,6 +183,10 @@ namespace ipl {
|
||||
|
||||
static const int SD_APP_BACKUP_THUMBNAIL_LENGTH = 0xC800;
|
||||
|
||||
#ifdef IPL_SDMEMORY_COMPLETION_PCT_ACCESSOR
|
||||
static int getCompletionPct() { return s_completion_pct; }
|
||||
#endif
|
||||
|
||||
protected:
|
||||
static const int FAT_PAGES = 8;
|
||||
static const int DATA_PAGES = 32;
|
||||
@@ -506,7 +514,7 @@ namespace ipl {
|
||||
void do_check_for_sd_app_to_nand();
|
||||
void check_backup_fits();
|
||||
void do_list_nand_apps_usage();
|
||||
void do_unk_8134C838();
|
||||
void do_check_sd_app_titles();
|
||||
|
||||
void do_move_nand_app_to_sd();
|
||||
void do_move_sd_app_to_nand();
|
||||
|
||||
@@ -15,11 +15,16 @@
|
||||
#define SAVEDATA_VERSION 3
|
||||
|
||||
namespace ipl {
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
|
||||
namespace scene {
|
||||
class SDChannelSelect;
|
||||
}
|
||||
#endif
|
||||
namespace channel {
|
||||
class Manager;
|
||||
}
|
||||
namespace savedata {
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
@@ -29,6 +34,9 @@ namespace ipl {
|
||||
void initManager();
|
||||
|
||||
void setPrevPage(int prevPage);
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
int& getSDPrevPage() { return mData.prevSDPage; }
|
||||
#endif
|
||||
void setChanInfo(int page, int index, const channel::SInfo& chanInfo);
|
||||
void setMemoSetting(const textinput::extend::savedata::MemoSetting& memoSetting);
|
||||
|
||||
@@ -50,6 +58,26 @@ namespace ipl {
|
||||
|
||||
int getPrevPage() { return mLastPrevPage; }
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
|
||||
int getLastSDPrevPage() { return mLastSDPrevPage; }
|
||||
void setLastSDPrevPage(int page) { mLastSDPrevPage = page; }
|
||||
BOOL didntGotoSDMenu() const { return mData.didntGotoSDMenu; }
|
||||
void setDidntGotoSDMenu(BOOL value) { mData.didntGotoSDMenu = value; }
|
||||
#endif
|
||||
|
||||
#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 {
|
||||
if (index < 0 || index >= MAX_CHANNEL_TOTAL) {
|
||||
return 0;
|
||||
}
|
||||
return (&mData.titleCache[0][0])[index];
|
||||
}
|
||||
#endif
|
||||
|
||||
bool hasPhotoMP3Dummy() { return mbPhotoMP3; }
|
||||
bool hasPhoto2Title() { return mbPhoto2; }
|
||||
bool hasPhoto2DummyCheck() { return mbPhoto2Check; }
|
||||
@@ -59,9 +87,12 @@ 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
|
||||
friend class ipl::scene::SDChannelSelect;
|
||||
#endif
|
||||
BOOL checkValidApp(ESTitleId titleId);
|
||||
|
||||
static void initManagerTask(void* work);
|
||||
@@ -153,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
|
||||
|
||||
@@ -49,6 +49,9 @@ namespace ipl {
|
||||
public:
|
||||
Scroller();
|
||||
|
||||
#ifdef IPL_SDMEMORY_SCROLLER_INIT_OUT_OF_LINE
|
||||
void init();
|
||||
#else
|
||||
void init() {
|
||||
mState = 0;
|
||||
mScroll = 0.0f;
|
||||
@@ -56,6 +59,7 @@ namespace ipl {
|
||||
mUpLimit = 0.0f;
|
||||
mDownLimit = 0.0f;
|
||||
}
|
||||
#endif
|
||||
|
||||
void calc();
|
||||
f32 get() const;
|
||||
@@ -69,6 +73,9 @@ namespace ipl {
|
||||
|
||||
void setDownLimit(f32 v) { mDownLimit = v; }
|
||||
void setUpLimit(f32 v) { mUpLimit = v; }
|
||||
#ifdef IPL_SDMEMORY_SCROLLER_STATE_ACCESSOR
|
||||
void setState(int state) { mState = state; }
|
||||
#endif
|
||||
|
||||
void addScroll(f32 v) { mScroll += v; }
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
41
libs/MSL/include/internal/format_runtime.h
Normal file
41
libs/MSL/include/internal/format_runtime.h
Normal file
@@ -0,0 +1,41 @@
|
||||
#ifndef MSL_FORMAT_RUNTIME_H
|
||||
#define MSL_FORMAT_RUNTIME_H
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <limits.h>
|
||||
#include <errno.h>
|
||||
#include <internal/locale.h>
|
||||
#define SIGDIGLEN 36
|
||||
#define LDBL_MANT_DIG 53
|
||||
#define LDBL_MAX_EXP 1024
|
||||
#define LDBL_MIN_EXP (-1021)
|
||||
#define DBL_MAX 1.7976931348623157e308
|
||||
#define DBL_MIN 2.2250738585072014e-308
|
||||
#define DBL_EPSILON 2.2204460492503131e-16
|
||||
#define EOF (-1)
|
||||
typedef long ptrdiff_t;
|
||||
typedef long long intmax_t;
|
||||
typedef unsigned long long uintmax_t;
|
||||
typedef struct {
|
||||
char sign;
|
||||
short exp;
|
||||
struct { unsigned char length; unsigned char text[SIGDIGLEN]; } sig;
|
||||
} decimal;
|
||||
typedef struct { char style; short digits; } decform;
|
||||
enum __ReadProcActions { __GetAChar, __UngetAChar, __TestForError };
|
||||
typedef struct { char* CharStr; size_t MaxCharCount; size_t CharsWritten; } __OutStrCtrl;
|
||||
typedef struct { char* NextChar; int NullCharDetected; } __InStrCtrl;
|
||||
void __num2dec(const decform*, double, decimal*);
|
||||
double __dec2num(const decimal*);
|
||||
size_t __fwrite(const void*, size_t, size_t, FILE*);
|
||||
int __StringRead(void*, int, int);
|
||||
unsigned long __strtoul(int, int, int (*)(void*, int, int), void*, int*, int*, int*);
|
||||
unsigned long long __strtoull(int, int, int (*)(void*, int, int), void*, int*, int*, int*);
|
||||
long double __strtold(int, int (*)(void*, int, int), void*, int*, int*);
|
||||
int wctomb(char*, wchar_t);
|
||||
double nan(const char*);
|
||||
#define signbit(x) __signbitd(x)
|
||||
#endif
|
||||
88
libs/MSL/matching-attempts.log
Normal file
88
libs/MSL/matching-attempts.log
Normal file
@@ -0,0 +1,88 @@
|
||||
MSL restoration, 43U, baseline 0 exact functions and 0 matched code/data in all six units.
|
||||
Sources: zeldaret/tp MSL printf/wprintf; public Mario Strikers Charged MSL decimal/scanning/strtold references in /tmp/mscharged-new; time reference experiments in /tmp. All measurements were rebuilt locally.
|
||||
|
||||
printf long2str: corrected 32-bit minimum constant; 138/138 instructions, zero differences.
|
||||
printf float2str: removed unnecessary short narrowing from exponent update; 500/500 instructions, zero differences.
|
||||
printf double2hex:
|
||||
1. Deferred output pointer initialization until after width validation: 242/242, 97 differences.
|
||||
2. Moved output pointer declaration after decimal: 242/242, same 97 differences.
|
||||
3. Copied incoming format into a local format: 244/242 and larger frame; rejected.
|
||||
4. Reconstructed the actual zero-value path and ordinary literal 0x0p0 from target assembly.
|
||||
5. Corrected unconditional exponent subtraction and explicit byte narrowing based on target assembly. Remaining struct argument copies use floating loads/stores instead of integer loads/stores; conversion-loop scheduling differs.
|
||||
printf __pformatter:
|
||||
1. Moved format declaration after buffers: 535/535, same 321 differences.
|
||||
2. Initialized format to zero: 540/535, additional stores; rejected.
|
||||
3. Copied parsed format before dispatch, with both locals declared at function entry: 515/535 after target semantic fixes, larger frame; rejected.
|
||||
4. Removed hex-prefix zero-fill handling absent from this binary. Remaining mismatch is by-value struct copy code generation; target has 535 instructions, source 511.
|
||||
|
||||
wprintf double2hex:
|
||||
1. Used the Charged reference implementation: 246/242, different frame/scheduling; rejected.
|
||||
2. Deferred output pointer initialization: 243/242, register and copy differences remained.
|
||||
3. Moved output pointer declaration after decimal: 243/242, unchanged differences.
|
||||
4. Reconstructed zero-value output and unconditional exponent subtraction from target assembly. Explicit byte narrowing improved conversion instructions; struct-copy and loop scheduling remain open.
|
||||
wprintf __wpformatter:
|
||||
1. Initialized local format: 596/593, additional stores; rejected.
|
||||
2. Moved format declaration after buffers: 591/593, changed scheduling; rejected.
|
||||
3. Copied parsed format before dispatch: 595/593, larger frame; rejected.
|
||||
4. Corrected the imported narrow Pascal-string branch to read and advance its actual input pointer, eliminating an uninitialized output-pointer read.
|
||||
5. Removed hex-prefix zero-fill handling absent from the target. Remaining struct-copy code generation and register scheduling differ.
|
||||
wprintf __wStringWrite: used the real callback result from wmemcpy; 27/27 instructions, zero differences.
|
||||
|
||||
ansi_fp: all ten functions have zero ctxdiff differences. Exception metadata enabled for this unit, using the same setting as matching MSL siblings. Code 6512/6512 and data 780/780.
|
||||
|
||||
time strftime:
|
||||
1. Assigned default calendar fields individually: 906/913, scheduling differences; rejected.
|
||||
2. Initialized the default calendar at declaration: 913/913, 34 remaining string-offset differences; retained.
|
||||
3. Moved format-pointer declaration before locale: 913/913, 76 differences; rejected.
|
||||
4. Replaced imported pooled-string address arithmetic with ordinary literals. Reconstructed real asctime/ctime formatting to account for the original literals, rather than retaining fake calls with missing format arguments.
|
||||
5. With ordinary source-token order restored, strftime has 913/913 instructions and zero ctxdiff differences. Keeping the shared asctime result local to asctime restored the target BSS symbols; exception records for the additional real library functions still differ at unit level. No padding or forced placement was added.
|
||||
|
||||
scanf: all four functions have zero ctxdiff differences, code 5484/5484 and data 388/388. The formatter retains its actual secure-mode parameter.
|
||||
strtold: __strtold has 1277/1277 instructions and strtod 44/44, both zero differences. Removed the imported inline qualifier from the public strtod wrapper so the real target symbol is emitted. Code 5284/5284 and data 112/112.
|
||||
|
||||
Exception metadata settings change only owned NonMatching units; configure.py status flags remain NonMatching. Clean gates require the original DOL SHA1 and zero baseline regressions. Raw instruction-exact counts can be lower than objdiff exact counts because the varargs conditional branch to an external register-save helper is compared without relocation normalization by gate.py. These counts are reported separately; they were not patched or hidden.
|
||||
printf::double2hex: aggregate exponent format initialized at declaration: 238/242 instructions, 227 positional diffs; restored.
|
||||
printf::double2hex: initialize exponent integer fields before byte flags: 241/242 instructions, 127 positional diffs; restored.
|
||||
printf::double2hex: use integer nibble temporary with explicit final narrowing: 239/242 instructions, 123 positional diffs; restored.
|
||||
printf::__pformatter: move parsed format declaration after output buffer: 511/535 instructions, 367 positional diffs; restored.
|
||||
printf::__pformatter: initialize parsed format before first parse: 516/535 instructions, 505 positional diffs; restored.
|
||||
printf::__pformatter: separate next-format pointer from parsed cursor: 511/535 instructions, 367 positional diffs; restored.
|
||||
wprintf::double2hex: aggregate exponent format initialized at declaration: 238/242 instructions, 227 positional diffs; restored.
|
||||
wprintf::double2hex: initialize exponent integer fields before byte flags: 241/242 instructions, 127 positional diffs; restored.
|
||||
wprintf::double2hex: use integer nibble temporary with explicit final narrowing: 239/242 instructions, 123 positional diffs; restored.
|
||||
wprintf::__wpformatter: move parsed format declaration after output buffer: 567/593 instructions, 519 positional diffs; restored.
|
||||
wprintf::__wpformatter: initialize parsed format before first parse: 572/593 instructions, 562 positional diffs; restored.
|
||||
wprintf::__wpformatter: separate next-format pointer from parsed cursor: 567/593 instructions, 519 positional diffs; restored.
|
||||
printf::printf: finish varargs lifetime with va_end: compile rejected: ninja: build stopped: subcommand failed.; restored.
|
||||
printf::printf: return through named result temporary: compile rejected: ninja: build stopped: subcommand failed.; restored.
|
||||
printf::printf: move va_start to first actual formatting use: 50/50 instructions, 1 positional diffs; restored.
|
||||
printf::fprintf: finish varargs lifetime with va_end: compile rejected: ninja: build stopped: subcommand failed.; restored.
|
||||
printf::fprintf: return through named result temporary: compile rejected: ninja: build stopped: subcommand failed.; restored.
|
||||
printf::fprintf: move va_start to first actual formatting use: 49/49 instructions, 1 positional diffs; restored.
|
||||
printf::printf: finish varargs lifetime / initialize controller first: 50/50 instructions, 1 positional diffs; restored.
|
||||
printf::printf: hoist argument list / named result: 50/50 instructions, 1 positional diffs; restored.
|
||||
printf::printf: argument-list pointer / delay va_start: 50/50 instructions, 1 positional diffs; restored.
|
||||
printf::fprintf: finish varargs lifetime / initialize controller first: 49/49 instructions, 1 positional diffs; restored.
|
||||
printf::fprintf: hoist argument list / named result: 49/49 instructions, 1 positional diffs; restored.
|
||||
printf::fprintf: argument-list pointer / delay va_start: 49/49 instructions, 1 positional diffs; restored.
|
||||
printf::snprintf: finish varargs lifetime / initialize controller first: 54/54 instructions, 1 positional diffs; restored.
|
||||
printf::snprintf: hoist argument list / named result: 54/54 instructions, 1 positional diffs; restored.
|
||||
printf::snprintf: argument-list pointer / delay va_start: 54/54 instructions, 1 positional diffs; restored.
|
||||
printf::sprintf: finish varargs lifetime / initialize controller first: 52/52 instructions, 1 positional diffs; restored.
|
||||
printf::sprintf: hoist argument list / named result: 52/52 instructions, 1 positional diffs; restored.
|
||||
printf::sprintf: argument-list pointer / delay va_start: 52/52 instructions, 1 positional diffs; restored.
|
||||
wprintf::swprintf: finish varargs lifetime / initialize controller first: 55/55 instructions, 1 positional diffs; restored.
|
||||
wprintf::swprintf: hoist argument list / named result: 55/55 instructions, 1 positional diffs; restored.
|
||||
wprintf::swprintf: argument-list pointer / delay va_start: 55/55 instructions, 11 positional diffs; restored.
|
||||
time::emit: finish varargs lifetime / initialize controller first: 43/43 instructions, 1 positional diffs; restored.
|
||||
time::emit: hoist argument list / named result: 43/43 instructions, 1 positional diffs; restored.
|
||||
time::emit: argument-list pointer / delay va_start: 42/43 instructions, 34 positional diffs; restored.
|
||||
|
||||
printf data: 139/148 relocation entries agree by target function and addend; dispatch-table entries in the unmatched formatter still differ. Generated jump-table data is retained, without manual entries or symbol mappings.
|
||||
wprintf data: 139/148 relocation entries agree by target function and addend; dispatch-table entries in the unmatched formatter still differ. Generated jump-table data is retained, without manual entries or symbol mappings.
|
||||
printf double2hex: moved exponent-format initialization after exponent extraction: 241/242 instructions; FP aggregate copies remained; restored.
|
||||
wprintf double2hex: moved exponent-format initialization after exponent extraction: 241/242 instructions; FP aggregate copies remained; restored.
|
||||
printf data: changed zero comparison literal to long double, matching the argument type and sharing its zero constant with float2str. .sdata2 now 8 bytes, 100%, versus 16 emitted bytes previously. Instruction scores unchanged.
|
||||
time data: literal pool, calendar tables and BSS already agree. Target has nine exception-index records; source includes exception records for real public asctime/ctime functions absent in the extracted target. Retained the functions rather than suppressing output.
|
||||
locale: restored the C locale components, collation table and ordinary literals in source order; all 792 data bytes exact. No target code functions exist.
|
||||
file_io: implemented fclose, fflush, __msl_strnicmp and __msl_itoa in object order using FILE fields and named arithmetic temporaries; all four have zero ctxdiff differences, 928 code bytes and 60 metadata bytes exact.
|
||||
160
libs/MSL/src/MSL_Common/file_io.c
Normal file
160
libs/MSL/src/MSL_Common/file_io.c
Normal file
@@ -0,0 +1,160 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
enum file_kinds { file_closed, file_disk, file_console, file_unavailable };
|
||||
enum io_states { neutral, writing, reading, rereading };
|
||||
enum io_modes { io_read = 1, io_write = 2, io_append = 4 };
|
||||
extern int __flush_all(void);
|
||||
extern int __flush_buffer(FILE*, size_t*);
|
||||
|
||||
#pragma exceptions on
|
||||
|
||||
int fclose(FILE* file)
|
||||
{
|
||||
int flush_result, close_result;
|
||||
|
||||
if (file == NULL)
|
||||
return -1;
|
||||
if (file->mode.file_kind == file_closed)
|
||||
return 0;
|
||||
|
||||
flush_result = fflush(file);
|
||||
|
||||
close_result = (*file->close_proc)(file->handle);
|
||||
|
||||
file->mode.file_kind = file_closed;
|
||||
file->handle = 0;
|
||||
|
||||
if (file->state.free_buffer)
|
||||
free((FILE*)file->buffer);
|
||||
return (flush_result || close_result) ? -1 : 0;
|
||||
}
|
||||
|
||||
int fflush(FILE* file)
|
||||
{
|
||||
int pos;
|
||||
|
||||
if (file == NULL)
|
||||
{
|
||||
return __flush_all();
|
||||
}
|
||||
|
||||
if (file->state.error != 0 || file->mode.file_kind == file_closed)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (file->mode.io_mode == io_read)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (file->state.io_state >= rereading)
|
||||
{
|
||||
file->state.io_state = reading;
|
||||
}
|
||||
|
||||
if (file->state.io_state == reading)
|
||||
{
|
||||
file->buffer_len = 0;
|
||||
}
|
||||
|
||||
if (file->state.io_state != writing)
|
||||
{
|
||||
file->state.io_state = neutral;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (file->mode.file_kind != file_disk)
|
||||
{
|
||||
pos = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
pos = ftell(file);
|
||||
}
|
||||
|
||||
if (__flush_buffer(file, NULL) != 0)
|
||||
{
|
||||
file->state.error = 1;
|
||||
file->buffer_len = 0;
|
||||
return -1;
|
||||
}
|
||||
|
||||
file->state.io_state = neutral;
|
||||
file->pos = pos;
|
||||
file->buffer_len = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __msl_strnicmp(const char* str1, const char* str2, int n)
|
||||
{
|
||||
int i;
|
||||
char c1, c2;
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
{
|
||||
c1 = tolower(*str1++);
|
||||
c2 = tolower(*str2++);
|
||||
|
||||
if (c1 < c2)
|
||||
return -1;
|
||||
|
||||
if (c1 > c2)
|
||||
return 1;
|
||||
|
||||
if (c1 == '\0')
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
char* __msl_itoa(int value, char* str, unsigned int base)
|
||||
{
|
||||
int negative;
|
||||
int length;
|
||||
char c;
|
||||
int start;
|
||||
int end;
|
||||
|
||||
negative = 0;
|
||||
length = 0;
|
||||
|
||||
if (value < 0)
|
||||
{
|
||||
value = -value;
|
||||
negative = 1;
|
||||
}
|
||||
|
||||
do
|
||||
{
|
||||
int digit = value % base;
|
||||
|
||||
if (digit > 9)
|
||||
str[length++] = digit + 0x37;
|
||||
else
|
||||
str[length++] = digit + 0x30;
|
||||
|
||||
value /= base;
|
||||
} while (value != 0);
|
||||
|
||||
if (negative != 0)
|
||||
str[length++] = '-';
|
||||
|
||||
str[length++] = '\0';
|
||||
|
||||
start = 0;
|
||||
end = strlen(str) - 1;
|
||||
|
||||
while (start < end)
|
||||
{
|
||||
c = str[start];
|
||||
str[start++] = str[end];
|
||||
str[end--] = c;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
123
libs/MSL/src/MSL_Common/locale.c
Normal file
123
libs/MSL/src/MSL_Common/locale.c
Normal file
@@ -0,0 +1,123 @@
|
||||
#include <internal/locale.h>
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
|
||||
extern int __mbtowc_noconv(wchar_t*, const char*, size_t);
|
||||
extern int __wctomb_noconv(char*, wchar_t);
|
||||
|
||||
struct lconv __lconv = {
|
||||
".",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
"",
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
};
|
||||
|
||||
extern const unsigned short __ctype_mapC[256];
|
||||
extern const unsigned char __upper_mapC[256];
|
||||
extern const unsigned char __lower_mapC[256];
|
||||
extern const unsigned short __wctype_mapC[256];
|
||||
extern const wchar_t __wupper_mapC[256];
|
||||
extern const wchar_t __wlower_mapC[256];
|
||||
|
||||
struct _loc_ctype_cmpt _loc_ctyp_C = {
|
||||
"C",
|
||||
__ctype_mapC,
|
||||
__upper_mapC,
|
||||
__lower_mapC,
|
||||
__wctype_mapC,
|
||||
__wupper_mapC,
|
||||
__wlower_mapC,
|
||||
__mbtowc_noconv,
|
||||
__wctomb_noconv
|
||||
};
|
||||
|
||||
unsigned short char_coll_tableC[96] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 33, 34, 35, 36, 37, 38, 39, 40,
|
||||
41, 42, 17, 18, 19, 20, 21, 22, 23, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71,
|
||||
73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 24, 25, 26, 27, 28, 0, 44, 46, 48, 50, 52, 54, 56,
|
||||
58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 29, 30, 31, 32, 0,
|
||||
};
|
||||
|
||||
struct _loc_coll_cmpt _loc_coll_C = {
|
||||
"C",
|
||||
' ',
|
||||
110,
|
||||
0,
|
||||
char_coll_tableC,
|
||||
NULL
|
||||
};
|
||||
|
||||
struct _loc_mon_cmpt _loc_mon_C = {
|
||||
"C",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
"",
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX,
|
||||
CHAR_MAX
|
||||
};
|
||||
|
||||
struct _loc_num_cmpt _loc_num_C = {
|
||||
"C",
|
||||
".",
|
||||
"",
|
||||
""
|
||||
};
|
||||
|
||||
struct _loc_time_cmpt _loc_tim_C = {
|
||||
"C",
|
||||
"AM|PM",
|
||||
"%a %b %e %T %Y",
|
||||
"%I:%M:%S %p",
|
||||
"%m/%d/%y",
|
||||
"%T",
|
||||
"Sun|Sunday|Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday",
|
||||
"Jan|January|Feb|February|Mar|March|Apr|April|May|May|Jun|June|Jul|July|Aug|August|Sep|September|Oct|October|Nov|"
|
||||
"November|Dec|December",
|
||||
""
|
||||
};
|
||||
|
||||
struct __locale _current_locale = {
|
||||
NULL,
|
||||
"C",
|
||||
&_loc_coll_C,
|
||||
&_loc_ctyp_C,
|
||||
&_loc_mon_C,
|
||||
&_loc_num_C,
|
||||
&_loc_tim_C
|
||||
};
|
||||
1362
libs/MSL/src/MSL_Common/printf.c
Normal file
1362
libs/MSL/src/MSL_Common/printf.c
Normal file
File diff suppressed because it is too large
Load Diff
817
libs/MSL/src/MSL_Common/scanf.c
Normal file
817
libs/MSL/src/MSL_Common/scanf.c
Normal file
@@ -0,0 +1,817 @@
|
||||
#include <internal/format_runtime.h>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
typedef long long intmax_t;
|
||||
|
||||
enum argument_options {
|
||||
normal_argument,
|
||||
char_argument,
|
||||
short_argument,
|
||||
long_argument,
|
||||
intmax_argument,
|
||||
size_t_argument,
|
||||
ptrdiff_argument,
|
||||
long_long_argument,
|
||||
double_argument,
|
||||
long_double_argument,
|
||||
wchar_argument
|
||||
};
|
||||
|
||||
typedef unsigned char char_map[32];
|
||||
|
||||
typedef struct {
|
||||
unsigned char suppress_assignment;
|
||||
unsigned char field_width_specified;
|
||||
unsigned char argument_options;
|
||||
unsigned char conversion_char;
|
||||
int field_width;
|
||||
char_map char_set;
|
||||
} scan_format;
|
||||
|
||||
#define set_char_map(map, ch) map[(unsigned char)ch >> 3] |= (1 << (ch & 7))
|
||||
#define tst_char_map(map, ch) (map[(unsigned char)ch >> 3] & (1 << (ch & 7)))
|
||||
|
||||
static const char* parse_format(const char* format_string, scan_format* format) {
|
||||
const char* s = format_string;
|
||||
int c;
|
||||
int flag_found, invert;
|
||||
scan_format f = {0, 0, normal_argument, 0, 2147483647, {0}};
|
||||
|
||||
if (((c = *++s) == '%')) {
|
||||
f.conversion_char = c;
|
||||
*format = f;
|
||||
return s + 1;
|
||||
}
|
||||
|
||||
if (c == '*') {
|
||||
f.suppress_assignment = 1;
|
||||
c = *++s;
|
||||
}
|
||||
|
||||
if (isdigit(c)) {
|
||||
f.field_width = 0;
|
||||
|
||||
do {
|
||||
f.field_width = (f.field_width * 10) + (c - '0');
|
||||
c = *++s;
|
||||
} while (isdigit(c));
|
||||
|
||||
if (f.field_width == 0) {
|
||||
f.conversion_char = 0xFF;
|
||||
*format = f;
|
||||
return s + 1;
|
||||
}
|
||||
|
||||
f.field_width_specified = 1;
|
||||
}
|
||||
|
||||
flag_found = 1;
|
||||
|
||||
switch (c) {
|
||||
case 'h':
|
||||
f.argument_options = short_argument;
|
||||
|
||||
if (s[1] == 'h') {
|
||||
f.argument_options = char_argument;
|
||||
c = *++s;
|
||||
}
|
||||
|
||||
break;
|
||||
case 'l':
|
||||
f.argument_options = long_argument;
|
||||
|
||||
if (s[1] == 'l') {
|
||||
f.argument_options = long_long_argument;
|
||||
c = *++s;
|
||||
}
|
||||
|
||||
break;
|
||||
case 'L':
|
||||
f.argument_options = long_double_argument;
|
||||
break;
|
||||
|
||||
case 'j':
|
||||
f.argument_options = intmax_argument;
|
||||
break;
|
||||
case 'z':
|
||||
f.argument_options = size_t_argument;
|
||||
break;
|
||||
case 't':
|
||||
f.argument_options = ptrdiff_argument;
|
||||
break;
|
||||
default:
|
||||
flag_found = 0;
|
||||
}
|
||||
|
||||
if (flag_found) {
|
||||
c = *++s;
|
||||
}
|
||||
|
||||
f.conversion_char = c;
|
||||
|
||||
switch (c) {
|
||||
case 'd':
|
||||
case 'i':
|
||||
case 'u':
|
||||
case 'o':
|
||||
case 'x':
|
||||
case 'X':
|
||||
if (f.argument_options == long_double_argument) {
|
||||
f.conversion_char = 0xFF;
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 'a':
|
||||
case 'A':
|
||||
case 'f':
|
||||
case 'F':
|
||||
case 'e':
|
||||
case 'E':
|
||||
case 'g':
|
||||
case 'G':
|
||||
if (f.argument_options == char_argument || f.argument_options == short_argument ||
|
||||
f.argument_options == intmax_argument || f.argument_options == size_t_argument ||
|
||||
f.argument_options == ptrdiff_argument || f.argument_options == long_long_argument) {
|
||||
f.conversion_char = 0xFF;
|
||||
break;
|
||||
}
|
||||
|
||||
if (f.argument_options == long_argument) {
|
||||
f.argument_options = double_argument;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 'p':
|
||||
f.argument_options = long_argument;
|
||||
f.conversion_char = 'x';
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
if (f.argument_options == long_argument) {
|
||||
f.argument_options = wchar_argument;
|
||||
} else {
|
||||
if (f.argument_options != normal_argument) {
|
||||
f.conversion_char = 0xFF;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 's':
|
||||
if (f.argument_options == long_argument) {
|
||||
f.argument_options = wchar_argument;
|
||||
} else {
|
||||
if (f.argument_options != normal_argument) {
|
||||
f.conversion_char = 0xFF;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
int i;
|
||||
unsigned char* p;
|
||||
|
||||
for (i = sizeof(f.char_set), p = f.char_set; i; --i) {
|
||||
*p++ = 0xFF;
|
||||
}
|
||||
|
||||
f.char_set[1] = 0xC1;
|
||||
f.char_set[4] = 0xFE;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 'n':
|
||||
break;
|
||||
|
||||
case '[':
|
||||
if (f.argument_options == long_argument) {
|
||||
f.argument_options = wchar_argument;
|
||||
} else {
|
||||
if (f.argument_options != normal_argument) {
|
||||
f.conversion_char = 0xFF;
|
||||
}
|
||||
}
|
||||
|
||||
c = *++s;
|
||||
invert = 0;
|
||||
|
||||
if (c == '^') {
|
||||
invert = 1;
|
||||
c = *++s;
|
||||
}
|
||||
|
||||
if (c == ']') {
|
||||
set_char_map(f.char_set, ']');
|
||||
c = *++s;
|
||||
}
|
||||
|
||||
while (c && c != ']') {
|
||||
int d;
|
||||
set_char_map(f.char_set, c);
|
||||
|
||||
if (*(s + 1) == '-' && (d = *(s + 2)) != 0 && d != ']') {
|
||||
while (++c <= d) {
|
||||
set_char_map(f.char_set, c);
|
||||
}
|
||||
|
||||
c = *(s += 3);
|
||||
} else {
|
||||
c = *++s;
|
||||
}
|
||||
}
|
||||
|
||||
if (!c) {
|
||||
f.conversion_char = 0xFF;
|
||||
break;
|
||||
}
|
||||
|
||||
if (invert) {
|
||||
int i;
|
||||
unsigned char* p;
|
||||
|
||||
for (i = sizeof(f.char_set), p = f.char_set; i; --i, ++p) {
|
||||
*p = ~*p;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
f.conversion_char = 0xFF;
|
||||
break;
|
||||
}
|
||||
|
||||
*format = f;
|
||||
return s + 1;
|
||||
}
|
||||
|
||||
int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char* format_str, va_list arg,
|
||||
int is_secure) {
|
||||
int num_chars, chars_read, items_assigned, conversions;
|
||||
int base, negative, overflow;
|
||||
int rval;
|
||||
const char* format_ptr;
|
||||
char format_char;
|
||||
char c;
|
||||
scan_format format;
|
||||
long long_num;
|
||||
unsigned long u_long_num;
|
||||
long long long_long_num = 0;
|
||||
unsigned long long u_long_long_num;
|
||||
long double long_double_num;
|
||||
char* arg_ptr;
|
||||
int elem_valid;
|
||||
size_t elem_maxsize;
|
||||
int match_failure = 0;
|
||||
int terminate = 0;
|
||||
|
||||
format_ptr = format_str;
|
||||
chars_read = 0;
|
||||
items_assigned = 0;
|
||||
conversions = 0;
|
||||
|
||||
while (!terminate && (format_char = *format_ptr) != 0) {
|
||||
if (isspace(format_char)) {
|
||||
do {
|
||||
format_char = *++format_ptr;
|
||||
} while (isspace(format_char));
|
||||
|
||||
if (!match_failure) {
|
||||
while (isspace(c = (*ReadProc)(ReadProcArg, 0, __GetAChar))) {
|
||||
++chars_read;
|
||||
}
|
||||
|
||||
(*ReadProc)(ReadProcArg, c, __UngetAChar);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if ((format_char != '%') && (!match_failure)) {
|
||||
if ((c = (*ReadProc)(ReadProcArg, 0, __GetAChar)) != (unsigned char)format_char) {
|
||||
(*ReadProc)(ReadProcArg, c, __UngetAChar);
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
++format_ptr;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
chars_read++;
|
||||
format_ptr++;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
format_ptr = parse_format(format_ptr, &format);
|
||||
|
||||
if (!format.suppress_assignment && format.conversion_char != '%') {
|
||||
arg_ptr = va_arg(arg, char*);
|
||||
} else {
|
||||
arg_ptr = 0;
|
||||
}
|
||||
|
||||
if ((format.conversion_char != 'n') && (!match_failure) && (*ReadProc)(ReadProcArg, 0, __TestForError)) {
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
}
|
||||
}
|
||||
|
||||
switch (format.conversion_char) {
|
||||
case 'd':
|
||||
base = 10;
|
||||
goto signed_int;
|
||||
case 'i':
|
||||
base = 0;
|
||||
signed_int:
|
||||
|
||||
if (match_failure) {
|
||||
long_num = 0;
|
||||
long_long_num = 0;
|
||||
} else {
|
||||
if ((format.argument_options == long_long_argument) ||
|
||||
(format.argument_options == intmax_argument)) {
|
||||
u_long_long_num = __strtoull(base, format.field_width, ReadProc, ReadProcArg, &num_chars,
|
||||
&negative, &overflow);
|
||||
} else {
|
||||
u_long_num = __strtoul(base, format.field_width, ReadProc, ReadProcArg, &num_chars, &negative,
|
||||
&overflow);
|
||||
}
|
||||
|
||||
if (!num_chars) {
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
long_num = 0;
|
||||
long_long_num = 0;
|
||||
goto signed_int_assign;
|
||||
}
|
||||
}
|
||||
|
||||
chars_read += num_chars;
|
||||
|
||||
if ((format.argument_options == long_long_argument) ||
|
||||
(format.argument_options == intmax_argument)) {
|
||||
long_long_num = (negative ? -u_long_long_num : u_long_long_num);
|
||||
} else {
|
||||
long_num = (negative ? -u_long_num : u_long_num);
|
||||
}
|
||||
}
|
||||
|
||||
signed_int_assign:
|
||||
|
||||
if (arg_ptr) {
|
||||
switch (format.argument_options) {
|
||||
case normal_argument:
|
||||
*(int*)arg_ptr = long_num;
|
||||
break;
|
||||
case char_argument:
|
||||
*(signed char*)arg_ptr = long_num;
|
||||
break;
|
||||
case short_argument:
|
||||
*(short*)arg_ptr = long_num;
|
||||
break;
|
||||
case long_argument:
|
||||
*(long*)arg_ptr = long_num;
|
||||
break;
|
||||
case intmax_argument:
|
||||
*(intmax_t*)arg_ptr = long_long_num;
|
||||
break;
|
||||
case size_t_argument:
|
||||
*(size_t*)arg_ptr = long_num;
|
||||
break;
|
||||
case ptrdiff_argument:
|
||||
*(ptrdiff_t*)arg_ptr = long_num;
|
||||
break;
|
||||
case long_long_argument:
|
||||
*(long long*)arg_ptr = long_long_num;
|
||||
break;
|
||||
}
|
||||
if (!match_failure) {
|
||||
items_assigned++;
|
||||
}
|
||||
}
|
||||
|
||||
conversions++;
|
||||
break;
|
||||
case 'o':
|
||||
base = 8;
|
||||
goto unsigned_int;
|
||||
case 'u':
|
||||
base = 10;
|
||||
goto unsigned_int;
|
||||
case 'x':
|
||||
case 'X':
|
||||
base = 16;
|
||||
unsigned_int:
|
||||
|
||||
if (match_failure) {
|
||||
u_long_num = 0;
|
||||
u_long_long_num = 0;
|
||||
} else {
|
||||
if ((format.argument_options == long_long_argument) ||
|
||||
(format.argument_options == intmax_argument)) {
|
||||
u_long_long_num = __strtoull(base, format.field_width, ReadProc, ReadProcArg, &num_chars,
|
||||
&negative, &overflow);
|
||||
} else {
|
||||
u_long_num = __strtoul(base, format.field_width, ReadProc, ReadProcArg, &num_chars, &negative,
|
||||
&overflow);
|
||||
}
|
||||
|
||||
if (!num_chars) {
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
u_long_num = 0;
|
||||
u_long_long_num = 0;
|
||||
goto unsigned_int_assign;
|
||||
}
|
||||
}
|
||||
|
||||
chars_read += num_chars;
|
||||
|
||||
if (negative) {
|
||||
if (format.argument_options == long_long_argument) {
|
||||
u_long_long_num = -u_long_long_num;
|
||||
} else {
|
||||
u_long_num = -u_long_num;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsigned_int_assign:
|
||||
|
||||
if (arg_ptr) {
|
||||
switch (format.argument_options) {
|
||||
case normal_argument:
|
||||
*(unsigned int*)arg_ptr = u_long_num;
|
||||
break;
|
||||
case char_argument:
|
||||
*(unsigned char*)arg_ptr = u_long_num;
|
||||
break;
|
||||
case short_argument:
|
||||
*(unsigned short*)arg_ptr = u_long_num;
|
||||
break;
|
||||
case long_argument:
|
||||
*(unsigned long*)arg_ptr = u_long_num;
|
||||
break;
|
||||
case intmax_argument:
|
||||
*(intmax_t*)arg_ptr = u_long_long_num;
|
||||
break;
|
||||
case size_t_argument:
|
||||
*(size_t*)arg_ptr = u_long_num;
|
||||
break;
|
||||
case ptrdiff_argument:
|
||||
*(ptrdiff_t*)arg_ptr = u_long_num;
|
||||
break;
|
||||
case long_long_argument:
|
||||
*(unsigned long long*)arg_ptr = u_long_long_num;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!match_failure) {
|
||||
items_assigned++;
|
||||
}
|
||||
}
|
||||
|
||||
conversions++;
|
||||
break;
|
||||
case 'a':
|
||||
case 'A':
|
||||
case 'f':
|
||||
case 'F':
|
||||
case 'e':
|
||||
case 'E':
|
||||
case 'g':
|
||||
case 'G':
|
||||
flt:
|
||||
if (match_failure) {
|
||||
long_double_num = NAN;
|
||||
} else {
|
||||
long_double_num = __strtold(format.field_width, ReadProc, ReadProcArg, &num_chars, &overflow);
|
||||
|
||||
if (!num_chars) {
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
long_double_num = NAN;
|
||||
goto assign_float;
|
||||
}
|
||||
}
|
||||
|
||||
chars_read += num_chars;
|
||||
}
|
||||
|
||||
assign_float:
|
||||
|
||||
if (arg_ptr) {
|
||||
switch (format.argument_options) {
|
||||
case normal_argument:
|
||||
*(float*)arg_ptr = long_double_num;
|
||||
break;
|
||||
case double_argument:
|
||||
*(double*)arg_ptr = long_double_num;
|
||||
break;
|
||||
case long_double_argument:
|
||||
*(long double*)arg_ptr = long_double_num;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!match_failure) {
|
||||
items_assigned++;
|
||||
}
|
||||
}
|
||||
|
||||
conversions++;
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
|
||||
if (!format.field_width_specified) {
|
||||
format.field_width = 1;
|
||||
}
|
||||
|
||||
if (arg_ptr) {
|
||||
if (is_secure) {
|
||||
elem_valid = 1;
|
||||
elem_maxsize = va_arg(arg, size_t);
|
||||
}
|
||||
|
||||
num_chars = 0;
|
||||
|
||||
if (match_failure) {
|
||||
if (elem_maxsize > 0) {
|
||||
*arg_ptr = 0;
|
||||
}
|
||||
continue;
|
||||
} else {
|
||||
char* arg_start = arg_ptr;
|
||||
|
||||
while (format.field_width-- &&
|
||||
(!is_secure || ((elem_valid = (elem_maxsize > num_chars)) != 0)) &&
|
||||
((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) {
|
||||
c = rval;
|
||||
|
||||
if (format.argument_options == wchar_argument) {
|
||||
mbtowc(((wchar_t*)arg_ptr), (char*)(&c), 1);
|
||||
arg_ptr += sizeof(char);
|
||||
} else {
|
||||
*arg_ptr++ = c;
|
||||
}
|
||||
num_chars++;
|
||||
}
|
||||
|
||||
c = rval;
|
||||
if (!num_chars || (is_secure && !elem_valid)) {
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
if (elem_maxsize > 0) {
|
||||
*arg_start = 0;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
chars_read += num_chars;
|
||||
|
||||
items_assigned++;
|
||||
}
|
||||
} else {
|
||||
num_chars = 0;
|
||||
|
||||
while (format.field_width-- && ((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) {
|
||||
c = rval;
|
||||
num_chars++;
|
||||
}
|
||||
c = rval;
|
||||
if (!num_chars) {
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
|
||||
conversions++;
|
||||
break;
|
||||
|
||||
case '%':
|
||||
if (match_failure) {
|
||||
continue;
|
||||
} else {
|
||||
while (isspace(c = (*ReadProc)(ReadProcArg, 0, __GetAChar))) {
|
||||
chars_read++;
|
||||
}
|
||||
|
||||
if (c != '%') {
|
||||
(*ReadProc)(ReadProcArg, c, __UngetAChar);
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
chars_read++;
|
||||
}
|
||||
break;
|
||||
|
||||
case 's':
|
||||
if (!match_failure) {
|
||||
c = (*ReadProc)(ReadProcArg, 0, __GetAChar);
|
||||
while (isspace(c)) {
|
||||
chars_read++;
|
||||
c = (*ReadProc)(ReadProcArg, 0, __GetAChar);
|
||||
}
|
||||
|
||||
(*ReadProc)(ReadProcArg, c, __UngetAChar);
|
||||
}
|
||||
case '[':
|
||||
if (arg_ptr) {
|
||||
if (is_secure) {
|
||||
elem_valid = 1;
|
||||
elem_maxsize = va_arg(arg, size_t) - 1;
|
||||
}
|
||||
|
||||
num_chars = 0;
|
||||
|
||||
if (match_failure) {
|
||||
if (elem_maxsize > 0) {
|
||||
*arg_ptr = 0;
|
||||
}
|
||||
continue;
|
||||
} else {
|
||||
char* arg_start = arg_ptr;
|
||||
|
||||
while (format.field_width-- &&
|
||||
(!is_secure || ((elem_valid = (elem_maxsize >= num_chars)) != 0)) &&
|
||||
((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) {
|
||||
c = rval;
|
||||
|
||||
if (!tst_char_map(format.char_set, c)) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (format.argument_options == wchar_argument) {
|
||||
mbtowc(((wchar_t*)arg_ptr), (char*)&c, 1);
|
||||
arg_ptr = (char*)((wchar_t*)arg_ptr + 1);
|
||||
} else {
|
||||
*arg_ptr++ = c;
|
||||
}
|
||||
num_chars++;
|
||||
}
|
||||
c = rval;
|
||||
|
||||
if (!num_chars || (is_secure && !elem_valid)) {
|
||||
(*ReadProc)(ReadProcArg, c, __UngetAChar);
|
||||
if (!is_secure) {
|
||||
goto exit;
|
||||
} else {
|
||||
match_failure = 1;
|
||||
if (elem_maxsize > 0) {
|
||||
*arg_start = 0;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
chars_read += num_chars;
|
||||
|
||||
if (format.argument_options == wchar_argument) {
|
||||
*(wchar_t*)arg_ptr = L'\0';
|
||||
} else {
|
||||
*arg_ptr = 0;
|
||||
}
|
||||
|
||||
items_assigned++;
|
||||
}
|
||||
} else {
|
||||
num_chars = 0;
|
||||
|
||||
while (format.field_width-- && ((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) {
|
||||
c = rval;
|
||||
if (!tst_char_map(format.char_set, c)) {
|
||||
break;
|
||||
}
|
||||
|
||||
num_chars++;
|
||||
}
|
||||
c = rval;
|
||||
|
||||
if (!num_chars) {
|
||||
(*ReadProc)(ReadProcArg, c, __UngetAChar);
|
||||
break;
|
||||
}
|
||||
chars_read += num_chars;
|
||||
}
|
||||
|
||||
if (format.field_width >= 0) {
|
||||
(*ReadProc)(ReadProcArg, c, __UngetAChar);
|
||||
}
|
||||
|
||||
conversions++;
|
||||
break;
|
||||
case 'n':
|
||||
if (arg_ptr) {
|
||||
switch (format.argument_options) {
|
||||
case normal_argument:
|
||||
*(int*)arg_ptr = chars_read;
|
||||
break;
|
||||
case short_argument:
|
||||
*(short*)arg_ptr = chars_read;
|
||||
break;
|
||||
case long_argument:
|
||||
*(long*)arg_ptr = chars_read;
|
||||
break;
|
||||
case char_argument:
|
||||
*(char*)arg_ptr = chars_read;
|
||||
break;
|
||||
case long_long_argument:
|
||||
*(long long*)arg_ptr = chars_read;
|
||||
break;
|
||||
}
|
||||
}
|
||||
continue;
|
||||
case 0xFF:
|
||||
default:
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
|
||||
exit:
|
||||
|
||||
if ((*ReadProc)(ReadProcArg, 0, __TestForError) && conversions == 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return items_assigned;
|
||||
}
|
||||
|
||||
int __StringRead(void* pPtr, int ch, int act) {
|
||||
char ret;
|
||||
__InStrCtrl* Iscp = (__InStrCtrl*)pPtr;
|
||||
|
||||
switch (act) {
|
||||
case __GetAChar:
|
||||
ret = *(Iscp->NextChar);
|
||||
|
||||
if (ret == '\0') {
|
||||
Iscp->NullCharDetected = 1;
|
||||
return -1;
|
||||
} else {
|
||||
Iscp->NextChar++;
|
||||
return (unsigned char)ret;
|
||||
}
|
||||
|
||||
case __UngetAChar:
|
||||
if (Iscp->NullCharDetected == 0) {
|
||||
Iscp->NextChar--;
|
||||
} else {
|
||||
Iscp->NullCharDetected = 0;
|
||||
}
|
||||
|
||||
return ch;
|
||||
|
||||
case __TestForError:
|
||||
return Iscp->NullCharDetected;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
inline int vsscanf(const char* s, const char* format, va_list arg) {
|
||||
__InStrCtrl isc;
|
||||
isc.NextChar = (char*)s;
|
||||
|
||||
if ((s == 0) || (*isc.NextChar == '\0')) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
isc.NullCharDetected = 0;
|
||||
return __sformatter(&__StringRead, (void*)&isc, format, arg, 0);
|
||||
}
|
||||
|
||||
int sscanf(const char* s, const char* pFormat, ...) {
|
||||
va_list args;
|
||||
va_start(args, pFormat);
|
||||
return vsscanf(s, pFormat, args);
|
||||
}
|
||||
|
||||
659
libs/MSL/src/MSL_Common/strtold.c
Normal file
659
libs/MSL/src/MSL_Common/strtold.c
Normal file
@@ -0,0 +1,659 @@
|
||||
#include <internal/format_runtime.h>
|
||||
#define DBL_MAX_10_EXP 308
|
||||
#define DBL_MIN_10_EXP (-307)
|
||||
#define LDBL_MIN DBL_MIN
|
||||
#define LDBL_MAX DBL_MAX
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#define TARGET_FLOAT_BITS 64
|
||||
#define TARGET_FLOAT_BYTES (TARGET_FLOAT_BITS / 8)
|
||||
#define TARGET_FLOAT_MAX_EXP LDBL_MAX_EXP
|
||||
#define TARGET_FLOAT_MANT_DIG LDBL_MANT_DIG
|
||||
#define TARGET_FLOAT_IMPLICIT_J_BIT 1
|
||||
#define TARGET_FLOAT_MANT_BITS (TARGET_FLOAT_MANT_DIG - TARGET_FLOAT_IMPLICIT_J_BIT)
|
||||
#define TARGET_FLOAT_EXP_BITS (TARGET_FLOAT_BITS - TARGET_FLOAT_MANT_BITS - 1)
|
||||
|
||||
enum scan_states {
|
||||
start = 0x0001,
|
||||
sig_start = 0x0002,
|
||||
leading_sig_zeroes = 0x0004,
|
||||
int_digit_loop = 0x0008,
|
||||
frac_start = 0x0010,
|
||||
frac_digit_loop = 0x0020,
|
||||
sig_end = 0x0040,
|
||||
exp_start = 0x0080,
|
||||
leading_exp_digit = 0x0100,
|
||||
leading_exp_zeroes = 0x0200,
|
||||
exp_digit_loop = 0x0400,
|
||||
finished = 0x0800,
|
||||
failure = 0x1000,
|
||||
nan_state = 0x2000,
|
||||
infin_state = 0x4000,
|
||||
hex_state = 0x8000
|
||||
};
|
||||
|
||||
enum hex_scan_states {
|
||||
not_hex = 0x0000,
|
||||
hex_start = 0x0001,
|
||||
hex_leading_sig_zeroes = 0x0002,
|
||||
hex_int_digit_loop = 0x0004,
|
||||
hex_frac_digit_loop = 0x0008,
|
||||
hex_sig_end = 0x0010,
|
||||
hex_exp_start = 0x0020,
|
||||
hex_leading_exp_digit = 0x0040,
|
||||
hex_leading_exp_zeroes = 0x0080,
|
||||
hex_exp_digit_loop = 0x0100
|
||||
};
|
||||
|
||||
#define final_state(scan_state) (scan_state & (finished | failure))
|
||||
#define success(scan_state) \
|
||||
(scan_state & \
|
||||
(leading_sig_zeroes | int_digit_loop | frac_digit_loop | leading_exp_zeroes | exp_digit_loop | finished))
|
||||
#define hex_success(count, scan_state) \
|
||||
(count - 1 > 2 && scan_state & (hex_leading_sig_zeroes | hex_int_digit_loop | hex_frac_digit_loop | \
|
||||
hex_leading_exp_zeroes | hex_exp_digit_loop))
|
||||
|
||||
#define fetch() (count++, (*ReadProc)(ReadProcArg, 0, __GetAChar))
|
||||
#define unfetch(c) (*ReadProc)(ReadProcArg, c, __UngetAChar)
|
||||
|
||||
long double __strtold(int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned,
|
||||
int* overflow) {
|
||||
int scan_state = start;
|
||||
int hex_scan_state = not_hex;
|
||||
int count = 0;
|
||||
int spaces = 0;
|
||||
int c;
|
||||
decimal d = {0, 0, {0, ""}};
|
||||
int sig_negative = 0;
|
||||
int exp_negative = 0;
|
||||
long exp_value = 0;
|
||||
int exp_adjust = 0;
|
||||
long double result = 0.0;
|
||||
int sign_detected = 0;
|
||||
int radix_marker = *(unsigned char*)(__lconv).decimal_point;
|
||||
|
||||
unsigned char* chptr;
|
||||
unsigned char mantissa[TARGET_FLOAT_BYTES];
|
||||
unsigned mantissa_digits;
|
||||
unsigned long exponent = 0;
|
||||
|
||||
int ui;
|
||||
unsigned char uch, uch1;
|
||||
int NibbleIndex;
|
||||
int expsign = 0;
|
||||
int exp_digits = 0;
|
||||
unsigned intdigits = 0;
|
||||
|
||||
*overflow = 0;
|
||||
c = fetch();
|
||||
|
||||
while (count <= max_width && c != -1 && !final_state(scan_state)) {
|
||||
switch (scan_state) {
|
||||
case start:
|
||||
if (isspace(c)) {
|
||||
c = fetch();
|
||||
count--;
|
||||
spaces++;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (toupper(c)) {
|
||||
case '-':
|
||||
sig_negative = 1;
|
||||
|
||||
case '+':
|
||||
c = fetch();
|
||||
sign_detected = 1;
|
||||
break;
|
||||
case 'I':
|
||||
c = fetch();
|
||||
scan_state = infin_state;
|
||||
break;
|
||||
|
||||
case 'N':
|
||||
c = fetch();
|
||||
scan_state = nan_state;
|
||||
break;
|
||||
|
||||
default:
|
||||
scan_state = sig_start;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case infin_state: {
|
||||
int i = 1;
|
||||
char model[] = "INFINITY";
|
||||
|
||||
while ((i < 8) && (toupper(c) == model[i])) {
|
||||
i++;
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
if ((i == 3) || (i == 8)) {
|
||||
if (sig_negative) {
|
||||
result = (float)-(double)INFINITY;
|
||||
} else {
|
||||
result = INFINITY;
|
||||
}
|
||||
|
||||
*chars_scanned = spaces + i + sign_detected;
|
||||
return result;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case nan_state: {
|
||||
int i = 1, j = 0;
|
||||
char model[] = "NAN(";
|
||||
char nan_arg[32] = "";
|
||||
while ((i < 4) && (toupper(c) == model[i])) {
|
||||
i++;
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
if ((i == 3) || (i == 4)) {
|
||||
if (i == 4) {
|
||||
while ((j < 32) && (isdigit(c) || isalpha(c) || (c == radix_marker))) {
|
||||
nan_arg[j++] = (char)c;
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
if (c != ')') {
|
||||
scan_state = failure;
|
||||
break;
|
||||
} else {
|
||||
j++;
|
||||
}
|
||||
}
|
||||
nan_arg[j] = '\0';
|
||||
|
||||
if (sig_negative) {
|
||||
result = -nan(nan_arg);
|
||||
} else {
|
||||
result = nan(nan_arg);
|
||||
}
|
||||
|
||||
*chars_scanned = spaces + i + j + sign_detected;
|
||||
return result;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case sig_start:
|
||||
if (c == radix_marker) {
|
||||
scan_state = frac_start;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
if (!isdigit(c)) {
|
||||
scan_state = failure;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '0') {
|
||||
c = fetch();
|
||||
if (toupper(c) == 'X') {
|
||||
scan_state = hex_state;
|
||||
hex_scan_state = hex_start;
|
||||
} else {
|
||||
scan_state = leading_sig_zeroes;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
scan_state = int_digit_loop;
|
||||
break;
|
||||
|
||||
case leading_sig_zeroes:
|
||||
if (c == '0') {
|
||||
c = fetch();
|
||||
|
||||
break;
|
||||
}
|
||||
scan_state = int_digit_loop;
|
||||
break;
|
||||
|
||||
case int_digit_loop:
|
||||
if (!isdigit(c)) {
|
||||
if (c == radix_marker) {
|
||||
scan_state = frac_digit_loop;
|
||||
c = fetch();
|
||||
} else {
|
||||
scan_state = sig_end;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (d.sig.length < 20) {
|
||||
d.sig.text[d.sig.length++] = (unsigned char)c;
|
||||
} else {
|
||||
exp_adjust++;
|
||||
}
|
||||
|
||||
c = fetch();
|
||||
break;
|
||||
|
||||
case frac_start:
|
||||
if (!isdigit(c)) {
|
||||
scan_state = failure;
|
||||
break;
|
||||
}
|
||||
|
||||
scan_state = frac_digit_loop;
|
||||
break;
|
||||
|
||||
case frac_digit_loop:
|
||||
if (!isdigit(c)) {
|
||||
scan_state = sig_end;
|
||||
break;
|
||||
}
|
||||
|
||||
if (d.sig.length < 20) {
|
||||
if (c != '0' || d.sig.length) {
|
||||
d.sig.text[d.sig.length++] = (unsigned char)c;
|
||||
}
|
||||
|
||||
exp_adjust--;
|
||||
}
|
||||
c = fetch();
|
||||
break;
|
||||
|
||||
case sig_end:
|
||||
if (toupper(c) == 'E') {
|
||||
scan_state = exp_start;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
scan_state = finished;
|
||||
break;
|
||||
|
||||
case exp_start:
|
||||
if (c == '+') {
|
||||
c = fetch();
|
||||
} else if (c == '-') {
|
||||
c = fetch();
|
||||
exp_negative = 1;
|
||||
}
|
||||
|
||||
scan_state = leading_exp_digit;
|
||||
break;
|
||||
|
||||
case leading_exp_digit:
|
||||
if (!isdigit(c)) {
|
||||
scan_state = failure;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '0') {
|
||||
scan_state = leading_exp_zeroes;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
scan_state = exp_digit_loop;
|
||||
break;
|
||||
|
||||
case leading_exp_zeroes:
|
||||
if (c == '0') {
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
scan_state = exp_digit_loop;
|
||||
break;
|
||||
|
||||
case exp_digit_loop:
|
||||
if (!isdigit(c)) {
|
||||
scan_state = finished;
|
||||
break;
|
||||
}
|
||||
|
||||
exp_value = exp_value * 10 + (c - '0');
|
||||
if (exp_value > 0x7FFF) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
c = fetch();
|
||||
break;
|
||||
|
||||
case hex_state: {
|
||||
switch (hex_scan_state) {
|
||||
case hex_start:
|
||||
memset(mantissa, 0, sizeof(mantissa));
|
||||
chptr = mantissa;
|
||||
mantissa_digits = (53 + 3) / 4;
|
||||
intdigits = 0;
|
||||
NibbleIndex = 0;
|
||||
hex_scan_state = hex_leading_sig_zeroes;
|
||||
c = fetch();
|
||||
break;
|
||||
|
||||
case hex_leading_sig_zeroes:
|
||||
if (c == '0') {
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
hex_scan_state = hex_int_digit_loop;
|
||||
break;
|
||||
|
||||
case hex_int_digit_loop:
|
||||
if (!isxdigit(c)) {
|
||||
if (c == radix_marker) {
|
||||
hex_scan_state = hex_frac_digit_loop;
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
else {
|
||||
hex_scan_state = hex_sig_end;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (intdigits < mantissa_digits) {
|
||||
intdigits++;
|
||||
uch = *(chptr + NibbleIndex / 2);
|
||||
|
||||
ui = toupper(c);
|
||||
if (ui >= 'A') {
|
||||
ui = ui - 'A' + 10;
|
||||
} else {
|
||||
ui -= '0';
|
||||
}
|
||||
|
||||
uch1 = (unsigned char)ui;
|
||||
|
||||
if ((NibbleIndex % 2) != 0) {
|
||||
uch |= uch1;
|
||||
} else {
|
||||
uch |= (unsigned char)(uch1 << 4);
|
||||
}
|
||||
|
||||
*(chptr + NibbleIndex++ / 2) = uch;
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
else {
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case hex_frac_digit_loop:
|
||||
if (!isxdigit(c)) {
|
||||
hex_scan_state = hex_sig_end;
|
||||
break;
|
||||
}
|
||||
|
||||
if (intdigits < mantissa_digits) {
|
||||
uch = *(chptr + NibbleIndex / 2);
|
||||
ui = toupper(c);
|
||||
|
||||
if (ui >= 'A') {
|
||||
ui = ui - 'A' + 10;
|
||||
} else {
|
||||
ui -= '0';
|
||||
}
|
||||
|
||||
uch1 = (unsigned char)ui;
|
||||
|
||||
if ((NibbleIndex % 2) != 0) {
|
||||
uch |= uch1;
|
||||
} else {
|
||||
uch |= (unsigned char)(uch1 << 4);
|
||||
}
|
||||
|
||||
*(chptr + NibbleIndex++ / 2) = uch;
|
||||
c = fetch();
|
||||
} else {
|
||||
c = fetch();
|
||||
}
|
||||
break;
|
||||
|
||||
case hex_sig_end:
|
||||
if (toupper(c) == 'P') {
|
||||
hex_scan_state = hex_exp_start;
|
||||
exp_digits++;
|
||||
c = fetch();
|
||||
} else {
|
||||
scan_state = finished;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case hex_exp_start:
|
||||
exp_digits++;
|
||||
if (c == '-') {
|
||||
expsign = 1;
|
||||
} else if (c != '+') {
|
||||
c = unfetch(c);
|
||||
count--;
|
||||
exp_digits--;
|
||||
}
|
||||
|
||||
hex_scan_state = hex_leading_exp_digit;
|
||||
c = fetch();
|
||||
break;
|
||||
|
||||
case hex_leading_exp_digit:
|
||||
if (!isdigit(c)) {
|
||||
scan_state = failure;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '0') {
|
||||
exp_digits++;
|
||||
hex_scan_state = hex_leading_exp_zeroes;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
hex_scan_state = hex_exp_digit_loop;
|
||||
break;
|
||||
|
||||
case hex_leading_exp_zeroes:
|
||||
if (c == '0') {
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
hex_scan_state = hex_exp_digit_loop;
|
||||
break;
|
||||
|
||||
case hex_exp_digit_loop:
|
||||
if (!isdigit(c)) {
|
||||
scan_state = finished;
|
||||
break;
|
||||
}
|
||||
|
||||
exponent = exponent * 10 + (c - '0');
|
||||
|
||||
if (exp_value > SHRT_MAX) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
exp_digits++;
|
||||
c = fetch();
|
||||
|
||||
break;
|
||||
}
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
if (scan_state != 32768 ? !success(scan_state) : !hex_success(count, hex_scan_state)) {
|
||||
count = 0;
|
||||
*chars_scanned = 0;
|
||||
} else {
|
||||
count--;
|
||||
*chars_scanned = count + spaces;
|
||||
}
|
||||
|
||||
unfetch(c);
|
||||
|
||||
if (hex_scan_state == not_hex) {
|
||||
if (exp_negative) {
|
||||
exp_value = -exp_value;
|
||||
}
|
||||
|
||||
{
|
||||
int n = d.sig.length;
|
||||
unsigned char* p = &d.sig.text[n];
|
||||
|
||||
while (n-- && *--p == '0') {
|
||||
exp_adjust++;
|
||||
}
|
||||
|
||||
d.sig.length = (unsigned char)(n + 1);
|
||||
|
||||
if (d.sig.length == 0) {
|
||||
d.sig.text[d.sig.length++] = '0';
|
||||
}
|
||||
}
|
||||
|
||||
exp_value += exp_adjust;
|
||||
|
||||
if (exp_value < -0x8000 || exp_value > 0x7FFF) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
if (*overflow) {
|
||||
if (exp_negative) {
|
||||
return 0.0;
|
||||
} else {
|
||||
return sig_negative ? -HUGE_VAL : HUGE_VAL;
|
||||
}
|
||||
}
|
||||
|
||||
d.exp = (short)exp_value;
|
||||
|
||||
result = __dec2num(&d);
|
||||
|
||||
if (result != 0.0 && result < LDBL_MIN) {
|
||||
*overflow = 1;
|
||||
} else if (result > LDBL_MAX) {
|
||||
*overflow = 1;
|
||||
result = HUGE_VAL;
|
||||
}
|
||||
|
||||
if (sig_negative && success(scan_state)) {
|
||||
result = -result;
|
||||
}
|
||||
|
||||
return result;
|
||||
} else {
|
||||
unsigned mantissa_bit, dbl_bit;
|
||||
unsigned one_bit;
|
||||
long double dbl_bits_storage;
|
||||
unsigned char* dbl_bits = (unsigned char*)&dbl_bits_storage;
|
||||
|
||||
if (expsign) {
|
||||
exponent = -exponent;
|
||||
}
|
||||
|
||||
exponent += intdigits * 4;
|
||||
|
||||
one_bit = 0;
|
||||
while (one_bit < 4 && !(mantissa[0] & (0x80 >> one_bit))) {
|
||||
one_bit++;
|
||||
exponent--;
|
||||
}
|
||||
|
||||
if (TARGET_FLOAT_IMPLICIT_J_BIT) {
|
||||
one_bit++;
|
||||
}
|
||||
|
||||
if (one_bit) {
|
||||
unsigned char carry = 0;
|
||||
for (chptr = mantissa + sizeof(mantissa) - 1; chptr >= mantissa; chptr--) {
|
||||
unsigned char a = *chptr;
|
||||
*chptr = (unsigned char)((a << one_bit) | carry);
|
||||
carry = (unsigned char)(a >> (8 - one_bit));
|
||||
}
|
||||
}
|
||||
|
||||
memset(dbl_bits, 0, sizeof(dbl_bits_storage));
|
||||
dbl_bit = (TARGET_FLOAT_BITS - TARGET_FLOAT_MANT_BITS);
|
||||
|
||||
for (mantissa_bit = 0; mantissa_bit < TARGET_FLOAT_MANT_BITS; mantissa_bit += 8) {
|
||||
unsigned char ui = mantissa[mantissa_bit >> 3];
|
||||
int halfbits;
|
||||
|
||||
if (mantissa_bit + 8 > TARGET_FLOAT_MANT_BITS) {
|
||||
ui &= 0xff << (TARGET_FLOAT_MANT_BITS - mantissa_bit);
|
||||
}
|
||||
|
||||
halfbits = (dbl_bit & 7);
|
||||
dbl_bits[dbl_bit >> 3] |= (unsigned char)(ui >> halfbits);
|
||||
dbl_bit += 8;
|
||||
dbl_bits[dbl_bit >> 3] |= (unsigned char)(ui << (8 - halfbits));
|
||||
}
|
||||
|
||||
exponent += TARGET_FLOAT_MAX_EXP - 2;
|
||||
|
||||
if ((exponent & ~(TARGET_FLOAT_MAX_EXP * 2 - 1))) {
|
||||
*overflow = 1;
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
exponent <<= 32 - TARGET_FLOAT_EXP_BITS;
|
||||
|
||||
dbl_bits[0] |= exponent >> 25;
|
||||
|
||||
if (TARGET_FLOAT_EXP_BITS > 7) {
|
||||
dbl_bits[1] |= exponent >> 17;
|
||||
}
|
||||
|
||||
if (TARGET_FLOAT_EXP_BITS > 15) {
|
||||
dbl_bits[2] |= exponent >> 9;
|
||||
}
|
||||
|
||||
if (TARGET_FLOAT_EXP_BITS > 23) {
|
||||
dbl_bits[3] |= exponent >> 1;
|
||||
}
|
||||
|
||||
if (sig_negative) {
|
||||
dbl_bits[0] |= 0x80;
|
||||
}
|
||||
|
||||
result = *(long double*)dbl_bits;
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
double strtod(const char* str, char** end) {
|
||||
__InStrCtrl isc;
|
||||
double value, abs_value;
|
||||
int count, overflow;
|
||||
|
||||
isc.NextChar = (char*)str;
|
||||
isc.NullCharDetected = 0;
|
||||
value = __strtold(INT_MAX, &__StringRead, (void*)&isc, &count, &overflow);
|
||||
|
||||
if (end) {
|
||||
*end = (char*)str + count;
|
||||
}
|
||||
|
||||
abs_value = fabs(value);
|
||||
if (overflow || (value != 0.0 && (abs_value < DBL_MIN || abs_value > DBL_MAX))) {
|
||||
errno = ERANGE;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
727
libs/MSL/src/MSL_Common/time.c
Normal file
727
libs/MSL/src/MSL_Common/time.c
Normal file
@@ -0,0 +1,727 @@
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stddef.h>
|
||||
#include <internal/locale.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
|
||||
typedef struct tm {
|
||||
int tm_sec;
|
||||
int tm_min;
|
||||
int tm_hour;
|
||||
int tm_mday;
|
||||
int tm_mon;
|
||||
int tm_year;
|
||||
int tm_wday;
|
||||
int tm_yday;
|
||||
int tm_isdst;
|
||||
} tm;
|
||||
|
||||
extern int __msl_mod(int, int);
|
||||
extern div_t __msl_div(long, long);
|
||||
extern int __msl_add(int*, int);
|
||||
extern int __msl_ladd(long*, long);
|
||||
extern int __msl_lmul(long*, long);
|
||||
|
||||
static int __leap_year(int year) {
|
||||
return __msl_mod(year, 4) == 0 && (__msl_mod(year, 100) != 0 || __msl_mod(year, 400) == 100);
|
||||
}
|
||||
|
||||
static int leap_days(int year, int month) {
|
||||
int n;
|
||||
div_t q;
|
||||
|
||||
q = div(year, 4);
|
||||
n = q.quot;
|
||||
|
||||
q = div(year, 100);
|
||||
n -= q.quot;
|
||||
|
||||
if (year < 100) {
|
||||
q = __msl_div(year + 899, 1000);
|
||||
n += q.quot;
|
||||
} else {
|
||||
q = __msl_div(year - 100, 1000);
|
||||
n += q.quot + 1;
|
||||
}
|
||||
|
||||
if (__leap_year(year)) {
|
||||
if (year < 0) {
|
||||
if (month > 1) {
|
||||
n++;
|
||||
}
|
||||
} else if (month <= 1) {
|
||||
n--;
|
||||
}
|
||||
}
|
||||
|
||||
return n;
|
||||
}
|
||||
|
||||
#define seconds_per_minute (60L)
|
||||
#define seconds_per_hour (60L * seconds_per_minute)
|
||||
#define seconds_per_day (24L * seconds_per_hour)
|
||||
#define seconds_1900_to_1970 (((365 * 70UL) + 17) * 24 * 60 * 60)
|
||||
|
||||
const short __msl_month_to_days[2][13] = {
|
||||
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
|
||||
{0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366}
|
||||
};
|
||||
|
||||
extern int __isdst(void);
|
||||
extern time_t __get_time(void);
|
||||
extern int __to_gm_time(time_t*);
|
||||
|
||||
void __msl_time2tm(time_t in_time, tm* tm) {
|
||||
unsigned long years, months, days, seconds;
|
||||
int is_leap_year;
|
||||
unsigned long time = in_time + seconds_1900_to_1970;
|
||||
|
||||
if (!tm) {
|
||||
return;
|
||||
}
|
||||
|
||||
tm->tm_isdst = __isdst();
|
||||
|
||||
days = time / seconds_per_day;
|
||||
seconds = time % seconds_per_day;
|
||||
|
||||
tm->tm_wday = (days + 1) % 7;
|
||||
years = 0;
|
||||
|
||||
for (;;) {
|
||||
unsigned long days_this_year = __leap_year(years) ? 366 : 365;
|
||||
|
||||
if (days < days_this_year) {
|
||||
break;
|
||||
}
|
||||
|
||||
days -= days_this_year;
|
||||
years += 1;
|
||||
}
|
||||
|
||||
tm->tm_year = years;
|
||||
tm->tm_yday = days;
|
||||
|
||||
months = 0;
|
||||
is_leap_year = __leap_year(years);
|
||||
|
||||
for (;;) {
|
||||
unsigned long days_thru_this_month = __msl_month_to_days[is_leap_year][months + 1];
|
||||
|
||||
if (days < days_thru_this_month) {
|
||||
days -= __msl_month_to_days[is_leap_year][months];
|
||||
break;
|
||||
}
|
||||
|
||||
++months;
|
||||
}
|
||||
|
||||
tm->tm_mon = months;
|
||||
tm->tm_mday = days + 1;
|
||||
tm->tm_hour = seconds / seconds_per_hour;
|
||||
seconds %= seconds_per_hour;
|
||||
tm->tm_min = seconds / seconds_per_minute;
|
||||
tm->tm_sec = seconds % seconds_per_minute;
|
||||
}
|
||||
|
||||
static int adjust(int* x, int y, int* z) {
|
||||
div_t q;
|
||||
|
||||
q = __msl_div(*x, y);
|
||||
*x = q.rem;
|
||||
return __msl_add(z, q.quot);
|
||||
}
|
||||
|
||||
static int __tm2time(tm* tm, time_t* time) {
|
||||
long days;
|
||||
time_t seconds, day_secs;
|
||||
|
||||
if (!tm || !time) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
--tm->tm_mday;
|
||||
|
||||
if (!adjust(&tm->tm_sec, 60, &tm->tm_min)) {
|
||||
goto no_exit;
|
||||
}
|
||||
if (!adjust(&tm->tm_min, 60, &tm->tm_hour)) {
|
||||
goto no_exit;
|
||||
}
|
||||
if (!adjust(&tm->tm_hour, 24, &tm->tm_mday)) {
|
||||
goto no_exit;
|
||||
}
|
||||
if (!adjust(&tm->tm_mon, 12, &tm->tm_year)) {
|
||||
goto no_exit;
|
||||
}
|
||||
|
||||
days = tm->tm_year;
|
||||
|
||||
if (!__msl_lmul(&days, 365)) {
|
||||
goto no_exit;
|
||||
}
|
||||
if (!__msl_ladd(&days, leap_days(tm->tm_year, tm->tm_mon))) {
|
||||
goto no_exit;
|
||||
}
|
||||
if (!__msl_ladd(&days, __msl_month_to_days[0][tm->tm_mon])) {
|
||||
goto no_exit;
|
||||
}
|
||||
if (!__msl_ladd(&days, tm->tm_mday)) {
|
||||
goto no_exit;
|
||||
}
|
||||
if (days < 0 || days > (ULONG_MAX / seconds_per_day)) {
|
||||
goto no_exit;
|
||||
}
|
||||
|
||||
day_secs = days * seconds_per_day;
|
||||
seconds = (tm->tm_hour * seconds_per_hour) + (tm->tm_min * seconds_per_minute) + tm->tm_sec;
|
||||
|
||||
if (seconds > ULONG_MAX - day_secs) {
|
||||
goto no_exit;
|
||||
}
|
||||
|
||||
seconds += day_secs;
|
||||
seconds -= seconds_1900_to_1970;
|
||||
*time = seconds;
|
||||
|
||||
__msl_time2tm(seconds, tm);
|
||||
return 1;
|
||||
|
||||
no_exit:
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern clock_t __get_clock(void);
|
||||
|
||||
clock_t clock(void) {
|
||||
return __get_clock();
|
||||
}
|
||||
|
||||
time_t mktime(tm* timeptr) {
|
||||
struct tm tm = *timeptr;
|
||||
time_t time;
|
||||
|
||||
if (!__tm2time(&tm, &time)) {
|
||||
return (time_t)-1;
|
||||
}
|
||||
|
||||
*timeptr = tm;
|
||||
return time;
|
||||
}
|
||||
|
||||
static void clear_tm(struct tm* tm) {
|
||||
tm->tm_sec = 0;
|
||||
tm->tm_min = 0;
|
||||
tm->tm_hour = 0;
|
||||
tm->tm_mday = 1;
|
||||
tm->tm_mon = 0;
|
||||
tm->tm_year = 0;
|
||||
tm->tm_wday = 1;
|
||||
tm->tm_yday = 0;
|
||||
tm->tm_isdst = -1;
|
||||
}
|
||||
|
||||
static char* find_name(const char* names, int index) {
|
||||
static char extracted_name[32];
|
||||
int i;
|
||||
const char* start = names;
|
||||
const char* end;
|
||||
|
||||
for (i = 0; i <= index; i++) {
|
||||
end = strchr(start, '|');
|
||||
if (i == index) {
|
||||
if (end == NULL) {
|
||||
strcpy(extracted_name, start);
|
||||
} else {
|
||||
strncpy(extracted_name, start, end - start);
|
||||
extracted_name[end - start] = '\0';
|
||||
}
|
||||
break;
|
||||
}
|
||||
start = end + 1;
|
||||
}
|
||||
|
||||
return extracted_name;
|
||||
}
|
||||
|
||||
#pragma exceptions off
|
||||
|
||||
char* asctime(const struct tm* timeptr) {
|
||||
static char asctime_result[26];
|
||||
char* result = asctime_result;
|
||||
if (!timeptr) {
|
||||
strcpy(result, "xxx xxx xx xx:xx:xx xxxx\n");
|
||||
} else {
|
||||
char day[4];
|
||||
char month[4];
|
||||
strncpy(day, find_name(_current_locale.time_cmpt_ptr->Day_Names, timeptr->tm_wday * 2), 3);
|
||||
day[3] = 0;
|
||||
strncpy(month, find_name(_current_locale.time_cmpt_ptr->MonthNames, timeptr->tm_mon * 2), 3);
|
||||
month[3] = 0;
|
||||
sprintf(result, "%s %s%3d %.2d:%.2d:%.2d %d\n", day, month, timeptr->tm_mday,
|
||||
timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec, timeptr->tm_year + 1900);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
struct tm* localtime(const time_t* timer);
|
||||
|
||||
char* ctime(const time_t* timer) {
|
||||
struct tm* calendar = localtime(timer);
|
||||
char* result = asctime(calendar);
|
||||
char day[4];
|
||||
char month[4];
|
||||
strncpy(day, find_name(_current_locale.time_cmpt_ptr->Day_Names, calendar->tm_wday * 2), 3);
|
||||
day[3] = 0;
|
||||
strncpy(month, find_name(_current_locale.time_cmpt_ptr->MonthNames, calendar->tm_mon * 2), 3);
|
||||
month[3] = 0;
|
||||
sprintf(result, "%.3s %.3s %2d %.2d:%.2d:%.2d %4d\n", day, month,
|
||||
calendar->tm_mday, calendar->tm_hour, calendar->tm_min, calendar->tm_sec,
|
||||
calendar->tm_year + 1900);
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma exceptions on
|
||||
|
||||
static time_t time(time_t* timer) {
|
||||
time_t result = __get_time();
|
||||
|
||||
if (timer) {
|
||||
*timer = result;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static struct tm* gmtime(const time_t* timer) {
|
||||
static struct tm gmtime_tm;
|
||||
time_t time;
|
||||
|
||||
if (!timer) {
|
||||
clear_tm(&gmtime_tm);
|
||||
return &gmtime_tm;
|
||||
}
|
||||
|
||||
time = *timer;
|
||||
if (!__to_gm_time(&time)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
__msl_time2tm(time, &gmtime_tm);
|
||||
gmtime_tm.tm_isdst = 0;
|
||||
return &gmtime_tm;
|
||||
}
|
||||
|
||||
#pragma exceptions on
|
||||
|
||||
struct tm* localtime(const time_t* timer) {
|
||||
static struct tm localtime_tm;
|
||||
|
||||
if (!timer) {
|
||||
clear_tm(&localtime_tm);
|
||||
localtime_tm.tm_isdst = __isdst();
|
||||
return &localtime_tm;
|
||||
} else {
|
||||
__msl_time2tm(*timer, &localtime_tm);
|
||||
localtime_tm.tm_isdst = __isdst();
|
||||
return &localtime_tm;
|
||||
}
|
||||
}
|
||||
|
||||
static int emit(char* str, size_t size, size_t* max_size, const char* format_str, ...) {
|
||||
va_list args;
|
||||
va_start(args, format_str);
|
||||
|
||||
if (size > *max_size) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
*max_size -= size;
|
||||
return vsprintf(str, format_str, args);
|
||||
}
|
||||
|
||||
time_t __MSL_ISO8601NewYear(int year) {
|
||||
struct tm ts0;
|
||||
time_t timeval;
|
||||
short StartMday[7] = {2, 3, 4, 29, 30, 31, 1};
|
||||
|
||||
ts0.tm_sec = 0;
|
||||
ts0.tm_min = 0;
|
||||
ts0.tm_hour = 0;
|
||||
ts0.tm_mon = 0;
|
||||
ts0.tm_isdst = -1;
|
||||
ts0.tm_mday = 0;
|
||||
ts0.tm_wday = 7;
|
||||
ts0.tm_year = year;
|
||||
while ((ts0.tm_wday != 0) && (ts0.tm_mday <= 7)) {
|
||||
ts0.tm_mday++;
|
||||
timeval = mktime(&ts0);
|
||||
}
|
||||
ts0.tm_mday = StartMday[ts0.tm_mday - 1];
|
||||
if (ts0.tm_mday >= 29) {
|
||||
ts0.tm_mon = 11;
|
||||
ts0.tm_year--;
|
||||
}
|
||||
return mktime(&ts0);
|
||||
}
|
||||
|
||||
static double difftime(time_t time1, time_t time0) {
|
||||
time_t diff;
|
||||
|
||||
if (time1 >= time0) {
|
||||
return time1 - time0;
|
||||
}
|
||||
|
||||
diff = time0 - time1;
|
||||
return -(double)diff;
|
||||
}
|
||||
|
||||
extern const double msl_seconds_per_day;
|
||||
extern const double msl_days_per_week;
|
||||
extern const double msl_seconds_per_minute;
|
||||
|
||||
int __MSL_ISO8601Week(const struct tm* tmptr, int* WYear) {
|
||||
struct WeekYear {
|
||||
int Year;
|
||||
time_t Start;
|
||||
};
|
||||
struct WeekYear LastYear, ThisYear, NextYear;
|
||||
struct WeekYear* WyPtr;
|
||||
struct tm Localtm = *tmptr;
|
||||
double Days;
|
||||
int WeekNo;
|
||||
time_t GivenTimeVal;
|
||||
|
||||
LastYear.Year = tmptr->tm_year - 1;
|
||||
LastYear.Start = __MSL_ISO8601NewYear(LastYear.Year);
|
||||
ThisYear.Year = tmptr->tm_year;
|
||||
ThisYear.Start = __MSL_ISO8601NewYear(ThisYear.Year);
|
||||
NextYear.Year = tmptr->tm_year + 1;
|
||||
NextYear.Start = __MSL_ISO8601NewYear(NextYear.Year);
|
||||
|
||||
GivenTimeVal = mktime(&Localtm);
|
||||
if ((LastYear.Start <= GivenTimeVal) && (GivenTimeVal < ThisYear.Start)) {
|
||||
WyPtr = &LastYear;
|
||||
} else if ((ThisYear.Start <= GivenTimeVal) && (GivenTimeVal < NextYear.Start)) {
|
||||
WyPtr = &ThisYear;
|
||||
} else {
|
||||
WyPtr = &NextYear;
|
||||
}
|
||||
*WYear = WyPtr->Year;
|
||||
{
|
||||
double diff;
|
||||
|
||||
if (GivenTimeVal >= WyPtr->Start) {
|
||||
diff = (double)(GivenTimeVal - WyPtr->Start);
|
||||
} else {
|
||||
diff = -(double)(WyPtr->Start - GivenTimeVal);
|
||||
}
|
||||
Days = diff / msl_seconds_per_day;
|
||||
}
|
||||
WeekNo = (int)(Days / msl_days_per_week) + 1;
|
||||
return WeekNo;
|
||||
}
|
||||
|
||||
static int week_num(const struct tm* tm, int starting_day) {
|
||||
int days = tm->tm_yday;
|
||||
|
||||
days -= __msl_mod(tm->tm_wday - starting_day, 7);
|
||||
|
||||
if (days < 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return (days / 7) + 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int emit_string(char* str, size_t size, size_t* max_size, const char* value) {
|
||||
return emit(str, size, max_size, "%s", value);
|
||||
}
|
||||
|
||||
|
||||
size_t strftime(char* str, size_t max_size, const char* format_str, const struct tm* timeptr) {
|
||||
char name[32];
|
||||
size_t num_chars, chars_written, space_remaining;
|
||||
struct __locale* locale = &_current_locale;
|
||||
const char* format_ptr;
|
||||
const char* curr_format;
|
||||
int n, ISO8601Year, ISO8601WeekNo;
|
||||
struct tm tm;
|
||||
struct tm defaults = {0, 0, 0, 1, 0, 0, 1, 0, -1};
|
||||
|
||||
if ((space_remaining = --max_size) <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
tm = defaults;
|
||||
|
||||
if (timeptr) {
|
||||
tm = *timeptr;
|
||||
|
||||
if (mktime(&tm) == (time_t)-1) {
|
||||
tm = defaults;
|
||||
}
|
||||
}
|
||||
|
||||
format_ptr = format_str;
|
||||
chars_written = 0;
|
||||
|
||||
while (*format_ptr) {
|
||||
if (!(curr_format = strchr(format_ptr, '%'))) {
|
||||
if ((num_chars = strlen(format_ptr)) != 0) {
|
||||
if (num_chars <= space_remaining) {
|
||||
memcpy(str, format_ptr, num_chars);
|
||||
|
||||
chars_written += num_chars;
|
||||
str += num_chars;
|
||||
space_remaining -= num_chars;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if ((num_chars = curr_format - format_ptr) != 0) {
|
||||
if (num_chars <= space_remaining) {
|
||||
memcpy(str, format_ptr, num_chars);
|
||||
|
||||
chars_written += num_chars;
|
||||
str += num_chars;
|
||||
space_remaining -= num_chars;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
format_ptr = curr_format;
|
||||
if (format_ptr[1] == 'E' || format_ptr[1] == 'O') {
|
||||
++format_ptr;
|
||||
}
|
||||
|
||||
switch (*++format_ptr) {
|
||||
case 'a':
|
||||
strcpy(name, find_name(locale->time_cmpt_ptr->Day_Names, tm.tm_wday * 2));
|
||||
num_chars = emit_string(str, strlen(name), &space_remaining, name);
|
||||
break;
|
||||
|
||||
case 'A':
|
||||
strcpy(name, find_name(locale->time_cmpt_ptr->Day_Names, tm.tm_wday * 2 + 1));
|
||||
num_chars = emit_string(str, strlen(name), &space_remaining, name);
|
||||
break;
|
||||
|
||||
case 'b':
|
||||
case 'h': {
|
||||
num_chars =
|
||||
emit(str, 3, &space_remaining, "%.3s",
|
||||
find_name(locale->time_cmpt_ptr->MonthNames, tm.tm_mon * 2));
|
||||
break;
|
||||
}
|
||||
|
||||
case 'B':
|
||||
strcpy(name, find_name(locale->time_cmpt_ptr->MonthNames, tm.tm_mon * 2 + 1));
|
||||
num_chars = emit_string(str, strlen(name), &space_remaining, name);
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
num_chars = strftime(str, space_remaining + 1, locale->time_cmpt_ptr->DateTime_Format, &tm);
|
||||
space_remaining -= num_chars;
|
||||
break;
|
||||
|
||||
case 'd':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", tm.tm_mday);
|
||||
break;
|
||||
|
||||
case 'D':
|
||||
num_chars = strftime(str, space_remaining + 1, "%m/%d/%y", &tm);
|
||||
break;
|
||||
|
||||
case 'e':
|
||||
num_chars = emit(str, 2, &space_remaining, "%2d", tm.tm_mday);
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
num_chars =
|
||||
emit(str, 10, &space_remaining, "%.4d-%.2d-%.2d", tm.tm_year + 1900, tm.tm_mon + 1,
|
||||
tm.tm_mday);
|
||||
break;
|
||||
|
||||
case 'g':
|
||||
ISO8601WeekNo = __MSL_ISO8601Week(timeptr, &ISO8601Year);
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", ISO8601Year % 100);
|
||||
break;
|
||||
|
||||
case 'G':
|
||||
ISO8601WeekNo = __MSL_ISO8601Week(timeptr, &ISO8601Year);
|
||||
num_chars = emit(str, 4, &space_remaining, "%.4d", ISO8601Year + 1900);
|
||||
break;
|
||||
|
||||
case 'H':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", tm.tm_hour);
|
||||
break;
|
||||
|
||||
case 'I':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d",
|
||||
(n = tm.tm_hour % 12) ? n : 12);
|
||||
break;
|
||||
|
||||
case 'j':
|
||||
num_chars = emit(str, 3, &space_remaining, "%.3d", tm.tm_yday + 1);
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", tm.tm_mon + 1);
|
||||
break;
|
||||
|
||||
case 'M':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", tm.tm_min);
|
||||
break;
|
||||
|
||||
case 'n':
|
||||
num_chars = emit(str, 2, &space_remaining, "\n");
|
||||
break;
|
||||
|
||||
case 'p': {
|
||||
char* name;
|
||||
|
||||
name = find_name(locale->time_cmpt_ptr->am_pm, tm.tm_hour < 12 ? 0 : 1);
|
||||
num_chars = emit_string(str, strlen(name), &space_remaining, name);
|
||||
break;
|
||||
}
|
||||
|
||||
case 'r':
|
||||
num_chars = strftime(str, space_remaining + 1, locale->time_cmpt_ptr->Twelve_hr_format, &tm);
|
||||
space_remaining -= num_chars;
|
||||
break;
|
||||
|
||||
case 'R':
|
||||
num_chars = strftime(str, space_remaining + 1, "%H:%M", &tm);
|
||||
space_remaining -= num_chars;
|
||||
break;
|
||||
|
||||
case 'S':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", tm.tm_sec);
|
||||
break;
|
||||
|
||||
case 't':
|
||||
num_chars = emit(str, 2, &space_remaining, "\t");
|
||||
break;
|
||||
|
||||
case 'T':
|
||||
num_chars = strftime(str, space_remaining + 1, "%H:%M:%S", &tm);
|
||||
space_remaining -= num_chars;
|
||||
break;
|
||||
|
||||
case 'u':
|
||||
if (tm.tm_wday == 0) {
|
||||
num_chars = emit(str, 1, &space_remaining, "7");
|
||||
} else {
|
||||
num_chars = emit(str, 1, &space_remaining, "%.1d", tm.tm_wday);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'U':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", week_num(&tm, 0));
|
||||
break;
|
||||
|
||||
case 'V':
|
||||
ISO8601WeekNo = __MSL_ISO8601Week(timeptr, &ISO8601Year);
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", ISO8601WeekNo);
|
||||
break;
|
||||
|
||||
case 'w':
|
||||
num_chars = emit(str, 1, &space_remaining, "%.1d", tm.tm_wday);
|
||||
break;
|
||||
|
||||
case 'W':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", week_num(&tm, 1));
|
||||
break;
|
||||
|
||||
case 'x':
|
||||
num_chars = strftime(str, space_remaining + 1, locale->time_cmpt_ptr->Date_Format, &tm);
|
||||
space_remaining -= num_chars;
|
||||
break;
|
||||
|
||||
case 'X':
|
||||
num_chars = strftime(str, space_remaining + 1, locale->time_cmpt_ptr->Time_Format, &tm);
|
||||
space_remaining -= num_chars;
|
||||
break;
|
||||
|
||||
case 'y':
|
||||
case 'C':
|
||||
num_chars = emit(str, 2, &space_remaining, "%.2d", tm.tm_year % 100);
|
||||
break;
|
||||
|
||||
case 'Y':
|
||||
num_chars = emit(str, 4, &space_remaining, "%.4d", tm.tm_year + 1900);
|
||||
break;
|
||||
|
||||
case 'z': {
|
||||
time_t local, utc, now;
|
||||
struct tm localtm, *utctmptr;
|
||||
double diff, diffmins, diffhours;
|
||||
|
||||
now = time(NULL);
|
||||
utctmptr = gmtime(&now);
|
||||
if (utctmptr == NULL) {
|
||||
num_chars = emit(str, 4, &space_remaining, "0000");
|
||||
} else {
|
||||
localtm = *localtime(&now);
|
||||
local = mktime(&localtm);
|
||||
utc = mktime(utctmptr);
|
||||
diff = difftime(local, utc);
|
||||
diffhours = (int)diff / 3600;
|
||||
diffmins = __abs(diff / msl_seconds_per_minute - msl_seconds_per_minute * diffhours);
|
||||
num_chars = emit(str, 5, &space_remaining, "%+03.0f%02.0f", diffhours, diffmins);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case 'Z': {
|
||||
char* TimeZone = locale->time_cmpt_ptr->TimeZone;
|
||||
|
||||
if (*TimeZone == '\0') {
|
||||
num_chars = 0;
|
||||
*str = '\0';
|
||||
} else {
|
||||
num_chars = emit_string(str, strlen(TimeZone), &space_remaining, TimeZone);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case '%':
|
||||
num_chars = emit(str, 2, &space_remaining, "%%", *format_ptr);
|
||||
break;
|
||||
|
||||
default:
|
||||
num_chars = emit(str, 2, &space_remaining, "%%%c", *format_ptr);
|
||||
break;
|
||||
}
|
||||
|
||||
if (!num_chars) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
chars_written += num_chars;
|
||||
str += num_chars;
|
||||
++format_ptr;
|
||||
}
|
||||
|
||||
*str = 0;
|
||||
if (max_size < chars_written) {
|
||||
return 0;
|
||||
} else {
|
||||
return chars_written;
|
||||
}
|
||||
}
|
||||
|
||||
const double msl_seconds_per_day = 86400.0;
|
||||
const double msl_days_per_week = 7.0;
|
||||
const double msl_seconds_per_minute = 60.0;
|
||||
1323
libs/MSL/src/MSL_Common/wprintf.c
Normal file
1323
libs/MSL/src/MSL_Common/wprintf.c
Normal file
File diff suppressed because it is too large
Load Diff
671
libs/MSL/src/MSL_Common_Embedded/ansi_fp.c
Normal file
671
libs/MSL/src/MSL_Common_Embedded/ansi_fp.c
Normal file
@@ -0,0 +1,671 @@
|
||||
#include <internal/format_runtime.h>
|
||||
#define LDBL_MAX DBL_MAX
|
||||
|
||||
|
||||
|
||||
typedef unsigned long long d_int;
|
||||
|
||||
static inline int __count_trailing_zerol(unsigned long x) { return 32 - __cntlzw(~x & (x - 1)); }
|
||||
|
||||
static int __count_trailing_zero(double n) {
|
||||
unsigned long* array = (unsigned long*)&n;
|
||||
|
||||
unsigned long hi = array[0] | 0x100000;
|
||||
unsigned long lo = array[1];
|
||||
int zeros = __count_trailing_zerol(lo);
|
||||
|
||||
if (lo == 0) {
|
||||
return 32 + __count_trailing_zerol(hi);
|
||||
}
|
||||
return zeros;
|
||||
}
|
||||
|
||||
static int __must_round(const decimal* d, int digits) {
|
||||
unsigned char const* i = d->sig.text + digits;
|
||||
|
||||
if (*i > 5) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (*i < 5) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
{
|
||||
unsigned char const* e = d->sig.text + d->sig.length;
|
||||
|
||||
for (i++; i < e; i++) {
|
||||
if (*i != 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (d->sig.text[digits - 1] & 1) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void __dorounddecup(decimal* d, int digits) {
|
||||
unsigned char* b = d->sig.text;
|
||||
unsigned char* i = b + digits - 1;
|
||||
|
||||
while (1) {
|
||||
if (*i < 9) {
|
||||
*i += 1;
|
||||
break;
|
||||
}
|
||||
if (i == b) {
|
||||
*i = 1;
|
||||
d->exp++;
|
||||
break;
|
||||
}
|
||||
*i-- = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void __rounddec(decimal* d, int digits) {
|
||||
if (digits > 0 && digits < d->sig.length) {
|
||||
int unkBool = __must_round(d, digits);
|
||||
d->sig.length = digits;
|
||||
|
||||
if (unkBool >= 0) {
|
||||
__dorounddecup(d, digits);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void __ull2dec(decimal* result, unsigned long long val) {
|
||||
result->sign = 0;
|
||||
result->sig.length = 0;
|
||||
|
||||
for (; val != 0; val /= 10) {
|
||||
result->sig.text[result->sig.length++] = (unsigned char)(val % 10);
|
||||
}
|
||||
|
||||
{
|
||||
unsigned char* i = result->sig.text;
|
||||
unsigned char* j = result->sig.text + result->sig.length;
|
||||
|
||||
for (; i < --j; ++i) {
|
||||
unsigned char t = *i;
|
||||
*i = *j;
|
||||
*j = t;
|
||||
}
|
||||
}
|
||||
|
||||
result->exp = result->sig.length - 1;
|
||||
}
|
||||
|
||||
static void __timesdec(decimal* result, const decimal* x, const decimal* y) {
|
||||
unsigned long accumulator = 0;
|
||||
unsigned char mantissa[SIGDIGLEN * 2];
|
||||
int i = x->sig.length + y->sig.length - 1;
|
||||
unsigned char* pDigit;
|
||||
unsigned char* ip = mantissa + i + 1;
|
||||
unsigned char* ep = ip;
|
||||
|
||||
result->sign = 0;
|
||||
|
||||
for (; i > 0; i--) {
|
||||
int k = y->sig.length - 1;
|
||||
int j = i - k - 1;
|
||||
int l;
|
||||
int t;
|
||||
const unsigned char* jp;
|
||||
const unsigned char* kp;
|
||||
|
||||
if (j < 0) {
|
||||
j = 0;
|
||||
k = i - 1;
|
||||
}
|
||||
|
||||
jp = x->sig.text + j;
|
||||
kp = y->sig.text + k;
|
||||
l = k + 1;
|
||||
t = x->sig.length - j;
|
||||
|
||||
if (l > t)
|
||||
l = t;
|
||||
|
||||
for (; l > 0; l--, jp++, kp--) {
|
||||
accumulator += *jp * *kp;
|
||||
}
|
||||
|
||||
*--ip = (unsigned char)(accumulator % 10);
|
||||
accumulator /= 10;
|
||||
}
|
||||
|
||||
result->exp = (short)(x->exp + y->exp);
|
||||
|
||||
if (accumulator) {
|
||||
*--ip = (unsigned char)(accumulator);
|
||||
result->exp++;
|
||||
}
|
||||
|
||||
for (i = 0; i < SIGDIGLEN && ip < ep; i++, ip++) {
|
||||
result->sig.text[i] = *ip;
|
||||
}
|
||||
result->sig.length = (unsigned char)(i);
|
||||
|
||||
if (ip < ep && *ip >= 5) {
|
||||
if (*ip == 5) {
|
||||
unsigned char* jp = ip + 1;
|
||||
for (; jp < ep; jp++) {
|
||||
if (*jp != 0)
|
||||
goto round;
|
||||
}
|
||||
if ((ip[-1] & 1) == 0)
|
||||
return;
|
||||
}
|
||||
round:
|
||||
__dorounddecup(result, result->sig.length);
|
||||
}
|
||||
}
|
||||
|
||||
static void __str2dec(decimal* d, const char* s, short exp) {
|
||||
int i;
|
||||
|
||||
d->exp = exp;
|
||||
d->sign = 0;
|
||||
|
||||
for (i = 0; i < SIGDIGLEN && *s;) {
|
||||
d->sig.text[i++] = *s++ - '0';
|
||||
}
|
||||
d->sig.length = i;
|
||||
|
||||
if (*s != 0) {
|
||||
if (*s < 5)
|
||||
return;
|
||||
if (*s > 5)
|
||||
goto round;
|
||||
|
||||
{
|
||||
const char* p = s + 1;
|
||||
|
||||
for (; *p != 0; p++) {
|
||||
if (*p != '0')
|
||||
goto round;
|
||||
}
|
||||
|
||||
if ((d->sig.text[i - 1] & 1) == 0)
|
||||
return;
|
||||
}
|
||||
round:
|
||||
__dorounddecup(d, d->sig.length);
|
||||
}
|
||||
}
|
||||
|
||||
static void __two_exp(decimal* result, long exp) {
|
||||
switch (exp) {
|
||||
case -64:
|
||||
__str2dec(result, "542101086242752217003726400434970855712890625", -20);
|
||||
return;
|
||||
case -53:
|
||||
__str2dec(result, "11102230246251565404236316680908203125", -16);
|
||||
return;
|
||||
case -32:
|
||||
__str2dec(result, "23283064365386962890625", -10);
|
||||
return;
|
||||
case -16:
|
||||
__str2dec(result, "152587890625", -5);
|
||||
return;
|
||||
case -8:
|
||||
__str2dec(result, "390625", -3);
|
||||
return;
|
||||
case -7:
|
||||
__str2dec(result, "78125", -3);
|
||||
return;
|
||||
case -6:
|
||||
__str2dec(result, "15625", -2);
|
||||
return;
|
||||
case -5:
|
||||
__str2dec(result, "3125", -2);
|
||||
return;
|
||||
case -4:
|
||||
__str2dec(result, "625", -2);
|
||||
return;
|
||||
case -3:
|
||||
__str2dec(result, "125", -1);
|
||||
return;
|
||||
case -2:
|
||||
__str2dec(result, "25", -1);
|
||||
return;
|
||||
case -1:
|
||||
__str2dec(result, "5", -1);
|
||||
return;
|
||||
case 0:
|
||||
__str2dec(result, "1", 0);
|
||||
return;
|
||||
case 1:
|
||||
__str2dec(result, "2", 0);
|
||||
return;
|
||||
case 2:
|
||||
__str2dec(result, "4", 0);
|
||||
return;
|
||||
case 3:
|
||||
__str2dec(result, "8", 0);
|
||||
return;
|
||||
case 4:
|
||||
__str2dec(result, "16", 1);
|
||||
return;
|
||||
case 5:
|
||||
__str2dec(result, "32", 1);
|
||||
return;
|
||||
case 6:
|
||||
__str2dec(result, "64", 1);
|
||||
return;
|
||||
case 7:
|
||||
__str2dec(result, "128", 2);
|
||||
return;
|
||||
case 8:
|
||||
__str2dec(result, "256", 2);
|
||||
return;
|
||||
}
|
||||
|
||||
{
|
||||
decimal x2, temp;
|
||||
|
||||
__two_exp(&x2, exp / 2);
|
||||
__timesdec(result, &x2, &x2);
|
||||
|
||||
if (exp & 1) {
|
||||
temp = *result;
|
||||
if (exp > 0) {
|
||||
__str2dec(&x2, "2", 0);
|
||||
} else {
|
||||
__str2dec(&x2, "5", -1);
|
||||
}
|
||||
__timesdec(result, &temp, &x2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int __equals_dec(const decimal* x, const decimal* y) {
|
||||
if (x->sig.text[0] == 0) {
|
||||
return y->sig.text[0] == 0;
|
||||
}
|
||||
|
||||
if (y->sig.text[0] == 0) {
|
||||
return x->sig.text[0] == 0;
|
||||
}
|
||||
|
||||
if (x->exp == y->exp) {
|
||||
int i;
|
||||
int l = x->sig.length;
|
||||
|
||||
if (l > y->sig.length) {
|
||||
l = y->sig.length;
|
||||
}
|
||||
|
||||
for (i = 0; i < l; i++) {
|
||||
if (x->sig.text[i] != y->sig.text[i]) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (l == x->sig.length) {
|
||||
x = y;
|
||||
}
|
||||
|
||||
for (; i < x->sig.length; i++) {
|
||||
if (x->sig.text[i] != 0) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __less_dec(const decimal* x, const decimal* y) {
|
||||
if (x->sig.text[0] == 0) {
|
||||
unsigned char leading_digit = y->sig.text[0];
|
||||
return ((unsigned long)(-leading_digit | leading_digit) >> 31);
|
||||
}
|
||||
|
||||
if (y->sig.text[0] == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (x->exp == y->exp) {
|
||||
int i;
|
||||
int l = x->sig.length;
|
||||
|
||||
if (l > y->sig.length) {
|
||||
l = y->sig.length;
|
||||
}
|
||||
|
||||
for (i = 0; i < l; i++) {
|
||||
if (x->sig.text[i] < y->sig.text[i]) {
|
||||
return 1;
|
||||
} else if (y->sig.text[i] < x->sig.text[i]) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (l == x->sig.length) {
|
||||
for (; i < y->sig.length; i++) {
|
||||
if (y->sig.text[i] != 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
return x->exp < y->exp;
|
||||
}
|
||||
|
||||
static void __minus_dec(decimal* z, const decimal* x, const decimal* y) {
|
||||
int zlen, dexp;
|
||||
unsigned char *ib, *i, *ie;
|
||||
unsigned char const *jb, *j, *jn;
|
||||
|
||||
*z = *x;
|
||||
|
||||
if (y->sig.text[0] == 0)
|
||||
return;
|
||||
|
||||
zlen = z->sig.length;
|
||||
if (zlen < y->sig.length)
|
||||
zlen = y->sig.length;
|
||||
|
||||
dexp = z->exp - y->exp;
|
||||
zlen += dexp;
|
||||
|
||||
if (zlen > SIGDIGLEN)
|
||||
zlen = SIGDIGLEN;
|
||||
|
||||
while (z->sig.length < zlen) {
|
||||
z->sig.text[z->sig.length++] = 0;
|
||||
}
|
||||
|
||||
ib = z->sig.text;
|
||||
i = ib + zlen;
|
||||
|
||||
if (y->sig.length + dexp < zlen) {
|
||||
i = ib + (y->sig.length + dexp);
|
||||
}
|
||||
|
||||
jb = y->sig.text;
|
||||
j = jb + (i - ib - dexp);
|
||||
jn = j;
|
||||
|
||||
while (i > ib && j > jb) {
|
||||
i--;
|
||||
j--;
|
||||
if (*i < *j) {
|
||||
unsigned char* k = i - 1;
|
||||
while (*k == 0)
|
||||
k--;
|
||||
while (k != i) {
|
||||
--*k;
|
||||
*++k += 10;
|
||||
}
|
||||
}
|
||||
*i -= *j;
|
||||
}
|
||||
|
||||
if (jn - jb < y->sig.length) {
|
||||
int round_down = 0;
|
||||
if (*jn < 5)
|
||||
round_down = 1;
|
||||
else if (*jn == 5) {
|
||||
unsigned char const* ibPtr = y->sig.text + y->sig.length;
|
||||
|
||||
for (j = jn + 1; j < ibPtr; j++) {
|
||||
if (*j != 0)
|
||||
goto done;
|
||||
}
|
||||
i = ib + (jn - jb) + dexp - 1;
|
||||
if (*i & 1)
|
||||
round_down = 1;
|
||||
}
|
||||
if (round_down) {
|
||||
if (*i < 1) {
|
||||
unsigned char* k = i - 1;
|
||||
while (*k == 0)
|
||||
k--;
|
||||
while (k != i) {
|
||||
--*k;
|
||||
*++k += 10;
|
||||
}
|
||||
}
|
||||
*i -= 1;
|
||||
}
|
||||
}
|
||||
done:
|
||||
for (i = ib; *i == 0; ++i) {}
|
||||
|
||||
if (i > ib) {
|
||||
unsigned char dl = (unsigned char)(i - ib);
|
||||
z->exp -= dl;
|
||||
ie = ib + z->sig.length;
|
||||
for (; i < ie; ++i, ++ib)
|
||||
*ib = *i;
|
||||
z->sig.length -= dl;
|
||||
}
|
||||
|
||||
ib = z->sig.text;
|
||||
for (i = ib + z->sig.length; i > ib;) {
|
||||
i--;
|
||||
if (*i != 0)
|
||||
break;
|
||||
}
|
||||
z->sig.length = (unsigned char)(i - ib + 1);
|
||||
}
|
||||
|
||||
static void __num2dec_internal(decimal* d, double x) {
|
||||
signed char sign = (signed char)(__signbitd(x) != 0);
|
||||
|
||||
if (x == 0) {
|
||||
d->sign = sign;
|
||||
d->exp = 0;
|
||||
d->sig.length = 1;
|
||||
d->sig.text[0] = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!isfinite(x)) {
|
||||
d->sign = sign;
|
||||
d->exp = 0;
|
||||
d->sig.length = 1;
|
||||
d->sig.text[0] = fpclassify(x) == 1 ? 'N' : 'I';
|
||||
return;
|
||||
}
|
||||
|
||||
if (sign != 0) {
|
||||
x = -x;
|
||||
}
|
||||
|
||||
{
|
||||
int exp;
|
||||
double frac = frexp(x, &exp);
|
||||
int num_bits_extract = LDBL_MANT_DIG - __count_trailing_zero(frac);
|
||||
decimal int_d, pow2_d;
|
||||
|
||||
__two_exp(&pow2_d, exp - num_bits_extract);
|
||||
__ull2dec(&int_d, ldexp(frac, num_bits_extract));
|
||||
__timesdec(d, &int_d, &pow2_d);
|
||||
d->sign = sign;
|
||||
}
|
||||
}
|
||||
|
||||
void __num2dec(const decform* form, double x, decimal* d) {
|
||||
short digits = form->digits;
|
||||
int i;
|
||||
__num2dec_internal(d, x);
|
||||
|
||||
if (d->sig.text[0] > 9) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (digits > SIGDIGLEN) {
|
||||
digits = SIGDIGLEN;
|
||||
}
|
||||
|
||||
__rounddec(d, digits);
|
||||
|
||||
while (d->sig.length < digits) {
|
||||
d->sig.text[d->sig.length++] = 0;
|
||||
}
|
||||
|
||||
d->exp -= d->sig.length - 1;
|
||||
|
||||
for (i = 0; i < d->sig.length; i++) {
|
||||
d->sig.text[i] += '0';
|
||||
}
|
||||
}
|
||||
|
||||
double __dec2num(const decimal* d) {
|
||||
if (d->sig.length <= 0) {
|
||||
return copysign(0.0, d->sign == 0 ? 1.0 : -1.0);
|
||||
}
|
||||
|
||||
switch (d->sig.text[0]) {
|
||||
case '0':
|
||||
return copysign(0.0, d->sign == 0 ? 1.0 : -1.0);
|
||||
case 'I':
|
||||
return copysign((double)INFINITY, d->sign == 0 ? 1.0 : -1.0);
|
||||
case 'N': {
|
||||
double result;
|
||||
d_int* ll = (d_int*)&result;
|
||||
|
||||
*ll = 0x7FF0000000000000;
|
||||
if (d->sign)
|
||||
*ll |= 0x8000000000000000;
|
||||
*ll |= 0x8000000000000;
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
static double pow_10[8] = {1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8};
|
||||
|
||||
decimal dec = *d;
|
||||
unsigned char* i = dec.sig.text;
|
||||
unsigned char* e = i + dec.sig.length;
|
||||
double first_guess;
|
||||
int exponent;
|
||||
|
||||
for (; i < e; ++i)
|
||||
*i -= '0';
|
||||
dec.exp += dec.sig.length - 1;
|
||||
exponent = dec.exp;
|
||||
|
||||
{
|
||||
decimal max;
|
||||
|
||||
__str2dec(&max, "179769313486231580793728714053034151", 308);
|
||||
if (__less_dec(&max, &dec)) {
|
||||
return copysign((double)INFINITY, d->sign == 0 ? 1.0 : -1.0);
|
||||
}
|
||||
}
|
||||
|
||||
i = dec.sig.text;
|
||||
first_guess = *i++;
|
||||
|
||||
while (i < e) {
|
||||
unsigned long ival = 0;
|
||||
int j;
|
||||
double temp1, temp2;
|
||||
int ndig = (int)(e - i) % 8;
|
||||
|
||||
if (ndig == 0)
|
||||
ndig = 8;
|
||||
|
||||
for (j = 0; j < ndig; ++j, ++i) {
|
||||
ival = ival * 10 + *i;
|
||||
}
|
||||
|
||||
temp1 = first_guess * pow_10[ndig - 1];
|
||||
temp2 = temp1 + ival;
|
||||
|
||||
if (ival != 0 && temp1 == temp2)
|
||||
break;
|
||||
|
||||
first_guess = temp2;
|
||||
exponent -= ndig;
|
||||
}
|
||||
|
||||
if (exponent < 0) {
|
||||
first_guess /= pow(5.0, -exponent);
|
||||
} else {
|
||||
first_guess *= pow(5.0, exponent);
|
||||
}
|
||||
|
||||
first_guess = ldexp(first_guess, exponent);
|
||||
|
||||
if (fpclassify(first_guess) == 2) {
|
||||
first_guess = LDBL_MAX;
|
||||
}
|
||||
|
||||
{
|
||||
decimal feedback1, feedback2, difflow, diffhigh;
|
||||
double next_guess;
|
||||
d_int* ull = (d_int*)&next_guess;
|
||||
int guessed_low = 0;
|
||||
|
||||
__num2dec_internal(&feedback1, first_guess);
|
||||
|
||||
if (__equals_dec(&feedback1, &dec)) {
|
||||
goto done;
|
||||
}
|
||||
if (__less_dec(&feedback1, &dec)) {
|
||||
guessed_low = 1;
|
||||
}
|
||||
|
||||
next_guess = first_guess;
|
||||
|
||||
while (1) {
|
||||
if (guessed_low) {
|
||||
++*ull;
|
||||
if (fpclassify(next_guess) == 2) {
|
||||
goto done;
|
||||
}
|
||||
} else {
|
||||
--*ull;
|
||||
}
|
||||
|
||||
__num2dec_internal(&feedback2, next_guess);
|
||||
if (guessed_low && !__less_dec(&feedback2, &dec)) {
|
||||
break;
|
||||
} else if (!guessed_low && !__less_dec(&dec, &feedback2)) {
|
||||
difflow = feedback1;
|
||||
feedback1 = feedback2;
|
||||
feedback2 = difflow;
|
||||
{
|
||||
double temp = first_guess;
|
||||
first_guess = next_guess;
|
||||
next_guess = temp;
|
||||
}
|
||||
break;
|
||||
}
|
||||
feedback1 = feedback2;
|
||||
first_guess = next_guess;
|
||||
}
|
||||
|
||||
__minus_dec(&difflow, &dec, &feedback1);
|
||||
__minus_dec(&diffhigh, &feedback2, &dec);
|
||||
|
||||
if (__equals_dec(&difflow, &diffhigh)) {
|
||||
if (*(unsigned long long*)&first_guess & 1) {
|
||||
first_guess = next_guess;
|
||||
}
|
||||
} else if (!__less_dec(&difflow, &diffhigh)) {
|
||||
first_guess = next_guess;
|
||||
}
|
||||
}
|
||||
done:
|
||||
if (dec.sign) {
|
||||
first_guess = -first_guess;
|
||||
}
|
||||
return first_guess;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,8 +88,16 @@ namespace nw4r {
|
||||
PaneList& GetChildList() { return mChildList; }
|
||||
|
||||
const math::VEC3& GetTranslate() { return mTranslate; }
|
||||
#ifdef IPL_SDMEMORY_SET_TRANSLATE_OUT_OF_LINE
|
||||
void SetTranslate(const math::VEC3& translate);
|
||||
#else
|
||||
void SetTranslate(const math::VEC3& translate) { mTranslate = translate; }
|
||||
#endif
|
||||
#ifdef IPL_SDMEMORY_SET_TRANSLATE_OUT_OF_LINE
|
||||
void SetTranslate(const math::VEC2& translate);
|
||||
#else
|
||||
void SetTranslate(const math::VEC2& translate) { SetTranslate(math::VEC3(translate.x, translate.y, 0.0f)); }
|
||||
#endif
|
||||
|
||||
const math::VEC3& GetRotate() const { return mRotate; }
|
||||
void SetRotate(const math::VEC3& rotate) { mRotate = rotate; }
|
||||
|
||||
@@ -55,6 +55,12 @@ namespace nw4r {
|
||||
NW4R_ASSERT(type < TEXTCOLOR_MAX);
|
||||
return mTextColors[type];
|
||||
}
|
||||
#ifdef IPL_SDMEMORY_SET_TEXT_COLORS
|
||||
void SetTextColors(const ut::Color& first, const ut::Color& second) {
|
||||
mTextColors[0] = first;
|
||||
mTextColors[1] = second;
|
||||
}
|
||||
#endif
|
||||
void SetTextColor(u32 type, ut::Color value) {
|
||||
NW4R_ASSERT(type < TEXTCOLOR_MAX);
|
||||
mTextColors[type] = value;
|
||||
|
||||
@@ -157,11 +157,15 @@ namespace nw4r {
|
||||
y = pF[1];
|
||||
z = pF[2];
|
||||
}
|
||||
#if defined(IPL_SD_CHANNEL_SELECT_CPP)
|
||||
VEC3(f32 fx, f32 fy, f32 fz);
|
||||
#else
|
||||
VEC3(f32 fx, f32 fy, f32 fz) {
|
||||
x = fx;
|
||||
y = fy;
|
||||
z = fz;
|
||||
}
|
||||
#endif
|
||||
|
||||
operator Vec*() { return reinterpret_cast<Vec*>(this); }
|
||||
operator const Vec*() const { return reinterpret_cast<const Vec*>(this); }
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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(); }
|
||||
|
||||
|
||||
@@ -14,9 +14,13 @@ namespace nw4r {
|
||||
#else
|
||||
Rect() : left(), top(), right(), bottom() {}
|
||||
#endif
|
||||
#ifdef IPL_SETTING_RECT_OUT_OF_LINE
|
||||
Rect(f32 l, f32 t, f32 r, f32 b);
|
||||
#else
|
||||
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
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -301,9 +301,9 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 uVar1 = sException.FPCSR_COPY;
|
||||
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((uVar1 & 0x20000000) != 0) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
@@ -333,16 +333,16 @@ namespace nw4r {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((uVar1 & 0x10000000) != 0) {
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x8000000) != 0) {
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x4000000) != 0) {
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((uVar1 & 0x2000000) != 0) {
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 scLytFatalColorR = 255;
|
||||
extern "C" const u8 scLytFatalColorG = 255;
|
||||
extern "C" const u8 scLytFatalColorB = 255;
|
||||
extern "C" const u8 scLytFatalColorA = 0;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -106,7 +106,15 @@ typedef struct {
|
||||
u16 outputHeight; // 0x2A
|
||||
u32 convWidth; // 0x2C
|
||||
u32 convHeight; // 0x30
|
||||
#ifdef TMC_JPEG_PLANAR_OUTPUT
|
||||
u32 chromaWidth;
|
||||
u32 chromaHeight;
|
||||
u8* pLumaBuffer;
|
||||
u8* pCbBuffer;
|
||||
u8* pCrBuffer;
|
||||
#else
|
||||
u8 unk_0x34[0x14]; // 0x34
|
||||
#endif
|
||||
void* pTexBuffer; // 0x48
|
||||
u8 unk_0x4C[0x67C];
|
||||
TMCCJPEGDecWork* pWorkBuf; // 0x6C8
|
||||
|
||||
@@ -1,13 +1,119 @@
|
||||
// Matching build uses iqdec_b65_frv32.s (retail extract); keep C for reference.
|
||||
#include <string.h>
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
typedef struct {
|
||||
u16 bitLength;
|
||||
u16 symbol;
|
||||
} TMCHuffmanEntry;
|
||||
|
||||
static TMCHuffmanEntry readHuffmanEntry(const TMCHuffmanEntry* entries, u32 index) {
|
||||
return entries[index];
|
||||
}
|
||||
|
||||
static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
|
||||
TMCHuffmanEntry limit;
|
||||
limit.bitLength = entries->bitLength;
|
||||
limit.symbol = entries->symbol;
|
||||
return limit;
|
||||
}
|
||||
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
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) {
|
||||
volatile u32 ac_comb;
|
||||
u16* ac_fast;
|
||||
TMCHuffmanEntry dcEntry;
|
||||
TMCHuffmanEntry acEntry;
|
||||
const TMCHuffmanEntry* ac_fast;
|
||||
u8* huff_sym;
|
||||
u32* huff_tbl;
|
||||
s32 bit_pos;
|
||||
u32 bit_data;
|
||||
u16* dc_fast;
|
||||
const TMCHuffmanEntry* dc_fast;
|
||||
s32 r;
|
||||
s32 blk0;
|
||||
s32 idx;
|
||||
@@ -19,29 +125,23 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
const u8* zztbl;
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
dc_fast = work->pDCFast;
|
||||
dc_fast = (const TMCHuffmanEntry*)work->pDCFast;
|
||||
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
bit_data = work->bitBuf;
|
||||
tmp = bit_pos - 8;
|
||||
tmp = ((bit_data >> tmp) & 0xFF) << 2;
|
||||
{
|
||||
u16* dc_entry = (u16*)((u8*)dc_fast + tmp);
|
||||
r = dc_entry[0];
|
||||
extra = dc_entry[1];
|
||||
}
|
||||
|
||||
{
|
||||
volatile u32 dc_comb;
|
||||
*(u16*)&dc_comb = r;
|
||||
*((u16*)&dc_comb + 1) = extra;
|
||||
dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
|
||||
r = dcEntry.bitLength;
|
||||
extra = dcEntry.symbol;
|
||||
}
|
||||
|
||||
if (r != 0) {
|
||||
@@ -49,74 +149,9 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
r = extra;
|
||||
} else {
|
||||
u32 code;
|
||||
unsigned int i;
|
||||
u16* entry;
|
||||
s32 thresh;
|
||||
s32 offs;
|
||||
|
||||
huff_sym = work->pDCHuffSym;
|
||||
huff_tbl = work->pDCHuffTbl;
|
||||
|
||||
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 = (u16*)((u8*)huff_tbl + 0x24);
|
||||
|
||||
goto dc_entry;
|
||||
|
||||
while (1) {
|
||||
i++;
|
||||
entry += 2;
|
||||
if (i > 16) {
|
||||
r = 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:
|
||||
thresh = entry[0];
|
||||
offs = entry[1];
|
||||
|
||||
{
|
||||
volatile u16 p[2];
|
||||
p[0] = thresh;
|
||||
p[1] = offs;
|
||||
tmp = *(u32*)p;
|
||||
}
|
||||
|
||||
{
|
||||
volatile u32 cw;
|
||||
cw = tmp;
|
||||
thresh = *(u16*)&cw;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry[0] + offs;
|
||||
r = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
dc_end:
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -130,203 +165,120 @@ 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;
|
||||
bit_pos -= r;
|
||||
work->bitCount = bit_pos;
|
||||
extra = extra & (bit_data >> bit_pos);
|
||||
if ((s32)tmp >> 1 <= extra) {
|
||||
extra = extra;
|
||||
} else {
|
||||
extra = extra - (tmp - 1);
|
||||
if (((s32)tmp >> 1) > extra) {
|
||||
extra -= tmp - 1;
|
||||
}
|
||||
dc_predict_row_ptr[0] += extra;
|
||||
}
|
||||
|
||||
*block = dc_predict_row_ptr[0] * blk0;
|
||||
|
||||
ac_fast = work->pACFast;
|
||||
huff_tbl = work->pACHuffTbl;
|
||||
huff_sym = work->pACHuffSym;
|
||||
|
||||
memset((u8*)block + 4, 0, 0xFC);
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
idx = 1;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
zztbl = TMCJPEGDEC_Zigzag_data;
|
||||
bit_data = work->bitBuf;
|
||||
t = bit_pos - 8;
|
||||
{
|
||||
u32 tbl_idx = ((bit_data >> t) & 0xFF) << 2;
|
||||
s32 thresh_val = ac_fast[tbl_idx >> 1];
|
||||
s32 offs_val = *(u16*)((u8*)ac_fast + tbl_idx + 2);
|
||||
*(u16*)&ac_comb = thresh_val;
|
||||
*((u16*)&ac_comb + 1) = offs_val;
|
||||
}
|
||||
ac_fast = (const TMCHuffmanEntry*)work->pACFast;
|
||||
huff_tbl = work->pACHuffTbl;
|
||||
huff_sym = work->pACHuffSym;
|
||||
|
||||
while (idx < 64) {
|
||||
s32 ac_thresh = *(u16*)&ac_comb;
|
||||
if (ac_thresh != 0) {
|
||||
bit_pos = work->bitCount;
|
||||
bit_pos -= ac_thresh;
|
||||
work->bitCount = bit_pos;
|
||||
r = *((u16*)&ac_comb + 1);
|
||||
} else {
|
||||
u32 code;
|
||||
unsigned int i;
|
||||
u16* entry;
|
||||
s32 thresh;
|
||||
s32 offs;
|
||||
memset(block + 1, 0, 0xFC);
|
||||
|
||||
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 = (u16*)((u8*)work->pACHuffTbl + 0x24);
|
||||
|
||||
goto ac_entry_huff;
|
||||
|
||||
while (1) {
|
||||
i++;
|
||||
entry += 2;
|
||||
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:
|
||||
thresh = entry[0];
|
||||
offs = entry[1];
|
||||
|
||||
{
|
||||
volatile u16 p[2];
|
||||
p[0] = thresh;
|
||||
p[1] = offs;
|
||||
tmp = *(u32*)p;
|
||||
}
|
||||
|
||||
{
|
||||
volatile u32 cw;
|
||||
cw = tmp;
|
||||
thresh = *(u16*)&cw;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry[0] + offs;
|
||||
r = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
ac_end:
|
||||
if (r < 0) {
|
||||
bit_pos = work->bitCount;
|
||||
idx = 1;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
t = r & 0x0F;
|
||||
if (t != 0) {
|
||||
r >>= 4;
|
||||
idx += r;
|
||||
bit_pos = work->bitCount;
|
||||
zztbl = TMCJPEGDEC_Zigzag_data;
|
||||
bit_data = work->bitBuf;
|
||||
t = bit_pos - 8;
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
if (idx >= 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
|
||||
zz = zztbl[idx];
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= t + 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
do {
|
||||
s32 ac_thresh = acEntry.bitLength;
|
||||
if (ac_thresh != 0) {
|
||||
bit_pos = work->bitCount;
|
||||
bit_pos -= ac_thresh;
|
||||
work->bitCount = bit_pos;
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
bit_pos = work->bitCount;
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
t = r & 0x0F;
|
||||
if (t != 0) {
|
||||
r >>= 4;
|
||||
idx += r;
|
||||
|
||||
if (idx >= 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
|
||||
zz = zztbl[idx];
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= t + 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
tmp = 1 << t;
|
||||
bit_data = work->bitBuf;
|
||||
extra = tmp - 1;
|
||||
bit_pos -= t;
|
||||
work->bitCount = bit_pos;
|
||||
t = bit_pos - 8;
|
||||
{
|
||||
u32 next_tbl = ((bit_data >> t) & 0xFF) << 2;
|
||||
s32 next_th = ac_fast[next_tbl >> 1];
|
||||
s32 next_of = *(u16*)((u8*)ac_fast + next_tbl + 2);
|
||||
tmp = 1 << t;
|
||||
bit_data = work->bitBuf;
|
||||
extra = tmp - 1;
|
||||
bit_pos -= t;
|
||||
work->bitCount = bit_pos;
|
||||
t = bit_pos - 8;
|
||||
extra = extra & (bit_data >> bit_pos);
|
||||
*(u16*)&ac_comb = next_th;
|
||||
*((u16*)&ac_comb + 1) = next_of;
|
||||
}
|
||||
q = ((s32*)conv_row_ptr)[(u8)zz];
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
if ((s32)tmp >> 1 <= extra) {
|
||||
extra = extra;
|
||||
} else {
|
||||
extra = extra - (tmp - 1);
|
||||
}
|
||||
|
||||
q = ((s32*)conv_row_ptr)[zz];
|
||||
block[zz] = extra * q;
|
||||
|
||||
idx++;
|
||||
} else {
|
||||
if (r == 0) {
|
||||
break;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
if (((s32)tmp >> 1) > extra) {
|
||||
extra -= tmp - 1;
|
||||
}
|
||||
}
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos = work->bitCount;
|
||||
t = bit_pos - 8;
|
||||
tmp = ((bit_data >> t) & 0xFF) << 2;
|
||||
{
|
||||
s32 next_thresh = ac_fast[tmp >> 1];
|
||||
s32 next_offs = *(u16*)((u8*)ac_fast + tmp + 2);
|
||||
*(u16*)&ac_comb = next_thresh;
|
||||
*((u16*)&ac_comb + 1) = next_offs;
|
||||
}
|
||||
|
||||
idx += 16;
|
||||
block[(u8)zz] = extra * q;
|
||||
|
||||
idx++;
|
||||
} else {
|
||||
if (r == 0) {
|
||||
break;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos = work->bitCount;
|
||||
t = bit_pos - 8;
|
||||
tmp = ((bit_data >> t) & 0xFF) << 2;
|
||||
acEntry = readHuffmanEntry(ac_fast, tmp >> 2);
|
||||
|
||||
idx += 16;
|
||||
}
|
||||
} while (idx < 64);
|
||||
|
||||
if (idx > 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
}
|
||||
|
||||
if (idx > 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
idx--;
|
||||
return TMCJPEGDEC_Zigzag_loop[idx];
|
||||
}
|
||||
|
||||
idx--;
|
||||
return TMCJPEGDEC_Zigzag_loop[idx];
|
||||
}
|
||||
|
||||
315
libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32.s
Normal file
315
libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32.s
Normal file
@@ -0,0 +1,315 @@
|
||||
.include "macros.inc"
|
||||
.file "iqdec_b65_frv32.c"
|
||||
|
||||
# 0x814F6BD4..0x814F7024 | size: 0x450
|
||||
.text
|
||||
.balign 4
|
||||
|
||||
# .text:0x0 | 0x814F6BD4 | size: 0x450
|
||||
.fn TMCJPEGDEC_decode_iquant, global
|
||||
/* 814F6BD4 001C70F4 94 21 FF B0 */ stwu r1, -0x50(r1)
|
||||
/* 814F6BD8 001C70F8 7C 08 02 A6 */ mflr r0
|
||||
/* 814F6BDC 001C70FC 90 01 00 54 */ stw r0, 0x54(r1)
|
||||
/* 814F6BE0 001C7100 BE A1 00 24 */ stmw r21, 0x24(r1)
|
||||
/* 814F6BE4 001C7104 7C 75 1B 78 */ mr r21, r3
|
||||
/* 814F6BE8 001C7108 7C 96 23 78 */ mr r22, r4
|
||||
/* 814F6BEC 001C710C 7C B8 2B 78 */ mr r24, r5
|
||||
/* 814F6BF0 001C7110 7C D7 33 78 */ mr r23, r6
|
||||
/* 814F6BF4 001C7114 80 06 00 04 */ lwz r0, 0x4(r6)
|
||||
/* 814F6BF8 001C7118 83 26 04 98 */ lwz r25, 0x498(r6)
|
||||
/* 814F6BFC 001C711C 2C 00 00 08 */ cmpwi r0, 0x8
|
||||
/* 814F6C00 001C7120 41 81 00 18 */ bgt .L_814F6C18
|
||||
/* 814F6C04 001C7124 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6C08 001C7128 4B FF 42 05 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6C0C 001C712C 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6C10 001C7130 40 80 00 08 */ bge .L_814F6C18
|
||||
/* 814F6C14 001C7134 48 00 03 FC */ b .L_814F7010
|
||||
.L_814F6C18:
|
||||
/* 814F6C18 001C7138 80 97 00 04 */ lwz r4, 0x4(r23)
|
||||
/* 814F6C1C 001C713C 80 77 00 00 */ lwz r3, 0x0(r23)
|
||||
/* 814F6C20 001C7140 38 04 FF F8 */ subi r0, r4, 0x8
|
||||
/* 814F6C24 001C7144 7C 60 04 30 */ srw r0, r3, r0
|
||||
/* 814F6C28 001C7148 54 00 15 BA */ clrlslwi r0, r0, 24, 2
|
||||
/* 814F6C2C 001C714C 7C 79 02 14 */ add r3, r25, r0
|
||||
/* 814F6C30 001C7150 7C 19 02 2E */ lhzx r0, r25, r0
|
||||
/* 814F6C34 001C7154 A3 23 00 02 */ lhz r25, 0x2(r3)
|
||||
/* 814F6C38 001C7158 2C 00 00 00 */ cmpwi r0, 0x0
|
||||
/* 814F6C3C 001C715C B0 01 00 1C */ sth r0, 0x1c(r1)
|
||||
/* 814F6C40 001C7160 B3 21 00 1E */ sth r25, 0x1e(r1)
|
||||
/* 814F6C44 001C7164 41 82 00 10 */ beq .L_814F6C54
|
||||
/* 814F6C48 001C7168 7C 00 20 50 */ subf r0, r0, r4
|
||||
/* 814F6C4C 001C716C 90 17 00 04 */ stw r0, 0x4(r23)
|
||||
/* 814F6C50 001C7170 48 00 00 C8 */ b .L_814F6D18
|
||||
.L_814F6C54:
|
||||
/* 814F6C54 001C7174 2C 04 00 11 */ cmpwi r4, 0x11
|
||||
/* 814F6C58 001C7178 83 B7 04 A0 */ lwz r29, 0x4a0(r23)
|
||||
/* 814F6C5C 001C717C 83 37 04 9C */ lwz r25, 0x49c(r23)
|
||||
/* 814F6C60 001C7180 41 81 00 18 */ bgt .L_814F6C78
|
||||
/* 814F6C64 001C7184 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6C68 001C7188 4B FF 41 A5 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6C6C 001C718C 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6C70 001C7190 40 80 00 08 */ bge .L_814F6C78
|
||||
/* 814F6C74 001C7194 48 00 00 94 */ b .L_814F6D08
|
||||
.L_814F6C78:
|
||||
/* 814F6C78 001C7198 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6C7C 001C719C 38 F9 00 24 */ addi r7, r25, 0x24
|
||||
/* 814F6C80 001C71A0 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6C84 001C71A4 38 A0 00 09 */ li r5, 0x9
|
||||
/* 814F6C88 001C71A8 38 63 FF F7 */ subi r3, r3, 0x9
|
||||
/* 814F6C8C 001C71AC 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6C90 001C71B0 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6C94 001C71B4 54 06 05 FE */ clrlwi r6, r0, 23
|
||||
/* 814F6C98 001C71B8 48 00 00 3C */ b .L_814F6CD4
|
||||
.L_814F6C9C:
|
||||
/* 814F6C9C 001C71BC 38 A5 00 01 */ addi r5, r5, 0x1
|
||||
/* 814F6CA0 001C71C0 38 E7 00 04 */ addi r7, r7, 0x4
|
||||
/* 814F6CA4 001C71C4 28 05 00 10 */ cmplwi r5, 0x10
|
||||
/* 814F6CA8 001C71C8 40 81 00 0C */ ble .L_814F6CB4
|
||||
/* 814F6CAC 001C71CC 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6CB0 001C71D0 48 00 00 58 */ b .L_814F6D08
|
||||
.L_814F6CB4:
|
||||
/* 814F6CB4 001C71D4 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6CB8 001C71D8 54 C6 08 3C */ slwi r6, r6, 1
|
||||
/* 814F6CBC 001C71DC 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6CC0 001C71E0 38 63 FF FF */ subi r3, r3, 0x1
|
||||
/* 814F6CC4 001C71E4 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6CC8 001C71E8 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6CCC 001C71EC 54 00 07 FE */ clrlwi r0, r0, 31
|
||||
/* 814F6CD0 001C71F0 7C C6 03 78 */ or r6, r6, r0
|
||||
.L_814F6CD4:
|
||||
/* 814F6CD4 001C71F4 A0 87 00 00 */ lhz r4, 0x0(r7)
|
||||
/* 814F6CD8 001C71F8 A0 67 00 02 */ lhz r3, 0x2(r7)
|
||||
/* 814F6CDC 001C71FC B0 81 00 14 */ sth r4, 0x14(r1)
|
||||
/* 814F6CE0 001C7200 B0 61 00 16 */ sth r3, 0x16(r1)
|
||||
/* 814F6CE4 001C7204 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 814F6CE8 001C7208 90 01 00 18 */ stw r0, 0x18(r1)
|
||||
/* 814F6CEC 001C720C A0 01 00 18 */ lhz r0, 0x18(r1)
|
||||
/* 814F6CF0 001C7210 7C 06 00 40 */ cmplw r6, r0
|
||||
/* 814F6CF4 001C7214 41 81 FF A8 */ bgt .L_814F6C9C
|
||||
/* 814F6CF8 001C7218 7C 04 30 50 */ subf r0, r4, r6
|
||||
/* 814F6CFC 001C721C 7C 00 1A 14 */ add r0, r0, r3
|
||||
/* 814F6D00 001C7220 54 00 06 3E */ clrlwi r0, r0, 24
|
||||
/* 814F6D04 001C7224 7C 7D 00 AE */ lbzx r3, r29, r0
|
||||
.L_814F6D08:
|
||||
/* 814F6D08 001C7228 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6D0C 001C722C 7C 79 1B 78 */ mr r25, r3
|
||||
/* 814F6D10 001C7230 40 80 00 08 */ bge .L_814F6D18
|
||||
/* 814F6D14 001C7234 48 00 02 FC */ b .L_814F7010
|
||||
.L_814F6D18:
|
||||
/* 814F6D18 001C7238 2C 19 00 00 */ cmpwi r25, 0x0
|
||||
/* 814F6D1C 001C723C 83 76 00 00 */ lwz r27, 0x0(r22)
|
||||
/* 814F6D20 001C7240 41 82 00 64 */ beq .L_814F6D84
|
||||
/* 814F6D24 001C7244 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6D28 001C7248 7C 00 C8 00 */ cmpw r0, r25
|
||||
/* 814F6D2C 001C724C 41 81 00 18 */ bgt .L_814F6D44
|
||||
/* 814F6D30 001C7250 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6D34 001C7254 4B FF 40 D9 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6D38 001C7258 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6D3C 001C725C 40 80 00 08 */ bge .L_814F6D44
|
||||
/* 814F6D40 001C7260 48 00 02 D0 */ b .L_814F7010
|
||||
.L_814F6D44:
|
||||
/* 814F6D44 001C7264 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6D48 001C7268 38 80 00 01 */ li r4, 0x1
|
||||
/* 814F6D4C 001C726C 80 77 00 00 */ lwz r3, 0x0(r23)
|
||||
/* 814F6D50 001C7270 7C 86 C8 30 */ slw r6, r4, r25
|
||||
/* 814F6D54 001C7274 7C 99 00 50 */ subf r4, r25, r0
|
||||
/* 814F6D58 001C7278 38 A6 FF FF */ subi r5, r6, 0x1
|
||||
/* 814F6D5C 001C727C 7C C0 0E 70 */ srawi r0, r6, 1
|
||||
/* 814F6D60 001C7280 7C 63 24 30 */ srw r3, r3, r4
|
||||
/* 814F6D64 001C7284 90 97 00 04 */ stw r4, 0x4(r23)
|
||||
/* 814F6D68 001C7288 7C A3 18 38 */ and r3, r5, r3
|
||||
/* 814F6D6C 001C728C 7C 00 18 00 */ cmpw r0, r3
|
||||
/* 814F6D70 001C7290 40 81 00 08 */ ble .L_814F6D78
|
||||
/* 814F6D74 001C7294 7C 65 18 50 */ subf r3, r5, r3
|
||||
.L_814F6D78:
|
||||
/* 814F6D78 001C7298 80 18 00 00 */ lwz r0, 0x0(r24)
|
||||
/* 814F6D7C 001C729C 7C 00 1A 14 */ add r0, r0, r3
|
||||
/* 814F6D80 001C72A0 90 18 00 00 */ stw r0, 0x0(r24)
|
||||
.L_814F6D84:
|
||||
/* 814F6D84 001C72A4 80 18 00 00 */ lwz r0, 0x0(r24)
|
||||
/* 814F6D88 001C72A8 38 75 00 04 */ addi r3, r21, 0x4
|
||||
/* 814F6D8C 001C72AC 38 80 00 00 */ li r4, 0x0
|
||||
/* 814F6D90 001C72B0 38 A0 00 FC */ li r5, 0xfc
|
||||
/* 814F6D94 001C72B4 7C 00 D9 D6 */ mullw r0, r0, r27
|
||||
/* 814F6D98 001C72B8 90 15 00 00 */ stw r0, 0x0(r21)
|
||||
/* 814F6D9C 001C72BC 83 97 04 A8 */ lwz r28, 0x4a8(r23)
|
||||
/* 814F6DA0 001C72C0 83 37 04 AC */ lwz r25, 0x4ac(r23)
|
||||
/* 814F6DA4 001C72C4 83 17 04 B0 */ lwz r24, 0x4b0(r23)
|
||||
/* 814F6DA8 001C72C8 4B E3 95 8D */ bl memset
|
||||
/* 814F6DAC 001C72CC 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6DB0 001C72D0 3B 60 00 01 */ li r27, 0x1
|
||||
/* 814F6DB4 001C72D4 2C 00 00 08 */ cmpwi r0, 0x8
|
||||
/* 814F6DB8 001C72D8 41 81 00 18 */ bgt .L_814F6DD0
|
||||
/* 814F6DBC 001C72DC 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6DC0 001C72E0 4B FF 40 4D */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6DC4 001C72E4 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6DC8 001C72E8 40 80 00 08 */ bge .L_814F6DD0
|
||||
/* 814F6DCC 001C72EC 48 00 02 44 */ b .L_814F7010
|
||||
.L_814F6DD0:
|
||||
/* 814F6DD0 001C72F0 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6DD4 001C72F4 3F A0 81 62 */ lis r29, TMCJPEGDEC_Zigzag_data@ha
|
||||
/* 814F6DD8 001C72F8 80 97 00 00 */ lwz r4, 0x0(r23)
|
||||
/* 814F6DDC 001C72FC 3B BD E1 B0 */ addi r29, r29, TMCJPEGDEC_Zigzag_data@l
|
||||
/* 814F6DE0 001C7300 38 03 FF F8 */ subi r0, r3, 0x8
|
||||
/* 814F6DE4 001C7304 3B E0 00 01 */ li r31, 0x1
|
||||
/* 814F6DE8 001C7308 7C 80 04 30 */ srw r0, r4, r0
|
||||
/* 814F6DEC 001C730C 54 00 15 BA */ clrlslwi r0, r0, 24, 2
|
||||
/* 814F6DF0 001C7310 7C 9C 02 14 */ add r4, r28, r0
|
||||
/* 814F6DF4 001C7314 7C 7C 02 2E */ lhzx r3, r28, r0
|
||||
/* 814F6DF8 001C7318 A0 04 00 02 */ lhz r0, 0x2(r4)
|
||||
/* 814F6DFC 001C731C B0 61 00 08 */ sth r3, 0x8(r1)
|
||||
/* 814F6E00 001C7320 B0 01 00 0A */ sth r0, 0xa(r1)
|
||||
.L_814F6E04:
|
||||
/* 814F6E04 001C7324 A0 81 00 08 */ lhz r4, 0x8(r1)
|
||||
/* 814F6E08 001C7328 2C 04 00 00 */ cmpwi r4, 0x0
|
||||
/* 814F6E0C 001C732C 41 82 00 18 */ beq .L_814F6E24
|
||||
/* 814F6E10 001C7330 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6E14 001C7334 A0 61 00 0A */ lhz r3, 0xa(r1)
|
||||
/* 814F6E18 001C7338 7C 04 00 50 */ subf r0, r4, r0
|
||||
/* 814F6E1C 001C733C 90 17 00 04 */ stw r0, 0x4(r23)
|
||||
/* 814F6E20 001C7340 48 00 00 C0 */ b .L_814F6EE0
|
||||
.L_814F6E24:
|
||||
/* 814F6E24 001C7344 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6E28 001C7348 2C 00 00 11 */ cmpwi r0, 0x11
|
||||
/* 814F6E2C 001C734C 41 81 00 18 */ bgt .L_814F6E44
|
||||
/* 814F6E30 001C7350 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6E34 001C7354 4B FF 3F D9 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6E38 001C7358 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6E3C 001C735C 40 80 00 08 */ bge .L_814F6E44
|
||||
/* 814F6E40 001C7360 48 00 00 94 */ b .L_814F6ED4
|
||||
.L_814F6E44:
|
||||
/* 814F6E44 001C7364 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6E48 001C7368 38 F9 00 24 */ addi r7, r25, 0x24
|
||||
/* 814F6E4C 001C736C 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6E50 001C7370 38 A0 00 09 */ li r5, 0x9
|
||||
/* 814F6E54 001C7374 38 63 FF F7 */ subi r3, r3, 0x9
|
||||
/* 814F6E58 001C7378 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6E5C 001C737C 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6E60 001C7380 54 06 05 FE */ clrlwi r6, r0, 23
|
||||
/* 814F6E64 001C7384 48 00 00 3C */ b .L_814F6EA0
|
||||
.L_814F6E68:
|
||||
/* 814F6E68 001C7388 38 A5 00 01 */ addi r5, r5, 0x1
|
||||
/* 814F6E6C 001C738C 38 E7 00 04 */ addi r7, r7, 0x4
|
||||
/* 814F6E70 001C7390 28 05 00 10 */ cmplwi r5, 0x10
|
||||
/* 814F6E74 001C7394 40 81 00 0C */ ble .L_814F6E80
|
||||
/* 814F6E78 001C7398 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6E7C 001C739C 48 00 00 58 */ b .L_814F6ED4
|
||||
.L_814F6E80:
|
||||
/* 814F6E80 001C73A0 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6E84 001C73A4 54 C6 08 3C */ slwi r6, r6, 1
|
||||
/* 814F6E88 001C73A8 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6E8C 001C73AC 38 63 FF FF */ subi r3, r3, 0x1
|
||||
/* 814F6E90 001C73B0 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6E94 001C73B4 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6E98 001C73B8 54 00 07 FE */ clrlwi r0, r0, 31
|
||||
/* 814F6E9C 001C73BC 7C C6 03 78 */ or r6, r6, r0
|
||||
.L_814F6EA0:
|
||||
/* 814F6EA0 001C73C0 A0 87 00 00 */ lhz r4, 0x0(r7)
|
||||
/* 814F6EA4 001C73C4 A0 67 00 02 */ lhz r3, 0x2(r7)
|
||||
/* 814F6EA8 001C73C8 B0 81 00 0C */ sth r4, 0xc(r1)
|
||||
/* 814F6EAC 001C73CC B0 61 00 0E */ sth r3, 0xe(r1)
|
||||
/* 814F6EB0 001C73D0 80 01 00 0C */ lwz r0, 0xc(r1)
|
||||
/* 814F6EB4 001C73D4 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 814F6EB8 001C73D8 A0 01 00 10 */ lhz r0, 0x10(r1)
|
||||
/* 814F6EBC 001C73DC 7C 06 00 40 */ cmplw r6, r0
|
||||
/* 814F6EC0 001C73E0 41 81 FF A8 */ bgt .L_814F6E68
|
||||
/* 814F6EC4 001C73E4 7C 04 30 50 */ subf r0, r4, r6
|
||||
/* 814F6EC8 001C73E8 7C 00 1A 14 */ add r0, r0, r3
|
||||
/* 814F6ECC 001C73EC 54 00 06 3E */ clrlwi r0, r0, 24
|
||||
/* 814F6ED0 001C73F0 7C 78 00 AE */ lbzx r3, r24, r0
|
||||
.L_814F6ED4:
|
||||
/* 814F6ED4 001C73F4 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6ED8 001C73F8 40 80 00 08 */ bge .L_814F6EE0
|
||||
/* 814F6EDC 001C73FC 48 00 01 34 */ b .L_814F7010
|
||||
.L_814F6EE0:
|
||||
/* 814F6EE0 001C7400 54 7A 07 3F */ clrlwi. r26, r3, 28
|
||||
/* 814F6EE4 001C7404 41 82 00 AC */ beq .L_814F6F90
|
||||
/* 814F6EE8 001C7408 7C 60 26 70 */ srawi r0, r3, 4
|
||||
/* 814F6EEC 001C740C 7F 7B 02 14 */ add r27, r27, r0
|
||||
/* 814F6EF0 001C7410 2C 1B 00 40 */ cmpwi r27, 0x40
|
||||
/* 814F6EF4 001C7414 41 80 00 0C */ blt .L_814F6F00
|
||||
/* 814F6EF8 001C7418 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6EFC 001C741C 48 00 01 14 */ b .L_814F7010
|
||||
.L_814F6F00:
|
||||
/* 814F6F00 001C7420 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6F04 001C7424 38 1A 00 08 */ addi r0, r26, 0x8
|
||||
/* 814F6F08 001C7428 7F DD D8 AE */ lbzx r30, r29, r27
|
||||
/* 814F6F0C 001C742C 7C 03 00 00 */ cmpw r3, r0
|
||||
/* 814F6F10 001C7430 41 81 00 18 */ bgt .L_814F6F28
|
||||
/* 814F6F14 001C7434 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6F18 001C7438 4B FF 3E F5 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6F1C 001C743C 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6F20 001C7440 40 80 00 08 */ bge .L_814F6F28
|
||||
/* 814F6F24 001C7444 48 00 00 EC */ b .L_814F7010
|
||||
.L_814F6F28:
|
||||
/* 814F6F28 001C7448 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6F2C 001C744C 7F E3 D0 30 */ slw r3, r31, r26
|
||||
/* 814F6F30 001C7450 80 B7 00 00 */ lwz r5, 0x0(r23)
|
||||
/* 814F6F34 001C7454 38 C3 FF FF */ subi r6, r3, 0x1
|
||||
/* 814F6F38 001C7458 7C 9A 00 50 */ subf r4, r26, r0
|
||||
/* 814F6F3C 001C745C 7C 60 0E 70 */ srawi r0, r3, 1
|
||||
/* 814F6F40 001C7460 38 64 FF F8 */ subi r3, r4, 0x8
|
||||
/* 814F6F44 001C7464 90 97 00 04 */ stw r4, 0x4(r23)
|
||||
/* 814F6F48 001C7468 7C A3 1C 30 */ srw r3, r5, r3
|
||||
/* 814F6F4C 001C746C 7C A5 24 30 */ srw r5, r5, r4
|
||||
/* 814F6F50 001C7470 54 63 15 BA */ clrlslwi r3, r3, 24, 2
|
||||
/* 814F6F54 001C7474 57 C7 15 BA */ clrlslwi r7, r30, 24, 2
|
||||
/* 814F6F58 001C7478 7C 9C 1A 14 */ add r4, r28, r3
|
||||
/* 814F6F5C 001C747C 7C C5 28 38 */ and r5, r6, r5
|
||||
/* 814F6F60 001C7480 7C 7C 1A 2E */ lhzx r3, r28, r3
|
||||
/* 814F6F64 001C7484 7C 00 28 00 */ cmpw r0, r5
|
||||
/* 814F6F68 001C7488 A0 04 00 02 */ lhz r0, 0x2(r4)
|
||||
/* 814F6F6C 001C748C B0 61 00 08 */ sth r3, 0x8(r1)
|
||||
/* 814F6F70 001C7490 7C 76 38 2E */ lwzx r3, r22, r7
|
||||
/* 814F6F74 001C7494 B0 01 00 0A */ sth r0, 0xa(r1)
|
||||
/* 814F6F78 001C7498 40 81 00 08 */ ble .L_814F6F80
|
||||
/* 814F6F7C 001C749C 7C A6 28 50 */ subf r5, r6, r5
|
||||
.L_814F6F80:
|
||||
/* 814F6F80 001C74A0 7C 05 19 D6 */ mullw r0, r5, r3
|
||||
/* 814F6F84 001C74A4 3B 7B 00 01 */ addi r27, r27, 0x1
|
||||
/* 814F6F88 001C74A8 7C 15 39 2E */ stwx r0, r21, r7
|
||||
/* 814F6F8C 001C74AC 48 00 00 58 */ b .L_814F6FE4
|
||||
.L_814F6F90:
|
||||
/* 814F6F90 001C74B0 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6F94 001C74B4 41 82 00 58 */ beq .L_814F6FEC
|
||||
/* 814F6F98 001C74B8 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6F9C 001C74BC 2C 00 00 08 */ cmpwi r0, 0x8
|
||||
/* 814F6FA0 001C74C0 41 81 00 18 */ bgt .L_814F6FB8
|
||||
/* 814F6FA4 001C74C4 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6FA8 001C74C8 4B FF 3E 65 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6FAC 001C74CC 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6FB0 001C74D0 40 80 00 08 */ bge .L_814F6FB8
|
||||
/* 814F6FB4 001C74D4 48 00 00 5C */ b .L_814F7010
|
||||
.L_814F6FB8:
|
||||
/* 814F6FB8 001C74D8 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6FBC 001C74DC 3B 7B 00 10 */ addi r27, r27, 0x10
|
||||
/* 814F6FC0 001C74E0 80 97 00 00 */ lwz r4, 0x0(r23)
|
||||
/* 814F6FC4 001C74E4 38 03 FF F8 */ subi r0, r3, 0x8
|
||||
/* 814F6FC8 001C74E8 7C 80 04 30 */ srw r0, r4, r0
|
||||
/* 814F6FCC 001C74EC 54 00 15 BA */ clrlslwi r0, r0, 24, 2
|
||||
/* 814F6FD0 001C74F0 7C 9C 02 14 */ add r4, r28, r0
|
||||
/* 814F6FD4 001C74F4 7C 7C 02 2E */ lhzx r3, r28, r0
|
||||
/* 814F6FD8 001C74F8 A0 04 00 02 */ lhz r0, 0x2(r4)
|
||||
/* 814F6FDC 001C74FC B0 61 00 08 */ sth r3, 0x8(r1)
|
||||
/* 814F6FE0 001C7500 B0 01 00 0A */ sth r0, 0xa(r1)
|
||||
.L_814F6FE4:
|
||||
/* 814F6FE4 001C7504 2C 1B 00 40 */ cmpwi r27, 0x40
|
||||
/* 814F6FE8 001C7508 41 80 FE 1C */ blt .L_814F6E04
|
||||
.L_814F6FEC:
|
||||
/* 814F6FEC 001C750C 2C 1B 00 40 */ cmpwi r27, 0x40
|
||||
/* 814F6FF0 001C7510 40 81 00 0C */ ble .L_814F6FFC
|
||||
/* 814F6FF4 001C7514 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6FF8 001C7518 48 00 00 18 */ b .L_814F7010
|
||||
.L_814F6FFC:
|
||||
/* 814F6FFC 001C751C 38 1B FF FF */ subi r0, r27, 0x1
|
||||
/* 814F7000 001C7520 3C 60 81 62 */ lis r3, TMCJPEGDEC_Zigzag_loop@ha
|
||||
/* 814F7004 001C7524 54 00 10 3A */ slwi r0, r0, 2
|
||||
/* 814F7008 001C7528 38 63 E1 F0 */ addi r3, r3, TMCJPEGDEC_Zigzag_loop@l
|
||||
/* 814F700C 001C752C 7C 63 00 2E */ lwzx r3, r3, r0
|
||||
.L_814F7010:
|
||||
/* 814F7010 001C7530 BA A1 00 24 */ lmw r21, 0x24(r1)
|
||||
/* 814F7014 001C7534 80 01 00 54 */ lwz r0, 0x54(r1)
|
||||
/* 814F7018 001C7538 7C 08 03 A6 */ mtlr r0
|
||||
/* 814F701C 001C753C 38 21 00 50 */ addi r1, r1, 0x50
|
||||
/* 814F7020 001C7540 4E 80 00 20 */ blr
|
||||
.endfn TMCJPEGDEC_decode_iquant
|
||||
@@ -1,26 +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 : ((v < 0) ? 0 : 255);
|
||||
return ok ? v : (v < 0 ? 0 : 255);
|
||||
}
|
||||
|
||||
static s8 clampS8(s32 v) {
|
||||
return (v < 128 && v > -129) ? (s8)v : (v > 0) ? 127 : -128;
|
||||
static s32 clampS8(s32 v) {
|
||||
s32 inRange = 0;
|
||||
if (v < 128 && v > -129) {
|
||||
inRange = 1;
|
||||
}
|
||||
return inRange ? v : (v > 0) ? 127 : -128;
|
||||
}
|
||||
|
||||
static s32 scalingClampU8(s32 val) {
|
||||
s32 result = 0;
|
||||
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) {
|
||||
@@ -29,17 +31,39 @@ 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;
|
||||
if (r > 0) {
|
||||
for (; iter > 0; iter--) {
|
||||
{
|
||||
for (; done < r; done += 8) {
|
||||
u32 ac;
|
||||
b4 = block[4];
|
||||
b6 = block[6];
|
||||
@@ -49,7 +73,13 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
b5 = block[5];
|
||||
b3 = block[3];
|
||||
|
||||
ac = (u32)b4 | (u32)b6 | (u32)b2 | (u32)b1 | (u32)b7 | (u32)b5 | (u32)b3;
|
||||
ac = (u32)b4;
|
||||
ac |= (u32)b6;
|
||||
ac |= (u32)b2;
|
||||
ac |= (u32)b1;
|
||||
ac |= (u32)b7;
|
||||
ac |= (u32)b5;
|
||||
ac |= (u32)b3;
|
||||
if (ac == 0) {
|
||||
s32 val = block[0];
|
||||
dst[7] = val;
|
||||
@@ -61,23 +91,39 @@ 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;
|
||||
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;
|
||||
@@ -88,12 +134,11 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
}
|
||||
block += 8;
|
||||
dst += 8;
|
||||
done += 8;
|
||||
}
|
||||
}
|
||||
|
||||
dst = tmp + done;
|
||||
for (; done < 0x38; done += 8) {
|
||||
for (; done <= 0x38; done += 8) {
|
||||
memset(dst, 0, 0x20);
|
||||
dst += 8;
|
||||
}
|
||||
@@ -114,7 +159,13 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
b5 = dst[0x28];
|
||||
b3 = dst[0x18];
|
||||
|
||||
ac = (u32)b4 | (u32)b6 | (u32)b2 | (u32)b1 | (u32)b7 | (u32)b5 | (u32)b3;
|
||||
ac = (u32)b4;
|
||||
ac |= (u32)b6;
|
||||
ac |= (u32)b2;
|
||||
ac |= (u32)b1;
|
||||
ac |= (u32)b7;
|
||||
ac |= (u32)b5;
|
||||
ac |= (u32)b3;
|
||||
out = conv_row_ptr + i;
|
||||
if (ac == 0) {
|
||||
u8 val = clampU8((*dst >> 11) + 0x80);
|
||||
@@ -127,24 +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 - b4;
|
||||
d = *dst + b4;
|
||||
u = t + b6 + b2;
|
||||
v = a + t;
|
||||
e = a - t;
|
||||
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;
|
||||
x = ((b1 + b7) - (b5 + b3)) * 0xB5 >> 8;
|
||||
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 = z_factor + ((b5 - b3) * 0x8B >> 8);
|
||||
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);
|
||||
@@ -163,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;
|
||||
@@ -181,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 < 0x39; 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];
|
||||
@@ -293,23 +332,41 @@ 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[6] = v - o;
|
||||
@@ -320,12 +377,10 @@ mode_gt_2:
|
||||
}
|
||||
block += 8;
|
||||
dst += 8;
|
||||
done += 8;
|
||||
}
|
||||
}
|
||||
|
||||
dst = tmp + done;
|
||||
for (; done < 0x39; done += 8) {
|
||||
for (; done <= 0x38; done += 8) {
|
||||
memset(dst, 0, 0x20);
|
||||
dst += 8;
|
||||
}
|
||||
@@ -335,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];
|
||||
@@ -353,40 +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;
|
||||
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;
|
||||
d = dcValue + b4;
|
||||
u = t + u;
|
||||
v = a + t;
|
||||
e = a - t;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
x = ((b1 + b7) - (b5 + b3)) * 0xB5 >> 8;
|
||||
y = d - u;
|
||||
z = ((b5 - b3) + (b1 - b7)) * 0x62 >> 8;
|
||||
m = ((b1 - b7) * 0x14E >> 8) - z;
|
||||
n = b1 + b7 + b5 + b3 + m;
|
||||
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--;
|
||||
}
|
||||
|
||||
@@ -15,9 +15,16 @@ static u16 readU16(const u8* p, u16 byteOrder) {
|
||||
return (u16)(raw >> 8 & 0xFF | (raw & 0xFF) << 8);
|
||||
}
|
||||
|
||||
static u16 readExifU16(const u8* data, u16 byteOrder) {
|
||||
u32 value = data[0] | data[1] << 8;
|
||||
if (byteOrder == 0x4949) {
|
||||
return (u16)value;
|
||||
}
|
||||
return (u16)(value >> 8 & 255 | (value & 255) << 8);
|
||||
}
|
||||
|
||||
static u32 readU32(const u8* p, u16 byteOrder) {
|
||||
u32 raw = p[0] | p[1] << 8;
|
||||
raw = raw | p[3] << 24 | p[2] << 16;
|
||||
u32 raw = p[1] << 8 | p[0] | p[2] << 16 | p[3] << 24;
|
||||
if (byteOrder == 0x4949) {
|
||||
return raw;
|
||||
}
|
||||
@@ -26,9 +33,9 @@ static u32 readU32(const u8* p, u16 byteOrder) {
|
||||
|
||||
s32 TMCCJPEGDecGetOffsetEXIF(u32* pOffset, u32* pSize, TMCCJPEGDecInitParam* pParam) {
|
||||
TMCCJPEGDecWork* work;
|
||||
u16 marker;
|
||||
u32 dataSize;
|
||||
u16 segSize;
|
||||
u32 dataSize;
|
||||
u16 marker;
|
||||
s32 result;
|
||||
u8 sig[4];
|
||||
|
||||
@@ -108,62 +115,26 @@ s32 TMCCJPEGDecGetOffsetEXIF(u32* pOffset, u32* pSize, TMCCJPEGDecInitParam* pPa
|
||||
continue;
|
||||
}
|
||||
|
||||
if (marker >= 0xFFD9) {
|
||||
if (marker == 0xFFD9) {
|
||||
switch (marker) {
|
||||
case 0xFFC0:
|
||||
case 0xFFC2:
|
||||
case 0xFFC4:
|
||||
case 0xFFDB:
|
||||
case 0xFFDC:
|
||||
case 0xFFDD:
|
||||
case 0xFFFE:
|
||||
result = TMCJPEGDEC_move_ptr(segSize, work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
break;
|
||||
case 0xFFDA:
|
||||
return -2;
|
||||
}
|
||||
|
||||
if (marker == 0xFFFE) {
|
||||
result = TMCJPEGDEC_move_ptr(segSize, work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (marker >= 0xFFDE)
|
||||
case 0xFFD9:
|
||||
return -2;
|
||||
default:
|
||||
return -0x2F;
|
||||
|
||||
if (marker >= 0xFFDB) {
|
||||
result = TMCJPEGDEC_move_ptr(segSize, work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
return -2;
|
||||
}
|
||||
|
||||
if (marker >= 0xFFC2) {
|
||||
if (marker == 0xFFC2) {
|
||||
result = TMCJPEGDEC_move_ptr(segSize, work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (marker == 0xFFC4) {
|
||||
result = TMCJPEGDEC_move_ptr(segSize, work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
return -0x2F;
|
||||
}
|
||||
|
||||
if (marker == 0xFFC0) {
|
||||
result = TMCJPEGDEC_move_ptr(segSize, work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
return -0x2F;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -271,114 +242,99 @@ _error:
|
||||
}
|
||||
|
||||
static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData* pInfo) {
|
||||
u32 ifd0Offset;
|
||||
u32 ifd1Offset;
|
||||
u32 exifIfdOffset;
|
||||
u16 count;
|
||||
u32 entriesSize;
|
||||
u32 i;
|
||||
const u8* p;
|
||||
s32 sval;
|
||||
u16 byteOrder;
|
||||
u32 raw;
|
||||
|
||||
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;
|
||||
|
||||
if (size < 8) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
raw = data[0] | data[1] << 8;
|
||||
byteOrder = raw;
|
||||
byteOrder = data[0] | data[1] << 8;
|
||||
if (byteOrder != 0x4D4D && byteOrder != 0x4949) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
if (readU16(data + 2, byteOrder) != 0x002A) {
|
||||
if (readExifU16(data + 2, byteOrder) != 42) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
ifd0Offset = readU32(data + 4, byteOrder);
|
||||
if (ifd0Offset > size) {
|
||||
ifdOffset = readU32(data + 4, byteOrder);
|
||||
if (size < ifdOffset) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
sval = size - (u16)ifd0Offset;
|
||||
if (sval < 2) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
p = data + (u16)ifd0Offset;
|
||||
count = readU16(p, byteOrder);
|
||||
entriesSize = count * 12;
|
||||
sval = (u32)(sval - 2);
|
||||
if (sval < entriesSize) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
p += 2;
|
||||
for (i = 0; i < count; i++) {
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, p);
|
||||
p += 12;
|
||||
}
|
||||
|
||||
sval -= entriesSize;
|
||||
if (sval < 4) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
ifd1Offset = readU32(p, byteOrder);
|
||||
if (ifd1Offset != 0) {
|
||||
if (ifd1Offset > size) {
|
||||
{
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
sval = size - (u16)ifd1Offset;
|
||||
if (sval < 2) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
p = data + (u16)ifd1Offset;
|
||||
count = readU16(p, byteOrder);
|
||||
count = readExifU16(entries, byteOrder);
|
||||
entriesSize = count * 12;
|
||||
sval = (u32)(sval - 2);
|
||||
if (sval < entriesSize) {
|
||||
entries += 2;
|
||||
remaining -= 2;
|
||||
if (remaining < entriesSize) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
p += 2;
|
||||
for (i = 0; i < count; i++) {
|
||||
TMCJPEGDEC_IFD1_tag_parse(pInfo, byteOrder, p);
|
||||
p += 12;
|
||||
for (index = 0; index < count; index++) {
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, entries);
|
||||
entries += 12;
|
||||
}
|
||||
remaining -= entriesSize;
|
||||
if (remaining < 4) {
|
||||
return -161;
|
||||
}
|
||||
ifdOffset = readU32(entries, byteOrder);
|
||||
}
|
||||
if (ifdOffset == 0) {
|
||||
return 0;
|
||||
}
|
||||
if (size < ifdOffset) {
|
||||
return -161;
|
||||
}
|
||||
{
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
count = readExifU16(entries, byteOrder);
|
||||
entriesSize = count * 12;
|
||||
entries += 2;
|
||||
remaining -= 2;
|
||||
if (remaining < entriesSize) {
|
||||
return -161;
|
||||
}
|
||||
for (index = 0; index < count; index++) {
|
||||
TMCJPEGDEC_IFD1_tag_parse(pInfo, byteOrder, entries);
|
||||
entries += 12;
|
||||
}
|
||||
}
|
||||
|
||||
exifIfdOffset = pInfo->nextIfdOffset;
|
||||
if (exifIfdOffset == 0 || exifIfdOffset > size) {
|
||||
ifdOffset = pInfo->nextIfdOffset;
|
||||
if (size < ifdOffset) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
sval = size - (u16)exifIfdOffset;
|
||||
if (sval < 2) {
|
||||
return -161;
|
||||
{
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
count = readExifU16(entries, byteOrder);
|
||||
entriesSize = count * 12;
|
||||
entries += 2;
|
||||
remaining -= 2;
|
||||
if (remaining < entriesSize) {
|
||||
return -161;
|
||||
}
|
||||
for (index = 0; index < count; index++) {
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, entries);
|
||||
entries += 12;
|
||||
}
|
||||
}
|
||||
|
||||
p = data + (u16)exifIfdOffset;
|
||||
count = readU16(p, byteOrder);
|
||||
entriesSize = count * 12;
|
||||
sval = (u32)(sval - 2);
|
||||
if (sval < entriesSize) {
|
||||
return -161;
|
||||
}
|
||||
|
||||
p += 2;
|
||||
for (i = 0; i < count; i++) {
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, p);
|
||||
p += 12;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -391,8 +347,10 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
|
||||
switch (tag) {
|
||||
case 0x0103:
|
||||
case 0x0111: {
|
||||
return;
|
||||
case 0x0111:
|
||||
case 0x0201:
|
||||
case 0x0202: {
|
||||
break;
|
||||
}
|
||||
case 0x0112: {
|
||||
pInfo->orientation = readU16(entry + 8, byteOrder);
|
||||
@@ -401,18 +359,18 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x011A: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
const u8* p = pInfo->thumbnailData + offset;
|
||||
if (p < pInfo->thumbnailData) {
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->xResNum = readU32(p, byteOrder);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (p < pInfo->thumbnailData) {
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->xResDen = readU32(p, byteOrder);
|
||||
@@ -421,18 +379,18 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x011B: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
const u8* p = pInfo->thumbnailData + offset;
|
||||
if (p < pInfo->thumbnailData) {
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->yResNum = readU32(p, byteOrder);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (p < pInfo->thumbnailData) {
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->yResDen = readU32(p, byteOrder);
|
||||
@@ -444,19 +402,19 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
}
|
||||
case 0x012D: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
const u8* p = pInfo->thumbnailData + offset;
|
||||
u32 j;
|
||||
u32 i;
|
||||
for (j = 0; j < 3; j++) {
|
||||
for (i = 0; i < 256; i++) {
|
||||
if (p < pInfo->thumbnailData) {
|
||||
return;
|
||||
u32 channel;
|
||||
u32 index;
|
||||
for (channel = 0; channel < 3; channel++) {
|
||||
for (index = 0; index < 256; index++) {
|
||||
const u8* p = pInfo->thumbnailData + offset;
|
||||
if (pInfo->thumbnailData > p) {
|
||||
break;
|
||||
}
|
||||
if (p + 2 > pInfo->dataEnd) {
|
||||
return;
|
||||
if (p > pInfo->dataEnd - 2) {
|
||||
break;
|
||||
}
|
||||
pInfo->transferFunc[j][i] = readU16(p, byteOrder);
|
||||
p += 2;
|
||||
pInfo->transferFunc[channel][index] = readU16(p, byteOrder);
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
return;
|
||||
@@ -464,17 +422,18 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x0132: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
const u8* p = pInfo->thumbnailData + offset;
|
||||
if (p < pInfo->thumbnailData) {
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 20 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 20) {
|
||||
return;
|
||||
}
|
||||
*(u32*)(pInfo->dateTime + 0) = *(u32*)(p + 0);
|
||||
*(u32*)(pInfo->dateTime + 4) = *(u32*)(p + 4);
|
||||
*(u32*)(pInfo->dateTime + 8) = *(u32*)(p + 8);
|
||||
*(u32*)(pInfo->dateTime + 12) = *(u32*)(p + 12);
|
||||
*(u32*)(pInfo->dateTime + 16) = *(u32*)(p + 16);
|
||||
{
|
||||
u32 index;
|
||||
for (index = 0; index < 20; index++) {
|
||||
pInfo->dateTime[index] = p[index];
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
case 0x0213: {
|
||||
@@ -511,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;
|
||||
}
|
||||
@@ -538,52 +495,54 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
switch (tag) {
|
||||
case 0x0132:
|
||||
case 0x0111:
|
||||
case 0x0112:
|
||||
case 0x012D:
|
||||
case 0x0213:
|
||||
case 0x8769:
|
||||
case 0x9000:
|
||||
case 0x9101: {
|
||||
return;
|
||||
}
|
||||
case 0x0103: {
|
||||
pInfo->compressionIfd1 = readU16(entry + 8, byteOrder);
|
||||
return;
|
||||
case 0x9101:
|
||||
case 0xA003: {
|
||||
break;
|
||||
}
|
||||
case 0x011A: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
const u8* p = pInfo->thumbnailData + offset;
|
||||
if (p < pInfo->thumbnailData) {
|
||||
u32 offset;
|
||||
const u8* p;
|
||||
offset = readU32(entry + 8, byteOrder);
|
||||
p = pInfo->thumbnailData + offset;
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->xResNumIfd1 = readU32(p, byteOrder);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (p < pInfo->thumbnailData) {
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->xResDenIfd1 = readU32(p, byteOrder);
|
||||
return;
|
||||
}
|
||||
case 0x011B: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
const u8* p = pInfo->thumbnailData + offset;
|
||||
if (p < pInfo->thumbnailData) {
|
||||
u32 offset;
|
||||
const u8* p;
|
||||
offset = readU32(entry + 8, byteOrder);
|
||||
p = pInfo->thumbnailData + offset;
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->planarConfigIfd1 = readU32(p, byteOrder);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (p < pInfo->thumbnailData) {
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
if (p + 4 > pInfo->dataEnd) {
|
||||
if (p > pInfo->dataEnd - 4) {
|
||||
return;
|
||||
}
|
||||
pInfo->yResDenIfd1 = readU32(p, byteOrder);
|
||||
@@ -593,6 +552,10 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
pInfo->resUnitIfd1 = readU16(entry + 8, byteOrder);
|
||||
return;
|
||||
}
|
||||
case 0x0103: {
|
||||
pInfo->compressionIfd1 = readU16(entry + 8, byteOrder);
|
||||
return;
|
||||
}
|
||||
case 0x0201: {
|
||||
pInfo->thumbnailOffset = readU32(entry + 8, byteOrder);
|
||||
return;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
extern void* memset(void* dest, s32 val, u32 count);
|
||||
|
||||
extern const u32 lbl_8161E080[64] = {
|
||||
extern const u32 scJpegAanScale[64] = {
|
||||
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
||||
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
||||
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
||||
@@ -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*)scJpegAanScale;
|
||||
|
||||
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) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,874 @@
|
||||
#define TMC_JPEG_PLANAR_OUTPUT
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static void TMCJPEG_814EFEAC(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F043C(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F0A58(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F11C4(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F17E0(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F1F48(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F2570(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F2B50(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F3158(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F32E4(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F34A4(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEG_814F372C(TMCCJPEGDecWork*, s32, s32);
|
||||
|
||||
s32 TMCJPEGDEC_set_converterY8U8V8(TMCCJPEGDecWork* work) {
|
||||
u8* buffer;
|
||||
s32 componentCount;
|
||||
TMCCJPEGDecState* state;
|
||||
|
||||
buffer = work->convBuf;
|
||||
componentCount = work->componentCount;
|
||||
state = work->pState;
|
||||
|
||||
switch (componentCount) {
|
||||
case 0: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* thirdRow;
|
||||
u8* fourthRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
work->pConverterFunc = TMCJPEG_814EFEAC;
|
||||
work->pConverterFuncEdge = TMCJPEG_814F043C;
|
||||
secondRow = firstRow + mode;
|
||||
thirdRow = secondRow + mode;
|
||||
fourthRow = thirdRow + mode;
|
||||
cbBlock = buffer + 260;
|
||||
crBlock = buffer + 324;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[2] = thirdRow;
|
||||
work->pConvRowPtrs[3] = fourthRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 32;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
work->pConverterFunc = TMCJPEG_814F0A58;
|
||||
work->pConverterFuncEdge = TMCJPEG_814F11C4;
|
||||
secondRow = firstRow + mode;
|
||||
cbBlock = buffer + 132;
|
||||
crBlock = buffer + 196;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 16;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* thirdRow;
|
||||
u8* fourthRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
work->pConverterFunc = TMCJPEG_814F17E0;
|
||||
work->pConverterFuncEdge = TMCJPEG_814F1F48;
|
||||
secondRow = firstRow + mode;
|
||||
thirdRow = firstRow + mode * 16;
|
||||
fourthRow = thirdRow + mode;
|
||||
cbBlock = buffer + 260;
|
||||
crBlock = buffer + 324;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[2] = thirdRow;
|
||||
work->pConvRowPtrs[3] = fourthRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 16;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
work->pConverterFunc = TMCJPEG_814F2570;
|
||||
work->pConverterFuncEdge = TMCJPEG_814F2B50;
|
||||
secondRow = firstRow + mode * 8;
|
||||
cbBlock = buffer + 132;
|
||||
crBlock = buffer + 196;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 8;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
TMCConverterFunc* converter;
|
||||
TMCConverterFunc* edgeConverter;
|
||||
converter = TMCJPEG_814F3158;
|
||||
edgeConverter = TMCJPEG_814F32E4;
|
||||
work->pConvRowPtrs[0] = buffer + 4;
|
||||
work->pConvRowPtrs[5] = buffer + 0x44;
|
||||
work->pConvRowPtrs[6] = buffer + 0x84;
|
||||
work->pConverterFunc = converter;
|
||||
work->pConverterFuncEdge = edgeConverter;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
TMCConverterFunc* converter;
|
||||
TMCConverterFunc* edgeConverter;
|
||||
converter = TMCJPEG_814F34A4;
|
||||
edgeConverter = TMCJPEG_814F372C;
|
||||
work->pConvRowPtrs[0] = buffer + 4;
|
||||
work->pConverterFunc = converter;
|
||||
work->pConverterFuncEdge = edgeConverter;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
return TMCC_ERROR_FORMAT;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
s32 width = state->jpegWidth;
|
||||
s32 height = state->jpegHeight;
|
||||
state->convWidth = ((u32)width / 8 + (width % 8 != 0)) * 8;
|
||||
state->convHeight = ((u32)height / 4 + (height % 4 != 0)) * 4;
|
||||
width = state->outputWidth;
|
||||
height = state->outputHeight;
|
||||
state->chromaWidth = ((u32)width / 8 + (width % 8 != 0)) * 8;
|
||||
state->chromaHeight = ((u32)height / 4 + (height % 4 != 0)) * 4;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 rowSkip;
|
||||
u8* output;
|
||||
s32 chromaXEnd;
|
||||
u32 tileRow;
|
||||
u32 chromaTileWidth;
|
||||
s32 chromaYEnd;
|
||||
u8* lumaTexture;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
u8* cbTexture;
|
||||
s32 xEnd;
|
||||
s32 height;
|
||||
u8* crTexture;
|
||||
s32 yEnd;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
u32 tileWidth;
|
||||
s32 width;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[260];
|
||||
cr = &work->convBuf[324];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
width = 32 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
rowSkip = 32 - width;
|
||||
for (; row < yEnd; row++) {
|
||||
output = lumaTexture + ((row & 3) << 3);
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
for (column = x; column < xEnd; column += 4) {
|
||||
(output + (column & 7))[(s32)(((column >> 3) + tileRow) << 5)] = luminance[0];
|
||||
(output + ((column + 1) & 7))[(s32)((((column + 1) >> 3) + tileRow) << 5)] = luminance[1];
|
||||
(output + ((column + 2) & 7))[(s32)((((column + 2) >> 3) + tileRow) << 5)] = luminance[2];
|
||||
(output + ((column + 3) & 7))[(s32)((((column + 3) >> 3) + tileRow) << 5)] = luminance[3];
|
||||
luminance += 4;
|
||||
}
|
||||
luminance += rowSkip;
|
||||
}
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
x = (u32)x >> 2;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
s32 chromaEnd;
|
||||
u8* cbTexture;
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[260];
|
||||
cr = &work->convBuf[324];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
} else {
|
||||
width = 32 / state->scaleFactor;
|
||||
}
|
||||
if (state->dataSizeY == (u32)y) {
|
||||
height = state->stepYExt;
|
||||
} else {
|
||||
height = 8 / state->scaleFactor;
|
||||
}
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (row = y; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
output = lumaTexture + ((row & 3) << 3) + (column & 7);
|
||||
output[tileOffset] = *luminance++;
|
||||
}
|
||||
luminance += 32 - width;
|
||||
}
|
||||
x = (u32)x >> 2;
|
||||
width = (width + 3) >> 2;
|
||||
xEnd = x + width;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + height;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaYEnd;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 chromaXEnd;
|
||||
s32 row;
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 width;
|
||||
s32 height;
|
||||
u8* cbTexture;
|
||||
s32 xEnd;
|
||||
u8* crTexture;
|
||||
s32 yEnd;
|
||||
u8* cb;
|
||||
u32 tileWidth;
|
||||
u8* cr;
|
||||
s32 chromaRowSkip;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[132];
|
||||
cr = &work->convBuf[196];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
width = 16 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 2) {
|
||||
(lumaTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *luminance++;
|
||||
(lumaTexture + ((row & 3) << 3) + ((column + 1) & 7))[(s32)((((column + 1) >> 3) + (row >> 2) * tileWidth) << 5)] = *luminance++;
|
||||
}
|
||||
luminance += 16 - width;
|
||||
}
|
||||
x = (u32)x >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaRowSkip = 8 - width;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += chromaRowSkip;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
s32 chromaEnd;
|
||||
u8* cbTexture;
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[132];
|
||||
cr = &work->convBuf[196];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
} else {
|
||||
width = 16 / state->scaleFactor;
|
||||
}
|
||||
if (state->dataSizeY == (u32)y) {
|
||||
height = state->stepYExt;
|
||||
} else {
|
||||
height = 8 / state->scaleFactor;
|
||||
}
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (row = y; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
output = lumaTexture + ((row & 3) << 3) + (column & 7);
|
||||
output[tileOffset] = *luminance++;
|
||||
}
|
||||
luminance += 16 - width;
|
||||
}
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + height;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 height;
|
||||
s32 chromaYEnd;
|
||||
s32 column;
|
||||
u8* lumaTexture;
|
||||
s32 chromaXEnd;
|
||||
u8* luminance;
|
||||
u32 chromaTileWidth;
|
||||
u8* cbTexture;
|
||||
s32 width;
|
||||
u8* crTexture;
|
||||
u32 tileWidth;
|
||||
u8* cb;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 yEnd;
|
||||
s32 xEnd;
|
||||
u8* cr;
|
||||
s32 row;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[260];
|
||||
cr = &work->convBuf[324];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
width = 16 / state->scaleFactor;
|
||||
height = 16 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 2) {
|
||||
(lumaTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *luminance++;
|
||||
(lumaTexture + ((row & 3) << 3) + ((column + 1) & 7))[(s32)((((column + 1) >> 3) + (row >> 2) * tileWidth) << 5)] = *luminance++;
|
||||
}
|
||||
luminance += 16 - width;
|
||||
}
|
||||
x = (u32)x >> 1;
|
||||
y = (u32)y >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
s32 chromaEnd;
|
||||
u8* cbTexture;
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[260];
|
||||
cr = &work->convBuf[324];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
} else {
|
||||
width = 16 / state->scaleFactor;
|
||||
}
|
||||
if (state->dataSizeY == (u32)y) {
|
||||
height = state->stepYExt;
|
||||
} else {
|
||||
height = 16 / state->scaleFactor;
|
||||
}
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (row = y; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
output = lumaTexture + ((row & 3) << 3) + (column & 7);
|
||||
output[tileOffset] = *luminance++;
|
||||
}
|
||||
luminance += 16 - width;
|
||||
}
|
||||
y = (u32)y >> 1;
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + ((height + 1) >> 1);
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
s32 chromaEnd;
|
||||
u8* cbTexture;
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[132];
|
||||
cr = &work->convBuf[196];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 16 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (row = y; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
output = lumaTexture + ((row & 3) << 3) + (column & 7);
|
||||
output[tileOffset] = *luminance++;
|
||||
}
|
||||
luminance += 8 - width;
|
||||
}
|
||||
y = (u32)y >> 1;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + 8 / state->scaleFactor;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F2B50(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
s32 chromaEnd;
|
||||
u8* cbTexture;
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[132];
|
||||
cr = &work->convBuf[196];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
} else {
|
||||
width = 8 / state->scaleFactor;
|
||||
}
|
||||
if (state->dataSizeY == (u32)y) {
|
||||
height = state->stepYExt;
|
||||
} else {
|
||||
height = 16 / state->scaleFactor;
|
||||
}
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (row = y; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
output = lumaTexture + ((row & 3) << 3) + (column & 7);
|
||||
output[tileOffset] = *luminance++;
|
||||
}
|
||||
luminance += 8 - width;
|
||||
}
|
||||
y = (u32)y >> 1;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + ((height + 1) >> 1);
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F3158(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 rowSkip;
|
||||
u8* output;
|
||||
s32 height;
|
||||
s32 tileRow;
|
||||
u8* cbOutput;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* crOutput;
|
||||
s32 pixelOffset;
|
||||
s32 tileOffset;
|
||||
u8* lumaTexture;
|
||||
s32 width;
|
||||
u32 rowOffset;
|
||||
u8* cbTexture;
|
||||
u8* crTexture;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[68];
|
||||
cr = &work->convBuf[132];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
rowSkip = 8 - width;
|
||||
for (; y < yEnd; y++) {
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
rowOffset = (y & 3) << 3;
|
||||
output = lumaTexture + rowOffset;
|
||||
cbOutput = cbTexture + rowOffset;
|
||||
crOutput = crTexture + rowOffset;
|
||||
for (column = x; column < xEnd;) {
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
pixelOffset = column++ & 7;
|
||||
(output + pixelOffset)[tileOffset] = *luminance++;
|
||||
(cbOutput + pixelOffset)[tileOffset] = *cb++ + 128;
|
||||
(crOutput + pixelOffset)[tileOffset] = *cr++ + 128;
|
||||
}
|
||||
luminance += rowSkip;
|
||||
cb += rowSkip;
|
||||
cr += rowSkip;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F32E4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 rowSkip;
|
||||
u8* output;
|
||||
s32 height;
|
||||
s32 tileRow;
|
||||
u8* cbOutput;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* crOutput;
|
||||
s32 pixelOffset;
|
||||
s32 tileOffset;
|
||||
u8* lumaTexture;
|
||||
s32 width;
|
||||
u32 rowOffset;
|
||||
u8* cbTexture;
|
||||
u8* crTexture;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[68];
|
||||
cr = &work->convBuf[132];
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
cbTexture = state->pCbBuffer;
|
||||
crTexture = state->pCrBuffer;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
} else {
|
||||
width = 8 / state->scaleFactor;
|
||||
}
|
||||
if (state->dataSizeY == (u32)y) {
|
||||
height = state->stepYExt;
|
||||
} else {
|
||||
height = 8 / state->scaleFactor;
|
||||
}
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
rowSkip = 8 - width;
|
||||
for (; y < yEnd; y++) {
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
rowOffset = (y & 3) << 3;
|
||||
output = lumaTexture + rowOffset;
|
||||
cbOutput = cbTexture + rowOffset;
|
||||
crOutput = crTexture + rowOffset;
|
||||
for (column = x; column < xEnd;) {
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
pixelOffset = column++ & 7;
|
||||
(output + pixelOffset)[tileOffset] = *luminance++;
|
||||
(cbOutput + pixelOffset)[tileOffset] = *cb++ + 128;
|
||||
(crOutput + pixelOffset)[tileOffset] = *cr++ + 128;
|
||||
}
|
||||
luminance += rowSkip;
|
||||
cb += rowSkip;
|
||||
cr += rowSkip;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F34A4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 height;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
s32 width;
|
||||
TMCCJPEGDecState* state;
|
||||
u32 tileRow;
|
||||
u32 tileWidth;
|
||||
s32 tileOffset;
|
||||
s32 row;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
{
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (row = y; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
output = lumaTexture + ((row & 3) << 3) + (column & 7);
|
||||
output[tileOffset] = *luminance++;
|
||||
}
|
||||
luminance += 8 - width;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F372C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 height;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
s32 width;
|
||||
TMCCJPEGDecState* state;
|
||||
u32 tileRow;
|
||||
u32 tileWidth;
|
||||
s32 tileOffset;
|
||||
s32 row;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
state = work->pState;
|
||||
tileWidth = state->convWidth >> 3;
|
||||
lumaTexture = state->pLumaBuffer;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
} else {
|
||||
width = 8 / state->scaleFactor;
|
||||
}
|
||||
if (state->dataSizeY == (u32)y) {
|
||||
height = state->stepYExt;
|
||||
} else {
|
||||
height = 8 / state->scaleFactor;
|
||||
}
|
||||
{
|
||||
xEnd = x + width;
|
||||
yEnd = y + height;
|
||||
for (row = y; row < yEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
tileOffset = ((column >> 3) + tileRow) << 5;
|
||||
output = lumaTexture + ((row & 3) << 3) + (column & 7);
|
||||
output[tileOffset] = *luminance++;
|
||||
}
|
||||
luminance += 8 - width;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user