Compare commits
1 Commits
cleanup/co
...
agent/data
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
83303f84a6 |
19
.github/workflows/readme-progress.yml
vendored
19
.github/workflows/readme-progress.yml
vendored
@@ -2,8 +2,6 @@ name: README progress
|
|||||||
|
|
||||||
# runs on the self-hosted runner on cole's server so it doesn't use hosted minutes.
|
# 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.
|
# only push/schedule/manual triggers, never pull_request, so fork PRs can't reach this machine.
|
||||||
# README progress is written inside each landing commit by the orchestrator, so this job never commits;
|
|
||||||
# it only rebuilds and publishes the current numbers to the job summary.
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
@@ -17,7 +15,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
progress:
|
progress:
|
||||||
@@ -50,8 +48,15 @@ jobs:
|
|||||||
- name: Report
|
- name: Report
|
||||||
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
|
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
|
||||||
|
|
||||||
- name: Summary
|
- name: Update README
|
||||||
|
run: python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||||
|
|
||||||
|
- name: Commit
|
||||||
run: |
|
run: |
|
||||||
python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
if git diff --quiet README.md; then exit 0; fi
|
||||||
sed -n '/progress:start/,/progress:end/p' README.md >> "$GITHUB_STEP_SUMMARY"
|
git config user.name "github-actions[bot]"
|
||||||
git checkout -- README.md
|
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
|
||||||
|
|||||||
170
AGENTS.md
170
AGENTS.md
@@ -78,12 +78,6 @@ Helper tools live in `tools/decomp-assist/`:
|
|||||||
between your object and the original. This is the main iteration loop.
|
between your object and the original. This is the main iteration loop.
|
||||||
- `disasm_fn.py <object> <symbol>` — disassembly with relocation-resolved call
|
- `disasm_fn.py <object> <symbol>` — disassembly with relocation-resolved call
|
||||||
names, so you can see which real functions are being called.
|
names, so you can see which real functions are being called.
|
||||||
- `literal_reference_diff.py [unit ...]` — advisory check of actual narrow-string
|
|
||||||
bytes passed at corresponding calls, including addresses derived from a shared
|
|
||||||
data base. Defaults to functions scored 100% in the live report; use
|
|
||||||
`--all-functions` to include other equal-sized functions. Inspect every
|
|
||||||
candidate against the assembly. This does not follow mutable pointer globals,
|
|
||||||
infer compiler aliases, or prove complete data matching; skips are reported.
|
|
||||||
- `pool_diff.py` — diffs the string pool in `.data` between your object and the
|
- `pool_diff.py` — diffs the string pool in `.data` between your object and the
|
||||||
original, string by string. See below; this is the highest-signal tool.
|
original, string by string. See below; this is the highest-signal tool.
|
||||||
- `export_pyghidra.py` — regenerates `ghidra_decomp.txt`, decompiled C for the
|
- `export_pyghidra.py` — regenerates `ghidra_decomp.txt`, decompiled C for the
|
||||||
@@ -170,8 +164,9 @@ This repository targets only Wii Menu 4.3U. Do not configure or build 43E,
|
|||||||
43J, or 43K while doing matching work.
|
43J, or 43K while doing matching work.
|
||||||
|
|
||||||
Most workers should pursue exact matching or safe linking; assign the remainder
|
Most workers should pursue exact matching or safe linking; assign the remainder
|
||||||
to decompilation. Keep every worker slot busy (currently four Codex slots; see
|
to decompilation. Keep up to 75 live workers when the runtime allows it, while
|
||||||
"Orchestrator loop" below). Fill completed slots with disjoint tasks. Never duplicate a source file or function
|
reserving capacity for fixer and validation workers. Fill completed slots with
|
||||||
|
disjoint tasks. Never duplicate a source file or function
|
||||||
range. Workers return changed paths, exact objdiff measurements, and validation
|
range. Workers return changed paths, exact objdiff measurements, and validation
|
||||||
results. Fuzzy-only results are not accepted.
|
results. Fuzzy-only results are not accepted.
|
||||||
|
|
||||||
@@ -251,12 +246,6 @@ and merge the PR, fast-forward `origin/main`, and publish progress. If a
|
|||||||
candidate fails validation, return it to its worker; do not fix the candidate
|
candidate fails validation, return it to its worker; do not fix the candidate
|
||||||
inline in the orchestrator.
|
inline in the orchestrator.
|
||||||
|
|
||||||
Two exceptions, both set by the human: once a leaf has failed at `max` effort
|
|
||||||
(see the effort scale below) the orchestrator itself takes a crack at it, and
|
|
||||||
the orchestrator may finish PRs whose authors are gone (rebase, drop a
|
|
||||||
forbidden pattern, close with evidence). Record every such attempt in the
|
|
||||||
policy log, including the ones that fail.
|
|
||||||
|
|
||||||
A new thread must begin by reading this file, checking the live 43U report and
|
A new thread must begin by reading this file, checking the live 43U report and
|
||||||
remote branch, and dispatching the worker pool. The parent must not claim a
|
remote branch, and dispatching the worker pool. The parent must not claim a
|
||||||
match without fresh independent verification.
|
match without fresh independent verification.
|
||||||
@@ -331,159 +320,6 @@ Linked: <percent> | Fuzzy: <percent> | Data: <percent>
|
|||||||
Do not report stale values, unmerged PR results, or add other text to that
|
Do not report stale values, unmerged PR results, or add other text to that
|
||||||
update. Continue all required verification and coordination silently.
|
update. Continue all required verification and coordination silently.
|
||||||
|
|
||||||
## Orchestrator loop (Claude orchestrator, Codex workers)
|
|
||||||
|
|
||||||
This is the loop currently in use. One Claude session is the orchestrator.
|
|
||||||
It does not spawn Claude subagents. All decompilation work goes to Codex CLI
|
|
||||||
workers running `gpt-6.1-sol`. The orchestrator assigns leaves, verifies,
|
|
||||||
lands, reviews outside PRs, and only decompiles by hand in the cases listed
|
|
||||||
under the ownership boundary above.
|
|
||||||
|
|
||||||
Only one orchestrator session may run at a time. If a second session resumes
|
|
||||||
the same thread (for example, the same session opened in two windows), close
|
|
||||||
one of them. Two orchestrators double-merge PRs and fight over the shared
|
|
||||||
build tree.
|
|
||||||
|
|
||||||
### Worker slots and the effort scale
|
|
||||||
|
|
||||||
Run four worker slots, each in its own worktree on a fresh branch from
|
|
||||||
`origin/main`. Every slot gets a disjoint set of three or four leaves (units),
|
|
||||||
closest-to-matching first. A slot starts at `medium` (or `low`) reasoning
|
|
||||||
effort and escalates only when a round produces no new exact function:
|
|
||||||
|
|
||||||
```
|
|
||||||
low/medium -> high -> xhigh -> max -> orchestrator attempt -> parked
|
|
||||||
```
|
|
||||||
|
|
||||||
A round that gains at least one exact function is landed, and the remaining
|
|
||||||
functions go out again at the same effort or one step up. A set that fails at
|
|
||||||
`max` goes to the orchestrator. If the orchestrator also fails, the function
|
|
||||||
is parked as a compiler tie-break with its evidence. Fill freed slots from the
|
|
||||||
live checklist right away; never leave a slot idle.
|
|
||||||
|
|
||||||
Before starting a function, a worker fetches `origin/main` and checks it is
|
|
||||||
not already matched. Outside contributors land work in parallel, and
|
|
||||||
duplicated matches waste a round.
|
|
||||||
|
|
||||||
### Silent mode for workers
|
|
||||||
|
|
||||||
Workers run unattended and must not talk. Every turn is tool calls only: no
|
|
||||||
plans, no progress notes, no summaries. Progress goes into an attempts log
|
|
||||||
file in `tools/decomp-assist/`. The only text message in a run is the final
|
|
||||||
report, at most 8-15 short lines:
|
|
||||||
|
|
||||||
- exact functions per unit, before and after;
|
|
||||||
- the final `GATE` line;
|
|
||||||
- commit hashes;
|
|
||||||
- a link to the attempts log.
|
|
||||||
|
|
||||||
Runs are audited for text messages, and any chatter is a contract
|
|
||||||
violation. Workers also must not push, open PRs, merge, rebase, touch other
|
|
||||||
worktrees, or spawn subagents.
|
|
||||||
|
|
||||||
Each worker prompt has this layout:
|
|
||||||
|
|
||||||
1. the `<task>` block (leaves, current exact counts, method, report format);
|
|
||||||
2. the shared `common.md` block with `<silent_mode>`, `<forbidden>`,
|
|
||||||
`<method>` and `<definition_of_done>`.
|
|
||||||
|
|
||||||
Resume a stalled worker on the same session with the failure evidence. Don't
|
|
||||||
replace it with a fresh one.
|
|
||||||
|
|
||||||
### Gate, landing and review
|
|
||||||
|
|
||||||
- `gate.py <unit...>` is the acceptance check for workers and for outside
|
|
||||||
PRs. It covers:
|
|
||||||
- a full 4.3U build and the DOL SHA1;
|
|
||||||
- per-unit objdiff and instruction-exact counts;
|
|
||||||
- regressions against a baseline report of `origin/main`;
|
|
||||||
- a net forbidden-pattern scan and a readability scan (auto-named
|
|
||||||
identifiers, raw `*(T*)(p + N)` offset casts).
|
|
||||||
- A function that disappears because it was renamed is not a regression,
|
|
||||||
unless the unit's exact count, code or data also drops.
|
|
||||||
- Landing a worker result builds a branch from `origin/main` with the
|
|
||||||
worker's diff, gates it, pushes it, then opens and squash-merges a PR on
|
|
||||||
the fork. After that it regenerates the checklist.
|
|
||||||
- Never run two full builds in the same build tree at once.
|
|
||||||
- Never land while the review queue is building. Both use the same
|
|
||||||
verification worktree.
|
|
||||||
|
|
||||||
Outside PRs are reviewed by a daemon. It re-runs the gate on any open PR
|
|
||||||
whose head commit changed since its last review. A PR is merged
|
|
||||||
automatically only when all of these hold:
|
|
||||||
|
|
||||||
- the PR rebases cleanly;
|
|
||||||
- the full build passes;
|
|
||||||
- the DOL hash matches;
|
|
||||||
- the gate passes, or its only failures are renamed-away functions;
|
|
||||||
- the diff adds no forbidden pattern and no `.s` file.
|
|
||||||
|
|
||||||
Everything else is reviewed by hand:
|
|
||||||
|
|
||||||
- **Conflicts:** comment asking for a rebase.
|
|
||||||
- **Forbidden patterns:** request changes with a concrete honest
|
|
||||||
alternative.
|
|
||||||
- **"Linking" by swapping in retail assembly or pinned labels:** close and
|
|
||||||
explain.
|
|
||||||
- **Proven split/ownership corrections** (relocation evidence, total data
|
|
||||||
unchanged): merge even if one unit's numbers move to its neighbour.
|
|
||||||
|
|
||||||
Policy additions learned in this loop:
|
|
||||||
|
|
||||||
- Linking a unit by building the retail `.s` instead of its C/C++ is
|
|
||||||
forbidden. "Linked" means the C/C++ itself compiles to the exact bytes.
|
|
||||||
- Definition-level `volatile` (on the field or object declaration) is allowed
|
|
||||||
when the target proves it, e.g. back-to-back reloads with no store in
|
|
||||||
between. Check that it changes no other function in the units that use it.
|
|
||||||
Use-site volatile casts and the `register` keyword stay forbidden.
|
|
||||||
|
|
||||||
### Handoff: where the loop lives
|
|
||||||
|
|
||||||
The loop's tools and state live outside the repository, in the author's
|
|
||||||
workers directory `/mnt/drive2/projects/wii-ipl-workers` (`$W` below). A new
|
|
||||||
orchestrator thread picks up from there.
|
|
||||||
|
|
||||||
Tools in `$W/_restore0928-tools/`:
|
|
||||||
|
|
||||||
| File | Purpose |
|
|
||||||
|------|---------|
|
|
||||||
| `gate.py <unit...> [--base origin/main] [--quick]` | the acceptance gate; `--quick` only skips the clean `rm -rf build/43U` |
|
|
||||||
| `land.sh <name> <worktree> merge-base <unit...> <title>` | gate a worker's diff on a fresh branch, push, open and squash-merge the PR |
|
|
||||||
| `luna.sh <worktree> <name> <prompt> <effort> [session]` | start (or resume) one Codex worker; run with `MODEL=gpt-6.1-sol CODEX_BIN=$W/_codex159/bin/codex` |
|
|
||||||
| `reviewd.sh` | review daemon: queues every open PR whose head changed |
|
|
||||||
| `revq.sh`, `automerge.py` | the daemon's gate runner and merge decision |
|
|
||||||
| `checklist.py` | regenerates `$W/CHECKLIST.md` from a report |
|
|
||||||
| `chatter.py <run-prefix>` | counts worker text messages for the silent-mode audit |
|
|
||||||
| `baseline-<sha8>.json` | objdiff reports of past `origin/main` commits, used for regressions |
|
|
||||||
|
|
||||||
State:
|
|
||||||
|
|
||||||
- `$W/_luna-runs/prompts/`: worker prompts. `common.md` is shared; each
|
|
||||||
task is `<name>.task.md`, and the launched prompt is `<name>.md` = task +
|
|
||||||
common.
|
|
||||||
- `$W/_luna-runs/<name>.<time>.jsonl` and `.last.md`: worker transcript and
|
|
||||||
final report.
|
|
||||||
- `$W/_luna-runs/effort-policy.txt`: the policy log. Records escalations,
|
|
||||||
parked functions, and every orchestrator attempt with what was tried.
|
|
||||||
- `$W/CHECKLIST.md`: units with non-exact code, worst first.
|
|
||||||
- Worktrees: `verify-fix` is the only verification and landing tree;
|
|
||||||
`sol-low`, `sol-med`, `sol-high` and `w0929-fix-board` are the four worker
|
|
||||||
slots; `orch` is orchestrator scratch.
|
|
||||||
- Logs: `/tmp/reviewd.log`, `/tmp/vfq.log` (current review batch) and
|
|
||||||
`/tmp/automerge.log` (merge decisions). These are lost on reboot, which
|
|
||||||
only means open PRs get reviewed again.
|
|
||||||
- `/tmp/wii-git.lock`: every `git fetch` or checkout in a shared worktree
|
|
||||||
runs under `flock` on this file, because worktrees share refs.
|
|
||||||
|
|
||||||
To pick up the loop:
|
|
||||||
|
|
||||||
1. Make sure no other orchestrator session is running.
|
|
||||||
2. Check `pgrep -af "reviewd.sh|luna.sh|land.sh"` and restart the review
|
|
||||||
daemon if it isn't running.
|
|
||||||
3. Read the newest `.last.md` for each slot. Land gains, then relaunch the
|
|
||||||
slot per the effort scale.
|
|
||||||
4. Handle every `NEEDS REVIEW` line in `/tmp/automerge.log`.
|
|
||||||
|
|
||||||
## Goal completion contract
|
## Goal completion contract
|
||||||
|
|
||||||
The decompilation loop does not stop after a successful wave, a convenient
|
The decompilation loop does not stop after a successful wave, a convenient
|
||||||
|
|||||||
@@ -53,9 +53,9 @@ Progress
|
|||||||
<!-- progress:start -->
|
<!-- progress:start -->
|
||||||
| Decompiled | Matched | Linked | Data |
|
| Decompiled | Matched | Linked | Data |
|
||||||
|:---:|:---:|:---:|:---:|
|
|:---:|:---:|:---:|:---:|
|
||||||
| 99.59% | 90.81% | 71.43% | 99.37% |
|
| 99.37% | 87.69% | 61.93% | 91.37% |
|
||||||
|
|
||||||
units 956/1027 complete, functions 12365/12563 matched.
|
units 917/1027 complete, functions 12211/12563 matched.
|
||||||
|
|
||||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
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 -->
|
<!-- progress:end -->
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ splits: 'config/43U/splits.txt'
|
|||||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||||
|
|
||||||
force_active:
|
force_active:
|
||||||
- SOGetSockOpt
|
|
||||||
- SOSetInterfaceOpt
|
|
||||||
- fprintf
|
- fprintf
|
||||||
- leap_days
|
- leap_days
|
||||||
- __msl_time2tm
|
- __msl_time2tm
|
||||||
@@ -31,8 +29,8 @@ force_active:
|
|||||||
- strspn
|
- strspn
|
||||||
- strcspn
|
- strcspn
|
||||||
- padding__Q23ipl5scene
|
- padding__Q23ipl5scene
|
||||||
- scRsnOuiPad
|
- lbl_81695063
|
||||||
- scWpaOuiPad
|
- lbl_81695067
|
||||||
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
||||||
|
|
||||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||||
|
|||||||
@@ -688,13 +688,13 @@ src/scene/memoryCard/iplMemoryCard.cpp:
|
|||||||
.text start:0x813C9DCC end:0x813CC1FC
|
.text start:0x813C9DCC end:0x813CC1FC
|
||||||
.rodata start:0x81610368 end:0x81610480
|
.rodata start:0x81610368 end:0x81610480
|
||||||
.data start:0x81651D30 end:0x81652640
|
.data start:0x81651D30 end:0x81652640
|
||||||
.sdata2 start:0x81694A68 end:0x81694A78
|
.sdata2 start:0x81694A68 end:0x81694A80
|
||||||
.sdata start:0x81696C78 end:0x81696CA0
|
.sdata start:0x81696C78 end:0x81696CA0
|
||||||
|
|
||||||
src/scene/memoryCard/iplMemoryCardBase.cpp:
|
src/scene/memoryCard/iplMemoryCardBase.cpp:
|
||||||
.text start:0x813CC1FC end:0x813CD034
|
.text start:0x813CC1FC end:0x813CD034
|
||||||
.data start:0x81652640 end:0x816526D0
|
.data start:0x81652640 end:0x816526D0
|
||||||
.sdata2 start:0x81694A78 end:0x81694A88
|
.sdata2 start:0x81694A80 end:0x81694A88
|
||||||
|
|
||||||
src/scene/memoryCard/iplMemoryCardManager.cpp:
|
src/scene/memoryCard/iplMemoryCardManager.cpp:
|
||||||
.text start:0x813CD034 end:0x813CE548
|
.text start:0x813CD034 end:0x813CE548
|
||||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
|||||||
.rodata start:0x81610608 end:0x81610918
|
.rodata start:0x81610608 end:0x81610918
|
||||||
.data start:0x81654B38 end:0x81654F98
|
.data start:0x81654B38 end:0x81654F98
|
||||||
.sdata2 start:0x81694B18 end:0x81694B60
|
.sdata2 start:0x81694B18 end:0x81694B60
|
||||||
.sdata start:0x81696DD0 end:0x81696E30
|
.sdata start:0x81696DD0 end:0x81696E40
|
||||||
|
|
||||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||||
.text start:0x813E4BBC end:0x813E947C
|
.text start:0x813E4BBC end:0x813E947C
|
||||||
.rodata start:0x81610918 end:0x81610948
|
.rodata start:0x81610918 end:0x81610948
|
||||||
.data start:0x81654F98 end:0x81655638
|
.data start:0x81654F98 end:0x81655638
|
||||||
.sdata2 start:0x81694B60 end:0x81694B88
|
.sdata2 start:0x81694B60 end:0x81694B88
|
||||||
.sdata start:0x81696E30 end:0x81696EF0
|
.sdata start:0x81696E40 end:0x81696EF0
|
||||||
|
|
||||||
src/scene/sdButton/iplSDButton.cpp:
|
src/scene/sdButton/iplSDButton.cpp:
|
||||||
.text start:0x813E947C end:0x813EA88C
|
.text start:0x813E947C end:0x813EA88C
|
||||||
@@ -869,12 +869,11 @@ src/scene/setting/iplUSBAP.cpp:
|
|||||||
.bss start:0x810BC148 end:0x810BD498
|
.bss start:0x810BC148 end:0x810BD498
|
||||||
.text start:0x813FC520 end:0x813FC8FC
|
.text start:0x813FC520 end:0x813FC8FC
|
||||||
.data start:0x81657B08 end:0x81657B18
|
.data start:0x81657B08 end:0x81657B18
|
||||||
.sbss start:0x81698C08 end:0x81698C20
|
.sbss start:0x81698C08 end:0x81698C28
|
||||||
|
|
||||||
src/scene/setting/iplUSBAPThread.cpp:
|
src/scene/setting/iplUSBAPThread.cpp:
|
||||||
.text start:0x813FC8FC end:0x813FCA0C
|
.text start:0x813FC8FC end:0x813FCA0C
|
||||||
.data start:0x81657B18 end:0x81657B60
|
.data start:0x81657B18 end:0x81657B60
|
||||||
.sbss start:0x81698C20 end:0x81698C28
|
|
||||||
|
|
||||||
src/scene/setting/iplAOSSThread.cpp:
|
src/scene/setting/iplAOSSThread.cpp:
|
||||||
.bss start:0x810BD498 end:0x810BD4A8
|
.bss start:0x810BD498 end:0x810BD4A8
|
||||||
@@ -1055,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
|
|||||||
.data start:0x8165F818 end:0x8165F8F0
|
.data start:0x8165F818 end:0x8165F8F0
|
||||||
.sdata2 start:0x81694E10 end:0x81694E28
|
.sdata2 start:0x81694E10 end:0x81694E28
|
||||||
|
|
||||||
src/keyboard/tiKeyboard.cpp:
|
src/keyboard/tiManager.cpp:
|
||||||
.text start:0x81437558 end:0x81439608
|
.text start:0x81437558 end:0x81439608
|
||||||
.ctors start:0x8160D208 end:0x8160D20C
|
.ctors start:0x8160D208 end:0x8160D20C
|
||||||
.data start:0x8165F8F0 end:0x81660378
|
.data start:0x8165F8F0 end:0x81660378
|
||||||
@@ -3552,12 +3551,12 @@ libs/RVL_SDK/src/bte/l2c_csm.c:
|
|||||||
|
|
||||||
libs/RVL_SDK/src/bte/l2c_link.c:
|
libs/RVL_SDK/src/bte/l2c_link.c:
|
||||||
.text start:0x815AC630 end:0x815AD7BC
|
.text start:0x815AC630 end:0x815AD7BC
|
||||||
.data start:0x8168E930 end:0x8168EBA0
|
.data start:0x8168E930 end:0x8168EB68
|
||||||
|
|
||||||
libs/RVL_SDK/src/bte/l2c_main.c:
|
libs/RVL_SDK/src/bte/l2c_main.c:
|
||||||
.bss start:0x811725E0 end:0x81172DC8
|
.bss start:0x811725E0 end:0x81172DC8
|
||||||
.text start:0x815AD7BC end:0x815AE7EC
|
.text start:0x815AD7BC end:0x815AE7EC
|
||||||
.data start:0x8168EBA0 end:0x8168EEA0
|
.data start:0x8168EB68 end:0x8168EEA0
|
||||||
|
|
||||||
libs/RVL_SDK/src/bte/l2c_utils.c:
|
libs/RVL_SDK/src/bte/l2c_utils.c:
|
||||||
.text start:0x815AE7EC end:0x815B06B0
|
.text start:0x815AE7EC end:0x815B06B0
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
84
configure.py
84
configure.py
@@ -689,7 +689,7 @@ config.libs = [
|
|||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("sound", [
|
IPLSection("sound", [
|
||||||
Object(Matching, "sound/iplSound.cpp"),
|
Object(NonMatching, "sound/iplSound.cpp"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("iplwww", [
|
IPLSection("iplwww", [
|
||||||
@@ -738,11 +738,11 @@ config.libs = [
|
|||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("board", [
|
IPLSection("board", [
|
||||||
Object(Matching, "scene/board/iplBoard.cpp"),
|
Object(Equivalent, "scene/board/iplBoard.cpp"),
|
||||||
Object(Matching, "scene/board/iplBoardObject.cpp"),
|
Object(Matching, "scene/board/iplBoardObject.cpp"),
|
||||||
Object(Matching, "scene/board/iplBoardSD.cpp"),
|
Object(Matching, "scene/board/iplBoardSD.cpp"),
|
||||||
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
|
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
|
||||||
Object(Matching, "scene/board/iplFocusObject.cpp"),
|
Object(Equivalent, "scene/board/iplFocusObject.cpp"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("button", [
|
IPLSection("button", [
|
||||||
@@ -772,7 +772,7 @@ config.libs = [
|
|||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("channelTitle", [
|
IPLSection("channelTitle", [
|
||||||
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
|
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("faceSelect", [
|
IPLSection("faceSelect", [
|
||||||
@@ -816,7 +816,7 @@ config.libs = [
|
|||||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||||
Object(Matching, "scene/memoryCard/iplGCWindow.cpp"),
|
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("textBalloon", [
|
IPLSection("textBalloon", [
|
||||||
@@ -850,7 +850,7 @@ config.libs = [
|
|||||||
),
|
),
|
||||||
IPLSection("sdChannelSelect", [
|
IPLSection("sdChannelSelect", [
|
||||||
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelSelect.cpp"),
|
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelSelect.cpp"),
|
||||||
Object(Matching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
|
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
IPLSection("sdChannelTitle", [
|
IPLSection("sdChannelTitle", [
|
||||||
@@ -869,15 +869,15 @@ config.libs = [
|
|||||||
),
|
),
|
||||||
IPLSection("setting", [
|
IPLSection("setting", [
|
||||||
Object(NonMatching, "scene/setting/iplSetting.cpp"),
|
Object(NonMatching, "scene/setting/iplSetting.cpp"),
|
||||||
Object(Matching, "scene/setting/iplSensitivity.cpp"),
|
Object(NonMatching, "scene/setting/iplSensitivity.cpp"),
|
||||||
Object(Matching, "scene/setting/iplNCDSetting.cpp"),
|
Object(Matching, "scene/setting/iplNCDSetting.cpp"),
|
||||||
Object(Matching, "scene/setting/iplParental.cpp"),
|
Object(Matching, "scene/setting/iplParental.cpp"),
|
||||||
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
|
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
|
||||||
Object(Matching, "scene/setting/iplUSBAP.cpp"),
|
Object(NonMatching, "scene/setting/iplUSBAP.cpp"),
|
||||||
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
|
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
|
||||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||||
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||||
]
|
]
|
||||||
@@ -901,7 +901,7 @@ config.libs = [
|
|||||||
),
|
),
|
||||||
IPLSection("bannerSound", [
|
IPLSection("bannerSound", [
|
||||||
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
|
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
|
||||||
Object(Matching, "bannerSound/AxAdpcmPlayer.cpp"),
|
Object(Equivalent, "bannerSound/AxAdpcmPlayer.cpp"),
|
||||||
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
|
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
|
||||||
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
|
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
|
||||||
]
|
]
|
||||||
@@ -918,23 +918,23 @@ config.libs = [
|
|||||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
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/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
|
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiUtil.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/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||||
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||||
Object(Matching, "keyboard/tiPkData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
Object(Matching, "keyboard/tiPkData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||||
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "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/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
Object(NonMatching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
|
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(Matching, "keyboard/tiLayoutGather.cpp", extra_cflags=["-O4,p"]),
|
Object(Matching, "keyboard/tiLayoutGather.cpp", extra_cflags=["-O4,p"]),
|
||||||
Object(NonMatching, "keyboard/tiKoreanInput.cpp", extra_cflags=["-O4,p"]), # for 4.3K
|
Object(NonMatching, "keyboard/tiKoreanInput.cpp", extra_cflags=["-O4,p"]), # for 4.3K
|
||||||
@@ -989,7 +989,7 @@ config.libs = [
|
|||||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||||
Object(Matching, "clib/zi8cinfo.c"),
|
Object(Matching, "clib/zi8cinfo.c"),
|
||||||
Object(Matching, "clib/zi8copy.c"),
|
Object(Matching, "clib/zi8copy.c"),
|
||||||
Object(Matching, "clib/zi8dawg.c"),
|
Object(NonMatching, "clib/zi8dawg.c"),
|
||||||
Object(Matching, "clib/zi8getc.c"),
|
Object(Matching, "clib/zi8getc.c"),
|
||||||
Object(NonMatching, "clib/zi8getc2.c"),
|
Object(NonMatching, "clib/zi8getc2.c"),
|
||||||
Object(Matching, "clib/zi8getSW.c"),
|
Object(Matching, "clib/zi8getSW.c"),
|
||||||
@@ -1005,7 +1005,7 @@ config.libs = [
|
|||||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||||
Object(NonMatching, "clib/zidawg1.c"),
|
Object(NonMatching, "clib/zidawg1.c"),
|
||||||
Object(Matching, "clib/zikorean.c"),
|
Object(Matching, "clib/zikorean.c"),
|
||||||
Object(Matching, "clib/ziswordw.c"),
|
Object(NonMatching, "clib/ziswordw.c"),
|
||||||
Object(NonMatching, "clib/zkokeyp.c"),
|
Object(NonMatching, "clib/zkokeyp.c"),
|
||||||
Object(Matching, "clib/zierror.c"),
|
Object(Matching, "clib/zierror.c"),
|
||||||
Object(NonMatching, "clib/zmtkey.c"),
|
Object(NonMatching, "clib/zmtkey.c"),
|
||||||
@@ -1045,7 +1045,7 @@ config.libs = [
|
|||||||
Object(Matching, "net/crc.c"),
|
Object(Matching, "net/crc.c"),
|
||||||
Object(NonMatching, "net/md5.c"),
|
Object(NonMatching, "net/md5.c"),
|
||||||
Object(Matching, "net/sha1.c"),
|
Object(Matching, "net/sha1.c"),
|
||||||
Object(Matching, "net/hmac.c"),
|
Object(NonMatching, "net/hmac.c"),
|
||||||
Object(Matching, "net/neterrorcode.c"),
|
Object(Matching, "net/neterrorcode.c"),
|
||||||
Object(Matching, "net/NETVersion.c"),
|
Object(Matching, "net/NETVersion.c"),
|
||||||
Object(NonMatching, "net/aes.c"),
|
Object(NonMatching, "net/aes.c"),
|
||||||
@@ -1060,10 +1060,10 @@ config.libs = [
|
|||||||
Object(NonMatching, "nhttp/NHTTP_recvbuf.c"),
|
Object(NonMatching, "nhttp/NHTTP_recvbuf.c"),
|
||||||
Object(Matching, "nhttp/NHTTP_request.c"),
|
Object(Matching, "nhttp/NHTTP_request.c"),
|
||||||
Object(Matching, "nhttp/NHTTP_response.c"),
|
Object(Matching, "nhttp/NHTTP_response.c"),
|
||||||
Object(Matching, "nhttp/NHTTP_socket_RVL.c"),
|
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
|
||||||
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
|
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
|
||||||
Object(Matching, "nhttp/NHTTP_thread.c"),
|
Object(NonMatching, "nhttp/NHTTP_thread.c"),
|
||||||
Object(Matching, "nhttp/d_nhttp_private.c"),
|
Object(NonMatching, "nhttp/d_nhttp_private.c"),
|
||||||
Object(Matching, "nhttp/d_nhttp.c"),
|
Object(Matching, "nhttp/d_nhttp.c"),
|
||||||
Object(Matching, "nhttp/d_nhttp_common.c"),
|
Object(Matching, "nhttp/d_nhttp_common.c"),
|
||||||
]
|
]
|
||||||
@@ -1075,12 +1075,12 @@ config.libs = [
|
|||||||
Object(Matching, "nwc24/NWC24Utils.c"),
|
Object(Matching, "nwc24/NWC24Utils.c"),
|
||||||
Object(Matching, "nwc24/NWC24Manage.c"),
|
Object(Matching, "nwc24/NWC24Manage.c"),
|
||||||
Object(Matching, "nwc24/NWC24MsgObj.c"),
|
Object(Matching, "nwc24/NWC24MsgObj.c"),
|
||||||
Object(Matching, "nwc24/NWC24MBoxCtrl.c"),
|
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
|
||||||
Object(Matching, "nwc24/NWC24Mime.c"),
|
Object(NonMatching, "nwc24/NWC24Mime.c"),
|
||||||
Object(Matching, "nwc24/NWC24Stream.c"),
|
Object(Matching, "nwc24/NWC24Stream.c"),
|
||||||
Object(Matching, "nwc24/NWC24Parser.c"),
|
Object(Matching, "nwc24/NWC24Parser.c"),
|
||||||
Object(Matching, "nwc24/NWC24MsgCommit.c"),
|
Object(NonMatching, "nwc24/NWC24MsgCommit.c"),
|
||||||
Object(Matching, "nwc24/NWC24MsgRead.c"),
|
Object(NonMatching, "nwc24/NWC24MsgRead.c"),
|
||||||
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
||||||
Object(Matching, "nwc24/NWC24Schedule.c"),
|
Object(Matching, "nwc24/NWC24Schedule.c"),
|
||||||
Object(NonMatching, "nwc24/NWC24DateParser.c"),
|
Object(NonMatching, "nwc24/NWC24DateParser.c"),
|
||||||
@@ -1097,8 +1097,8 @@ config.libs = [
|
|||||||
RevoEXLib("so", [
|
RevoEXLib("so", [
|
||||||
Object(Matching, "so/SOCommon.c"),
|
Object(Matching, "so/SOCommon.c"),
|
||||||
Object(NonMatching, "so/SOBasic.c"),
|
Object(NonMatching, "so/SOBasic.c"),
|
||||||
Object(Matching, "so/SOInformation.c"),
|
Object(NonMatching, "so/SOInformation.c"),
|
||||||
Object(Matching, "so/SOOption.c"),
|
Object(NonMatching, "so/SOOption.c"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
RevoEXLib("ssl", [
|
RevoEXLib("ssl", [
|
||||||
@@ -1212,7 +1212,7 @@ config.libs = [
|
|||||||
Object(NonMatching, "exif/exif_parse.c"),
|
Object(NonMatching, "exif/exif_parse.c"),
|
||||||
|
|
||||||
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
||||||
Object(Matching, "reschange/idct_resolution_change_var.c"),
|
Object(NonMatching, "reschange/idct_resolution_change_var.c"),
|
||||||
|
|
||||||
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
||||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||||
@@ -1453,7 +1453,7 @@ config.libs = [
|
|||||||
Object(Matching, "axfx/AXFXReverbStd.c"),
|
Object(Matching, "axfx/AXFXReverbStd.c"),
|
||||||
Object(Matching, "axfx/AXFXReverbStdExp.c"),
|
Object(Matching, "axfx/AXFXReverbStdExp.c"),
|
||||||
Object(Matching, "axfx/AXFXChorus.c"),
|
Object(Matching, "axfx/AXFXChorus.c"),
|
||||||
Object(Matching, "axfx/AXFXChorusExp.c"),
|
Object(NonMatching, "axfx/AXFXChorusExp.c"),
|
||||||
Object(Matching, "axfx/AXFXLfoTable.c"),
|
Object(Matching, "axfx/AXFXLfoTable.c"),
|
||||||
Object(Matching, "axfx/AXFXSrcCoef.c"),
|
Object(Matching, "axfx/AXFXSrcCoef.c"),
|
||||||
Object(Matching, "axfx/AXFXHooks.c"),
|
Object(Matching, "axfx/AXFXHooks.c"),
|
||||||
@@ -1692,19 +1692,19 @@ config.libs = [
|
|||||||
Object(Matching, "fa/pdm_disk.c"),
|
Object(Matching, "fa/pdm_disk.c"),
|
||||||
Object(NonMatching, "fa/pdm_partition.c"),
|
Object(NonMatching, "fa/pdm_partition.c"),
|
||||||
Object(NonMatching, "fa/pf_cache.c"),
|
Object(NonMatching, "fa/pf_cache.c"),
|
||||||
Object(Matching, "fa/pf_cluster.c"),
|
Object(NonMatching, "fa/pf_cluster.c"),
|
||||||
Object(Matching, "fa/pf_dir.c"),
|
Object(NonMatching, "fa/pf_dir.c"),
|
||||||
Object(Matching, "fa/pf_entry.c"),
|
Object(Matching, "fa/pf_entry.c"),
|
||||||
Object(Matching, "fa/pf_entry_iterator.c"),
|
Object(NonMatching, "fa/pf_entry_iterator.c"),
|
||||||
Object(Matching, "fa/pf_fat.c"),
|
Object(NonMatching, "fa/pf_fat.c"),
|
||||||
Object(Matching, "fa/pf_fat12.c"),
|
Object(NonMatching, "fa/pf_fat12.c"),
|
||||||
Object(Matching, "fa/pf_fat16.c"),
|
Object(Matching, "fa/pf_fat16.c"),
|
||||||
Object(Matching, "fa/pf_fat32.c"),
|
Object(Matching, "fa/pf_fat32.c"),
|
||||||
Object(Matching, "fa/pf_fatfs.c"),
|
Object(Matching, "fa/pf_fatfs.c"),
|
||||||
Object(Matching, "fa/pf_file.c"),
|
Object(NonMatching, "fa/pf_file.c"),
|
||||||
Object(Matching, "fa/pf_path.c"),
|
Object(NonMatching, "fa/pf_path.c"),
|
||||||
Object(Matching, "fa/pf_sector.c"),
|
Object(Matching, "fa/pf_sector.c"),
|
||||||
Object(Matching, "fa/pf_volume.c"),
|
Object(NonMatching, "fa/pf_volume.c"),
|
||||||
Object(Matching, "fa/pf_volume_apiadd.c"),
|
Object(Matching, "fa/pf_volume_apiadd.c"),
|
||||||
Object(Matching, "fa/pf_cp932.c"),
|
Object(Matching, "fa/pf_cp932.c"),
|
||||||
Object(Matching, "fa/pf_api_util.c"),
|
Object(Matching, "fa/pf_api_util.c"),
|
||||||
@@ -1860,7 +1860,7 @@ config.libs = [
|
|||||||
|
|
||||||
Object(Matching, "fa/msc/puh_msc.c"),
|
Object(Matching, "fa/msc/puh_msc.c"),
|
||||||
Object(Matching, "fa/msc/puh_msc_cmd.c"),
|
Object(Matching, "fa/msc/puh_msc_cmd.c"),
|
||||||
Object(Matching, "fa/msc/puh_msc_blk.c"),
|
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
RVLSDKLib("sdi", [
|
RVLSDKLib("sdi", [
|
||||||
@@ -1869,7 +1869,7 @@ config.libs = [
|
|||||||
),
|
),
|
||||||
RVLSDKLib("nup", [
|
RVLSDKLib("nup", [
|
||||||
Object(NonMatching, "nup/nup.cpp"),
|
Object(NonMatching, "nup/nup.cpp"),
|
||||||
Object(Matching, "nup/nup_nhttp.cpp"),
|
Object(NonMatching, "nup/nup_nhttp.cpp"),
|
||||||
Object(Matching, "nup/nup_mem.cpp"),
|
Object(Matching, "nup/nup_mem.cpp"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
@@ -1892,7 +1892,7 @@ config.libs = [
|
|||||||
]
|
]
|
||||||
),
|
),
|
||||||
RVLSDKLib("kpr", [
|
RVLSDKLib("kpr", [
|
||||||
Object(Matching, "kpr/kpr_lib.c"),
|
Object(NonMatching, "kpr/kpr_lib.c"),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
RVLSDKLib("usbkbd", [
|
RVLSDKLib("usbkbd", [
|
||||||
|
|||||||
@@ -37,16 +37,8 @@ namespace ipl {
|
|||||||
u8 unk_0x06; // 0x06
|
u8 unk_0x06; // 0x06
|
||||||
u8 unk_0x07; // 0x07
|
u8 unk_0x07; // 0x07
|
||||||
u8 iconFmt[8]; // 0x08
|
u8 iconFmt[8]; // 0x08
|
||||||
#ifdef IPL_MEMORY_CARD_MANAGER_CPP
|
u16 anmFrameBits; // 0x10
|
||||||
volatile u16 anmFrameBits;
|
|
||||||
#else
|
|
||||||
u16 anmFrameBits;
|
|
||||||
#endif
|
|
||||||
#ifdef IPL_MEMORY_CARD_MANAGER_CPP
|
|
||||||
volatile s16 anmMax;
|
|
||||||
#else
|
|
||||||
s16 anmMax; // 0x12
|
s16 anmMax; // 0x12
|
||||||
#endif
|
|
||||||
u32 bannerOffset; // 0x14
|
u32 bannerOffset; // 0x14
|
||||||
u32 bannerTlutOffset; // 0x18
|
u32 bannerTlutOffset; // 0x18
|
||||||
u32 iconOffset[8]; // 0x1C
|
u32 iconOffset[8]; // 0x1C
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
|||||||
|
|
||||||
class SurfaceManager {
|
class SurfaceManager {
|
||||||
public:
|
public:
|
||||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||||
void* libBuf, const char* arcPath);
|
void* libBuf, const char* param_10);
|
||||||
static void DisposeManager();
|
static void DisposeManager();
|
||||||
|
|
||||||
static void RegisterArcFile(void* fileBuf);
|
static void RegisterArcFile(void* fileBuf);
|
||||||
|
|||||||
@@ -92,11 +92,7 @@ namespace textinput {
|
|||||||
virtual void setSaveData(savedata::MemoSetting memoSetting) {
|
virtual void setSaveData(savedata::MemoSetting memoSetting) {
|
||||||
mMemoSetting = memoSetting;
|
mMemoSetting = memoSetting;
|
||||||
}
|
}
|
||||||
#ifdef IPL_KEYBOARD_MEMO_GET_SAVE_DATA
|
|
||||||
virtual savedata::MemoSetting getSaveData();
|
|
||||||
#else
|
|
||||||
virtual savedata::MemoSetting getSaveData() { return mMemoSetting; }
|
virtual savedata::MemoSetting getSaveData() { return mMemoSetting; }
|
||||||
#endif
|
|
||||||
|
|
||||||
virtual void changeState(StateTimeLine stateTimeLine);
|
virtual void changeState(StateTimeLine stateTimeLine);
|
||||||
virtual State* getState() { return mpCurrentState; }
|
virtual State* getState() { return mpCurrentState; }
|
||||||
|
|||||||
@@ -20,8 +20,6 @@ namespace textinput {
|
|||||||
public:
|
public:
|
||||||
void NotifyEvent(u8 down, u8 code);
|
void NotifyEvent(u8 down, u8 code);
|
||||||
void Update();
|
void Update();
|
||||||
bool HasCurrentKey(u32 slot) const { return (current & (1 << slot)) != 0; }
|
|
||||||
bool HadPreviousKey(u32 slot) const { return (previous & (1 << slot)) != 0; }
|
|
||||||
void UpdateModState_();
|
void UpdateModState_();
|
||||||
void Clear() {
|
void Clear() {
|
||||||
held = 0;
|
held = 0;
|
||||||
@@ -109,23 +107,10 @@ namespace textinput {
|
|||||||
HKBManager* manager;
|
HKBManager* manager;
|
||||||
};
|
};
|
||||||
HKBManager() __attribute__((never_inline));
|
HKBManager() __attribute__((never_inline));
|
||||||
|
~HKBManager();
|
||||||
static HKBManager& getInstance() { return sInstance; }
|
static HKBManager& getInstance() { return sInstance; }
|
||||||
void Initialize();
|
void Initialize();
|
||||||
void ClearState();
|
void ClearState();
|
||||||
u32 FilterCharacter(u32 code) const {
|
|
||||||
if (allowedCharacters == 0) return code;
|
|
||||||
u32 count = allowedCharacterCount;
|
|
||||||
if (count == 0) return code;
|
|
||||||
for (u32 index = 0; index < count; index++) {
|
|
||||||
if (static_cast<u16>(code) == allowedCharacters[index]) return code;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
void DetachDevice(KBDDevEvent* event) {
|
|
||||||
u8 device = event->device;
|
|
||||||
attached[device] = 0;
|
|
||||||
states[device].Clear();
|
|
||||||
}
|
|
||||||
u32 GetModifierState() const;
|
u32 GetModifierState() const;
|
||||||
void SetCountry(u8 country);
|
void SetCountry(u8 country);
|
||||||
void SetModifierState(u32 state, u32 mask);
|
void SetModifierState(u32 state, u32 mask);
|
||||||
@@ -164,7 +149,6 @@ namespace textinput {
|
|||||||
void Update();
|
void Update();
|
||||||
|
|
||||||
u32 GetModifierState() const;
|
u32 GetModifierState() const;
|
||||||
void SetCountry(u8 country);
|
|
||||||
void SetModifierState(u32, u32);
|
void SetModifierState(u32, u32);
|
||||||
|
|
||||||
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ namespace textinput {
|
|||||||
#endif
|
#endif
|
||||||
public:
|
public:
|
||||||
HWKeyboard(Manager *);
|
HWKeyboard(Manager *);
|
||||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
#ifdef TIMANAGER_IMPLEMENTATION
|
||||||
inline ~HWKeyboard();
|
inline ~HWKeyboard();
|
||||||
#else
|
#else
|
||||||
~HWKeyboard();
|
~HWKeyboard();
|
||||||
#endif
|
#endif
|
||||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
#ifdef TIMANAGER_IMPLEMENTATION
|
||||||
void setLanguage(Destination destination, Language language);
|
void setLanguage(Destination destination, Language language);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ namespace textinput {
|
|||||||
wchar_t convertWCCode(wchar_t code) const;
|
wchar_t convertWCCode(wchar_t code) const;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||||
void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||||
#else
|
#else
|
||||||
virtual void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
virtual void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||||
@@ -46,10 +46,9 @@ namespace textinput {
|
|||||||
bool updateTappingShift_(input::HKBManager&);
|
bool updateTappingShift_(input::HKBManager&);
|
||||||
#endif
|
#endif
|
||||||
void updateShift(input::HKBManager& hkbManager);
|
void updateShift(input::HKBManager& hkbManager);
|
||||||
bool controlKeyTriggeredHandler(input::HKBManager&);
|
void controlKeyTriggeredHandler(input::HKBManager);
|
||||||
|
|
||||||
Manager *mgr() { return mpManager; }
|
Manager *mgr() { return mpManager; }
|
||||||
const Manager *mgr() const { return mpManager; }
|
|
||||||
|
|
||||||
Manager* mpManager; // 0x10
|
Manager* mpManager; // 0x10
|
||||||
u8 field_0x14; // 0x14
|
u8 field_0x14; // 0x14
|
||||||
|
|||||||
@@ -133,11 +133,7 @@ namespace textinput {
|
|||||||
friend class Base;
|
friend class Base;
|
||||||
public:
|
public:
|
||||||
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
||||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
|
||||||
void init() __attribute__((never_inline));
|
|
||||||
#else
|
|
||||||
void init();
|
void init();
|
||||||
#endif
|
|
||||||
~RowInfoManager();
|
~RowInfoManager();
|
||||||
#endif
|
#endif
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -113,8 +113,6 @@ namespace textinput {
|
|||||||
#ifdef TIMANAGER_IMPLEMENTATION
|
#ifdef TIMANAGER_IMPLEMENTATION
|
||||||
virtual void setTitleText(wchar_t* titleText);
|
virtual void setTitleText(wchar_t* titleText);
|
||||||
void initAspect();
|
void initAspect();
|
||||||
#elif defined(MYTIMANAGER_IMPLEMENTATION)
|
|
||||||
virtual void setTitleText(wchar_t* titleText);
|
|
||||||
#else
|
#else
|
||||||
virtual void setTitleText(const wchar_t* titleText);
|
virtual void setTitleText(const wchar_t* titleText);
|
||||||
#endif
|
#endif
|
||||||
@@ -137,13 +135,8 @@ namespace textinput {
|
|||||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { 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 void* getSignKeyboard() { return mpSignWindow; }
|
||||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||||
#endif
|
|
||||||
|
|
||||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||||
@@ -151,13 +144,8 @@ namespace textinput {
|
|||||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { 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 void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
|
||||||
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
||||||
#endif
|
|
||||||
|
|
||||||
virtual inputform::EditBuffer* createEditBuffer();
|
virtual inputform::EditBuffer* createEditBuffer();
|
||||||
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();
|
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();
|
||||||
|
|||||||
@@ -197,7 +197,6 @@ namespace textinput {
|
|||||||
bool mbMaintainCursorCache;
|
bool mbMaintainCursorCache;
|
||||||
#elif defined(MYTIINPUTFORM_IMPLEMENTATION)
|
#elif defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||||
protected:
|
protected:
|
||||||
void setDrawScrollY(const f32& scroll) { mfDrawScrollY = scroll; }
|
|
||||||
u8 mDrawState[0x27];
|
u8 mDrawState[0x27];
|
||||||
f32 mfDrawScrollY;
|
f32 mfDrawScrollY;
|
||||||
u8 mDrawCacheState[0x14];
|
u8 mDrawCacheState[0x14];
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ namespace textinput {
|
|||||||
public:
|
public:
|
||||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||||
|
|
||||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
|
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||||
#else
|
#else
|
||||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||||
|
|||||||
@@ -34,14 +34,14 @@ namespace gui {
|
|||||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||||
virtual void draw() {} // 0x18 (0x06)
|
virtual void draw() {} // 0x18 (0x06)
|
||||||
|
|
||||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||||
virtual ~Interface(); // 0x1C (0x07)
|
virtual ~Interface(); // 0x1C (0x07)
|
||||||
#else
|
#else
|
||||||
virtual ~Interface() {} // 0x1C (0x07)
|
virtual ~Interface() {} // 0x1C (0x07)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||||
class __declspec(novtable) EventHandler {
|
class __declspec(novtable) EventHandler {
|
||||||
#else
|
#else
|
||||||
class EventHandler {
|
class EventHandler {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace ipl {
|
|||||||
mbDisableCon(bDisableCon) {}
|
mbDisableCon(bDisableCon) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||||
virtual ~PaneManager();
|
virtual ~PaneManager();
|
||||||
#else
|
#else
|
||||||
virtual ~PaneManager() {}
|
virtual ~PaneManager() {}
|
||||||
|
|||||||
@@ -7,10 +7,6 @@
|
|||||||
|
|
||||||
#include "utility/iplFrameController.h"
|
#include "utility/iplFrameController.h"
|
||||||
|
|
||||||
#ifdef IPL_GC_WINDOW_CPP
|
|
||||||
#include "math/iplMathTypes.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef IPL_GCW_INTP_CTOR_OUT_OF_LINE
|
#ifdef IPL_GCW_INTP_CTOR_OUT_OF_LINE
|
||||||
#include "global/decomp/utils.h"
|
#include "global/decomp/utils.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -42,33 +38,6 @@ namespace ipl {
|
|||||||
T mEnd;
|
T mEnd;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef IPL_GC_WINDOW_CPP
|
|
||||||
template <>
|
|
||||||
class Interporation<VEC3> : public utility::FrameController {
|
|
||||||
public:
|
|
||||||
virtual ~Interporation();
|
|
||||||
|
|
||||||
void init(int playback, f32 maxFrame, f32 minFrame, const VEC3& start,
|
|
||||||
const VEC3& end, f32 speed = 1.0f) {
|
|
||||||
mStart = start;
|
|
||||||
mEnd = end;
|
|
||||||
utility::FrameController::init(playback, maxFrame, minFrame, speed);
|
|
||||||
}
|
|
||||||
|
|
||||||
const VEC3& getStart() { return mStart; }
|
|
||||||
const VEC3& getEnd() { return mEnd; }
|
|
||||||
|
|
||||||
void playBackwards() {
|
|
||||||
mAnmType = ANIM_TYPE_BACKWARD;
|
|
||||||
mState = ANIM_STATE_PLAY;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
VEC3 mStart;
|
|
||||||
VEC3 mEnd;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
class LinearIntp : public Interporation<T> {
|
class LinearIntp : public Interporation<T> {
|
||||||
public:
|
public:
|
||||||
@@ -92,16 +61,6 @@ namespace ipl {
|
|||||||
T get2() const { return (((mStart * (mMaxFrame - mFrame)) + (mEnd * mFrame)) / mMaxFrame); }
|
T get2() const { return (((mStart * (mMaxFrame - mFrame)) + (mEnd * mFrame)) / mMaxFrame); }
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef IPL_GC_WINDOW_CPP
|
|
||||||
template <>
|
|
||||||
class LinearIntp<VEC3> : public Interporation<VEC3> {
|
|
||||||
public:
|
|
||||||
LinearIntp();
|
|
||||||
virtual ~LinearIntp();
|
|
||||||
VEC3 get() const;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||||
template <typename T>
|
template <typename T>
|
||||||
|
|||||||
@@ -143,11 +143,7 @@ namespace ipl {
|
|||||||
#else
|
#else
|
||||||
VEC3 operator-(const VEC3& rhs) const { return VEC3(x - rhs.x, y - rhs.y, z - rhs.z); }
|
VEC3 operator-(const VEC3& rhs) const { return VEC3(x - rhs.x, y - rhs.y, z - rhs.z); }
|
||||||
#endif
|
#endif
|
||||||
#ifdef IPL_FOCUS_OBJECT_CPP
|
|
||||||
VEC3 operator*(f32 val) const;
|
|
||||||
#else
|
|
||||||
VEC3 operator*(f32 val) const { return VEC3(x * val, y * val, z * val); }
|
VEC3 operator*(f32 val) const { return VEC3(x * val, y * val, z * val); }
|
||||||
#endif
|
|
||||||
VEC3 operator*(f64 val) const {
|
VEC3 operator*(f64 val) const {
|
||||||
nw4r::math::VEC3 vecOut;
|
nw4r::math::VEC3 vecOut;
|
||||||
VEC3Scale(&vecOut, this, (f32)val);
|
VEC3Scale(&vecOut, this, (f32)val);
|
||||||
|
|||||||
@@ -162,14 +162,14 @@ namespace ipl {
|
|||||||
class {
|
class {
|
||||||
public:
|
public:
|
||||||
void init() {
|
void init() {
|
||||||
mAngleIdx = -1;
|
unk_0x0C = -1;
|
||||||
pos.x = 0.0f;
|
pos.x = 0.0f;
|
||||||
pos.y = 0.0f;
|
pos.y = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
math::VEC2 pos; // pos
|
math::VEC2 pos; // pos
|
||||||
int mStep;
|
int unk_0x08;
|
||||||
int mAngleIdx;
|
int unk_0x0C;
|
||||||
} mStandData; // 0xE4
|
} mStandData; // 0xE4
|
||||||
|
|
||||||
picture mPicture; // 0xF4
|
picture mPicture; // 0xF4
|
||||||
|
|||||||
@@ -53,7 +53,24 @@ namespace ipl {
|
|||||||
mBScroller.init();
|
mBScroller.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL calc(bool canScroll);
|
BOOL calc(bool canScroll) __attribute__((never_inline)) /*for now*/ {
|
||||||
|
BOOL result = FALSE;
|
||||||
|
|
||||||
|
if (canScroll) {
|
||||||
|
if (mBScroller.calc()) {
|
||||||
|
result = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mScroller.calc();
|
||||||
|
|
||||||
|
f32 movable = mScroller.movable_pos(mBScroller.getSpeed());
|
||||||
|
|
||||||
|
mScroller.addScroll(movable);
|
||||||
|
mBScroller.addSoundFreq(movable);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
BOOL is_busy() const {
|
BOOL is_busy() const {
|
||||||
BOOL result = TRUE;
|
BOOL result = TRUE;
|
||||||
|
|||||||
@@ -18,11 +18,11 @@ namespace ipl {
|
|||||||
|
|
||||||
class line_collision {
|
class line_collision {
|
||||||
public:
|
public:
|
||||||
line_collision() : mLeft(0.0f), mRight(0.0f), mY(0.0f) {}
|
line_collision() : unk_0x00(0.0f), unk_0x04(0.0f), unk_0x08(0.0f) {}
|
||||||
|
|
||||||
f32 mLeft;
|
f32 unk_0x00;
|
||||||
f32 mRight;
|
f32 unk_0x04;
|
||||||
f32 mY;
|
f32 unk_0x08;
|
||||||
nw4r::ut::Link mLinkList; // 0x0C
|
nw4r::ut::Link mLinkList; // 0x0C
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -31,9 +31,9 @@ namespace ipl {
|
|||||||
url_collision();
|
url_collision();
|
||||||
~url_collision();
|
~url_collision();
|
||||||
|
|
||||||
int mTagNo;
|
int unk_0x00;
|
||||||
wchar_t* mpStart;
|
wchar_t* unk_0x04;
|
||||||
wchar_t* mpEnd;
|
wchar_t* unk_0x08;
|
||||||
nw4r::ut::Link mLinkList; // 0x0C
|
nw4r::ut::Link mLinkList; // 0x0C
|
||||||
nw4r::ut::List mLineCollisions; // 0x14
|
nw4r::ut::List mLineCollisions; // 0x14
|
||||||
};
|
};
|
||||||
@@ -53,19 +53,19 @@ namespace ipl {
|
|||||||
void parse(nw4r::ut::PrintContext<wchar_t>* context);
|
void parse(nw4r::ut::PrintContext<wchar_t>* context);
|
||||||
|
|
||||||
BOOL is_focused() const;
|
BOOL is_focused() const;
|
||||||
void select(int tagNo);
|
void select(int unk);
|
||||||
|
|
||||||
int get_focused_tagno(int chan) const;
|
int get_focused_tagno(int chan) const;
|
||||||
url_collision* get_selected_col();
|
url_collision* get_selected_col();
|
||||||
|
|
||||||
void get_url(char* urlOut, u32 urlLen);
|
void get_url(char* urlOut, u32 urlLen);
|
||||||
|
|
||||||
void setHitYOffset(f32 val) { mHitYOffset = val; }
|
void setUnk_0x40(f32 val) { unk_0x40 = val; }
|
||||||
void setMemoTranslateY(f32 val) { mMemoTranslateY = val; }
|
void setUnk_0x44(f32 val) { unk_0x44 = val; }
|
||||||
void setFocusEnabled(bool val) { mbFocusEnabled = val; }
|
void setUnk_0x53(bool val) { unk_0x53 = val; }
|
||||||
|
|
||||||
u8 getColorPass() const { return mbColorPass; }
|
u8 getUnk_0x50() const { return unk_0x50; }
|
||||||
void setColorPass(u8 val) { mbColorPass = val; }
|
void setUnk_0x50(u8 val) { unk_0x50 = val; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -75,14 +75,14 @@ namespace ipl {
|
|||||||
|
|
||||||
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
|
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
|
||||||
nw4r::ut::List mUrlCollisions; // 0x34
|
nw4r::ut::List mUrlCollisions; // 0x34
|
||||||
f32 mHitYOffset;
|
f32 unk_0x40;
|
||||||
f32 mMemoTranslateY;
|
f32 unk_0x44;
|
||||||
int mCurTagNo;
|
int unk_0x48;
|
||||||
int mSelectedTagNo;
|
int unk_0x4C;
|
||||||
u8 mbColorPass;
|
u8 unk_0x50;
|
||||||
u8 mbInTag;
|
u8 unk_0x51;
|
||||||
u8 mbHoverOffset;
|
u8 unk_0x52;
|
||||||
u8 mbFocusEnabled;
|
u8 unk_0x53;
|
||||||
};
|
};
|
||||||
} // namespace scene
|
} // namespace scene
|
||||||
} // namespace ipl
|
} // namespace ipl
|
||||||
|
|||||||
@@ -309,8 +309,8 @@ namespace ipl {
|
|||||||
return mbArrowVisible[i];
|
return mbArrowVisible[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
void setSuppressNewMailAnm(bool flag) {
|
void setUnk_0x105(bool flag) {
|
||||||
mbSuppressNewMailAnm = flag;
|
unk_0x105 = flag;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -354,7 +354,7 @@ namespace ipl {
|
|||||||
ANIM_MAX,
|
ANIM_MAX,
|
||||||
};
|
};
|
||||||
|
|
||||||
int mAnimWait;
|
int unk_0x54;
|
||||||
|
|
||||||
layout::Object* mpLayout; // 0x58
|
layout::Object* mpLayout; // 0x58
|
||||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||||
@@ -373,8 +373,8 @@ namespace ipl {
|
|||||||
|
|
||||||
BOOL mbHovered[BTN_MAX]; // 0xD8
|
BOOL mbHovered[BTN_MAX]; // 0xD8
|
||||||
|
|
||||||
bool mbNewMailAnm;
|
bool unk_0x104;
|
||||||
bool mbSuppressNewMailAnm;
|
bool unk_0x105;
|
||||||
|
|
||||||
utility::timer mTimer; // 0x108
|
utility::timer mTimer; // 0x108
|
||||||
bool mbEnabled; // 0x110
|
bool mbEnabled; // 0x110
|
||||||
|
|||||||
@@ -95,9 +95,9 @@ namespace ipl {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
nw4r::ut::List mDateList; // 0x84
|
nw4r::ut::List mDateList; // 0x84
|
||||||
nw4r::ut::List mDrawList;
|
nw4r::ut::List unk_0x90;
|
||||||
bool mbScrolling; // 0x9C
|
bool mbScrolling; // 0x9C
|
||||||
vBOOL mbSearchTaskRunning;
|
vBOOL unk_0xA0;
|
||||||
BOOL mbTaskCanceled; // 0xA4
|
BOOL mbTaskCanceled; // 0xA4
|
||||||
vBOOL mbBackToBoardAlt; // 0xA8
|
vBOOL mbBackToBoardAlt; // 0xA8
|
||||||
bool mbAsian; // 0xAC
|
bool mbAsian; // 0xAC
|
||||||
|
|||||||
@@ -68,8 +68,8 @@ namespace ipl {
|
|||||||
vBOOL mbAppearMsg; // 0x0C
|
vBOOL mbAppearMsg; // 0x0C
|
||||||
|
|
||||||
private:
|
private:
|
||||||
u32 mFocusState;
|
u32 unk_0x10;
|
||||||
int mPendingFocusCmd;
|
int unk_0x14;
|
||||||
layout::Object* mpLayout; // 0x18
|
layout::Object* mpLayout; // 0x18
|
||||||
gui::PaneManager* mpGui; // 0x1C
|
gui::PaneManager* mpGui; // 0x1C
|
||||||
layout::PaneAnimator* mpCurrentPaneAnim; // 0x20
|
layout::PaneAnimator* mpCurrentPaneAnim; // 0x20
|
||||||
@@ -77,7 +77,7 @@ namespace ipl {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
utility::Date* mpDate; // 0x38
|
utility::Date* mpDate; // 0x38
|
||||||
u32 mPointCount;
|
u32 unk_0x3C;
|
||||||
|
|
||||||
static const char* mscAnimPanes[ANIM_PANE_MAX];
|
static const char* mscAnimPanes[ANIM_PANE_MAX];
|
||||||
|
|
||||||
|
|||||||
@@ -293,8 +293,8 @@ namespace ipl {
|
|||||||
LOCKED_DIALOG_ANIM_MAX,
|
LOCKED_DIALOG_ANIM_MAX,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void markTmdReadyTask(void* work);
|
static void iplChannelTitle_813BA684(void* work);
|
||||||
static void deleteTmpTitleContentTask(void* work);
|
static void iplChannelTitle_813BA784(void* work);
|
||||||
static void getTmdTask(void* work);
|
static void getTmdTask(void* work);
|
||||||
static void getTicketLimitTask(void* work);
|
static void getTicketLimitTask(void* work);
|
||||||
static BOOL isTimeLimitedTicket(ESTicketView * ticket, u32* remainTime = NULL);
|
static BOOL isTimeLimitedTicket(ESTicketView * ticket, u32* remainTime = NULL);
|
||||||
|
|||||||
@@ -65,11 +65,7 @@ namespace ipl {
|
|||||||
virtual BOOL isReady() const { return FALSE; }
|
virtual BOOL isReady() const { return FALSE; }
|
||||||
|
|
||||||
/** @brief If the user can power off/reset the system */
|
/** @brief If the user can power off/reset the system */
|
||||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
|
||||||
virtual BOOL isResetAcceptable() { return TRUE; }
|
|
||||||
#else
|
|
||||||
virtual BOOL isResetAcceptable() const { return TRUE; }
|
virtual BOOL isResetAcceptable() const { return TRUE; }
|
||||||
#endif
|
|
||||||
/** @brief The scene running code when powering off/resetting the system */
|
/** @brief The scene running code when powering off/resetting the system */
|
||||||
virtual void startResetting() {}
|
virtual void startResetting() {}
|
||||||
/** @brief If the scene has finished its powering off/resetting task */
|
/** @brief If the scene has finished its powering off/resetting task */
|
||||||
|
|||||||
@@ -102,7 +102,12 @@ namespace ipl {
|
|||||||
static const char* getButtonName(int button) { return smButtonName[button]; }
|
static const char* getButtonName(int button) { return smButtonName[button]; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void setEventHandler(::gui::EventHandler * event);
|
#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, u32 msgId);
|
||||||
void setText(const char* paneName, const wchar_t* text);
|
void setText(const char* paneName, const wchar_t* text);
|
||||||
@@ -145,7 +150,7 @@ namespace ipl {
|
|||||||
ANIM_MAX,
|
ANIM_MAX,
|
||||||
};
|
};
|
||||||
|
|
||||||
int mAnimWait;
|
int unk_0x54;
|
||||||
|
|
||||||
layout::Object* mpLayout; // 0x58
|
layout::Object* mpLayout; // 0x58
|
||||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||||
|
|||||||
@@ -81,22 +81,22 @@ namespace ipl {
|
|||||||
void* mpThumbnailData;
|
void* mpThumbnailData;
|
||||||
NandSDWorker::SDAppMetaEntry mAppMeta;
|
NandSDWorker::SDAppMetaEntry mAppMeta;
|
||||||
};
|
};
|
||||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel);
|
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel);
|
||||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||||
EGG::ExpHeap* secondHeap);
|
EGG::ExpHeap* secondHeap);
|
||||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel);
|
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel);
|
||||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel);
|
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel);
|
||||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel);
|
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel);
|
||||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel);
|
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel);
|
||||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel);
|
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel);
|
||||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int state);
|
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int state);
|
||||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int state);
|
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int state);
|
||||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool selected);
|
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool selected);
|
||||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int enabled);
|
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int enabled);
|
||||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel);
|
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel);
|
||||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel);
|
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel);
|
||||||
|
|
||||||
union SDChannelSelectCommandArguments {
|
union SDChannelSelectCommandArguments {
|
||||||
u32 values[3];
|
u32 values[3];
|
||||||
@@ -203,9 +203,9 @@ namespace ipl {
|
|||||||
bool enqueueLoadNotice();
|
bool enqueueLoadNotice();
|
||||||
bool enqueuePageNotice();
|
bool enqueuePageNotice();
|
||||||
bool enqueueResultNotice(u32 result);
|
bool enqueueResultNotice(u32 result);
|
||||||
bool enqueueChannelNotice(u64 titleId, u32 value);
|
bool enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value);
|
||||||
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
||||||
bool enqueueStateNotice(u64 titleId, u32 state);
|
bool enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state);
|
||||||
bool enqueueErrorNotice(u32 page, u32 index);
|
bool enqueueErrorNotice(u32 page, u32 index);
|
||||||
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
||||||
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
||||||
|
|||||||
@@ -62,17 +62,17 @@ namespace ipl {
|
|||||||
void start_left_event(const char* paneName);
|
void start_left_event(const char* paneName);
|
||||||
void start_trig_event(const char* paneName);
|
void start_trig_event(const char* paneName);
|
||||||
|
|
||||||
typedef struct CmdEntry {
|
typedef struct Unk {
|
||||||
int command; // 0x00
|
int command; // 0x00
|
||||||
u32 msgID; // 0x04
|
u32 msgID; // 0x04
|
||||||
} CmdEntry;
|
} Unk;
|
||||||
|
|
||||||
CmdEntry mCmdQueue[64];
|
Unk unk_0x64[64];
|
||||||
|
|
||||||
int mQueueCapacity;
|
int unk_0x264;
|
||||||
int mQueueCount;
|
int unk_0x268;
|
||||||
int mQueueRead;
|
int unk_0x26C;
|
||||||
int mQueueWrite;
|
int unk_0x270;
|
||||||
|
|
||||||
int mSettingArg; // 0x274
|
int mSettingArg; // 0x274
|
||||||
|
|
||||||
|
|||||||
@@ -167,12 +167,12 @@ namespace ipl {
|
|||||||
|
|
||||||
bool is_stopped_all_anm() const;
|
bool is_stopped_all_anm() const;
|
||||||
|
|
||||||
void calc_exit_sequence();
|
void fn_81409864();
|
||||||
|
|
||||||
void prepare_exit_abort();
|
void fn_814098F4();
|
||||||
void wait_decide_se();
|
void fn_unk_inline();
|
||||||
void start_exit_fade();
|
void fn_81409988();
|
||||||
void finish_exit_reboot();
|
void fn_814099EC();
|
||||||
|
|
||||||
int mState; // 0x60
|
int mState; // 0x60
|
||||||
int mPrevState; // 0x64
|
int mPrevState; // 0x64
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ namespace ipl {
|
|||||||
WAIT_UNTIL_FADE_IN = 15
|
WAIT_UNTIL_FADE_IN = 15
|
||||||
};
|
};
|
||||||
|
|
||||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& initialPos,
|
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& unk2,
|
||||||
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
|
f32 unk3 = 120.0f, f32 unk4 = 30.0f);
|
||||||
~TextBalloon();
|
~TextBalloon();
|
||||||
|
|
||||||
void calc();
|
void calc();
|
||||||
@@ -31,7 +31,7 @@ namespace ipl {
|
|||||||
void fadeout();
|
void fadeout();
|
||||||
void fadeoutForce();
|
void fadeoutForce();
|
||||||
|
|
||||||
void setPos(const math::VEC3& pos, bool use16x9X, int hAlign);
|
void setPos(const math::VEC3& pos, bool unk0, int unk1);
|
||||||
void updatePos(const math::VEC3& pos);
|
void updatePos(const math::VEC3& pos);
|
||||||
|
|
||||||
void set_translate(const math::VEC3& trans);
|
void set_translate(const math::VEC3& trans);
|
||||||
@@ -50,7 +50,7 @@ namespace ipl {
|
|||||||
|
|
||||||
undefined4 unk_0x00;
|
undefined4 unk_0x00;
|
||||||
undefined4 unk_0x04;
|
undefined4 unk_0x04;
|
||||||
BOOL mbWaitingFadeIn; // 0x08
|
BOOL unk_0x08;
|
||||||
|
|
||||||
layout::Object* mpLayout; // 0x0C
|
layout::Object* mpLayout; // 0x0C
|
||||||
|
|
||||||
@@ -60,10 +60,10 @@ namespace ipl {
|
|||||||
|
|
||||||
u32 mTextLen; // 0x18
|
u32 mTextLen; // 0x18
|
||||||
math::VEC3 mBalloonPos; // 0x1C
|
math::VEC3 mBalloonPos; // 0x1C
|
||||||
undefined4 mHAlign; // 0x28
|
undefined4 unk_0x28;
|
||||||
undefined mbUse16x9X; // 0x2C
|
undefined unk_0x2C;
|
||||||
f32 mMargin16x9; // 0x30
|
f32 unk_0x30;
|
||||||
f32 mMargin4x3; // 0x34
|
f32 unk_0x34;
|
||||||
|
|
||||||
int mWaitUntilFadeIn; // 0x38
|
int mWaitUntilFadeIn; // 0x38
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ namespace ipl {
|
|||||||
};
|
};
|
||||||
|
|
||||||
virtual BOOL isResetAcceptable() const {
|
virtual BOOL isResetAcceptable() const {
|
||||||
return mbResetAcceptable;
|
return unk_0x7D;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void prepare();
|
virtual void prepare();
|
||||||
@@ -108,7 +108,7 @@ namespace ipl {
|
|||||||
static const int mToFace_Duration = 20;
|
static const int mToFace_Duration = 20;
|
||||||
|
|
||||||
bool mbClosing; // 0x7C
|
bool mbClosing; // 0x7C
|
||||||
bool mbResetAcceptable;
|
bool unk_0x7D;
|
||||||
|
|
||||||
wchar_t* mWCString; // 0x80
|
wchar_t* mWCString; // 0x80
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ namespace ipl {
|
|||||||
int stopBGM(int unk = 0);
|
int stopBGM(int unk = 0);
|
||||||
#endif
|
#endif
|
||||||
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||||
void stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||||
void stopAllSound(int unk = 0);
|
void stopAllSound(int unk = 0);
|
||||||
|
|
||||||
int resetAllSound();
|
int resetAllSound();
|
||||||
@@ -99,7 +99,7 @@ namespace ipl {
|
|||||||
long clipGELT_S32(long value, long lo, long hi);
|
long clipGELT_S32(long value, long lo, long hi);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
u32 unk_0x620[3];
|
u32 unk_0x620[0x18];
|
||||||
};
|
};
|
||||||
|
|
||||||
// use getSystem() and getBannerPlayer() instead
|
// use getSystem() and getBannerPlayer() instead
|
||||||
|
|||||||
@@ -89,10 +89,10 @@ namespace ipl {
|
|||||||
|
|
||||||
int mIPLState; // 0x04
|
int mIPLState; // 0x04
|
||||||
volatile BS2State mState; // 0x08
|
volatile BS2State mState; // 0x08
|
||||||
bool mbTickEnabled; // 0x0C
|
bool unk_0x0C;
|
||||||
bool mbUpdateRequested; // 0x0D
|
bool unk_0x0D;
|
||||||
bool mbAbortRequested; // 0x0E
|
bool unk_0x0E;
|
||||||
bool mbRestartRequested; // 0x0F
|
bool unk_0x0F;
|
||||||
bool mbIsDiagDisc; // 0x10
|
bool mbIsDiagDisc; // 0x10
|
||||||
bool mbIncludesSeatTitles; // 0x11
|
bool mbIncludesSeatTitles; // 0x11
|
||||||
u8* mpBannerBuffer; // 0x14
|
u8* mpBannerBuffer; // 0x14
|
||||||
|
|||||||
@@ -336,19 +336,19 @@ namespace ipl {
|
|||||||
|
|
||||||
BOOL nand_error_handling(int code);
|
BOOL nand_error_handling(int code);
|
||||||
|
|
||||||
SEntry* findEntryByTitleId(ESTitleId titleId);
|
SEntry* fn_8133A4E0(ESTitleId titleId);
|
||||||
u32 getBannerCSIdx(ESTitleId titleId);
|
u32 fn_8133A57C(ESTitleId titleId);
|
||||||
u32 getSoundSize(ESTitleId titleId);
|
u32 fn_8133A5B8(ESTitleId titleId);
|
||||||
BOOL needsNetSetting(ESTitleId titleId);
|
BOOL fn_8133A5F0(ESTitleId titleId);
|
||||||
BOOL usesAltSound(ESTitleId titleId);
|
BOOL fn_8133A634(ESTitleId titleId);
|
||||||
BOOL isMissingTicket(ESTitleId titleId);
|
BOOL fn_8133A678(ESTitleId titleId);
|
||||||
BOOL isNewsChannelV6Plus(ESTitleId titleId);
|
BOOL fn_8133A6B8(ESTitleId titleId);
|
||||||
BOOL isOperaChannel(ESTitleId titleId);
|
BOOL fn_8133A73C(ESTitleId titleId);
|
||||||
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
|
||||||
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
|
||||||
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
|
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
|
||||||
void clearTmpChannel();
|
void fn_8133A9F0();
|
||||||
void unloadBanner(ESTitleId titleId);
|
void fn_8133AA50(ESTitleId titleId);
|
||||||
|
|
||||||
BOOL isReady() { return mState == FINISH; }
|
BOOL isReady() { return mState == FINISH; }
|
||||||
|
|
||||||
|
|||||||
@@ -118,26 +118,26 @@ namespace ipl {
|
|||||||
public:
|
public:
|
||||||
Base(int chan, KPADStatus& status) {
|
Base(int chan, KPADStatus& status) {
|
||||||
mButton = 0;
|
mButton = 0;
|
||||||
mDecideHoldCount = 0;
|
unk_0x08 = 0;
|
||||||
mLastRumbleTime = 0;
|
mLastRumbleTime = 0;
|
||||||
mRumbleType = -1;
|
mRumbleType = -1;
|
||||||
mChan = chan;
|
mChan = chan;
|
||||||
mType = 2;
|
mType = 2;
|
||||||
mbForceInvalid = 0;
|
unk_0x1C = 0;
|
||||||
KPADEnableDPD(chan);
|
KPADEnableDPD(chan);
|
||||||
mbPinch = 0;
|
unk_0x1D = 0;
|
||||||
mbPrevPinch = 0;
|
unk_0x1E = 0;
|
||||||
mpStatus = &status;
|
unk_0x20 = &status;
|
||||||
}
|
}
|
||||||
|
|
||||||
Base(int chan, int type, KPADStatus& status) {
|
Base(int chan, int type, KPADStatus& status) {
|
||||||
mButton = 0;
|
mButton = 0;
|
||||||
mDecideHoldCount = 0;
|
unk_0x08 = 0;
|
||||||
mLastRumbleTime = 0;
|
mLastRumbleTime = 0;
|
||||||
mRumbleType = -1;
|
mRumbleType = -1;
|
||||||
mChan = chan;
|
mChan = chan;
|
||||||
mType = type;
|
mType = type;
|
||||||
mbForceInvalid = 0;
|
unk_0x1C = 0;
|
||||||
KPADEnableDPD(chan);
|
KPADEnableDPD(chan);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -152,15 +152,15 @@ namespace ipl {
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
u8 mButton;
|
u8 mButton;
|
||||||
u32 mDecideHoldCount;
|
u32 unk_0x08;
|
||||||
OSTick mLastRumbleTime;
|
OSTick mLastRumbleTime;
|
||||||
s32 mRumbleType;
|
s32 mRumbleType;
|
||||||
u32 mChan;
|
u32 mChan;
|
||||||
u32 mType;
|
u32 mType;
|
||||||
u8 mbForceInvalid;
|
u8 unk_0x1C;
|
||||||
u8 mbPinch;
|
u8 unk_0x1D;
|
||||||
u8 mbPrevPinch;
|
u8 unk_0x1E;
|
||||||
KPADStatus* mpStatus;
|
KPADStatus* unk_0x20;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Revolution : public Base {
|
class Revolution : public Base {
|
||||||
@@ -206,8 +206,8 @@ namespace ipl {
|
|||||||
virtual BOOL isValidDpdClassic() const;
|
virtual BOOL isValidDpdClassic() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
math::VEC2 mClassicCursor;
|
math::VEC2 unk_0x24;
|
||||||
int mClassicCursorTimer;
|
int unk_0x2C;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Master : public Interface {
|
class Master : public Interface {
|
||||||
@@ -264,18 +264,18 @@ namespace ipl {
|
|||||||
public:
|
public:
|
||||||
Base(int chan, KPADStatus& arg1) {
|
Base(int chan, KPADStatus& arg1) {
|
||||||
mButton = 0;
|
mButton = 0;
|
||||||
mDecideHoldCount = 0;
|
unk_0x08 = 0;
|
||||||
mLastRumbleTime = 0;
|
mLastRumbleTime = 0;
|
||||||
mRumbleType = -1;
|
mRumbleType = -1;
|
||||||
mChan = chan;
|
mChan = chan;
|
||||||
mType = 2;
|
mType = 2;
|
||||||
mbForceInvalid = 0;
|
unk_0x1C = 0;
|
||||||
|
|
||||||
KPADEnableDPD(chan);
|
KPADEnableDPD(chan);
|
||||||
|
|
||||||
mbPinch = 0;
|
unk_0x1D = 0;
|
||||||
mbPrevPinch = 0;
|
unk_0x1E = 0;
|
||||||
mpStatus = &arg1;
|
unk_0x20 = &arg1;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~Base(); // 0x08
|
virtual ~Base(); // 0x08
|
||||||
@@ -326,15 +326,15 @@ namespace ipl {
|
|||||||
|
|
||||||
// protected:
|
// protected:
|
||||||
u8 mButton; // 0x4
|
u8 mButton; // 0x4
|
||||||
u32 mDecideHoldCount; // 0x8
|
u32 unk_0x08; // 0x8
|
||||||
OSTick mLastRumbleTime; // 0xC
|
OSTick mLastRumbleTime; // 0xC
|
||||||
s32 mRumbleType; // 0x10
|
s32 mRumbleType; // 0x10
|
||||||
u32 mChan; // 0x14
|
u32 mChan; // 0x14
|
||||||
u32 mType; // 0x18
|
u32 mType; // 0x18
|
||||||
u8 mbForceInvalid;
|
u8 unk_0x1C;
|
||||||
u8 mbPinch; // 0x1D
|
u8 unk_0x1D; // 0x1D
|
||||||
u8 mbPrevPinch; // 0x1E
|
u8 unk_0x1E; // 0x1E
|
||||||
KPADStatus* mpStatus; // 0x20
|
KPADStatus* unk_0x20; // 0x20
|
||||||
};
|
};
|
||||||
|
|
||||||
class Interface : public Base {
|
class Interface : public Base {
|
||||||
@@ -446,8 +446,8 @@ namespace ipl {
|
|||||||
virtual BOOL isValidDpdClassic() const; // 0x8C
|
virtual BOOL isValidDpdClassic() const; // 0x8C
|
||||||
|
|
||||||
private:
|
private:
|
||||||
math::VEC2 mClassicCursor;
|
math::VEC2 unk_0x24;
|
||||||
int mClassicCursorTimer;
|
int unk_0x2C;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Manager {
|
class Manager {
|
||||||
|
|||||||
@@ -60,9 +60,9 @@ namespace ipl {
|
|||||||
|
|
||||||
int mMessageID; // 0x08
|
int mMessageID; // 0x08
|
||||||
|
|
||||||
int mArg2;
|
int unk_0x0C;
|
||||||
int mArg3;
|
int unk_0x10;
|
||||||
char mArg1[4];
|
char unk_0x14[4];
|
||||||
|
|
||||||
u8* mpArcData; // 0x18
|
u8* mpArcData; // 0x18
|
||||||
u32 mArcSize; // 0x1C
|
u32 mArcSize; // 0x1C
|
||||||
|
|||||||
@@ -145,13 +145,6 @@ namespace ipl {
|
|||||||
mpCommonFile = commonFile;
|
mpCommonFile = commonFile;
|
||||||
mpLangFile = langFile;
|
mpLangFile = langFile;
|
||||||
}
|
}
|
||||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
|
||||||
virtual ~LangFile() {}
|
|
||||||
virtual void read() {}
|
|
||||||
virtual bool isFinished() { return false; }
|
|
||||||
virtual int checkData() { return 0; }
|
|
||||||
virtual bool isFatalError() { return false; }
|
|
||||||
#else
|
|
||||||
virtual ~LangFile(); // 0x08
|
virtual ~LangFile(); // 0x08
|
||||||
|
|
||||||
virtual void read(); // 0x0C
|
virtual void read(); // 0x0C
|
||||||
@@ -159,7 +152,6 @@ namespace ipl {
|
|||||||
virtual bool isFinished(); // 0x14
|
virtual bool isFinished(); // 0x14
|
||||||
virtual int checkData(); // 0x18
|
virtual int checkData(); // 0x18
|
||||||
virtual bool isFatalError(); // 0x1C
|
virtual bool isFatalError(); // 0x1C
|
||||||
#endif
|
|
||||||
|
|
||||||
File* getCmnFile() const { return mpCommonFile; }
|
File* getCmnFile() const { return mpCommonFile; }
|
||||||
File* getLangFile() const { return mpLangFile; }
|
File* getLangFile() const { return mpLangFile; }
|
||||||
@@ -173,11 +165,7 @@ namespace ipl {
|
|||||||
public:
|
public:
|
||||||
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
|
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
|
||||||
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
|
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
|
||||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
|
||||||
virtual ~LayoutFile() {} // 0x08
|
|
||||||
#else
|
|
||||||
virtual ~LayoutFile(); // 0x08
|
virtual ~LayoutFile(); // 0x08
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
} // namespace nand
|
} // namespace nand
|
||||||
} // namespace ipl
|
} // namespace ipl
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ namespace ipl {
|
|||||||
void read_sd_app_location_async(ESTitleId32* titleIds);
|
void read_sd_app_location_async(ESTitleId32* titleIds);
|
||||||
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
||||||
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
||||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
|
||||||
|
|
||||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||||
|
|
||||||
@@ -152,7 +152,7 @@ namespace ipl {
|
|||||||
BOOL is_working();
|
BOOL is_working();
|
||||||
|
|
||||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||||
void requestCancel() { mbCancel = true; }
|
void requestCancel() { unk_0x04 = true; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
|
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
|
||||||
@@ -514,7 +514,7 @@ namespace ipl {
|
|||||||
void do_check_for_sd_app_to_nand();
|
void do_check_for_sd_app_to_nand();
|
||||||
void check_backup_fits();
|
void check_backup_fits();
|
||||||
void do_list_nand_apps_usage();
|
void do_list_nand_apps_usage();
|
||||||
void do_check_sd_app_titles();
|
void do_unk_8134C838();
|
||||||
|
|
||||||
void do_move_nand_app_to_sd();
|
void do_move_nand_app_to_sd();
|
||||||
void do_move_sd_app_to_nand();
|
void do_move_sd_app_to_nand();
|
||||||
@@ -531,7 +531,7 @@ namespace ipl {
|
|||||||
static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done);
|
static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done);
|
||||||
|
|
||||||
Work* myWork; // 0x00
|
Work* myWork; // 0x00
|
||||||
bool mbCancel; // 0x04
|
bool unk_0x04; // 0x04
|
||||||
|
|
||||||
static const char* c_banner_file_name;
|
static const char* c_banner_file_name;
|
||||||
static const char* c_nocopy_folder_name;
|
static const char* c_nocopy_folder_name;
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ namespace ipl {
|
|||||||
|
|
||||||
bool received() { return mbReviecedMsg; }
|
bool received() { return mbReviecedMsg; }
|
||||||
void prepNextReceive() { mbReviecedMsg = false; }
|
void prepNextReceive() { mbReviecedMsg = false; }
|
||||||
volatile bool isReceivingIdle() { return mbReceiving == false; }
|
volatile bool isUnk0xA31() { return unk_0xA31 == false; }
|
||||||
|
|
||||||
BOOL isAppDlEnableLock(u32 appId) {
|
BOOL isAppDlEnableLock(u32 appId) {
|
||||||
utility::autoMutexLock lock(mAutoLock);
|
utility::autoMutexLock lock(mAutoLock);
|
||||||
@@ -175,9 +175,9 @@ namespace ipl {
|
|||||||
OSMutex mAutoLock; // 0xA18
|
OSMutex mAutoLock; // 0xA18
|
||||||
|
|
||||||
bool mbReviecedMsg;
|
bool mbReviecedMsg;
|
||||||
bool mbReceiving;
|
bool unk_0xA31;
|
||||||
bool mbReceivePaused; // 0xA32
|
bool mbReceivePaused; // 0xA32
|
||||||
bool mbNewTitleTblReady;
|
bool unk_0xA33;
|
||||||
|
|
||||||
static Arg smArg;
|
static Arg smArg;
|
||||||
|
|
||||||
|
|||||||
@@ -26,18 +26,6 @@ namespace ipl {
|
|||||||
namespace savedata {
|
namespace savedata {
|
||||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||||
|
|
||||||
struct ChannelSlot {
|
|
||||||
u8 valid; // 0x00 (primaryType)
|
|
||||||
u8 pad[3]; // 0x01
|
|
||||||
s32 titleId; // 0x04 (sceneID)
|
|
||||||
u8 rest[8]; // 0x08
|
|
||||||
};
|
|
||||||
|
|
||||||
struct ChannelPage {
|
|
||||||
u8 pad[0x30];
|
|
||||||
ChannelSlot slots[MAX_CHANNEL_INDEX]; // 0x30
|
|
||||||
};
|
|
||||||
|
|
||||||
class Manager {
|
class Manager {
|
||||||
public:
|
public:
|
||||||
Manager(EGG::Heap* heap);
|
Manager(EGG::Heap* heap);
|
||||||
|
|||||||
@@ -38,19 +38,6 @@ namespace EGG {
|
|||||||
|
|
||||||
virtual void calc(); // 0x30
|
virtual void calc(); // 0x30
|
||||||
|
|
||||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
|
||||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x34
|
|
||||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x38
|
|
||||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x3C
|
|
||||||
|
|
||||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x44
|
|
||||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x44
|
|
||||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x48
|
|
||||||
|
|
||||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x50
|
|
||||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x50
|
|
||||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x58
|
|
||||||
#else
|
|
||||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x34
|
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x34
|
||||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x38
|
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x38
|
||||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName) NO_INLINE {
|
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName) NO_INLINE {
|
||||||
@@ -79,7 +66,6 @@ namespace EGG {
|
|||||||
u32 id = changeNameToId(pName);
|
u32 id = changeNameToId(pName);
|
||||||
return mSoundArchivePlayer.HoldSound(pHandle, id);
|
return mSoundArchivePlayer.HoldSound(pHandle, id);
|
||||||
} // 0x58
|
} // 0x58
|
||||||
#endif
|
|
||||||
|
|
||||||
u32 changeNameToId(const char* pName) { return mpArchive->ConvertLabelStringToSoundId(pName); }
|
u32 changeNameToId(const char* pName) { return mpArchive->ConvertLabelStringToSoundId(pName); }
|
||||||
const char* changeIdToName(u32 id) { return mpArchive->GetSoundLabelString(id); }
|
const char* changeIdToName(u32 id) { return mpArchive->GetSoundLabelString(id); }
|
||||||
|
|||||||
@@ -19,10 +19,6 @@ namespace EGG {
|
|||||||
|
|
||||||
~SoundHeapMgr() { destroySoundHeap(); }
|
~SoundHeapMgr() { destroySoundHeap(); }
|
||||||
|
|
||||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
|
||||||
virtual bool loadState(s32 id); // 0x08
|
|
||||||
virtual s32 getCurrentLevel(); // 0x0C
|
|
||||||
#else
|
|
||||||
virtual bool loadState(s32 id) {
|
virtual bool loadState(s32 id) {
|
||||||
#ifdef IPL_SOUND_MATCHING
|
#ifdef IPL_SOUND_MATCHING
|
||||||
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
|
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
|
||||||
@@ -39,7 +35,6 @@ namespace EGG {
|
|||||||
} // 0x08
|
} // 0x08
|
||||||
|
|
||||||
virtual s32 getCurrentLevel() { return mHeap.GetCurrentLevel(); } // 0x0C
|
virtual s32 getCurrentLevel() { return mHeap.GetCurrentLevel(); } // 0x0C
|
||||||
#endif
|
|
||||||
|
|
||||||
s32 saveState() { return mHeap.SaveState(); }
|
s32 saveState() { return mHeap.SaveState(); }
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
#define EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
|
||||||
|
|
||||||
#include <egg/core.h>
|
#include <egg/core.h>
|
||||||
|
|
||||||
namespace EGG {
|
namespace EGG {
|
||||||
|
|||||||
@@ -1120,7 +1120,6 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
|||||||
case 's':
|
case 's':
|
||||||
if (format.argument_options == wchar_argument) {
|
if (format.argument_options == wchar_argument) {
|
||||||
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
|
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
|
||||||
int wideLength;
|
|
||||||
|
|
||||||
if (wcs_ptr == NULL) {
|
if (wcs_ptr == NULL) {
|
||||||
wcs_ptr = L"";
|
wcs_ptr = L"";
|
||||||
@@ -1128,24 +1127,22 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
|||||||
|
|
||||||
if (format.alternate_form) {
|
if (format.alternate_form) {
|
||||||
wchar_t first = *wcs_ptr++;
|
wchar_t first = *wcs_ptr++;
|
||||||
wideLength = (unsigned char)first;
|
num_chars = (unsigned char)first;
|
||||||
|
|
||||||
if (format.precision_specified && wideLength > format.precision) {
|
if (format.precision_specified && num_chars > format.precision) {
|
||||||
wideLength = format.precision;
|
num_chars = format.precision;
|
||||||
}
|
}
|
||||||
} else if (format.precision_specified) {
|
} else if (format.precision_specified) {
|
||||||
wideLength = format.precision;
|
num_chars = format.precision;
|
||||||
|
|
||||||
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, wideLength)) != 0) {
|
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, num_chars)) != 0) {
|
||||||
wideLength = string_end - wcs_ptr;
|
num_chars = string_end - wcs_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
wideLength = wcslen(wcs_ptr);
|
num_chars = wcslen(wcs_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
num_chars = wideLength;
|
|
||||||
|
|
||||||
buff_ptr = wcs_ptr;
|
buff_ptr = wcs_ptr;
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,45 +1,32 @@
|
|||||||
|
|
||||||
|
// Yes, versions other than 4.3U align by 8.
|
||||||
#if defined(VERSION_43U)
|
#if defined(VERSION_43U)
|
||||||
#pragma function_align 32
|
#pragma function_align 32
|
||||||
#else
|
#else
|
||||||
#pragma function_align 8
|
#pragma function_align 8
|
||||||
#endif
|
#endif // VERSION_43U
|
||||||
|
|
||||||
#include <TRK_Hollywood_Revolution.h>
|
#include <TRK_Hollywood_Revolution.h>
|
||||||
|
|
||||||
#pragma force_active on
|
#pragma force_active on
|
||||||
|
|
||||||
// clang-format off
|
// Encapsulating function to get the file to align properly
|
||||||
asm DSIOResult TRKAccessFile(MessageCommandID cmd, unsigned int handle, int* count, unsigned char* buffer) {
|
asm void __targsupp() {
|
||||||
#ifdef __MWERKS__
|
// clang-format off
|
||||||
|
#ifdef __MWERKS__
|
||||||
nofralloc
|
nofralloc
|
||||||
twi 31, r0, 0
|
entry TRKAccessFile
|
||||||
blr
|
twi 31, r0, 0
|
||||||
#endif
|
blr
|
||||||
|
entry TRKOpenFile
|
||||||
|
twi 31, r0, 0
|
||||||
|
blr
|
||||||
|
entry TRKCloseFile
|
||||||
|
twi 31, r0, 0
|
||||||
|
blr
|
||||||
|
entry TRKPositionFile
|
||||||
|
twi 31, r0, 0
|
||||||
|
blr
|
||||||
|
#endif // __MWERKS__
|
||||||
|
// clang-format on
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma function_align 8
|
|
||||||
|
|
||||||
asm DSIOResult TRKOpenFile() {
|
|
||||||
#ifdef __MWERKS__
|
|
||||||
nofralloc
|
|
||||||
twi 31, r0, 0
|
|
||||||
blr
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
asm DSIOResult TRKCloseFile() {
|
|
||||||
#ifdef __MWERKS__
|
|
||||||
nofralloc
|
|
||||||
twi 31, r0, 0
|
|
||||||
blr
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
asm DSIOResult TRKPositionFile() {
|
|
||||||
#ifdef __MWERKS__
|
|
||||||
nofralloc
|
|
||||||
twi 31, r0, 0
|
|
||||||
blr
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
// clang-format on
|
|
||||||
|
|||||||
@@ -19,13 +19,8 @@ namespace nw4r {
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
class AutoLock : private NonCopyable {
|
class AutoLock : private NonCopyable {
|
||||||
public:
|
public:
|
||||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
|
||||||
explicit AutoLock(T& rLockObj);
|
|
||||||
~AutoLock();
|
|
||||||
#else
|
|
||||||
explicit AutoLock(T& rLockObj) : mLockObj(rLockObj) { Lock(rLockObj); }
|
explicit AutoLock(T& rLockObj) : mLockObj(rLockObj) { Lock(rLockObj); }
|
||||||
~AutoLock() { Unlock(mLockObj); }
|
~AutoLock() { Unlock(mLockObj); }
|
||||||
#endif
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
T& mLockObj; // 0x00
|
T& mLockObj; // 0x00
|
||||||
|
|||||||
@@ -301,9 +301,9 @@ namespace nw4r {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||||
u32 fpcsr = sException.FPCSR_COPY;
|
u32 uVar1 = sException.FPCSR_COPY;
|
||||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
|
||||||
if ((fpcsr & 0x20000000) != 0) {
|
if ((uVar1 & 0x20000000) != 0) {
|
||||||
Exception_Printf_(" FPE: Invalid operation\n");
|
Exception_Printf_(" FPE: Invalid operation\n");
|
||||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||||
Exception_Printf_(" SNaN\n");
|
Exception_Printf_(" SNaN\n");
|
||||||
@@ -333,16 +333,16 @@ namespace nw4r {
|
|||||||
Exception_Printf_(" Invalid integer convert\n");
|
Exception_Printf_(" Invalid integer convert\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((fpcsr & 0x10000000) != 0) {
|
if ((uVar1 & 0x10000000) != 0) {
|
||||||
Exception_Printf_(" FPE: Overflow\n");
|
Exception_Printf_(" FPE: Overflow\n");
|
||||||
}
|
}
|
||||||
if ((fpcsr & 0x8000000) != 0) {
|
if ((uVar1 & 0x8000000) != 0) {
|
||||||
Exception_Printf_(" FPE: Underflow\n");
|
Exception_Printf_(" FPE: Underflow\n");
|
||||||
}
|
}
|
||||||
if ((fpcsr & 0x4000000) != 0) {
|
if ((uVar1 & 0x4000000) != 0) {
|
||||||
Exception_Printf_(" FPE: Zero division\n");
|
Exception_Printf_(" FPE: Zero division\n");
|
||||||
}
|
}
|
||||||
if ((fpcsr & 0x2000000) != 0) {
|
if ((uVar1 & 0x2000000) != 0) {
|
||||||
Exception_Printf_(" FPE: Inexact result\n");
|
Exception_Printf_(" FPE: Inexact result\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,22 @@
|
|||||||
#include <nw4r/db/assert.h>
|
#include <nw4r/db/assert.h>
|
||||||
|
|
||||||
extern "C" const u8 scLytFatalColorR;
|
extern "C" const u8 lbl_81695550 = 255;
|
||||||
extern "C" const u8 scLytFatalColorG;
|
extern "C" const u8 lbl_81695551 = 255;
|
||||||
extern "C" const u8 scLytFatalColorB;
|
extern "C" const u8 lbl_81695552 = 255;
|
||||||
extern "C" const u8 scLytFatalColorA;
|
extern "C" const u8 lbl_81695553 = 0;
|
||||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||||
|
|
||||||
#undef NW4R_ASSERT
|
#undef NW4R_ASSERT
|
||||||
#define NW4R_GLOBAL_ASSERT(x) \
|
#define NW4R_ASSERT(x) \
|
||||||
{ \
|
{ \
|
||||||
if (!(x)) { \
|
if (!(x)) { \
|
||||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||||
GXColor back = {0, 0, 0, 0}; \
|
GXColor back = {0, 0, 0, 0}; \
|
||||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define NW4R_ASSERT(x) \
|
|
||||||
{ \
|
|
||||||
if (!(x)) { \
|
|
||||||
GXColor front = {255, 255, 255, 0}; \
|
|
||||||
GXColor back = {0, 0, 0, 0}; \
|
|
||||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
|
|
||||||
#include <nw4r/lyt/window.h>
|
#include <nw4r/lyt/window.h>
|
||||||
|
|
||||||
#include <nw4r/lyt/common.h>
|
#include <nw4r/lyt/common.h>
|
||||||
@@ -497,7 +488,7 @@ namespace nw4r {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Material* Window::GetFrameMaterial(u32 frameIdx) const {
|
Material* Window::GetFrameMaterial(u32 frameIdx) const {
|
||||||
NW4R_GLOBAL_ASSERT(frameIdx < WINDOWFRAME_MAX);
|
NW4R_ASSERT(frameIdx < WINDOWFRAME_MAX);
|
||||||
if (frameIdx >= mFrameNum) {
|
if (frameIdx >= mFrameNum) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -510,8 +501,3 @@ namespace nw4r {
|
|||||||
}
|
}
|
||||||
} // namespace lyt
|
} // namespace lyt
|
||||||
} // namespace nw4r
|
} // namespace nw4r
|
||||||
|
|
||||||
extern "C" const u8 scLytFatalColorR = 255;
|
|
||||||
extern "C" const u8 scLytFatalColorG = 255;
|
|
||||||
extern "C" const u8 scLytFatalColorB = 255;
|
|
||||||
extern "C" const u8 scLytFatalColorA = 0;
|
|
||||||
|
|||||||
@@ -314,7 +314,7 @@ namespace nw4r {
|
|||||||
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
|
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
|
||||||
u32 glgrInnerLen;
|
u32 glgrInnerLen;
|
||||||
HeaderedGlyphGroups* pGlgr;
|
HeaderedGlyphGroups* pGlgr;
|
||||||
const ArchiveFontBinaryLayout* font;
|
ArchiveFontBinaryLayout* font;
|
||||||
u8* glgrEnd;
|
u8* glgrEnd;
|
||||||
|
|
||||||
u32 expectedMaxSize;
|
u32 expectedMaxSize;
|
||||||
@@ -337,7 +337,7 @@ namespace nw4r {
|
|||||||
|
|
||||||
// Copy the glgr to work
|
// Copy the glgr to work
|
||||||
{
|
{
|
||||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
pGlgr = &font->glgr;
|
||||||
glgrEnd = (u8*)pGlgr + (u32)ctx->mNextBlockHdr.size;
|
glgrEnd = (u8*)pGlgr + (u32)ctx->mNextBlockHdr.size;
|
||||||
|
|
||||||
memcpy(pGlgr, &ctx->mNextBlockHdr, sizeof(BinaryBlockHeader));
|
memcpy(pGlgr, &ctx->mNextBlockHdr, sizeof(BinaryBlockHeader));
|
||||||
@@ -368,21 +368,21 @@ namespace nw4r {
|
|||||||
|
|
||||||
u32 sheetOffsetsScratchSize;
|
u32 sheetOffsetsScratchSize;
|
||||||
|
|
||||||
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
|
||||||
dataBlockCount = font->hdr.dataBlocks; // 0x0E
|
dataBlockCount = font->hdr.dataBlocks; // 0x0E
|
||||||
|
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
||||||
// countName = font->glgr.inner.nameCount;
|
// countName = font->glgr.inner.nameCount;
|
||||||
countSheet = font->glgr.inner.sheetCount;
|
countSheet = font->glgr.inner.sheetCount;
|
||||||
// count0A = font->glgr.inner.smthCount_0x0a;
|
// count0A = font->glgr.inner.smthCount_0x0a;
|
||||||
// count0C = font->glgr.inner.smthCount_0x0c;
|
// count0C = font->glgr.inner.smthCount_0x0c;
|
||||||
|
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
||||||
|
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
||||||
|
|
||||||
stepSheetFlags = detail::CalcSizeFlagSet(countSheet);
|
stepSheetFlags = detail::CalcSizeFlagSet(countSheet);
|
||||||
flagsSheetsOff = detail::CalcOffsetSheetFlags(font->glgr.inner.nameCount, countSheet, font->glgr.inner.smthCount_0x0a,
|
flagsSheetsOff = detail::CalcOffsetSheetFlags(font->glgr.inner.nameCount, countSheet, font->glgr.inner.smthCount_0x0a,
|
||||||
font->glgr.inner.smthCount_0x0c);
|
font->glgr.inner.smthCount_0x0c);
|
||||||
flagsSheets = (const u32*)font + (flagsSheetsOff >> 2);
|
flagsSheets = (const u32*)font + (flagsSheetsOff >> 2);
|
||||||
|
|
||||||
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
pGlgr = &font->glgr;
|
||||||
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
|
||||||
|
|
||||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
|
||||||
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
||||||
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
||||||
// return CONSTRUCT_STATE_FATAL_ERR;
|
// return CONSTRUCT_STATE_FATAL_ERR;
|
||||||
|
|||||||
@@ -63,9 +63,9 @@ typedef struct {
|
|||||||
u8 mcuYRem; // 0x0F
|
u8 mcuYRem; // 0x0F
|
||||||
u16 mcuYCount; // 0x10
|
u16 mcuYCount; // 0x10
|
||||||
u16 mcuXCount2; // 0x12
|
u16 mcuXCount2; // 0x12
|
||||||
u32 mcuTotal; // 0x14
|
u32 unk_0x14;
|
||||||
u8 remX; // 0x18
|
u8 unk_0x18;
|
||||||
u8 remY; // 0x19
|
u8 unk_0x19;
|
||||||
u8 compCount; // 0x1A
|
u8 compCount; // 0x1A
|
||||||
u8 scanCompCount; // 0x1B
|
u8 scanCompCount; // 0x1B
|
||||||
u8 blockCount[4]; // 0x1C
|
u8 blockCount[4]; // 0x1C
|
||||||
@@ -142,9 +142,9 @@ struct TMCCJPEGDecWork_t {
|
|||||||
u8 mcuYRem; // 0x17FF
|
u8 mcuYRem; // 0x17FF
|
||||||
u16 mcuYCount; // 0x1800
|
u16 mcuYCount; // 0x1800
|
||||||
u16 mcuXCount2; // 0x1802
|
u16 mcuXCount2; // 0x1802
|
||||||
u32 mcuTotal; // 0x1804
|
u32 unk_0x1804;
|
||||||
u8 remX; // 0x1808
|
u8 unk_0x1808;
|
||||||
u8 remY; // 0x1809
|
u8 unk_0x1809;
|
||||||
u8 compCount; // 0x180A
|
u8 compCount; // 0x180A
|
||||||
u8 scanCompCount; // 0x180B
|
u8 scanCompCount; // 0x180B
|
||||||
u8 blockCount[4]; // 0x180C
|
u8 blockCount[4]; // 0x180C
|
||||||
|
|||||||
@@ -10,12 +10,14 @@ static TMCHuffmanEntry readHuffmanEntry(const TMCHuffmanEntry* entries, u32 inde
|
|||||||
return entries[index];
|
return entries[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
static void readHuffmanLimit(const TMCHuffmanEntry* entries, TMCHuffmanEntry* limit) {
|
static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
|
||||||
limit->bitLength = entries->bitLength;
|
TMCHuffmanEntry limit;
|
||||||
limit->symbol = entries->symbol;
|
limit.bitLength = entries->bitLength;
|
||||||
|
limit.symbol = entries->symbol;
|
||||||
|
return limit;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||||
u32 bitData;
|
u32 bitData;
|
||||||
u32 code;
|
u32 code;
|
||||||
u32 length;
|
u32 length;
|
||||||
@@ -49,21 +51,17 @@ static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table,
|
|||||||
code |= (bitData >> bitCount) & 1;
|
code |= (bitData >> bitCount) & 1;
|
||||||
read_entry:
|
read_entry:
|
||||||
{
|
{
|
||||||
readHuffmanLimit(entry, limit);
|
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||||
*decoded = *limit;
|
if (code > (u32)decoded.bitLength) {
|
||||||
if (code > (u32)decoded->bitLength) {
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
{
|
code = code - entry->bitLength + entry->symbol;
|
||||||
u32 relativeCode = code - entry->bitLength;
|
return symbols[code & 0xFF];
|
||||||
u32 symbolIndex = relativeCode + entry->symbol;
|
|
||||||
return symbols[symbolIndex & 0xFF];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||||
u32 bitData;
|
u32 bitData;
|
||||||
u32 code;
|
u32 code;
|
||||||
u32 length;
|
u32 length;
|
||||||
@@ -96,41 +94,33 @@ static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, co
|
|||||||
code |= (bitData >> bitCount) & 1;
|
code |= (bitData >> bitCount) & 1;
|
||||||
read_entry:
|
read_entry:
|
||||||
{
|
{
|
||||||
readHuffmanLimit(entry, limit);
|
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||||
*decoded = *limit;
|
if (code > (u32)decoded.bitLength) {
|
||||||
if (code > (u32)decoded->bitLength) {
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
{
|
code = code - entry->bitLength + entry->symbol;
|
||||||
u32 relativeCode = code - entry->bitLength;
|
return symbols[code & 0xFF];
|
||||||
u32 symbolIndex = relativeCode + entry->symbol;
|
|
||||||
return symbols[symbolIndex & 0xFF];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
||||||
TMCHuffmanEntry dcEntry;
|
TMCHuffmanEntry dcEntry;
|
||||||
TMCHuffmanEntry dcDecoded;
|
TMCHuffmanEntry acEntry;
|
||||||
TMCHuffmanEntry dcLimit;
|
|
||||||
TMCHuffmanEntry acDecoded;
|
|
||||||
TMCHuffmanEntry acLimit;
|
|
||||||
u8* huff_sym;
|
|
||||||
const TMCHuffmanEntry* ac_fast;
|
const TMCHuffmanEntry* ac_fast;
|
||||||
s32 idx;
|
u8* huff_sym;
|
||||||
u32* huff_tbl;
|
u32* huff_tbl;
|
||||||
s32 bit_pos;
|
s32 bit_pos;
|
||||||
u32 bit_data;
|
u32 bit_data;
|
||||||
u32 tmp;
|
const TMCHuffmanEntry* dc_fast;
|
||||||
s32 r;
|
s32 r;
|
||||||
s32 blk0;
|
s32 blk0;
|
||||||
TMCHuffmanEntry acEntry;
|
s32 idx;
|
||||||
s32 extra;
|
s32 extra;
|
||||||
s32 t;
|
s32 t;
|
||||||
s32 zz;
|
s32 zz;
|
||||||
s32 q;
|
s32 q;
|
||||||
const TMCHuffmanEntry* dc_fast;
|
u32 tmp;
|
||||||
const u8* zztbl;
|
const u8* zztbl;
|
||||||
|
|
||||||
bit_pos = work->bitCount;
|
bit_pos = work->bitCount;
|
||||||
@@ -145,19 +135,22 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
|||||||
|
|
||||||
bit_pos = work->bitCount;
|
bit_pos = work->bitCount;
|
||||||
bit_data = work->bitBuf;
|
bit_data = work->bitBuf;
|
||||||
|
tmp = bit_pos - 8;
|
||||||
|
tmp = ((bit_data >> tmp) & 0xFF) << 2;
|
||||||
{
|
{
|
||||||
dcEntry = readHuffmanEntry(dc_fast, (bit_data >> (bit_pos - 8)) & 0xFF);
|
dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
|
||||||
r = dcEntry.bitLength;
|
r = dcEntry.bitLength;
|
||||||
extra = dcEntry.symbol;
|
extra = dcEntry.symbol;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r != 0) {
|
if (r != 0) {
|
||||||
work->bitCount = bit_pos - r;
|
bit_pos -= r;
|
||||||
|
work->bitCount = bit_pos;
|
||||||
r = extra;
|
r = extra;
|
||||||
} else {
|
} else {
|
||||||
huff_sym = work->pDCHuffSym;
|
huff_sym = work->pDCHuffSym;
|
||||||
huff_tbl = work->pDCHuffTbl;
|
huff_tbl = work->pDCHuffTbl;
|
||||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &dcLimit, &dcDecoded);
|
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -217,7 +210,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
|||||||
r = acEntry.symbol;
|
r = acEntry.symbol;
|
||||||
} else {
|
} else {
|
||||||
bit_pos = work->bitCount;
|
bit_pos = work->bitCount;
|
||||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &acLimit, &acDecoded);
|
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include <tmc_jpeg_internal.h>
|
#include <tmc_jpeg_internal.h>
|
||||||
|
|
||||||
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work);
|
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work);
|
||||||
static s32 refillJpegBuffer(TMCCJPEGDecWork* work);
|
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work);
|
||||||
|
|
||||||
s32 TMCJPEGDEC_init_ptr_buff(TMCCJPEGDecWork* work, void* param) {
|
s32 TMCJPEGDEC_init_ptr_buff(TMCCJPEGDecWork* work, void* param) {
|
||||||
u32 readSize;
|
u32 readSize;
|
||||||
@@ -52,7 +52,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
|
|||||||
|
|
||||||
if (work->pBufCur >= work->pBufEnd) {
|
if (work->pBufCur >= work->pBufEnd) {
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
s32 r = refillJpegBuffer(work);
|
s32 r = TMCJPEG_814EB108(work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -69,7 +69,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
|
|||||||
|
|
||||||
if (cur >= work->pBufEnd) {
|
if (cur >= work->pBufEnd) {
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
s32 r = refillJpegBuffer(work);
|
s32 r = TMCJPEG_814EB108(work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -92,7 +92,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
|
|||||||
|
|
||||||
if (work->pBufCur >= work->pBufEnd) {
|
if (work->pBufCur >= work->pBufEnd) {
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
goto br;
|
goto br;
|
||||||
} else {
|
} else {
|
||||||
@@ -119,7 +119,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r >= 0) {
|
if (r >= 0) {
|
||||||
goto o1;
|
goto o1;
|
||||||
}
|
}
|
||||||
@@ -144,7 +144,7 @@ p2:
|
|||||||
goto r2;
|
goto r2;
|
||||||
}
|
}
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
goto ez;
|
goto ez;
|
||||||
else {
|
else {
|
||||||
@@ -166,7 +166,7 @@ r2:
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
goto ez;
|
goto ez;
|
||||||
else {
|
else {
|
||||||
@@ -193,7 +193,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
|
|||||||
for (i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
if (work->pBufCur >= work->pBufEnd) {
|
if (work->pBufCur >= work->pBufEnd) {
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
goto copy_byte;
|
goto copy_byte;
|
||||||
} else {
|
} else {
|
||||||
@@ -214,7 +214,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
|
|||||||
goto r0;
|
goto r0;
|
||||||
}
|
}
|
||||||
if (work->remaining != 0) {
|
if (work->remaining != 0) {
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r >= 0) {
|
if (r >= 0) {
|
||||||
goto r0;
|
goto r0;
|
||||||
}
|
}
|
||||||
@@ -251,7 +251,7 @@ lp:
|
|||||||
if (work->remaining == 0) {
|
if (work->remaining == 0) {
|
||||||
goto er1;
|
goto er1;
|
||||||
}
|
}
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r >= 0) {
|
if (r >= 0) {
|
||||||
goto lc;
|
goto lc;
|
||||||
}
|
}
|
||||||
@@ -271,7 +271,7 @@ lc:
|
|||||||
if (work->remaining == 0) {
|
if (work->remaining == 0) {
|
||||||
goto er2;
|
goto er2;
|
||||||
}
|
}
|
||||||
r = refillJpegBuffer(work);
|
r = TMCJPEG_814EB108(work);
|
||||||
if (r >= 0) {
|
if (r >= 0) {
|
||||||
goto ret0;
|
goto ret0;
|
||||||
}
|
}
|
||||||
@@ -320,7 +320,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
|
|||||||
if (work->remaining == 0) {
|
if (work->remaining == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
r = refillJpegBufferAfterFF(work);
|
r = TMCJPEG_814EAF50(work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -345,7 +345,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
|
|||||||
if (work->remaining == 0) {
|
if (work->remaining == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
r = refillJpegBufferAfterFF(work);
|
r = TMCJPEG_814EAF50(work);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -364,7 +364,7 @@ s32 TMCJPEGDEC_chk_possible_size(TMCCJPEGDecWork* work) {
|
|||||||
return work->pBufEnd - work->pBufCur;
|
return work->pBufEnd - work->pBufCur;
|
||||||
}
|
}
|
||||||
|
|
||||||
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
|
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
|
||||||
u8 marker;
|
u8 marker;
|
||||||
u32 readSize;
|
u32 readSize;
|
||||||
u8* dest;
|
u8* dest;
|
||||||
@@ -410,7 +410,7 @@ static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static s32 refillJpegBuffer(TMCCJPEGDecWork* work) {
|
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work) {
|
||||||
u8* end;
|
u8* end;
|
||||||
u32 i, j;
|
u32 i, j;
|
||||||
s32 readSize;
|
s32 readSize;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ static u16 readU16(const u8* p, u16 byteOrder) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static u16 readExifU16(const u8* data, u16 byteOrder) {
|
static u16 readExifU16(const u8* data, u16 byteOrder) {
|
||||||
u16 value = data[0] | data[1] << 8;
|
u32 value = data[0] | data[1] << 8;
|
||||||
if (byteOrder == 0x4949) {
|
if (byteOrder == 0x4949) {
|
||||||
return (u16)value;
|
return (u16)value;
|
||||||
}
|
}
|
||||||
@@ -246,9 +246,9 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
|||||||
u32 ifdOffset;
|
u32 ifdOffset;
|
||||||
const u8* entries;
|
const u8* entries;
|
||||||
u16 remaining;
|
u16 remaining;
|
||||||
u16 index;
|
|
||||||
s32 entriesSize;
|
|
||||||
u16 count;
|
u16 count;
|
||||||
|
s32 entriesSize;
|
||||||
|
u16 index;
|
||||||
pInfo->thumbnailData = (u8*)data;
|
pInfo->thumbnailData = (u8*)data;
|
||||||
pInfo->dataEnd = (u8*)data + size;
|
pInfo->dataEnd = (u8*)data + size;
|
||||||
pInfo->nextIfdOffset = 0;
|
pInfo->nextIfdOffset = 0;
|
||||||
@@ -339,7 +339,7 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
|
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
|
||||||
s32 tag;
|
u16 tag;
|
||||||
u16 type;
|
u16 type;
|
||||||
|
|
||||||
tag = readU16(entry, byteOrder);
|
tag = readU16(entry, byteOrder);
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
state->componentCount = work->componentCount;
|
state->componentCount = work->componentCount;
|
||||||
state->result = work->mcuTotal;
|
state->result = work->unk_0x1804;
|
||||||
state->maxX = work->mcuYCount;
|
state->maxX = work->mcuYCount;
|
||||||
state->maxY = work->mcuXCount2;
|
state->maxY = work->mcuXCount2;
|
||||||
|
|
||||||
@@ -59,8 +59,8 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
|||||||
state->stepY = (state->scaleFactor + work->mcuXRem - 1) / state->scaleFactor;
|
state->stepY = (state->scaleFactor + work->mcuXRem - 1) / state->scaleFactor;
|
||||||
state->jpegWidth = ((s32)(work->frameWidth + state->scaleFactor) - 1) / state->scaleFactor;
|
state->jpegWidth = ((s32)(work->frameWidth + state->scaleFactor) - 1) / state->scaleFactor;
|
||||||
state->jpegHeight = (state->scaleFactor + work->frameHeight - 1) / state->scaleFactor;
|
state->jpegHeight = (state->scaleFactor + work->frameHeight - 1) / state->scaleFactor;
|
||||||
state->stepXExt = (state->scaleFactor + work->remX - 1) / state->scaleFactor;
|
state->stepXExt = (state->scaleFactor + work->unk_0x1808 - 1) / state->scaleFactor;
|
||||||
state->stepYExt = (state->scaleFactor + work->remY - 1) / state->scaleFactor;
|
state->stepYExt = (state->scaleFactor + work->unk_0x1809 - 1) / state->scaleFactor;
|
||||||
|
|
||||||
state->dataSizeX = (state->stepXExt != 0) ? (state->maxX - 1) * state->stepX : (state->maxX + 1) * state->stepX;
|
state->dataSizeX = (state->stepXExt != 0) ? (state->maxX - 1) * state->stepX : (state->maxX + 1) * state->stepX;
|
||||||
state->dataSizeY = (state->stepYExt != 0) ? (state->maxY - 1) * state->stepY : (state->maxY + 1) * state->stepY;
|
state->dataSizeY = (state->stepYExt != 0) ? (state->maxY - 1) * state->stepY : (state->maxY + 1) * state->stepY;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
extern void* memset(void* dest, s32 val, u32 count);
|
extern void* memset(void* dest, s32 val, u32 count);
|
||||||
|
|
||||||
extern const u32 scJpegAanScale[64] = {
|
extern const u32 lbl_8161E080[64] = {
|
||||||
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
||||||
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
||||||
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
||||||
@@ -562,12 +562,12 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
|||||||
remX = p->frameWidth % p->mcuXCount;
|
remX = p->frameWidth % p->mcuXCount;
|
||||||
remY = p->frameHeight % p->mcuXRem;
|
remY = p->frameHeight % p->mcuXRem;
|
||||||
|
|
||||||
p->remX = remX;
|
p->unk_0x18 = remX;
|
||||||
p->remY = remY;
|
p->unk_0x19 = remY;
|
||||||
|
|
||||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||||
p->mcuTotal = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
p->unk_0x14 = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||||
|
|
||||||
for (idx = 0; idx < (s32)p->scanCompCount; idx++) {
|
for (idx = 0; idx < (s32)p->scanCompCount; idx++) {
|
||||||
u8 compId;
|
u8 compId;
|
||||||
@@ -1424,7 +1424,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
|||||||
s32 r;
|
s32 r;
|
||||||
|
|
||||||
d = tblCopy;
|
d = tblCopy;
|
||||||
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
|
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
|
||||||
|
|
||||||
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
||||||
|
|
||||||
@@ -1919,8 +1919,8 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
|||||||
remX = fw - mcuCountX * mcuX;
|
remX = fw - mcuCountX * mcuX;
|
||||||
remY = fh - mcuCountY * mcuY;
|
remY = fh - mcuCountY * mcuY;
|
||||||
|
|
||||||
work->remX = remX;
|
work->unk_0x1808 = remX;
|
||||||
work->remY = remY;
|
work->unk_0x1809 = remY;
|
||||||
|
|
||||||
{
|
{
|
||||||
u16 xr = (remX != 0) ? 1 : 0;
|
u16 xr = (remX != 0) ? 1 : 0;
|
||||||
@@ -1929,7 +1929,7 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
|||||||
mcuCountY += yr;
|
mcuCountY += yr;
|
||||||
frameInfo->mcuYCount = mcuCountX;
|
frameInfo->mcuYCount = mcuCountX;
|
||||||
frameInfo->mcuXCount2 = mcuCountY;
|
frameInfo->mcuXCount2 = mcuCountY;
|
||||||
work->mcuTotal = (u32)mcuCountX * (u32)mcuCountY;
|
work->unk_0x1804 = (u32)mcuCountX * (u32)mcuCountY;
|
||||||
}
|
}
|
||||||
|
|
||||||
compCount2 = frameInfo->compCount;
|
compCount2 = frameInfo->compCount;
|
||||||
|
|||||||
@@ -15,13 +15,9 @@ static s8 clampS8(s32 v) {
|
|||||||
|
|
||||||
void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
|
void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
|
||||||
s32 bd;
|
s32 bd;
|
||||||
|
s32 d;
|
||||||
s32 c;
|
s32 c;
|
||||||
s32 a;
|
s32 a;
|
||||||
s32 cd;
|
|
||||||
s32 oddrot;
|
|
||||||
s32 evsum;
|
|
||||||
s32 rot;
|
|
||||||
s32 d;
|
|
||||||
s32 b;
|
s32 b;
|
||||||
|
|
||||||
s32* sp;
|
s32* sp;
|
||||||
@@ -30,41 +26,57 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
|
|||||||
s32 tmp[64];
|
s32 tmp[64];
|
||||||
s32 i;
|
s32 i;
|
||||||
|
|
||||||
|
s32 evsum, rot, oddrot, cd;
|
||||||
|
|
||||||
sp = block + 24;
|
sp = block + 24;
|
||||||
dp = tmp + 24;
|
dp = tmp + 24;
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
s32 a, b, c, d;
|
a = sp[0]; // 0x0
|
||||||
s32 odddiff, bd, evsum, cd, rot, oddrot;
|
b = sp[1]; // 0x4
|
||||||
a = sp[0];
|
c = sp[2]; // 0x8
|
||||||
b = sp[1];
|
d = sp[3]; // 0xc
|
||||||
c = sp[2];
|
|
||||||
d = sp[3];
|
|
||||||
odddiff = b - d;
|
|
||||||
bd = b + d;
|
bd = b + d;
|
||||||
evsum = a + c;
|
evsum = a + c;
|
||||||
cd = a - c;
|
|
||||||
rot = (odddiff * 0xB5) >> 8;
|
oddrot = (0xB5 * (sp[1] - sp[3]) >> 8) + bd;
|
||||||
oddrot = rot + bd;
|
rot = (0xB5 * (sp[1] - sp[3])) >> 8;
|
||||||
dp[0] = evsum + oddrot;
|
|
||||||
dp[1] = cd + rot;
|
dp[1] = (a - c) + rot;
|
||||||
dp[2] = cd - rot;
|
dp[2] = (a - c) - rot;
|
||||||
dp[3] = evsum - oddrot;
|
dp[3] = evsum - oddrot;
|
||||||
sp -= 8;
|
dp[0] = evsum + oddrot;
|
||||||
dp -= 8;
|
|
||||||
|
b = sp[-7]; // -0x1c
|
||||||
|
d = sp[-5]; // -0x14
|
||||||
|
|
||||||
|
bd = b + d;
|
||||||
|
rot = ((b - d) * 0xB5) >> 8;
|
||||||
|
oddrot = rot + bd;
|
||||||
|
|
||||||
|
a = sp[-8]; // -0x20
|
||||||
|
c = sp[-6]; // -0x18
|
||||||
|
|
||||||
|
dp[-8] = (a + c) + oddrot;
|
||||||
|
dp[-7] = (a - c) + rot;
|
||||||
|
dp[-6] = (a - c) - rot;
|
||||||
|
dp[-5] = (a + c) - oddrot;
|
||||||
|
|
||||||
|
sp -= 16;
|
||||||
|
dp -= 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
u32 idx = 3;
|
u32 idx = 3;
|
||||||
|
sp = tmp + 3;
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 4; i++) {
|
||||||
u8* bp = conv_row_ptr + idx;
|
u8* bp = conv_row_ptr + idx;
|
||||||
|
|
||||||
a = tmp[idx] + 0x40000;
|
a = sp[0] + 0x40000;
|
||||||
b = tmp[idx + 8];
|
b = sp[8];
|
||||||
d = tmp[idx + 24];
|
d = sp[24];
|
||||||
c = tmp[idx + 16];
|
c = sp[16];
|
||||||
|
|
||||||
evsum = a + c;
|
evsum = a + c;
|
||||||
cd = a - c;
|
cd = a - c;
|
||||||
@@ -78,6 +90,7 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
|
|||||||
bp[pitch * 2] = clampU8((cd - rot) >> 11);
|
bp[pitch * 2] = clampU8((cd - rot) >> 11);
|
||||||
bp[pitch * 4 - pitch] = clampU8((evsum - oddrot) >> 11);
|
bp[pitch * 4 - pitch] = clampU8((evsum - oddrot) >> 11);
|
||||||
|
|
||||||
|
sp--;
|
||||||
idx -= 1;
|
idx -= 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -118,37 +131,38 @@ void TMCJPEGDEC_IdctBlock4x4_Col(s32* sp, u8* conv_row_ptr, u16 pitch, s32 zigza
|
|||||||
s32 a, b, c, d;
|
s32 a, b, c, d;
|
||||||
s32 evsum, evdiff, oddsum, odddiff, rot, oddrot;
|
s32 evsum, evdiff, oddsum, odddiff, rot, oddrot;
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
a = src[0];
|
s32 a0 = src[0], b0 = src[1], c0 = src[2], d0 = src[3];
|
||||||
b = src[1];
|
s32 a1 = src[-8], b1 = src[-7], c1 = src[-6], d1 = src[-5];
|
||||||
c = src[2];
|
|
||||||
d = src[3];
|
s32 odddiff0 = b0 - d0;
|
||||||
odddiff = b - d;
|
s32 oddsum0 = b0 + d0;
|
||||||
oddsum = b + d;
|
s32 evsum0 = a0 + c0;
|
||||||
evsum = a + c;
|
s32 evdiff0 = a0 - c0;
|
||||||
evdiff = a - c;
|
s32 rot0 = (odddiff0 * 0xB5) >> 8;
|
||||||
rot = (odddiff * 0xB5) >> 8;
|
|
||||||
oddrot = rot + oddsum;
|
s32 odddiff1 = b1 - d1;
|
||||||
dst[0] = evsum + oddrot;
|
s32 oddsum1 = b1 + d1;
|
||||||
dst[1] = evdiff + rot;
|
s32 evsum1 = a1 + c1;
|
||||||
dst[2] = evdiff - rot;
|
s32 evdiff1 = a1 - c1;
|
||||||
dst[3] = evsum - oddrot;
|
s32 rot1 = (odddiff1 * 0xB5) >> 8;
|
||||||
src -= 8;
|
|
||||||
dst -= 8;
|
dst[0] = evsum0 + (oddsum0 + rot0);
|
||||||
|
dst[1] = evdiff0 + rot0;
|
||||||
|
dst[2] = evdiff0 - rot0;
|
||||||
|
dst[3] = evsum0 - (oddsum0 + rot0);
|
||||||
|
|
||||||
|
dst[-8] = evsum1 + (oddsum1 + rot1);
|
||||||
|
dst[-7] = evdiff1 + rot1;
|
||||||
|
dst[-6] = evdiff1 - rot1;
|
||||||
|
dst[-5] = evsum1 - (oddsum1 + rot1);
|
||||||
|
|
||||||
|
src -= 16;
|
||||||
|
dst -= 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
src = tmp + 3;
|
src = tmp + 3;
|
||||||
for (i = 3; i >= 0; i--) {
|
for (i = 3; i >= 0; i--) {
|
||||||
s32 evdiff;
|
|
||||||
s32 a;
|
|
||||||
s32 c;
|
|
||||||
s32 b;
|
|
||||||
s32 evsum;
|
|
||||||
s32 d;
|
|
||||||
s32 oddsum;
|
|
||||||
s32 odddiff;
|
|
||||||
s32 rot;
|
|
||||||
s32 oddrot;
|
|
||||||
u8* out = conv_row_ptr + i;
|
u8* out = conv_row_ptr + i;
|
||||||
a = src[0];
|
a = src[0];
|
||||||
b = src[8];
|
b = src[8];
|
||||||
@@ -156,7 +170,7 @@ void TMCJPEGDEC_IdctBlock4x4_Col(s32* sp, u8* conv_row_ptr, u16 pitch, s32 zigza
|
|||||||
d = src[24];
|
d = src[24];
|
||||||
|
|
||||||
odddiff = b - d;
|
odddiff = b - d;
|
||||||
oddsum = d + b;
|
oddsum = b + d;
|
||||||
evsum = a + c;
|
evsum = a + c;
|
||||||
evdiff = a - c;
|
evdiff = a - c;
|
||||||
rot = odddiff * 0xB5 >> 8;
|
rot = odddiff * 0xB5 >> 8;
|
||||||
|
|||||||
@@ -166,23 +166,23 @@ s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
s32 red;
|
s8 crValue;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
u8* texture;
|
u8* texture;
|
||||||
s32 height;
|
s32 height;
|
||||||
s32 column;
|
s32 yEnd;
|
||||||
s32 xEnd;
|
s32 xEnd;
|
||||||
s32 green;
|
s32 green;
|
||||||
s32 yEnd;
|
s32 column;
|
||||||
s32 tileWidth;
|
s32 tileWidth;
|
||||||
s32 blueOffset;
|
s32 blueOffset;
|
||||||
u16* output;
|
u16* output;
|
||||||
s32 tileRow;
|
s32 tileRow;
|
||||||
s32 lumaSkip;
|
s32 lumaSkip;
|
||||||
s8 crValue;
|
s32 red;
|
||||||
s32 chromaSkip;
|
s32 chromaSkip;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 cbValue;
|
s32 cbValue;
|
||||||
@@ -216,7 +216,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
cbValue = (s8)*cb++;
|
cbValue = (s8)*cb++;
|
||||||
crValue = (s8)*cr++;
|
crValue = (s8)*cr++;
|
||||||
redOffset = (crValue * 359) >> 8;
|
redOffset = (crValue * 359) >> 8;
|
||||||
greenOffset = -(crValue * 183 + cbValue * 88) >> 8;
|
greenOffset = -(cbValue * 88 + crValue * 183) >> 8;
|
||||||
blueOffset = (cbValue * 454) >> 8;
|
blueOffset = (cbValue * 454) >> 8;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -224,7 +224,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | green | red) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -238,7 +238,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | green | red) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -252,7 +252,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | green | red) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -266,7 +266,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | green | red) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -285,20 +285,20 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
s32 chromaSkip;
|
s32 column;
|
||||||
s32 tileRow;
|
|
||||||
s32 xEnd;
|
|
||||||
u8* texture;
|
|
||||||
TMCCJPEGDecState* state;
|
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
|
u8* cr;
|
||||||
|
TMCCJPEGDecState* state;
|
||||||
|
s32 tileWidth;
|
||||||
|
u8* texture;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 height;
|
s32 height;
|
||||||
u8* cr;
|
s32 xEnd;
|
||||||
s32 column;
|
|
||||||
s32 lumaSkip;
|
|
||||||
s32 yEnd;
|
s32 yEnd;
|
||||||
s32 tileWidth;
|
s32 lumaSkip;
|
||||||
|
s32 chromaSkip;
|
||||||
|
s32 tileRow;
|
||||||
u16* output;
|
u16* output;
|
||||||
s32 cbValue;
|
s32 cbValue;
|
||||||
s8 crValue;
|
s8 crValue;
|
||||||
@@ -345,7 +345,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
red = blue + redOffset;
|
red = blue + redOffset;
|
||||||
green = blue + greenOffset;
|
green = blue + greenOffset;
|
||||||
blue = blue + blueOffset;
|
blue = blue + blueOffset;
|
||||||
if ((green | red | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -366,11 +366,11 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
|
|
||||||
static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
s32 chromaSkip;
|
s32 chromaSkip;
|
||||||
s32 lumaSkip;
|
s32 blue;
|
||||||
s32 cbValue;
|
s32 cbValue;
|
||||||
s32 tileWidth;
|
s32 tileWidth;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
u16* output;
|
s32 xEnd;
|
||||||
u8* texture;
|
u8* texture;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 height;
|
s32 height;
|
||||||
@@ -379,7 +379,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
s32 red;
|
s32 red;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
s32 column;
|
s32 column;
|
||||||
s32 xEnd;
|
u16* output;
|
||||||
s32 yEnd;
|
s32 yEnd;
|
||||||
s32 redOffset;
|
s32 redOffset;
|
||||||
s32 tileRow;
|
s32 tileRow;
|
||||||
@@ -387,7 +387,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
s32 blueOffset;
|
s32 blueOffset;
|
||||||
s32 value;
|
s32 value;
|
||||||
s32 green;
|
s32 green;
|
||||||
s32 blue;
|
s32 lumaSkip;
|
||||||
s32 crValue;
|
s32 crValue;
|
||||||
|
|
||||||
luminance = work->convBuf + 4;
|
luminance = work->convBuf + 4;
|
||||||
@@ -415,7 +415,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -426,7 +426,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -441,21 +441,21 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
s32 blue;
|
s32 column;
|
||||||
u16* output;
|
u8* luminance;
|
||||||
s32 xEnd;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
s32 tileWidth;
|
s32 tileWidth;
|
||||||
u8* luminance;
|
u8* texture;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 height;
|
s32 height;
|
||||||
u8* cb;
|
s32 xEnd;
|
||||||
u8* texture;
|
|
||||||
s32 column;
|
|
||||||
s32 chromaSkip;
|
|
||||||
s32 yEnd;
|
s32 yEnd;
|
||||||
|
s32 lumaSkip;
|
||||||
|
s32 chromaSkip;
|
||||||
s32 tileRow;
|
s32 tileRow;
|
||||||
|
u16* output;
|
||||||
s32 cbValue;
|
s32 cbValue;
|
||||||
s32 crValue;
|
s32 crValue;
|
||||||
s32 redOffset;
|
s32 redOffset;
|
||||||
@@ -463,7 +463,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
s32 blueOffset;
|
s32 blueOffset;
|
||||||
s32 value;
|
s32 value;
|
||||||
s32 red;
|
s32 red;
|
||||||
s32 lumaSkip;
|
s32 blue;
|
||||||
s32 green;
|
s32 green;
|
||||||
|
|
||||||
luminance = work->convBuf + 4;
|
luminance = work->convBuf + 4;
|
||||||
@@ -502,7 +502,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -517,19 +517,19 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
s32 tileRow;
|
s32 blue;
|
||||||
s8 crValue;
|
s8 crValue;
|
||||||
s32 chromaSkip;
|
s32 chromaSkip;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
u8* texture;
|
s32 xEnd;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 height;
|
s32 height;
|
||||||
s32 green;
|
s32 blueOffset;
|
||||||
s32 blue;
|
u8* texture;
|
||||||
s32 lumaSkip;
|
s32 lumaSkip;
|
||||||
s32 yEnd;
|
s32 yEnd;
|
||||||
s32 xEnd;
|
s32 tileRow;
|
||||||
s32 value;
|
s32 value;
|
||||||
s32 column;
|
s32 column;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
@@ -538,7 +538,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
s32 redOffset;
|
s32 redOffset;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
u16* output;
|
u16* output;
|
||||||
s32 blueOffset;
|
s32 green;
|
||||||
s32 red;
|
s32 red;
|
||||||
s32 cbValue;
|
s32 cbValue;
|
||||||
|
|
||||||
@@ -578,7 +578,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | green | red) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -593,7 +593,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | green | red) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -620,11 +620,11 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
u8* luminance = work->convBuf + 4;
|
u8* luminance = work->convBuf + 4;
|
||||||
u8* cb = work->convBuf + 260;
|
u8* cb = work->convBuf + 260;
|
||||||
s32 width;
|
u8* cr = work->convBuf + 324;
|
||||||
TMCCJPEGDecState* state = work->pState;
|
TMCCJPEGDecState* state = work->pState;
|
||||||
s32 tileWidth = (state->convWidth >> 2) << 1;
|
s32 tileWidth = (state->convWidth >> 2) << 1;
|
||||||
u8* texture = state->pTexBuffer;
|
u8* texture = state->pTexBuffer;
|
||||||
u8* cr = work->convBuf + 324;
|
s32 width;
|
||||||
s32 height;
|
s32 height;
|
||||||
if (state->dataSizeX == (u32)x) {
|
if (state->dataSizeX == (u32)x) {
|
||||||
width = state->stepXExt;
|
width = state->stepXExt;
|
||||||
@@ -660,7 +660,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
s32 green = value + greenOffset;
|
s32 green = value + greenOffset;
|
||||||
s32 red = value + redOffset;
|
s32 red = value + redOffset;
|
||||||
s32 blue = value + blueOffset;
|
s32 blue = value + blueOffset;
|
||||||
if ((green | red | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -686,7 +686,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
|
|
||||||
static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
u16* output;
|
u16* output;
|
||||||
s32 tileRow;
|
s32 column;
|
||||||
s32 redOffset;
|
s32 redOffset;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
s32 lumaSkip;
|
s32 lumaSkip;
|
||||||
@@ -695,7 +695,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
u8* cb;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
s32 height;
|
s32 height;
|
||||||
s32 column;
|
s32 tileRow;
|
||||||
s32 chromaSkip;
|
s32 chromaSkip;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 xEnd;
|
s32 xEnd;
|
||||||
@@ -742,7 +742,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -770,7 +770,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
u16* output;
|
u16* output;
|
||||||
s32 lumaSkip;
|
s32 lumaSkip;
|
||||||
s32 blue;
|
s32 blue;
|
||||||
u8* texture;
|
s32 tileRow;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
@@ -783,7 +783,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
s32 greenOffset;
|
s32 greenOffset;
|
||||||
s32 yEnd;
|
s32 yEnd;
|
||||||
s32 cbValue;
|
s32 cbValue;
|
||||||
s32 tileRow;
|
u8* texture;
|
||||||
s32 blueOffset;
|
s32 blueOffset;
|
||||||
s32 red;
|
s32 red;
|
||||||
s8 crValue;
|
s8 crValue;
|
||||||
@@ -831,7 +831,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
green = value + greenOffset;
|
green = value + greenOffset;
|
||||||
red = value + redOffset;
|
red = value + redOffset;
|
||||||
blue = value + blueOffset;
|
blue = value + blueOffset;
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
@@ -856,20 +856,20 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
|||||||
|
|
||||||
static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
u16* output;
|
u16* output;
|
||||||
|
s32 tileWidth;
|
||||||
s32 tileRow;
|
s32 tileRow;
|
||||||
s32 rowSkip;
|
s32 xEnd;
|
||||||
u8* texture;
|
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
s32 crValue;
|
s8 crValue;
|
||||||
s32 height;
|
s32 height;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 column;
|
s32 column;
|
||||||
s32 xEnd;
|
s32 rowSkip;
|
||||||
s32 yEnd;
|
s32 yEnd;
|
||||||
s32 tileWidth;
|
u8* texture;
|
||||||
s32 row;
|
s32 row;
|
||||||
s32 red;
|
s32 red;
|
||||||
s32 cbValue;
|
s32 cbValue;
|
||||||
@@ -899,7 +899,7 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
|||||||
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||||
red = value + ((crValue * 359) >> 8);
|
red = value + ((crValue * 359) >> 8);
|
||||||
blue = value + ((cbValue * 454) >> 8);
|
blue = value + ((cbValue * 454) >> 8);
|
||||||
if ((red | green | blue) >> 8) {
|
if ((blue | red | green) >> 8) {
|
||||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||||
|
|||||||
@@ -171,7 +171,9 @@ s32 TMCJPEGDEC_set_converterY8U8V8(TMCCJPEGDecWork* work) {
|
|||||||
static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
s32 rowSkip;
|
s32 rowSkip;
|
||||||
u8* output;
|
u8* output;
|
||||||
|
s32 chromaXEnd;
|
||||||
u32 tileRow;
|
u32 tileRow;
|
||||||
|
u32 chromaTileWidth;
|
||||||
s32 chromaYEnd;
|
s32 chromaYEnd;
|
||||||
u8* lumaTexture;
|
u8* lumaTexture;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
@@ -214,17 +216,17 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
}
|
}
|
||||||
luminance += rowSkip;
|
luminance += rowSkip;
|
||||||
}
|
}
|
||||||
tileWidth = state->chromaWidth >> 3;
|
chromaTileWidth = state->chromaWidth >> 3;
|
||||||
x = (u32)x >> 2;
|
x = (u32)x >> 2;
|
||||||
width = 8 / state->scaleFactor;
|
width = 8 / state->scaleFactor;
|
||||||
height = 8 / state->scaleFactor;
|
height = 8 / state->scaleFactor;
|
||||||
xEnd = x + width;
|
chromaXEnd = x + width;
|
||||||
chromaYEnd = y + height;
|
chromaYEnd = y + height;
|
||||||
for (; y < chromaYEnd; y++) {
|
for (; y < chromaYEnd; y++) {
|
||||||
for (column = x; column < xEnd; column += 1) {
|
for (column = x; column < chromaXEnd; column += 1) {
|
||||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||||
cb++;
|
cb++;
|
||||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||||
cr++;
|
cr++;
|
||||||
}
|
}
|
||||||
cb += 8 - width;
|
cb += 8 - width;
|
||||||
@@ -233,6 +235,7 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
|
u32 chromaTileWidth;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
u8* lumaTexture;
|
u8* lumaTexture;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
@@ -247,9 +250,9 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
u8* output;
|
u8* output;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
s32 width;
|
|
||||||
s32 tileOffset;
|
|
||||||
s32 xEnd;
|
s32 xEnd;
|
||||||
|
s32 tileOffset;
|
||||||
|
s32 width;
|
||||||
u32 tileWidth;
|
u32 tileWidth;
|
||||||
|
|
||||||
luminance = work->convBuf + 4;
|
luminance = work->convBuf + 4;
|
||||||
@@ -284,13 +287,13 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
x = (u32)x >> 2;
|
x = (u32)x >> 2;
|
||||||
width = (width + 3) >> 2;
|
width = (width + 3) >> 2;
|
||||||
xEnd = x + width;
|
xEnd = x + width;
|
||||||
tileWidth = state->chromaWidth >> 3;
|
chromaTileWidth = state->chromaWidth >> 3;
|
||||||
chromaEnd = y + height;
|
chromaEnd = y + height;
|
||||||
for (; y < chromaEnd; y++) {
|
for (; y < chromaEnd; y++) {
|
||||||
for (column = x; column < xEnd; column += 1) {
|
for (column = x; column < xEnd; column += 1) {
|
||||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||||
cb++;
|
cb++;
|
||||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||||
cr++;
|
cr++;
|
||||||
}
|
}
|
||||||
cb += 8 - width;
|
cb += 8 - width;
|
||||||
@@ -303,7 +306,9 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
u8* lumaTexture;
|
u8* lumaTexture;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
s32 column;
|
s32 column;
|
||||||
|
s32 chromaXEnd;
|
||||||
s32 row;
|
s32 row;
|
||||||
|
u32 chromaTileWidth;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
s32 width;
|
s32 width;
|
||||||
s32 height;
|
s32 height;
|
||||||
@@ -314,6 +319,7 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
u8* cb;
|
u8* cb;
|
||||||
u32 tileWidth;
|
u32 tileWidth;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
|
s32 chromaRowSkip;
|
||||||
|
|
||||||
row = y;
|
row = y;
|
||||||
luminance = work->convBuf + 4;
|
luminance = work->convBuf + 4;
|
||||||
@@ -338,22 +344,24 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
x = (u32)x >> 1;
|
x = (u32)x >> 1;
|
||||||
width = 8 / state->scaleFactor;
|
width = 8 / state->scaleFactor;
|
||||||
height = 8 / state->scaleFactor;
|
height = 8 / state->scaleFactor;
|
||||||
xEnd = x + width;
|
chromaXEnd = x + width;
|
||||||
chromaYEnd = y + height;
|
chromaYEnd = y + height;
|
||||||
tileWidth = state->chromaWidth >> 3;
|
chromaTileWidth = state->chromaWidth >> 3;
|
||||||
for (row = y; row < chromaYEnd; row++) {
|
chromaRowSkip = 8 - width;
|
||||||
for (column = x; column < xEnd; column += 1) {
|
for (; y < chromaYEnd; y++) {
|
||||||
(cbTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cb + 128;
|
for (column = x; column < chromaXEnd; column += 1) {
|
||||||
|
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||||
cb++;
|
cb++;
|
||||||
(crTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cr + 128;
|
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||||
cr++;
|
cr++;
|
||||||
}
|
}
|
||||||
cb += 8 - width;
|
cb += chromaRowSkip;
|
||||||
cr += 8 - width;
|
cr += 8 - width;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
|
u32 chromaTileWidth;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
u8* lumaTexture;
|
u8* lumaTexture;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
@@ -368,9 +376,9 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
u8* output;
|
u8* output;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
s32 width;
|
|
||||||
s32 tileOffset;
|
|
||||||
s32 xEnd;
|
s32 xEnd;
|
||||||
|
s32 tileOffset;
|
||||||
|
s32 width;
|
||||||
u32 tileWidth;
|
u32 tileWidth;
|
||||||
|
|
||||||
luminance = work->convBuf + 4;
|
luminance = work->convBuf + 4;
|
||||||
@@ -405,13 +413,13 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
x = (u32)x >> 1;
|
x = (u32)x >> 1;
|
||||||
width = (width + 1) >> 1;
|
width = (width + 1) >> 1;
|
||||||
xEnd = x + width;
|
xEnd = x + width;
|
||||||
tileWidth = state->chromaWidth >> 3;
|
chromaTileWidth = state->chromaWidth >> 3;
|
||||||
chromaEnd = y + height;
|
chromaEnd = y + height;
|
||||||
for (; y < chromaEnd; y++) {
|
for (; y < chromaEnd; y++) {
|
||||||
for (column = x; column < xEnd; column += 1) {
|
for (column = x; column < xEnd; column += 1) {
|
||||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||||
cb++;
|
cb++;
|
||||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||||
cr++;
|
cr++;
|
||||||
}
|
}
|
||||||
cb += 8 - width;
|
cb += 8 - width;
|
||||||
@@ -420,21 +428,23 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
s32 chromaYEnd;
|
|
||||||
u8* lumaTexture;
|
|
||||||
s32 height;
|
s32 height;
|
||||||
u8* luminance;
|
s32 chromaYEnd;
|
||||||
s32 column;
|
s32 column;
|
||||||
|
u8* lumaTexture;
|
||||||
|
s32 chromaXEnd;
|
||||||
|
u8* luminance;
|
||||||
|
u32 chromaTileWidth;
|
||||||
u8* cbTexture;
|
u8* cbTexture;
|
||||||
s32 row;
|
s32 width;
|
||||||
u8* crTexture;
|
u8* crTexture;
|
||||||
s32 xEnd;
|
u32 tileWidth;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
s32 yEnd;
|
s32 yEnd;
|
||||||
s32 width;
|
s32 xEnd;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
u32 tileWidth;
|
s32 row;
|
||||||
|
|
||||||
row = y;
|
row = y;
|
||||||
luminance = work->convBuf + 4;
|
luminance = work->convBuf + 4;
|
||||||
@@ -460,14 +470,14 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
y = (u32)y >> 1;
|
y = (u32)y >> 1;
|
||||||
width = 8 / state->scaleFactor;
|
width = 8 / state->scaleFactor;
|
||||||
height = 8 / state->scaleFactor;
|
height = 8 / state->scaleFactor;
|
||||||
xEnd = x + width;
|
chromaXEnd = x + width;
|
||||||
chromaYEnd = y + height;
|
chromaYEnd = y + height;
|
||||||
tileWidth = state->chromaWidth >> 3;
|
chromaTileWidth = state->chromaWidth >> 3;
|
||||||
for (; y < chromaYEnd; y++) {
|
for (; y < chromaYEnd; y++) {
|
||||||
for (column = x; column < xEnd; column += 1) {
|
for (column = x; column < chromaXEnd; column += 1) {
|
||||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||||
cb++;
|
cb++;
|
||||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||||
cr++;
|
cr++;
|
||||||
}
|
}
|
||||||
cb += 8 - width;
|
cb += 8 - width;
|
||||||
@@ -476,6 +486,7 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
|
u32 chromaTileWidth;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
u8* lumaTexture;
|
u8* lumaTexture;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
@@ -486,13 +497,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
u8* crTexture;
|
u8* crTexture;
|
||||||
u32 tileRow;
|
u32 tileRow;
|
||||||
s32 height;
|
s32 height;
|
||||||
s32 width;
|
s32 yEnd;
|
||||||
u8* output;
|
u8* output;
|
||||||
u8* cb;
|
u8* cb;
|
||||||
u8* cr;
|
u8* cr;
|
||||||
s32 xEnd;
|
s32 xEnd;
|
||||||
s32 tileOffset;
|
s32 tileOffset;
|
||||||
s32 yEnd;
|
s32 width;
|
||||||
u32 tileWidth;
|
u32 tileWidth;
|
||||||
|
|
||||||
luminance = work->convBuf + 4;
|
luminance = work->convBuf + 4;
|
||||||
@@ -528,13 +539,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
x = (u32)x >> 1;
|
x = (u32)x >> 1;
|
||||||
width = (width + 1) >> 1;
|
width = (width + 1) >> 1;
|
||||||
xEnd = x + width;
|
xEnd = x + width;
|
||||||
tileWidth = state->chromaWidth >> 3;
|
chromaTileWidth = state->chromaWidth >> 3;
|
||||||
chromaEnd = y + ((height + 1) >> 1);
|
chromaEnd = y + ((height + 1) >> 1);
|
||||||
for (; y < chromaEnd; y++) {
|
for (; y < chromaEnd; y++) {
|
||||||
for (column = x; column < xEnd; column += 1) {
|
for (column = x; column < xEnd; column += 1) {
|
||||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||||
cb++;
|
cb++;
|
||||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||||
cr++;
|
cr++;
|
||||||
}
|
}
|
||||||
cb += 8 - width;
|
cb += 8 - width;
|
||||||
@@ -543,8 +554,9 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||||
u8* lumaTexture;
|
u32 chromaTileWidth;
|
||||||
TMCCJPEGDecState* state;
|
TMCCJPEGDecState* state;
|
||||||
|
u8* lumaTexture;
|
||||||
u8* luminance;
|
u8* luminance;
|
||||||
s32 column;
|
s32 column;
|
||||||
s32 row;
|
s32 row;
|
||||||
@@ -584,13 +596,13 @@ static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
|||||||
luminance += 8 - width;
|
luminance += 8 - width;
|
||||||
}
|
}
|
||||||
y = (u32)y >> 1;
|
y = (u32)y >> 1;
|
||||||
tileWidth = state->chromaWidth >> 3;
|
chromaTileWidth = state->chromaWidth >> 3;
|
||||||
chromaEnd = y + 8 / state->scaleFactor;
|
chromaEnd = y + 8 / state->scaleFactor;
|
||||||
for (; y < chromaEnd; y++) {
|
for (; y < chromaEnd; y++) {
|
||||||
for (column = x; column < xEnd; column += 1) {
|
for (column = x; column < xEnd; column += 1) {
|
||||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||||
cb++;
|
cb++;
|
||||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||||
cr++;
|
cr++;
|
||||||
}
|
}
|
||||||
cb += 8 - width;
|
cb += 8 - width;
|
||||||
|
|||||||
@@ -205,21 +205,21 @@ typedef struct _ziUwdNode {
|
|||||||
|
|
||||||
struct __zi8_work_data_s {
|
struct __zi8_work_data_s {
|
||||||
ziU8 unk_0x00;
|
ziU8 unk_0x00;
|
||||||
ziU8 countOnly; // 0x01
|
ziU8 unk_0x01;
|
||||||
ziU8 unk_0x02[2];
|
ziU8 unk_0x02[2];
|
||||||
ziLanguageEntry* langEntries; // 0x04
|
ziLanguageEntry* langEntries; // 0x04
|
||||||
ziU8 unk_0x08;
|
ziU8 unk_0x08;
|
||||||
ziU8 unk_0x09;
|
ziU8 unk_0x09;
|
||||||
ziU8 maxWordLength;
|
ziU8 unk_0x0A;
|
||||||
ziU8 unk_0x0B;
|
ziU8 unk_0x0B;
|
||||||
ziU32 unk_0x0C;
|
ziU32 unk_0x0C;
|
||||||
ziU32 unk_0x10;
|
ziU32 unk_0x10;
|
||||||
ziU16 unk_0x14;
|
ziU16 unk_0x14;
|
||||||
ziU8 cangjieEnabled; // 0x16
|
ziU8 unk_0x16;
|
||||||
ziU8 unk_0x17;
|
ziU8 unk_0x17;
|
||||||
ziU8 subLanguage; // 0x18
|
ziU8 unk_0x18;
|
||||||
ziU8 unk_0x19;
|
ziU8 unk_0x19;
|
||||||
ziU16 separator; // 0x1A
|
ziU16 unk_0x1A;
|
||||||
ziU8 unk_0x1C[3];
|
ziU8 unk_0x1C[3];
|
||||||
ziU8 unk_0x1F;
|
ziU8 unk_0x1F;
|
||||||
ziU16 unk_0x20[0x40];
|
ziU16 unk_0x20[0x40];
|
||||||
@@ -258,32 +258,32 @@ struct __zi8_work_data_s {
|
|||||||
ziU8 unk_0x330[8];
|
ziU8 unk_0x330[8];
|
||||||
ziU32 unk_0x338;
|
ziU32 unk_0x338;
|
||||||
ziU8 unk_0x33C[0x1FC];
|
ziU8 unk_0x33C[0x1FC];
|
||||||
ziU8 language; // 0x538
|
ziU8 unk_0x538;
|
||||||
ziU8 unk_0x539;
|
ziU8 unk_0x539;
|
||||||
ziU8 unk_0x53A[0x40];
|
ziU8 unk_0x53A[0x40];
|
||||||
ziWChar unk_0x57A[0x641];
|
ziWChar unk_0x57A[0x641];
|
||||||
ziPtr unk_0x11FC;
|
ziPtr unk_0x11FC;
|
||||||
ziPtr userKeys[0x83]; // 0x1200
|
ziPtr userKeys[0x83]; // 0x1200
|
||||||
ziU8 unk_0x140C[4];
|
ziU8 unk_0x140C[4];
|
||||||
ziU32 formats; // 0x1410
|
ziU32 unk_0x1410;
|
||||||
ziU8 unk_0x1414[4];
|
ziU8 unk_0x1414[4];
|
||||||
ziU8 formatCount;
|
ziU8 unk_0x1418;
|
||||||
ziU8 unk_0x1419;
|
ziU8 unk_0x1419;
|
||||||
ziU16 capacity; // 0x141A
|
ziU16 unk_0x141A;
|
||||||
ziU8 unk_0x141C;
|
ziU8 unk_0x141C;
|
||||||
ziU8 unk_0x141D;
|
ziU8 unk_0x141D;
|
||||||
ziU8 graphTableId; // 0x141E
|
ziU8 unk_0x141E;
|
||||||
ziU8 maxCnt; // 0x141F
|
ziU8 unk_0x141F;
|
||||||
ziU8 unk_0x1420[4];
|
ziU8 unk_0x1420[4];
|
||||||
zi8DawgCtx dawgCtx; // 0x1424
|
zi8DawgCtx dawgCtx; // 0x1424
|
||||||
ziU8 unk_0x1760[4]; // 0x1760
|
ziU8 unk_0x1760[4]; // 0x1760
|
||||||
ziU8* groupPtr; // 0x1764
|
ziU8* unk_0x1764; // 0x1764
|
||||||
ziU8 unk_0x1768;
|
ziU8 unk_0x1768;
|
||||||
ziU8 unk_0x1769[0x81];
|
ziU8 unk_0x1769[0x81];
|
||||||
ziU16 matchOffset; // 0x17EA
|
ziU16 unk_0x17EA;
|
||||||
ziU8 unk_0x17EC;
|
ziU8 unk_0x17EC;
|
||||||
ziU8 unk_0x17ED[3];
|
ziU8 unk_0x17ED[3];
|
||||||
ziU8* dawgGroup; // 0x17F0
|
ziU8* unk_0x17F0;
|
||||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||||
ziU16 unk_0x1874;
|
ziU16 unk_0x1874;
|
||||||
ziU8 unk_0x1876;
|
ziU8 unk_0x1876;
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ ziU32 Zi8GetTableData(ziU8 lang, ziU8 tableIdx, ziU8 memberId ZI_NEED_WORK) {
|
|||||||
if (langIdx-- != 0) {
|
if (langIdx-- != 0) {
|
||||||
tableData = ZI_WORK->langEntries[langIdx].tableData;
|
tableData = ZI_WORK->langEntries[langIdx].tableData;
|
||||||
if ((lang == ZI8_LANG_ZH) && (tableData[3] >= 4) &&
|
if ((lang == ZI8_LANG_ZH) && (tableData[3] >= 4) &&
|
||||||
((ZI_WORK->subLanguage == 1) || (ZI_WORK->subLanguage == 0x80) || (ZI_WORK->subLanguage == 0x40))) {
|
((ZI_WORK->unk_0x18 == 1) || (ZI_WORK->unk_0x18 == 0x80) || (ZI_WORK->unk_0x18 == 0x40))) {
|
||||||
offset = ((tableData[0x8B] << 0x10) + (tableData[0x8C] << 8) + tableData[0x8D]);
|
offset = ((tableData[0x8B] << 0x10) + (tableData[0x8C] << 8) + tableData[0x8D]);
|
||||||
if (offset != 0) {
|
if (offset != 0) {
|
||||||
tableData += offset;
|
tableData += offset;
|
||||||
|
|||||||
@@ -27,11 +27,11 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
|||||||
ziWChar Zi8ConvertUC2UserKey(ziChar, ziU8 ZI_NEED_WORK);
|
ziWChar Zi8ConvertUC2UserKey(ziChar, ziU8 ZI_NEED_WORK);
|
||||||
|
|
||||||
ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||||
const ziConversionTables* defaults;
|
ziU8* table;
|
||||||
ziWChar* mapped;
|
ziWChar* mapped;
|
||||||
ziU8* cursor;
|
ziU8* cursor;
|
||||||
ziU16 first, last;
|
ziU16 first, last;
|
||||||
ziU8* table;
|
const ziConversionTables* defaults;
|
||||||
if (character == 0) {
|
if (character == 0) {
|
||||||
Zi8LogError(0x133, __zi8_work_data);
|
Zi8LogError(0x133, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -796,11 +796,11 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
|||||||
if (remaining != 0) {
|
if (remaining != 0) {
|
||||||
remaining--;
|
remaining--;
|
||||||
} else {
|
} else {
|
||||||
totalCandidates = totalCandidates + 1;
|
totalCandidates++;
|
||||||
if (options->countOnly == '\0') {
|
if (options->countOnly == '\0') {
|
||||||
*output++ = spellingBuffer[spellingIndex];
|
*output++ = spellingBuffer[spellingIndex];
|
||||||
*output++ = 0;
|
*output++ = 0;
|
||||||
candidateCount = candidateCount + 1;
|
candidateCount++;
|
||||||
}
|
}
|
||||||
else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||||
@@ -940,7 +940,8 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
|||||||
for (tableIndex = 0; tableIndex < params->count;) {
|
for (tableIndex = 0; tableIndex < params->count;) {
|
||||||
while (*output != 0) {
|
while (*output != 0) {
|
||||||
if (*output != 0x27) {
|
if (*output != 0x27) {
|
||||||
*output++ |= 0xf300;
|
*output |= 0xf300;
|
||||||
|
output++;
|
||||||
} else {
|
} else {
|
||||||
*output++ = 0xf360;
|
*output++ = 0xf360;
|
||||||
}
|
}
|
||||||
@@ -1000,10 +1001,10 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
|||||||
}
|
}
|
||||||
if (Zi8IsDupWordW(output,(ziU8)phoneticIndex,work) == 0) {
|
if (Zi8IsDupWordW(output,(ziU8)phoneticIndex,work) == 0) {
|
||||||
if (remaining == 0) {
|
if (remaining == 0) {
|
||||||
totalCandidates = totalCandidates + 1;
|
totalCandidates++;
|
||||||
if (options->countOnly == 0) {
|
if (options->countOnly == 0) {
|
||||||
output += phoneticIndex + 1;
|
output += phoneticIndex + 1;
|
||||||
++candidateCount;
|
candidateCount++;
|
||||||
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -285,9 +285,9 @@ static ziBool ZiIsLetterHyphen(ziWChar character ZI_NEED_WORK) {
|
|||||||
else return ZI8_FALSE;
|
else return ZI8_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ZiAlphaWork* work) {
|
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ziPtr work) {
|
||||||
enum { LOWER_CASE, UPPER_CASE } upper = LOWER_CASE;
|
enum { LOWER_CASE, UPPER_CASE } upper = LOWER_CASE;
|
||||||
if (work->caseMode == 3) {
|
if (((ZiAlphaWork*)work)->caseMode == 3) {
|
||||||
Zi8ChangeCharCase(1, word++, language, work);
|
Zi8ChangeCharCase(1, word++, language, work);
|
||||||
} else if (((ZiAlphaWork*)work)->caseMode == 1) {
|
} else if (((ZiAlphaWork*)work)->caseMode == 1) {
|
||||||
upper = UPPER_CASE;
|
upper = UPPER_CASE;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
|
|||||||
}
|
}
|
||||||
|
|
||||||
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
|
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
|
||||||
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
|
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
|
||||||
++spelling;
|
++spelling;
|
||||||
}
|
}
|
||||||
if (!*spelling || spelling == end) {
|
if (!*spelling || spelling == end) {
|
||||||
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
|
|||||||
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
|
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
|
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
|
||||||
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
|
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (*spelling != *candidate) {
|
if (*spelling != *candidate) {
|
||||||
@@ -430,7 +430,7 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
|||||||
if (getMode != 7 && getMode != 10 && getMode != 8 && getMode != 9) {
|
if (getMode != 7 && getMode != 10 && getMode != 8 && getMode != 9) {
|
||||||
Zi8PrepareMatch(request, &match, 0, work);
|
Zi8PrepareMatch(request, &match, 0, work);
|
||||||
} else {
|
} else {
|
||||||
if (!((struct __zi8_work_data_s*)work)->cangjieEnabled || request->elementCount > 6) {
|
if (!((struct __zi8_work_data_s*)work)->unk_0x16 || request->elementCount > 6) {
|
||||||
resultFallback = 0;
|
resultFallback = 0;
|
||||||
goto engine_finish;
|
goto engine_finish;
|
||||||
}
|
}
|
||||||
@@ -753,7 +753,8 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
|||||||
if (!componentTable) {
|
if (!componentTable) {
|
||||||
componentCount = Zi8GetTableCount(1, 7, work);
|
componentCount = Zi8GetTableCount(1, 7, work);
|
||||||
componentOrdinals = (ziU8*)Zi8GetTableAddress(1, 7, work);
|
componentOrdinals = (ziU8*)Zi8GetTableAddress(1, 7, work);
|
||||||
componentTable = componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
|
componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
|
||||||
|
componentTable = componentCursor;
|
||||||
componentCursor += 8;
|
componentCursor += 8;
|
||||||
--componentCount;
|
--componentCount;
|
||||||
componentIndex = componentCount;
|
componentIndex = componentCount;
|
||||||
@@ -1150,7 +1151,7 @@ context_word_lookup:
|
|||||||
if (ordinalIndex == 0xFFFF) goto context_results_done;
|
if (ordinalIndex == 0xFFFF) goto context_results_done;
|
||||||
record = records + ordinalIndex * 12;
|
record = records + ordinalIndex * 12;
|
||||||
phoneticGroups = phraseTable + ((record[9] & 15) << 16 | (record[11] | record[10] << 8));
|
phoneticGroups = phraseTable + ((record[9] & 15) << 16 | (record[11] | record[10] << 8));
|
||||||
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
|
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
|
||||||
switch (phoneticGroups[0] & 7) {
|
switch (phoneticGroups[0] & 7) {
|
||||||
case 2: phoneticGroups += 2; break;
|
case 2: phoneticGroups += 2; break;
|
||||||
case 3: case 4: phoneticGroups += 3; break;
|
case 3: case 4: phoneticGroups += 3; break;
|
||||||
@@ -1964,7 +1965,7 @@ component_retry:
|
|||||||
((ZiChineseWork*)work)->duplicateOrdinals[((ZiChineseWork*)work)->duplicateIndex] = ordinalIndex;
|
((ZiChineseWork*)work)->duplicateOrdinals[((ZiChineseWork*)work)->duplicateIndex] = ordinalIndex;
|
||||||
relatedRecord = records + ordinalIndex * 12;
|
relatedRecord = records + ordinalIndex * 12;
|
||||||
phoneticGroups = phraseTable + ((relatedRecord[9] & 15) << 16 | (relatedRecord[11] | relatedRecord[10] << 8));
|
phoneticGroups = phraseTable + ((relatedRecord[9] & 15) << 16 | (relatedRecord[11] | relatedRecord[10] << 8));
|
||||||
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
|
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
|
||||||
switch (phoneticGroups[0] & 7) {
|
switch (phoneticGroups[0] & 7) {
|
||||||
case 2: phoneticGroups += 2; break;
|
case 2: phoneticGroups += 2; break;
|
||||||
case 3: case 4: phoneticGroups += 3; break;
|
case 3: case 4: phoneticGroups += 3; break;
|
||||||
@@ -2868,7 +2869,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
|||||||
ziU8 count;
|
ziU8 count;
|
||||||
ziWChar spacedElements[256];
|
ziWChar spacedElements[256];
|
||||||
struct { ziWChar separator; } savedState;
|
struct { ziWChar separator; } savedState;
|
||||||
savedState.separator = ZI_WORK->separator;
|
savedState.separator = ZI_WORK->unk_0x1A;
|
||||||
if (elementCount <= 1 || !charCount) {
|
if (elementCount <= 1 || !charCount) {
|
||||||
return elementCount;
|
return elementCount;
|
||||||
}
|
}
|
||||||
@@ -2881,9 +2882,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
|||||||
if (spacedIndex == elementCount) {
|
if (spacedIndex == elementCount) {
|
||||||
return elementCount;
|
return elementCount;
|
||||||
}
|
}
|
||||||
ZI_WORK->separator = 0xF360;
|
ZI_WORK->unk_0x1A = 0xF360;
|
||||||
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
|
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
|
||||||
ZI_WORK->separator = savedState.separator;
|
ZI_WORK->unk_0x1A = savedState.separator;
|
||||||
spacedIndex = elementIndex = count = 0;
|
spacedIndex = elementIndex = count = 0;
|
||||||
while (charCount && elementIndex < elementCount) {
|
while (charCount && elementIndex < elementCount) {
|
||||||
if (spacedElements[spacedIndex] == 0xF360) {
|
if (spacedElements[spacedIndex] == 0xF360) {
|
||||||
|
|||||||
@@ -39,10 +39,10 @@ ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU8 count, ziU8 language,
|
|||||||
}
|
}
|
||||||
if (mode == 1) acceptPrefix = 0;
|
if (mode == 1) acceptPrefix = 0;
|
||||||
} else {
|
} else {
|
||||||
if (ZI_WORK->graphTableId != 0 && graphTable == 0xc &&
|
if (ZI_WORK->unk_0x141E != 0 && graphTable == 0xc &&
|
||||||
Zi8GetTableSize(language, ZI_WORK->graphTableId, ZI_WORK) != 0) {
|
Zi8GetTableSize(language, ZI_WORK->unk_0x141E, ZI_WORK) != 0) {
|
||||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->graphTableId, ZI_WORK);
|
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->unk_0x141E, ZI_WORK);
|
||||||
keyTable = ZI_WORK->graphTableId + 1;
|
keyTable = ZI_WORK->unk_0x141E + 1;
|
||||||
} else {
|
} else {
|
||||||
if (Zi8GetTableSize(language, graphTable, ZI_WORK) == 0) {
|
if (Zi8GetTableSize(language, graphTable, ZI_WORK) == 0) {
|
||||||
Zi8LogError(0x961, ZI_WORK);
|
Zi8LogError(0x961, ZI_WORK);
|
||||||
@@ -136,7 +136,7 @@ descend:
|
|||||||
records[context->cnt].node = ZiDAWGGetChild(records[context->cnt - 1].node);
|
records[context->cnt].node = ZiDAWGGetChild(records[context->cnt - 1].node);
|
||||||
if (records[context->cnt].node == (ziU8*)0) goto next_sibling;
|
if (records[context->cnt].node == (ziU8*)0) goto next_sibling;
|
||||||
context->cnt++;
|
context->cnt++;
|
||||||
if (ZI_WORK->maxCnt < context->cnt) ZI_WORK->maxCnt = context->cnt;
|
if (ZI_WORK->unk_0x141F < context->cnt) ZI_WORK->unk_0x141F = context->cnt;
|
||||||
goto update_current;
|
goto update_current;
|
||||||
next_sibling:
|
next_sibling:
|
||||||
while (context->cnt != 0) {
|
while (context->cnt != 0) {
|
||||||
@@ -184,36 +184,37 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
|
|||||||
|
|
||||||
result = 0;
|
result = 0;
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
ZI_WORK->groupPtr = (ziU8*)group;
|
ZI_WORK->unk_0x1764 = (ziU8*)group;
|
||||||
if (ZI_WORK->groupPtr == 0) {
|
if (ZI_WORK->unk_0x1764 == 0) {
|
||||||
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
||||||
ZI_WORK->groupPtr = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK);
|
||||||
|
ZI_WORK->unk_0x1764 = (ziU8*)tableAddress;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ZI_WORK->groupPtr != 0) {
|
if (ZI_WORK->unk_0x1764 != 0) {
|
||||||
for (; (*ZI_WORK->groupPtr != 0xff && ((groupIndex & 0xff) != 0));
|
for (; (*ZI_WORK->unk_0x1764 != 0xff && ((groupIndex & 0xff) != 0));
|
||||||
groupIndex = groupIndex - 1) {
|
groupIndex = groupIndex - 1) {
|
||||||
while (*ZI_WORK->groupPtr != 0xff) {
|
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||||
ZI_WORK->groupPtr += 2;
|
ZI_WORK->unk_0x1764 += 2;
|
||||||
}
|
}
|
||||||
ZI_WORK->groupPtr++;
|
ZI_WORK->unk_0x1764++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ZI_WORK->groupPtr == 0) {
|
if (ZI_WORK->unk_0x1764 == 0) {
|
||||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,capacity & 0xffff,
|
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,capacity & 0xffff,
|
||||||
mode & 0xff,status & 0xff,0,1,acceptPrefix,0,&ZI_WORK->dawgCtx,
|
mode & 0xff,status & 0xff,0,1,acceptPrefix,0,&ZI_WORK->dawgCtx,
|
||||||
ZI_WORK->unk_0x1760,ZI_WORK);
|
ZI_WORK->unk_0x1760,ZI_WORK);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
while (*ZI_WORK->groupPtr != 0xff) {
|
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,
|
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,
|
||||||
capacity & 0xffff,mode & 0xff,status & 0xff,
|
capacity & 0xffff,mode & 0xff,status & 0xff,
|
||||||
*ZI_WORK->groupPtr,
|
*ZI_WORK->unk_0x1764,
|
||||||
ZI_WORK->groupPtr[1],acceptPrefix,0,
|
ZI_WORK->unk_0x1764[1],acceptPrefix,0,
|
||||||
&ZI_WORK->dawgCtx,ZI_WORK->unk_0x1760,ZI_WORK);
|
&ZI_WORK->dawgCtx,ZI_WORK->unk_0x1760,ZI_WORK);
|
||||||
if ((result & 0xff) != 0) break;
|
if ((result & 0xff) != 0) break;
|
||||||
ZI_WORK->groupPtr += 2;
|
ZI_WORK->unk_0x1764 += 2;
|
||||||
status = 0;
|
status = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -230,31 +231,31 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
|||||||
if (reservedMode != 0) return 0;
|
if (reservedMode != 0) return 0;
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
ZI_WORK->unk_0x1768 = 0;
|
ZI_WORK->unk_0x1768 = 0;
|
||||||
ZI_WORK->matchOffset = 0;
|
ZI_WORK->unk_0x17EA = 0;
|
||||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
||||||
ZI_WORK->graphTableId = 0x10;
|
ZI_WORK->unk_0x141E = 0x10;
|
||||||
} else {
|
} else {
|
||||||
ZI_WORK->graphTableId = 0;
|
ZI_WORK->unk_0x141E = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
search_segment:
|
search_segment:
|
||||||
ZI_WORK->maxCnt = 1;
|
ZI_WORK->unk_0x141F = 1;
|
||||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||||
count - ZI_WORK->matchOffset, language,
|
count - ZI_WORK->unk_0x17EA, language,
|
||||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||||
mode, status, ZI_WORK->unk_0x1768, (char*)group,
|
mode, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||||
acceptPrefix, ZI_WORK);
|
acceptPrefix, ZI_WORK);
|
||||||
if ((ziU8)result != 0) {
|
if ((ziU8)result != 0) {
|
||||||
for (index = (ziU8)(ZI_WORK->matchOffset + result); index != 0; index--) {
|
for (index = (ziU8)(ZI_WORK->unk_0x17EA + result); index != 0; index--) {
|
||||||
output[index - 1] = ZI_WORK->unk_0x17F4[index - 1];
|
output[index - 1] = ZI_WORK->unk_0x17F4[index - 1];
|
||||||
}
|
}
|
||||||
result = (ziU8)(result + ZI_WORK->matchOffset);
|
result = (ziU8)(result + ZI_WORK->unk_0x17EA);
|
||||||
} else {
|
} else {
|
||||||
if (status != 0 || count == 1) goto finish_segments;
|
if (status != 0 || count == 1) goto finish_segments;
|
||||||
if (mode == 1 && ZI_WORK->unk_0x1768 == 0 &&
|
if (mode == 1 && ZI_WORK->unk_0x1768 == 0 &&
|
||||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||||
count - ZI_WORK->matchOffset, language,
|
count - ZI_WORK->unk_0x17EA, language,
|
||||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||||
0, status, ZI_WORK->unk_0x1768, (char*)group,
|
0, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||||
acceptPrefix, ZI_WORK) != 0) goto finish_segments;
|
acceptPrefix, ZI_WORK) != 0) goto finish_segments;
|
||||||
if ((Zi8GetTableCount(language, 0x1f, ZI_WORK) & 4) == 0) {
|
if ((Zi8GetTableCount(language, 0x1f, ZI_WORK) & 4) == 0) {
|
||||||
@@ -262,25 +263,25 @@ search_segment:
|
|||||||
if (elements[index] == 0xeff1) goto finish_segments;
|
if (elements[index] == 0xeff1) goto finish_segments;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ZI_WORK->maxCnt > capacity) goto finish_segments;
|
if (ZI_WORK->unk_0x141F > capacity) goto finish_segments;
|
||||||
for (index = ZI_WORK->maxCnt; index != 0; index--) {
|
for (index = ZI_WORK->unk_0x141F; index != 0; index--) {
|
||||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset, index, language,
|
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA, index, language,
|
||||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||||
1, 0, ZI_WORK->unk_0x1768, (char*)group,
|
1, 0, ZI_WORK->unk_0x1768, (char*)group,
|
||||||
acceptPrefix, ZI_WORK);
|
acceptPrefix, ZI_WORK);
|
||||||
if ((ziU8)result != 0) {
|
if ((ziU8)result != 0) {
|
||||||
ZI_WORK->matchOffset += (ziU8)result;
|
ZI_WORK->unk_0x17EA += (ziU8)result;
|
||||||
if (ZI_WORK->matchOffset == count) return 0;
|
if (ZI_WORK->unk_0x17EA == count) return 0;
|
||||||
ZI_WORK->unk_0x1768++;
|
ZI_WORK->unk_0x1768++;
|
||||||
status = 0;
|
status = 0;
|
||||||
ZI_WORK->graphTableId = 0;
|
ZI_WORK->unk_0x141E = 0;
|
||||||
if (ZI_WORK->dawgCtx.key == 0 && language == 10) {
|
if (ZI_WORK->dawgCtx.key == 0 && language == 10) {
|
||||||
for (index = 0; index < ZI_WORK->matchOffset; index++) {
|
for (index = 0; index < ZI_WORK->unk_0x17EA; index++) {
|
||||||
switch (ZI_WORK->unk_0x17F4[index]) {
|
switch (ZI_WORK->unk_0x17F4[index]) {
|
||||||
case 0x61:
|
case 0x61:
|
||||||
case 0x6f:
|
case 0x6f:
|
||||||
case 0x75:
|
case 0x75:
|
||||||
ZI_WORK->graphTableId = 0x10;
|
ZI_WORK->unk_0x141E = 0x10;
|
||||||
goto search_segment;
|
goto search_segment;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -306,7 +307,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
|||||||
} else {
|
} else {
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
ZI_WORK->unk_0x17EC = 0;
|
ZI_WORK->unk_0x17EC = 0;
|
||||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||||
Zi8LogError(100, ZI_WORK);
|
Zi8LogError(100, ZI_WORK);
|
||||||
goto finish_match;
|
goto finish_match;
|
||||||
@@ -316,30 +317,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
|||||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||||
} else {
|
} else {
|
||||||
while (ZI_WORK->dawgGroup != 0) {
|
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||||
acceptPrefix, ZI_WORK);
|
acceptPrefix, ZI_WORK);
|
||||||
if ((ziU8)result != 0) break;
|
if ((ziU8)result != 0) break;
|
||||||
status = 0;
|
status = 0;
|
||||||
if (count <= 1 && language == 0x36) break;
|
if (count <= 1 && language == 0x36) break;
|
||||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||||
mode = 0;
|
mode = 0;
|
||||||
ZI_WORK->unk_0x17EC = 1;
|
ZI_WORK->unk_0x17EC = 1;
|
||||||
if (tableSize != 0) {
|
if (tableSize != 0) {
|
||||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||||
while (ZI_WORK->dawgGroup != 0) {
|
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||||
acceptPrefix, ZI_WORK) != 0) {
|
acceptPrefix, ZI_WORK) != 0) {
|
||||||
*output = *elements;
|
*output = *elements;
|
||||||
result = 1;
|
result = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||||
|
|||||||
@@ -50,11 +50,11 @@ ziBool Zi8ZHsetZYfuzzyPairs(ziFuzzyZYPairs pairs ZI_NEED_WORK) {
|
|||||||
|
|
||||||
ziBool Zi8SetLatinSearchOrder(ziU8* searchArray, ziU8 searchSize ZI_NEED_WORK) {
|
ziBool Zi8SetLatinSearchOrder(ziU8* searchArray, ziU8 searchSize ZI_NEED_WORK) {
|
||||||
if (searchArray == 0 || *searchArray == 0) {
|
if (searchArray == 0 || *searchArray == 0) {
|
||||||
ZI_WORK->formats = (ziU32)Zi8SOdefaultArray;
|
ZI_WORK->unk_0x1410 = (ziU32)Zi8SOdefaultArray;
|
||||||
ZI_WORK->formatCount = 9;
|
ZI_WORK->unk_0x1418 = 9;
|
||||||
} else {
|
} else {
|
||||||
ZI_WORK->formats = (ziU32)searchArray;
|
ZI_WORK->unk_0x1410 = (ziU32)searchArray;
|
||||||
ZI_WORK->formatCount = searchSize;
|
ZI_WORK->unk_0x1418 = searchSize;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -158,13 +158,13 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
|||||||
length = length - parameters->firstCandidate;
|
length = length - parameters->firstCandidate;
|
||||||
if (countOnly != 0) {
|
if (countOnly != 0) {
|
||||||
parameters->letters = length;
|
parameters->letters = length;
|
||||||
ZI_WORK->maxWordLength = 0xff;
|
ZI_WORK->unk_0x0A = 0xff;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||||
parameters->letters = length;
|
parameters->letters = length;
|
||||||
if ((parameters->getOptions & 0x80) == 0) {
|
if ((parameters->getOptions & 0x80) == 0) {
|
||||||
ZI_WORK->language = parameters->language;
|
ZI_WORK->unk_0x538 = parameters->language;
|
||||||
parameters->candidates[0] = 0xfff0;
|
parameters->candidates[0] = 0xfff0;
|
||||||
output = (ziWChar*)&ZI_WORK->unk_0x338;
|
output = (ziWChar*)&ZI_WORK->unk_0x338;
|
||||||
}
|
}
|
||||||
@@ -175,7 +175,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
|||||||
current = signatures.first;
|
current = signatures.first;
|
||||||
length = signatures.length;
|
length = signatures.length;
|
||||||
}
|
}
|
||||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||||
length = parameters->elementCount;
|
length = parameters->elementCount;
|
||||||
@@ -185,7 +185,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
|||||||
if (parameters->letters == 2) {
|
if (parameters->letters == 2) {
|
||||||
current = signatures.second;
|
current = signatures.second;
|
||||||
length = secondLength;
|
length = secondLength;
|
||||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||||
length = parameters->elementCount;
|
length = parameters->elementCount;
|
||||||
@@ -194,7 +194,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
|||||||
*output++ = 0;
|
*output++ = 0;
|
||||||
}
|
}
|
||||||
*output++ = 0;
|
*output++ = 0;
|
||||||
ZI_WORK->maxWordLength = 0xff;
|
ZI_WORK->unk_0x0A = 0xff;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,7 +226,7 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
|||||||
length = length - parameters->firstCandidate;
|
length = length - parameters->firstCandidate;
|
||||||
if (countOnly != 0) {
|
if (countOnly != 0) {
|
||||||
parameters->letters = length;
|
parameters->letters = length;
|
||||||
ZI_WORK->maxWordLength = 0xff;
|
ZI_WORK->unk_0x0A = 0xff;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||||
@@ -279,13 +279,13 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
|||||||
|
|
||||||
ziU8 _Zi8GetCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
ziU8 _Zi8GetCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||||
ZiCandidateOptions options = {0};
|
ZiCandidateOptions options = {0};
|
||||||
options.capacity = ZI_WORK->capacity;
|
options.capacity = ZI_WORK->unk_0x141A;
|
||||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||||
}
|
}
|
||||||
|
|
||||||
ziU8 _Zi8CheckCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
ziU8 _Zi8CheckCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||||
ZiCandidateOptions options = {0};
|
ZiCandidateOptions options = {0};
|
||||||
options.capacity = ZI_WORK->capacity;
|
options.capacity = ZI_WORK->unk_0x141A;
|
||||||
options.flags = 1;
|
options.flags = 1;
|
||||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||||
}
|
}
|
||||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
|||||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||||
switch (parameters->language) {
|
switch (parameters->language) {
|
||||||
case 1:
|
case 1:
|
||||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||||
switch(ZI_WORK->unk_0x00) {
|
switch(ZI_WORK->unk_0x00) {
|
||||||
case '\0':
|
case '\0':
|
||||||
if (parameters->elements[0] == 0xEF04) {
|
if (parameters->elements[0] == 0xEF04) {
|
||||||
ZI_WORK->countOnly = options->countOnly;
|
ZI_WORK->unk_0x01 = options->countOnly;
|
||||||
ZI_WORK->unk_0x00 = '\x01';
|
ZI_WORK->unk_0x00 = '\x01';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
|||||||
break;
|
break;
|
||||||
case 0x11:
|
case 0x11:
|
||||||
default:
|
default:
|
||||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||||
switch(ZI_WORK->unk_0x00) {
|
switch(ZI_WORK->unk_0x00) {
|
||||||
case '\0':
|
case '\0':
|
||||||
if (parameters->elements[0] == 0xEFF2) {
|
if (parameters->elements[0] == 0xEFF2) {
|
||||||
ZI_WORK->countOnly = options->countOnly;
|
ZI_WORK->unk_0x01 = options->countOnly;
|
||||||
ZI_WORK->unk_0x00 = '\x01';
|
ZI_WORK->unk_0x00 = '\x01';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -490,11 +490,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
|||||||
ZI_WORK->unk_0x00 = '\0';
|
ZI_WORK->unk_0x00 = '\0';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
ZI_WORK->unk_0x18 = parameters->subLanguage;
|
||||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||||
options->maxCount = ZI_WORK->unk_0x10;
|
options->maxCount = ZI_WORK->unk_0x10;
|
||||||
options->maxWordLength = ZI_WORK->maxWordLength;
|
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||||
ZI_WORK->maxWordLength = -1;
|
ZI_WORK->unk_0x0A = -1;
|
||||||
if ((ziU8)Zi8LangSupported(parameters->language,ZI_WORK) == 0) {
|
if ((ziU8)Zi8LangSupported(parameters->language,ZI_WORK) == 0) {
|
||||||
Zi8LogError(0x163,ZI_WORK);
|
Zi8LogError(0x163,ZI_WORK);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -558,7 +558,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
|||||||
}
|
}
|
||||||
else if ((parameters->language == 1) &&
|
else if ((parameters->language == 1) &&
|
||||||
((((parameters->getMode == 7 || (parameters->getMode == 8)) || (parameters->getMode == 10)) || (parameters->getMode == 9)))) {
|
((((parameters->getMode == 7 || (parameters->getMode == 8)) || (parameters->getMode == 10)) || (parameters->getMode == 9)))) {
|
||||||
if (ZI_WORK->cangjieEnabled != '\0') {
|
if (ZI_WORK->unk_0x16 != '\0') {
|
||||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||||
} else {
|
} else {
|
||||||
error = 0x708;
|
error = 0x708;
|
||||||
@@ -582,7 +582,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ZI_WORK->language = parameters->language;
|
ZI_WORK->unk_0x538 = parameters->language;
|
||||||
if ((parameters->getOptions & 0x80) == 0) {
|
if ((parameters->getOptions & 0x80) == 0) {
|
||||||
saved.restoreCandidates = 1;
|
saved.restoreCandidates = 1;
|
||||||
saved.savedOptions = parameters->getOptions;
|
saved.savedOptions = parameters->getOptions;
|
||||||
@@ -711,6 +711,6 @@ void Zi8Memcpy(ziU8* destination, ziU8* source, ziS32 count) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ziBool Zi8SetMaxWordLength(ziU8 length ZI_NEED_WORK) {
|
ziBool Zi8SetMaxWordLength(ziU8 length ZI_NEED_WORK) {
|
||||||
ZI_WORK->maxWordLength = length;
|
ZI_WORK->unk_0x0A = length;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
|||||||
Zi8Memset(__zi8_work_data, 0, 0x1B44);
|
Zi8Memset(__zi8_work_data, 0, 0x1B44);
|
||||||
ZI_WORK->unk_0x08 = 1;
|
ZI_WORK->unk_0x08 = 1;
|
||||||
ZI_WORK->unk_0x09 = 1;
|
ZI_WORK->unk_0x09 = 1;
|
||||||
ZI_WORK->maxWordLength = 0xFF;
|
ZI_WORK->unk_0x0A = 0xFF;
|
||||||
ZI_WORK->unk_0x10 = 0x64;
|
ZI_WORK->unk_0x10 = 0x64;
|
||||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||||
ZI_WORK->separator = 0x20;
|
ZI_WORK->unk_0x1A = 0x20;
|
||||||
ZI_WORK->unk_0x1C[2] = 0;
|
ZI_WORK->unk_0x1C[2] = 0;
|
||||||
ZI_WORK->unk_0x1B30 = 0;
|
ZI_WORK->unk_0x1B30 = 0;
|
||||||
ZI_WORK->unk_0x1B3A = 0;
|
ZI_WORK->unk_0x1B3A = 0;
|
||||||
@@ -42,13 +42,13 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
ZI_WORK->unk_0x1874 = 0x2D;
|
ZI_WORK->unk_0x1874 = 0x2D;
|
||||||
ZI_WORK->language = 0;
|
ZI_WORK->unk_0x538 = 0;
|
||||||
ZI_WORK->unk_0x1C[3] = 0;
|
ZI_WORK->unk_0x1C[3] = 0;
|
||||||
ZI_WORK->capacity = 0x100;
|
ZI_WORK->unk_0x141A = 0x100;
|
||||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||||
ZI_WORK->unk_0x17 = 5;
|
ZI_WORK->unk_0x17 = 5;
|
||||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||||
ZI_WORK->unk_0x1B28.bits.msb = 1;
|
ZI_WORK->unk_0x1B28.bits.msb = 1;
|
||||||
ZI_WORK->unk_0x1B2C.bits.msb = 1;
|
ZI_WORK->unk_0x1B2C.bits.msb = 1;
|
||||||
zyFuzzy = ZI_WORK->unk_0x1B2C.word;
|
zyFuzzy = ZI_WORK->unk_0x1B2C.word;
|
||||||
|
|||||||
@@ -24,17 +24,17 @@ ziU8 Zi8GetZHCharSet(ziPtr workData) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (Zi8GetTableCount(1, 10, workData) != 0) {
|
if (Zi8GetTableCount(1, 10, workData) != 0) {
|
||||||
bak = ((struct __zi8_work_data_s*)workData)->subLanguage;
|
bak = ((struct __zi8_work_data_s*)workData)->unk_0x18;
|
||||||
((struct __zi8_work_data_s*)workData)->subLanguage = 1;
|
((struct __zi8_work_data_s*)workData)->unk_0x18 = 1;
|
||||||
addr = Zi8GetTableAddress(1, 10, workData);
|
addr = Zi8GetTableAddress(1, 10, workData);
|
||||||
p = (ziU8*)addr;
|
p = (ziU8*)addr;
|
||||||
v0 = (ziU16)((ziU16)p[0] | ((ziU16)p[1] << 8));
|
v0 = (ziU16)((ziU16)p[0] | ((ziU16)p[1] << 8));
|
||||||
((struct __zi8_work_data_s*)workData)->subLanguage = 0;
|
((struct __zi8_work_data_s*)workData)->unk_0x18 = 0;
|
||||||
addr = Zi8GetTableAddress(1, 10, workData);
|
addr = Zi8GetTableAddress(1, 10, workData);
|
||||||
p = (ziU8*)addr;
|
p = (ziU8*)addr;
|
||||||
v1 = (ziU16)((ziU16)p[2] | ((ziU16)p[3] << 8));
|
v1 = (ziU16)((ziU16)p[2] | ((ziU16)p[3] << 8));
|
||||||
v2 = (ziU16)((ziU16)p[4] | ((ziU16)p[5] << 8));
|
v2 = (ziU16)((ziU16)p[4] | ((ziU16)p[5] << 8));
|
||||||
((struct __zi8_work_data_s*)workData)->subLanguage = bak;
|
((struct __zi8_work_data_s*)workData)->unk_0x18 = bak;
|
||||||
if (v0 != 0) {
|
if (v0 != 0) {
|
||||||
if (v0 > 0x4E20) {
|
if (v0 > 0x4E20) {
|
||||||
charSet |= 8;
|
charSet |= 8;
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ ziU32 Zi8SecMatchChar(ziPtr nodeAddress, ziU8* dictionaryAddress, ziMatchParam*
|
|||||||
|
|
||||||
data = (ziU8*)Zi8GetTableAddress(1, 1, ZI_WORK);
|
data = (ziU8*)Zi8GetTableAddress(1, 1, ZI_WORK);
|
||||||
data += ((ziU8*)nodeAddress)[0xB] + (((ziU8*)nodeAddress)[0xA] << 8) + ((((ziU8*)nodeAddress)[9] & 0xF) << 16);
|
data += ((ziU8*)nodeAddress)[0xB] + (((ziU8*)nodeAddress)[0xA] << 8) + ((((ziU8*)nodeAddress)[9] & 0xF) << 16);
|
||||||
if (ZI_WORK->cangjieEnabled != 0) {
|
if (ZI_WORK->unk_0x16 != 0) {
|
||||||
switch (data[0] & 7) {
|
switch (data[0] & 7) {
|
||||||
case 2:
|
case 2:
|
||||||
data += 2;
|
data += 2;
|
||||||
@@ -346,7 +346,7 @@ match_code:
|
|||||||
traversal.soundIndex = initialCode;
|
traversal.soundIndex = initialCode;
|
||||||
}
|
}
|
||||||
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
|
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
|
||||||
if (ZI_WORK->cangjieEnabled != 0) {
|
if (ZI_WORK->unk_0x16 != 0) {
|
||||||
switch (sound[0] & 7) {
|
switch (sound[0] & 7) {
|
||||||
case 2:
|
case 2:
|
||||||
sound += 2;
|
sound += 2;
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
|||||||
p = (ziU8*)(table2 +
|
p = (ziU8*)(table2 +
|
||||||
(((e[9] & 0xF) << 16) |
|
(((e[9] & 0xF) << 16) |
|
||||||
(e[0xB] | (e[0xA] << 8))));
|
(e[0xB] | (e[0xA] << 8))));
|
||||||
if (WORKP->cangjieEnabled != 0) {
|
if (WORKP->unk_0x16 != 0) {
|
||||||
switch (p[0] & 7) {
|
switch (p[0] & 7) {
|
||||||
case 2:
|
case 2:
|
||||||
p += 2;
|
p += 2;
|
||||||
@@ -65,7 +65,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
e = (ziU8*)table;
|
e = (ziU8*)table;
|
||||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->subLanguage) {
|
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->unk_0x18) {
|
||||||
if ((ziU16)ch >= WORKP->unk_0x1B1C && (ziU16)ch <= WORKP->unk_0x1B1E) {
|
if ((ziU16)ch >= WORKP->unk_0x1B1C && (ziU16)ch <= WORKP->unk_0x1B1E) {
|
||||||
i = (ziU16)(ch - WORKP->unk_0x1B1C);
|
i = (ziU16)(ch - WORKP->unk_0x1B1C);
|
||||||
goto map;
|
goto map;
|
||||||
|
|||||||
@@ -49,42 +49,39 @@ void Zi8CopyZHSpelling(ziU8* source, ziWChar* output, ziU16 capacity, int size,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option, struct __zi8_work_data_s* __zi8_work_data) {
|
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option ZI_NEED_WORK) {
|
||||||
ziU8 previous;
|
ziU8 previous;
|
||||||
previous = __zi8_work_data->pdRemoveOpt;
|
previous = ZI_WORK->pdRemoveOpt;
|
||||||
__zi8_work_data->pdRemoveOpt = option;
|
ZI_WORK->pdRemoveOpt = option;
|
||||||
Zi8LogError(100, __zi8_work_data);
|
Zi8LogError(100, __zi8_work_data);
|
||||||
return previous;
|
return previous;
|
||||||
}
|
}
|
||||||
ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziWChar* spelling, ziU16 spellingCapacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziWChar* spelling, ziU16 spellingCapacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||||
int fallback = 0;
|
|
||||||
ziU8* bytePattern;
|
|
||||||
ziWChar folded;
|
ziWChar folded;
|
||||||
ziPudSection* section;
|
ziU32 entrySize, wordSize, copied;
|
||||||
int wordSize;
|
ziU8* entry;
|
||||||
int copied;
|
|
||||||
ziU8* word;
|
ziU8* word;
|
||||||
int index;
|
int index;
|
||||||
ziU32 entrySize;
|
int fallback = 0;
|
||||||
ziPudHeader* table;
|
ziPudHeader* table;
|
||||||
ziU8* byteOutput;
|
ziPudSection* section;
|
||||||
if (!(ZI_WORK->pudCount <= 16 && ZI_WORK->pudCount != 0 && ZI_WORK->pudTable[ZI_WORK->pudCount - 1] != 0)) {
|
if (!(ZI_WORK->pudCount <= 16 && ZI_WORK->pudCount != 0 && ZI_WORK->pudTable[ZI_WORK->pudCount - 1] != 0)) {
|
||||||
Zi8LogError(0x4B0, __zi8_work_data);
|
Zi8LogError(0x4B0, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (language == 1) {
|
if (language == 1) {
|
||||||
|
length &= 0x7F;
|
||||||
length *= 2;
|
length *= 2;
|
||||||
}
|
}
|
||||||
if (continuation == 0) {
|
if (continuation == 0) {
|
||||||
table = (ziPudHeader*)ZI_WORK->pudTable[ZI_WORK->pudCount - 1];
|
table = (ziPudHeader*)ZI_WORK->pudTable[ZI_WORK->pudCount - 1];
|
||||||
section = table->sections;
|
|
||||||
index = 0;
|
index = 0;
|
||||||
while (index < table->languageCount) {
|
section = table->sections;
|
||||||
if (section->language == language) break;
|
while (index < table->languageCount && section->language != language) {
|
||||||
section++;
|
|
||||||
index++;
|
index++;
|
||||||
|
section++;
|
||||||
}
|
}
|
||||||
if (index >= table->languageCount) {
|
if (table->languageCount <= index) {
|
||||||
Zi8LogError(0x4F6, __zi8_work_data);
|
Zi8LogError(0x4F6, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -93,97 +90,90 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
|||||||
ZI_WORK->unk_0x318 = 0;
|
ZI_WORK->unk_0x318 = 0;
|
||||||
}
|
}
|
||||||
for (;;) {
|
for (;;) {
|
||||||
word = (ziU8*)ZI_WORK->unk_0x310;
|
entry = (ziU8*)ZI_WORK->unk_0x310;
|
||||||
if (word == 0) {
|
if (entry == 0) {
|
||||||
Zi8LogError(0x4B3, __zi8_work_data);
|
Zi8LogError(0x4B3, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
||||||
wordSize = *word++;
|
word = entry + 1;
|
||||||
|
wordSize = *entry;
|
||||||
entrySize = wordSize;
|
entrySize = wordSize;
|
||||||
if (language == 1) {
|
if (language == 1) {
|
||||||
if (ZI_WORK->unk_0x17 > *word) goto next;
|
if (*word < ZI_WORK->unk_0x17) goto next;
|
||||||
wordSize--;
|
entrySize = wordSize - 1;
|
||||||
entrySize--;
|
word = entry + 2;
|
||||||
word++;
|
|
||||||
wordSize = ZiGetZHWordSize((ziWChar*)word, entrySize);
|
wordSize = ZiGetZHWordSize((ziWChar*)word, entrySize);
|
||||||
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && length < wordSize && word[length] == 0x20) goto matchText;
|
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && wordSize > length && word[length] == 0x20) goto matchText;
|
||||||
if ((ziS32)length > (ziS32)wordSize || (complete != 0 && wordSize != length) || (complete == 0 && wordSize == length)) {
|
if ((ziS32)length > (ziS32)wordSize || (complete != 0 && wordSize != length) || (complete == 0 && wordSize == length)) goto next;
|
||||||
next:
|
if (language == 1) {
|
||||||
ZI_WORK->unk_0x318++;
|
|
||||||
word += entrySize;
|
|
||||||
} else {
|
|
||||||
if (language == 1) {
|
|
||||||
bytePattern = (ziU8*)pattern;
|
|
||||||
for (index = 0; index < length; index++) {
|
|
||||||
if (word[index] != bytePattern[index]) goto next;
|
|
||||||
}
|
|
||||||
goto matched;
|
|
||||||
}
|
|
||||||
matchText:
|
|
||||||
for (index = 0; index < length; index++) {
|
for (index = 0; index < length; index++) {
|
||||||
if (pattern[index] >= 0xEFF1 && pattern[index] <= 0xF37F) {
|
if (word[index] != ((ziU8*)pattern)[index]) goto next;
|
||||||
if (pattern[index] != Zi8ConvertUC2Key(word[index], language, __zi8_work_data)) goto next;
|
|
||||||
} else {
|
|
||||||
folded = Zi8ConvertUC2WC(word[index], language, __zi8_work_data);
|
|
||||||
if (folded != pattern[index] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[index])) goto next;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
matched:
|
goto matched;
|
||||||
if (fallback) {
|
|
||||||
ZI_WORK->unk_0x310 = 0;
|
|
||||||
ZI_WORK->unk_0x318 = 0;
|
|
||||||
ZI_WORK->unk_0x314 = 0;
|
|
||||||
if (*pattern >= 0xEFF1) *output = *pattern;
|
|
||||||
else *output = Zi8ConvertWC2Key(*pattern, language, __zi8_work_data);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (language == 1) {
|
|
||||||
byteOutput = (ziU8*)output;
|
|
||||||
for (index = copied = 0; index < (ziS32)wordSize && copied < capacity; copied++) {
|
|
||||||
byteOutput[index] = word[index];
|
|
||||||
index++;
|
|
||||||
byteOutput[index] = word[index];
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
Zi8CopyZHSpelling(word, spelling, spellingCapacity, entrySize, wordSize);
|
|
||||||
} else {
|
|
||||||
for (copied = 0; copied < wordSize && copied < capacity; copied++) {
|
|
||||||
output[copied] = Zi8ConvertUC2WC(word[copied], language, __zi8_work_data);
|
|
||||||
if (ZI_WORK->unk_0x31E != 0 && copied >= length && output[copied] == 0x20) {
|
|
||||||
if (complete != 0 || copied >= length) break;
|
|
||||||
goto next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ZI_WORK->unk_0x318++;
|
|
||||||
ZI_WORK->unk_0x310 = (ziU32)(word + entrySize);
|
|
||||||
Zi8LogError(100, __zi8_work_data);
|
|
||||||
return (ziU8)copied;
|
|
||||||
}
|
}
|
||||||
|
matchText:
|
||||||
|
for (index = 0; index < length; index++) {
|
||||||
|
if (pattern[index] < 0xEFF1 || pattern[index] > 0xF37F) {
|
||||||
|
folded = Zi8ConvertUC2WC(word[index], language, __zi8_work_data);
|
||||||
|
if (folded != pattern[index] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[index])) goto next;
|
||||||
|
} else if (pattern[index] != Zi8ConvertUC2Key(word[index], language, __zi8_work_data)) goto next;
|
||||||
|
}
|
||||||
|
matched:
|
||||||
|
if (fallback) {
|
||||||
|
ZI_WORK->unk_0x310 = 0;
|
||||||
|
ZI_WORK->unk_0x318 = 0;
|
||||||
|
ZI_WORK->unk_0x314 = 0;
|
||||||
|
if (*pattern < 0xEFF1) *output = Zi8ConvertWC2Key(*pattern, language, __zi8_work_data);
|
||||||
|
else *output = *pattern;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (language == 1) {
|
||||||
|
index = 0;
|
||||||
|
for (copied = 0; index < (ziS32)wordSize && copied < capacity; copied++) {
|
||||||
|
((ziU8*)output)[index] = word[index];
|
||||||
|
((ziU8*)output)[index + 1] = word[index + 1];
|
||||||
|
index += 2;
|
||||||
|
}
|
||||||
|
Zi8CopyZHSpelling(word, spelling, spellingCapacity, entrySize, wordSize);
|
||||||
|
} else {
|
||||||
|
for (copied = 0; copied < wordSize && copied < capacity; copied++) {
|
||||||
|
output[copied] = Zi8ConvertUC2WC(word[copied], language, __zi8_work_data);
|
||||||
|
if (ZI_WORK->unk_0x31E != 0 && copied >= length && output[copied] == 0x20) {
|
||||||
|
if (complete != 0 || copied >= length) break;
|
||||||
|
goto next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ZI_WORK->unk_0x318++;
|
||||||
|
ZI_WORK->unk_0x310 = (ziU32)(word + entrySize);
|
||||||
|
Zi8LogError(100, __zi8_work_data);
|
||||||
|
return (ziU8)copied;
|
||||||
|
next:
|
||||||
|
ZI_WORK->unk_0x318++;
|
||||||
|
entry = word + entrySize;
|
||||||
}
|
}
|
||||||
if (length == 1 && complete != 0 && continuation == 0) {
|
if (length != 1 || complete == 0 || continuation != 0) {
|
||||||
complete = 0;
|
|
||||||
fallback = 1;
|
|
||||||
ZI_WORK->unk_0x318 = 0;
|
|
||||||
} else {
|
|
||||||
ZI_WORK->unk_0x310 = 0;
|
ZI_WORK->unk_0x310 = 0;
|
||||||
ZI_WORK->unk_0x318 = 0;
|
ZI_WORK->unk_0x318 = 0;
|
||||||
ZI_WORK->unk_0x314 = 0;
|
ZI_WORK->unk_0x314 = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
complete = 0;
|
||||||
|
fallback = 1;
|
||||||
|
ZI_WORK->unk_0x318 = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation, struct __zi8_work_data_s* __zi8_work_data) {
|
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||||
ziU32 result;
|
ziU32 result;
|
||||||
if (continuation == 0) __zi8_work_data->pudCount = 1;
|
if (continuation == 0) ZI_WORK->pudCount = 1;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
||||||
if ((ziU8)result != 0) break;
|
if ((ziU8)result != 0) break;
|
||||||
if (++__zi8_work_data->pudCount <= 16) {
|
if (++ZI_WORK->pudCount <= 16) {
|
||||||
continuation = 0;
|
continuation = 0;
|
||||||
} else {
|
} else {
|
||||||
__zi8_work_data->pudCount = 1;
|
ZI_WORK->pudCount = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
|
|||||||
}
|
}
|
||||||
if (pdst[k - 1] != 0xF360 &&
|
if (pdst[k - 1] != 0xF360 &&
|
||||||
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
|
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
|
||||||
pdst[k++] = ZI_WORK->separator;
|
pdst[k++] = ZI_WORK->unk_0x1A;
|
||||||
}
|
}
|
||||||
psrc += i;
|
psrc += i;
|
||||||
n -= i;
|
n -= i;
|
||||||
|
|||||||
@@ -15,11 +15,11 @@ void Zi8Memset(ziPtr, ziU32, ziU32);
|
|||||||
|
|
||||||
ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||||
ziU8 length;
|
ziU8 length;
|
||||||
|
ziU8 position;
|
||||||
ziUwdNode* previous;
|
ziUwdNode* previous;
|
||||||
ziUwdNode* current;
|
ziUwdNode* current;
|
||||||
ziUwdNode* added;
|
ziUwdNode* added;
|
||||||
ziUserWord* candidate;
|
ziUserWord* candidate;
|
||||||
ziU8 position;
|
|
||||||
if (ZI_WORK->uwdCount >= 32) {
|
if (ZI_WORK->uwdCount >= 32) {
|
||||||
Zi8LogError(0x19D, __zi8_work_data);
|
Zi8LogError(0x19D, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -41,7 +41,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
|||||||
current = ZI_WORK->uwdList;
|
current = ZI_WORK->uwdList;
|
||||||
while (current != 0) {
|
while (current != 0) {
|
||||||
candidate = (ziUserWord*)current->word;
|
candidate = (ziUserWord*)current->word;
|
||||||
if (ZI_WORK->unk_0x12E == 1 && candidate->priority < word->priority) break;
|
if (ZI_WORK->unk_0x12E == 1 && word->priority > candidate->priority) break;
|
||||||
if (candidate->length == length) {
|
if (candidate->length == length) {
|
||||||
position = 0;
|
position = 0;
|
||||||
while (position < length) {
|
while (position < length) {
|
||||||
@@ -56,7 +56,8 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
|||||||
previous = current;
|
previous = current;
|
||||||
current = current->next;
|
current = current->next;
|
||||||
}
|
}
|
||||||
added = &ZI_WORK->uwdNodes[ZI_WORK->uwdCount++];
|
length = ZI_WORK->uwdCount++;
|
||||||
|
added = &ZI_WORK->uwdNodes[length];
|
||||||
if (previous == 0) {
|
if (previous == 0) {
|
||||||
ZI_WORK->uwdList = added;
|
ZI_WORK->uwdList = added;
|
||||||
added->next = current;
|
added->next = current;
|
||||||
@@ -86,24 +87,23 @@ void Zi8_8148047C(ziPtr __zi8_work_data) {
|
|||||||
ZI_WORK->uwdList = 0;
|
ZI_WORK->uwdList = 0;
|
||||||
}
|
}
|
||||||
ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||||
ziUserDictionary* dictionary;
|
ziWChar folded;
|
||||||
|
int fallback = 0;
|
||||||
|
int visited = 0;
|
||||||
|
int prefixLength;
|
||||||
|
int position, previousOffset;
|
||||||
|
ziU32 size;
|
||||||
|
ziU8 entryLanguage;
|
||||||
|
ziU32 entryLength;
|
||||||
ziU8* cursor;
|
ziU8* cursor;
|
||||||
ziU8* begin;
|
ziU8* begin;
|
||||||
ziU8* boundary;
|
ziU8* boundary;
|
||||||
ziU8* end;
|
ziU8* end;
|
||||||
|
ziUserWord* candidate;
|
||||||
ziUserWord* previous;
|
ziUserWord* previous;
|
||||||
|
ziUserWord* result;
|
||||||
|
ziUserDictionary* dictionary;
|
||||||
int firstSegment;
|
int firstSegment;
|
||||||
ziU32 size;
|
|
||||||
int headerSize;
|
|
||||||
int entryLanguage;
|
|
||||||
volatile int entryLength;
|
|
||||||
int previousOffset;
|
|
||||||
int visited = 0;
|
|
||||||
int fallback = 0;
|
|
||||||
ziWChar folded;
|
|
||||||
ziU8* text;
|
|
||||||
int position;
|
|
||||||
int prefixLength;
|
|
||||||
Zi8LogError(100, __zi8_work_data);
|
Zi8LogError(100, __zi8_work_data);
|
||||||
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||||
Zi8ReplaceLastError(0x19C, __zi8_work_data);
|
Zi8ReplaceLastError(0x19C, __zi8_work_data);
|
||||||
@@ -111,17 +111,16 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
|||||||
}
|
}
|
||||||
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
||||||
if (continuation != 0) {
|
if (continuation != 0) {
|
||||||
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
|
result = Zi8_814803F4(__zi8_work_data);
|
||||||
entryLength = 0;
|
entryLength = 0;
|
||||||
if (text != 0) {
|
if (result != 0) {
|
||||||
language = ((ziUserWord*)text)->language;
|
entryLanguage = result->language;
|
||||||
entryLength = ((ziUserWord*)text)->length;
|
entryLength = result->length;
|
||||||
if (entryLength >= capacity) {
|
if (entryLength >= capacity) {
|
||||||
Zi8_8148047C(__zi8_work_data);
|
Zi8_8148047C(__zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
text = ((ziUserWord*)text)->text;
|
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
|
||||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
|
|
||||||
}
|
}
|
||||||
return entryLength;
|
return entryLength;
|
||||||
}
|
}
|
||||||
@@ -131,20 +130,17 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
|||||||
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
|
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
|
||||||
else {
|
else {
|
||||||
prefixLength = 0;
|
prefixLength = 0;
|
||||||
for (position = currentLength - 2; position >= 0;) {
|
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
|
||||||
if (currentWord[position] == 0x20) break;
|
|
||||||
position--;
|
|
||||||
prefixLength++;
|
|
||||||
}
|
|
||||||
position++;
|
position++;
|
||||||
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
||||||
else {
|
else {
|
||||||
ZI_WORK->unk_0x140 = 1;
|
ZI_WORK->unk_0x140 = 1;
|
||||||
ZI_WORK->unk_0x141[prefixLength + 4] = ZI_WORK->unk_0x141[0] = prefixLength + 5;
|
ZI_WORK->unk_0x141[0] = prefixLength + 5;
|
||||||
|
ZI_WORK->unk_0x141[prefixLength + 4] = prefixLength + 5;
|
||||||
ZI_WORK->unk_0x141[1] = language;
|
ZI_WORK->unk_0x141[1] = language;
|
||||||
ZI_WORK->unk_0x141[2] = prefixLength;
|
ZI_WORK->unk_0x141[2] = prefixLength;
|
||||||
previousOffset = 4;
|
previousOffset = 4;
|
||||||
while (prefixLength > 0) {
|
for (; prefixLength > 0; prefixLength--, position++) {
|
||||||
folded = currentWord[position];
|
folded = currentWord[position];
|
||||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||||
@@ -156,56 +152,48 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
|||||||
ZI_WORK->unk_0x140 = 0;
|
ZI_WORK->unk_0x140 = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
prefixLength--;
|
|
||||||
position++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ZI_WORK->unk_0x140 == 0 && length == 0) return 0;
|
if (ZI_WORK->unk_0x140 == 0 && length == 0) return 0;
|
||||||
rescan:
|
rescan:
|
||||||
cursor = begin = dictionary->entries + dictionary->current;
|
begin = dictionary->entries + dictionary->current;
|
||||||
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
||||||
end = (ziU8*)dictionary + dictionary->end + 7;
|
end = (ziU8*)dictionary + dictionary->end + 7;
|
||||||
|
cursor = begin;
|
||||||
if (begin < boundary) firstSegment = 1;
|
if (begin < boundary) firstSegment = 1;
|
||||||
else firstSegment = 0;
|
else firstSegment = 0;
|
||||||
while ((cursor < boundary && firstSegment) || (cursor < end && !firstSegment)) {
|
while (firstSegment ? cursor < boundary : cursor < end) {
|
||||||
size = *cursor;
|
size = *cursor;
|
||||||
if ((ziS32)ZI_WORK->unk_0x13C > visited++ || (((ziUserWord*)cursor)->size & 0xC0) != 0) {
|
candidate = (ziUserWord*)cursor;
|
||||||
next:
|
position = visited++;
|
||||||
if ((cursor += size) > end) {
|
if ((ziS32)ZI_WORK->unk_0x13C <= position && (size & 0xC0) == 0) {
|
||||||
if (firstSegment) break;
|
|
||||||
firstSegment = 1;
|
|
||||||
size = cursor - end - 1;
|
|
||||||
cursor = dictionary->entries + size;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
previous = (ziUserWord*)(cursor + size);
|
previous = (ziUserWord*)(cursor + size);
|
||||||
if ((ziU8*)previous > end) previous = (ziUserWord*)(dictionary->entries + (cursor - end - 1));
|
if ((ziU8*)previous > end) previous = (ziUserWord*)(cursor + ((ziU8*)dictionary - end) + 7);
|
||||||
text = cursor;
|
entryLanguage = candidate->language;
|
||||||
headerSize = *text++;
|
entryLength = candidate->length;
|
||||||
entryLanguage = *text++;
|
if (entryLanguage == language && length <= entryLength && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
|
||||||
entryLength = *text++;
|
|
||||||
text++;
|
|
||||||
if (entryLanguage == language && entryLength >= length && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
|
|
||||||
for (position = 0; position < length; position++) {
|
for (position = 0; position < length; position++) {
|
||||||
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF010) {
|
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF010) {
|
||||||
if (pattern[position] != Zi8ConvertUC2Key(text[position], language, __zi8_work_data)) goto next;
|
folded = Zi8ConvertUC2WC(candidate->text[position], language, __zi8_work_data);
|
||||||
} else {
|
|
||||||
folded = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
|
|
||||||
if (folded != pattern[position] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[position])) goto next;
|
if (folded != pattern[position] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[position])) goto next;
|
||||||
}
|
} else if (pattern[position] != Zi8ConvertUC2Key(candidate->text[position], language, __zi8_work_data)) goto next;
|
||||||
}
|
}
|
||||||
if (ZI_WORK->unk_0x140 != 0) {
|
if (ZI_WORK->unk_0x140 != 0) {
|
||||||
if (ZI_WORK->unk_0x141[0] != previous->size || ZI_WORK->unk_0x141[1] != previous->language || ZI_WORK->unk_0x141[2] != previous->length) goto next;
|
if (ZI_WORK->unk_0x141[0] != previous->size || ZI_WORK->unk_0x141[1] != previous->language || ZI_WORK->unk_0x141[2] != previous->length) goto next;
|
||||||
prefixLength = 4;
|
for (position = 4; position < ZI_WORK->unk_0x141[2] + 4; position++) {
|
||||||
position = ZI_WORK->unk_0x141[2] + 4;
|
if (ZI_WORK->unk_0x141[position] != ((ziU8*)previous)[position] && ZI_WORK->unk_0x184[position] != ((ziU8*)previous)[position]) goto next;
|
||||||
for (; prefixLength < position; prefixLength++) {
|
|
||||||
if (ZI_WORK->unk_0x141[prefixLength] != ((ziU8*)previous)[prefixLength] && ZI_WORK->unk_0x184[prefixLength] != ((ziU8*)previous)[prefixLength]) goto next;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Zi8_81480224((ziUserWord*)cursor, __zi8_work_data);
|
Zi8_81480224(candidate, __zi8_work_data);
|
||||||
}
|
}
|
||||||
goto next;
|
}
|
||||||
|
next:
|
||||||
|
cursor += size;
|
||||||
|
if (end < cursor) {
|
||||||
|
if (firstSegment) break;
|
||||||
|
firstSegment = 1;
|
||||||
|
cursor = dictionary->entries + (cursor - end - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ZI_WORK->unk_0x140 != 0 && length != 0) {
|
if (ZI_WORK->unk_0x140 != 0 && length != 0) {
|
||||||
@@ -213,24 +201,23 @@ next:
|
|||||||
visited = 0;
|
visited = 0;
|
||||||
goto rescan;
|
goto rescan;
|
||||||
}
|
}
|
||||||
if (length == 1 && complete != 0 && continuation == 0) {
|
if (complete == 1 && length != 0 && continuation == 0) {
|
||||||
complete = 0;
|
complete = 0;
|
||||||
fallback = 1;
|
fallback = 1;
|
||||||
visited = 0;
|
visited = 0;
|
||||||
goto rescan;
|
goto rescan;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
|
result = Zi8_814803F4(__zi8_work_data);
|
||||||
if (text != 0) {
|
entryLength = 0;
|
||||||
language = ((ziUserWord*)text)->language;
|
if (result != 0) {
|
||||||
entryLength = ((ziUserWord*)text)->length;
|
entryLanguage = result->language;
|
||||||
|
entryLength = result->length;
|
||||||
if (entryLength >= capacity) {
|
if (entryLength >= capacity) {
|
||||||
Zi8_8148047C(__zi8_work_data);
|
Zi8_8148047C(__zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
text = ((ziUserWord*)text)->text;
|
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
|
||||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
|
|
||||||
return entryLength;
|
|
||||||
}
|
}
|
||||||
return 0;
|
return entryLength;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include <zi8clib/zierror.h>
|
#include <zi8clib/zierror.h>
|
||||||
#include <zi8clib/zitypes.h>
|
#include <zi8clib/zitypes.h>
|
||||||
|
|
||||||
extern const ziU16 nodeHeaderTable[16];
|
extern ziU16 nodeHeaderTable[16];
|
||||||
|
|
||||||
ziU32 ZiDAWGGetChild(ziU32 node) {
|
ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||||
ziU32 base;
|
ziU32 base;
|
||||||
@@ -22,10 +22,11 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
|||||||
node += offset;
|
node += offset;
|
||||||
if (((ziU32)header & 2) != 0) {
|
if (((ziU32)header & 2) != 0) {
|
||||||
if ((*(ziU8*)node & 0x80) != 0) {
|
if ((*(ziU8*)node & 0x80) != 0) {
|
||||||
offset = ((*(ziU8*)node & 0x7f) << 16) +
|
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
|
||||||
((((ziU32)*((ziU8*)node + 1) & 0xffff) << 8) + *((ziU8*)node + 2)) + 0x8000;
|
offset += *((ziU8*)node + 2);
|
||||||
} else {
|
} else {
|
||||||
offset = (((ziU32)*(ziU8*)node & 0xffff) << 8) + (ziU32)*((ziU8*)node + 1);
|
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
|
||||||
|
offset += (ziU32)*((ziU8*)node + 1);
|
||||||
}
|
}
|
||||||
} else if (((ziU32)header & 8) != 0) {
|
} else if (((ziU32)header & 8) != 0) {
|
||||||
if ((*(ziU8*)node & 0x80) != 0) {
|
if ((*(ziU8*)node & 0x80) != 0) {
|
||||||
@@ -41,50 +42,41 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
|||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct ziDawgLongOffset {
|
ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||||
ziU8 flags;
|
|
||||||
ziU8 middle;
|
|
||||||
ziU8 low;
|
|
||||||
} ziDawgLongOffset;
|
|
||||||
typedef char ziDawgLongOffsetSizeCheck[(sizeof(ziDawgLongOffset) == 3) ? 1 : -1];
|
|
||||||
|
|
||||||
ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
|
||||||
ziS32 depth;
|
|
||||||
ziU8* node;
|
|
||||||
ziU16 header;
|
ziU16 header;
|
||||||
|
ziU8* cursor = node;
|
||||||
|
ziS32 depth;
|
||||||
ziS32 offset;
|
ziS32 offset;
|
||||||
|
|
||||||
depth = 0;
|
depth = 0;
|
||||||
node = cursor;
|
|
||||||
offset = 0;
|
offset = 0;
|
||||||
header = nodeHeaderTable[cursor[0] >> 4];
|
header = nodeHeaderTable[node[0] >> 4];
|
||||||
if ((header & 4) == 0) {
|
if ((header & 4) == 0) {
|
||||||
return 0;
|
node = 0;
|
||||||
} else {
|
} else {
|
||||||
if ((header & 8) != 0) {
|
if ((header & 8) != 0) {
|
||||||
if ((cursor[0] & 0xf) == 0xf) {
|
if ((node[0] & 0xf) == 0xf) {
|
||||||
cursor += 2;
|
node += 2;
|
||||||
} else {
|
} else {
|
||||||
cursor += 1;
|
node += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((header & 2) != 0) {
|
if ((header & 2) != 0) {
|
||||||
if ((*cursor & 0x80) != 0) {
|
if ((*node & 0x80) == 0) {
|
||||||
cursor += 3;
|
node += 2;
|
||||||
} else {
|
} else {
|
||||||
cursor += 2;
|
node += 3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((*cursor & 0x80) != 0) {
|
if ((*node & 0x80) != 0) {
|
||||||
node += (((const ziDawgLongOffset*)cursor)->flags & 0x7f) * 0x10000 +
|
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
|
||||||
(((ziU32)(ziU16)cursor[1] << 8) +
|
(ziU32)node[2] + 0x8000;
|
||||||
((const ziDawgLongOffset*)cursor)->low) + 0x8000;
|
|
||||||
} else {
|
} else {
|
||||||
node = cursor[1] + (node + (ziU16)*cursor * 0x100);
|
node += (ziU16)*node * 0x100 + (ziU32)node[1];
|
||||||
}
|
}
|
||||||
return node;
|
|
||||||
} else {
|
} else {
|
||||||
|
cursor = node;
|
||||||
do {
|
do {
|
||||||
header = nodeHeaderTable[cursor[0] >> 4];
|
header = nodeHeaderTable[cursor[0] >> 4];
|
||||||
if ((cursor[0] & 0xf) == 0xf) {
|
if ((cursor[0] & 0xf) == 0xf) {
|
||||||
@@ -96,16 +88,14 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((header & 1) != 0) {
|
if ((header & 1) != 0) {
|
||||||
if ((header & 2) != 0) {
|
if ((header & 2) == 0) {
|
||||||
if ((*cursor & 0x80) != 0) {
|
|
||||||
cursor += 3;
|
|
||||||
offset += 3;
|
|
||||||
} else {
|
|
||||||
cursor += 2;
|
|
||||||
offset += 2;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
depth++;
|
depth++;
|
||||||
|
} else if ((*cursor & 0x80) != 0) {
|
||||||
|
cursor += 3;
|
||||||
|
offset += 3;
|
||||||
|
} else {
|
||||||
|
cursor += 2;
|
||||||
|
offset += 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,17 +113,18 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
|||||||
}
|
}
|
||||||
} while (0 < depth);
|
} while (0 < depth);
|
||||||
|
|
||||||
return node + offset;
|
node += offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
ziU8 ZiDAWGgetEOWattribute(ziU32 node) {
|
ziU8 ZiDAWGgetEOWattribute(ziU32 node) {
|
||||||
return (nodeHeaderTable[*(ziU8*)node >> 4] & 0x10) > 0;
|
return (nodeHeaderTable[*(ziU8*)node >> 4] & 0x10) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ziU32 ZiDAWGgetCHARattribute(zi8DawgCtx* context, ziU32 node, ziPtr __zi8_work_data) {
|
ziU32 ZiDAWGgetCHARattribute(ziPtr context, ziU32 node, ziPtr __zi8_work_data) {
|
||||||
ziU8 key;
|
ziU8 key;
|
||||||
ziU32 attribute;
|
ziU32 attribute;
|
||||||
|
|
||||||
@@ -143,15 +134,15 @@ ziU32 ZiDAWGgetCHARattribute(zi8DawgCtx* context, ziU32 node, ziPtr __zi8_work_d
|
|||||||
key = (ziU32)*(ziU8*)node & 0xf;
|
key = (ziU32)*(ziU8*)node & 0xf;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (key > context->cap) {
|
if (key > ((zi8DawgCtx*)context)->cap) {
|
||||||
Zi8LogError(0x138b, __zi8_work_data);
|
Zi8LogError(0x138b, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
attribute = key << 24;
|
attribute = key << 24;
|
||||||
attribute |= ((ziU8*)context->p0C)[key] << 16;
|
attribute |= ((ziU8*)((zi8DawgCtx*)context)->p0C)[key] << 16;
|
||||||
attribute |= (((ziU32)((ziU8*)context->p08)[key * 2] & 0xFFFF) << 8) +
|
attribute += ((ziU32)((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2] & 0xFFFF) << 8;
|
||||||
((ziU8*)context->p08 + key * 2)[1];
|
attribute += ((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2 + 1];
|
||||||
Zi8LogError(0x64, __zi8_work_data);
|
Zi8LogError(0x64, __zi8_work_data);
|
||||||
return attribute;
|
return attribute;
|
||||||
}
|
}
|
||||||
@@ -164,55 +155,60 @@ ziU32 ZiDAWGGetGraph(ziPtr context) {
|
|||||||
|
|
||||||
ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||||
ziU32 graph;
|
ziU32 graph;
|
||||||
ziU8 depth;
|
|
||||||
ziU32 end;
|
|
||||||
ziS32 result;
|
ziS32 result;
|
||||||
|
ziU32 end;
|
||||||
|
ziU8 depth;
|
||||||
|
ziU32 pair;
|
||||||
|
|
||||||
graph = ZiDAWGGetGraph(context);
|
graph = ZiDAWGGetGraph(context);
|
||||||
result = 0;
|
result = 0;
|
||||||
if ((((ziU16)entry[0] << 8) + entry[1]) != 0 || (((ziU16)entry[2] << 8) + entry[3]) != 0) {
|
pair = (((ziU16)entry[0] << 8) + entry[1]);
|
||||||
|
if (pair != 0) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
pair = (((ziU16)entry[2] << 8) + entry[3]);
|
||||||
entry += 10;
|
if (pair == 0) {
|
||||||
depth = 0;
|
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||||
while ((depth < 2) && (*keys != 0)) {
|
entry += 10;
|
||||||
if (*keys >= 0xeff1 && *keys <= 0xf010) {
|
depth = 0;
|
||||||
goto checkEntry;
|
while ((depth < 2) && (*keys != 0)) {
|
||||||
|
if ((*keys < 0xeff1) || (0xf010 < *keys)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
if (*keys == (ziS32)(((ziU16)entry[2] << 8) + entry[3])) {
|
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
entry += (((ziU16)entry[0] << 8) + entry[1]) * 10 + 10;
|
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
|
||||||
checkEntry:
|
|
||||||
if (((ziU32)entry >= end) ||
|
if (((ziU32)entry >= end) ||
|
||||||
(*keys == (ziS32)(((ziU16)entry[2] << 8) + entry[3]))) {
|
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((ziU32)entry >= end) {
|
if ((ziU32)entry >= end) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = graph + (ziU32)entry[4] * 0x10000 + (((ziU16)entry[5] << 8) + entry[6]);
|
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
|
||||||
((zi8DawgCtx*)context)->unk_0x338 =
|
entry[6];
|
||||||
graph + (ziU32)entry[7] * 0x10000 + (((ziU16)entry[8] << 8) + entry[9]);
|
((zi8DawgCtx*)context)->unk_0x338 =
|
||||||
if (((zi8DawgCtx*)context)->unk_0x338 == graph) {
|
graph + (ziU32)entry[7] * 0x10000 + ((ziU16)entry[8] << 8) +
|
||||||
((zi8DawgCtx*)context)->unk_0x338 = 0;
|
entry[9];
|
||||||
}
|
if (((zi8DawgCtx*)context)->unk_0x338 == graph) {
|
||||||
|
((zi8DawgCtx*)context)->unk_0x338 = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if ((((ziU16)entry[0] << 8) + entry[1]) == 0) {
|
if ((entry[1] + ((ziU16)entry[0] << 8)) == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
end = (((ziU16)entry[0] << 8) + entry[1]) * 10 + ((ziU32)entry + 10);
|
end = (ziU32)(entry + (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10);
|
||||||
entry += 10;
|
entry += 10;
|
||||||
depth++;
|
depth++;
|
||||||
keys++;
|
keys++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
||||||
ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
||||||
|
|
||||||
ziU8 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
|
ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
|
||||||
ziU16 i;
|
ziU16 i;
|
||||||
ziU8* table;
|
ziU8* table;
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ ziU8 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr wo
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
||||||
|
|
||||||
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||||
ziPtr workData) {
|
ziPtr workData) {
|
||||||
@@ -97,9 +97,9 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
|||||||
|
|
||||||
result = 0;
|
result = 0;
|
||||||
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
|
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
|
||||||
if (Zi8LookupKoreanChar(buffer[currentCharacter], &state.characterIndex,
|
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
|
||||||
&state.inputIndex, workData) != 0) {
|
&state.inputIndex, workData) != 0) {
|
||||||
state.matched = Zi8MatchKoreanSequence(&state.nextIndex,
|
state.matched = Zi8_81481E6C(&state.nextIndex,
|
||||||
buffer + currentCharacter + 1,
|
buffer + currentCharacter + 1,
|
||||||
state.characterIndex,
|
state.characterIndex,
|
||||||
(state.elementIndex - currentCharacter) - 1,
|
(state.elementIndex - currentCharacter) - 1,
|
||||||
@@ -235,7 +235,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
|
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
|
||||||
ziU16 nestedScratch;
|
ziU16 nestedScratch;
|
||||||
ziU16 nestedIndexStorage;
|
ziU16 nestedIndexStorage;
|
||||||
ziU16 index1;
|
ziU16 index1;
|
||||||
@@ -375,8 +375,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
|
|||||||
}
|
}
|
||||||
if ((index3 >= tableCount) || (firstCharacter != (table + index3 * 4)[2]) ||
|
if ((index3 >= tableCount) || (firstCharacter != (table + index3 * 4)[2]) ||
|
||||||
(input[1] != (table + index3 * 4)[1]) || (input[0] != table[index3 * 4])) {
|
(input[1] != (table + index3 * 4)[1]) || (input[0] != table[index3 * 4])) {
|
||||||
if ((Zi8LookupKoreanChar(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
if ((Zi8_814813FC(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
|
(Zi8_81481E6C(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
|
||||||
*resultIndex = index1;
|
*resultIndex = index1;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -397,8 +397,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
|
|||||||
if ((index4 >= tableCount) || (firstCharacter != (table + index4 * 4)[3]) ||
|
if ((index4 >= tableCount) || (firstCharacter != (table + index4 * 4)[3]) ||
|
||||||
(input[2] != (table + index4 * 4)[2]) || (input[1] != (table + index4 * 4)[1]) ||
|
(input[2] != (table + index4 * 4)[2]) || (input[1] != (table + index4 * 4)[1]) ||
|
||||||
(input[0] != table[index4 * 4])) {
|
(input[0] != table[index4 * 4])) {
|
||||||
if ((Zi8LookupKoreanChar(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
if ((Zi8_814813FC(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
|
(Zi8_81481E6C(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
|
||||||
*resultIndex = index2;
|
*resultIndex = index2;
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
@@ -409,8 +409,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
|
|||||||
*resultIndex = index4;
|
*resultIndex = index4;
|
||||||
return 4;
|
return 4;
|
||||||
}
|
}
|
||||||
if ((Zi8LookupKoreanChar(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
if ((Zi8_814813FC(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
|
(Zi8_81481E6C(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
|
||||||
*resultIndex = index3;
|
*resultIndex = index3;
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,134 +20,127 @@ typedef struct ziChineseEntry {
|
|||||||
ziU8 offsetLow[2];
|
ziU8 offsetLow[2];
|
||||||
} ziChineseEntry;
|
} ziChineseEntry;
|
||||||
|
|
||||||
ziU32 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
||||||
ziU8 Zi8GetFormatVersion(ziU8 ZI_NEED_WORK);
|
ziU8 Zi8GetFormatVersion(ziU8 ZI_NEED_WORK);
|
||||||
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||||
|
|
||||||
typedef struct ziEncodedOrdinal {
|
|
||||||
ziU8 low;
|
|
||||||
ziU8 high;
|
|
||||||
} ziEncodedOrdinal;
|
|
||||||
typedef char ziEncodedOrdinalSizeCheck[(sizeof(ziEncodedOrdinal) == 2) ? 1 : -1];
|
|
||||||
|
|
||||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||||
ziChineseEntry* table = 0;
|
int count;
|
||||||
ziU8* baseData = 0;
|
int offset;
|
||||||
ziU8 group = 0;
|
ziU8 group;
|
||||||
ziU8 remaining = 0;
|
ziU8 remaining;
|
||||||
ziU16 value = 0;
|
ziU16 value;
|
||||||
|
ziWChar* cursor;
|
||||||
|
ziSearchState search;
|
||||||
ziGetParam request;
|
ziGetParam request;
|
||||||
ziWChar ordinals[65];
|
ziWChar ordinals[65];
|
||||||
int count;
|
int length;
|
||||||
int countLeft;
|
int unmatched;
|
||||||
ziChineseEntry* entry;
|
ziChineseEntry* entry;
|
||||||
ziWChar* cursor;
|
|
||||||
ziU8* data;
|
ziU8* data;
|
||||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||||
ziU32 savedFormats = ZI_WORK->formats;
|
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||||
ziU8 savedCount = ZI_WORK->formatCount;
|
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||||
ziSearchState search = {0};
|
search.flags = 0;
|
||||||
|
search.word = 0;
|
||||||
|
search.length = 0;
|
||||||
|
search.position = 0;
|
||||||
|
search.capacity = 0;
|
||||||
|
search.options = 0;
|
||||||
Zi8LogError(100, __zi8_work_data);
|
Zi8LogError(100, __zi8_work_data);
|
||||||
if (word == 0 || *word == 0) {
|
if (word == 0 || *word == 0) {
|
||||||
Zi8ReplaceLastError(300, __zi8_work_data);
|
Zi8ReplaceLastError(300, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (language != 1) {
|
if (language != 1) {
|
||||||
for (count = 0; word[count] != 0; count++) {
|
for (length = 0; word[length] != 0; length++) {
|
||||||
if (word[count] >= 0xEFF1 || count == 64) return 0;
|
if (word[length] >= 0xEFF1 || length == 64) return 0;
|
||||||
}
|
}
|
||||||
((ziU8*)&search.length)[0] = count;
|
((ziU8*)&search.length)[0] = length;
|
||||||
((ziU8*)&search.flags)[2] = 1;
|
((ziU8*)&search.flags)[2] = 1;
|
||||||
search.word = word;
|
|
||||||
((ziU16*)&search.capacity)[0] = 64;
|
((ziU16*)&search.capacity)[0] = 64;
|
||||||
|
search.word = word;
|
||||||
request.language = language;
|
request.language = language;
|
||||||
request.getMode = 0;
|
request.getMode = 0;
|
||||||
request.subLanguage = 7;
|
request.subLanguage = 7;
|
||||||
request.context = 1;
|
request.context = 1;
|
||||||
request.getOptions = 0x81;
|
request.getOptions = 0x81;
|
||||||
request.elements = word;
|
request.elements = word;
|
||||||
request.elementCount = count;
|
request.elementCount = length;
|
||||||
request.currentWord = 0;
|
request.currentWord = 0;
|
||||||
request.wordCharCount = 0;
|
request.wordCharCount = 0;
|
||||||
request.candidates = ordinals;
|
request.candidates = ordinals;
|
||||||
request.maxCandidates = 1;
|
request.maxCandidates = 1;
|
||||||
request.firstCandidate = 0;
|
request.firstCandidate = 0;
|
||||||
ZI_WORK->formats = (ziU32)formats;
|
ZI_WORK->unk_0x1410 = (ziU32)formats;
|
||||||
if (ZI_WORK->unk_0x1C[0] == 2) {
|
if (ZI_WORK->unk_0x1C[0] == 2) {
|
||||||
ZI_WORK->formatCount = 0;
|
ZI_WORK->unk_0x1418 = 0;
|
||||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 1;
|
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 1;
|
||||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 2;
|
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 2;
|
||||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 3;
|
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 3;
|
||||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 4;
|
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 4;
|
||||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 5;
|
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 5;
|
||||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 6;
|
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 6;
|
||||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 7;
|
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 7;
|
||||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 8;
|
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 8;
|
||||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->formatCount = 2;
|
} else if (ZI_WORK->unk_0x1C[0] == 0) ZI_WORK->unk_0x1418 = 1;
|
||||||
else ZI_WORK->formatCount = 1;
|
else ZI_WORK->unk_0x1418 = 2;
|
||||||
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
||||||
ZI_WORK->formats = savedFormats;
|
ZI_WORK->unk_0x1410 = savedFormats;
|
||||||
ZI_WORK->formatCount = savedCount;
|
ZI_WORK->unk_0x1418 = savedCount;
|
||||||
if (count != 0) return 1;
|
if (count != 0) return 1;
|
||||||
}
|
}
|
||||||
if (language != 1) {
|
if (language == 1) {
|
||||||
Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
length = 0;
|
||||||
return 0;
|
do {
|
||||||
}
|
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||||
{
|
if (ordinals[length] == 0xFFFF) return 0;
|
||||||
count = 0;
|
length++;
|
||||||
while (word[count] != 0) {
|
if (length == 64) return 0;
|
||||||
ordinals[count] = Zi8Uni2Ord(word[count], __zi8_work_data);
|
} while (word[length] != 0);
|
||||||
if (ordinals[count] == 0xFFFF) return 0;
|
|
||||||
count++;
|
|
||||||
if (count == 64) return 0;
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
if (count-- == 1) return 1;
|
if (length == 1) return 1;
|
||||||
|
count = --length;
|
||||||
ordinals[count] |= 0x8000;
|
ordinals[count] |= 0x8000;
|
||||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||||
table = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data);
|
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||||
entry = table + ordinals[0];
|
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||||
baseData = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
|
if (ZI_WORK->unk_0x16 != 0) {
|
||||||
baseData += ((entry->offsetHigh & 15) << 16 | (entry->offsetLow[1] | (entry->offsetLow[0] << 8)));
|
|
||||||
data = baseData;
|
|
||||||
if (ZI_WORK->cangjieEnabled != 0) {
|
|
||||||
switch (*data & 7) {
|
switch (*data & 7) {
|
||||||
case 2:
|
case 2:
|
||||||
countLeft = 2;
|
offset = 2;
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
case 4:
|
case 4:
|
||||||
countLeft = 3;
|
offset = 3;
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
countLeft = 4;
|
offset = 4;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
countLeft = 1;
|
offset = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
data += countLeft;
|
data += offset;
|
||||||
}
|
}
|
||||||
if ((*data & 0x80) != 0) {
|
if ((*data & 0x80) == 0) return 0;
|
||||||
group = 0;
|
group = 0;
|
||||||
data += ((*data & 0x7F) >> 4) + 1;
|
data += ((*data & 0x7F) >> 4) + 1;
|
||||||
} else return 0;
|
|
||||||
while ((group & 0x80) == 0) {
|
while ((group & 0x80) == 0) {
|
||||||
group = *data++;
|
group = *data++;
|
||||||
for (remaining = group & 15; remaining != 0; remaining--) {
|
for (remaining = group & 15; remaining != 0; remaining--) {
|
||||||
countLeft = count;
|
unmatched = count;
|
||||||
cursor = ordinals;
|
cursor = ordinals;
|
||||||
while (countLeft > 0) {
|
while (unmatched > 0) {
|
||||||
value = ((ziU32)(ziU16)data[1] << 8) |
|
value = data[0] | (data[1] << 8);
|
||||||
((const ziEncodedOrdinal*)data)->low;
|
|
||||||
data += 2;
|
data += 2;
|
||||||
if (value != *++cursor) break;
|
cursor++;
|
||||||
countLeft--;
|
if (value != *cursor) break;
|
||||||
|
unmatched--;
|
||||||
if (value & 0x8000) break;
|
if (value & 0x8000) break;
|
||||||
}
|
}
|
||||||
if (countLeft == 0) return 1;
|
if (unmatched == 0) return 1;
|
||||||
if (!(value & 0x8000)) {
|
if (!(value & 0x8000)) {
|
||||||
data++;
|
data++;
|
||||||
while (!(*data & 0x80)) data += 2;
|
while (!(*data & 0x80)) data += 2;
|
||||||
@@ -158,7 +151,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
|||||||
Zi8LogError(0x2BD, __zi8_work_data);
|
Zi8LogError(0x2BD, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
|||||||
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
||||||
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
|
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
|
||||||
|
|
||||||
ziBool Zi8MapKeyCode(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
ziBool Zi8_81484484(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
||||||
if (character == 0xeffa) {
|
if (character == 0xeffa) {
|
||||||
*output = 0;
|
*output = 0;
|
||||||
} else if ((character >= 0xeff1) && (character <= 0xeff9)) {
|
} else if ((character >= 0xeff1) && (character <= 0xeff9)) {
|
||||||
@@ -58,7 +58,7 @@ ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, zi
|
|||||||
*chars = 0;
|
*chars = 0;
|
||||||
if (ZI_WORK->userKeys[language] != 0) {
|
if (ZI_WORK->userKeys[language] != 0) {
|
||||||
customTable = ZI_WORK->userKeys[language];
|
customTable = ZI_WORK->userKeys[language];
|
||||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data)) {
|
if (!Zi8_81484484(key, &key, __zi8_work_data)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
keyChars = customTable->lower[key];
|
keyChars = customTable->lower[key];
|
||||||
@@ -87,7 +87,7 @@ tables_ready:
|
|||||||
Zi8ReplaceLastError(0x962, __zi8_work_data);
|
Zi8ReplaceLastError(0x962, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
if (!Zi8_81484484(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
||||||
Zi8ReplaceLastError(300, __zi8_work_data);
|
Zi8ReplaceLastError(300, __zi8_work_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word
|
|||||||
index = ZI_WORK->oemIdx;
|
index = ZI_WORK->oemIdx;
|
||||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||||
if ((ziS32)length >= (ziS32)--capacity) {
|
capacity--;
|
||||||
|
if ((ziS32)length >= (ziS32)capacity) {
|
||||||
failed:
|
failed:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
|
|||||||
|
|
||||||
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
||||||
|
|
||||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
|
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
|
||||||
|
|
||||||
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
||||||
void bta_dm_immediate_disable(void);
|
void bta_dm_immediate_disable(void);
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
|
|||||||
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
||||||
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
||||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||||
UINT8 enable);
|
UINT8 enable);
|
||||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
||||||
UINT8 L2CA_Flush(UINT16 cid);
|
UINT8 L2CA_Flush(UINT16 cid);
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ typedef struct UHF_MSC_MESSAGE {
|
|||||||
} UHF_MSC_MESSAGE;
|
} UHF_MSC_MESSAGE;
|
||||||
|
|
||||||
extern UHF_MSC_DEVICE uhg_msc_blk_device_tbl[8];
|
extern UHF_MSC_DEVICE uhg_msc_blk_device_tbl[8];
|
||||||
extern s32 uhg_msc_memid;
|
extern s32 uhg_msc_memid_8169971C;
|
||||||
s32 uhf_ker_set_priority(s32 task_id, s32 priority);
|
s32 uhf_ker_set_priority(s32 task_id, s32 priority);
|
||||||
void* uhf_ker_get_memory_block(s32 pool, u32 size, u32 alignment);
|
void* uhf_ker_get_memory_block(s32 pool, u32 size, u32 alignment);
|
||||||
s32 uhf_ker_release_memory_block(s32 pool, void* block);
|
s32 uhf_ker_release_memory_block(s32 pool, void* block);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <revolution/types.h>
|
#include <revolution/types.h>
|
||||||
|
|
||||||
s32 uhf_ker_create_sem(u32 initCount, int flags);
|
s32 uhf_ker_create_sem(u32 param_1, int param_2);
|
||||||
s32 uhf_ker_delete_sem(int sem);
|
s32 uhf_ker_delete_sem(int sem);
|
||||||
|
|
||||||
s32 uhf_ker_get_sem(int sem);
|
s32 uhf_ker_get_sem(int sem);
|
||||||
|
|||||||
@@ -242,8 +242,8 @@ typedef struct WPADCB {
|
|||||||
WPADCallback getInfoCB; // 0x988
|
WPADCallback getInfoCB; // 0x988
|
||||||
u8 getInfoBusy; // 0x98C
|
u8 getInfoBusy; // 0x98C
|
||||||
|
|
||||||
u8 encStatus; // 0x98D
|
u8 unk_0x98D; // 0x98D
|
||||||
u8 continuous; // 0x98E
|
u8 unk_0x98E; // 0x98E
|
||||||
u8 unk_0x98F[0x9A0 - 0x990];
|
u8 unk_0x98F[0x9A0 - 0x990];
|
||||||
} WPADCB;
|
} WPADCB;
|
||||||
|
|
||||||
@@ -261,7 +261,7 @@ void WPADiExcludeButton(s32 chan);
|
|||||||
void WPADiCopyOut(s32 chan);
|
void WPADiCopyOut(s32 chan);
|
||||||
|
|
||||||
BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback);
|
BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback);
|
||||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback);
|
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback);
|
||||||
BOOL WPADiSendEnableDPD(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
BOOL WPADiSendEnableDPD(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||||
BOOL WPADiSendEnableSpeaker(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
BOOL WPADiSendEnableSpeaker(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||||
BOOL WPADiSendGetContStat(WPADCommandQueue* pQueue, WPADInfo* pInfo, WPADCallback pCallback);
|
BOOL WPADiSendGetContStat(WPADCommandQueue* pQueue, WPADInfo* pInfo, WPADCallback pCallback);
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ typedef struct WPADMemBlock {
|
|||||||
int unk_0x04; // 0x04
|
int unk_0x04; // 0x04
|
||||||
s16 unk_0x08; // 0x08
|
s16 unk_0x08; // 0x08
|
||||||
int unk_0x0C; // 0x0C
|
int unk_0x0C; // 0x0C
|
||||||
WPADCallback callback; // 0x10
|
WPADCallback unk_0x10; // 0x10
|
||||||
} WPADMemBlock;
|
} WPADMemBlock;
|
||||||
|
|
||||||
typedef struct WPADGameInfo {
|
typedef struct WPADGameInfo {
|
||||||
|
|||||||
@@ -16,24 +16,24 @@ typedef s32 CXStreamingResult;
|
|||||||
#define CX_STREAMING_ERR_BAD_FILE_TABLE -5
|
#define CX_STREAMING_ERR_BAD_FILE_TABLE -5
|
||||||
|
|
||||||
typedef struct CXUncompContextRL {
|
typedef struct CXUncompContextRL {
|
||||||
u8* outData; // 0x00
|
u8* unk_0x00; // 0x00
|
||||||
int outDataLen; // 0x04
|
int unk_0x04; // 0x04
|
||||||
u32 size; // 0x08
|
u32 size; // 0x08
|
||||||
u16 length; // 0x0C
|
u16 unk_0x0C; // 0x0C
|
||||||
u8 flags; // 0x0E
|
u8 unk_0x0e; // 0x0E
|
||||||
u8 hdrLen; // 0x0F
|
u8 unk_0x0f; // 0x0F
|
||||||
} CXUncompContextRL;
|
} CXUncompContextRL;
|
||||||
|
|
||||||
typedef struct CXUncompContextLZ {
|
typedef struct CXUncompContextLZ {
|
||||||
u8* outData; // 0x00
|
u8* unk_0x00; // 0x00
|
||||||
int outDataLen; // 0x04
|
int unk_0x04; // 0x04
|
||||||
u32 size; // 0x08
|
u32 size; // 0x08
|
||||||
int length; // 0x0C
|
int unk_0x0C; // 0x0C
|
||||||
u8 lengthBytesLeft; // 0x10
|
u8 unk_0x10; // 0x10
|
||||||
u8 flags; // 0x11
|
u8 unk_0x11; // 0x11
|
||||||
u8 flagsLeft; // 0x12
|
u8 unk_0x12; // 0x12
|
||||||
u8 hdrLen; // 0x13
|
u8 unk_0x13; // 0x13
|
||||||
u8 lzType; // 0x14
|
u8 unk_0x14; // 0x14
|
||||||
u8 padding[3];
|
u8 padding[3];
|
||||||
} CXUncompContextLZ;
|
} CXUncompContextLZ;
|
||||||
|
|
||||||
@@ -52,19 +52,19 @@ typedef struct CXUncompContextHuffman {
|
|||||||
u32 size; // 0x08
|
u32 size; // 0x08
|
||||||
CXHuffmanDecodeTableEntry* decodeTable; // 0x0C
|
CXHuffmanDecodeTableEntry* decodeTable; // 0x0C
|
||||||
u32 bits; // 0x10
|
u32 bits; // 0x10
|
||||||
u32 wordBuffer; // 0x14
|
u32 unk_0x14; // 0x14
|
||||||
s16 decodeTableSize; // 0x18
|
s16 decodeTableSize; // 0x18
|
||||||
u8 bitsLeft; // 0x1A
|
u8 bitsLeft; // 0x1A
|
||||||
u8 wordBits; // 0x1B
|
u8 unk_0x1b; // 0x1B
|
||||||
u8 depth; // 0x1C
|
u8 depth; // 0x1C
|
||||||
u8 hdrLen; // 0x1D
|
u8 hdrLen; // 0x1D
|
||||||
u8 padding[2]; // 0x1E
|
u8 padding[2]; // 0x1E
|
||||||
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
|
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
|
||||||
} CXUncompContextHuffman;
|
} CXUncompContextHuffman;
|
||||||
|
|
||||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
|
||||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
|
||||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||||
|
|
||||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||||
|
|||||||
@@ -72,11 +72,7 @@ struct DVDCommandBlock {
|
|||||||
DVDCommandBlock* prev; // 0x04
|
DVDCommandBlock* prev; // 0x04
|
||||||
|
|
||||||
u32 command; // 0x08
|
u32 command; // 0x08
|
||||||
#ifdef BS2_MACH_VOLATILE_DVD_STATE
|
|
||||||
volatile s32 state;
|
|
||||||
#else
|
|
||||||
s32 state; // 0x0C
|
s32 state; // 0x0C
|
||||||
#endif
|
|
||||||
|
|
||||||
u32 offset; // 0x10
|
u32 offset; // 0x10
|
||||||
u32 length; // 0x14
|
u32 length; // 0x14
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ void KPADInit();
|
|||||||
s32 KPADRead(s32 chan, KPADStatus* status, u32 length);
|
s32 KPADRead(s32 chan, KPADStatus* status, u32 length);
|
||||||
|
|
||||||
void KPADSetSensorHeight(s32 chan, f32 sensorHeight);
|
void KPADSetSensorHeight(s32 chan, f32 sensorHeight);
|
||||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* rect, f32 scale);
|
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* param_3, f32 param_4);
|
||||||
|
|
||||||
void KPADSetPosParam(s32 chan, f32 x, f32 y);
|
void KPADSetPosParam(s32 chan, f32 x, f32 y);
|
||||||
void KPADSetBtnRepeat(s32 chan, f32, f32);
|
void KPADSetBtnRepeat(s32 chan, f32, f32);
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
|||||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||||
|
|
||||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||||
|
|
||||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ typedef void (*USBKBDEventCallback)(void*, char*);
|
|||||||
typedef void (*USBKBDCmdLEDCallback)(BOOL success, void* cbarg);
|
typedef void (*USBKBDCmdLEDCallback)(BOOL success, void* cbarg);
|
||||||
|
|
||||||
typedef struct USBKBDCmdLED {
|
typedef struct USBKBDCmdLED {
|
||||||
vu32 device; // 0x00
|
vu32 unk_0x00;
|
||||||
vu8 ledBits; // 0x04
|
vu8 unk_0x04;
|
||||||
} USBKBDCmdLED;
|
} USBKBDCmdLED;
|
||||||
|
|
||||||
typedef struct USBKBDCmdLEDAsync {
|
typedef struct USBKBDCmdLEDAsync {
|
||||||
@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
|
|||||||
|
|
||||||
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
|
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
|
||||||
|
|
||||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
|
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
|
||||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||||
|
|
||||||
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);
|
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);
|
||||||
|
|
||||||
|
|||||||
@@ -80,11 +80,11 @@ typedef struct {
|
|||||||
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
|
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
|
||||||
|
|
||||||
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
|
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
|
||||||
s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 offset,
|
s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
|
||||||
WADProcessCallback processCallback);
|
WADProcessCallback processCB);
|
||||||
|
|
||||||
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADBlocks* blocks, u32* fileListOut);
|
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7);
|
||||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADProcessCallback processCallback);
|
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB);
|
||||||
|
|
||||||
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);
|
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);
|
||||||
|
|
||||||
|
|||||||
@@ -67,17 +67,14 @@ BOOL AXFXChorusExpSettings(AXFX_CHORUS_EXP* fx) {
|
|||||||
OSRestoreInterrupts(enabled);
|
OSRestoreInterrupts(enabled);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
static void __FreeDelayLine(AXFX_CHORUS_EXP* fx) {
|
void AXFXChorusExpShutdown(AXFX_CHORUS_EXP* fx) {
|
||||||
|
BOOL enabled = OSDisableInterrupts();
|
||||||
u32 channel;
|
u32 channel;
|
||||||
|
fx->active |= 1;
|
||||||
for (channel = 0; channel < 3; channel++) {
|
for (channel = 0; channel < 3; channel++) {
|
||||||
if (fx->delay.line[channel] != NULL) __AXFXFree(fx->delay.line[channel]);
|
if (fx->delay.line[channel] != NULL) __AXFXFree(fx->delay.line[channel]);
|
||||||
fx->delay.line[channel] = NULL;
|
fx->delay.line[channel] = NULL;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
void AXFXChorusExpShutdown(AXFX_CHORUS_EXP* fx) {
|
|
||||||
BOOL enabled = OSDisableInterrupts();
|
|
||||||
fx->active |= 1;
|
|
||||||
__FreeDelayLine(fx);
|
|
||||||
OSRestoreInterrupts(enabled);
|
OSRestoreInterrupts(enabled);
|
||||||
}
|
}
|
||||||
void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
||||||
@@ -121,11 +118,10 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
|||||||
fx->history[0][history] = fx->delay.line[0][source];
|
fx->history[0][history] = fx->delay.line[0][source];
|
||||||
fx->history[1][history] = fx->delay.line[1][source];
|
fx->history[1][history] = fx->delay.line[1][source];
|
||||||
fx->history[2][history] = fx->delay.line[2][source];
|
fx->history[2][history] = fx->delay.line[2][source];
|
||||||
history++;
|
history = (history + 1) & 3;
|
||||||
history &= 3;
|
|
||||||
source++;
|
source++;
|
||||||
whole--;
|
|
||||||
if (source >= fx->delay.size) source = 0;
|
if (source >= fx->delay.size) source = 0;
|
||||||
|
whole--;
|
||||||
}
|
}
|
||||||
fx->delay.lastPos = position & 0xFFFF0000;
|
fx->delay.lastPos = position & 0xFFFF0000;
|
||||||
coefficients = __AXFXGetSrcCoef((fraction >> 9) & 0x7F);
|
coefficients = __AXFXGetSrcCoef((fraction >> 9) & 0x7F);
|
||||||
@@ -133,18 +129,14 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
|||||||
f32 filtered = 0.0f;
|
f32 filtered = 0.0f;
|
||||||
f32 dry;
|
f32 dry;
|
||||||
filtered += coefficients[0] * fx->history[channel][history];
|
filtered += coefficients[0] * fx->history[channel][history];
|
||||||
history++;
|
history = (history + 1) & 3;
|
||||||
history &= 3;
|
|
||||||
filtered += coefficients[1] * fx->history[channel][history];
|
filtered += coefficients[1] * fx->history[channel][history];
|
||||||
history++;
|
history = (history + 1) & 3;
|
||||||
history &= 3;
|
|
||||||
filtered += coefficients[2] * fx->history[channel][history];
|
filtered += coefficients[2] * fx->history[channel][history];
|
||||||
history++;
|
history = (history + 1) & 3;
|
||||||
history &= 3;
|
|
||||||
filtered += coefficients[3] * fx->history[channel][history];
|
filtered += coefficients[3] * fx->history[channel][history];
|
||||||
history++;
|
history = (history + 1) & 3;
|
||||||
history &= 3;
|
if (fx->busIn != NULL) dry = *input[channel]++ + *output[channel];
|
||||||
if (fx->busIn != NULL) dry = *output[channel] + *input[channel]++;
|
|
||||||
else dry = *output[channel];
|
else dry = *output[channel];
|
||||||
fx->delay.line[channel][fx->delay.inPos] = dry + filtered * fx->feedback;
|
fx->delay.line[channel][fx->delay.inPos] = dry + filtered * fx->feedback;
|
||||||
*output[channel]++ = filtered * fx->outGain;
|
*output[channel]++ = filtered * fx->outGain;
|
||||||
@@ -157,20 +149,8 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
|||||||
if (fx->delay.outPos >= fx->delay.sizeFP) fx->delay.outPos = 0;
|
if (fx->delay.outPos >= fx->delay.sizeFP) fx->delay.outPos = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static inline void chorus_gradient(AXFX_CHORUS_EXP_LFO* lfo, f32 depth, f32 step) {
|
|
||||||
depth /= step;
|
|
||||||
lfo->gradFactor = 65536.0f * depth;
|
|
||||||
}
|
|
||||||
static BOOL __InitParams(AXFX_CHORUS_EXP* fx) {
|
static BOOL __InitParams(AXFX_CHORUS_EXP* fx) {
|
||||||
f32 delay;
|
f32 delay, depth, step;
|
||||||
f32 depth;
|
|
||||||
f32 step;
|
|
||||||
u32 channel;
|
|
||||||
u32 sample;
|
|
||||||
s32 stepSamp;
|
|
||||||
s32 phaseAdd;
|
|
||||||
s32 depthSamp;
|
|
||||||
|
|
||||||
if (fx->delayTime < 0.1f || fx->delayTime > 50.0f) return FALSE;
|
if (fx->delayTime < 0.1f || fx->delayTime > 50.0f) return FALSE;
|
||||||
if (fx->depth < 0.0f || fx->depth > 1.0f) return FALSE;
|
if (fx->depth < 0.0f || fx->depth > 1.0f) return FALSE;
|
||||||
if (fx->rate < 0.1f || fx->rate > 2.0f) return FALSE;
|
if (fx->rate < 0.1f || fx->rate > 2.0f) return FALSE;
|
||||||
@@ -180,60 +160,61 @@ static BOOL __InitParams(AXFX_CHORUS_EXP* fx) {
|
|||||||
fx->lfo.table = __AXFXGetLfoSinTable();
|
fx->lfo.table = __AXFXGetLfoSinTable();
|
||||||
delay = 32.0f * fx->delayTime;
|
delay = 32.0f * fx->delayTime;
|
||||||
depth = delay * fx->depth;
|
depth = delay * fx->depth;
|
||||||
if (depth >= delay) {
|
if (delay <= depth) {
|
||||||
depth -= 1.0f;
|
depth -= 1.0f;
|
||||||
if (depth < 0.0f) depth = 0.0f;
|
if (depth < 0.0f) depth = 0.0f;
|
||||||
}
|
}
|
||||||
|
fx->lfo.depthSamp = 65536.0f * depth;
|
||||||
|
fx->lfo.phaseAdd = 65536.0f * (256.0f * fx->rate / 32000.0f);
|
||||||
|
step = (32000.0f / fx->rate) * (1.0f / 256.0f);
|
||||||
|
fx->lfo.stepSamp = 65536.0f * step;
|
||||||
|
fx->lfo.gradFactor = 65536.0f * (depth / step);
|
||||||
fx->lfo.lastNum = -1;
|
fx->lfo.lastNum = -1;
|
||||||
fx->lfo.phase = 0;
|
fx->lfo.phase = 0;
|
||||||
fx->lfo.sign = 0;
|
fx->lfo.sign = 0;
|
||||||
fx->lfo.lastValue = 0;
|
fx->lfo.lastValue = 0;
|
||||||
fx->lfo.grad = 0;
|
fx->lfo.grad = 0;
|
||||||
depthSamp = 65536.0f * depth;
|
fx->history[0][0] = 0.0f;
|
||||||
phaseAdd = 65536.0f * (256.0f * fx->rate / 32000.0f);
|
fx->history[0][1] = 0.0f;
|
||||||
step = (32000.0f / fx->rate) / 256.0f;
|
fx->history[0][2] = 0.0f;
|
||||||
stepSamp = 65536.0f * step;
|
fx->history[0][3] = 0.0f;
|
||||||
fx->lfo.depthSamp = depthSamp;
|
fx->history[1][0] = 0.0f;
|
||||||
fx->lfo.phaseAdd = phaseAdd;
|
fx->history[1][1] = 0.0f;
|
||||||
fx->lfo.stepSamp = stepSamp;
|
fx->history[1][2] = 0.0f;
|
||||||
chorus_gradient(&fx->lfo, depth, step);
|
fx->history[1][3] = 0.0f;
|
||||||
for (channel = 0; channel < 3; channel++) {
|
fx->history[2][0] = 0.0f;
|
||||||
for (sample = 0; sample < 4; sample++) {
|
fx->history[2][1] = 0.0f;
|
||||||
fx->history[channel][sample] = 0.0f;
|
fx->history[2][2] = 0.0f;
|
||||||
}
|
fx->history[2][3] = 0.0f;
|
||||||
}
|
|
||||||
fx->histIndex = 0;
|
fx->histIndex = 0;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
static void __CalcLFO(s32* output, AXFX_CHORUS_EXP_LFO* lfo) {
|
static void __CalcLFO(s32* output, AXFX_CHORUS_EXP_LFO* lfo) {
|
||||||
s32 start;
|
u32 remaining = 96;
|
||||||
s64 value;
|
do {
|
||||||
s32 difference;
|
s32 value;
|
||||||
s64 gradient;
|
u32 phase = lfo->phase & 0xFFFF0000;
|
||||||
u32 phase;
|
|
||||||
u32 sample;
|
|
||||||
for (sample = 0; sample < 96; sample++) {
|
|
||||||
phase = lfo->phase & 0xFFFF0000;
|
|
||||||
if (phase != lfo->lastNum) {
|
if (phase != lfo->lastNum) {
|
||||||
|
s32 start, difference;
|
||||||
|
s64 product;
|
||||||
lfo->lastNum = phase;
|
lfo->lastNum = phase;
|
||||||
phase >>= 16;
|
phase >>= 16;
|
||||||
start = lfo->table[phase];
|
start = lfo->table[phase];
|
||||||
difference = lfo->table[(phase + 1) & 0x7F] - start;
|
difference = lfo->table[(phase + 1) & 0x7F] - start;
|
||||||
gradient = difference;
|
product = (s64)start * lfo->depthSamp;
|
||||||
gradient *= lfo->gradFactor;
|
value = ((u32)(product >> 32) << 8) | ((u32)product >> 24);
|
||||||
lfo->grad = gradient >> 24;
|
product = (s64)difference * lfo->gradFactor;
|
||||||
value = (s64)start * lfo->depthSamp;
|
lfo->grad = ((u32)(product >> 32) << 8) | ((u32)product >> 24);
|
||||||
value >>= 24;
|
|
||||||
} else {
|
|
||||||
value = lfo->lastValue + lfo->grad;
|
|
||||||
}
|
}
|
||||||
|
else value = lfo->lastValue + lfo->grad;
|
||||||
lfo->lastValue = value;
|
lfo->lastValue = value;
|
||||||
if (lfo->sign >= 1) value = -value;
|
if (lfo->sign != 0) value = -value;
|
||||||
lfo->phase += lfo->phaseAdd;
|
lfo->phase += lfo->phaseAdd;
|
||||||
if (lfo->phase & 0xFF800000) {
|
if (lfo->phase & 0xFF800000) {
|
||||||
lfo->phase &= 0x7FFFFF;
|
lfo->phase &= 0x7FFFFF;
|
||||||
lfo->sign ^= 1;
|
lfo->sign ^= 1;
|
||||||
}
|
}
|
||||||
*output++ = value;
|
*output++ = value;
|
||||||
}
|
remaining--;
|
||||||
|
} while (remaining != 0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||||
{
|
{
|
||||||
BOOLEAN status = FALSE;
|
BOOLEAN status = FALSE;
|
||||||
int i;
|
int i;
|
||||||
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static BOOLEAN bta_dm_l2cap_server_compress_cback(
|
static BOOLEAN bta_dm_l2cap_server_compress_cback(
|
||||||
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
|
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
|
||||||
int direction, int config, int enable, UINT8 **p_mem_pool,
|
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
|
||||||
UINT32 *mem_pool_size)
|
UINT32 *mem_pool_size)
|
||||||
{
|
{
|
||||||
BOOLEAN status = FALSE;
|
BOOLEAN status = FALSE;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
|
|||||||
GKI_freebuf(p_msg);
|
GKI_freebuf(p_msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
void bte_hcisu_task(int unused)
|
void bte_hcisu_task(int param_1)
|
||||||
{
|
{
|
||||||
if (p_hcisu_if)
|
if (p_hcisu_if)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -152,11 +152,11 @@ void BTA_CleanUp(tBTA_APP_INFO_CBACK *p_cb)
|
|||||||
GKI_shutdown();
|
GKI_shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
void bta_usb_close_evt(INT8 status)
|
void bta_usb_close_evt(INT8 param_1)
|
||||||
{
|
{
|
||||||
if (_bte_app_info)
|
if (_bte_app_info)
|
||||||
{
|
{
|
||||||
if (status >= 0)
|
if (param_1 >= 0)
|
||||||
(*_bte_app_info)(0);
|
(*_bte_app_info)(0);
|
||||||
else
|
else
|
||||||
(*_bte_app_info)(1);
|
(*_bte_app_info)(1);
|
||||||
|
|||||||
@@ -113,20 +113,20 @@ static UINT16 const hcisu_msg_evt_table[] =
|
|||||||
MSG_HC_TO_STACK_HCI_EVT,
|
MSG_HC_TO_STACK_HCI_EVT,
|
||||||
};
|
};
|
||||||
|
|
||||||
void hcisu_h2_usb_cback(UINT8 event, INT8 status)
|
void hcisu_h2_usb_cback(UINT8 param_1, INT8 param_2)
|
||||||
{
|
{
|
||||||
switch (event)
|
switch (param_1)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
bta_usb_close_evt(status);
|
bta_usb_close_evt(param_2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||||
{
|
{
|
||||||
UINT16 bytes_read = 0;
|
UINT16 bytes_read = 0;
|
||||||
UINT8 byte;
|
UINT8 byte;
|
||||||
@@ -138,7 +138,7 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
|||||||
if (p_cb->at_0x1e != 2)
|
if (p_cb->at_0x1e != 2)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
r27 = pipe + 1;
|
r27 = param_1 + 1;
|
||||||
|
|
||||||
while (TRUE)
|
while (TRUE)
|
||||||
{
|
{
|
||||||
@@ -148,36 +148,36 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
|||||||
++bytes_read;
|
++bytes_read;
|
||||||
msg_received = FALSE;
|
msg_received = FALSE;
|
||||||
|
|
||||||
switch (p_cb->at_0x1a[pipe])
|
switch (p_cb->at_0x1a[param_1])
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
if (r27 == 1)
|
if (r27 == 1)
|
||||||
{
|
{
|
||||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||||
p_cb->at_0x14[pipe] = 4;
|
p_cb->at_0x14[param_1] = 4;
|
||||||
}
|
}
|
||||||
else if (r27 == 2)
|
else if (r27 == 2)
|
||||||
{
|
{
|
||||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||||
p_cb->at_0x14[pipe] = 2;
|
p_cb->at_0x14[param_1] = 2;
|
||||||
}
|
}
|
||||||
else if (r27 == 3)
|
else if (r27 == 3)
|
||||||
{
|
{
|
||||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||||
p_cb->at_0x14[pipe] = 3;
|
p_cb->at_0x14[param_1] = 3;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p_cb->at_0x00[pipe])
|
if (p_cb->at_0x00[param_1])
|
||||||
{
|
{
|
||||||
p_cb->at_0x00[pipe]->len = 0;
|
p_cb->at_0x00[param_1]->len = 0;
|
||||||
p_cb->at_0x00[pipe]->event =
|
p_cb->at_0x00[param_1]->event =
|
||||||
hcisu_msg_evt_table[p_cb->at_0x14[pipe] - 1];
|
hcisu_msg_evt_table[p_cb->at_0x14[param_1] - 1];
|
||||||
p_cb->at_0x00[pipe]->offset = 0;
|
p_cb->at_0x00[param_1]->offset = 0;
|
||||||
p_cb->at_0x1a[pipe] = 1;
|
p_cb->at_0x1a[param_1] = 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -185,54 +185,54 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
|||||||
"HCIS: Unable to allocate buffer for incoming HCI "
|
"HCIS: Unable to allocate buffer for incoming HCI "
|
||||||
"message.");
|
"message.");
|
||||||
|
|
||||||
p_cb->at_0x1a[pipe] = 2;
|
p_cb->at_0x1a[param_1] = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
p_cb->at_0x0c[pipe] =
|
p_cb->at_0x0c[param_1] =
|
||||||
hcisu_preamble_table[p_cb->at_0x14[pipe] - 1];
|
hcisu_preamble_table[p_cb->at_0x14[param_1] - 1];
|
||||||
|
|
||||||
/* fallthrough */
|
/* fallthrough */
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||||
|
|
||||||
--p_cb->at_0x0c[pipe];
|
--p_cb->at_0x0c[param_1];
|
||||||
|
|
||||||
if (p_cb->at_0x0c[pipe] == 0)
|
if (p_cb->at_0x0c[param_1] == 0)
|
||||||
{
|
{
|
||||||
msg_len = byte;
|
msg_len = byte;
|
||||||
|
|
||||||
if (p_cb->at_0x14[pipe] == 2)
|
if (p_cb->at_0x14[param_1] == 2)
|
||||||
{
|
{
|
||||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||||
|
|
||||||
if ((p_cb->at_0x00[pipe] =
|
if ((p_cb->at_0x00[param_1] =
|
||||||
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
|
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
|
||||||
(BT_HDR *)p_cb->at_0x00[pipe]))
|
(BT_HDR *)p_cb->at_0x00[param_1]))
|
||||||
== 0)
|
== 0)
|
||||||
{
|
{
|
||||||
p_cb->at_0x0c[pipe] = msg_len;
|
p_cb->at_0x0c[param_1] = msg_len;
|
||||||
|
|
||||||
if (msg_len == 0)
|
if (msg_len == 0)
|
||||||
p_cb->at_0x1a[pipe] = 0;
|
p_cb->at_0x1a[param_1] = 0;
|
||||||
else
|
else
|
||||||
p_cb->at_0x1a[pipe] = 4;
|
p_cb->at_0x1a[param_1] = 4;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
p_cb->at_0x0c[pipe] = msg_len;
|
p_cb->at_0x0c[param_1] = msg_len;
|
||||||
|
|
||||||
if (sizeof(HC_BT_HDR)
|
if (sizeof(HC_BT_HDR)
|
||||||
+ hcisu_preamble_table[p_cb->at_0x14[pipe] - 1]
|
+ hcisu_preamble_table[p_cb->at_0x14[param_1] - 1]
|
||||||
+ msg_len
|
+ msg_len
|
||||||
> GKI_get_buf_size(p_cb->at_0x00[pipe]))
|
> GKI_get_buf_size(p_cb->at_0x00[param_1]))
|
||||||
{
|
{
|
||||||
GKI_freebuf(p_cb->at_0x00[pipe]);
|
GKI_freebuf(p_cb->at_0x00[param_1]);
|
||||||
p_cb->at_0x00[pipe] = NULL;
|
p_cb->at_0x00[param_1] = NULL;
|
||||||
p_cb->at_0x1a[pipe] = 4;
|
p_cb->at_0x1a[param_1] = 4;
|
||||||
|
|
||||||
BT_TRACE(HCI, ERROR,
|
BT_TRACE(HCI, ERROR,
|
||||||
"HCIS: Invalid length for incoming HCI message.");
|
"HCIS: Invalid length for incoming HCI message.");
|
||||||
@@ -242,85 +242,85 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
|||||||
|
|
||||||
if (msg_len != 0)
|
if (msg_len != 0)
|
||||||
{
|
{
|
||||||
p_cb->at_0x1a[pipe] = 3;
|
p_cb->at_0x1a[param_1] = 3;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
msg_received = TRUE;
|
msg_received = TRUE;
|
||||||
p_cb->at_0x1a[pipe] = 0;
|
p_cb->at_0x1a[param_1] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
p_cb->at_0x17[pipe] = byte;
|
p_cb->at_0x17[param_1] = byte;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
--p_cb->at_0x0c[pipe];
|
--p_cb->at_0x0c[param_1];
|
||||||
|
|
||||||
if (p_cb->at_0x0c[pipe] == 0)
|
if (p_cb->at_0x0c[param_1] == 0)
|
||||||
{
|
{
|
||||||
msg_len = byte;
|
msg_len = byte;
|
||||||
|
|
||||||
if (p_cb->at_0x14[pipe] == 2)
|
if (p_cb->at_0x14[param_1] == 2)
|
||||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||||
|
|
||||||
p_cb->at_0x0c[pipe] = msg_len;
|
p_cb->at_0x0c[param_1] = msg_len;
|
||||||
p_cb->at_0x1a[pipe] = 4;
|
p_cb->at_0x1a[param_1] = 4;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
p_cb->at_0x17[pipe] = byte;
|
p_cb->at_0x17[param_1] = byte;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||||
|
|
||||||
--p_cb->at_0x0c[pipe];
|
--p_cb->at_0x0c[param_1];
|
||||||
|
|
||||||
len = UUSB_Read(pipe + 1,
|
len = UUSB_Read(param_1 + 1,
|
||||||
(UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
(UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||||
+ p_cb->at_0x00[pipe]->len,
|
+ p_cb->at_0x00[param_1]->len,
|
||||||
p_cb->at_0x0c[pipe]);
|
p_cb->at_0x0c[param_1]);
|
||||||
|
|
||||||
p_cb->at_0x00[pipe]->len += len;
|
p_cb->at_0x00[param_1]->len += len;
|
||||||
p_cb->at_0x0c[pipe] -= len;
|
p_cb->at_0x0c[param_1] -= len;
|
||||||
bytes_read += len;
|
bytes_read += len;
|
||||||
|
|
||||||
if (p_cb->at_0x0c[pipe] == 0)
|
if (p_cb->at_0x0c[param_1] == 0)
|
||||||
{
|
{
|
||||||
if (p_cb->at_0x14[pipe] == 2
|
if (p_cb->at_0x14[param_1] == 2
|
||||||
&& l2cap_link_chk_pkt_end() == 0)
|
&& l2cap_link_chk_pkt_end() == 0)
|
||||||
{
|
{
|
||||||
p_cb->at_0x1a[pipe] = 0;
|
p_cb->at_0x1a[param_1] = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
msg_received = TRUE;
|
msg_received = TRUE;
|
||||||
p_cb->at_0x1a[pipe] = 0;
|
p_cb->at_0x1a[param_1] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
--p_cb->at_0x0c[pipe];
|
--p_cb->at_0x0c[param_1];
|
||||||
|
|
||||||
if (p_cb->at_0x0c[pipe] == 0)
|
if (p_cb->at_0x0c[param_1] == 0)
|
||||||
p_cb->at_0x1a[pipe] = 0;
|
p_cb->at_0x1a[param_1] = 0;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (msg_received)
|
if (msg_received)
|
||||||
{
|
{
|
||||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[pipe]);
|
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[param_1]);
|
||||||
p_cb->at_0x00[pipe] = NULL;
|
p_cb->at_0x00[param_1] = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -403,7 +403,7 @@ void hcisu_h2_send_msg(tHCISU_H2_CB *p_cb, HC_BT_HDR *p_msg)
|
|||||||
hcisu_h2_send_msg_now(p_cb, p_msg);
|
hcisu_h2_send_msg_now(p_cb, p_msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
|
void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||||
{
|
{
|
||||||
hcisu_h2_cb.at_0x1e = 0;
|
hcisu_h2_cb.at_0x1e = 0;
|
||||||
|
|
||||||
@@ -411,9 +411,9 @@ void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
|
|||||||
hcisu_h2_cb.at_0x1a[1] = 0;
|
hcisu_h2_cb.at_0x1a[1] = 0;
|
||||||
hcisu_h2_cb.at_0x1a[2] = 0;
|
hcisu_h2_cb.at_0x1a[2] = 0;
|
||||||
|
|
||||||
hcisu_h2_cb.at_0x1f = taskId;
|
hcisu_h2_cb.at_0x1f = param_1;
|
||||||
hcisu_h2_cb.at_0x20 = mbox;
|
hcisu_h2_cb.at_0x20 = param_2;
|
||||||
hcisu_h2_cb.at_0x12 = bufSize;
|
hcisu_h2_cb.at_0x12 = param_3;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)
|
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)
|
||||||
|
|||||||
@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||||
UINT8 enable)
|
UINT8 enable)
|
||||||
{
|
{
|
||||||
tL2C_LCB *p_lcb;
|
tL2C_LCB *p_lcb;
|
||||||
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
|
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
|
||||||
{
|
{
|
||||||
#if 0
|
#if 0
|
||||||
/* ... */
|
/* ... */
|
||||||
|
|||||||
@@ -565,7 +565,7 @@ void UUSB_Open(tUUSB *uusb, tUUSB_CBACK *cback)
|
|||||||
(void)uusb;
|
(void)uusb;
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT16 UUSB_Read(UINT8 pipe, void *buf, UINT16 len)
|
UINT16 UUSB_Read(UINT8 param_1, void *param_2, UINT16 param_3)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -580,7 +580,7 @@ int UUSB_WriteBuf(/* ... */)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||||
{
|
{
|
||||||
short sp18 = 0;
|
short sp18 = 0;
|
||||||
IOSError ret = 0;
|
IOSError ret = 0;
|
||||||
@@ -591,7 +591,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
|||||||
if (usb.state != 2)
|
if (usb.state != 2)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
switch (pipe)
|
switch (param_1)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
|
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
|
||||||
@@ -656,7 +656,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
|||||||
memcpy(p_buffer, p_data, len);
|
memcpy(p_buffer, p_data, len);
|
||||||
|
|
||||||
if (len > 190)
|
if (len > 190)
|
||||||
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
|
UUSBDBG(" woah ! thats pretty Big ! :%d", param_3);
|
||||||
|
|
||||||
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
|
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
|
||||||
{
|
{
|
||||||
@@ -696,7 +696,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
(void)unused;
|
(void)param_4;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user